1041 files changed, 0 insertions, 506681 deletions

diff --git a/target/linux/generic-2.6/base-files/init b/target/linux/generic-2.6/base-files/init
deleted file mode 100755
index 9e8ba7c5eb..0000000000
--- a/target/linux/generic-2.6/base-files/init
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-INITRAMFS=1
-
-. /etc/preinit
-
-set_state init
-echo "- init -"
-
-# if we have no root parameter, just go to running from ramfs
-[ -z $rootfs ] && {
-  export NOMOUNT="No Root"
-  exec /sbin/init
-}
-
-#if we have a failsafe boot selected, dont bother
-#trying to find or wait for a root mount point
-[ -z "$FAILSAFE" ] || {
-  exec /bin/busybox init
-}
-
-# Load the modules we have in initramfs, this should
-# make the media accessible, but, it may take some time
-. /etc/functions.sh
-load_modules /etc/modules /etc/modules.d/*
-
-#wait 10 seconds for the disc to show up
-#usb stick typically takes 4 to 6 seconds
-#till it's readable
-#it's quite possible the disc never shows up
-#if we netbooted this kernel
-COUNTER=0
-while [ $COUNTER -lt 10 ]; do
-  sleep 1
-  [ -e $rootfs ] && let COUNTER=10;
-  let COUNTER=COUNTER+1
-done
-[ -e $rootfs ] || {
-  export FAILSAFE="NoDisc"
-  exec /bin/busybox init
-}
-
-# now we'll try mount it, again with a timeout
-# This will fail if the inserted stick is formatted
-# in a manner we dont understand
-COUNTER=0
-while [ $COUNTER -lt 10 ]; do
-  sleep 1
-  mount $rootfs /mnt
-  [ $? -eq "0" ] && let COUNTER=100;
-  let COUNTER=COUNTER+1
-done
-[ $? -ne "0" ] && {
-  export FAILSAFE="MountFail"
-  exec /bin/busybox init
-}
-
-#It mounted, lets look for a postinit file, again, give it time
-#I've seen this take 6 seconds to actually complete
-COUNTER=0
-while [ $COUNTER -lt 10 ]; do
-  sleep 1
-  [ -e /mnt/etc/banner ] && let COUNTER=10;
-  let COUNTER=COUNTER+1
-done
-[ -e /mnt/etc/banner ] || {
-  export FAILSAFE="No Openwrt FS"
-  exec /bin/busybox init
-}
-
-unset rootfs
-
-mount -o move /proc /mnt/proc
-mount -o move /dev /mnt/dev
-mount -o move /dev/pts /mnt/dev/pts
-mount -o move /tmp /mnt/tmp
-mount -o move /sys /mnt/sys
-mount none /tmp -t tmpfs
-killall -q hotplug2
-exec switch_root -c /dev/console /mnt /sbin/init
-
-set_state done
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
deleted file mode 100644
index cf29de5aed..0000000000
--- a/target/linux/generic-2.6/config-2.6.25
+++ /dev/null
@@ -1,2036 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_9P_FS is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM7X00A is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCNET is not set
-CONFIG_ARPD=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATL1 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CODA_FS is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ALGAPI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DECNET is not set
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECONET is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-CONFIG_EVENTFD=y
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SUPPORT is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-CONFIG_IMQ_BEHAVIOR_BA=y
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-CONFIG_IPV6_ROUTER_PREF=y
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYS is not set
-CONFIG_KMOD=y
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-CONFIG_LBD=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LSF is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211_DEBUG is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_SM501 is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-# CONFIG_MMC_AT91 is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_EMATCH=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PID_NS is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PM is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8187 is not set
-CONFIG_RT_MUTEXES=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 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_LM93 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_USX2Y is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB_DRIVER_MIPS is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_STANDALONE=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TPS65010 is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-CONFIG_VIDEO_V4L2=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VITESSE_PHY is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
deleted file mode 100644
index b2ced18a9a..0000000000
--- a/target/linux/generic-2.6/config-2.6.30
+++ /dev/null
@@ -1,2683 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACER_WMI is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_OLPC is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BDI_SWITCH is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CODA_FS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_ERRORS is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4DEV_COMPAT is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_COBALT is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3C2410 is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VESA is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBD=y
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_BLOCK_PARANOID_RESUME is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_EMBEDDED_SDIO is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_PARANOID_SD_INIT is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDHCI_PCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_WBSD is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_PPC is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING is not set
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_ATEN2011 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_XMON is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
deleted file mode 100644
index 9c9eecf011..0000000000
--- a/target/linux/generic-2.6/config-2.6.31
+++ /dev/null
@@ -1,2706 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACER_WMI is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYS is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_OPROFILE is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VT6655 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
deleted file mode 100644
index 3cd83c2b1c..0000000000
--- a/target/linux/generic-2.6/config-2.6.32
+++ /dev/null
@@ -1,2835 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_COPS is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_MV_CESA is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_FS_XATTR is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SCMI is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBERTAS_SDIO is not set
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_PPC is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_PPC4xx is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_TLE62X0 is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
deleted file mode 100644
index fb8ac7a5a1..0000000000
--- a/target/linux/generic-2.6/config-2.6.33
+++ /dev/null
@@ -1,2906 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_R8187SE is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_BRIDGE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_IFXMIPS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_USE_FOR_EXT23 is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWMC3200TOP is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_ZLIB is not set
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_LZMA_COMPRESS=y
-CONFIG_LZMA_DECOMPRESS=y
-CONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_TINY_RCU=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XILINX is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY=""
diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
deleted file mode 100644
index 53e28aea98..0000000000
--- a/target/linux/generic-2.6/config-2.6.34
+++ /dev/null
@@ -1,2958 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_R8187SE is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-CONFIG_BRIDGE=y
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_IFXMIPS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CRYSTALHD is not set
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DT3155 is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_USE_FOR_EXT23 is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GENERIC_PWM is not set
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SCH is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_3M_PCT is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MOSART is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HID_QUANTA is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_STANTUM is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWMC3200TOP is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_ZLIB is not set
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_KSZ884X_PCI is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LKDTM is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGFS is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_LZMA_COMPRESS=y
-CONFIG_LZMA_DECOMPRESS=y
-CCONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MACVTAP is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_TINY_RCU=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPINLOCK_TEST is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UCB1400_CORE is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY=""
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
diff --git a/target/linux/generic-2.6/config-2.6.35 b/target/linux/generic-2.6/config-2.6.35
deleted file mode 100644
index 7e4d41ad2a..0000000000
--- a/target/linux/generic-2.6/config-2.6.35
+++ /dev/null
@@ -1,3003 +0,0 @@
-# CONFIG_6PACK is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_9P_FS is not set
-# CONFIG_AB3100_CORE is not set
-# CONFIG_AB4500_CORE is not set
-# CONFIG_AB8500_CORE is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_ACENIC is not set
-# CONFIG_ACPI_POWER_METER is not set
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_ADIS16255 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_ADM6996_PHY is not set
-# CONFIG_ADM8211 is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_AGP is not set
-CONFIG_AIO=y
-# CONFIG_AIRO_CS is not set
-# CONFIG_AIRO is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-# CONFIG_R8187SE is not set
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ANDROID is not set
-CONFIG_ANON_INODES=y
-# CONFIG_APPLICOM is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR9170_USB is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCMRING is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_STMP3XXX is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCNET is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_ARPD=y
-# CONFIG_ARTHUR is not set
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_ASUS_OLED is not set
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_AT24 is not set
-# CONFIG_AT76C50X_USB is not set
-# CONFIG_ATA_ACPI is not set
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_ATA is not set
-# CONFIG_ATALK is not set
-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_ATA_PIIX is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_ATA_SFF=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL2 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_ATM_BR2684 is not set
-# CONFIG_ATM_CLIP is not set
-CONFIG_ATM_CLIP_NO_ICMP=y
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATMEL is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_FORE200E is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_LANE is not set
-# CONFIG_ATM_MPOA is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_SOLOS is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_AUDIT is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_AX25_DAMA_SLAVE is not set
-# CONFIG_AX25 is not set
-# CONFIG_AX88796 is not set
-# CONFIG_B3DFG is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_B44 is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_FULL=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
-# CONFIG_BATTERY_BQ27000_HDQ is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BAYCOM_EPP is not set
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_SER_FDX is not set
-# CONFIG_BAYCOM_SER_HDX is not set
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-CONFIG_BCM43XX_DMA=y
-# CONFIG_BCM43XX is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_BCM43XX_PIO=y
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_BINARY_PRINTF is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_BLINK is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_ONLY is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_SD is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLOCK=y
-# CONFIG_BNX2 is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_BPQETHER is not set
-CONFIG_BRIDGE=y
-# CONFIG_BRIDGE_EBT_802_3 is not set
-# CONFIG_BRIDGE_EBT_AMONG is not set
-# CONFIG_BRIDGE_EBT_ARP is not set
-# CONFIG_BRIDGE_EBT_ARPREPLY is not set
-# CONFIG_BRIDGE_EBT_BROUTE is not set
-# CONFIG_BRIDGE_EBT_DNAT is not set
-# CONFIG_BRIDGE_EBT_IP6 is not set
-# CONFIG_BRIDGE_EBT_IP is not set
-# CONFIG_BRIDGE_EBT_LIMIT is not set
-# CONFIG_BRIDGE_EBT_LOG is not set
-# CONFIG_BRIDGE_EBT_MARK is not set
-# CONFIG_BRIDGE_EBT_MARK_T is not set
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-# CONFIG_BRIDGE_EBT_PKTTYPE is not set
-# CONFIG_BRIDGE_EBT_REDIRECT is not set
-# CONFIG_BRIDGE_EBT_SNAT is not set
-# CONFIG_BRIDGE_EBT_STP is not set
-# CONFIG_BRIDGE_EBT_T_FILTER is not set
-# CONFIG_BRIDGE_EBT_T_NAT is not set
-# CONFIG_BRIDGE_EBT_ULOG is not set
-# CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_NETFILTER is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_BROKEN_ON_SMP=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BNEP is not set
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIDTL1 is not set
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_HIDP is not set
-# CONFIG_BT is not set
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_RFCOMM is not set
-CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_FS is not set
-# CONFIG_BT_SCO is not set
-CONFIG_BUG=y
-# CONFIG_C2PORT is not set
-# CONFIG_CAIF is not set
-# CONFIG_CAN is not set
-# CONFIG_CAPI_AVM is not set
-# CONFIG_CAPI_EICON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_CARDBUS=y
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_CASSINI is not set
-# CONFIG_CB710_CORE is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CFG80211 is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_CHELSIO_T3 is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_CIFS is not set
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CLASSIC_RCU=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_CNIC is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_COMEDI is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CROSSCOMPILE=y
-CONFIG_CROSS_COMPILE=""
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_AES is not set
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_IFXMIPS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-# CONFIG_CRYPTO_HASH is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_MANAGER is not set
-CONFIG_CRYPTO_MANAGER_NO_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_PRNG is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_RNG is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CRYPTO_TWOFISH_COMMON is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-CONFIG_CRYPTO_UNLZMA=y
-# CONFIG_CRYPTO_VMAC is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ZLIB=y
-# CONFIG_CRYSTALHD is not set
-# CONFIG_CUSE is not set
-# CONFIG_DAB is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DCB is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DECNET is not set
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_CUBIC is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_HYBLA is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_DEFAULT_NOOP is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="westwood"
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_VENO is not set
-CONFIG_DEFAULT_WESTWOOD=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_DEVKMEM is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS is not set
-# CONFIG_DGRS is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_DL2K is not set
-# CONFIG_DLM is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_DMA_ENGINE is not set
-# CONFIG_DMASCC is not set
-# CONFIG_DMATEST is not set
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DNET is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_DRAGONRISE_FF is not set
-# CONFIG_DRM is not set
-# CONFIG_DS1682 is not set
-# CONFIG_DST is not set
-# CONFIG_DT3155 is not set
-# CONFIG_DTLK is not set
-# CONFIG_DUMMY is not set
-# CONFIG_DVB_CORE is not set
-# CONFIG_DVB is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-# CONFIG_E1000E is not set
-# CONFIG_E1000 is not set
-# CONFIG_E100 is not set
-# CONFIG_ECHO is not set
-# CONFIG_ECONET is not set
-# CONFIG_EDAC is not set
-# CONFIG_EEPRO100 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_EPIC100 is not set
-CONFIG_EPOLL=y
-# CONFIG_EQUALIZER is not set
-# CONFIG_ET131X is not set
-# CONFIG_ETHOC is not set
-CONFIG_EVENTFD=y
-# CONFIG_EVENT_TRACER is not set
-CONFIG_EXPERIMENTAL=y
-# CONFIG_EXPORTFS is not set
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_EXT4_USE_FOR_EXT23 is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_EZX_PCAP is not set
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_FS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EARLYSUSPEND is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_OF is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_PS3 is not set
-# CONFIG_FB_PXA is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE_FNIC is not set
-# CONFIG_FCOE is not set
-# CONFIG_FDDI is not set
-# CONFIG_FEALNX is not set
-CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_FORCEDETH is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_FREEZER is not set
-# CONFIG_FSCACHE is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_FTL is not set
-# CONFIG_FTRACE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SAS is not set
-# CONFIG_FUSION_SPI is not set
-CONFIG_FUTEX=y
-CONFIG_FW_LOADER=y
-CONFIG_GACT_PROB=y
-# CONFIG_GAMEPORT is not set
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_TIME=y
-# CONFIG_GIGASET_CAPI is not set
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_GPIO_DEVICE is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_LANGWELL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_RDC321X is not set
-# CONFIG_GPIO_SCH is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-# CONFIG_HCALL_STATS is not set
-# CONFIG_HDLC_CISCO is not set
-# CONFIG_HDLC_FR is not set
-# CONFIG_HDLC is not set
-# CONFIG_HDLC_PPP is not set
-# CONFIG_HDLC_RAW_ETH is not set
-# CONFIG_HDLC_RAW is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_HECI is not set
-# CONFIG_HERMES is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HID_3M_PCT is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CANDO is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COMPAT is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EGALAX is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MOSART is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HID_QUANTA is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_ROCCAT_KONE is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_STANTUM is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_HIPPI is not set
-# CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_HOTPLUG=y
-# CONFIG_HP100 is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_HVC_UDBG is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIA is not set
-# CONFIG_HYPERV is not set
-# CONFIG_HYSDN is not set
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_48 is not set
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCA is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_COMPAT 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_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_ELEKTOR is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_IBM_IIC is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_PROSAVAGE is not set
-# CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_SMBUS is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2O is not set
-# CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-# CONFIG_IDE_GD is not set
-# CONFIG_IDE is not set
-CONFIG_IDE_MAX_HWIFS=4
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_IDE_PHISON is not set
-CONFIG_IDE_PROC_FS=y
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_IEEE1394_DV1394 is not set
-# CONFIG_IEEE1394_ETH1394 is not set
-# CONFIG_IEEE1394 is not set
-# CONFIG_IEEE1394_OHCI1394 is not set
-# CONFIG_IEEE1394_PCILYNX is not set
-# CONFIG_IEEE1394_RAWIO is not set
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_VIDEO1394 is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_IFB is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-# CONFIG_IMQ is not set
-CONFIG_IMQ_NUM_DEVS=2
-# 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_INET6_XFRM_MODE_BEET is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_TCP_DIAG is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET=y
-# CONFIG_INFINIBAND is not set
-# CONFIG_INFTL is not set
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
-# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
-# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-CONFIG_INITRAMFS_COMPRESSION_NONE=y
-# CONFIG_INOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_APANEL is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_GPIO is not set
-# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_MIMIO is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_WINBOND_CIR is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INSTRUMENTATION is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IP1000 is not set
-# CONFIG_IP17XX_PHY is not set
-# CONFIG_IP6_NF_FILTER is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_LIMIT is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_ROUTE is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IPC_NS is not set
-# CONFIG_IP_DCCP is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_ARPFILTER is not set
-# CONFIG_IP_NF_ARP_MANGLE is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_SET is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT_AMANDA is not set
-# CONFIG_IP_NF_NAT_FTP is not set
-# CONFIG_IP_NF_NAT_H323 is not set
-# CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_NAT_PPTP is not set
-# CONFIG_IP_NF_NAT_SIP is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-# CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
-# CONFIG_IP_NF_SET_IPHASH is not set
-# CONFIG_IP_NF_SET_IPMAP is not set
-# CONFIG_IP_NF_SET_IPPORTHASH is not set
-# CONFIG_IP_NF_SET_IPTREE is not set
-# CONFIG_IP_NF_SET_IPTREEMAP is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
-# CONFIG_IP_NF_SET_NETHASH is not set
-# CONFIG_IP_NF_SET_PORTMAP is not set
-# CONFIG_IP_NF_SIP is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_REDIRECT is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_TARGET_SET is not set
-# CONFIG_IP_NF_TARGET_TOS is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_PIMSM_V1 is not set
-# CONFIG_IP_PIMSM_V2 is not set
-# CONFIG_IP_PNP is not set
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-# CONFIG_IP_ROUTE_MULTIPATH_DRR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RANDOM is not set
-# CONFIG_IP_ROUTE_MULTIPATH_RR is not set
-# CONFIG_IP_ROUTE_MULTIPATH_WRANDOM is not set
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_SCTP is not set
-CONFIG_IPSEC_NAT_TRAVERSAL=y
-# CONFIG_IPV6 is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_VS is not set
-# CONFIG_IPW2100_DEBUG is not set
-# CONFIG_IPW2100 is not set
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2200_DEBUG is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPWIRELESS is not set
-# CONFIG_IPX is not set
-# CONFIG_IRDA is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-# CONFIG_ISDN_AUDIO is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-# CONFIG_ISDN_DIVERSION is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_DRV_EICON is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_DRV_HISAX is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_LOOP is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_TPAM is not set
-# CONFIG_ISDN_WITH_ABC is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWL3945 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWLCORE is not set
-# CONFIG_IWLWIFI is not set
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWMC3200TOP is not set
-# CONFIG_IXGB is not set
-# CONFIG_JBD2_DEBUG is not set
-# CONFIG_JBD_DEBUG is not set
-# CONFIG_JBD is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_ZLIB is not set
-CONFIG_JFFS2_LZMA=y
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_JME is not set
-CONFIG_JOLIET=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYS is not set
-# CONFIG_KGDB is not set
-# CONFIG_KMEMTRACE is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSM is not set
-# CONFIG_KSZ884X_PCI is not set
-# CONFIG_L2TP is not set
-# CONFIG_LANMEDIA is not set
-# CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_LBDAF=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_GPIO_PLATFORM=y
-# CONFIG_LEDS_LT3593 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_LIB80211_CRYPT_CCMP is not set
-# CONFIG_LIB80211_CRYPT_TKIP is not set
-# CONFIG_LIB80211_CRYPT_WEP is not set
-# CONFIG_LIB80211_DEBUG is not set
-# CONFIG_LIB80211 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LIBERTAS is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_LKDTM is not set
-# CONFIG_LLC2 is not set
-CONFIG_LLC=y
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_LOCKD is not set
-CONFIG_LOCKD_V4=y
-# CONFIG_LOCK_STAT is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_LOGFS is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGO is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LSF is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LTPC is not set
-# CONFIG_LXT_PHY is not set
-CONFIG_LZMA_COMPRESS=y
-CONFIG_LZMA_DECOMPRESS=y
-CCONFIG_MAC80211_DEFAULT_PS_VALUE=1
-CONFIG_MAC80211_DEFAULT_PS=y
-# CONFIG_MAC80211 is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MAC_PARTITION is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_MACVTAP is not set
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARKERS is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MD is not set
-# CONFIG_ME4000 is not set
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_MEILHAUS is not set
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_MFD_88PM8607 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_MC13783 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_SM501 is not set
-CONFIG_MFD_SUPPORT=y
-# CONFIG_MFD_TC35892 is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_WM831X is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MG_DISK is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MIGRATION is not set
-CONFIG_MII=y
-CONFIG_MINI_FO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_MIPS_FPU_EMU is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_MISDN_AVMFRITZ is not set
-# CONFIG_MISDN_HFCPCI is not set
-# CONFIG_MISDN_HFCUSB is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN is not set
-# CONFIG_MISDN_NETJET is not set
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MKISS is not set
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_CB710 is not set
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_MVSDIO is not set
-# CONFIG_MMC_S3C is not set
-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDRICOH_CS is not set
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_TEST is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_VIA_SDMMC is not set
-CONFIG_MMU=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MSDOS_FS is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_MYLOADER_PARTS is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_UBI is not set
-CONFIG_MTD=y
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_MV643XX_ETH is not set
-# CONFIG_MVSWITCH_PHY is not set
-# CONFIG_MWAVE is not set
-# CONFIG_MWL8K is not set
-# CONFIG_MYRI10GE is not set
-# CONFIG_N_GSM is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_NET_9P is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_SIMP is not set
-CONFIG_NET_ACT_SKBEDIT=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_FW is not set
-CONFIG_NET_CLS_IND=y
-# CONFIG_NET_CLS_ROUTE4 is not set
-# CONFIG_NET_CLS_RSVP6 is not set
-# CONFIG_NET_CLS_RSVP is not set
-# CONFIG_NET_CLS_TCINDEX is not set
-# CONFIG_NET_CLS_U32 is not set
-CONFIG_NET_CLS=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETDEBUG is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEVICES_MULTIQUEUE=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_DROP_MONITOR is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_NET_EMATCH_CMP is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_EMATCH_META is not set
-# CONFIG_NET_EMATCH_NBYTE is not set
-CONFIG_NET_EMATCH_STACK=32
-# CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_U32 is not set
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
-# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_TPROXY is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
-# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OSF is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
-CONFIG_NET_IPGRE_BROADCAST=y
-# CONFIG_NET_IPGRE is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_KEY is not set
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_NET_PCI=y
-# CONFIG_NET_PCMCIA is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NETPOLL is not set
-CONFIG_NET_RADIO=y
-# CONFIG_NETROM is not set
-# CONFIG_NET_SB1000 is not set
-# CONFIG_NET_SCH_ATM is not set
-# CONFIG_NET_SCH_CBQ is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_DSMARK is not set
-CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ESFQ is not set
-CONFIG_NET_SCH_ESFQ_NFCT=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_GRED is not set
-# CONFIG_NET_SCH_HFSC is not set
-# CONFIG_NET_SCH_HTB is not set
-# CONFIG_NET_SCH_INGRESS is not set
-# CONFIG_NET_SCH_MULTIQ is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_SCH_PRIO is not set
-# CONFIG_NET_SCH_RED is not set
-# CONFIG_NET_SCH_RR is not set
-# CONFIG_NET_SCH_SFQ is not set
-# CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_TEQL is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_WIRELESS_RTNETLINK=y
-CONFIG_NET_WIRELESS=y
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETXEN_NIC is not set
-CONFIG_NET=y
-# CONFIG_NEW_GPIO is not set
-CONFIG_NEW_LEDS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_NF_CONNTRACK_RTSP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_FTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
-# CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-# CONFIG_NF_NAT_RTSP is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NFS_ACL_SUPPORT is not set
-CONFIG_NFS_COMMON=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_NFSD_TCP=y
-# CONFIG_NFSD_V2_ACL is not set
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFTL is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_NL80211=y
-CONFIG_NLATTR=y
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# 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_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS 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_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_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_NORTEL_HERMES is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_NS83820 is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OC_ETM is not set
-# CONFIG_OCF_BENCH is not set
-# CONFIG_OCF_C7108 is not set
-# CONFIG_OCF_CRYPTOCTEON is not set
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFNHIPP is not set
-# CONFIG_OCF_HIFN is not set
-# CONFIG_OCF_IXP4XX is not set
-# CONFIG_OCF_KIRKWOOD is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OCF_OCFNULL is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_OCF_SAFE is not set
-# CONFIG_OCF_TALITOS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_ORION_WATCHDOG is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_PACKET_MMAP=y
-CONFIG_PACKET=y
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_QDI is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-# CONFIG_PATA_WINBOND_VLB is not set
-# CONFIG_PC300TOO is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCF8575 is not set
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCI_ATMEL is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCI_HERMES is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_LEGACY is not set
-# CONFIG_PCI_MSI is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_STUB is not set
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_ATMEL is not set
-# CONFIG_PCMCIA_DEBUG is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_HERMES is not set
-# CONFIG_PCMCIA_IOCTL is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_PCMCIA_LOAD_CIS is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_RAYCS is not set
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_PCMCIA_XIRCOM is not set
-# CONFIG_PCNET32 is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_PD6729 is not set
-# CONFIG_PDC_ADMA is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_PHONE is not set
-# CONFIG_PHONET is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-# CONFIG_PID_NS is not set
-# CONFIG_PLAN9AUTH is not set
-CONFIG_PLIST=y
-# CONFIG_PLX_HERMES is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PM is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-CONFIG_PPC4xx_GPIO=y
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-CONFIG_PPP_FILTER=y
-# CONFIG_PPP is not set
-# CONFIG_PPP_MPPE is not set
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPS is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_TINY_RCU=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_PRINTK=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_PROBE_INITRD_HEADER is not set
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROFILING is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_QEMU is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_QT2160 is not set
-# CONFIG_QUOTA is not set
-# CONFIG_R3964 is not set
-# CONFIG_R6040 is not set
-# CONFIG_R8169 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_RTRACK 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_RAID_ATTRS is not set
-CONFIG_RAMFS=y
-# CONFIG_RAMOOPS is not set
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RDC_17F3101X is not set
-# CONFIG_RD_GZIP is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
-# CONFIG_RDS is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_REDWOOD is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_RELAY is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_RFKILL_INPUT is not set
-# CONFIG_RFKILL is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_ROSE is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RT3070 is not set
-# CONFIG_RT3090 is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_PCF50606 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_RTC7301 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_HCTOSYS=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_RTL8187SE is not set
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8192U is not set
-# CONFIG_RTL8192SU is not set
-# CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366_SMI is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366RB_PHY is not set
-CONFIG_RT_MUTEXES=y
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_S2IO is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_SX4 is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_SC92031 is not set
-# CONFIG_SCC is not set
-# CONFIG_SCHED_BFS is not set
-CONFIG_SCHED_CFS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_DH is not set
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_ESP_CORE is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_MPT2SAS is not set
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PROC_FS=y
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECCOMP is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7473 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_HDAPS is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 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_LM93 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_M41T00 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=2
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SFI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_SHAPER is not set
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-# CONFIG_SIMPLE_GPIO is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_SKY2 is not set
-CONFIG_SLABINFO=y
-CONFIG_SLAB=y
-# CONFIG_SLHC is not set
-# CONFIG_SLICOSS is not set
-# CONFIG_SLIP is not set
-# CONFIG_SLOB is not set
-# CONFIG_SLOW_WORK_DEBUG is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_SMARTJOYPLUS_FF is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMP is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMI8330 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
-# CONFIG_SND_CS4236 is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DT019X is not set
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_ES968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_HWDEP is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGOIOX is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_ISA is not set
-# CONFIG_SND is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_LX6464ES is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_MIRO is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MPU401 is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_OPL3SA2 is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_OXYGEN is not set
-CONFIG_SND_PCI=y
-# CONFIG_SND_PCMCIA is not set
-# CONFIG_SND_PCM is not set
-# CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_RAWMIDI is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RTCTIMER is not set
-# CONFIG_SND_SB16 is not set
-# CONFIG_SND_SB8 is not set
-# CONFIG_SND_SBAWE is not set
-# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SGALAXY is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_TIMER is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
-CONFIG_SND_USB=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VIRTUOSO is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SONY_LAPTOP is not set
-# CONFIG_SOUND is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_DEBUG is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_GPIO_OLD is not set
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_SPI_ORION is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPINLOCK_TEST is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_LZMA=y
-CONFIG_SQUASHFS_SUPPORT_ZLIB=y
-# CONFIG_SQUASHFS_VMALLOC is not set
-# CONFIG_SQUASHFS_XATTRS is not set
-CONFIG_SQUASHFS=y
-# CONFIG_SSB_DEBUG is not set
-# CONFIG_SSB is not set
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB_SDIOHOST is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSFDC is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_STACKTRACE_SUPPORT=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_STAGING=y
-CONFIG_STANDALONE=y
-CONFIG_STDBINUTILS=y
-# CONFIG_STE10XP is not set
-CONFIG_STP=y
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_STRIP is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_SUNRPC_GSS is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_SUNRPC_REGISTER_V4 is not set
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SWAP=y
-# CONFIG_SWCONFIG is not set
-# CONFIG_SYNCLINK_CS is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_SYSFS=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYSVIPC=y
-# CONFIG_TPS6507X is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_TCIC is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_TEXTSEARCH_BM is not set
-# CONFIG_TEXTSEARCH_FSM is not set
-# CONFIG_TEXTSEARCH_KMP is not set
-CONFIG_TEXTSEARCH=y
-# CONFIG_THERMAL_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TIFM_CORE is not set
-# CONFIG_TIGON3 is not set
-CONFIG_TIMERFD=y
-# CONFIG_TINY_SHMEM is not set
-# CONFIG_TIPC is not set
-# CONFIG_TLAN is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TMPFS_POSIX_ACL is not set
-CONFIG_TMPFS=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FILTER is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_S3C2410 is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANZPORT is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_TR is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_TUNER_TEA5761 is not set
-# CONFIG_TUN is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_UDF_FS is not set
-CONFIG_UDF_NLS=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_UFS_FS is not set
-# CONFIG_UIO is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_UNEVICTABLE_LRU is not set
-# CONFIG_UNION_MOUNT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_UNIX=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATMEL is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_BELKIN=y
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_CPC is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_DABUSB is not set
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_ET61X251 is not set
-CONFIG_USB_EZUSB=y
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_USB_HIDDEV is not set
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-CONFIG_USB_HIDINPUT=y
-# CONFIG_USB_HID is not set
-# CONFIG_USB_HSO is not set
-# CONFIG_USB_HWA_HCD is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_IP_COMMON is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KC2190 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_EEM is not set
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_INT51X1 is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_OHCI_HCD_PCI is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF is not set
-# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
-# CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_PWC_INPUT_EVDEV is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
-# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_CP2101 is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_OPTION is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_STKWEBCAM is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_FREECOM=y
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_SIERRA is not set
-CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_TMC is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_UEAGLEATM is not set
-# CONFIG_USB_ULPI is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_VICAM is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-# CONFIG_USB_VIDEO_CLASS is not set
-# CONFIG_USB_VST is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_UWB is not set
-# CONFIG_VETH is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_CX2341X is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_IR_I2C is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_SAA6588 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA7111 is not set
-# CONFIG_VIDEO_SAA7114 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_TCM825X is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-# CONFIG_VIDEO_V4L1 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_VPX3220 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIRQ_DEBUG is not set
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_VME_BUS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_VMSPLIT_1G is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMXNET3 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VT is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_W1_CON is not set
-# CONFIG_W1 is not set
-# CONFIG_W1_MASTER_DS1WM is not set
-# CONFIG_W1_MASTER_DS2482 is not set
-# CONFIG_W1_MASTER_DS2490 is not set
-# CONFIG_W1_MASTER_GPIO is not set
-# CONFIG_W1_MASTER_MATROX is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
-# CONFIG_W1_SLAVE_DS2431 is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
-# CONFIG_W1_SLAVE_DS2760 is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_WAN is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_WANXL is not set
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG=y
-# CONFIG_WDTPCI is not set
-# CONFIG_WIMAX is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS=y
-CONFIG_WLAN_80211=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN=y
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_WR_PPMC is not set
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-# CONFIG_X25 is not set
-# CONFIG_XFRM_IPCOMP is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
-CONFIG_XFRM=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_YAM is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_YENTA is not set
-# CONFIG_YENTA_O2 is not set
-# CONFIG_YENTA_RICOH is not set
-# CONFIG_YENTA_TI is not set
-# CONFIG_YENTA_TOSHIBA is not set
-# CONFIG_ZD1211RW_DEBUG is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_ZEROPLUS_FF is not set
-# CONFIG_ZISOFS_FS is not set
-CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ZONE_DMA=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY=""
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
deleted file mode 100644
index 4dc637471c..0000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/char/gpio_dev.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * character device wrapper for generic gpio layer
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
- *
- * Feedback, Bugs...  blogic@openwrt.org
- *
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/atomic.h>
-#include <linux/init.h>
-#include <linux/genhd.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio_dev.h>
-
-#define DRVNAME		"gpiodev"
-#define DEVNAME		"gpio"
-
-static int dev_major;
-static unsigned int gpio_access_mask;
-static struct class *gpiodev_class;
-
-/* Counter is 1, if the device is not opened and zero (or less) if opened. */
-static atomic_t gpio_open_cnt = ATOMIC_INIT(1);
-
-static int
-gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg)
-{
-	int retval = 0;
-
-	if (((1 << arg) & gpio_access_mask) != (1 << arg))
-	{
-		retval = -EINVAL;
-		goto out;
-	}
-
-	switch (cmd)
-	{
-	case GPIO_GET:
-		retval = gpio_get_value(arg);
-		break;
-
-	case GPIO_SET:
-		gpio_set_value(arg, 1);
-		break;
-
-	case GPIO_CLEAR:
-		gpio_set_value(arg, 0);
-		break;
-
-	case GPIO_DIR_IN:
-		gpio_direction_input(arg);
-		break;
-
-	case GPIO_DIR_OUT:
-		gpio_direction_output(arg, 0);
-		break;
-
-	default:
-		retval = -EINVAL;
-		break;
-	}
-
-out:
-	return retval;
-}
-
-static int
-gpio_open(struct inode *inode, struct file *file)
-{
-	int result = 0;
-	unsigned int dev_minor = MINOR(inode->i_rdev);
-
-	if (dev_minor != 0)
-	{
-		printk(KERN_ERR DRVNAME ": trying to access unknown minor device -> %d\n", dev_minor);
-		result = -ENODEV;
-		goto out;
-	}
-
-	/* FIXME: We should really allow multiple applications to open the device
-	 *        at the same time, as long as the apps access different IO pins.
-	 *        The generic gpio-registration functions can be used for that.
-	 *        Two new IOCTLs have to be introduced for that. Need to check userspace
-	 *        compatibility first. --mb */
-	if (!atomic_dec_and_test(&gpio_open_cnt)) {
-		atomic_inc(&gpio_open_cnt);
-		printk(KERN_ERR DRVNAME ": Device with minor ID %d already in use\n", dev_minor);
-		result = -EBUSY;
-		goto out;
-	}
-
-out:
-	return result;
-}
-
-static int
-gpio_close(struct inode * inode, struct file * file)
-{
-	smp_mb__before_atomic_inc();
-	atomic_inc(&gpio_open_cnt);
-
-	return 0;
-}
-
-struct file_operations gpio_fops = {
-	ioctl:		gpio_ioctl,
-	open:		gpio_open,
-	release:	gpio_close
-};
-
-static int
-gpio_probe(struct platform_device *dev)
-{
-	int result = 0;
-
-	dev_major = register_chrdev(0, DEVNAME, &gpio_fops);
-	if (!dev_major)
-	{
-		printk(KERN_ERR DRVNAME ": Error whilst opening %s \n", DEVNAME);
-		result = -ENODEV;
-		goto out;
-	}
-
-	gpiodev_class = class_create(THIS_MODULE, DRVNAME);
-	class_device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), NULL, DEVNAME);
-
-	printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
-
-	if (dev->num_resources != 1)
-	{
-		printk(KERN_ERR DRVNAME ": device may only have 1 resource\n");
-		result = -ENODEV;
-		goto out;
-	}
-
-	gpio_access_mask = dev->resource[0].start;
-
-	printk(KERN_INFO DRVNAME ": gpio platform device registered with access mask %08X\n", gpio_access_mask);
-out:
-	return result;
-}
-
-static int
-gpio_remove(struct platform_device *dev)
-{
-	unregister_chrdev(dev_major, DEVNAME);
-	return 0;
-}
-
-static struct
-platform_driver gpio_driver = {
-	.probe = gpio_probe,
-	.remove = gpio_remove,
-	.driver = {
-		.name = "GPIODEV",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init
-gpio_mod_init(void)
-{
-	int ret = platform_driver_register(&gpio_driver);
-	if (ret)
-		printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
-
-	return ret;
-}
-
-static void __exit
-gpio_mod_exit(void)
-{
-	platform_driver_unregister(&gpio_driver);
-}
-
-module_init (gpio_mod_init);
-module_exit (gpio_mod_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("John Crispin / OpenWrt");
-MODULE_DESCRIPTION("Character device for for generic gpio api");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c
deleted file mode 100644
index 83a8178340..0000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/input/misc/gpio_buttons.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Driver for buttons on GPIO lines not capable of generating interrupts
- *
- *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: /drivers/input/misc/cobalt_btns.c
- *	Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
- *
- *  also was based on: /drivers/input/keyboard/gpio_keys.c
- *	Copyright 2005 Phil Blundell
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-
-#include <linux/gpio_buttons.h>
-
-#include <asm/gpio.h>
-
-#define DRV_NAME	"gpio-buttons"
-#define DRV_VERSION	"0.1.1"
-#define PFX		DRV_NAME ": "
-
-struct gpio_buttons_dev {
-	struct input_polled_dev *poll_dev;
-	struct gpio_buttons_platform_data *pdata;
-};
-
-static void gpio_buttons_poll(struct input_polled_dev *dev)
-{
-	struct gpio_buttons_dev *bdev = dev->private;
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	struct input_dev *input = dev->input;
-	int i;
-
-	for (i = 0; i < bdev->pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int type = button->type ?: EV_KEY;
-		int state;
-
-		state = gpio_get_value(button->gpio) ? 1 : 0;
-		state ^= button->active_low;
-
-		if (state) {
-			button->count++;
-		} else {
-			if (button->count >= button->threshold) {
-				input_event(input, type, button->code, 1);
-				input_sync(input);
-			}
-			button->count = 0;
-		}
-
-		if (button->count == button->threshold) {
-			input_event(input, type, button->code, 0);
-			input_sync(input);
-		}
-	}
-}
-
-static int __devinit gpio_buttons_probe(struct platform_device *pdev)
-{
-	struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data;
-	struct gpio_buttons_dev *bdev;
-	struct input_polled_dev *poll_dev;
-	struct input_dev *input;
-	int error, i;
-
-
-	if (!pdata)
-		return -ENXIO;
-
-	bdev = kzalloc(sizeof(*bdev), GFP_KERNEL);
-	if (!bdev) {
-		printk(KERN_ERR DRV_NAME "no memory for device\n");
-		return -ENOMEM;
-	}
-
-	poll_dev = input_allocate_polled_device();
-	if (!poll_dev) {
-		printk(KERN_ERR DRV_NAME "no memory for polled device\n");
-		error = -ENOMEM;
-		goto err_free_bdev;
-	}
-
-	poll_dev->private = bdev;
-	poll_dev->poll = gpio_buttons_poll;
-	poll_dev->poll_interval = pdata->poll_interval;
-
-	input = poll_dev->input;
-
-	input->evbit[0] = BIT(EV_KEY);
-	input->name = pdev->name;
-	input->phys = "gpio-buttons/input0";
-	input->dev.parent = &pdev->dev;
-
-	input->id.bustype = BUS_HOST;
-	input->id.vendor = 0x0001;
-	input->id.product = 0x0001;
-	input->id.version = 0x0100;
-
-	for (i = 0; i < pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int gpio = button->gpio;
-		unsigned int type = button->type ?: EV_KEY;
-
-		error = gpio_request(gpio, button->desc ?
-				button->desc : DRV_NAME);
-		if (error) {
-			printk(KERN_ERR PFX "unable to claim gpio %u, "
-				"error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		error = gpio_direction_input(gpio);
-		if (error) {
-			printk(KERN_ERR PFX "unable to set direction on "
-				"gpio %u, error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		input_set_capability(input, type, button->code);
-		button->count = 0;
-	}
-
-	bdev->poll_dev = poll_dev;
-	bdev->pdata = pdata;
-	platform_set_drvdata(pdev, bdev);
-
-	error = input_register_polled_device(poll_dev);
-	if (error) {
-		printk(KERN_ERR PFX "unable to register polled device, "
-			"error %d\n", error);
-		goto err_free_gpio;
-	}
-
-	return 0;
-
-err_free_gpio:
-	for (i = i - 1; i >= 0; i--)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(poll_dev);
-
-err_free_bdev:
-	kfree(bdev);
-
-	platform_set_drvdata(pdev, NULL);
-	return error;
-}
-
-static int __devexit gpio_buttons_remove(struct platform_device *pdev)
-{
-	struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev);
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	int i;
-
-	input_unregister_polled_device(bdev->poll_dev);
-
-	for (i = 0; i < pdata->nbuttons; i++)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(bdev->poll_dev);
-
-	kfree(bdev);
-	platform_set_drvdata(pdev, NULL);
-
-	return 0;
-}
-
-static struct platform_driver gpio_buttons_driver = {
-	.probe	= gpio_buttons_probe,
-	.remove	= __devexit_p(gpio_buttons_remove),
-	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
-	},
-};
-
-static int __init gpio_buttons_init(void)
-{
-	printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n");
-	return platform_driver_register(&gpio_buttons_driver);
-}
-
-static void __exit gpio_buttons_exit(void)
-{
-	platform_driver_unregister(&gpio_buttons_driver);
-}
-
-module_init(gpio_buttons_init);
-module_exit(gpio_buttons_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_VERSION(DRV_VERSION);
-MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs");
-
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c
deleted file mode 100644
index 92995e40cf..0000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-default-on.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * LED Kernel Default ON Trigger
- *
- * Copyright 2008 Nick Forbes <nick.forbes@incepta.com>
- *
- * Based on Richard Purdie's ledtrig-timer.c.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/leds.h>
-#include "leds.h"
-
-static void defon_trig_activate(struct led_classdev *led_cdev)
-{
-	led_set_brightness(led_cdev, LED_FULL);
-}
-
-static struct led_trigger defon_led_trigger = {
-	.name     = "default-on",
-	.activate = defon_trig_activate,
-};
-
-static int __init defon_trig_init(void)
-{
-	return led_trigger_register(&defon_led_trigger);
-}
-
-static void __exit defon_trig_exit(void)
-{
-	led_trigger_unregister(&defon_led_trigger);
-}
-
-module_init(defon_trig_init);
-module_exit(defon_trig_exit);
-
-MODULE_AUTHOR("Nick Forbes <nick.forbes@incepta.com>");
-MODULE_DESCRIPTION("Default-ON LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c
deleted file mode 100644
index cb47480a36..0000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-morse.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- *  LED Morse Trigger
- *
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: drivers/led/ledtrig-timer.c
- *	Copyright 2005-2006 Openedhand Ltd.
- *	Author: Richard Purdie <rpurdie@openedhand.com>
- *
- *  also based on the patch '[PATCH] 2.5.59 morse code panics' posted
- *  in the LKML by Tomas Szepe at Thu, 30 Jan 2003
- *	Copyright (C) 2002 Andrew Rodland <arodland@noln.com>
- *	Copyright (C) 2003 Tomas Szepe <szepe@pinerecords.com>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-
-#include "leds.h"
-
-#define MORSE_DELAY_BASE	(HZ/2)
-
-#define MORSE_STATE_BLINK_START	0
-#define MORSE_STATE_BLINK_STOP	1
-
-#define MORSE_DIT_LEN	1
-#define MORSE_DAH_LEN	3
-#define MORSE_SPACE_LEN	7
-
-struct morse_trig_data {
-	unsigned long delay;
-	char *msg;
-
-	unsigned char morse;
-	unsigned char state;
-	char *msgpos;
-	struct timer_list timer;
-};
-
-const unsigned char morsetable[] = {
-	0122, 0, 0310, 0, 0, 0163,				/* "#$%&' */
-	055, 0155, 0, 0, 0163, 0141, 0152, 0051, 		/* ()*+,-./ */
-	077, 076, 074, 070, 060, 040, 041, 043, 047, 057,	/* 0-9 */
-	0107, 0125, 0, 0061, 0, 0114, 0, 			/* :;<=>?@ */
-	006, 021, 025, 011, 002, 024, 013, 020, 004,		/* A-I */
-	036, 015, 022, 007, 005, 017, 026, 033, 012,		/* J-R */
-	010, 003, 014, 030, 016, 031, 035, 023,			/* S-Z */
-	0, 0, 0, 0, 0154					/* [\]^_ */
-};
-
-static inline unsigned char tomorse(char c) {
-	if (c >= 'a' && c <= 'z')
-		c = c - 'a' + 'A';
-	if (c >= '"' && c <= '_') {
-		return morsetable[c - '"'];
-	} else
-		return 0;
-}
-
-static inline unsigned long dit_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DIT_LEN*morse_data->delay;
-}
-
-static inline unsigned long dah_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DAH_LEN*morse_data->delay;
-}
-
-static inline unsigned long space_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_SPACE_LEN*morse_data->delay;
-}
-
-static void morse_timer_function(unsigned long data)
-{
-	struct led_classdev *led_cdev = (struct led_classdev *)data;
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	unsigned long brightness = LED_OFF;
-	unsigned long delay = 0;
-
-	if (!morse_data->msg)
-		goto set_led;
-
-	switch (morse_data->state) {
-	case MORSE_STATE_BLINK_START:
-		/* Starting a new blink.  We have a valid code in morse. */
-		delay = (morse_data->morse & 001) ? dah_len(morse_data):
-			dit_len(morse_data);
-		brightness = LED_FULL;
-		morse_data->state = MORSE_STATE_BLINK_STOP;
-		morse_data->morse >>= 1;
-		break;
-	case MORSE_STATE_BLINK_STOP:
-		/* Coming off of a blink. */
-		morse_data->state = MORSE_STATE_BLINK_START;
-
-		if (morse_data->morse > 1) {
-			/* Not done yet, just a one-dit pause. */
-			delay = dit_len(morse_data);
-			break;
-		}
-
-		/* Get a new char, figure out how much space. */
-		/* First time through */
-		if (!morse_data->msgpos)
-			morse_data->msgpos = (char *)morse_data->msg;
-
-		if (!*morse_data->msgpos) {
-			/* Repeating */
-			morse_data->msgpos = (char *)morse_data->msg;
-			delay = space_len(morse_data);
-		} else {
-			/* Inter-letter space */
-			delay = dah_len(morse_data);
-		}
-
-		if (!(morse_data->morse = tomorse(*morse_data->msgpos))) {
-			delay = space_len(morse_data);
-			/* And get us back here */
-			morse_data->state = MORSE_STATE_BLINK_STOP;
-		}
-		morse_data->msgpos++;
-		break;
-	}
-
-	mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay));
-
-set_led:
-	led_set_brightness(led_cdev, brightness);
-}
-
-static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	sprintf(buf, "%lu\n", morse_data->delay);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_delay_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *after;
-	unsigned long state = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-	int ret = -EINVAL;
-
-	if (*after && isspace(*after))
-		count++;
-
-	if (count == size) {
-		morse_data->delay = state;
-		mod_timer(&morse_data->timer, jiffies + 1);
-		ret = count;
-	}
-
-	return ret;
-}
-
-static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data->msg)
-		sprintf(buf, "<none>\n");
-	else
-		sprintf(buf, "%s\n", morse_data->msg);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_msg_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *m;
-
-	m = kmalloc(size, GFP_KERNEL);
-	if (!m)
-		return -ENOMEM;
-
-	memcpy(m,buf,size);
-	m[size]='\0';
-
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	morse_data->msg = m;
-	morse_data->msgpos = NULL;
-	morse_data->state = MORSE_STATE_BLINK_STOP;
-
-	mod_timer(&morse_data->timer, jiffies + 1);
-
-	return size;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-static ssize_t morse_delay_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	device_create_file(leddev->dev, &dev_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	device_remove_file(leddev->dev, &dev_attr_ ## attr)
-
-#else
-static ssize_t morse_delay_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct class_device *dev, const char *buf,
-		size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct class_device *dev, const char *buf,
-				size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr)
-
-#endif
-
-static void morse_trig_activate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data;
-	int rc;
-
-	morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL);
-	if (!morse_data)
-		return;
-
-	morse_data->delay = MORSE_DELAY_BASE;
-	init_timer(&morse_data->timer);
-	morse_data->timer.function = morse_timer_function;
-	morse_data->timer.data = (unsigned long)led_cdev;
-
-	rc = led_device_create_file(led_cdev, delay);
-	if (rc) goto err;
-
-	rc = led_device_create_file(led_cdev, message);
-	if (rc) goto err_delay;
-
-	led_cdev->trigger_data = morse_data;
-
-	return;
-
-err_delay:
-	led_device_remove_file(led_cdev, delay);
-err:
-	kfree(morse_data);
-}
-
-static void morse_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data)
-		return;
-
-	led_device_remove_file(led_cdev, message);
-	led_device_remove_file(led_cdev, delay);
-
-	del_timer_sync(&morse_data->timer);
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	kfree(morse_data);
-}
-
-static struct led_trigger morse_led_trigger = {
-	.name		= "morse",
-	.activate	= morse_trig_activate,
-	.deactivate	= morse_trig_deactivate,
-};
-
-static int __init morse_trig_init(void)
-{
-	return led_trigger_register(&morse_led_trigger);
-}
-
-static void __exit morse_trig_exit(void)
-{
-	led_trigger_unregister(&morse_led_trigger);
-}
-
-module_init(morse_trig_init);
-module_exit(morse_trig_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION("Morse LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c
deleted file mode 100644
index 285d0f795c..0000000000
--- a/target/linux/generic-2.6/files-2.6.25/drivers/leds/ledtrig-netdev.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * LED Kernel Netdev Trigger
- *
- * Toggles the LED to reflect the link and traffic state of a named net device
- *
- * Copyright 2007 Oliver Jowett <oliver@opencloud.com>
- *
- * Derived from ledtrig-timer.c which is:
- *  Copyright 2005-2006 Openedhand Ltd.
- *  Author: Richard Purdie <rpurdie@openedhand.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/netdevice.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-#include "leds.h"
-
-/*
- * Configurable sysfs attributes:
- *
- * device_name - network device name to monitor
- *
- * interval - duration of LED blink, in milliseconds
- *
- * mode - either "none" (LED is off) or a space separated list of one or more of:
- *   link: LED's normal state reflects whether the link is up (has carrier) or not
- *   tx:   LED blinks on transmitted data
- *   rx:   LED blinks on receive data
- * 
- * Some suggestions:
- *
- *  Simple link status LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo link >someled/mode
- *
- *  Ethernet-style link/activity LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo "link tx rx" >someled/mode
- *
- *  Modem-style tx/rx LEDs:
- *  $ echo netdev >led1/trigger
- *  $ echo ppp0 >led1/device_name
- *  $ echo tx >led1/mode
- *  $ echo netdev >led2/trigger
- *  $ echo ppp0 >led2/device_name
- *  $ echo rx >led2/mode
- *
- */
-
-#define MODE_LINK 1
-#define MODE_TX   2
-#define MODE_RX   4
-
-struct led_netdev_data {
-	rwlock_t lock;
-	
-	struct timer_list timer;
-	struct notifier_block notifier;	
-	
-	struct led_classdev *led_cdev;
-	struct net_device *net_dev;
-	
-	char device_name[IFNAMSIZ];
-	unsigned interval;
-	unsigned mode;
-	unsigned link_up;
-	unsigned last_activity;
-};
-
-static void set_baseline_state(struct led_netdev_data *trigger_data)
-{  
-	if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up)
-		led_set_brightness(trigger_data->led_cdev, LED_FULL);
-	else
-		led_set_brightness(trigger_data->led_cdev, LED_OFF);
-	
-	if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up)
-		mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-	else
-		del_timer(&trigger_data->timer);    
-}  
-
-static ssize_t led_device_name_show(struct device *dev,
-				    struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%s\n", trigger_data->device_name);
-	read_unlock(&trigger_data->lock);
-	
-	return strlen(buf) + 1;
-}
-  
-static ssize_t led_device_name_store(struct device *dev, 
-				     struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	if (size < 0 || size >= IFNAMSIZ)
-		return -EINVAL;
-	
-	write_lock(&trigger_data->lock);
-
-	strcpy(trigger_data->device_name, buf);
-	if (size > 0 && trigger_data->device_name[size-1] == '\n')
-		trigger_data->device_name[size-1] = 0;
-	
-	if (trigger_data->device_name[0] != 0) {
-		/* check for existing device to update from */
-		trigger_data->net_dev = dev_get_by_name(trigger_data->device_name);
-		if (trigger_data->net_dev != NULL)
-			trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
-		set_baseline_state(trigger_data); /* updates LEDs, may start timers */
-	}
-	
-	write_unlock(&trigger_data->lock);	
-	return size;
-}
-
-static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store);
-
-static ssize_t led_mode_show(struct device *dev,
-			     struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	
-	if (trigger_data->mode == 0) {
-		strcpy(buf, "none\n");
-	} else {
-		if (trigger_data->mode & MODE_LINK) 
-			strcat(buf, "link ");
-		if (trigger_data->mode & MODE_TX)
-			strcat(buf, "tx ");
-		if (trigger_data->mode & MODE_RX)
-			strcat(buf, "rx ");
-		strcat(buf, "\n");
-	}
-	
-	read_unlock(&trigger_data->lock);	
-
-	return strlen(buf)+1;
-}
-
-static ssize_t led_mode_store(struct device *dev, 
-			      struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;	
-	char copybuf[1024];
-	int new_mode = -1;
-	char *p, *token;
-
-	/* take a copy since we don't want to trash the inbound buffer when using strsep */
-	strncpy(copybuf, buf, sizeof(copybuf));
-	copybuf[1023] = 0;
-	p = copybuf;
-	
-	while ((token = strsep(&p, " \t\n")) != NULL) {
-		if (!*token)
-			continue;
-		
-		if (new_mode == -1)
-			new_mode = 0;
-		
-		if (!strcmp(token, "none"))
-			new_mode = 0;
-		else if (!strcmp(token, "tx"))
-			new_mode |= MODE_TX;
-		else if (!strcmp(token, "rx"))
-			new_mode |= MODE_RX;
-		else if (!strcmp(token, "link"))
-			new_mode |= MODE_LINK;
-		else
-			return -EINVAL;
-	}
-	
-	if (new_mode == -1)
-		return -EINVAL;
-	
-	write_lock(&trigger_data->lock);	
-	trigger_data->mode = new_mode;  
-	set_baseline_state(trigger_data);
-	write_unlock(&trigger_data->lock);
-	
-	return size;
-}
-
-static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store);
-
-static ssize_t led_interval_show(struct device *dev, 
-				 struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval));
-	read_unlock(&trigger_data->lock);
-	
-	return strlen(buf) + 1;
-}
-
-static ssize_t led_interval_store(struct device *dev, 
-				  struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	int ret = -EINVAL;
-	char *after;
-	unsigned long value = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-
-	if (*after && isspace(*after))
-		count++;
-
-	/* impose some basic bounds on the timer interval */
-	if (count == size && value >= 5 && value <= 10000) {
-		write_lock(&trigger_data->lock);
-		trigger_data->interval = msecs_to_jiffies(value);
-		set_baseline_state(trigger_data); // resets timer
-		write_unlock(&trigger_data->lock);
-		ret = count;
-	}
-	
-	return ret;
-}
-
-static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store);
-
-static int netdev_trig_notify(struct notifier_block *nb,
-			      unsigned long evt,
-			      void *dv)
-{
-	struct net_device *dev = dv;
-	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
-	
-	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
-		return NOTIFY_DONE;
-	
-	write_lock(&trigger_data->lock);
-
-	if (strcmp(dev->name, trigger_data->device_name))
-		goto done;
-	
-	if (evt == NETDEV_REGISTER) {
-		if (trigger_data->net_dev != NULL)
-			dev_put(trigger_data->net_dev);
-		dev_hold(dev);
-		trigger_data->net_dev = dev;
-		trigger_data->link_up = 0;
-		goto done;
-	}
-	
-	if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) {
-		dev_put(trigger_data->net_dev);
-		trigger_data->net_dev = NULL;
-		goto done;
-	}
-	
-	/* UP / DOWN / CHANGE */
-	
-	trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev));
-	set_baseline_state(trigger_data);
-
-done:
-	write_unlock(&trigger_data->lock);  
-	return NOTIFY_DONE;
-}
-
-/* here's the real work! */
-static void netdev_trig_timer(unsigned long arg)
-{
-	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
-	struct net_device_stats *dev_stats;
-	unsigned new_activity;
-	
-	write_lock(&trigger_data->lock);
-    
-	if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) {
-		/* we don't need to do timer work, just reflect link state. */
-		led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
-		goto no_restart;
-	}
-	
-	dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev);
-	new_activity =
-		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
-		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
-      
-	if (trigger_data->mode & MODE_LINK) {
-		/* base state is ON (link present) */
-		/* if there's no link, we don't get this far and the LED is off */
-		
-		/* OFF -> ON always */
-		/* ON -> OFF on activity */
-		if (trigger_data->led_cdev->brightness == LED_OFF) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		}
-	} else {
-		/* base state is OFF */
-		/* ON -> OFF always */
-		/* OFF -> ON on activity */
-		if (trigger_data->led_cdev->brightness == LED_FULL) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		}
-	}
-	
-	trigger_data->last_activity = new_activity;
-	mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-
-no_restart:
-	write_unlock(&trigger_data->lock);
-}
-
-static void netdev_trig_activate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data;
-	int rc;
-
-	trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
-	if (!trigger_data)
-		return;
-
-	rwlock_init(&trigger_data->lock);
-
-	trigger_data->notifier.notifier_call = netdev_trig_notify;
-	trigger_data->notifier.priority = 10;
-
-	setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data);
-
-	trigger_data->led_cdev = led_cdev;
-	trigger_data->net_dev = NULL;
-	trigger_data->device_name[0] = 0;
-	
-	trigger_data->mode = 0;
-	trigger_data->interval = msecs_to_jiffies(50);
-	trigger_data->link_up = 0;
-	trigger_data->last_activity = 0;
-	
-	led_cdev->trigger_data = trigger_data;
-
-	rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
-	if (rc)
-		goto err_out;
-	rc = device_create_file(led_cdev->dev, &dev_attr_mode);
-	if (rc)
-		goto err_out_device_name;
-	rc = device_create_file(led_cdev->dev, &dev_attr_interval);
-	if (rc)
-		goto err_out_mode;
-
-	register_netdevice_notifier(&trigger_data->notifier);	
-	return;
-
-err_out_mode:
-	device_remove_file(led_cdev->dev, &dev_attr_mode);
-err_out_device_name:
-	device_remove_file(led_cdev->dev, &dev_attr_device_name);
-err_out:
-	led_cdev->trigger_data = NULL;
-	kfree(trigger_data);
-}
-
-static void netdev_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	if (trigger_data) {	  
-		unregister_netdevice_notifier(&trigger_data->notifier);
-
-		device_remove_file(led_cdev->dev, &dev_attr_device_name);
-		device_remove_file(led_cdev->dev, &dev_attr_mode);
-		device_remove_file(led_cdev->dev, &dev_attr_interval);
-
-		write_lock(&trigger_data->lock);
-		
-		if (trigger_data->net_dev) {
-			dev_put(trigger_data->net_dev);
-			trigger_data->net_dev = NULL;
-		}
-		
-		write_unlock(&trigger_data->lock);
-
-		del_timer_sync(&trigger_data->timer);
-
-		kfree(trigger_data);
-	}
-}
-
-static struct led_trigger netdev_led_trigger = {
-	.name     = "netdev",
-	.activate = netdev_trig_activate,
-	.deactivate = netdev_trig_deactivate,
-};
-
-static int __init netdev_trig_init(void)
-{
-	return led_trigger_register(&netdev_led_trigger);
-}
-
-static void __exit netdev_trig_exit(void)
-{
-	led_trigger_unregister(&netdev_led_trigger);
-}
-
-module_init(netdev_trig_init);
-module_exit(netdev_trig_exit);
-
-MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
-MODULE_DESCRIPTION("Netdev LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files/Documentation/pwm.txt b/target/linux/generic-2.6/files/Documentation/pwm.txt
deleted file mode 100644
index 2c41ca5867..0000000000
--- a/target/linux/generic-2.6/files/Documentation/pwm.txt
+++ /dev/null
@@ -1,260 +0,0 @@
-                       Generic PWM Device API
-
-                          February 1, 2010
-                            Bill Gatliff
-                        <bgat@billgatliff.com>
-
-
-
-The code in drivers/pwm and include/linux/pwm/ implements an API for
-applications involving pulse-width-modulation signals.  This document
-describes how the API implementation facilitates both PWM-generating
-devices, and users of those devices.
-
-
-
-Motivation
-
-The primary goals for implementing the "generic PWM API" are to
-consolidate the various PWM implementations within a consistent and
-redundancy-reducing framework, and to facilitate the use of
-hotpluggable PWM devices.
-
-Previous PWM-related implementations within the Linux kernel achieved
-their consistency via cut-and-paste, but did not need to (and didn't)
-facilitate more than one PWM-generating device within the system---
-hotplug or otherwise.  The Generic PWM Device API might be most
-appropriately viewed as an update to those implementations, rather
-than a complete rewrite.
-
-
-
-Challenges
-
-One of the difficulties in implementing a generic PWM framework is the
-fact that pulse-width-modulation applications involve real-world
-signals, which often must be carefully managed to prevent destruction
-of hardware that is linked to those signals.  A DC motor that
-experiences a brief interruption in the PWM signal controlling it
-might destructively overheat; it could suddenly change speed, losing
-synchronization with a sensor; it could even suddenly change direction
-or torque, breaking the mechanical device connected to it.
-
-(A generic PWM device framework is not directly responsible for
-preventing the above scenarios: that responsibility lies with the
-hardware designer, and the application and driver authors.  But it
-must to the greatest extent possible make it easy to avoid such
-problems).
-
-A generic PWM device framework must accommodate the substantial
-differences between available PWM-generating hardware devices, without
-becoming sub-optimal for any of them.
-
-Finally, a generic PWM device framework must be relatively
-lightweight, computationally speaking.  Some PWM users demand
-high-speed outputs, plus the ability to regulate those outputs
-quickly.  A device framework must be able to "keep up" with such
-hardware, while still leaving time to do real work.
-
-The Generic PWM Device API is an attempt to meet all of the above
-requirements.  At its initial publication, the API was already in use
-managing small DC motors, sensors and solenoids through a
-custom-designed, optically-isolated H-bridge driver.
-
-
-
-Functional Overview
-
-The Generic PWM Device API framework is implemented in
-include/linux/pwm/pwm.h and drivers/pwm/pwm.c.  The functions therein
-use information from pwm_device, pwm_channel and pwm_channel_config
-structures to invoke services in PWM peripheral device drivers.
-Consult drivers/pwm/atmel-pwm.c for an example driver.
-
-There are two classes of adopters of the PWM framework:
-
-  "Users" -- those wishing to employ the API merely to produce PWM
-  signals; once they have identified the appropriate physical output
-  on the platform in question, they don't care about the details of
-  the underlying hardware
-
-  "Driver authors" -- those wishing to bind devices that can generate
-  PWM signals to the Generic PWM Device API, so that the services of
-  those devices become available to users. Assuming the hardware can
-  support the needs of a user, driver authors don't care about the
-  details of the user's application
-
-Generally speaking, users will first invoke pwm_request() to obtain a
-handle to a PWM device.  They will then pass that handle to functions
-like pwm_duty_ns() and pwm_period_ns() to set the duty cycle and
-period of the PWM signal, respectively.  They will also invoke
-pwm_start() and pwm_stop() to turn the signal on and off.
-
-The Generic PWM API framework also provides a sysfs interface to PWM
-devices, which is adequate for basic application needs and testing.
-
-Driver authors fill out a pwm_device structure, which describes the
-capabilities of the PWM hardware being constructed--- including the
-number of distinct output "channels" the peripheral offers.  They then
-invoke pwm_register() (usually from within their device's probe()
-handler) to make the PWM API aware of their device.  The framework
-will call back to the methods described in the pwm_device structure as
-users begin to configure and utilize the hardware.
-
-Note that PWM signals can be produced by a variety of peripherals,
-beyond the true "PWM hardware" offered by many system-on-chip devices.
-Other possibilities include timer/counters with compare-match
-capabilities, carefully-programmed synchronous serial ports
-(e.g. SPI), and GPIO pins driven by kernel interval timers.  With a
-proper pwm_device structure, these devices and pseudo-devices can all
-be accommodated by the Generic PWM Device API framework.
-
-
-
-Using the API to Generate PWM Signals -- Basic Functions for Users
-
-
-pwm_request() -- Returns a pwm_channel pointer, which is subsequently
-passed to the other user-related PWM functions.  Once requested, a PWM
-channel is marked as in-use and subsequent requests prior to
-pwm_free() will fail.
-
-The names used to refer to PWM devices are defined by driver authors.
-Typically they are platform device bus identifiers, and this
-convention is encouraged for consistency.
-
-
-pwm_free() -- Marks a PWM channel as no longer in use.  The PWM device
-is stopped before it is released by the API.
-
-
-pwm_period_ns() -- Specifies the PWM signal's period, in nanoseconds.
-
-
-pwm_duty_ns() -- Specifies the PWM signal's active duration, in nanoseconds.
-
-
-pwm_duty_percent() -- Specifies the PWM signal's active duration, as a
-percentage of the current period of the signal.  NOTE: this value is
-not recalculated if the period of the signal is subsequently changed.
-
-
-pwm_start(), pwm_stop() -- Turns the PWM signal on and off.  Except
-where stated otherwise by a driver author, signals are stopped at the
-end of the current period, at which time the output is set to its
-inactive state.
-
-
-pwm_polarity() -- Defines whether the PWM signal output's active
-region is "1" or "0".  A 10% duty-cycle, polarity=1 signal will
-conventionally be at 5V (or 3.3V, or 1000V, or whatever the platform
-hardware does) for 10% of the period.  The same configuration of a
-polarity=0 signal will be at 5V (or 3.3V, or ...) for 90% of the
-period.
-
-
-
-Using the API to Generate PWM Signals -- Advanced Functions
-
-
-pwm_config() -- Passes a pwm_channel_config structure to the
-associated device driver.  This function is invoked by pwm_start(),
-pwm_duty_ns(), etc. and is one of two main entry points to the PWM
-driver for the hardware being used.  The configuration change is
-guaranteed atomic if multiple configuration changes are specified.
-This function might sleep, depending on what the device driver has to
-do to satisfy the request.  All PWM device drivers must support this
-entry point.
-
-
-pwm_config_nosleep() -- Passes a pwm_channel_config structure to the
-associated device driver.  If the driver must sleep in order to
-implement the requested configuration change, -EWOULDBLOCK is
-returned.  Users may call this function from interrupt handlers, for
-example.  This is the other main entry point into the PWM hardware
-driver, but not all device drivers support this entry point.
-
-
-pwm_synchronize(), pwm_unsynchronize() -- "Synchronizes" two or more
-PWM channels, if the underlying hardware permits.  (If it doesn't, the
-framework facilitates emulating this capability but it is not yet
-implemented).  Synchronized channels will start and stop
-simultaneously when any single channel in the group is started or
-stopped.  Use pwm_unsynchronize(..., NULL) to completely detach a
-channel from any other synchronized channels.  By default, all PWM
-channels are unsynchronized.
-
-
-pwm_set_handler() -- Defines an end-of-period callback.  The indicated
-function will be invoked in a worker thread at the end of each PWM
-period, and can subsequently invoke pwm_config(), etc.  Must be used
-with extreme care for high-speed PWM outputs.  Set the handler
-function to NULL to un-set the handler.
-
-
-
-Implementing a PWM Device API Driver -- Functions for Driver Authors
-
-
-Fill out the appropriate fields in a pwm_device structure, and submit
-to pwm_register():
-
-
-bus_id -- the plain-text name of the device.  Users will bind to a
-channel on the device using this name plus the channel number.  For
-example, the Atmel PWMC's bus_id is "atmel_pwmc", the same as used by
-the platform device driver (recommended).  The first device registered
-thereby receives bus_id "atmel_pwmc.0", which is what you put in
-pwm_device.bus_id.  Channels are then named "atmel_pwmc.0:[0-3]".
-(Hint: just use pdev->dev.bus_id in your probe() method).
-
-
-nchan -- the number of distinct output channels provided by the device.
-
-
-request -- (optional) Invoked each time a user requests a channel.
-Use to turn on clocks, clean up register states, etc.  The framework
-takes care of device locking/unlocking; you will see only successful
-requests.
-
-
-free -- (optional) Callback for each time a user relinquishes a
-channel.  The framework will have already stopped, unsynchronized and
-un-handled the channel.  Use to turn off clocks, etc. as necessary.
-
-
-synchronize, unsynchronize -- (optional) Callbacks to
-synchronize/unsynchronize channels.  Some devices provide this
-capability in hardware; for others, it can be emulated (see
-atmel_pwmc.c's sync_mask for an example).
-
-
-set_callback -- (optional) Invoked when a user requests a handler.  If
-the hardware supports an end-of-period interrupt, invoke the function
-indicated during your interrupt handler.  The callback function itself
-is always internal to the API, and does not map directly to the user's
-callback function.
-
-
-config -- Invoked to change the device configuration, always from a
-sleep-capable context.  All the changes indicated must be performed
-atomically, ideally synchronized to an end-of-period event (so that
-you avoid short or long output pulses).  You may sleep, etc. as
-necessary within this function.
-
-
-config_nosleep -- (optional) Invoked to change device configuration
-from within a context that is not allowed to sleep.  If you cannot
-perform the requested configuration changes without sleeping, return
--EWOULDBLOCK.
-
-
-
-Acknowledgements
-
-
-The author expresses his gratitude to the countless developers who
-have reviewed and submitted feedback on the various versions of the
-Generic PWM Device API code, and those who have submitted drivers and
-applications that use the framework.  You know who you are.  ;)
-
diff --git a/target/linux/generic-2.6/files/arch/mips/fw/myloader/Makefile b/target/linux/generic-2.6/files/arch/mips/fw/myloader/Makefile
deleted file mode 100644
index 34acfd01cc..0000000000
--- a/target/linux/generic-2.6/files/arch/mips/fw/myloader/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the Compex's MyLoader support on MIPS architecture
-#
-
-lib-y += myloader.o
diff --git a/target/linux/generic-2.6/files/arch/mips/fw/myloader/myloader.c b/target/linux/generic-2.6/files/arch/mips/fw/myloader/myloader.c
deleted file mode 100644
index a26f9ad3fd..0000000000
--- a/target/linux/generic-2.6/files/arch/mips/fw/myloader/myloader.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Compex's MyLoader specific prom routines
- *
- *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/string.h>
-
-#include <asm/addrspace.h>
-#include <asm/fw/myloader/myloader.h>
-
-#define SYS_PARAMS_ADDR		KSEG1ADDR(0x80000800)
-#define BOARD_PARAMS_ADDR	KSEG1ADDR(0x80000A00)
-#define PART_TABLE_ADDR		KSEG1ADDR(0x80000C00)
-#define BOOT_PARAMS_ADDR	KSEG1ADDR(0x80000E00)
-
-static struct myloader_info myloader_info __initdata;
-static int myloader_found __initdata;
-
-struct myloader_info * __init myloader_get_info(void)
-{
-	struct mylo_system_params *sysp;
-	struct mylo_board_params *boardp;
-	struct mylo_partition_table *parts;
-
-	if (myloader_found)
-		return &myloader_info;
-
-	sysp = (struct mylo_system_params *)(SYS_PARAMS_ADDR);
-	boardp = (struct mylo_board_params *)(BOARD_PARAMS_ADDR);
-	parts = (struct mylo_partition_table *)(PART_TABLE_ADDR);
-
-	printk(KERN_DEBUG "MyLoader: sysp=%08x, boardp=%08x, parts=%08x\n",
-		sysp->magic, boardp->magic, parts->magic);
-
-	/* Check for some magic numbers */
-	if (sysp->magic != MYLO_MAGIC_SYS_PARAMS ||
-	    boardp->magic != MYLO_MAGIC_BOARD_PARAMS ||
-	    le32_to_cpu(parts->magic) != MYLO_MAGIC_PARTITIONS)
-		return NULL;
-
-	printk(KERN_DEBUG "MyLoader: id=%04x:%04x, sub_id=%04x:%04x\n",
-		sysp->vid, sysp->did, sysp->svid, sysp->sdid);
-
-	myloader_info.vid = sysp->vid;
-	myloader_info.did = sysp->did;
-	myloader_info.svid = sysp->svid;
-	myloader_info.sdid = sysp->sdid;
-
-	memcpy(myloader_info.macs, boardp->addr, sizeof(myloader_info.macs));
-
-	myloader_found = 1;
-
-	return &myloader_info;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/Config.in b/target/linux/generic-2.6/files/crypto/ocf/Config.in
deleted file mode 100644
index d722cba299..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################################################################
-
-mainmenu_option next_comment
-comment 'OCF Configuration'
-tristate 'OCF (Open Cryptograhic Framework)' CONFIG_OCF_OCF
-dep_mbool '  enable fips RNG checks (fips check on RNG data before use)' \
-				CONFIG_OCF_FIPS $CONFIG_OCF_OCF
-dep_mbool '  enable harvesting entropy for /dev/random' \
-				CONFIG_OCF_RANDOMHARVEST $CONFIG_OCF_OCF
-dep_tristate '  cryptodev (user space support)' \
-				CONFIG_OCF_CRYPTODEV $CONFIG_OCF_OCF
-dep_tristate '  cryptosoft (software crypto engine)' \
-				CONFIG_OCF_CRYPTOSOFT $CONFIG_OCF_OCF
-dep_tristate '  safenet (HW crypto engine)' \
-				CONFIG_OCF_SAFE $CONFIG_OCF_OCF
-dep_tristate '  IXP4xx (HW crypto engine)' \
-				CONFIG_OCF_IXP4XX $CONFIG_OCF_OCF
-dep_mbool    '  Enable IXP4xx HW to perform SHA1 and MD5 hashing (very slow)' \
-				CONFIG_OCF_IXP4XX_SHA1_MD5 $CONFIG_OCF_IXP4XX
-dep_tristate '  hifn (HW crypto engine)' \
-				CONFIG_OCF_HIFN $CONFIG_OCF_OCF
-dep_tristate '  talitos (HW crypto engine)' \
-				CONFIG_OCF_TALITOS $CONFIG_OCF_OCF
-dep_tristate '  pasemi (HW crypto engine)' \
-				CONFIG_OCF_PASEMI $CONFIG_OCF_OCF
-dep_tristate '  ep80579 (HW crypto engine)' \
-				CONFIG_OCF_EP80579 $CONFIG_OCF_OCF
-dep_tristate '  Micronas c7108 (HW crypto engine)' \
-				CONFIG_OCF_C7108 $CONFIG_OCF_OCF
-dep_tristate '  ocfnull (does no crypto)' \
-				CONFIG_OCF_OCFNULL $CONFIG_OCF_OCF
-dep_tristate '  ocf-bench (HW crypto in-kernel benchmark)' \
-				CONFIG_OCF_BENCH $CONFIG_OCF_OCF
-endmenu
-
-#############################################################################
diff --git a/target/linux/generic-2.6/files/crypto/ocf/Kconfig b/target/linux/generic-2.6/files/crypto/ocf/Kconfig
deleted file mode 100644
index b9c24fff4b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/Kconfig
+++ /dev/null
@@ -1,119 +0,0 @@
-menu "OCF Configuration"
-
-config OCF_OCF
-	tristate "OCF (Open Cryptograhic Framework)"
-	help
-	  A linux port of the OpenBSD/FreeBSD crypto framework.
-
-config OCF_RANDOMHARVEST
-	bool "crypto random --- harvest entropy for /dev/random"
-	depends on OCF_OCF
-	help
-	  Includes code to harvest random numbers from devices that support it.
-
-config OCF_FIPS
-	bool "enable fips RNG checks"
-	depends on OCF_OCF && OCF_RANDOMHARVEST
-	help
-	  Run all RNG provided data through a fips check before
-	  adding it /dev/random's entropy pool.
-
-config OCF_CRYPTODEV
-	tristate "cryptodev (user space support)"
-	depends on OCF_OCF
-	help
-	  The user space API to access crypto hardware.
-
-config OCF_CRYPTOSOFT
-	tristate "cryptosoft (software crypto engine)"
-	depends on OCF_OCF
-	help
-	  A software driver for the OCF framework that uses
-	  the kernel CryptoAPI.
-
-config OCF_SAFE
-	tristate "safenet (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  A driver for a number of the safenet Excel crypto accelerators.
-	  Currently tested and working on the 1141 and 1741.
-
-config OCF_IXP4XX
-	tristate "IXP4xx (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  XScale IXP4xx crypto accelerator driver.  Requires the
-	  Intel Access library.
-
-config OCF_IXP4XX_SHA1_MD5
-	bool "IXP4xx SHA1 and MD5 Hashing"
-	depends on OCF_IXP4XX
-	help
-	  Allows the IXP4xx crypto accelerator to perform SHA1 and MD5 hashing.
-	  Note: this is MUCH slower than using cryptosoft (software crypto engine).
-
-config OCF_HIFN
-	tristate "hifn (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for various HIFN based crypto accelerators.
-	  (7951, 7955, 7956, 7751, 7811)
-
-config OCF_HIFNHIPP
-	tristate "Hifn HIPP (HW packet crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for various HIFN (HIPP) based crypto accelerators
-	  (7855)
-
-config OCF_TALITOS
-	tristate "talitos (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for Freescale's security engine (SEC/talitos).
-
-config OCF_PASEMI
-	tristate "pasemi (HW crypto engine)"
-	depends on OCF_OCF && PPC_PASEMI
-	help
-	  OCF driver for the PA Semi PWRficient DMA Engine
-
-config OCF_EP80579
-	tristate "ep80579 (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for the Intel EP80579 Integrated Processor Product Line.
-
-config OCF_CRYPTOCTEON
-	tristate "cryptocteon (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for the Cavium OCTEON Processors.
-
-config OCF_KIRKWOOD
-	tristate "kirkwood (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for the Marvell Kirkwood (88F6xxx) Processors.
-
-config OCF_C7108
-	tristate "Micronas 7108 (HW crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for the Microna 7108 Cipher processors.
-
-config OCF_OCFNULL
-	tristate "ocfnull (fake crypto engine)"
-	depends on OCF_OCF
-	help
-	  OCF driver for measuring ipsec overheads (does no crypto)
-
-config OCF_BENCH
-	tristate "ocf-bench (HW crypto in-kernel benchmark)"
-	depends on OCF_OCF
-	help
-	  A very simple encryption test for the in-kernel interface
-	  of OCF.  Also includes code to benchmark the IXP Access library
-	  for comparison.
-
-endmenu
diff --git a/target/linux/generic-2.6/files/crypto/ocf/Makefile b/target/linux/generic-2.6/files/crypto/ocf/Makefile
deleted file mode 100644
index fa951f401c..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-OCF_OBJS = crypto.o criov.o
-
-ifdef CONFIG_OCF_RANDOMHARVEST
-	OCF_OBJS += random.o
-endif
-
-ifdef CONFIG_OCF_FIPS
-	OCF_OBJS += rndtest.o
-endif
-
-# Add in autoconf.h to get #defines for CONFIG_xxx
-AUTOCONF_H=$(ROOTDIR)/modules/autoconf.h
-ifeq ($(AUTOCONF_H), $(wildcard $(AUTOCONF_H)))
-	EXTRA_CFLAGS += -include $(AUTOCONF_H)
-	export EXTRA_CFLAGS
-endif
-
-ifndef obj
-	obj ?= .
-	_obj = subdir
-	mod-subdirs := safe hifn ixp4xx talitos ocfnull
-	export-objs += crypto.o criov.o random.o
-	list-multi += ocf.o
-	_slash :=
-else
-	_obj = obj
-	_slash := /
-endif
-
-EXTRA_CFLAGS += -I$(obj)/.
-
-obj-$(CONFIG_OCF_OCF)         += ocf.o
-obj-$(CONFIG_OCF_CRYPTODEV)   += cryptodev.o
-obj-$(CONFIG_OCF_CRYPTOSOFT)  += cryptosoft.o
-obj-$(CONFIG_OCF_BENCH)       += ocf-bench.o
-
-$(_obj)-$(CONFIG_OCF_SAFE)    += safe$(_slash)
-$(_obj)-$(CONFIG_OCF_HIFN)    += hifn$(_slash)
-$(_obj)-$(CONFIG_OCF_IXP4XX)  += ixp4xx$(_slash)
-$(_obj)-$(CONFIG_OCF_TALITOS) += talitos$(_slash)
-$(_obj)-$(CONFIG_OCF_PASEMI)  += pasemi$(_slash)
-$(_obj)-$(CONFIG_OCF_EP80579) += ep80579$(_slash)
-$(_obj)-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon$(_slash)
-$(_obj)-$(CONFIG_OCF_KIRKWOOD) += kirkwood$(_slash)
-$(_obj)-$(CONFIG_OCF_OCFNULL) += ocfnull$(_slash)
-$(_obj)-$(CONFIG_OCF_C7108) += c7108$(_slash)
-
-ocf-objs := $(OCF_OBJS)
-
-$(list-multi) dummy1: $(ocf-objs)
-	$(LD) -r -o $@ $(ocf-objs)
-
-.PHONY:
-clean:
-	rm -f *.o *.ko .*.o.flags .*.ko.cmd .*.o.cmd .*.mod.o.cmd *.mod.c
-	rm -f */*.o */*.ko */.*.o.cmd */.*.ko.cmd */.*.mod.o.cmd */*.mod.c */.*.o.flags
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
-#
-# release gen targets
-#
-
-.PHONY: patch
-patch:
-	REL=`date +%Y%m%d`; \
-		patch=ocf-linux-$$REL.patch; \
-		patch24=ocf-linux-24-$$REL.patch; \
-		patch26=ocf-linux-26-$$REL.patch; \
-		( \
-			find . -name Makefile; \
-			find . -name Config.in; \
-			find . -name Kconfig; \
-			find . -name README; \
-			find . -name '*.[ch]' | grep -v '.mod.c'; \
-		) | while read t; do \
-			diff -Nau /dev/null $$t | sed 's?^+++ \./?+++ linux/crypto/ocf/?'; \
-		done > $$patch; \
-		cat patches/linux-2.4.35-ocf.patch $$patch > $$patch24; \
-		cat patches/linux-2.6.33-ocf.patch $$patch > $$patch26
-
-.PHONY: tarball
-tarball:
-	REL=`date +%Y%m%d`; RELDIR=/tmp/ocf-linux-$$REL; \
-		CURDIR=`pwd`; \
-		rm -rf /tmp/ocf-linux-$$REL*; \
-		mkdir -p $$RELDIR/tools; \
-		cp README* $$RELDIR; \
-		cp patches/openss*.patch $$RELDIR; \
-		cp patches/crypto-tools.patch $$RELDIR; \
-		cp tools/[!C]* $$RELDIR/tools; \
-		cd ..; \
-		tar cvf $$RELDIR/ocf-linux.tar \
-					--exclude=CVS \
-					--exclude=.* \
-					--exclude=*.o \
-					--exclude=*.ko \
-					--exclude=*.mod.* \
-					--exclude=README* \
-					--exclude=ocf-*.patch \
-					--exclude=ocf/patches/openss*.patch \
-					--exclude=ocf/patches/crypto-tools.patch \
-					--exclude=ocf/tools \
-					ocf; \
-		gzip -9 $$RELDIR/ocf-linux.tar; \
-		cd /tmp; \
-		tar cvf ocf-linux-$$REL.tar ocf-linux-$$REL; \
-		gzip -9 ocf-linux-$$REL.tar; \
-		cd $$CURDIR/../../user; \
-		rm -rf /tmp/crypto-tools-$$REL*; \
-		tar cvf /tmp/crypto-tools-$$REL.tar \
-					--exclude=CVS \
-					--exclude=.* \
-					--exclude=*.o \
-					--exclude=cryptotest \
-					--exclude=cryptokeytest \
-					crypto-tools; \
-		gzip -9 /tmp/crypto-tools-$$REL.tar
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/README b/target/linux/generic-2.6/files/crypto/ocf/README
deleted file mode 100644
index 5ac39f7304..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/README
+++ /dev/null
@@ -1,167 +0,0 @@
-README - ocf-linux-20100325
----------------------------
-
-This README provides instructions for getting ocf-linux compiled and
-operating in a generic linux environment.  For other information you
-might like to visit the home page for this project:
-
-    http://ocf-linux.sourceforge.net/
-
-Adding OCF to linux
--------------------
-
-    Not much in this file for now,  just some notes.  I usually build
-    the ocf support as modules but it can be built into the kernel as
-    well.  To use it:
-
-    * mknod /dev/crypto c 10 70
-
-    * to add OCF to your kernel source,  you have two options.  Apply
-      the kernel specific patch:
-
-          cd linux-2.4*; gunzip < ocf-linux-24-XXXXXXXX.patch.gz | patch -p1
-          cd linux-2.6*; gunzip < ocf-linux-26-XXXXXXXX.patch.gz | patch -p1
-    
-      if you do one of the above,  then you can proceed to the next step,
-      or you can do the above process by hand with using the patches against
-      linux-2.4.35 and 2.6.33 to include the ocf code under crypto/ocf.
-      Here's how to add it:
-
-      for 2.4.35 (and later)
-
-          cd linux-2.4.35/crypto
-          tar xvzf ocf-linux.tar.gz
-          cd ..
-          patch -p1 < crypto/ocf/patches/linux-2.4.35-ocf.patch
-
-      for 2.6.23 (and later),  find the kernel patch specific (or nearest)
-      to your kernel versions and then:
-
-          cd linux-2.6.NN/crypto
-          tar xvzf ocf-linux.tar.gz
-          cd ..
-          patch -p1 < crypto/ocf/patches/linux-2.6.NN-ocf.patch
-
-      It should be easy to take this patch and apply it to other more
-      recent versions of the kernels.  The same patches should also work
-      relatively easily on kernels as old as 2.6.11 and 2.4.18.
-      
-    * under 2.4 if you are on a non-x86 platform,  you may need to:
-
-        cp linux-2.X.x/include/asm-i386/kmap_types.h linux-2.X.x/include/asm-YYY
-
-      so that you can build the kernel crypto support needed for the cryptosoft
-      driver.
-
-    * For simplicity you should enable all the crypto support in your kernel
-      except for the test driver.  Likewise for the OCF options.  Do not
-      enable OCF crypto drivers for HW that you do not have (for example
-      ixp4xx will not compile on non-Xscale systems).
-
-    * make sure that cryptodev.h (from ocf-linux.tar.gz) is installed as
-      crypto/cryptodev.h in an include directory that is used for building
-      applications for your platform.  For example on a host system that
-      might be:
-
-              /usr/include/crypto/cryptodev.h
-
-    * patch your openssl-0.9.8n code with the openssl-0.9.8n.patch.
-      (NOTE: there is no longer a need to patch ssh). The patch is against:
-      openssl-0_9_8e
-
-      If you need a patch for an older version of openssl,  you should look
-      to older OCF releases.  This patch is unlikely to work on older
-      openssl versions.
-
-      openssl-0.9.8n.patch
-                - enables --with-cryptodev for non BSD systems
-                - adds -cpu option to openssl speed for calculating CPU load
-                  under linux
-                - fixes null pointer in openssl speed multi thread output.
-                - fixes test keys to work with linux crypto's more stringent
-                  key checking.
-                - adds MD5/SHA acceleration (Ronen Shitrit), only enabled
-                  with the --with-cryptodev-digests option
-                - fixes bug in engine code caching.
-
-    * build crypto-tools-XXXXXXXX.tar.gz if you want to try some of the BSD
-      tools for testing OCF (ie., cryptotest).
-
-How to load the OCF drivers
----------------------------
-
-    First insert the base modules:
-
-        insmod ocf
-        insmod cryptodev
-
-    You can then install the software OCF driver with:
-
-        insmod cryptosoft
-
-    and one or more of the OCF HW drivers with:
-
-        insmod safe
-        insmod hifn7751
-        insmod ixp4xx
-        ...
-
-    all the drivers take a debug option to enable verbose debug so that
-    you can see what is going on.  For debug you load them as:
-
-        insmod ocf crypto_debug=1
-        insmod cryptodev cryptodev_debug=1
-        insmod cryptosoft swcr_debug=1
-
-    You may load more than one OCF crypto driver but then there is no guarantee
-    as to which will be used.
-
-    You can also enable debug at run time on 2.6 systems with the following:
-
-        echo 1 > /sys/module/ocf/parameters/crypto_debug
-        echo 1 > /sys/module/cryptodev/parameters/cryptodev_debug
-        echo 1 > /sys/module/cryptosoft/parameters/swcr_debug
-        echo 1 > /sys/module/hifn7751/parameters/hifn_debug
-        echo 1 > /sys/module/safe/parameters/safe_debug
-        echo 1 > /sys/module/ixp4xx/parameters/ixp_debug
-        ...
-
-Testing the OCF support
------------------------
-
-    run "cryptotest",  it should do a short test for a couple of
-    des packets.  If it does everything is working.
-
-    If this works,  then ssh will use the driver when invoked as:
-
-        ssh -c 3des username@host
-
-    to see for sure that it is operating, enable debug as defined above.
-
-    To get a better idea of performance run:
-
-        cryptotest 100 4096
-
-    There are more options to cryptotest,  see the help.
-
-    It is also possible to use openssl to test the speed of the crypto
-    drivers.
-
-        openssl speed -evp des -engine cryptodev -elapsed
-        openssl speed -evp des3 -engine cryptodev -elapsed
-        openssl speed -evp aes128 -engine cryptodev -elapsed
-
-    and multiple threads (10) with:
-
-        openssl speed -evp des -engine cryptodev -elapsed -multi 10
-        openssl speed -evp des3 -engine cryptodev -elapsed -multi 10
-        openssl speed -evp aes128 -engine cryptodev -elapsed -multi 10
-
-    for public key testing you can try:
-
-        cryptokeytest
-        openssl speed -engine cryptodev rsa -elapsed
-        openssl speed -engine cryptodev dsa -elapsed
-
-David McCullough
-david_mccullough@mcafee.com
diff --git a/target/linux/generic-2.6/files/crypto/ocf/c7108/Makefile b/target/linux/generic-2.6/files/crypto/ocf/c7108/Makefile
deleted file mode 100644
index e7e634b2b5..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/c7108/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_C7108) += aes-7108.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.c b/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.c
deleted file mode 100644
index a5ac054957..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.c
+++ /dev/null
@@ -1,839 +0,0 @@
-/*
- * Copyright (C) 2006 Micronas USA
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-//#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <asm/io.h>
-#include <asm/delay.h>
-//#include <asm/scatterlist.h>
-#include <linux/scatterlist.h>
-#include <linux/dma-mapping.h>
-#include <linux/highmem.h>
-#include <cryptodev.h>
-#include <uio.h>
-#include <aes-7108.h>
-
-/* Runtime mode */
-static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
-//static int c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
-
-static int32_t c7108_id = -1;
-static struct cipher_7108 **c7108_sessions = NULL;
-static u_int32_t c7108_sesnum = 0;
-static unsigned long iobar;
-
-/* Crypto entry points */
-static	int c7108_process(void *, struct cryptop *, int);
-static	int c7108_newsession(void *, u_int32_t *, struct cryptoini *);
-static	int c7108_freesession(void *, u_int64_t);
-
-/* Globals */
-static int debug = 0;
-static spinlock_t csr_mutex;
-
-/* Generic controller-based lock */
-#define AES_LOCK()\
-          spin_lock(&csr_mutex)
-#define AES_UNLOCK()\
-          spin_unlock(&csr_mutex)
-
-/* 7108 AES register access */
-#define c7108_reg_wr8(a,d)   iowrite8(d, (void*)(iobar+(a)))
-#define c7108_reg_wr16(a,d)  iowrite16(d, (void*)(iobar+(a)))
-#define c7108_reg_wr32(a,d)  iowrite32(d, (void*)(iobar+(a)))
-#define c7108_reg_rd8(a)     ioread8((void*)(iobar+(a)))
-#define c7108_reg_rd16(a)    ioread16((void*)(iobar+(a)))
-#define c7108_reg_rd32(a)    ioread32((void*)(iobar+(a)))
-
-static int 
-c7108_xlate_key(int klen, u8* k8ptr, u32* k32ptr)
-{
-        int i, nw=0;
-	nw = ((klen >= 256) ? 8 : (klen >= 192) ? 6 : 4);
-	for ( i = 0; i < nw; i++) { 
-	    k32ptr[i] =    (k8ptr[i+3] << 24) | (k8ptr[i+2] << 16) | 
-		           (k8ptr[i+1] << 8)  | k8ptr[i];
-	    
-	}
-	return 0;
-}
-
-static int 
-c7108_cache_key(int klen, u32* k32ptr, u8* k8ptr)
-{
-        int i, nb=0;
-	u8* ptr = (u8*)k32ptr;
-	nb = ((klen >= 256) ? 32 : (klen >= 192) ? 24 : 16);
-	for ( i = 0; i < nb; i++)
-	    k8ptr[i] = ptr[i];
-	return 0;
-}
-
-static int
-c7108_aes_setup_dma(u32 src, u32 dst, u32 len)
-{
-        if (len < 16) {
-	    printk("len < 16\n");
-	    return -10;
-	}
-	if (len % 16) {
-	    printk("len not multiple of 16\n");
-	    return -11;
-	}	
-	c7108_reg_wr16(C7108_AES_DMA_SRC0_LO, (u16) src);
-	c7108_reg_wr16(C7108_AES_DMA_SRC0_HI, (u16)((src & 0xffff0000) >> 16));
-	c7108_reg_wr16(C7108_AES_DMA_DST0_LO, (u16) dst);
-	c7108_reg_wr16(C7108_AES_DMA_DST0_HI, (u16)((dst & 0xffff0000) >> 16));
-	c7108_reg_wr16(C7108_AES_DMA_LEN, (u16) ((len / 16) - 1));
-
-	return 0;
-}
-
-static int
-c7108_aes_set_hw_iv(u8 iv[16])
-{
-        c7108_reg_wr16(C7108_AES_IV0_LO, (u16) ((iv[1] << 8) | iv[0]));
-	c7108_reg_wr16(C7108_AES_IV0_HI, (u16) ((iv[3] << 8) | iv[2]));
-	c7108_reg_wr16(C7108_AES_IV1_LO, (u16) ((iv[5] << 8) | iv[4]));
-	c7108_reg_wr16(C7108_AES_IV1_HI, (u16) ((iv[7] << 8) | iv[6]));
-	c7108_reg_wr16(C7108_AES_IV2_LO, (u16) ((iv[9] << 8) | iv[8]));
-	c7108_reg_wr16(C7108_AES_IV2_HI, (u16) ((iv[11] << 8) | iv[10]));
-	c7108_reg_wr16(C7108_AES_IV3_LO, (u16) ((iv[13] << 8) | iv[12]));
-	c7108_reg_wr16(C7108_AES_IV3_HI, (u16) ((iv[15] << 8) | iv[14]));
-
-    return 0;
-}
-
-static void
-c7108_aes_read_dkey(u32 * dkey)
-{
-        dkey[0] = (c7108_reg_rd16(C7108_AES_EKEY0_HI) << 16) | 
-	           c7108_reg_rd16(C7108_AES_EKEY0_LO);
-	dkey[1] = (c7108_reg_rd16(C7108_AES_EKEY1_HI) << 16) | 
-	           c7108_reg_rd16(C7108_AES_EKEY1_LO);
-	dkey[2] = (c7108_reg_rd16(C7108_AES_EKEY2_HI) << 16) | 
-	           c7108_reg_rd16(C7108_AES_EKEY2_LO);
-	dkey[3] = (c7108_reg_rd16(C7108_AES_EKEY3_HI) << 16) | 
-	           c7108_reg_rd16(C7108_AES_EKEY3_LO);
-	dkey[4] = (c7108_reg_rd16(C7108_AES_EKEY4_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY4_LO);
-	dkey[5] = (c7108_reg_rd16(C7108_AES_EKEY5_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY5_LO);
-	dkey[6] = (c7108_reg_rd16(C7108_AES_EKEY6_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY6_LO);
-	dkey[7] = (c7108_reg_rd16(C7108_AES_EKEY7_HI) << 16) | 
-                   c7108_reg_rd16(C7108_AES_EKEY7_LO);
-}
-
-static int
-c7108_aes_cipher(int op,
-		 u32 dst,
-		 u32 src,
-		 u32 len,
-		 int klen,
-		 u16 mode,
-		 u32 key[8],
-		 u8 iv[16])
-{
-        int rv = 0, cnt=0;
-	u16 ctrl = 0, stat = 0;
-
-	AES_LOCK();
-
-	/* Setup key length */
-	if (klen == 128) {
-	    ctrl |= C7108_AES_KEY_LEN_128;
-	} else if (klen == 192) {
-	    ctrl |= C7108_AES_KEY_LEN_192;
-	} else if (klen == 256) {
-	    ctrl |= C7108_AES_KEY_LEN_256;
-	} else {
-	    AES_UNLOCK();
-	    return -3;
-	}
-	
-	/* Check opcode */
-	if (C7108_AES_ENCRYPT == op) {
-	    ctrl |= C7108_AES_ENCRYPT;
-	} else if (C7108_AES_DECRYPT == op) {
-	    ctrl |= C7108_AES_DECRYPT;
-	} else {
-	    AES_UNLOCK();
-	    return -4;
-	}
-	
-	/* check mode */
-	if ( (mode != C7108_AES_CTRL_MODE_CBC) &&
-	     (mode != C7108_AES_CTRL_MODE_CFB) &&
-	     (mode != C7108_AES_CTRL_MODE_OFB) &&
-	     (mode != C7108_AES_CTRL_MODE_CTR) && 
-	     (mode != C7108_AES_CTRL_MODE_ECB) ) { 
-	    AES_UNLOCK();	    
-	    return -5;
-	}
-	
-	/* Now set mode */
-	ctrl |= mode;
-	
-	/* For CFB, OFB, and CTR, neither backward key
-	 * expansion nor key inversion is required.
-	 */
-	if ( (C7108_AES_DECRYPT == op) &&  
-	     (C7108_AES_CTRL_MODE_CBC == mode ||
-	      C7108_AES_CTRL_MODE_ECB == mode ) ){ 
-
-	    /* Program Key */
-	    c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[4]);
-	    c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[4] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[5]);
-	    c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[5] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[6]);
-	    c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[6] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[7]);
-	    c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[7] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[2]);
-	    c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[2] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[3]);
-	    c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[3] >> 16));
-	    
-	    
-	    if (192 == klen) { 
-		c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[7]);
-		c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[7] >> 16));
-		c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[7]);
-		c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[7] >> 16));
-		
-	    } else if (256 == klen) {
-		/* 256 */
-		c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[0]);
-		c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[0] >> 16));
-		c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[1]);
-		c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[1] >> 16));
-		
-	    }
-	    
-	} else { 
-	    /* Program Key */
-	    c7108_reg_wr16(C7108_AES_KEY0_LO, (u16) key[0]);
-	    c7108_reg_wr16(C7108_AES_KEY0_HI, (u16) (key[0] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY1_LO, (u16) key[1]);
-	    c7108_reg_wr16(C7108_AES_KEY1_HI, (u16) (key[1] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY2_LO, (u16) key[2]);
-	    c7108_reg_wr16(C7108_AES_KEY2_HI, (u16) (key[2] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY3_LO, (u16) key[3]);
-	    c7108_reg_wr16(C7108_AES_KEY3_HI, (u16) (key[3] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY4_LO, (u16) key[4]);
-	    c7108_reg_wr16(C7108_AES_KEY4_HI, (u16) (key[4] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY5_LO, (u16) key[5]);
-	    c7108_reg_wr16(C7108_AES_KEY5_HI, (u16) (key[5] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY6_LO, (u16) key[6]);
-	    c7108_reg_wr16(C7108_AES_KEY6_HI, (u16) (key[6] >> 16));
-	    c7108_reg_wr16(C7108_AES_KEY7_LO, (u16) key[7]);
-	    c7108_reg_wr16(C7108_AES_KEY7_HI, (u16) (key[7] >> 16));
-	    
-	}
-	
-	/* Set IV always */
-	c7108_aes_set_hw_iv(iv);
-	
-	/* Program DMA addresses */
-	if ((rv = c7108_aes_setup_dma(src, dst, len)) < 0) { 
-	    AES_UNLOCK();
-	    return rv;
-	}
-
-	
-	/* Start AES cipher */
-	c7108_reg_wr16(C7108_AES_CTRL, ctrl | C7108_AES_GO);
-	
-	//printk("Ctrl: 0x%x\n", ctrl | C7108_AES_GO);
-	do {
-	    /* TODO: interrupt mode */
-	    //        printk("aes_stat=0x%x\n", stat);
-	    //udelay(100);
-	} while ((cnt++ < 1000000) && 
-		 !((stat=c7108_reg_rd16(C7108_AES_CTRL))&C7108_AES_OP_DONE));
-
-
-	if ((mode == C7108_AES_CTRL_MODE_ECB)||
-	    (mode == C7108_AES_CTRL_MODE_CBC)) { 
-	    /* Save out key when the lock is held ... */
-	    c7108_aes_read_dkey(key);
-	}
-	
-	AES_UNLOCK();
-	return 0;
-	
-}
-
-/*
- * Generate a new crypto device session.
- */
-static int
-c7108_newsession(void *arg, u_int32_t *sid, struct cryptoini *cri)
-{
-	struct cipher_7108 **swd;
-	u_int32_t i;
-	char *algo;
-	int mode, xfm_type;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid == NULL || cri == NULL) {
-		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	if (c7108_sessions) {
-		for (i = 1; i < c7108_sesnum; i++)
-			if (c7108_sessions[i] == NULL)
-				break;
-	} else
-		i = 1;		/* NB: to silence compiler warning */
-
-	if (c7108_sessions == NULL || i == c7108_sesnum) {
-	    if (c7108_sessions == NULL) {
-		i = 1; /* We leave c7108_sessions[0] empty */
-		c7108_sesnum = CRYPTO_SW_SESSIONS;
-	    } else
-		c7108_sesnum *= 2;
-	    
-	    swd = kmalloc(c7108_sesnum * sizeof(struct cipher_7108 *), 
-			  GFP_ATOMIC);
-	    if (swd == NULL) {
-		/* Reset session number */
-		if (c7108_sesnum == CRYPTO_SW_SESSIONS)
-		    c7108_sesnum = 0;
-		else
-		    c7108_sesnum /= 2;
-		dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-		return ENOBUFS;
-	    }
-	    memset(swd, 0, c7108_sesnum * sizeof(struct cipher_7108 *));
-	    
-	    /* Copy existing sessions */
-	    if (c7108_sessions) {
-		memcpy(swd, c7108_sessions,
-		       (c7108_sesnum / 2) * sizeof(struct cipher_7108 *));
-		kfree(c7108_sessions);
-	    }
-	    
-	    c7108_sessions = swd;
-
-	}
-	
-	swd = &c7108_sessions[i];
-	*sid = i;
-
-	while (cri) {
-		*swd = (struct cipher_7108 *) 
-		    kmalloc(sizeof(struct cipher_7108), GFP_ATOMIC);
-		if (*swd == NULL) {
-		    c7108_freesession(NULL, i);
-		    dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		    return ENOBUFS;
-		}
-		memset(*swd, 0, sizeof(struct cipher_7108));
-
-		algo = NULL;
-		mode = 0;
-		xfm_type = HW_TYPE_CIPHER;
-
-		switch (cri->cri_alg) {
-
-		case CRYPTO_AES_CBC:
-			algo = "aes";
-			mode = CRYPTO_TFM_MODE_CBC;
-			c7108_crypto_mode = C7108_AES_CTRL_MODE_CBC;
-			break;
-#if 0
-		case CRYPTO_AES_CTR:
-			algo = "aes_ctr";
-			mode = CRYPTO_TFM_MODE_CBC;
-			c7108_crypto_mode = C7108_AES_CTRL_MODE_CTR;
-			break;
-		case CRYPTO_AES_ECB:
-			algo = "aes_ecb";
-			mode = CRYPTO_TFM_MODE_CBC;
-			c7108_crypto_mode = C7108_AES_CTRL_MODE_ECB;
-			break;
-		case CRYPTO_AES_OFB:
-			algo = "aes_ofb";
-			mode = CRYPTO_TFM_MODE_CBC;
-			c7108_crypto_mode = C7108_AES_CTRL_MODE_OFB;
-			break;
-		case CRYPTO_AES_CFB:
-			algo = "aes_cfb";
-			mode = CRYPTO_TFM_MODE_CBC;
-			c7108_crypto_mode = C7108_AES_CTRL_MODE_CFB;
-			break;
-#endif
-		default:
-		        printk("unsupported crypto algorithm: %d\n", 
-			       cri->cri_alg);
-			return -EINVAL;
-			break;
-		}
-
-
-		if (!algo || !*algo) {
-		    printk("cypher_7108_crypto: Unknown algo 0x%x\n", 
-			   cri->cri_alg);
-		    c7108_freesession(NULL, i);
-		    return EINVAL;
-		}
-		
-		if (xfm_type == HW_TYPE_CIPHER) {
-		    if (debug) {
-			dprintk("%s key:", __FUNCTION__);
-			for (i = 0; i < (cri->cri_klen + 7) / 8; i++)
-			    dprintk("%s0x%02x", (i % 8) ? " " : "\n    ",
-				    cri->cri_key[i]);
-			dprintk("\n");
-		    }
-
-		} else if (xfm_type == SW_TYPE_HMAC || 
-			   xfm_type == SW_TYPE_HASH) {
-		    printk("cypher_7108_crypto: HMAC unsupported!\n");
-		    return -EINVAL;
-		    c7108_freesession(NULL, i);
-		} else {
-		    printk("cypher_7108_crypto: "
-			   "Unhandled xfm_type %d\n", xfm_type);
-		    c7108_freesession(NULL, i);
-		    return EINVAL;
-		}
-		
-		(*swd)->cri_alg = cri->cri_alg;
-		(*swd)->xfm_type = xfm_type;
-		
-		cri = cri->cri_next;
-		swd = &((*swd)->next);
-	}
-	return 0;
-}
-
-/*
- * Free a session.
- */
-static int
-c7108_freesession(void *arg, u_int64_t tid)
-{
-	struct cipher_7108 *swd;
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid > c7108_sesnum || c7108_sessions == NULL ||
-			c7108_sessions[sid] == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return(EINVAL);
-	}
-
-	/* Silently accept and return */
-	if (sid == 0)
-		return(0);
-
-	while ((swd = c7108_sessions[sid]) != NULL) {
-		c7108_sessions[sid] = swd->next;
-		kfree(swd);
-	}
-	return 0;
-}
-
-/*
- * Process a hardware request.
- */
-static int
-c7108_process(void *arg, struct cryptop *crp, int hint)
-{
-	struct cryptodesc *crd;
-	struct cipher_7108 *sw;
-	u_int32_t lid;
-	int type;
-	u32 hwkey[8];
-
-#define SCATTERLIST_MAX 16
-	struct scatterlist sg[SCATTERLIST_MAX];
-	int sg_num, sg_len, skip;
-	struct sk_buff *skb = NULL;
-	struct uio *uiop = NULL;
-
-	dprintk("%s()\n", __FUNCTION__);
-	/* Sanity check */
-	if (crp == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	crp->crp_etype = 0;
-
-	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	lid = crp->crp_sid & 0xffffffff;
-	if (lid >= c7108_sesnum || lid == 0 || c7108_sessions == NULL ||
-			c7108_sessions[lid] == NULL) {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-
-	/*
-	 * do some error checking outside of the loop for SKB and IOV
-	 * processing this leaves us with valid skb or uiop pointers
-	 * for later
-	 */
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		skb = (struct sk_buff *) crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
-			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", 
-			       __FILE__, __LINE__,
-			       skb_shinfo(skb)->nr_frags);
-			goto done;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		uiop = (struct uio *) crp->crp_buf;
-		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
-			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", 
-			       __FILE__, __LINE__,
-			       uiop->uio_iovcnt);
-			goto done;
-		}
-	}
-
-	/* Go through crypto descriptors, processing as we go */
-	for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-	    /*
-	     * Find the crypto context.
-	     *
-	     * XXX Note that the logic here prevents us from having
-	     * XXX the same algorithm multiple times in a session
-	     * XXX (or rather, we can but it won't give us the right
-	     * XXX results). To do that, we'd need some way of differentiating
-	     * XXX between the various instances of an algorithm (so we can
-	     * XXX locate the correct crypto context).
-	     */
-	    for (sw = c7108_sessions[lid]; 
-		 sw && sw->cri_alg != crd->crd_alg;
-		 sw = sw->next)
-		;
-	    
-	    /* No such context ? */
-	    if (sw == NULL) {
-		crp->crp_etype = EINVAL;
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		goto done;
-	    }
-	    
-	    skip = crd->crd_skip;
-	    
-	    /*
-	     * setup the SG list skip from the start of the buffer
-	     */
-	    memset(sg, 0, sizeof(sg));
-	    if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		int i, len;
-		type = CRYPTO_BUF_SKBUF;
-		
-		sg_num = 0;
-		sg_len = 0;
-
-		if (skip < skb_headlen(skb)) {
-		    //sg[sg_num].page   = virt_to_page(skb->data + skip);
-			//sg[sg_num].offset = offset_in_page(skb->data + skip);
-		    len = skb_headlen(skb) - skip;
-		    if (len + sg_len > crd->crd_len)
-			len = crd->crd_len - sg_len;
-		    //sg[sg_num].length = len;
-		    sg_set_page(&sg[sg_num], virt_to_page(skb->data + skip), len, offset_in_page(skb->data + skip));
-			sg_len += sg[sg_num].length;
-		    sg_num++;
-		    skip = 0;
-		} else
-		    skip -= skb_headlen(skb);
-		
-		for (i = 0; sg_len < crd->crd_len &&
-			 i < skb_shinfo(skb)->nr_frags &&
-			 sg_num < SCATTERLIST_MAX; i++) {
-		    if (skip < skb_shinfo(skb)->frags[i].size) {
-			//sg[sg_num].page   = skb_shinfo(skb)->frags[i].page;
-			//sg[sg_num].offset = skb_shinfo(skb)->frags[i].page_offset + skip;
-			len = skb_shinfo(skb)->frags[i].size - skip;
-			if (len + sg_len > crd->crd_len)
-			    len = crd->crd_len - sg_len;
-			//sg[sg_num].length = len;
-			sg_set_page(&sg[sg_num], skb_shinfo(skb)->frags[i].page, len, skb_shinfo(skb)->frags[i].page_offset + skip);
-			sg_len += sg[sg_num].length;
-			sg_num++;
-			skip = 0;
-		    } else
-			skip -= skb_shinfo(skb)->frags[i].size;
-		}
-	    } else if (crp->crp_flags & CRYPTO_F_IOV) {
-		int len;
-		type = CRYPTO_BUF_IOV;
-		sg_len = 0;
-		for (sg_num = 0; sg_len < crd->crd_len &&
-			 sg_num < uiop->uio_iovcnt &&
-			 sg_num < SCATTERLIST_MAX; sg_num++) {
-		    if (skip < uiop->uio_iov[sg_num].iov_len) {
-			//sg[sg_num].page   =			    virt_to_page(uiop->uio_iov[sg_num].iov_base+skip);
-			//sg[sg_num].offset =			   offset_in_page(uiop->uio_iov[sg_num].iov_base+skip);
-			len = uiop->uio_iov[sg_num].iov_len - skip;
-			if (len + sg_len > crd->crd_len)
-			    len = crd->crd_len - sg_len;
-			//sg[sg_num].length = len;
-			sg_set_page(&sg[sg_num], virt_to_page(uiop->uio_iov[sg_num].iov_base+skip), len, offset_in_page(uiop->uio_iov[sg_num].iov_base+skip));
-			sg_len += sg[sg_num].length;
-			skip = 0;
-		    } else 
-			skip -= uiop->uio_iov[sg_num].iov_len;
-		}
-	    } else {
-		type = CRYPTO_BUF_CONTIG;
-		//sg[0].page   = virt_to_page(crp->crp_buf + skip);
-		//sg[0].offset = offset_in_page(crp->crp_buf + skip);
-		sg_len = (crp->crp_ilen - skip);
-		if (sg_len > crd->crd_len)
-		    sg_len = crd->crd_len;
-		//sg[0].length = sg_len;
-		sg_set_page(&sg[0], virt_to_page(crp->crp_buf + skip), sg_len, offset_in_page(crp->crp_buf + skip));
-		sg_num = 1;
-	    }
-	    
-	    
-	    switch (sw->xfm_type) {
-
-	    case HW_TYPE_CIPHER: {
-
-		unsigned char iv[64];
-		unsigned char *ivp = iv;
-		int i;
-		int ivsize = 16;    /* fixed for AES */
-		int blocksize = 16; /* fixed for AES */
-
-		if (sg_len < blocksize) {
-		    crp->crp_etype = EINVAL;
-		    dprintk("%s,%d: EINVAL len %d < %d\n", 
-			    __FILE__, __LINE__,
-			    sg_len, 
-			    blocksize);
-		    goto done;
-		}
-		
-		if (ivsize > sizeof(iv)) {
-		    crp->crp_etype = EINVAL;
-		    dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		    goto done;
-		}
-		
-		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-		    
-		    if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-			ivp = crd->crd_iv;
-		    } else {
-			get_random_bytes(ivp, ivsize);
-		    }
-		    /*
-		     * do we have to copy the IV back to the buffer ?
-		     */
-		    if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-			    crypto_copyback(crp->crp_buf,
-					  crd->crd_inject,
-					  ivsize,
-					  (caddr_t)ivp);
-		    }
-
-		    c7108_xlate_key(crd->crd_klen,
-				    (u8*)crd->crd_key, (u32*)hwkey);
-
-		    /* Encrypt SG list */
-		    for (i = 0; i < sg_num; i++) { 
-			sg[i].dma_address = 
-			    dma_map_single(NULL, 
-					   kmap(sg_page(&sg[i])) + sg[i].offset, sg_len, DMA_BIDIRECTIONAL);
-#if 0							   
-			printk("sg[%d]:0x%08x, off 0x%08x "
-			       "kmap 0x%08x phys 0x%08x\n", 
-			       i, sg[i].page, sg[i].offset,
-			       kmap(sg[i].page) + sg[i].offset,
-			       sg[i].dma_address);
-#endif
-			c7108_aes_cipher(C7108_AES_ENCRYPT,
-					 sg[i].dma_address,
-					 sg[i].dma_address,
-					 sg_len,
-					 crd->crd_klen,
-					 c7108_crypto_mode,
-					 hwkey,
-					 ivp);
-
-			if ((c7108_crypto_mode == C7108_AES_CTRL_MODE_CBC)||
-			    (c7108_crypto_mode == C7108_AES_CTRL_MODE_ECB)) { 
-			    /* Read back expanded key and cache it in key
-			     * context.
-			     * NOTE: for ECB/CBC modes only (not CTR, CFB, OFB)
-			     *       where you set the key once.
-			     */
-			    c7108_cache_key(crd->crd_klen, 
-					    (u32*)hwkey, (u8*)crd->crd_key);
-#if 0
-			    printk("%s expanded key:", __FUNCTION__);
-			    for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
-				printk("%s0x%02x", (i % 8) ? " " : "\n    ",
-				       crd->crd_key[i]);
-			    printk("\n");
-#endif
-			}
-		    }
-		}
-		else { /*decrypt */
-
-		    if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-			ivp = crd->crd_iv;
-		    } else {
-			crypto_copydata(crp->crp_buf, crd->crd_inject,
-				  ivsize, (caddr_t)ivp);
-		    }
-
-		    c7108_xlate_key(crd->crd_klen,
-				    (u8*)crd->crd_key, (u32*)hwkey);
-
-		    /* Decrypt SG list */
-		    for (i = 0; i < sg_num; i++) { 
-			sg[i].dma_address = 
-			    dma_map_single(NULL, 
-					   kmap(sg_page(&sg[i])) + sg[i].offset,
-					   sg_len, DMA_BIDIRECTIONAL);
-
-#if 0
-			printk("sg[%d]:0x%08x, off 0x%08x "
-			       "kmap 0x%08x phys 0x%08x\n", 
-			       i, sg[i].page, sg[i].offset,
-			       kmap(sg[i].page) + sg[i].offset,
-			       sg[i].dma_address);
-#endif
-			c7108_aes_cipher(C7108_AES_DECRYPT,
-					 sg[i].dma_address,
-					 sg[i].dma_address,
-					 sg_len,
-					 crd->crd_klen,
-					 c7108_crypto_mode,
-					 hwkey,
-					 ivp);
-		    }
-		}
-	    } break;
-	    case SW_TYPE_HMAC:
-	    case SW_TYPE_HASH:
-		crp->crp_etype = EINVAL;
-		goto done;
-		break;
-		
-	    case SW_TYPE_COMP:
-		crp->crp_etype = EINVAL;
-		goto done;
-		break;
-		
-	    default:
-		/* Unknown/unsupported algorithm */
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	    }
-	}
-	
-done:
-	crypto_done(crp);
-	return 0;
-}
-
-static struct {                                                                                                                 
-	softc_device_decl sc_dev;                                                                                               
-} a7108dev;
-
-static device_method_t a7108_methods = {                                                                                          
-/* crypto device methods */                                                                                             
-	DEVMETHOD(cryptodev_newsession, c7108_newsession),                                                                  
-	DEVMETHOD(cryptodev_freesession, c7108_freesession),                                                             
-	DEVMETHOD(cryptodev_process, c7108_process),                                                                     
-	DEVMETHOD(cryptodev_kprocess, NULL) 
-};   
-
-static int
-cypher_7108_crypto_init(void)
-{
-	dprintk("%s(%p)\n", __FUNCTION__, cypher_7108_crypto_init);
-	
-	iobar = (unsigned long)ioremap(CCU_AES_REG_BASE, 0x4000);
-	printk("7108: AES @ 0x%08x (0x%08x phys) %s mode\n", 
-	       iobar, CCU_AES_REG_BASE, 
-	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CBC ? "CBC" :
-	       c7108_crypto_mode & C7108_AES_CTRL_MODE_ECB ? "ECB" : 
-	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CTR ? "CTR" : 
-	       c7108_crypto_mode & C7108_AES_CTRL_MODE_CFB ? "CFB" : 
-	       c7108_crypto_mode & C7108_AES_CTRL_MODE_OFB ? "OFB" : "???");
-	csr_mutex  = SPIN_LOCK_UNLOCKED;
-
-	memset(&a7108dev, 0, sizeof(a7108dev));                                                                                     
-	softc_device_init(&a7108dev, "aes7108", 0, a7108_methods);
-
-       	c7108_id = crypto_get_driverid(softc_get_device(&a7108dev), CRYPTOCAP_F_HARDWARE);
-	if (c7108_id < 0)
-		panic("7108: crypto device cannot initialize!");
-
-//	crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0, c7108_newsession, c7108_freesession, c7108_process, NULL);
-	crypto_register(c7108_id, CRYPTO_AES_CBC, 0, 0);
-
-	return(0);
-}
-
-static void
-cypher_7108_crypto_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	crypto_unregister_all(c7108_id);
-	c7108_id = -1;
-}
-
-module_init(cypher_7108_crypto_init);
-module_exit(cypher_7108_crypto_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION("Cypher 7108 Crypto (OCF module for kernel crypto)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.h b/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.h
deleted file mode 100644
index 0c7bfcbb83..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/c7108/aes-7108.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2006 Micronas USA
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef __AES_7108_H__
-#define __AES_7108_H__
-
-/* Cypher 7108 AES Controller Hardware */
-#define CCU_REG_BASE       0x1b500000	
-#define CCU_AES_REG_BASE   (CCU_REG_BASE + 0x100)
-#define C7108_AES_KEY0_LO        (0x0000) 
-#define C7108_AES_KEY0_HI        (0x0004) 
-#define C7108_AES_KEY1_LO        (0x0008) 
-#define C7108_AES_KEY1_HI        (0x000c) 
-#define C7108_AES_KEY2_LO        (0x0010) 
-#define C7108_AES_KEY2_HI        (0x0014) 
-#define C7108_AES_KEY3_LO        (0x0018) 
-#define C7108_AES_KEY3_HI        (0x001c) 
-#define C7108_AES_KEY4_LO        (0x0020) 
-#define C7108_AES_KEY4_HI        (0x0024) 
-#define C7108_AES_KEY5_LO        (0x0028) 
-#define C7108_AES_KEY5_HI        (0x002c) 
-#define C7108_AES_KEY6_LO        (0x0030) 
-#define C7108_AES_KEY6_HI        (0x0034) 
-#define C7108_AES_KEY7_LO        (0x0038) 
-#define C7108_AES_KEY7_HI        (0x003c) 
-#define C7108_AES_IV0_LO         (0x0040) 
-#define C7108_AES_IV0_HI         (0x0044) 
-#define C7108_AES_IV1_LO         (0x0048) 
-#define C7108_AES_IV1_HI         (0x004c) 
-#define C7108_AES_IV2_LO         (0x0050) 
-#define C7108_AES_IV2_HI         (0x0054) 
-#define C7108_AES_IV3_LO         (0x0058) 
-#define C7108_AES_IV3_HI         (0x005c) 
-
-#define C7108_AES_DMA_SRC0_LO    (0x0068) /* Bits 0:15 */
-#define C7108_AES_DMA_SRC0_HI    (0x006c) /* Bits 27:16 */
-#define C7108_AES_DMA_DST0_LO    (0x0070) /* Bits 0:15 */
-#define C7108_AES_DMA_DST0_HI    (0x0074) /* Bits 27:16 */
-#define C7108_AES_DMA_LEN        (0x0078)  /*Bytes:(Count+1)x16 */
-
-/* AES/Copy engine control register */
-#define C7108_AES_CTRL           (0x007c) /* AES control */
-#define C7108_AES_CTRL_RS        (1<<0)     /* Which set of src/dst to use */
-
-/* AES Cipher mode, controlled by setting Bits 2:0 */
-#define C7108_AES_CTRL_MODE_CBC     0
-#define C7108_AES_CTRL_MODE_CFB     (1<<0)
-#define C7108_AES_CTRL_MODE_OFB     (1<<1)
-#define C7108_AES_CTRL_MODE_CTR     ((1<<0)|(1<<1))
-#define C7108_AES_CTRL_MODE_ECB     (1<<2)
-
-/* AES Key length , Bits 5:4 */
-#define C7108_AES_KEY_LEN_128         0       /* 00 */
-#define C7108_AES_KEY_LEN_192         (1<<4)  /* 01 */
-#define C7108_AES_KEY_LEN_256         (1<<5)  /* 10 */
-
-/* AES Operation (crypt/decrypt), Bit 3 */
-#define C7108_AES_DECRYPT             (1<<3)   /* Clear for encrypt */
-#define C7108_AES_ENCRYPT              0       
-#define C7108_AES_INTR                (1<<13) /* Set on done trans from 0->1*/
-#define C7108_AES_GO                  (1<<14) /* Run */
-#define C7108_AES_OP_DONE             (1<<15) /* Set when complete */
-
-
-/* Expanded key registers */
-#define C7108_AES_EKEY0_LO            (0x0080)
-#define C7108_AES_EKEY0_HI            (0x0084)
-#define C7108_AES_EKEY1_LO            (0x0088)
-#define C7108_AES_EKEY1_HI            (0x008c)
-#define C7108_AES_EKEY2_LO            (0x0090)
-#define C7108_AES_EKEY2_HI            (0x0094)
-#define C7108_AES_EKEY3_LO            (0x0098)
-#define C7108_AES_EKEY3_HI            (0x009c)
-#define C7108_AES_EKEY4_LO            (0x00a0)
-#define C7108_AES_EKEY4_HI            (0x00a4)
-#define C7108_AES_EKEY5_LO            (0x00a8)
-#define C7108_AES_EKEY5_HI            (0x00ac)
-#define C7108_AES_EKEY6_LO            (0x00b0)
-#define C7108_AES_EKEY6_HI            (0x00b4)
-#define C7108_AES_EKEY7_LO            (0x00b8)
-#define C7108_AES_EKEY7_HI            (0x00bc)
-#define C7108_AES_OK                  (0x00fc) /* Reset: "OK" */
-
-#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
-
-/* Software session entry */
-
-#define HW_TYPE_CIPHER	0
-#define SW_TYPE_HMAC	1
-#define SW_TYPE_AUTH2	2
-#define SW_TYPE_HASH	3
-#define SW_TYPE_COMP	4
-
-struct cipher_7108 {
-	int			xfm_type;
-	int			cri_alg;
-	union {
-		struct {
-			char sw_key[HMAC_BLOCK_LEN];
-			int  sw_klen;
-			int  sw_authlen;
-		} hmac;
-	} u;
-	struct cipher_7108	*next;
-};
-
-
-
-#endif /* __C7108_AES_7108_H__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/criov.c b/target/linux/generic-2.6/files/crypto/ocf/criov.c
deleted file mode 100644
index 6d7d3ad452..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/criov.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*      $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $	*/
-
-/*
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Copyright (c) 1999 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-__FBSDID("$FreeBSD: src/sys/opencrypto/criov.c,v 1.5 2006/06/04 22:15:13 pjd Exp $");
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/uio.h>
-#include <linux/skbuff.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-
-#include <uio.h>
-#include <cryptodev.h>
-
-/*
- * This macro is only for avoiding code duplication, as we need to skip
- * given number of bytes in the same way in three functions below.
- */
-#define	CUIO_SKIP()	do {						\
-	KASSERT(off >= 0, ("%s: off %d < 0", __func__, off));		\
-	KASSERT(len >= 0, ("%s: len %d < 0", __func__, len));		\
-	while (off > 0) {						\
-		KASSERT(iol >= 0, ("%s: empty in skip", __func__));	\
-		if (off < iov->iov_len)					\
-			break;						\
-		off -= iov->iov_len;					\
-		iol--;							\
-		iov++;							\
-	}								\
-} while (0)
-
-void
-cuio_copydata(struct uio* uio, int off, int len, caddr_t cp)
-{
-	struct iovec *iov = uio->uio_iov;
-	int iol = uio->uio_iovcnt;
-	unsigned count;
-
-	CUIO_SKIP();
-	while (len > 0) {
-		KASSERT(iol >= 0, ("%s: empty", __func__));
-		count = min((int)(iov->iov_len - off), len);
-		memcpy(cp, ((caddr_t)iov->iov_base) + off, count);
-		len -= count;
-		cp += count;
-		off = 0;
-		iol--;
-		iov++;
-	}
-}
-
-void
-cuio_copyback(struct uio* uio, int off, int len, caddr_t cp)
-{
-	struct iovec *iov = uio->uio_iov;
-	int iol = uio->uio_iovcnt;
-	unsigned count;
-
-	CUIO_SKIP();
-	while (len > 0) {
-		KASSERT(iol >= 0, ("%s: empty", __func__));
-		count = min((int)(iov->iov_len - off), len);
-		memcpy(((caddr_t)iov->iov_base) + off, cp, count);
-		len -= count;
-		cp += count;
-		off = 0;
-		iol--;
-		iov++;
-	}
-}
-
-/*
- * Return a pointer to iov/offset of location in iovec list.
- */
-struct iovec *
-cuio_getptr(struct uio *uio, int loc, int *off)
-{
-	struct iovec *iov = uio->uio_iov;
-	int iol = uio->uio_iovcnt;
-
-	while (loc >= 0) {
-		/* Normal end of search */
-		if (loc < iov->iov_len) {
-	    		*off = loc;
-	    		return (iov);
-		}
-
-		loc -= iov->iov_len;
-		if (iol == 0) {
-			if (loc == 0) {
-				/* Point at the end of valid data */
-				*off = iov->iov_len;
-				return (iov);
-			} else
-				return (NULL);
-		} else {
-			iov++, iol--;
-		}
-    	}
-
-	return (NULL);
-}
-
-EXPORT_SYMBOL(cuio_copyback);
-EXPORT_SYMBOL(cuio_copydata);
-EXPORT_SYMBOL(cuio_getptr);
-
-
-static void
-skb_copy_bits_back(struct sk_buff *skb, int offset, caddr_t cp, int len)
-{
-	int i;
-	if (offset < skb_headlen(skb)) {
-		memcpy(skb->data + offset, cp, min_t(int, skb_headlen(skb), len));
-		len -= skb_headlen(skb);
-		cp += skb_headlen(skb);
-	}
-	offset -= skb_headlen(skb);
-	for (i = 0; len > 0 && i < skb_shinfo(skb)->nr_frags; i++) {
-		if (offset < skb_shinfo(skb)->frags[i].size) {
-			memcpy(page_address(skb_shinfo(skb)->frags[i].page) +
-					skb_shinfo(skb)->frags[i].page_offset,
-					cp, min_t(int, skb_shinfo(skb)->frags[i].size, len));
-			len -= skb_shinfo(skb)->frags[i].size;
-			cp += skb_shinfo(skb)->frags[i].size;
-		}
-		offset -= skb_shinfo(skb)->frags[i].size;
-	}
-}
-
-void
-crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in)
-{
-
-	if ((flags & CRYPTO_F_SKBUF) != 0)
-		skb_copy_bits_back((struct sk_buff *)buf, off, in, size);
-	else if ((flags & CRYPTO_F_IOV) != 0)
-		cuio_copyback((struct uio *)buf, off, size, in);
-	else
-		bcopy(in, buf + off, size);
-}
-
-void
-crypto_copydata(int flags, caddr_t buf, int off, int size, caddr_t out)
-{
-
-	if ((flags & CRYPTO_F_SKBUF) != 0)
-		skb_copy_bits((struct sk_buff *)buf, off, out, size);
-	else if ((flags & CRYPTO_F_IOV) != 0)
-		cuio_copydata((struct uio *)buf, off, size, out);
-	else
-		bcopy(buf + off, out, size);
-}
-
-int
-crypto_apply(int flags, caddr_t buf, int off, int len,
-    int (*f)(void *, void *, u_int), void *arg)
-{
-#if 0
-	int error;
-
-	if ((flags & CRYPTO_F_SKBUF) != 0)
-		error = XXXXXX((struct mbuf *)buf, off, len, f, arg);
-	else if ((flags & CRYPTO_F_IOV) != 0)
-		error = cuio_apply((struct uio *)buf, off, len, f, arg);
-	else
-		error = (*f)(arg, buf + off, len);
-	return (error);
-#else
-	KASSERT(0, ("crypto_apply not implemented!\n"));
-#endif
-	return 0;
-}
-
-EXPORT_SYMBOL(crypto_copyback);
-EXPORT_SYMBOL(crypto_copydata);
-EXPORT_SYMBOL(crypto_apply);
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/crypto.c b/target/linux/generic-2.6/files/crypto/ocf/crypto.c
deleted file mode 100644
index 9735f0ce93..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/crypto.c
+++ /dev/null
@@ -1,1784 +0,0 @@
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Redistribution and use in source and binary forms, with or without
- * Copyright (c) 2002-2006 Sam Leffler.  All rights reserved.
- *
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.27 2007/03/21 03:42:51 sam Exp $");
-#endif
-
-/*
- * Cryptographic Subsystem.
- *
- * This code is derived from the Openbsd Cryptographic Framework (OCF)
- * that has the copyright shown below.  Very little of the original
- * code remains.
- */
-/*-
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000, 2001 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
-__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $");
- */
-
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/version.h>
-#include <cryptodev.h>
-
-/*
- * keep track of whether or not we have been initialised, a big
- * issue if we are linked into the kernel and a driver gets started before
- * us
- */
-static int crypto_initted = 0;
-
-/*
- * Crypto drivers register themselves by allocating a slot in the
- * crypto_drivers table with crypto_get_driverid() and then registering
- * each algorithm they support with crypto_register() and crypto_kregister().
- */
-
-/*
- * lock on driver table
- * we track its state as spin_is_locked does not do anything on non-SMP boxes
- */
-static spinlock_t	crypto_drivers_lock;
-static int			crypto_drivers_locked;		/* for non-SMP boxes */
-
-#define	CRYPTO_DRIVER_LOCK() \
-			({ \
-				spin_lock_irqsave(&crypto_drivers_lock, d_flags); \
-			 	crypto_drivers_locked = 1; \
-				dprintk("%s,%d: DRIVER_LOCK()\n", __FILE__, __LINE__); \
-			 })
-#define	CRYPTO_DRIVER_UNLOCK() \
-			({ \
-			 	dprintk("%s,%d: DRIVER_UNLOCK()\n", __FILE__, __LINE__); \
-			 	crypto_drivers_locked = 0; \
-				spin_unlock_irqrestore(&crypto_drivers_lock, d_flags); \
-			 })
-#define	CRYPTO_DRIVER_ASSERT() \
-			({ \
-			 	if (!crypto_drivers_locked) { \
-					dprintk("%s,%d: DRIVER_ASSERT!\n", __FILE__, __LINE__); \
-			 	} \
-			 })
-
-/*
- * Crypto device/driver capabilities structure.
- *
- * Synchronization:
- * (d) - protected by CRYPTO_DRIVER_LOCK()
- * (q) - protected by CRYPTO_Q_LOCK()
- * Not tagged fields are read-only.
- */
-struct cryptocap {
-	device_t	cc_dev;			/* (d) device/driver */
-	u_int32_t	cc_sessions;		/* (d) # of sessions */
-	u_int32_t	cc_koperations;		/* (d) # os asym operations */
-	/*
-	 * Largest possible operator length (in bits) for each type of
-	 * encryption algorithm. XXX not used
-	 */
-	u_int16_t	cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1];
-	u_int8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1];
-	u_int8_t	cc_kalg[CRK_ALGORITHM_MAX + 1];
-
-	int		cc_flags;		/* (d) flags */
-#define CRYPTOCAP_F_CLEANUP	0x80000000	/* needs resource cleanup */
-	int		cc_qblocked;		/* (q) symmetric q blocked */
-	int		cc_kqblocked;		/* (q) asymmetric q blocked */
-
-	int		cc_unqblocked;		/* (q) symmetric q blocked */
-	int		cc_unkqblocked;		/* (q) asymmetric q blocked */
-};
-static struct cryptocap *crypto_drivers = NULL;
-static int crypto_drivers_num = 0;
-
-/*
- * There are two queues for crypto requests; one for symmetric (e.g.
- * cipher) operations and one for asymmetric (e.g. MOD)operations.
- * A single mutex is used to lock access to both queues.  We could
- * have one per-queue but having one simplifies handling of block/unblock
- * operations.
- */
-static	int crp_sleep = 0;
-static LIST_HEAD(crp_q);		/* request queues */
-static LIST_HEAD(crp_kq);
-
-static spinlock_t crypto_q_lock;
-
-int crypto_all_qblocked = 0;  /* protect with Q_LOCK */
-module_param(crypto_all_qblocked, int, 0444);
-MODULE_PARM_DESC(crypto_all_qblocked, "Are all crypto queues blocked");
-
-int crypto_all_kqblocked = 0; /* protect with Q_LOCK */
-module_param(crypto_all_kqblocked, int, 0444);
-MODULE_PARM_DESC(crypto_all_kqblocked, "Are all asym crypto queues blocked");
-
-#define	CRYPTO_Q_LOCK() \
-			({ \
-				spin_lock_irqsave(&crypto_q_lock, q_flags); \
-			 	dprintk("%s,%d: Q_LOCK()\n", __FILE__, __LINE__); \
-			 })
-#define	CRYPTO_Q_UNLOCK() \
-			({ \
-			 	dprintk("%s,%d: Q_UNLOCK()\n", __FILE__, __LINE__); \
-				spin_unlock_irqrestore(&crypto_q_lock, q_flags); \
-			 })
-
-/*
- * There are two queues for processing completed crypto requests; one
- * for the symmetric and one for the asymmetric ops.  We only need one
- * but have two to avoid type futzing (cryptop vs. cryptkop).  A single
- * mutex is used to lock access to both queues.  Note that this lock
- * must be separate from the lock on request queues to insure driver
- * callbacks don't generate lock order reversals.
- */
-static LIST_HEAD(crp_ret_q);		/* callback queues */
-static LIST_HEAD(crp_ret_kq);
-
-static spinlock_t crypto_ret_q_lock;
-#define	CRYPTO_RETQ_LOCK() \
-			({ \
-				spin_lock_irqsave(&crypto_ret_q_lock, r_flags); \
-				dprintk("%s,%d: RETQ_LOCK\n", __FILE__, __LINE__); \
-			 })
-#define	CRYPTO_RETQ_UNLOCK() \
-			({ \
-			 	dprintk("%s,%d: RETQ_UNLOCK\n", __FILE__, __LINE__); \
-				spin_unlock_irqrestore(&crypto_ret_q_lock, r_flags); \
-			 })
-#define	CRYPTO_RETQ_EMPTY()	(list_empty(&crp_ret_q) && list_empty(&crp_ret_kq))
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static kmem_cache_t *cryptop_zone;
-static kmem_cache_t *cryptodesc_zone;
-#else
-static struct kmem_cache *cryptop_zone;
-static struct kmem_cache *cryptodesc_zone;
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-#include <linux/sched.h>
-#define	kill_proc(p,s,v)	send_sig(s,find_task_by_vpid(p),0)
-#endif
-
-#define debug crypto_debug
-int crypto_debug = 0;
-module_param(crypto_debug, int, 0644);
-MODULE_PARM_DESC(crypto_debug, "Enable debug");
-EXPORT_SYMBOL(crypto_debug);
-
-/*
- * Maximum number of outstanding crypto requests before we start
- * failing requests.  We need this to prevent DOS when too many
- * requests are arriving for us to keep up.  Otherwise we will
- * run the system out of memory.  Since crypto is slow,  we are
- * usually the bottleneck that needs to say, enough is enough.
- *
- * We cannot print errors when this condition occurs,  we are already too
- * slow,  printing anything will just kill us
- */
-
-static int crypto_q_cnt = 0;
-module_param(crypto_q_cnt, int, 0444);
-MODULE_PARM_DESC(crypto_q_cnt,
-		"Current number of outstanding crypto requests");
-
-static int crypto_q_max = 1000;
-module_param(crypto_q_max, int, 0644);
-MODULE_PARM_DESC(crypto_q_max,
-		"Maximum number of outstanding crypto requests");
-
-#define bootverbose crypto_verbose
-static int crypto_verbose = 0;
-module_param(crypto_verbose, int, 0644);
-MODULE_PARM_DESC(crypto_verbose,
-		"Enable verbose crypto startup");
-
-int	crypto_usercrypto = 1;	/* userland may do crypto reqs */
-module_param(crypto_usercrypto, int, 0644);
-MODULE_PARM_DESC(crypto_usercrypto,
-	   "Enable/disable user-mode access to crypto support");
-
-int	crypto_userasymcrypto = 1;	/* userland may do asym crypto reqs */
-module_param(crypto_userasymcrypto, int, 0644);
-MODULE_PARM_DESC(crypto_userasymcrypto,
-	   "Enable/disable user-mode access to asymmetric crypto support");
-
-int	crypto_devallowsoft = 0;	/* only use hardware crypto */
-module_param(crypto_devallowsoft, int, 0644);
-MODULE_PARM_DESC(crypto_devallowsoft,
-	   "Enable/disable use of software crypto support");
-
-/*
- * This parameter controls the maximum number of crypto operations to 
- * do consecutively in the crypto kernel thread before scheduling to allow 
- * other processes to run. Without it, it is possible to get into a 
- * situation where the crypto thread never allows any other processes to run.
- * Default to 1000 which should be less than one second.
- */
-static int crypto_max_loopcount = 1000;
-module_param(crypto_max_loopcount, int, 0644);
-MODULE_PARM_DESC(crypto_max_loopcount,
-	   "Maximum number of crypto ops to do before yielding to other processes");
-
-static pid_t	cryptoproc = (pid_t) -1;
-static struct	completion cryptoproc_exited;
-static DECLARE_WAIT_QUEUE_HEAD(cryptoproc_wait);
-static pid_t	cryptoretproc = (pid_t) -1;
-static struct	completion cryptoretproc_exited;
-static DECLARE_WAIT_QUEUE_HEAD(cryptoretproc_wait);
-
-static	int crypto_proc(void *arg);
-static	int crypto_ret_proc(void *arg);
-static	int crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint);
-static	int crypto_kinvoke(struct cryptkop *krp, int flags);
-static	void crypto_exit(void);
-static  int crypto_init(void);
-
-static	struct cryptostats cryptostats;
-
-static struct cryptocap *
-crypto_checkdriver(u_int32_t hid)
-{
-	if (crypto_drivers == NULL)
-		return NULL;
-	return (hid >= crypto_drivers_num ? NULL : &crypto_drivers[hid]);
-}
-
-/*
- * Compare a driver's list of supported algorithms against another
- * list; return non-zero if all algorithms are supported.
- */
-static int
-driver_suitable(const struct cryptocap *cap, const struct cryptoini *cri)
-{
-	const struct cryptoini *cr;
-
-	/* See if all the algorithms are supported. */
-	for (cr = cri; cr; cr = cr->cri_next)
-		if (cap->cc_alg[cr->cri_alg] == 0)
-			return 0;
-	return 1;
-}
-
-/*
- * Select a driver for a new session that supports the specified
- * algorithms and, optionally, is constrained according to the flags.
- * The algorithm we use here is pretty stupid; just use the
- * first driver that supports all the algorithms we need. If there
- * are multiple drivers we choose the driver with the fewest active
- * sessions.  We prefer hardware-backed drivers to software ones.
- *
- * XXX We need more smarts here (in real life too, but that's
- * XXX another story altogether).
- */
-static struct cryptocap *
-crypto_select_driver(const struct cryptoini *cri, int flags)
-{
-	struct cryptocap *cap, *best;
-	int match, hid;
-
-	CRYPTO_DRIVER_ASSERT();
-
-	/*
-	 * Look first for hardware crypto devices if permitted.
-	 */
-	if (flags & CRYPTOCAP_F_HARDWARE)
-		match = CRYPTOCAP_F_HARDWARE;
-	else
-		match = CRYPTOCAP_F_SOFTWARE;
-	best = NULL;
-again:
-	for (hid = 0; hid < crypto_drivers_num; hid++) {
-		cap = &crypto_drivers[hid];
-		/*
-		 * If it's not initialized, is in the process of
-		 * going away, or is not appropriate (hardware
-		 * or software based on match), then skip.
-		 */
-		if (cap->cc_dev == NULL ||
-		    (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
-		    (cap->cc_flags & match) == 0)
-			continue;
-
-		/* verify all the algorithms are supported. */
-		if (driver_suitable(cap, cri)) {
-			if (best == NULL ||
-			    cap->cc_sessions < best->cc_sessions)
-				best = cap;
-		}
-	}
-	if (best != NULL)
-		return best;
-	if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
-		/* sort of an Algol 68-style for loop */
-		match = CRYPTOCAP_F_SOFTWARE;
-		goto again;
-	}
-	return best;
-}
-
-/*
- * Create a new session.  The crid argument specifies a crypto
- * driver to use or constraints on a driver to select (hardware
- * only, software only, either).  Whatever driver is selected
- * must be capable of the requested crypto algorithms.
- */
-int
-crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int crid)
-{
-	struct cryptocap *cap;
-	u_int32_t hid, lid;
-	int err;
-	unsigned long d_flags;
-
-	CRYPTO_DRIVER_LOCK();
-	if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-		/*
-		 * Use specified driver; verify it is capable.
-		 */
-		cap = crypto_checkdriver(crid);
-		if (cap != NULL && !driver_suitable(cap, cri))
-			cap = NULL;
-	} else {
-		/*
-		 * No requested driver; select based on crid flags.
-		 */
-		cap = crypto_select_driver(cri, crid);
-		/*
-		 * if NULL then can't do everything in one session.
-		 * XXX Fix this. We need to inject a "virtual" session
-		 * XXX layer right about here.
-		 */
-	}
-	if (cap != NULL) {
-		/* Call the driver initialization routine. */
-		hid = cap - crypto_drivers;
-		lid = hid;		/* Pass the driver ID. */
-		cap->cc_sessions++;
-		CRYPTO_DRIVER_UNLOCK();
-		err = CRYPTODEV_NEWSESSION(cap->cc_dev, &lid, cri);
-		CRYPTO_DRIVER_LOCK();
-		if (err == 0) {
-			(*sid) = (cap->cc_flags & 0xff000000)
-			       | (hid & 0x00ffffff);
-			(*sid) <<= 32;
-			(*sid) |= (lid & 0xffffffff);
-		} else
-			cap->cc_sessions--;
-	} else
-		err = EINVAL;
-	CRYPTO_DRIVER_UNLOCK();
-	return err;
-}
-
-static void
-crypto_remove(struct cryptocap *cap)
-{
-	CRYPTO_DRIVER_ASSERT();
-	if (cap->cc_sessions == 0 && cap->cc_koperations == 0)
-		bzero(cap, sizeof(*cap));
-}
-
-/*
- * Delete an existing session (or a reserved session on an unregistered
- * driver).
- */
-int
-crypto_freesession(u_int64_t sid)
-{
-	struct cryptocap *cap;
-	u_int32_t hid;
-	int err = 0;
-	unsigned long d_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-	CRYPTO_DRIVER_LOCK();
-
-	if (crypto_drivers == NULL) {
-		err = EINVAL;
-		goto done;
-	}
-
-	/* Determine two IDs. */
-	hid = CRYPTO_SESID2HID(sid);
-
-	if (hid >= crypto_drivers_num) {
-		dprintk("%s - INVALID DRIVER NUM %d\n", __FUNCTION__, hid);
-		err = ENOENT;
-		goto done;
-	}
-	cap = &crypto_drivers[hid];
-
-	if (cap->cc_dev) {
-		CRYPTO_DRIVER_UNLOCK();
-		/* Call the driver cleanup routine, if available, unlocked. */
-		err = CRYPTODEV_FREESESSION(cap->cc_dev, sid);
-		CRYPTO_DRIVER_LOCK();
-	}
-
-	if (cap->cc_sessions)
-		cap->cc_sessions--;
-
-	if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
-		crypto_remove(cap);
-
-done:
-	CRYPTO_DRIVER_UNLOCK();
-	return err;
-}
-
-/*
- * Return an unused driver id.  Used by drivers prior to registering
- * support for the algorithms they handle.
- */
-int32_t
-crypto_get_driverid(device_t dev, int flags)
-{
-	struct cryptocap *newdrv;
-	int i;
-	unsigned long d_flags;
-
-	if ((flags & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-		printf("%s: no flags specified when registering driver\n",
-		    device_get_nameunit(dev));
-		return -1;
-	}
-
-	CRYPTO_DRIVER_LOCK();
-
-	for (i = 0; i < crypto_drivers_num; i++) {
-		if (crypto_drivers[i].cc_dev == NULL &&
-		    (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP) == 0) {
-			break;
-		}
-	}
-
-	/* Out of entries, allocate some more. */
-	if (i == crypto_drivers_num) {
-		/* Be careful about wrap-around. */
-		if (2 * crypto_drivers_num <= crypto_drivers_num) {
-			CRYPTO_DRIVER_UNLOCK();
-			printk("crypto: driver count wraparound!\n");
-			return -1;
-		}
-
-		newdrv = kmalloc(2 * crypto_drivers_num * sizeof(struct cryptocap),
-				GFP_KERNEL);
-		if (newdrv == NULL) {
-			CRYPTO_DRIVER_UNLOCK();
-			printk("crypto: no space to expand driver table!\n");
-			return -1;
-		}
-
-		memcpy(newdrv, crypto_drivers,
-				crypto_drivers_num * sizeof(struct cryptocap));
-		memset(&newdrv[crypto_drivers_num], 0,
-				crypto_drivers_num * sizeof(struct cryptocap));
-
-		crypto_drivers_num *= 2;
-
-		kfree(crypto_drivers);
-		crypto_drivers = newdrv;
-	}
-
-	/* NB: state is zero'd on free */
-	crypto_drivers[i].cc_sessions = 1;	/* Mark */
-	crypto_drivers[i].cc_dev = dev;
-	crypto_drivers[i].cc_flags = flags;
-	if (bootverbose)
-		printf("crypto: assign %s driver id %u, flags %u\n",
-		    device_get_nameunit(dev), i, flags);
-
-	CRYPTO_DRIVER_UNLOCK();
-
-	return i;
-}
-
-/*
- * Lookup a driver by name.  We match against the full device
- * name and unit, and against just the name.  The latter gives
- * us a simple widlcarding by device name.  On success return the
- * driver/hardware identifier; otherwise return -1.
- */
-int
-crypto_find_driver(const char *match)
-{
-	int i, len = strlen(match);
-	unsigned long d_flags;
-
-	CRYPTO_DRIVER_LOCK();
-	for (i = 0; i < crypto_drivers_num; i++) {
-		device_t dev = crypto_drivers[i].cc_dev;
-		if (dev == NULL ||
-		    (crypto_drivers[i].cc_flags & CRYPTOCAP_F_CLEANUP))
-			continue;
-		if (strncmp(match, device_get_nameunit(dev), len) == 0 ||
-		    strncmp(match, device_get_name(dev), len) == 0)
-			break;
-	}
-	CRYPTO_DRIVER_UNLOCK();
-	return i < crypto_drivers_num ? i : -1;
-}
-
-/*
- * Return the device_t for the specified driver or NULL
- * if the driver identifier is invalid.
- */
-device_t
-crypto_find_device_byhid(int hid)
-{
-	struct cryptocap *cap = crypto_checkdriver(hid);
-	return cap != NULL ? cap->cc_dev : NULL;
-}
-
-/*
- * Return the device/driver capabilities.
- */
-int
-crypto_getcaps(int hid)
-{
-	struct cryptocap *cap = crypto_checkdriver(hid);
-	return cap != NULL ? cap->cc_flags : 0;
-}
-
-/*
- * Register support for a key-related algorithm.  This routine
- * is called once for each algorithm supported a driver.
- */
-int
-crypto_kregister(u_int32_t driverid, int kalg, u_int32_t flags)
-{
-	struct cryptocap *cap;
-	int err;
-	unsigned long d_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-	CRYPTO_DRIVER_LOCK();
-
-	cap = crypto_checkdriver(driverid);
-	if (cap != NULL &&
-	    (CRK_ALGORITM_MIN <= kalg && kalg <= CRK_ALGORITHM_MAX)) {
-		/*
-		 * XXX Do some performance testing to determine placing.
-		 * XXX We probably need an auxiliary data structure that
-		 * XXX describes relative performances.
-		 */
-
-		cap->cc_kalg[kalg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
-		if (bootverbose)
-			printf("crypto: %s registers key alg %u flags %u\n"
-				, device_get_nameunit(cap->cc_dev)
-				, kalg
-				, flags
-			);
-		err = 0;
-	} else
-		err = EINVAL;
-
-	CRYPTO_DRIVER_UNLOCK();
-	return err;
-}
-
-/*
- * Register support for a non-key-related algorithm.  This routine
- * is called once for each such algorithm supported by a driver.
- */
-int
-crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
-    u_int32_t flags)
-{
-	struct cryptocap *cap;
-	int err;
-	unsigned long d_flags;
-
-	dprintk("%s(id=0x%x, alg=%d, maxoplen=%d, flags=0x%x)\n", __FUNCTION__,
-			driverid, alg, maxoplen, flags);
-
-	CRYPTO_DRIVER_LOCK();
-
-	cap = crypto_checkdriver(driverid);
-	/* NB: algorithms are in the range [1..max] */
-	if (cap != NULL &&
-	    (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX)) {
-		/*
-		 * XXX Do some performance testing to determine placing.
-		 * XXX We probably need an auxiliary data structure that
-		 * XXX describes relative performances.
-		 */
-
-		cap->cc_alg[alg] = flags | CRYPTO_ALG_FLAG_SUPPORTED;
-		cap->cc_max_op_len[alg] = maxoplen;
-		if (bootverbose)
-			printf("crypto: %s registers alg %u flags %u maxoplen %u\n"
-				, device_get_nameunit(cap->cc_dev)
-				, alg
-				, flags
-				, maxoplen
-			);
-		cap->cc_sessions = 0;		/* Unmark */
-		err = 0;
-	} else
-		err = EINVAL;
-
-	CRYPTO_DRIVER_UNLOCK();
-	return err;
-}
-
-static void
-driver_finis(struct cryptocap *cap)
-{
-	u_int32_t ses, kops;
-
-	CRYPTO_DRIVER_ASSERT();
-
-	ses = cap->cc_sessions;
-	kops = cap->cc_koperations;
-	bzero(cap, sizeof(*cap));
-	if (ses != 0 || kops != 0) {
-		/*
-		 * If there are pending sessions,
-		 * just mark as invalid.
-		 */
-		cap->cc_flags |= CRYPTOCAP_F_CLEANUP;
-		cap->cc_sessions = ses;
-		cap->cc_koperations = kops;
-	}
-}
-
-/*
- * Unregister a crypto driver. If there are pending sessions using it,
- * leave enough information around so that subsequent calls using those
- * sessions will correctly detect the driver has been unregistered and
- * reroute requests.
- */
-int
-crypto_unregister(u_int32_t driverid, int alg)
-{
-	struct cryptocap *cap;
-	int i, err;
-	unsigned long d_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-	CRYPTO_DRIVER_LOCK();
-
-	cap = crypto_checkdriver(driverid);
-	if (cap != NULL &&
-	    (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX) &&
-	    cap->cc_alg[alg] != 0) {
-		cap->cc_alg[alg] = 0;
-		cap->cc_max_op_len[alg] = 0;
-
-		/* Was this the last algorithm ? */
-		for (i = 1; i <= CRYPTO_ALGORITHM_MAX; i++)
-			if (cap->cc_alg[i] != 0)
-				break;
-
-		if (i == CRYPTO_ALGORITHM_MAX + 1)
-			driver_finis(cap);
-		err = 0;
-	} else
-		err = EINVAL;
-	CRYPTO_DRIVER_UNLOCK();
-	return err;
-}
-
-/*
- * Unregister all algorithms associated with a crypto driver.
- * If there are pending sessions using it, leave enough information
- * around so that subsequent calls using those sessions will
- * correctly detect the driver has been unregistered and reroute
- * requests.
- */
-int
-crypto_unregister_all(u_int32_t driverid)
-{
-	struct cryptocap *cap;
-	int err;
-	unsigned long d_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-	CRYPTO_DRIVER_LOCK();
-	cap = crypto_checkdriver(driverid);
-	if (cap != NULL) {
-		driver_finis(cap);
-		err = 0;
-	} else
-		err = EINVAL;
-	CRYPTO_DRIVER_UNLOCK();
-
-	return err;
-}
-
-/*
- * Clear blockage on a driver.  The what parameter indicates whether
- * the driver is now ready for cryptop's and/or cryptokop's.
- */
-int
-crypto_unblock(u_int32_t driverid, int what)
-{
-	struct cryptocap *cap;
-	int err;
-	unsigned long q_flags;
-
-	CRYPTO_Q_LOCK();
-	cap = crypto_checkdriver(driverid);
-	if (cap != NULL) {
-		if (what & CRYPTO_SYMQ) {
-			cap->cc_qblocked = 0;
-			cap->cc_unqblocked = 0;
-			crypto_all_qblocked = 0;
-		}
-		if (what & CRYPTO_ASYMQ) {
-			cap->cc_kqblocked = 0;
-			cap->cc_unkqblocked = 0;
-			crypto_all_kqblocked = 0;
-		}
-		if (crp_sleep)
-			wake_up_interruptible(&cryptoproc_wait);
-		err = 0;
-	} else
-		err = EINVAL;
-	CRYPTO_Q_UNLOCK(); //DAVIDM should this be a driver lock
-
-	return err;
-}
-
-/*
- * Add a crypto request to a queue, to be processed by the kernel thread.
- */
-int
-crypto_dispatch(struct cryptop *crp)
-{
-	struct cryptocap *cap;
-	int result = -1;
-	unsigned long q_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	cryptostats.cs_ops++;
-
-	CRYPTO_Q_LOCK();
-	if (crypto_q_cnt >= crypto_q_max) {
-		CRYPTO_Q_UNLOCK();
-		cryptostats.cs_drops++;
-		return ENOMEM;
-	}
-	crypto_q_cnt++;
-
-	/* make sure we are starting a fresh run on this crp. */
-	crp->crp_flags &= ~CRYPTO_F_DONE;
-	crp->crp_etype = 0;
-
-	/*
-	 * Caller marked the request to be processed immediately; dispatch
-	 * it directly to the driver unless the driver is currently blocked.
-	 */
-	if ((crp->crp_flags & CRYPTO_F_BATCH) == 0) {
-		int hid = CRYPTO_SESID2HID(crp->crp_sid);
-		cap = crypto_checkdriver(hid);
-		/* Driver cannot disappear when there is an active session. */
-		KASSERT(cap != NULL, ("%s: Driver disappeared.", __func__));
-		if (!cap->cc_qblocked) {
-			crypto_all_qblocked = 0;
-			crypto_drivers[hid].cc_unqblocked = 1;
-			CRYPTO_Q_UNLOCK();
-			result = crypto_invoke(cap, crp, 0);
-			CRYPTO_Q_LOCK();
-			if (result == ERESTART)
-				if (crypto_drivers[hid].cc_unqblocked)
-					crypto_drivers[hid].cc_qblocked = 1;
-			crypto_drivers[hid].cc_unqblocked = 0;
-		}
-	}
-	if (result == ERESTART) {
-		/*
-		 * The driver ran out of resources, mark the
-		 * driver ``blocked'' for cryptop's and put
-		 * the request back in the queue.  It would
-		 * best to put the request back where we got
-		 * it but that's hard so for now we put it
-		 * at the front.  This should be ok; putting
-		 * it at the end does not work.
-		 */
-		list_add(&crp->crp_next, &crp_q);
-		cryptostats.cs_blocks++;
-		result = 0;
-	} else if (result == -1) {
-		TAILQ_INSERT_TAIL(&crp_q, crp, crp_next);
-		result = 0;
-	}
-	if (crp_sleep)
-		wake_up_interruptible(&cryptoproc_wait);
-	CRYPTO_Q_UNLOCK();
-	return result;
-}
-
-/*
- * Add an asymetric crypto request to a queue,
- * to be processed by the kernel thread.
- */
-int
-crypto_kdispatch(struct cryptkop *krp)
-{
-	int error;
-	unsigned long q_flags;
-
-	cryptostats.cs_kops++;
-
-	error = crypto_kinvoke(krp, krp->krp_crid);
-	if (error == ERESTART) {
-		CRYPTO_Q_LOCK();
-		TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
-		if (crp_sleep)
-			wake_up_interruptible(&cryptoproc_wait);
-		CRYPTO_Q_UNLOCK();
-		error = 0;
-	}
-	return error;
-}
-
-/*
- * Verify a driver is suitable for the specified operation.
- */
-static __inline int
-kdriver_suitable(const struct cryptocap *cap, const struct cryptkop *krp)
-{
-	return (cap->cc_kalg[krp->krp_op] & CRYPTO_ALG_FLAG_SUPPORTED) != 0;
-}
-
-/*
- * Select a driver for an asym operation.  The driver must
- * support the necessary algorithm.  The caller can constrain
- * which device is selected with the flags parameter.  The
- * algorithm we use here is pretty stupid; just use the first
- * driver that supports the algorithms we need. If there are
- * multiple suitable drivers we choose the driver with the
- * fewest active operations.  We prefer hardware-backed
- * drivers to software ones when either may be used.
- */
-static struct cryptocap *
-crypto_select_kdriver(const struct cryptkop *krp, int flags)
-{
-	struct cryptocap *cap, *best, *blocked;
-	int match, hid;
-
-	CRYPTO_DRIVER_ASSERT();
-
-	/*
-	 * Look first for hardware crypto devices if permitted.
-	 */
-	if (flags & CRYPTOCAP_F_HARDWARE)
-		match = CRYPTOCAP_F_HARDWARE;
-	else
-		match = CRYPTOCAP_F_SOFTWARE;
-	best = NULL;
-	blocked = NULL;
-again:
-	for (hid = 0; hid < crypto_drivers_num; hid++) {
-		cap = &crypto_drivers[hid];
-		/*
-		 * If it's not initialized, is in the process of
-		 * going away, or is not appropriate (hardware
-		 * or software based on match), then skip.
-		 */
-		if (cap->cc_dev == NULL ||
-		    (cap->cc_flags & CRYPTOCAP_F_CLEANUP) ||
-		    (cap->cc_flags & match) == 0)
-			continue;
-
-		/* verify all the algorithms are supported. */
-		if (kdriver_suitable(cap, krp)) {
-			if (best == NULL ||
-			    cap->cc_koperations < best->cc_koperations)
-				best = cap;
-		}
-	}
-	if (best != NULL)
-		return best;
-	if (match == CRYPTOCAP_F_HARDWARE && (flags & CRYPTOCAP_F_SOFTWARE)) {
-		/* sort of an Algol 68-style for loop */
-		match = CRYPTOCAP_F_SOFTWARE;
-		goto again;
-	}
-	return best;
-}
-
-/*
- * Dispatch an assymetric crypto request.
- */
-static int
-crypto_kinvoke(struct cryptkop *krp, int crid)
-{
-	struct cryptocap *cap = NULL;
-	int error;
-	unsigned long d_flags;
-
-	KASSERT(krp != NULL, ("%s: krp == NULL", __func__));
-	KASSERT(krp->krp_callback != NULL,
-	    ("%s: krp->crp_callback == NULL", __func__));
-
-	CRYPTO_DRIVER_LOCK();
-	if ((crid & (CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE)) == 0) {
-		cap = crypto_checkdriver(crid);
-		if (cap != NULL) {
-			/*
-			 * Driver present, it must support the necessary
-			 * algorithm and, if s/w drivers are excluded,
-			 * it must be registered as hardware-backed.
-			 */
-			if (!kdriver_suitable(cap, krp) ||
-			    (!crypto_devallowsoft &&
-			     (cap->cc_flags & CRYPTOCAP_F_HARDWARE) == 0))
-				cap = NULL;
-		}
-	} else {
-		/*
-		 * No requested driver; select based on crid flags.
-		 */
-		if (!crypto_devallowsoft)	/* NB: disallow s/w drivers */
-			crid &= ~CRYPTOCAP_F_SOFTWARE;
-		cap = crypto_select_kdriver(krp, crid);
-	}
-	if (cap != NULL && !cap->cc_kqblocked) {
-		krp->krp_hid = cap - crypto_drivers;
-		cap->cc_koperations++;
-		CRYPTO_DRIVER_UNLOCK();
-		error = CRYPTODEV_KPROCESS(cap->cc_dev, krp, 0);
-		CRYPTO_DRIVER_LOCK();
-		if (error == ERESTART) {
-			cap->cc_koperations--;
-			CRYPTO_DRIVER_UNLOCK();
-			return (error);
-		}
-		/* return the actual device used */
-		krp->krp_crid = krp->krp_hid;
-	} else {
-		/*
-		 * NB: cap is !NULL if device is blocked; in
-		 *     that case return ERESTART so the operation
-		 *     is resubmitted if possible.
-		 */
-		error = (cap == NULL) ? ENODEV : ERESTART;
-	}
-	CRYPTO_DRIVER_UNLOCK();
-
-	if (error) {
-		krp->krp_status = error;
-		crypto_kdone(krp);
-	}
-	return 0;
-}
-
-
-/*
- * Dispatch a crypto request to the appropriate crypto devices.
- */
-static int
-crypto_invoke(struct cryptocap *cap, struct cryptop *crp, int hint)
-{
-	KASSERT(crp != NULL, ("%s: crp == NULL", __func__));
-	KASSERT(crp->crp_callback != NULL,
-	    ("%s: crp->crp_callback == NULL", __func__));
-	KASSERT(crp->crp_desc != NULL, ("%s: crp->crp_desc == NULL", __func__));
-
-	dprintk("%s()\n", __FUNCTION__);
-
-#ifdef CRYPTO_TIMING
-	if (crypto_timing)
-		crypto_tstat(&cryptostats.cs_invoke, &crp->crp_tstamp);
-#endif
-	if (cap->cc_flags & CRYPTOCAP_F_CLEANUP) {
-		struct cryptodesc *crd;
-		u_int64_t nid;
-
-		/*
-		 * Driver has unregistered; migrate the session and return
-		 * an error to the caller so they'll resubmit the op.
-		 *
-		 * XXX: What if there are more already queued requests for this
-		 *      session?
-		 */
-		crypto_freesession(crp->crp_sid);
-
-		for (crd = crp->crp_desc; crd->crd_next; crd = crd->crd_next)
-			crd->CRD_INI.cri_next = &(crd->crd_next->CRD_INI);
-
-		/* XXX propagate flags from initial session? */
-		if (crypto_newsession(&nid, &(crp->crp_desc->CRD_INI),
-		    CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE) == 0)
-			crp->crp_sid = nid;
-
-		crp->crp_etype = EAGAIN;
-		crypto_done(crp);
-		return 0;
-	} else {
-		/*
-		 * Invoke the driver to process the request.
-		 */
-		return CRYPTODEV_PROCESS(cap->cc_dev, crp, hint);
-	}
-}
-
-/*
- * Release a set of crypto descriptors.
- */
-void
-crypto_freereq(struct cryptop *crp)
-{
-	struct cryptodesc *crd;
-
-	if (crp == NULL)
-		return;
-
-#ifdef DIAGNOSTIC
-	{
-		struct cryptop *crp2;
-		unsigned long q_flags;
-
-		CRYPTO_Q_LOCK();
-		TAILQ_FOREACH(crp2, &crp_q, crp_next) {
-			KASSERT(crp2 != crp,
-			    ("Freeing cryptop from the crypto queue (%p).",
-			    crp));
-		}
-		CRYPTO_Q_UNLOCK();
-		CRYPTO_RETQ_LOCK();
-		TAILQ_FOREACH(crp2, &crp_ret_q, crp_next) {
-			KASSERT(crp2 != crp,
-			    ("Freeing cryptop from the return queue (%p).",
-			    crp));
-		}
-		CRYPTO_RETQ_UNLOCK();
-	}
-#endif
-
-	while ((crd = crp->crp_desc) != NULL) {
-		crp->crp_desc = crd->crd_next;
-		kmem_cache_free(cryptodesc_zone, crd);
-	}
-	kmem_cache_free(cryptop_zone, crp);
-}
-
-/*
- * Acquire a set of crypto descriptors.
- */
-struct cryptop *
-crypto_getreq(int num)
-{
-	struct cryptodesc *crd;
-	struct cryptop *crp;
-
-	crp = kmem_cache_alloc(cryptop_zone, SLAB_ATOMIC);
-	if (crp != NULL) {
-		memset(crp, 0, sizeof(*crp));
-		INIT_LIST_HEAD(&crp->crp_next);
-		init_waitqueue_head(&crp->crp_waitq);
-		while (num--) {
-			crd = kmem_cache_alloc(cryptodesc_zone, SLAB_ATOMIC);
-			if (crd == NULL) {
-				crypto_freereq(crp);
-				return NULL;
-			}
-			memset(crd, 0, sizeof(*crd));
-			crd->crd_next = crp->crp_desc;
-			crp->crp_desc = crd;
-		}
-	}
-	return crp;
-}
-
-/*
- * Invoke the callback on behalf of the driver.
- */
-void
-crypto_done(struct cryptop *crp)
-{
-	unsigned long q_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if ((crp->crp_flags & CRYPTO_F_DONE) == 0) {
-		crp->crp_flags |= CRYPTO_F_DONE;
-		CRYPTO_Q_LOCK();
-		crypto_q_cnt--;
-		CRYPTO_Q_UNLOCK();
-	} else
-		printk("crypto: crypto_done op already done, flags 0x%x",
-				crp->crp_flags);
-	if (crp->crp_etype != 0)
-		cryptostats.cs_errs++;
-	/*
-	 * CBIMM means unconditionally do the callback immediately;
-	 * CBIFSYNC means do the callback immediately only if the
-	 * operation was done synchronously.  Both are used to avoid
-	 * doing extraneous context switches; the latter is mostly
-	 * used with the software crypto driver.
-	 */
-	if ((crp->crp_flags & CRYPTO_F_CBIMM) ||
-	    ((crp->crp_flags & CRYPTO_F_CBIFSYNC) &&
-	     (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC))) {
-		/*
-		 * Do the callback directly.  This is ok when the
-		 * callback routine does very little (e.g. the
-		 * /dev/crypto callback method just does a wakeup).
-		 */
-		crp->crp_callback(crp);
-	} else {
-		unsigned long r_flags;
-		/*
-		 * Normal case; queue the callback for the thread.
-		 */
-		CRYPTO_RETQ_LOCK();
-		if (CRYPTO_RETQ_EMPTY())
-			wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
-		TAILQ_INSERT_TAIL(&crp_ret_q, crp, crp_next);
-		CRYPTO_RETQ_UNLOCK();
-	}
-}
-
-/*
- * Invoke the callback on behalf of the driver.
- */
-void
-crypto_kdone(struct cryptkop *krp)
-{
-	struct cryptocap *cap;
-	unsigned long d_flags;
-
-	if ((krp->krp_flags & CRYPTO_KF_DONE) != 0)
-		printk("crypto: crypto_kdone op already done, flags 0x%x",
-				krp->krp_flags);
-	krp->krp_flags |= CRYPTO_KF_DONE;
-	if (krp->krp_status != 0)
-		cryptostats.cs_kerrs++;
-
-	CRYPTO_DRIVER_LOCK();
-	/* XXX: What if driver is loaded in the meantime? */
-	if (krp->krp_hid < crypto_drivers_num) {
-		cap = &crypto_drivers[krp->krp_hid];
-		cap->cc_koperations--;
-		KASSERT(cap->cc_koperations >= 0, ("cc_koperations < 0"));
-		if (cap->cc_flags & CRYPTOCAP_F_CLEANUP)
-			crypto_remove(cap);
-	}
-	CRYPTO_DRIVER_UNLOCK();
-
-	/*
-	 * CBIMM means unconditionally do the callback immediately;
-	 * This is used to avoid doing extraneous context switches
-	 */
-	if ((krp->krp_flags & CRYPTO_KF_CBIMM)) {
-		/*
-		 * Do the callback directly.  This is ok when the
-		 * callback routine does very little (e.g. the
-		 * /dev/crypto callback method just does a wakeup).
-		 */
-		krp->krp_callback(krp);
-	} else {
-		unsigned long r_flags;
-		/*
-		 * Normal case; queue the callback for the thread.
-		 */
-		CRYPTO_RETQ_LOCK();
-		if (CRYPTO_RETQ_EMPTY())
-			wake_up_interruptible(&cryptoretproc_wait);/* shared wait channel */
-		TAILQ_INSERT_TAIL(&crp_ret_kq, krp, krp_next);
-		CRYPTO_RETQ_UNLOCK();
-	}
-}
-
-int
-crypto_getfeat(int *featp)
-{
-	int hid, kalg, feat = 0;
-	unsigned long d_flags;
-
-	CRYPTO_DRIVER_LOCK();
-	for (hid = 0; hid < crypto_drivers_num; hid++) {
-		const struct cryptocap *cap = &crypto_drivers[hid];
-
-		if ((cap->cc_flags & CRYPTOCAP_F_SOFTWARE) &&
-		    !crypto_devallowsoft) {
-			continue;
-		}
-		for (kalg = 0; kalg < CRK_ALGORITHM_MAX; kalg++)
-			if (cap->cc_kalg[kalg] & CRYPTO_ALG_FLAG_SUPPORTED)
-				feat |=  1 << kalg;
-	}
-	CRYPTO_DRIVER_UNLOCK();
-	*featp = feat;
-	return (0);
-}
-
-/*
- * Crypto thread, dispatches crypto requests.
- */
-static int
-crypto_proc(void *arg)
-{
-	struct cryptop *crp, *submit;
-	struct cryptkop *krp, *krpp;
-	struct cryptocap *cap;
-	u_int32_t hid;
-	int result, hint;
-	unsigned long q_flags;
-	int loopcount = 0;
-
-	ocf_daemonize("crypto");
-
-	CRYPTO_Q_LOCK();
-	for (;;) {
-		/*
-		 * we need to make sure we don't get into a busy loop with nothing
-		 * to do,  the two crypto_all_*blocked vars help us find out when
-		 * we are all full and can do nothing on any driver or Q.  If so we
-		 * wait for an unblock.
-		 */
-		crypto_all_qblocked  = !list_empty(&crp_q);
-
-		/*
-		 * Find the first element in the queue that can be
-		 * processed and look-ahead to see if multiple ops
-		 * are ready for the same driver.
-		 */
-		submit = NULL;
-		hint = 0;
-		list_for_each_entry(crp, &crp_q, crp_next) {
-			hid = CRYPTO_SESID2HID(crp->crp_sid);
-			cap = crypto_checkdriver(hid);
-			/*
-			 * Driver cannot disappear when there is an active
-			 * session.
-			 */
-			KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
-			    __func__, __LINE__));
-			if (cap == NULL || cap->cc_dev == NULL) {
-				/* Op needs to be migrated, process it. */
-				if (submit == NULL)
-					submit = crp;
-				break;
-			}
-			if (!cap->cc_qblocked) {
-				if (submit != NULL) {
-					/*
-					 * We stop on finding another op,
-					 * regardless whether its for the same
-					 * driver or not.  We could keep
-					 * searching the queue but it might be
-					 * better to just use a per-driver
-					 * queue instead.
-					 */
-					if (CRYPTO_SESID2HID(submit->crp_sid) == hid)
-						hint = CRYPTO_HINT_MORE;
-					break;
-				} else {
-					submit = crp;
-					if ((submit->crp_flags & CRYPTO_F_BATCH) == 0)
-						break;
-					/* keep scanning for more are q'd */
-				}
-			}
-		}
-		if (submit != NULL) {
-			hid = CRYPTO_SESID2HID(submit->crp_sid);
-			crypto_all_qblocked = 0;
-			list_del(&submit->crp_next);
-			crypto_drivers[hid].cc_unqblocked = 1;
-			cap = crypto_checkdriver(hid);
-			CRYPTO_Q_UNLOCK();
-			KASSERT(cap != NULL, ("%s:%u Driver disappeared.",
-			    __func__, __LINE__));
-			result = crypto_invoke(cap, submit, hint);
-			CRYPTO_Q_LOCK();
-			if (result == ERESTART) {
-				/*
-				 * The driver ran out of resources, mark the
-				 * driver ``blocked'' for cryptop's and put
-				 * the request back in the queue.  It would
-				 * best to put the request back where we got
-				 * it but that's hard so for now we put it
-				 * at the front.  This should be ok; putting
-				 * it at the end does not work.
-				 */
-				/* XXX validate sid again? */
-				list_add(&submit->crp_next, &crp_q);
-				cryptostats.cs_blocks++;
-				if (crypto_drivers[hid].cc_unqblocked)
-					crypto_drivers[hid].cc_qblocked=0;
-				crypto_drivers[hid].cc_unqblocked=0;
-			}
-			crypto_drivers[hid].cc_unqblocked = 0;
-		}
-
-		crypto_all_kqblocked = !list_empty(&crp_kq);
-
-		/* As above, but for key ops */
-		krp = NULL;
-		list_for_each_entry(krpp, &crp_kq, krp_next) {
-			cap = crypto_checkdriver(krpp->krp_hid);
-			if (cap == NULL || cap->cc_dev == NULL) {
-				/*
-				 * Operation needs to be migrated, invalidate
-				 * the assigned device so it will reselect a
-				 * new one below.  Propagate the original
-				 * crid selection flags if supplied.
-				 */
-				krp->krp_hid = krp->krp_crid &
-				    (CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE);
-				if (krp->krp_hid == 0)
-					krp->krp_hid =
-				    CRYPTOCAP_F_SOFTWARE|CRYPTOCAP_F_HARDWARE;
-				break;
-			}
-			if (!cap->cc_kqblocked) {
-				krp = krpp;
-				break;
-			}
-		}
-		if (krp != NULL) {
-			crypto_all_kqblocked = 0;
-			list_del(&krp->krp_next);
-			crypto_drivers[krp->krp_hid].cc_kqblocked = 1;
-			CRYPTO_Q_UNLOCK();
-			result = crypto_kinvoke(krp, krp->krp_hid);
-			CRYPTO_Q_LOCK();
-			if (result == ERESTART) {
-				/*
-				 * The driver ran out of resources, mark the
-				 * driver ``blocked'' for cryptkop's and put
-				 * the request back in the queue.  It would
-				 * best to put the request back where we got
-				 * it but that's hard so for now we put it
-				 * at the front.  This should be ok; putting
-				 * it at the end does not work.
-				 */
-				/* XXX validate sid again? */
-				list_add(&krp->krp_next, &crp_kq);
-				cryptostats.cs_kblocks++;
-			} else
-				crypto_drivers[krp->krp_hid].cc_kqblocked = 0;
-		}
-
-		if (submit == NULL && krp == NULL) {
-			/*
-			 * Nothing more to be processed.  Sleep until we're
-			 * woken because there are more ops to process.
-			 * This happens either by submission or by a driver
-			 * becoming unblocked and notifying us through
-			 * crypto_unblock.  Note that when we wakeup we
-			 * start processing each queue again from the
-			 * front. It's not clear that it's important to
-			 * preserve this ordering since ops may finish
-			 * out of order if dispatched to different devices
-			 * and some become blocked while others do not.
-			 */
-			dprintk("%s - sleeping (qe=%d qb=%d kqe=%d kqb=%d)\n",
-					__FUNCTION__,
-					list_empty(&crp_q), crypto_all_qblocked,
-					list_empty(&crp_kq), crypto_all_kqblocked);
-			loopcount = 0;
-			CRYPTO_Q_UNLOCK();
-			crp_sleep = 1;
-			wait_event_interruptible(cryptoproc_wait,
-					!(list_empty(&crp_q) || crypto_all_qblocked) ||
-					!(list_empty(&crp_kq) || crypto_all_kqblocked) ||
-					cryptoproc == (pid_t) -1);
-			crp_sleep = 0;
-			if (signal_pending (current)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				spin_lock_irq(&current->sigmask_lock);
-#endif
-				flush_signals(current);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				spin_unlock_irq(&current->sigmask_lock);
-#endif
-			}
-			CRYPTO_Q_LOCK();
-			dprintk("%s - awake\n", __FUNCTION__);
-			if (cryptoproc == (pid_t) -1)
-				break;
-			cryptostats.cs_intrs++;
-		} else if (loopcount > crypto_max_loopcount) {
-			/*
-			 * Give other processes a chance to run if we've 
-			 * been using the CPU exclusively for a while.
-			 */
-			loopcount = 0;
-			schedule();
-		}
-		loopcount++;
-	}
-	CRYPTO_Q_UNLOCK();
-	complete_and_exit(&cryptoproc_exited, 0);
-}
-
-/*
- * Crypto returns thread, does callbacks for processed crypto requests.
- * Callbacks are done here, rather than in the crypto drivers, because
- * callbacks typically are expensive and would slow interrupt handling.
- */
-static int
-crypto_ret_proc(void *arg)
-{
-	struct cryptop *crpt;
-	struct cryptkop *krpt;
-	unsigned long  r_flags;
-
-	ocf_daemonize("crypto_ret");
-
-	CRYPTO_RETQ_LOCK();
-	for (;;) {
-		/* Harvest return q's for completed ops */
-		crpt = NULL;
-		if (!list_empty(&crp_ret_q))
-			crpt = list_entry(crp_ret_q.next, typeof(*crpt), crp_next);
-		if (crpt != NULL)
-			list_del(&crpt->crp_next);
-
-		krpt = NULL;
-		if (!list_empty(&crp_ret_kq))
-			krpt = list_entry(crp_ret_kq.next, typeof(*krpt), krp_next);
-		if (krpt != NULL)
-			list_del(&krpt->krp_next);
-
-		if (crpt != NULL || krpt != NULL) {
-			CRYPTO_RETQ_UNLOCK();
-			/*
-			 * Run callbacks unlocked.
-			 */
-			if (crpt != NULL)
-				crpt->crp_callback(crpt);
-			if (krpt != NULL)
-				krpt->krp_callback(krpt);
-			CRYPTO_RETQ_LOCK();
-		} else {
-			/*
-			 * Nothing more to be processed.  Sleep until we're
-			 * woken because there are more returns to process.
-			 */
-			dprintk("%s - sleeping\n", __FUNCTION__);
-			CRYPTO_RETQ_UNLOCK();
-			wait_event_interruptible(cryptoretproc_wait,
-					cryptoretproc == (pid_t) -1 ||
-					!list_empty(&crp_ret_q) ||
-					!list_empty(&crp_ret_kq));
-			if (signal_pending (current)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				spin_lock_irq(&current->sigmask_lock);
-#endif
-				flush_signals(current);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				spin_unlock_irq(&current->sigmask_lock);
-#endif
-			}
-			CRYPTO_RETQ_LOCK();
-			dprintk("%s - awake\n", __FUNCTION__);
-			if (cryptoretproc == (pid_t) -1) {
-				dprintk("%s - EXITING!\n", __FUNCTION__);
-				break;
-			}
-			cryptostats.cs_rets++;
-		}
-	}
-	CRYPTO_RETQ_UNLOCK();
-	complete_and_exit(&cryptoretproc_exited, 0);
-}
-
-
-#if 0 /* should put this into /proc or something */
-static void
-db_show_drivers(void)
-{
-	int hid;
-
-	db_printf("%12s %4s %4s %8s %2s %2s\n"
-		, "Device"
-		, "Ses"
-		, "Kops"
-		, "Flags"
-		, "QB"
-		, "KB"
-	);
-	for (hid = 0; hid < crypto_drivers_num; hid++) {
-		const struct cryptocap *cap = &crypto_drivers[hid];
-		if (cap->cc_dev == NULL)
-			continue;
-		db_printf("%-12s %4u %4u %08x %2u %2u\n"
-		    , device_get_nameunit(cap->cc_dev)
-		    , cap->cc_sessions
-		    , cap->cc_koperations
-		    , cap->cc_flags
-		    , cap->cc_qblocked
-		    , cap->cc_kqblocked
-		);
-	}
-}
-
-DB_SHOW_COMMAND(crypto, db_show_crypto)
-{
-	struct cryptop *crp;
-
-	db_show_drivers();
-	db_printf("\n");
-
-	db_printf("%4s %8s %4s %4s %4s %4s %8s %8s\n",
-	    "HID", "Caps", "Ilen", "Olen", "Etype", "Flags",
-	    "Desc", "Callback");
-	TAILQ_FOREACH(crp, &crp_q, crp_next) {
-		db_printf("%4u %08x %4u %4u %4u %04x %8p %8p\n"
-		    , (int) CRYPTO_SESID2HID(crp->crp_sid)
-		    , (int) CRYPTO_SESID2CAPS(crp->crp_sid)
-		    , crp->crp_ilen, crp->crp_olen
-		    , crp->crp_etype
-		    , crp->crp_flags
-		    , crp->crp_desc
-		    , crp->crp_callback
-		);
-	}
-	if (!TAILQ_EMPTY(&crp_ret_q)) {
-		db_printf("\n%4s %4s %4s %8s\n",
-		    "HID", "Etype", "Flags", "Callback");
-		TAILQ_FOREACH(crp, &crp_ret_q, crp_next) {
-			db_printf("%4u %4u %04x %8p\n"
-			    , (int) CRYPTO_SESID2HID(crp->crp_sid)
-			    , crp->crp_etype
-			    , crp->crp_flags
-			    , crp->crp_callback
-			);
-		}
-	}
-}
-
-DB_SHOW_COMMAND(kcrypto, db_show_kcrypto)
-{
-	struct cryptkop *krp;
-
-	db_show_drivers();
-	db_printf("\n");
-
-	db_printf("%4s %5s %4s %4s %8s %4s %8s\n",
-	    "Op", "Status", "#IP", "#OP", "CRID", "HID", "Callback");
-	TAILQ_FOREACH(krp, &crp_kq, krp_next) {
-		db_printf("%4u %5u %4u %4u %08x %4u %8p\n"
-		    , krp->krp_op
-		    , krp->krp_status
-		    , krp->krp_iparams, krp->krp_oparams
-		    , krp->krp_crid, krp->krp_hid
-		    , krp->krp_callback
-		);
-	}
-	if (!TAILQ_EMPTY(&crp_ret_q)) {
-		db_printf("%4s %5s %8s %4s %8s\n",
-		    "Op", "Status", "CRID", "HID", "Callback");
-		TAILQ_FOREACH(krp, &crp_ret_kq, krp_next) {
-			db_printf("%4u %5u %08x %4u %8p\n"
-			    , krp->krp_op
-			    , krp->krp_status
-			    , krp->krp_crid, krp->krp_hid
-			    , krp->krp_callback
-			);
-		}
-	}
-}
-#endif
-
-
-static int
-crypto_init(void)
-{
-	int error;
-
-	dprintk("%s(%p)\n", __FUNCTION__, (void *) crypto_init);
-
-	if (crypto_initted)
-		return 0;
-	crypto_initted = 1;
-
-	spin_lock_init(&crypto_drivers_lock);
-	spin_lock_init(&crypto_q_lock);
-	spin_lock_init(&crypto_ret_q_lock);
-
-	cryptop_zone = kmem_cache_create("cryptop", sizeof(struct cryptop),
-				       0, SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-				       , NULL
-#endif
-					);
-
-	cryptodesc_zone = kmem_cache_create("cryptodesc", sizeof(struct cryptodesc),
-				       0, SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-				       , NULL
-#endif
-					);
-
-	if (cryptodesc_zone == NULL || cryptop_zone == NULL) {
-		printk("crypto: crypto_init cannot setup crypto zones\n");
-		error = ENOMEM;
-		goto bad;
-	}
-
-	crypto_drivers_num = CRYPTO_DRIVERS_INITIAL;
-	crypto_drivers = kmalloc(crypto_drivers_num * sizeof(struct cryptocap),
-			GFP_KERNEL);
-	if (crypto_drivers == NULL) {
-		printk("crypto: crypto_init cannot setup crypto drivers\n");
-		error = ENOMEM;
-		goto bad;
-	}
-
-	memset(crypto_drivers, 0, crypto_drivers_num * sizeof(struct cryptocap));
-
-	init_completion(&cryptoproc_exited);
-	init_completion(&cryptoretproc_exited);
-
-	cryptoproc = 0; /* to avoid race condition where proc runs first */
-	cryptoproc = kernel_thread(crypto_proc, NULL, CLONE_FS|CLONE_FILES);
-	if (cryptoproc < 0) {
-		error = cryptoproc;
-		printk("crypto: crypto_init cannot start crypto thread; error %d",
-			error);
-		goto bad;
-	}
-
-	cryptoretproc = 0; /* to avoid race condition where proc runs first */
-	cryptoretproc = kernel_thread(crypto_ret_proc, NULL, CLONE_FS|CLONE_FILES);
-	if (cryptoretproc < 0) {
-		error = cryptoretproc;
-		printk("crypto: crypto_init cannot start cryptoret thread; error %d",
-				error);
-		goto bad;
-	}
-
-	return 0;
-bad:
-	crypto_exit();
-	return error;
-}
-
-
-static void
-crypto_exit(void)
-{
-	pid_t p;
-	unsigned long d_flags;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	/*
-	 * Terminate any crypto threads.
-	 */
-
-	CRYPTO_DRIVER_LOCK();
-	p = cryptoproc;
-	cryptoproc = (pid_t) -1;
-	kill_proc(p, SIGTERM, 1);
-	wake_up_interruptible(&cryptoproc_wait);
-	CRYPTO_DRIVER_UNLOCK();
-
-	wait_for_completion(&cryptoproc_exited);
-
-	CRYPTO_DRIVER_LOCK();
-	p = cryptoretproc;
-	cryptoretproc = (pid_t) -1;
-	kill_proc(p, SIGTERM, 1);
-	wake_up_interruptible(&cryptoretproc_wait);
-	CRYPTO_DRIVER_UNLOCK();
-
-	wait_for_completion(&cryptoretproc_exited);
-
-	/* XXX flush queues??? */
-
-	/* 
-	 * Reclaim dynamically allocated resources.
-	 */
-	if (crypto_drivers != NULL)
-		kfree(crypto_drivers);
-
-	if (cryptodesc_zone != NULL)
-		kmem_cache_destroy(cryptodesc_zone);
-	if (cryptop_zone != NULL)
-		kmem_cache_destroy(cryptop_zone);
-}
-
-
-EXPORT_SYMBOL(crypto_newsession);
-EXPORT_SYMBOL(crypto_freesession);
-EXPORT_SYMBOL(crypto_get_driverid);
-EXPORT_SYMBOL(crypto_kregister);
-EXPORT_SYMBOL(crypto_register);
-EXPORT_SYMBOL(crypto_unregister);
-EXPORT_SYMBOL(crypto_unregister_all);
-EXPORT_SYMBOL(crypto_unblock);
-EXPORT_SYMBOL(crypto_dispatch);
-EXPORT_SYMBOL(crypto_kdispatch);
-EXPORT_SYMBOL(crypto_freereq);
-EXPORT_SYMBOL(crypto_getreq);
-EXPORT_SYMBOL(crypto_done);
-EXPORT_SYMBOL(crypto_kdone);
-EXPORT_SYMBOL(crypto_getfeat);
-EXPORT_SYMBOL(crypto_userasymcrypto);
-EXPORT_SYMBOL(crypto_getcaps);
-EXPORT_SYMBOL(crypto_find_driver);
-EXPORT_SYMBOL(crypto_find_device_byhid);
-
-module_init(crypto_init);
-module_exit(crypto_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("OCF (OpenBSD Cryptographic Framework)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/Makefile b/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/Makefile
deleted file mode 100644
index eeed0d6411..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_CRYPTOCTEON) += cryptocteon.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef CONFIG_OCF_CRYPTOCTEON
-# you need the cavium crypto component installed
-EXTRA_CFLAGS += -I$(ROOTDIR)/prop/include
-endif
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cavium_crypto.c b/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cavium_crypto.c
deleted file mode 100644
index ceaf77c5c8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cavium_crypto.c
+++ /dev/null
@@ -1,2283 +0,0 @@
-/*
- * Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
- *
- * Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
- * reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Cavium Networks
- * 4. Cavium Networks' name may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- * 
- * This Software, including technical data, may be subject to U.S. export
- * control laws, including the U.S. Export Administration Act and its
- * associated regulations, and may be subject to export or import regulations
- * in other countries. You warrant that You will comply strictly in all
- * respects with all such regulations and acknowledge that you have the
- * responsibility to obtain licenses to export, re-export or import the
- * Software.
- * 
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" AND
- * WITH ALL FAULTS AND CAVIUM MAKES NO PROMISES, REPRESENTATIONS OR WARRANTIES,
- * EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO THE
- * SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
- * DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
- * SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE,
- * MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF
- * VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
- * CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR
- * PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
-*/
-/****************************************************************************/
-
-#include <linux/scatterlist.h>
-#include <asm/octeon/octeon.h>
-#include "octeon-asm.h"
-
-/****************************************************************************/
-
-extern unsigned long octeon_crypto_enable(struct octeon_cop2_state *);
-extern void octeon_crypto_disable(struct octeon_cop2_state *, unsigned long);
-
-#define SG_INIT(s, p, i, l) \
-	{ \
-	    (i) = 0; \
-	    (l) = (s)[0].length; \
-	    (p) = (typeof(p)) sg_virt((s)); \
-		CVMX_PREFETCH0((p)); \
-	}
-
-#define SG_CONSUME(s, p, i, l) \
-	{ \
-		(p)++; \
-		(l) -= sizeof(*(p)); \
-		if ((l) < 0) { \
-			dprintk("%s, %d: l = %d\n", __FILE__, __LINE__, l); \
-		} else if ((l) == 0) { \
-		    (i)++; \
-		    (l) = (s)[0].length; \
-		    (p) = (typeof(p)) sg_virt(s); \
-			CVMX_PREFETCH0((p)); \
-		} \
-	}
-
-#define ESP_HEADER_LENGTH     8
-#define DES_CBC_IV_LENGTH     8
-#define AES_CBC_IV_LENGTH     16
-#define ESP_HMAC_LEN          12
-
-#define ESP_HEADER_LENGTH 8
-#define DES_CBC_IV_LENGTH 8
-
-/****************************************************************************/
-
-#define CVM_LOAD_SHA_UNIT(dat, next)  { \
-   if (next == 0) {                     \
-      next = 1;                         \
-      CVMX_MT_HSH_DAT (dat, 0);         \
-   } else if (next == 1) {              \
-      next = 2;                         \
-      CVMX_MT_HSH_DAT (dat, 1);         \
-   } else if (next == 2) {              \
-      next = 3;                    \
-      CVMX_MT_HSH_DAT (dat, 2);         \
-   } else if (next == 3) {              \
-      next = 4;                         \
-      CVMX_MT_HSH_DAT (dat, 3);         \
-   } else if (next == 4) {              \
-      next = 5;                           \
-      CVMX_MT_HSH_DAT (dat, 4);         \
-   } else if (next == 5) {              \
-      next = 6;                         \
-      CVMX_MT_HSH_DAT (dat, 5);         \
-   } else if (next == 6) {              \
-      next = 7;                         \
-      CVMX_MT_HSH_DAT (dat, 6);         \
-   } else {                             \
-     CVMX_MT_HSH_STARTSHA (dat);        \
-     next = 0;                          \
-   }                                    \
-}
-
-#define CVM_LOAD2_SHA_UNIT(dat1, dat2, next)  { \
-   if (next == 0) {                      \
-      CVMX_MT_HSH_DAT (dat1, 0);         \
-      CVMX_MT_HSH_DAT (dat2, 1);         \
-      next = 2;                          \
-   } else if (next == 1) {               \
-      CVMX_MT_HSH_DAT (dat1, 1);         \
-      CVMX_MT_HSH_DAT (dat2, 2);         \
-      next = 3;                          \
-   } else if (next == 2) {               \
-      CVMX_MT_HSH_DAT (dat1, 2);         \
-      CVMX_MT_HSH_DAT (dat2, 3);         \
-      next = 4;                          \
-   } else if (next == 3) {               \
-      CVMX_MT_HSH_DAT (dat1, 3);         \
-      CVMX_MT_HSH_DAT (dat2, 4);         \
-      next = 5;                          \
-   } else if (next == 4) {               \
-      CVMX_MT_HSH_DAT (dat1, 4);         \
-      CVMX_MT_HSH_DAT (dat2, 5);         \
-      next = 6;                          \
-   } else if (next == 5) {               \
-      CVMX_MT_HSH_DAT (dat1, 5);         \
-      CVMX_MT_HSH_DAT (dat2, 6);         \
-      next = 7;                          \
-   } else if (next == 6) {               \
-      CVMX_MT_HSH_DAT (dat1, 6);         \
-      CVMX_MT_HSH_STARTSHA (dat2);       \
-      next = 0;                          \
-   } else {                              \
-     CVMX_MT_HSH_STARTSHA (dat1);        \
-     CVMX_MT_HSH_DAT (dat2, 0);          \
-     next = 1;                           \
-   }                                     \
-}
-
-/****************************************************************************/
-
-#define CVM_LOAD_MD5_UNIT(dat, next)  { \
-   if (next == 0) {                     \
-      next = 1;                         \
-      CVMX_MT_HSH_DAT (dat, 0);         \
-   } else if (next == 1) {              \
-      next = 2;                         \
-      CVMX_MT_HSH_DAT (dat, 1);         \
-   } else if (next == 2) {              \
-      next = 3;                    \
-      CVMX_MT_HSH_DAT (dat, 2);         \
-   } else if (next == 3) {              \
-      next = 4;                         \
-      CVMX_MT_HSH_DAT (dat, 3);         \
-   } else if (next == 4) {              \
-      next = 5;                           \
-      CVMX_MT_HSH_DAT (dat, 4);         \
-   } else if (next == 5) {              \
-      next = 6;                         \
-      CVMX_MT_HSH_DAT (dat, 5);         \
-   } else if (next == 6) {              \
-      next = 7;                         \
-      CVMX_MT_HSH_DAT (dat, 6);         \
-   } else {                             \
-     CVMX_MT_HSH_STARTMD5 (dat);        \
-     next = 0;                          \
-   }                                    \
-}
-
-#define CVM_LOAD2_MD5_UNIT(dat1, dat2, next)  { \
-   if (next == 0) {                      \
-      CVMX_MT_HSH_DAT (dat1, 0);         \
-      CVMX_MT_HSH_DAT (dat2, 1);         \
-      next = 2;                          \
-   } else if (next == 1) {               \
-      CVMX_MT_HSH_DAT (dat1, 1);         \
-      CVMX_MT_HSH_DAT (dat2, 2);         \
-      next = 3;                          \
-   } else if (next == 2) {               \
-      CVMX_MT_HSH_DAT (dat1, 2);         \
-      CVMX_MT_HSH_DAT (dat2, 3);         \
-      next = 4;                          \
-   } else if (next == 3) {               \
-      CVMX_MT_HSH_DAT (dat1, 3);         \
-      CVMX_MT_HSH_DAT (dat2, 4);         \
-      next = 5;                          \
-   } else if (next == 4) {               \
-      CVMX_MT_HSH_DAT (dat1, 4);         \
-      CVMX_MT_HSH_DAT (dat2, 5);         \
-      next = 6;                          \
-   } else if (next == 5) {               \
-      CVMX_MT_HSH_DAT (dat1, 5);         \
-      CVMX_MT_HSH_DAT (dat2, 6);         \
-      next = 7;                          \
-   } else if (next == 6) {               \
-      CVMX_MT_HSH_DAT (dat1, 6);         \
-      CVMX_MT_HSH_STARTMD5 (dat2);       \
-      next = 0;                          \
-   } else {                              \
-     CVMX_MT_HSH_STARTMD5 (dat1);        \
-     CVMX_MT_HSH_DAT (dat2, 0);          \
-     next = 1;                           \
-   }                                     \
-}
-
-/****************************************************************************/
-
-static inline uint64_t
-swap64(uint64_t a)
-{
-    return ((a >> 56) |
-       (((a >> 48) & 0xfful) << 8) |
-       (((a >> 40) & 0xfful) << 16) |
-       (((a >> 32) & 0xfful) << 24) |
-       (((a >> 24) & 0xfful) << 32) |
-       (((a >> 16) & 0xfful) << 40) |
-       (((a >> 8) & 0xfful) << 48) | (((a >> 0) & 0xfful) << 56));
-}
-
-/****************************************************************************/
-
-void
-octo_calc_hash(__u8 auth, unsigned char *key, uint64_t *inner, uint64_t *outer)
-{
-    uint8_t hash_key[64];
-    uint64_t *key1;
-    register uint64_t xor1 = 0x3636363636363636ULL;
-    register uint64_t xor2 = 0x5c5c5c5c5c5c5c5cULL;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    memset(hash_key, 0, sizeof(hash_key));
-    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
-    key1 = (uint64_t *) hash_key;
-    flags = octeon_crypto_enable(&state);
-    if (auth) {
-       CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
-       CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
-       CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
-    } else {
-       CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
-       CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
-    }
-
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 0);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 1);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 2);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 3);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 4);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 5);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor1), 6);
-    key1++;
-    if (auth)
-	CVMX_MT_HSH_STARTSHA((*key1 ^ xor1));
-    else
-	CVMX_MT_HSH_STARTMD5((*key1 ^ xor1));
-
-    CVMX_MF_HSH_IV(inner[0], 0);
-    CVMX_MF_HSH_IV(inner[1], 1);
-    if (auth) {
-	inner[2] = 0;
-	CVMX_MF_HSH_IV(((uint64_t *) inner)[2], 2);
-    }
-
-    memset(hash_key, 0, sizeof(hash_key));
-    memcpy(hash_key, (uint8_t *) key, (auth ? 20 : 16));
-    key1 = (uint64_t *) hash_key;
-    if (auth) {
-      CVMX_MT_HSH_IV(0x67452301EFCDAB89ULL, 0);
-      CVMX_MT_HSH_IV(0x98BADCFE10325476ULL, 1);
-      CVMX_MT_HSH_IV(0xC3D2E1F000000000ULL, 2);
-    } else {
-      CVMX_MT_HSH_IV(0x0123456789ABCDEFULL, 0);
-      CVMX_MT_HSH_IV(0xFEDCBA9876543210ULL, 1);
-    }
-
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 0);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 1);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 2);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 3);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 4);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 5);
-    key1++;
-    CVMX_MT_HSH_DAT((*key1 ^ xor2), 6);
-    key1++;
-    if (auth)
-       CVMX_MT_HSH_STARTSHA((*key1 ^ xor2));
-    else 
-       CVMX_MT_HSH_STARTMD5((*key1 ^ xor2));
-
-    CVMX_MF_HSH_IV(outer[0], 0);
-    CVMX_MF_HSH_IV(outer[1], 1);
-    if (auth) {
-      outer[2] = 0;
-      CVMX_MF_HSH_IV(outer[2], 2);
-    }
-    octeon_crypto_disable(&state, flags);
-    return;
-}
-
-/****************************************************************************/
-/* DES functions */
-
-int
-octo_des_cbc_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    while (crypt_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-	CVMX_MT_3DES_ENC_CBC(*data);
-	CVMX_MF_3DES_RESULT(*data);
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_len -= 8;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-
-int
-octo_des_cbc_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    while (crypt_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-	CVMX_MT_3DES_DEC_CBC(*data);
-	CVMX_MF_3DES_RESULT(*data);
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_len -= 8;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES functions */
-
-int
-octo_aes_cbc_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data, *pdata;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    while (crypt_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-	pdata = data;
-	CVMX_MT_AES_ENC_CBC0(*data);
-	SG_CONSUME(sg, data, data_i, data_l);
-	CVMX_MT_AES_ENC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_len -= 16;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-
-int
-octo_aes_cbc_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    uint64_t *data, *pdata;
-    int data_i, data_l;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x7) || (crypt_off + crypt_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    while (crypt_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_off -= 8;
-    }
-
-    while (crypt_len > 0) {
-	pdata = data;
-	CVMX_MT_AES_DEC_CBC0(*data);
-	SG_CONSUME(sg, data, data_i, data_l);
-	CVMX_MT_AES_DEC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	SG_CONSUME(sg, data, data_i, data_l);
-	crypt_len -= 16;
-    }
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* MD5 */
-
-int
-octo_null_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    uint64_t *data;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
-	    (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (auth_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	auth_off -= 8;
-    }
-
-    while (auth_len > 0) {
-	CVM_LOAD_MD5_UNIT(*data, next);
-	auth_len -= 8;
-	SG_CONSUME(sg, data, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	icv_off -= 8;
-    }
-    CVMX_MF_HSH_IV(*data, 0);
-    SG_CONSUME(sg, data, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* SHA1 */
-
-int
-octo_null_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    uint64_t *data;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 ||
-	    (auth_off & 0x7) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data, data_i, data_l);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (auth_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	auth_off -= 8;
-    }
-
-    while (auth_len > 0) {
-	CVM_LOAD_SHA_UNIT(*data, next);
-	auth_len -= 8;
-	SG_CONSUME(sg, data, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* save the HMAC */
-    SG_INIT(sg, data, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data, data_i, data_l);
-	icv_off -= 8;
-    }
-    CVMX_MF_HSH_IV(*data, 0);
-    SG_CONSUME(sg, data, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *(uint32_t *)data = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* DES MD5 */
-
-int
-octo_des_cbc_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-    	uint32_t *first = data32;
-	mydata.data32[0] = *first;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata.data32[1] = *data32;
-    	if (crypt_off <= 0) {
-	    if (crypt_len > 0) {
-		CVMX_MT_3DES_ENC_CBC(*data);
-		CVMX_MF_3DES_RESULT(*data);
-		crypt_len -= 8;
-	    }
-	} else
-	    crypt_off -= 8;
-    	if (auth_off <= 0) {
-	    if (auth_len > 0) {
-		CVM_LOAD_MD5_UNIT(*data, next);
-		auth_len -= 8;
-	    }
-	} else
-	    auth_off -= 8;
-	*first = mydata.data32[0];
-	*data32 = mydata.data32[1];
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_des_cbc_md5_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-    	uint32_t *first = data32;
-	mydata.data32[0] = *first;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata.data32[1] = *data32;
-    	if (auth_off <= 0) {
-	    if (auth_len > 0) {
-		CVM_LOAD_MD5_UNIT(*data, next);
-		auth_len -= 8;
-	    }
-	} else
-	    auth_off -= 8;
-    	if (crypt_off <= 0) {
-	    if (crypt_len > 0) {
-		CVMX_MT_3DES_DEC_CBC(*data);
-		CVMX_MF_3DES_RESULT(*data);
-		crypt_len -= 8;
-	    }
-	} else
-	    crypt_off -= 8;
-	*first = mydata.data32[0];
-	*data32 = mydata.data32[1];
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* DES SHA */
-
-int
-octo_des_cbc_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-    	uint32_t *first = data32;
-	mydata.data32[0] = *first;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata.data32[1] = *data32;
-    	if (crypt_off <= 0) {
-	    if (crypt_len > 0) {
-		CVMX_MT_3DES_ENC_CBC(*data);
-		CVMX_MF_3DES_RESULT(*data);
-		crypt_len -= 8;
-	    }
-	} else
-	    crypt_off -= 8;
-    	if (auth_off <= 0) {
-	    if (auth_len > 0) {
-		CVM_LOAD_SHA_UNIT(*data, next);
-		auth_len -= 8;
-	    }
-	} else
-	    auth_off -= 8;
-	*first = mydata.data32[0];
-	*data32 = mydata.data32[1];
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-	CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_des_cbc_sha1_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata;
-    uint64_t *data = &mydata.data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load 3DES Key */
-    CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    if (od->octo_encklen == 24) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-    } else if (od->octo_encklen == 8) {
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 1);
-	CVMX_MT_3DES_KEY(((uint64_t *) od->octo_enckey)[0], 2);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-
-    CVMX_MT_3DES_IV(* (uint64_t *) ivp);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    while (crypt_len > 0 || auth_len > 0) {
-    	uint32_t *first = data32;
-	mydata.data32[0] = *first;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata.data32[1] = *data32;
-    	if (auth_off <= 0) {
-	    if (auth_len > 0) {
-		CVM_LOAD_SHA_UNIT(*data, next);
-		auth_len -= 8;
-	    }
-	} else
-	    auth_off -= 8;
-    	if (crypt_off <= 0) {
-	    if (crypt_len > 0) {
-		CVMX_MT_3DES_DEC_CBC(*data);
-		CVMX_MF_3DES_RESULT(*data);
-		crypt_len -= 8;
-	    }
-	} else
-	    crypt_off -= 8;
-	*first = mydata.data32[0];
-	*data32 = mydata.data32[1];
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES MD5 */
-
-int
-octo_aes_cbc_md5_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_MD5_UNIT(*pdata, next);
-	crypt_off -= 8;
-	auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-    	uint32_t *pdata32[3];
-
-	pdata32[0] = data32;
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-
-	pdata32[1] = data32;
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-
-	pdata32[2] = data32;
-	mydata[1].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-
-	mydata[1].data32[1] = *data32;
-
-	CVMX_MT_AES_ENC_CBC0(*pdata);
-	CVMX_MT_AES_ENC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	crypt_len -= 16;
-
-	if (auth_len > 0) {
-	    CVM_LOAD_MD5_UNIT(*pdata, next);
-	    auth_len -= 8;
-	}
-	if (auth_len > 0) {
-	    CVM_LOAD_MD5_UNIT(*data, next);
-	    auth_len -= 8;
-	}
-
-	*pdata32[0] = mydata[0].data32[0];
-	*pdata32[1] = mydata[0].data32[1];
-	*pdata32[2] = mydata[1].data32[0];
-	*data32     = mydata[1].data32[1];
-
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish any left over hashing */
-    while (auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_MD5_UNIT(*pdata, next);
-	auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_aes_cbc_md5_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s()\n", __FUNCTION__);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load MD5 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_MD5_UNIT(*pdata, next);
-	crypt_off -= 8;
-	auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-    	uint32_t *pdata32[3];
-
-	pdata32[0] = data32;
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[1] = data32;
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[2] = data32;
-	mydata[1].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[1].data32[1] = *data32;
-
-	if (auth_len > 0) {
-	    CVM_LOAD_MD5_UNIT(*pdata, next);
-	    auth_len -= 8;
-	}
-
-	if (auth_len > 0) {
-	    CVM_LOAD_MD5_UNIT(*data, next);
-	    auth_len -= 8;
-	}
-
-	CVMX_MT_AES_DEC_CBC0(*pdata);
-	CVMX_MT_AES_DEC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	crypt_len -= 16;
-
-	*pdata32[0] = mydata[0].data32[0];
-	*pdata32[1] = mydata[0].data32[1];
-	*pdata32[2] = mydata[1].data32[0];
-	*data32     = mydata[1].data32[1];
-
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish left over hash if any */
-    while (auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_MD5_UNIT(*pdata, next);
-	auth_len -= 8;
-    }
-
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_MD5_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVMX_ES64(tmp1, ((alen + 64) << 3));
-    CVM_LOAD_MD5_UNIT(tmp1, next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    CVMX_MT_HSH_DAT(0x8000000000000000ULL, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_ES64(tmp1, ((64 + 16) << 3));
-    CVMX_MT_HSH_STARTMD5(tmp1);
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
-/* AES SHA1 */
-
-int
-octo_aes_cbc_sha1_encrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
-			__FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load SHA IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_SHA_UNIT(*pdata, next);
-	crypt_off -= 8;
-	auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-    	uint32_t *pdata32[3];
-
-	pdata32[0] = data32;
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[1] = data32;
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[2] = data32;
-	mydata[1].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[1].data32[1] = *data32;
-
-	CVMX_MT_AES_ENC_CBC0(*pdata);
-	CVMX_MT_AES_ENC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	crypt_len -= 16;
-
-	if (auth_len > 0) {
-	    CVM_LOAD_SHA_UNIT(*pdata, next);
-	    auth_len -= 8;
-	}
-	if (auth_len > 0) {
-	    CVM_LOAD_SHA_UNIT(*data, next);
-	    auth_len -= 8;
-	}
-
-	*pdata32[0] = mydata[0].data32[0];
-	*pdata32[1] = mydata[0].data32[1];
-	*pdata32[2] = mydata[1].data32[0];
-	*data32     = mydata[1].data32[1];
-
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish and hashing */
-    while (auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_SHA_UNIT(*pdata, next);
-	auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-    CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-int
-octo_aes_cbc_sha1_decrypt(
-    struct octo_sess *od,
-    struct scatterlist *sg, int sg_len,
-    int auth_off, int auth_len,
-    int crypt_off, int crypt_len,
-    int icv_off, uint8_t *ivp)
-{
-    register int next = 0;
-    union {
-	uint32_t data32[2];
-	uint64_t data64[1];
-    } mydata[2];
-    uint64_t *pdata = &mydata[0].data64[0];
-    uint64_t *data =  &mydata[1].data64[0];
-    uint32_t *data32;
-    uint64_t tmp1, tmp2, tmp3;
-    int data_i, data_l, alen = auth_len;
-    struct octeon_cop2_state state;
-    unsigned long flags;
-
-    dprintk("%s(a_off=%d a_len=%d c_off=%d c_len=%d icv_off=%d)\n",
-			__FUNCTION__, auth_off, auth_len, crypt_off, crypt_len, icv_off);
-
-    if (unlikely(od == NULL || sg==NULL || sg_len==0 || ivp==NULL ||
-	    (crypt_off & 0x3) || (crypt_off + crypt_len > sg_len) ||
-	    (crypt_len  & 0x7) ||
-	    (auth_len  & 0x7) ||
-	    (auth_off & 0x3) || (auth_off + auth_len > sg_len))) {
-	dprintk("%s: Bad parameters od=%p sg=%p sg_len=%d "
-		"auth_off=%d auth_len=%d crypt_off=%d crypt_len=%d "
-		"icv_off=%d ivp=%p\n", __FUNCTION__, od, sg, sg_len,
-		auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	return -EINVAL;
-    }
-
-    SG_INIT(sg, data32, data_i, data_l);
-
-    CVMX_PREFETCH0(ivp);
-    CVMX_PREFETCH0(od->octo_enckey);
-
-    flags = octeon_crypto_enable(&state);
-
-    /* load AES Key */
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[0], 0);
-    CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[1], 1);
-
-    if (od->octo_encklen == 16) {
-	CVMX_MT_AES_KEY(0x0, 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 24) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(0x0, 3);
-    } else if (od->octo_encklen == 32) {
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[2], 2);
-	CVMX_MT_AES_KEY(((uint64_t *) od->octo_enckey)[3], 3);
-    } else {
-	octeon_crypto_disable(&state, flags);
-	dprintk("%s: Bad key length %d\n", __FUNCTION__, od->octo_encklen);
-	return -EINVAL;
-    }
-    CVMX_MT_AES_KEYLENGTH(od->octo_encklen / 8 - 1);
-
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[0], 0);
-    CVMX_MT_AES_IV(((uint64_t *) ivp)[1], 1);
-
-    /* Load SHA1 IV */
-    CVMX_MT_HSH_IV(od->octo_hminner[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hminner[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hminner[2], 2);
-
-    while (crypt_off > 0 && auth_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	crypt_off -= 4;
-	auth_off -= 4;
-    }
-
-    /* align auth and crypt */
-    while (crypt_off > 0 && auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_SHA_UNIT(*pdata, next);
-	crypt_off -= 8;
-	auth_len -= 8;
-    }
-
-    while (crypt_len > 0) {
-    	uint32_t *pdata32[3];
-
-	pdata32[0] = data32;
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[1] = data32;
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	pdata32[2] = data32;
-	mydata[1].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[1].data32[1] = *data32;
-
-	if (auth_len > 0) {
-	    CVM_LOAD_SHA_UNIT(*pdata, next);
-	    auth_len -= 8;
-	}
-	if (auth_len > 0) {
-	    CVM_LOAD_SHA_UNIT(*data, next);
-	    auth_len -= 8;
-	}
-
-	CVMX_MT_AES_DEC_CBC0(*pdata);
-	CVMX_MT_AES_DEC_CBC1(*data);
-	CVMX_MF_AES_RESULT(*pdata, 0);
-	CVMX_MF_AES_RESULT(*data, 1);
-	crypt_len -= 16;
-
-	*pdata32[0] = mydata[0].data32[0];
-	*pdata32[1] = mydata[0].data32[1];
-	*pdata32[2] = mydata[1].data32[0];
-	*data32     = mydata[1].data32[1];
-
-	SG_CONSUME(sg, data32, data_i, data_l);
-    }
-
-    /* finish and leftover hashing */
-    while (auth_len > 0) {
-	mydata[0].data32[0] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	mydata[0].data32[1] = *data32;
-	SG_CONSUME(sg, data32, data_i, data_l);
-	CVM_LOAD_SHA_UNIT(*pdata, next);
-	auth_len -= 8;
-    }
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_SHA_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_SHA_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* Finish Inner hash */
-    while (next != 7) {
-	CVM_LOAD_SHA_UNIT(((uint64_t) 0x0ULL), next);
-    }
-	CVM_LOAD_SHA_UNIT((uint64_t) ((alen + 64) << 3), next);
-
-    /* Get the inner hash of HMAC */
-    CVMX_MF_HSH_IV(tmp1, 0);
-    CVMX_MF_HSH_IV(tmp2, 1);
-    tmp3 = 0;
-    CVMX_MF_HSH_IV(tmp3, 2);
-
-    /* Initialize hash unit */
-    CVMX_MT_HSH_IV(od->octo_hmouter[0], 0);
-    CVMX_MT_HSH_IV(od->octo_hmouter[1], 1);
-    CVMX_MT_HSH_IV(od->octo_hmouter[2], 2);
-
-    CVMX_MT_HSH_DAT(tmp1, 0);
-    CVMX_MT_HSH_DAT(tmp2, 1);
-    tmp3 |= 0x0000000080000000;
-    CVMX_MT_HSH_DAT(tmp3, 2);
-    CVMX_MT_HSH_DATZ(3);
-    CVMX_MT_HSH_DATZ(4);
-    CVMX_MT_HSH_DATZ(5);
-    CVMX_MT_HSH_DATZ(6);
-    CVMX_MT_HSH_STARTSHA((uint64_t) ((64 + 20) << 3));
-
-    /* finish the hash */
-    CVMX_PREFETCH0(od->octo_hmouter);
-#if 0
-    if (unlikely(inplen)) {
-	uint64_t tmp = 0;
-	uint8_t *p = (uint8_t *) & tmp;
-	p[inplen] = 0x80;
-	do {
-	    inplen--;
-	    p[inplen] = ((uint8_t *) data)[inplen];
-	} while (inplen);
-	CVM_LOAD_MD5_UNIT(tmp, next);
-    } else {
-	CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-    }
-#else
-    CVM_LOAD_MD5_UNIT(0x8000000000000000ULL, next);
-#endif
-
-    /* save the HMAC */
-    SG_INIT(sg, data32, data_i, data_l);
-    while (icv_off > 0) {
-	SG_CONSUME(sg, data32, data_i, data_l);
-	icv_off -= 4;
-    }
-    CVMX_MF_HSH_IV(tmp1, 0);
-    *data32 = (uint32_t) (tmp1 >> 32);
-    SG_CONSUME(sg, data32, data_i, data_l);
-    *data32 = (uint32_t) tmp1;
-    SG_CONSUME(sg, data32, data_i, data_l);
-    CVMX_MF_HSH_IV(tmp1, 1);
-    *data32 = (uint32_t) (tmp1 >> 32);
-
-    octeon_crypto_disable(&state, flags);
-    return 0;
-}
-
-/****************************************************************************/
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cryptocteon.c b/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cryptocteon.c
deleted file mode 100644
index 9940f59a9a..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptocteon/cryptocteon.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * Octeon Crypto for OCF
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2009-2010 David McCullough
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <linux/scatterlist.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-
-struct {
-	softc_device_decl	sc_dev;
-} octo_softc;
-
-#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
-
-struct octo_sess {
-	int					 octo_encalg;
-	#define MAX_CIPHER_KEYLEN	64
-	char				 octo_enckey[MAX_CIPHER_KEYLEN];
-	int					 octo_encklen;
-
-	int					 octo_macalg;
-	#define MAX_HASH_KEYLEN	64
-	char				 octo_mackey[MAX_HASH_KEYLEN];
-	int					 octo_macklen;
-	int					 octo_mackey_set;
-
-	int					 octo_mlen;
-	int					 octo_ivsize;
-
-#if 0
-	int					(*octo_decrypt)(struct scatterlist *sg, int sg_len,
-							uint8_t *key, int key_len, uint8_t * iv,
-							uint64_t *hminner, uint64_t *hmouter);
-
-	int					(*octo_encrypt)(struct scatterlist *sg, int sg_len,
-							uint8_t *key, int key_len, uint8_t * iv,
-							uint64_t *hminner, uint64_t *hmouter);
-#else
-	int					(*octo_encrypt)(struct octo_sess *od,
-	                      struct scatterlist *sg, int sg_len,
-						  int auth_off, int auth_len,
-						  int crypt_off, int crypt_len,
-						  int icv_off, uint8_t *ivp);
-	int					(*octo_decrypt)(struct octo_sess *od,
-	                      struct scatterlist *sg, int sg_len,
-						  int auth_off, int auth_len,
-						  int crypt_off, int crypt_len,
-						  int icv_off, uint8_t *ivp);
-#endif
-
-	uint64_t			 octo_hminner[3];
-	uint64_t			 octo_hmouter[3];
-};
-
-int32_t octo_id = -1;
-module_param(octo_id, int, 0444);
-MODULE_PARM_DESC(octo_id, "Read-Only OCF ID for cryptocteon driver");
-
-static struct octo_sess **octo_sessions = NULL;
-static u_int32_t octo_sesnum = 0;
-
-static	int octo_process(device_t, struct cryptop *, int);
-static	int octo_newsession(device_t, u_int32_t *, struct cryptoini *);
-static	int octo_freesession(device_t, u_int64_t);
-
-static device_method_t octo_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	octo_newsession),
-	DEVMETHOD(cryptodev_freesession,octo_freesession),
-	DEVMETHOD(cryptodev_process,	octo_process),
-};
-
-#define debug octo_debug
-int octo_debug = 0;
-module_param(octo_debug, int, 0644);
-MODULE_PARM_DESC(octo_debug, "Enable debug");
-
-
-#include "cavium_crypto.c"
-
-
-/*
- * Generate a new octo session.  We artifically limit it to a single
- * hash/cipher or hash-cipher combo just to make it easier, most callers
- * do not expect more than this anyway.
- */
-static int
-octo_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
-{
-	struct cryptoini *c, *encini = NULL, *macini = NULL;
-	struct octo_sess **ocd;
-	int i;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid == NULL || cri == NULL) {
-		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	/*
-	 * To keep it simple, we only handle hash, cipher or hash/cipher in a
-	 * session,  you cannot currently do multiple ciphers/hashes in one
-	 * session even though it would be possibel to code this driver to
-	 * handle it.
-	 */
-	for (i = 0, c = cri; c && i < 2; i++) {
-		if (c->cri_alg == CRYPTO_MD5_HMAC ||
-				c->cri_alg == CRYPTO_SHA1_HMAC ||
-				c->cri_alg == CRYPTO_NULL_HMAC) {
-			if (macini) {
-				break;
-			}
-			macini = c;
-		}
-		if (c->cri_alg == CRYPTO_DES_CBC ||
-				c->cri_alg == CRYPTO_3DES_CBC ||
-				c->cri_alg == CRYPTO_AES_CBC ||
-				c->cri_alg == CRYPTO_NULL_CBC) {
-			if (encini) {
-				break;
-			}
-			encini = c;
-		}
-		c = c->cri_next;
-	}
-	if (!macini && !encini) {
-		dprintk("%s,%d - EINVAL bad cipher/hash or combination\n",
-				__FILE__, __LINE__);
-		return EINVAL;
-	}
-	if (c) {
-		dprintk("%s,%d - EINVAL cannot handle chained cipher/hash combos\n",
-				__FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	/*
-	 * So we have something we can do, lets setup the session
-	 */
-
-	if (octo_sessions) {
-		for (i = 1; i < octo_sesnum; i++)
-			if (octo_sessions[i] == NULL)
-				break;
-	} else
-		i = 1;		/* NB: to silence compiler warning */
-
-	if (octo_sessions == NULL || i == octo_sesnum) {
-		if (octo_sessions == NULL) {
-			i = 1; /* We leave octo_sessions[0] empty */
-			octo_sesnum = CRYPTO_SW_SESSIONS;
-		} else
-			octo_sesnum *= 2;
-
-		ocd = kmalloc(octo_sesnum * sizeof(struct octo_sess *), SLAB_ATOMIC);
-		if (ocd == NULL) {
-			/* Reset session number */
-			if (octo_sesnum == CRYPTO_SW_SESSIONS)
-				octo_sesnum = 0;
-			else
-				octo_sesnum /= 2;
-			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-			return ENOBUFS;
-		}
-		memset(ocd, 0, octo_sesnum * sizeof(struct octo_sess *));
-
-		/* Copy existing sessions */
-		if (octo_sessions) {
-			memcpy(ocd, octo_sessions,
-			    (octo_sesnum / 2) * sizeof(struct octo_sess *));
-			kfree(octo_sessions);
-		}
-
-		octo_sessions = ocd;
-	}
-
-	ocd = &octo_sessions[i];
-	*sid = i;
-
-
-	*ocd = (struct octo_sess *) kmalloc(sizeof(struct octo_sess), SLAB_ATOMIC);
-	if (*ocd == NULL) {
-		octo_freesession(NULL, i);
-		dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-		return ENOBUFS;
-	}
-	memset(*ocd, 0, sizeof(struct octo_sess));
-
-	if (encini && encini->cri_key) {
-		(*ocd)->octo_encklen = (encini->cri_klen + 7) / 8;
-		memcpy((*ocd)->octo_enckey, encini->cri_key, (*ocd)->octo_encklen);
-	}
-
-	if (macini && macini->cri_key) {
-		(*ocd)->octo_macklen = (macini->cri_klen + 7) / 8;
-		memcpy((*ocd)->octo_mackey, macini->cri_key, (*ocd)->octo_macklen);
-	}
-
-	(*ocd)->octo_mlen = 0;
-	if (encini && encini->cri_mlen)
-		(*ocd)->octo_mlen = encini->cri_mlen;
-	else if (macini && macini->cri_mlen)
-		(*ocd)->octo_mlen = macini->cri_mlen;
-	else
-		(*ocd)->octo_mlen = 12;
-
-	/*
-	 * point c at the enc if it exists, otherwise the mac
-	 */
-	c = encini ? encini : macini;
-
-	switch (c->cri_alg) {
-	case CRYPTO_DES_CBC:
-	case CRYPTO_3DES_CBC:
-		(*ocd)->octo_ivsize  = 8;
-		switch (macini ? macini->cri_alg : -1) {
-		case CRYPTO_MD5_HMAC:
-			(*ocd)->octo_encrypt = octo_des_cbc_md5_encrypt;
-			(*ocd)->octo_decrypt = octo_des_cbc_md5_decrypt;
-			octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-					(*ocd)->octo_hmouter);
-			break;
-		case CRYPTO_SHA1_HMAC:
-			(*ocd)->octo_encrypt = octo_des_cbc_sha1_encrypt;
-			(*ocd)->octo_decrypt = octo_des_cbc_sha1_encrypt;
-			octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-					(*ocd)->octo_hmouter);
-			break;
-		case -1:
-			(*ocd)->octo_encrypt = octo_des_cbc_encrypt;
-			(*ocd)->octo_decrypt = octo_des_cbc_decrypt;
-			break;
-		default:
-			octo_freesession(NULL, i);
-			dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-			return EINVAL;
-		}
-		break;
-	case CRYPTO_AES_CBC:
-		(*ocd)->octo_ivsize  = 16;
-		switch (macini ? macini->cri_alg : -1) {
-		case CRYPTO_MD5_HMAC:
-			(*ocd)->octo_encrypt = octo_aes_cbc_md5_encrypt;
-			(*ocd)->octo_decrypt = octo_aes_cbc_md5_decrypt;
-			octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-					(*ocd)->octo_hmouter);
-			break;
-		case CRYPTO_SHA1_HMAC:
-			(*ocd)->octo_encrypt = octo_aes_cbc_sha1_encrypt;
-			(*ocd)->octo_decrypt = octo_aes_cbc_sha1_decrypt;
-			octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-					(*ocd)->octo_hmouter);
-			break;
-		case -1:
-			(*ocd)->octo_encrypt = octo_aes_cbc_encrypt;
-			(*ocd)->octo_decrypt = octo_aes_cbc_decrypt;
-			break;
-		default:
-			octo_freesession(NULL, i);
-			dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-			return EINVAL;
-		}
-		break;
-	case CRYPTO_MD5_HMAC:
-		(*ocd)->octo_encrypt = octo_null_md5_encrypt;
-		(*ocd)->octo_decrypt = octo_null_md5_encrypt;
-		octo_calc_hash(0, macini->cri_key, (*ocd)->octo_hminner,
-				(*ocd)->octo_hmouter);
-		break;
-	case CRYPTO_SHA1_HMAC:
-		(*ocd)->octo_encrypt = octo_null_sha1_encrypt;
-		(*ocd)->octo_decrypt = octo_null_sha1_encrypt;
-		octo_calc_hash(1, macini->cri_key, (*ocd)->octo_hminner,
-				(*ocd)->octo_hmouter);
-		break;
-	default:
-		octo_freesession(NULL, i);
-		dprintk("%s,%d: EINVALn", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	(*ocd)->octo_encalg = encini ? encini->cri_alg : -1;
-	(*ocd)->octo_macalg = macini ? macini->cri_alg : -1;
-
-	return 0;
-}
-
-/*
- * Free a session.
- */
-static int
-octo_freesession(device_t dev, u_int64_t tid)
-{
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid > octo_sesnum || octo_sessions == NULL ||
-			octo_sessions[sid] == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return(EINVAL);
-	}
-
-	/* Silently accept and return */
-	if (sid == 0)
-		return(0);
-
-	if (octo_sessions[sid])
-		kfree(octo_sessions[sid]);
-	octo_sessions[sid] = NULL;
-	return 0;
-}
-
-/*
- * Process a request.
- */
-static int
-octo_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct cryptodesc *crd;
-	struct octo_sess *od;
-	u_int32_t lid;
-#define SCATTERLIST_MAX 16
-	struct scatterlist sg[SCATTERLIST_MAX];
-	int sg_num, sg_len;
-	struct sk_buff *skb = NULL;
-	struct uio *uiop = NULL;
-	struct cryptodesc *enccrd = NULL, *maccrd = NULL;
-	unsigned char *ivp = NULL;
-	unsigned char iv_data[HASH_MAX_LEN];
-	int auth_off = 0, auth_len = 0, crypt_off = 0, crypt_len = 0, icv_off = 0;
-
-	dprintk("%s()\n", __FUNCTION__);
-	/* Sanity check */
-	if (crp == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	crp->crp_etype = 0;
-
-	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	lid = crp->crp_sid & 0xffffffff;
-	if (lid >= octo_sesnum || lid == 0 || octo_sessions == NULL ||
-			octo_sessions[lid] == NULL) {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-	od = octo_sessions[lid];
-
-	/*
-	 * do some error checking outside of the loop for SKB and IOV processing
-	 * this leaves us with valid skb or uiop pointers for later
-	 */
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		skb = (struct sk_buff *) crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
-			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", __FILE__, __LINE__,
-					skb_shinfo(skb)->nr_frags);
-			goto done;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		uiop = (struct uio *) crp->crp_buf;
-		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
-			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", __FILE__, __LINE__,
-					uiop->uio_iovcnt);
-			goto done;
-		}
-	}
-
-	/* point our enccrd and maccrd appropriately */
-	crd = crp->crp_desc;
-	if (crd->crd_alg == od->octo_encalg) enccrd = crd;
-	if (crd->crd_alg == od->octo_macalg) maccrd = crd;
-	crd = crd->crd_next;
-	if (crd) {
-		if (crd->crd_alg == od->octo_encalg) enccrd = crd;
-		if (crd->crd_alg == od->octo_macalg) maccrd = crd;
-		crd = crd->crd_next;
-	}
-	if (crd) {
-		crp->crp_etype = EINVAL;
-		dprintk("%s,%d: ENOENT - descriptors do not match session\n",
-				__FILE__, __LINE__);
-		goto done;
-	}
-
-	if (enccrd) {
-		if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
-			ivp = enccrd->crd_iv;
-		} else {
-			ivp = iv_data;
-			crypto_copydata(crp->crp_flags, crp->crp_buf,
-					enccrd->crd_inject, od->octo_ivsize, (caddr_t) ivp);
-		}
-
-		if (maccrd) {
-			auth_off = maccrd->crd_skip;
-			auth_len = maccrd->crd_len;
-			icv_off  = maccrd->crd_inject;
-		}
-
-		crypt_off = enccrd->crd_skip;
-		crypt_len = enccrd->crd_len;
-	} else { /* if (maccrd) */
-		auth_off = maccrd->crd_skip;
-		auth_len = maccrd->crd_len;
-		icv_off  = maccrd->crd_inject;
-	}
-
-
-	/*
-	 * setup the SG list to cover the buffer
-	 */
-	memset(sg, 0, sizeof(sg));
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		int i, len;
-
-		sg_num = 0;
-		sg_len = 0;
-
-		len = skb_headlen(skb);
-		sg_set_page(&sg[sg_num], virt_to_page(skb->data), len,
-				offset_in_page(skb->data));
-		sg_len += len;
-		sg_num++;
-
-		for (i = 0; i < skb_shinfo(skb)->nr_frags && sg_num < SCATTERLIST_MAX;
-				i++) {
-			len = skb_shinfo(skb)->frags[i].size;
-			sg_set_page(&sg[sg_num], skb_shinfo(skb)->frags[i].page,
-					len, skb_shinfo(skb)->frags[i].page_offset);
-			sg_len += len;
-			sg_num++;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		int len;
-
-		sg_len = 0;
-		for (sg_num = 0; sg_len < crp->crp_ilen &&
-				sg_num < uiop->uio_iovcnt &&
-				sg_num < SCATTERLIST_MAX; sg_num++) {
-			len = uiop->uio_iov[sg_num].iov_len;
-			sg_set_page(&sg[sg_num],
-					virt_to_page(uiop->uio_iov[sg_num].iov_base), len,
-					offset_in_page(uiop->uio_iov[sg_num].iov_base));
-			sg_len += len;
-		}
-	} else {
-		sg_len = crp->crp_ilen;
-		sg_set_page(&sg[0], virt_to_page(crp->crp_buf), sg_len,
-				offset_in_page(crp->crp_buf));
-		sg_num = 1;
-	}
-
-
-	/*
-	 * setup a new explicit key
-	 */
-	if (enccrd) {
-		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			od->octo_encklen = (enccrd->crd_klen + 7) / 8;
-			memcpy(od->octo_enckey, enccrd->crd_key, od->octo_encklen);
-		}
-	}
-	if (maccrd) {
-		if (maccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			od->octo_macklen = (maccrd->crd_klen + 7) / 8;
-			memcpy(od->octo_mackey, maccrd->crd_key, od->octo_macklen);
-			od->octo_mackey_set = 0;
-		}
-		if (!od->octo_mackey_set) {
-			octo_calc_hash(maccrd->crd_alg == CRYPTO_MD5_HMAC ? 0 : 1,
-				maccrd->crd_key, od->octo_hminner, od->octo_hmouter);
-			od->octo_mackey_set = 1;
-		}
-	}
-
-
-	if (!enccrd || (enccrd->crd_flags & CRD_F_ENCRYPT))
-		(*od->octo_encrypt)(od, sg, sg_len,
-				auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-	else
-		(*od->octo_decrypt)(od, sg, sg_len,
-				auth_off, auth_len, crypt_off, crypt_len, icv_off, ivp);
-
-done:
-	crypto_done(crp);
-	return 0;
-}
-
-static int
-cryptocteon_init(void)
-{
-	dprintk("%s(%p)\n", __FUNCTION__, cryptocteon_init);
-
-	softc_device_init(&octo_softc, "cryptocteon", 0, octo_methods);
-
-	octo_id = crypto_get_driverid(softc_get_device(&octo_softc),
-			CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SYNC);
-	if (octo_id < 0) {
-		printk("Cryptocteon device cannot initialize!");
-		return -ENODEV;
-	}
-
-	crypto_register(octo_id, CRYPTO_MD5_HMAC, 0,0);
-	crypto_register(octo_id, CRYPTO_SHA1_HMAC, 0,0);
-	//crypto_register(octo_id, CRYPTO_MD5, 0,0);
-	//crypto_register(octo_id, CRYPTO_SHA1, 0,0);
-	crypto_register(octo_id, CRYPTO_DES_CBC, 0,0);
-	crypto_register(octo_id, CRYPTO_3DES_CBC, 0,0);
-	crypto_register(octo_id, CRYPTO_AES_CBC, 0,0);
-
-	return(0);
-}
-
-static void
-cryptocteon_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	crypto_unregister_all(octo_id);
-	octo_id = -1;
-}
-
-module_init(cryptocteon_init);
-module_exit(cryptocteon_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("Cryptocteon (OCF module for Cavium OCTEON crypto)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptodev.c b/target/linux/generic-2.6/files/crypto/ocf/cryptodev.c
deleted file mode 100644
index 87a4c379d4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptodev.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*	$OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $	*/
-
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Copyright (c) 2001 Theo de Raadt
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
-__FBSDID("$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.34 2007/05/09 19:37:02 gnn Exp $");
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/delay.h>
-#include <linux/list.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/unistd.h>
-#include <linux/module.h>
-#include <linux/wait.h>
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/dcache.h>
-#include <linux/file.h>
-#include <linux/mount.h>
-#include <linux/miscdevice.h>
-#include <linux/version.h>
-#include <asm/uaccess.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-
-extern asmlinkage long sys_dup(unsigned int fildes);
-
-#define debug cryptodev_debug
-int cryptodev_debug = 0;
-module_param(cryptodev_debug, int, 0644);
-MODULE_PARM_DESC(cryptodev_debug, "Enable cryptodev debug");
-
-struct csession_info {
-	u_int16_t	blocksize;
-	u_int16_t	minkey, maxkey;
-
-	u_int16_t	keysize;
-	/* u_int16_t	hashsize;  */
-	u_int16_t	authsize;
-	u_int16_t	authkey;
-	/* u_int16_t	ctxsize; */
-};
-
-struct csession {
-	struct list_head	list;
-	u_int64_t	sid;
-	u_int32_t	ses;
-
-	wait_queue_head_t waitq;
-
-	u_int32_t	cipher;
-
-	u_int32_t	mac;
-
-	caddr_t		key;
-	int		keylen;
-	u_char		tmp_iv[EALG_MAX_BLOCK_LEN];
-
-	caddr_t		mackey;
-	int		mackeylen;
-
-	struct csession_info info;
-
-	struct iovec	iovec;
-	struct uio	uio;
-	int		error;
-};
-
-struct fcrypt {
-	struct list_head	csessions;
-	int		sesn;
-};
-
-static struct csession *csefind(struct fcrypt *, u_int);
-static int csedelete(struct fcrypt *, struct csession *);
-static struct csession *cseadd(struct fcrypt *, struct csession *);
-static struct csession *csecreate(struct fcrypt *, u_int64_t,
-		struct cryptoini *crie, struct cryptoini *cria, struct csession_info *);
-static int csefree(struct csession *);
-
-static	int cryptodev_op(struct csession *, struct crypt_op *);
-static	int cryptodev_key(struct crypt_kop *);
-static	int cryptodev_find(struct crypt_find_op *);
-
-static int cryptodev_cb(void *);
-static int cryptodev_open(struct inode *inode, struct file *filp);
-
-/*
- * Check a crypto identifier to see if it requested
- * a valid crid and it's capabilities match.
- */
-static int
-checkcrid(int crid)
-{
-	int hid = crid & ~(CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE);
-	int typ = crid & (CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE);
-	int caps = 0;
-	
-	/* if the user hasn't selected a driver, then just call newsession */
-	if (hid == 0 && typ != 0)
-		return 0;
-
-	caps = crypto_getcaps(hid);
-
-	/* didn't find anything with capabilities */
-	if (caps == 0) {
-		dprintk("%s: hid=%x typ=%x not matched\n", __FUNCTION__, hid, typ);
-		return EINVAL;
-	}
-	
-	/* the user didn't specify SW or HW, so the driver is ok */
-	if (typ == 0)
-		return 0;
-
-	/* if the type specified didn't match */
-	if (typ != (caps & (CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE))) {
-		dprintk("%s: hid=%x typ=%x caps=%x not matched\n", __FUNCTION__,
-				hid, typ, caps);
-		return EINVAL;
-	}
-
-	return 0;
-}
-
-static int
-cryptodev_op(struct csession *cse, struct crypt_op *cop)
-{
-	struct cryptop *crp = NULL;
-	struct cryptodesc *crde = NULL, *crda = NULL;
-	int error = 0;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (cop->len > CRYPTO_MAX_DATA_LEN) {
-		dprintk("%s: %d > %d\n", __FUNCTION__, cop->len, CRYPTO_MAX_DATA_LEN);
-		return (E2BIG);
-	}
-
-	if (cse->info.blocksize && (cop->len % cse->info.blocksize) != 0) {
-		dprintk("%s: blocksize=%d len=%d\n", __FUNCTION__, cse->info.blocksize,
-				cop->len);
-		return (EINVAL);
-	}
-
-	cse->uio.uio_iov = &cse->iovec;
-	cse->uio.uio_iovcnt = 1;
-	cse->uio.uio_offset = 0;
-#if 0
-	cse->uio.uio_resid = cop->len;
-	cse->uio.uio_segflg = UIO_SYSSPACE;
-	cse->uio.uio_rw = UIO_WRITE;
-	cse->uio.uio_td = td;
-#endif
-	cse->uio.uio_iov[0].iov_len = cop->len;
-	if (cse->info.authsize)
-		cse->uio.uio_iov[0].iov_len += cse->info.authsize;
-	cse->uio.uio_iov[0].iov_base = kmalloc(cse->uio.uio_iov[0].iov_len,
-			GFP_KERNEL);
-
-	if (cse->uio.uio_iov[0].iov_base == NULL) {
-		dprintk("%s: iov_base kmalloc(%d) failed\n", __FUNCTION__,
-				(int)cse->uio.uio_iov[0].iov_len);
-		return (ENOMEM);
-	}
-
-	crp = crypto_getreq((cse->info.blocksize != 0) + (cse->info.authsize != 0));
-	if (crp == NULL) {
-		dprintk("%s: ENOMEM\n", __FUNCTION__);
-		error = ENOMEM;
-		goto bail;
-	}
-
-	if (cse->info.authsize && cse->info.blocksize) {
-		if (cop->op == COP_ENCRYPT) {
-			crde = crp->crp_desc;
-			crda = crde->crd_next;
-		} else {
-			crda = crp->crp_desc;
-			crde = crda->crd_next;
-		}
-	} else if (cse->info.authsize) {
-		crda = crp->crp_desc;
-	} else if (cse->info.blocksize) {
-		crde = crp->crp_desc;
-	} else {
-		dprintk("%s: bad request\n", __FUNCTION__);
-		error = EINVAL;
-		goto bail;
-	}
-
-	if ((error = copy_from_user(cse->uio.uio_iov[0].iov_base, cop->src,
-					cop->len))) {
-		dprintk("%s: bad copy\n", __FUNCTION__);
-		goto bail;
-	}
-
-	if (crda) {
-		crda->crd_skip = 0;
-		crda->crd_len = cop->len;
-		crda->crd_inject = cop->len;
-
-		crda->crd_alg = cse->mac;
-		crda->crd_key = cse->mackey;
-		crda->crd_klen = cse->mackeylen * 8;
-	}
-
-	if (crde) {
-		if (cop->op == COP_ENCRYPT)
-			crde->crd_flags |= CRD_F_ENCRYPT;
-		else
-			crde->crd_flags &= ~CRD_F_ENCRYPT;
-		crde->crd_len = cop->len;
-		crde->crd_inject = 0;
-
-		crde->crd_alg = cse->cipher;
-		crde->crd_key = cse->key;
-		crde->crd_klen = cse->keylen * 8;
-	}
-
-	crp->crp_ilen = cse->uio.uio_iov[0].iov_len;
-	crp->crp_flags = CRYPTO_F_IOV | CRYPTO_F_CBIMM
-		       | (cop->flags & COP_F_BATCH);
-	crp->crp_buf = (caddr_t)&cse->uio;
-	crp->crp_callback = (int (*) (struct cryptop *)) cryptodev_cb;
-	crp->crp_sid = cse->sid;
-	crp->crp_opaque = (void *)cse;
-
-	if (cop->iv) {
-		if (crde == NULL) {
-			error = EINVAL;
-			dprintk("%s no crde\n", __FUNCTION__);
-			goto bail;
-		}
-		if (cse->cipher == CRYPTO_ARC4) { /* XXX use flag? */
-			error = EINVAL;
-			dprintk("%s arc4 with IV\n", __FUNCTION__);
-			goto bail;
-		}
-		if ((error = copy_from_user(cse->tmp_iv, cop->iv,
-						cse->info.blocksize))) {
-			dprintk("%s bad iv copy\n", __FUNCTION__);
-			goto bail;
-		}
-		memcpy(crde->crd_iv, cse->tmp_iv, cse->info.blocksize);
-		crde->crd_flags |= CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
-		crde->crd_skip = 0;
-	} else if (cse->cipher == CRYPTO_ARC4) { /* XXX use flag? */
-		crde->crd_skip = 0;
-	} else if (crde) {
-		crde->crd_flags |= CRD_F_IV_PRESENT;
-		crde->crd_skip = cse->info.blocksize;
-		crde->crd_len -= cse->info.blocksize;
-	}
-
-	if (cop->mac && crda == NULL) {
-		error = EINVAL;
-		dprintk("%s no crda\n", __FUNCTION__);
-		goto bail;
-	}
-
-	/*
-	 * Let the dispatch run unlocked, then, interlock against the
-	 * callback before checking if the operation completed and going
-	 * to sleep.  This insures drivers don't inherit our lock which
-	 * results in a lock order reversal between crypto_dispatch forced
-	 * entry and the crypto_done callback into us.
-	 */
-	error = crypto_dispatch(crp);
-	if (error) {
-		dprintk("%s error in crypto_dispatch\n", __FUNCTION__);
-		goto bail;
-	}
-
-	dprintk("%s about to WAIT\n", __FUNCTION__);
-	/*
-	 * we really need to wait for driver to complete to maintain
-	 * state,  luckily interrupts will be remembered
-	 */
-	do {
-		error = wait_event_interruptible(crp->crp_waitq,
-				((crp->crp_flags & CRYPTO_F_DONE) != 0));
-		/*
-		 * we can't break out of this loop or we will leave behind
-		 * a huge mess,  however,  staying here means if your driver
-		 * is broken user applications can hang and not be killed.
-		 * The solution,  fix your driver :-)
-		 */
-		if (error) {
-			schedule();
-			error = 0;
-		}
-	} while ((crp->crp_flags & CRYPTO_F_DONE) == 0);
-	dprintk("%s finished WAITING error=%d\n", __FUNCTION__, error);
-
-	if (crp->crp_etype != 0) {
-		error = crp->crp_etype;
-		dprintk("%s error in crp processing\n", __FUNCTION__);
-		goto bail;
-	}
-
-	if (cse->error) {
-		error = cse->error;
-		dprintk("%s error in cse processing\n", __FUNCTION__);
-		goto bail;
-	}
-
-	if (cop->dst && (error = copy_to_user(cop->dst,
-					cse->uio.uio_iov[0].iov_base, cop->len))) {
-		dprintk("%s bad dst copy\n", __FUNCTION__);
-		goto bail;
-	}
-
-	if (cop->mac &&
-			(error=copy_to_user(cop->mac,
-				(caddr_t)cse->uio.uio_iov[0].iov_base + cop->len,
-				cse->info.authsize))) {
-		dprintk("%s bad mac copy\n", __FUNCTION__);
-		goto bail;
-	}
-
-bail:
-	if (crp)
-		crypto_freereq(crp);
-	if (cse->uio.uio_iov[0].iov_base)
-		kfree(cse->uio.uio_iov[0].iov_base);
-
-	return (error);
-}
-
-static int
-cryptodev_cb(void *op)
-{
-	struct cryptop *crp = (struct cryptop *) op;
-	struct csession *cse = (struct csession *)crp->crp_opaque;
-	int error;
-
-	dprintk("%s()\n", __FUNCTION__);
-	error = crp->crp_etype;
-	if (error == EAGAIN) {
-		crp->crp_flags &= ~CRYPTO_F_DONE;
-#ifdef NOTYET
-		/*
-		 * DAVIDM I am fairly sure that we should turn this into a batch
-		 * request to stop bad karma/lockup, revisit
-		 */
-		crp->crp_flags |= CRYPTO_F_BATCH;
-#endif
-		return crypto_dispatch(crp);
-	}
-	if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) {
-		cse->error = error;
-		wake_up_interruptible(&crp->crp_waitq);
-	}
-	return (0);
-}
-
-static int
-cryptodevkey_cb(void *op)
-{
-	struct cryptkop *krp = (struct cryptkop *) op;
-	dprintk("%s()\n", __FUNCTION__);
-	wake_up_interruptible(&krp->krp_waitq);
-	return (0);
-}
-
-static int
-cryptodev_key(struct crypt_kop *kop)
-{
-	struct cryptkop *krp = NULL;
-	int error = EINVAL;
-	int in, out, size, i;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (kop->crk_iparams + kop->crk_oparams > CRK_MAXPARAM) {
-		dprintk("%s params too big\n", __FUNCTION__);
-		return (EFBIG);
-	}
-
-	in = kop->crk_iparams;
-	out = kop->crk_oparams;
-	switch (kop->crk_op) {
-	case CRK_MOD_EXP:
-		if (in == 3 && out == 1)
-			break;
-		return (EINVAL);
-	case CRK_MOD_EXP_CRT:
-		if (in == 6 && out == 1)
-			break;
-		return (EINVAL);
-	case CRK_DSA_SIGN:
-		if (in == 5 && out == 2)
-			break;
-		return (EINVAL);
-	case CRK_DSA_VERIFY:
-		if (in == 7 && out == 0)
-			break;
-		return (EINVAL);
-	case CRK_DH_COMPUTE_KEY:
-		if (in == 3 && out == 1)
-			break;
-		return (EINVAL);
-	default:
-		return (EINVAL);
-	}
-
-	krp = (struct cryptkop *)kmalloc(sizeof *krp, GFP_KERNEL);
-	if (!krp)
-		return (ENOMEM);
-	bzero(krp, sizeof *krp);
-	krp->krp_op = kop->crk_op;
-	krp->krp_status = kop->crk_status;
-	krp->krp_iparams = kop->crk_iparams;
-	krp->krp_oparams = kop->crk_oparams;
-	krp->krp_crid = kop->crk_crid;
-	krp->krp_status = 0;
-	krp->krp_flags = CRYPTO_KF_CBIMM;
-	krp->krp_callback = (int (*) (struct cryptkop *)) cryptodevkey_cb;
-	init_waitqueue_head(&krp->krp_waitq);
-
-	for (i = 0; i < CRK_MAXPARAM; i++)
-		krp->krp_param[i].crp_nbits = kop->crk_param[i].crp_nbits;
-	for (i = 0; i < krp->krp_iparams + krp->krp_oparams; i++) {
-		size = (krp->krp_param[i].crp_nbits + 7) / 8;
-		if (size == 0)
-			continue;
-		krp->krp_param[i].crp_p = (caddr_t) kmalloc(size, GFP_KERNEL);
-		if (i >= krp->krp_iparams)
-			continue;
-		error = copy_from_user(krp->krp_param[i].crp_p,
-				kop->crk_param[i].crp_p, size);
-		if (error)
-			goto fail;
-	}
-
-	error = crypto_kdispatch(krp);
-	if (error)
-		goto fail;
-
-	do {
-		error = wait_event_interruptible(krp->krp_waitq,
-				((krp->krp_flags & CRYPTO_KF_DONE) != 0));
-		/*
-		 * we can't break out of this loop or we will leave behind
-		 * a huge mess,  however,  staying here means if your driver
-		 * is broken user applications can hang and not be killed.
-		 * The solution,  fix your driver :-)
-		 */
-		if (error) {
-			schedule();
-			error = 0;
-		}
-	} while ((krp->krp_flags & CRYPTO_KF_DONE) == 0);
-
-	dprintk("%s finished WAITING error=%d\n", __FUNCTION__, error);
-	
-	kop->crk_crid = krp->krp_crid;		/* device that did the work */
-	if (krp->krp_status != 0) {
-		error = krp->krp_status;
-		goto fail;
-	}
-
-	for (i = krp->krp_iparams; i < krp->krp_iparams + krp->krp_oparams; i++) {
-		size = (krp->krp_param[i].crp_nbits + 7) / 8;
-		if (size == 0)
-			continue;
-		error = copy_to_user(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p,
-				size);
-		if (error)
-			goto fail;
-	}
-
-fail:
-	if (krp) {
-		kop->crk_status = krp->krp_status;
-		for (i = 0; i < CRK_MAXPARAM; i++) {
-			if (krp->krp_param[i].crp_p)
-				kfree(krp->krp_param[i].crp_p);
-		}
-		kfree(krp);
-	}
-	return (error);
-}
-
-static int
-cryptodev_find(struct crypt_find_op *find)
-{
-	device_t dev;
-
-	if (find->crid != -1) {
-		dev = crypto_find_device_byhid(find->crid);
-		if (dev == NULL)
-			return (ENOENT);
-		strlcpy(find->name, device_get_nameunit(dev),
-		    sizeof(find->name));
-	} else {
-		find->crid = crypto_find_driver(find->name);
-		if (find->crid == -1)
-			return (ENOENT);
-	}
-	return (0);
-}
-
-static struct csession *
-csefind(struct fcrypt *fcr, u_int ses)
-{
-	struct csession *cse;
-
-	dprintk("%s()\n", __FUNCTION__);
-	list_for_each_entry(cse, &fcr->csessions, list)
-		if (cse->ses == ses)
-			return (cse);
-	return (NULL);
-}
-
-static int
-csedelete(struct fcrypt *fcr, struct csession *cse_del)
-{
-	struct csession *cse;
-
-	dprintk("%s()\n", __FUNCTION__);
-	list_for_each_entry(cse, &fcr->csessions, list) {
-		if (cse == cse_del) {
-			list_del(&cse->list);
-			return (1);
-		}
-	}
-	return (0);
-}
-	
-static struct csession *
-cseadd(struct fcrypt *fcr, struct csession *cse)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	list_add_tail(&cse->list, &fcr->csessions);
-	cse->ses = fcr->sesn++;
-	return (cse);
-}
-
-static struct csession *
-csecreate(struct fcrypt *fcr, u_int64_t sid, struct cryptoini *crie,
-	struct cryptoini *cria, struct csession_info *info)
-{
-	struct csession *cse;
-
-	dprintk("%s()\n", __FUNCTION__);
-	cse = (struct csession *) kmalloc(sizeof(struct csession), GFP_KERNEL);
-	if (cse == NULL)
-		return NULL;
-	memset(cse, 0, sizeof(struct csession));
-
-	INIT_LIST_HEAD(&cse->list);
-	init_waitqueue_head(&cse->waitq);
-
-	cse->key = crie->cri_key;
-	cse->keylen = crie->cri_klen/8;
-	cse->mackey = cria->cri_key;
-	cse->mackeylen = cria->cri_klen/8;
-	cse->sid = sid;
-	cse->cipher = crie->cri_alg;
-	cse->mac = cria->cri_alg;
-	cse->info = *info;
-	cseadd(fcr, cse);
-	return (cse);
-}
-
-static int
-csefree(struct csession *cse)
-{
-	int error;
-
-	dprintk("%s()\n", __FUNCTION__);
-	error = crypto_freesession(cse->sid);
-	if (cse->key)
-		kfree(cse->key);
-	if (cse->mackey)
-		kfree(cse->mackey);
-	kfree(cse);
-	return(error);
-}
-
-static int
-cryptodev_ioctl(
-	struct inode *inode,
-	struct file *filp,
-	unsigned int cmd,
-	unsigned long arg)
-{
-	struct cryptoini cria, crie;
-	struct fcrypt *fcr = filp->private_data;
-	struct csession *cse;
-	struct csession_info info;
-	struct session2_op sop;
-	struct crypt_op cop;
-	struct crypt_kop kop;
-	struct crypt_find_op fop;
-	u_int64_t sid;
-	u_int32_t ses = 0;
-	int feat, fd, error = 0, crid;
-	mm_segment_t fs;
-
-	dprintk("%s(cmd=%x arg=%lx)\n", __FUNCTION__, cmd, arg);
-
-	switch (cmd) {
-
-	case CRIOGET: {
-		dprintk("%s(CRIOGET)\n", __FUNCTION__);
-		fs = get_fs();
-		set_fs(get_ds());
-		for (fd = 0; fd < files_fdtable(current->files)->max_fds; fd++)
-			if (files_fdtable(current->files)->fd[fd] == filp)
-				break;
-		fd = sys_dup(fd);
-		set_fs(fs);
-		put_user(fd, (int *) arg);
-		return IS_ERR_VALUE(fd) ? fd : 0;
-		}
-
-#define	CIOCGSESSSTR	(cmd == CIOCGSESSION ? "CIOCGSESSION" : "CIOCGSESSION2")
-	case CIOCGSESSION:
-	case CIOCGSESSION2:
-		dprintk("%s(%s)\n", __FUNCTION__, CIOCGSESSSTR);
-		memset(&crie, 0, sizeof(crie));
-		memset(&cria, 0, sizeof(cria));
-		memset(&info, 0, sizeof(info));
-		memset(&sop, 0, sizeof(sop));
-
-		if (copy_from_user(&sop, (void*)arg, (cmd == CIOCGSESSION) ?
-					sizeof(struct session_op) : sizeof(sop))) {
-			dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
-			error = EFAULT;
-			goto bail;
-		}
-
-		switch (sop.cipher) {
-		case 0:
-			dprintk("%s(%s) - no cipher\n", __FUNCTION__, CIOCGSESSSTR);
-			break;
-		case CRYPTO_NULL_CBC:
-			info.blocksize = NULL_BLOCK_LEN;
-			info.minkey = NULL_MIN_KEY_LEN;
-			info.maxkey = NULL_MAX_KEY_LEN;
-			break;
-		case CRYPTO_DES_CBC:
-			info.blocksize = DES_BLOCK_LEN;
-			info.minkey = DES_MIN_KEY_LEN;
-			info.maxkey = DES_MAX_KEY_LEN;
-			break;
-		case CRYPTO_3DES_CBC:
-			info.blocksize = DES3_BLOCK_LEN;
-			info.minkey = DES3_MIN_KEY_LEN;
-			info.maxkey = DES3_MAX_KEY_LEN;
-			break;
-		case CRYPTO_BLF_CBC:
-			info.blocksize = BLOWFISH_BLOCK_LEN;
-			info.minkey = BLOWFISH_MIN_KEY_LEN;
-			info.maxkey = BLOWFISH_MAX_KEY_LEN;
-			break;
-		case CRYPTO_CAST_CBC:
-			info.blocksize = CAST128_BLOCK_LEN;
-			info.minkey = CAST128_MIN_KEY_LEN;
-			info.maxkey = CAST128_MAX_KEY_LEN;
-			break;
-		case CRYPTO_SKIPJACK_CBC:
-			info.blocksize = SKIPJACK_BLOCK_LEN;
-			info.minkey = SKIPJACK_MIN_KEY_LEN;
-			info.maxkey = SKIPJACK_MAX_KEY_LEN;
-			break;
-		case CRYPTO_AES_CBC:
-			info.blocksize = AES_BLOCK_LEN;
-			info.minkey = AES_MIN_KEY_LEN;
-			info.maxkey = AES_MAX_KEY_LEN;
-			break;
-		case CRYPTO_ARC4:
-			info.blocksize = ARC4_BLOCK_LEN;
-			info.minkey = ARC4_MIN_KEY_LEN;
-			info.maxkey = ARC4_MAX_KEY_LEN;
-			break;
-		case CRYPTO_CAMELLIA_CBC:
-			info.blocksize = CAMELLIA_BLOCK_LEN;
-			info.minkey = CAMELLIA_MIN_KEY_LEN;
-			info.maxkey = CAMELLIA_MAX_KEY_LEN;
-			break;
-		default:
-			dprintk("%s(%s) - bad cipher\n", __FUNCTION__, CIOCGSESSSTR);
-			error = EINVAL;
-			goto bail;
-		}
-
-		switch (sop.mac) {
-		case 0:
-			dprintk("%s(%s) - no mac\n", __FUNCTION__, CIOCGSESSSTR);
-			break;
-		case CRYPTO_NULL_HMAC:
-			info.authsize = NULL_HASH_LEN;
-			break;
-		case CRYPTO_MD5:
-			info.authsize = MD5_HASH_LEN;
-			break;
-		case CRYPTO_SHA1:
-			info.authsize = SHA1_HASH_LEN;
-			break;
-		case CRYPTO_SHA2_256:
-			info.authsize = SHA2_256_HASH_LEN;
-			break;
-		case CRYPTO_SHA2_384:
-			info.authsize = SHA2_384_HASH_LEN;
-  			break;
-		case CRYPTO_SHA2_512:
-			info.authsize = SHA2_512_HASH_LEN;
-			break;
-		case CRYPTO_RIPEMD160:
-			info.authsize = RIPEMD160_HASH_LEN;
-			break;
-		case CRYPTO_MD5_HMAC:
-			info.authsize = MD5_HASH_LEN;
-			info.authkey = 16;
-			break;
-		case CRYPTO_SHA1_HMAC:
-			info.authsize = SHA1_HASH_LEN;
-			info.authkey = 20;
-			break;
-		case CRYPTO_SHA2_256_HMAC:
-			info.authsize = SHA2_256_HASH_LEN;
-			info.authkey = 32;
-			break;
-		case CRYPTO_SHA2_384_HMAC:
-			info.authsize = SHA2_384_HASH_LEN;
-			info.authkey = 48;
-  			break;
-		case CRYPTO_SHA2_512_HMAC:
-			info.authsize = SHA2_512_HASH_LEN;
-			info.authkey = 64;
-			break;
-		case CRYPTO_RIPEMD160_HMAC:
-			info.authsize = RIPEMD160_HASH_LEN;
-			info.authkey = 20;
-			break;
-		default:
-			dprintk("%s(%s) - bad mac\n", __FUNCTION__, CIOCGSESSSTR);
-			error = EINVAL;
-			goto bail;
-		}
-
-		if (info.blocksize) {
-			crie.cri_alg = sop.cipher;
-			crie.cri_klen = sop.keylen * 8;
-			if ((info.maxkey && sop.keylen > info.maxkey) ||
-				   	sop.keylen < info.minkey) {
-				dprintk("%s(%s) - bad key\n", __FUNCTION__, CIOCGSESSSTR);
-				error = EINVAL;
-				goto bail;
-			}
-
-			crie.cri_key = (u_int8_t *) kmalloc(crie.cri_klen/8+1, GFP_KERNEL);
-			if (copy_from_user(crie.cri_key, sop.key,
-							crie.cri_klen/8)) {
-				dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
-				error = EFAULT;
-				goto bail;
-			}
-			if (info.authsize)
-				crie.cri_next = &cria;
-		}
-
-		if (info.authsize) {
-			cria.cri_alg = sop.mac;
-			cria.cri_klen = sop.mackeylen * 8;
-			if (info.authkey && sop.mackeylen != info.authkey) {
-				dprintk("%s(%s) - mackeylen %d != %d\n", __FUNCTION__,
-						CIOCGSESSSTR, sop.mackeylen, info.authkey);
-				error = EINVAL;
-				goto bail;
-			}
-
-			if (cria.cri_klen) {
-				cria.cri_key = (u_int8_t *) kmalloc(cria.cri_klen/8,GFP_KERNEL);
-				if (copy_from_user(cria.cri_key, sop.mackey,
-								cria.cri_klen / 8)) {
-					dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
-					error = EFAULT;
-					goto bail;
-				}
-			}
-		}
-
-		/* NB: CIOGSESSION2 has the crid */
-		if (cmd == CIOCGSESSION2) {
-			crid = sop.crid;
-			error = checkcrid(crid);
-			if (error) {
-				dprintk("%s(%s) - checkcrid %x\n", __FUNCTION__,
-						CIOCGSESSSTR, error);
-				goto bail;
-			}
-		} else {
-			/* allow either HW or SW to be used */
-			crid = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
-		}
-		error = crypto_newsession(&sid, (info.blocksize ? &crie : &cria), crid);
-		if (error) {
-			dprintk("%s(%s) - newsession %d\n",__FUNCTION__,CIOCGSESSSTR,error);
-			goto bail;
-		}
-
-		cse = csecreate(fcr, sid, &crie, &cria, &info);
-		if (cse == NULL) {
-			crypto_freesession(sid);
-			error = EINVAL;
-			dprintk("%s(%s) - csecreate failed\n", __FUNCTION__, CIOCGSESSSTR);
-			goto bail;
-		}
-		sop.ses = cse->ses;
-
-		if (cmd == CIOCGSESSION2) {
-			/* return hardware/driver id */
-			sop.crid = CRYPTO_SESID2HID(cse->sid);
-		}
-
-		if (copy_to_user((void*)arg, &sop, (cmd == CIOCGSESSION) ?
-					sizeof(struct session_op) : sizeof(sop))) {
-			dprintk("%s(%s) - bad copy\n", __FUNCTION__, CIOCGSESSSTR);
-			error = EFAULT;
-		}
-bail:
-		if (error) {
-			dprintk("%s(%s) - bail %d\n", __FUNCTION__, CIOCGSESSSTR, error);
-			if (crie.cri_key)
-				kfree(crie.cri_key);
-			if (cria.cri_key)
-				kfree(cria.cri_key);
-		}
-		break;
-	case CIOCFSESSION:
-		dprintk("%s(CIOCFSESSION)\n", __FUNCTION__);
-		get_user(ses, (uint32_t*)arg);
-		cse = csefind(fcr, ses);
-		if (cse == NULL) {
-			error = EINVAL;
-			dprintk("%s(CIOCFSESSION) - Fail %d\n", __FUNCTION__, error);
-			break;
-		}
-		csedelete(fcr, cse);
-		error = csefree(cse);
-		break;
-	case CIOCCRYPT:
-		dprintk("%s(CIOCCRYPT)\n", __FUNCTION__);
-		if(copy_from_user(&cop, (void*)arg, sizeof(cop))) {
-			dprintk("%s(CIOCCRYPT) - bad copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		cse = csefind(fcr, cop.ses);
-		if (cse == NULL) {
-			error = EINVAL;
-			dprintk("%s(CIOCCRYPT) - Fail %d\n", __FUNCTION__, error);
-			break;
-		}
-		error = cryptodev_op(cse, &cop);
-		if(copy_to_user((void*)arg, &cop, sizeof(cop))) {
-			dprintk("%s(CIOCCRYPT) - bad return copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		break;
-	case CIOCKEY:
-	case CIOCKEY2:
-		dprintk("%s(CIOCKEY)\n", __FUNCTION__);
-		if (!crypto_userasymcrypto)
-			return (EPERM);		/* XXX compat? */
-		if(copy_from_user(&kop, (void*)arg, sizeof(kop))) {
-			dprintk("%s(CIOCKEY) - bad copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		if (cmd == CIOCKEY) {
-			/* NB: crypto core enforces s/w driver use */
-			kop.crk_crid =
-			    CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
-		}
-		error = cryptodev_key(&kop);
-		if(copy_to_user((void*)arg, &kop, sizeof(kop))) {
-			dprintk("%s(CIOCGKEY) - bad return copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		break;
-	case CIOCASYMFEAT:
-		dprintk("%s(CIOCASYMFEAT)\n", __FUNCTION__);
-		if (!crypto_userasymcrypto) {
-			/*
-			 * NB: if user asym crypto operations are
-			 * not permitted return "no algorithms"
-			 * so well-behaved applications will just
-			 * fallback to doing them in software.
-			 */
-			feat = 0;
-		} else
-			error = crypto_getfeat(&feat);
-		if (!error) {
-		  error = copy_to_user((void*)arg, &feat, sizeof(feat));
-		}
-		break;
-	case CIOCFINDDEV:
-		if (copy_from_user(&fop, (void*)arg, sizeof(fop))) {
-			dprintk("%s(CIOCFINDDEV) - bad copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		error = cryptodev_find(&fop);
-		if (copy_to_user((void*)arg, &fop, sizeof(fop))) {
-			dprintk("%s(CIOCFINDDEV) - bad return copy\n", __FUNCTION__);
-			error = EFAULT;
-			goto bail;
-		}
-		break;
-	default:
-		dprintk("%s(unknown ioctl 0x%x)\n", __FUNCTION__, cmd);
-		error = EINVAL;
-		break;
-	}
-	return(-error);
-}
-
-#ifdef HAVE_UNLOCKED_IOCTL
-static long
-cryptodev_unlocked_ioctl(
-	struct file *filp,
-	unsigned int cmd,
-	unsigned long arg)
-{
-	return cryptodev_ioctl(NULL, filp, cmd, arg);
-}
-#endif
-
-static int
-cryptodev_open(struct inode *inode, struct file *filp)
-{
-	struct fcrypt *fcr;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (filp->private_data) {
-		printk("cryptodev: Private data already exists !\n");
-		return(0);
-	}
-
-	fcr = kmalloc(sizeof(*fcr), GFP_KERNEL);
-	if (!fcr) {
-		dprintk("%s() - malloc failed\n", __FUNCTION__);
-		return(-ENOMEM);
-	}
-	memset(fcr, 0, sizeof(*fcr));
-
-	INIT_LIST_HEAD(&fcr->csessions);
-	filp->private_data = fcr;
-	return(0);
-}
-
-static int
-cryptodev_release(struct inode *inode, struct file *filp)
-{
-	struct fcrypt *fcr = filp->private_data;
-	struct csession *cse, *tmp;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (!filp) {
-		printk("cryptodev: No private data on release\n");
-		return(0);
-	}
-
-	list_for_each_entry_safe(cse, tmp, &fcr->csessions, list) {
-		list_del(&cse->list);
-		(void)csefree(cse);
-	}
-	filp->private_data = NULL;
-	kfree(fcr);
-	return(0);
-}
-
-static struct file_operations cryptodev_fops = {
-	.owner = THIS_MODULE,
-	.open = cryptodev_open,
-	.release = cryptodev_release,
-	.ioctl = cryptodev_ioctl,
-#ifdef HAVE_UNLOCKED_IOCTL
-	.unlocked_ioctl = cryptodev_unlocked_ioctl,
-#endif
-};
-
-static struct miscdevice cryptodev = {
-	.minor = CRYPTODEV_MINOR,
-	.name = "crypto",
-	.fops = &cryptodev_fops,
-};
-
-static int __init
-cryptodev_init(void)
-{
-	int rc;
-
-	dprintk("%s(%p)\n", __FUNCTION__, cryptodev_init);
-	rc = misc_register(&cryptodev);
-	if (rc) {
-		printk(KERN_ERR "cryptodev: registration of /dev/crypto failed\n");
-		return(rc);
-	}
-
-	return(0);
-}
-
-static void __exit
-cryptodev_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	misc_deregister(&cryptodev);
-}
-
-module_init(cryptodev_init);
-module_exit(cryptodev_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("Cryptodev (user interface to OCF)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptodev.h b/target/linux/generic-2.6/files/crypto/ocf/cryptodev.h
deleted file mode 100644
index 60323175f2..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptodev.h
+++ /dev/null
@@ -1,479 +0,0 @@
-/*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.25 2007/05/09 19:37:02 gnn Exp $	*/
-/*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
-
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
- * Copyright (c) 2001 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef _CRYPTO_CRYPTO_H_
-#define _CRYPTO_CRYPTO_H_
-
-/* Some initial values */
-#define CRYPTO_DRIVERS_INITIAL	4
-#define CRYPTO_SW_SESSIONS	32
-
-/* Hash values */
-#define NULL_HASH_LEN		0
-#define MD5_HASH_LEN		16
-#define SHA1_HASH_LEN		20
-#define RIPEMD160_HASH_LEN	20
-#define SHA2_256_HASH_LEN	32
-#define SHA2_384_HASH_LEN	48
-#define SHA2_512_HASH_LEN	64
-#define MD5_KPDK_HASH_LEN	16
-#define SHA1_KPDK_HASH_LEN	20
-/* Maximum hash algorithm result length */
-#define HASH_MAX_LEN		SHA2_512_HASH_LEN /* Keep this updated */
-
-/* HMAC values */
-#define NULL_HMAC_BLOCK_LEN			1
-#define MD5_HMAC_BLOCK_LEN			64
-#define SHA1_HMAC_BLOCK_LEN			64
-#define RIPEMD160_HMAC_BLOCK_LEN	64
-#define SHA2_256_HMAC_BLOCK_LEN		64
-#define SHA2_384_HMAC_BLOCK_LEN		128
-#define SHA2_512_HMAC_BLOCK_LEN		128
-/* Maximum HMAC block length */
-#define HMAC_MAX_BLOCK_LEN		SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
-#define HMAC_IPAD_VAL			0x36
-#define HMAC_OPAD_VAL			0x5C
-
-/* Encryption algorithm block sizes */
-#define NULL_BLOCK_LEN			1
-#define DES_BLOCK_LEN			8
-#define DES3_BLOCK_LEN			8
-#define BLOWFISH_BLOCK_LEN		8
-#define SKIPJACK_BLOCK_LEN		8
-#define CAST128_BLOCK_LEN		8
-#define RIJNDAEL128_BLOCK_LEN	16
-#define AES_BLOCK_LEN			RIJNDAEL128_BLOCK_LEN
-#define CAMELLIA_BLOCK_LEN		16
-#define ARC4_BLOCK_LEN			1
-#define EALG_MAX_BLOCK_LEN		AES_BLOCK_LEN /* Keep this updated */
-
-/* Encryption algorithm min and max key sizes */
-#define NULL_MIN_KEY_LEN		0
-#define NULL_MAX_KEY_LEN		0
-#define DES_MIN_KEY_LEN			8
-#define DES_MAX_KEY_LEN			8
-#define DES3_MIN_KEY_LEN		24
-#define DES3_MAX_KEY_LEN		24
-#define BLOWFISH_MIN_KEY_LEN	4
-#define BLOWFISH_MAX_KEY_LEN	56
-#define SKIPJACK_MIN_KEY_LEN	10
-#define SKIPJACK_MAX_KEY_LEN	10
-#define CAST128_MIN_KEY_LEN		5
-#define CAST128_MAX_KEY_LEN		16
-#define RIJNDAEL128_MIN_KEY_LEN	16
-#define RIJNDAEL128_MAX_KEY_LEN	32
-#define AES_MIN_KEY_LEN			RIJNDAEL128_MIN_KEY_LEN
-#define AES_MAX_KEY_LEN			RIJNDAEL128_MAX_KEY_LEN
-#define CAMELLIA_MIN_KEY_LEN	16
-#define CAMELLIA_MAX_KEY_LEN	32
-#define ARC4_MIN_KEY_LEN		1
-#define ARC4_MAX_KEY_LEN		256
-
-/* Max size of data that can be processed */
-#define CRYPTO_MAX_DATA_LEN		64*1024 - 1
-
-#define CRYPTO_ALGORITHM_MIN	1
-#define CRYPTO_DES_CBC			1
-#define CRYPTO_3DES_CBC			2
-#define CRYPTO_BLF_CBC			3
-#define CRYPTO_CAST_CBC			4
-#define CRYPTO_SKIPJACK_CBC		5
-#define CRYPTO_MD5_HMAC			6
-#define CRYPTO_SHA1_HMAC		7
-#define CRYPTO_RIPEMD160_HMAC	8
-#define CRYPTO_MD5_KPDK			9
-#define CRYPTO_SHA1_KPDK		10
-#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
-#define CRYPTO_AES_CBC			11 /* 128 bit blocksize -- the same as above */
-#define CRYPTO_ARC4				12
-#define CRYPTO_MD5				13
-#define CRYPTO_SHA1				14
-#define CRYPTO_NULL_HMAC		15
-#define CRYPTO_NULL_CBC			16
-#define CRYPTO_DEFLATE_COMP		17 /* Deflate compression algorithm */
-#define CRYPTO_SHA2_256_HMAC	18
-#define CRYPTO_SHA2_384_HMAC	19
-#define CRYPTO_SHA2_512_HMAC	20
-#define CRYPTO_CAMELLIA_CBC		21
-#define CRYPTO_SHA2_256			22
-#define CRYPTO_SHA2_384			23
-#define CRYPTO_SHA2_512			24
-#define CRYPTO_RIPEMD160		25
-#define CRYPTO_ALGORITHM_MAX	25 /* Keep updated - see below */
-
-/* Algorithm flags */
-#define CRYPTO_ALG_FLAG_SUPPORTED	0x01 /* Algorithm is supported */
-#define CRYPTO_ALG_FLAG_RNG_ENABLE	0x02 /* Has HW RNG for DH/DSA */
-#define CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
-
-/*
- * Crypto driver/device flags.  They can set in the crid
- * parameter when creating a session or submitting a key
- * op to affect the device/driver assigned.  If neither
- * of these are specified then the crid is assumed to hold
- * the driver id of an existing (and suitable) device that
- * must be used to satisfy the request.
- */
-#define CRYPTO_FLAG_HARDWARE	0x01000000	/* hardware accelerated */
-#define CRYPTO_FLAG_SOFTWARE	0x02000000	/* software implementation */
-
-/* NB: deprecated */
-struct session_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	u_int32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	u_int32_t	ses;		/* returns: session # */ 
-};
-
-struct session2_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	u_int32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	u_int32_t	ses;		/* returns: session # */ 
-	int		crid;		/* driver id + flags (rw) */
-	int		pad[4];		/* for future expansion */
-};
-
-struct crypt_op {
-	u_int32_t	ses;
-	u_int16_t	op;		/* i.e. COP_ENCRYPT */
-#define COP_NONE	0
-#define COP_ENCRYPT	1
-#define COP_DECRYPT	2
-	u_int16_t	flags;
-#define	COP_F_BATCH	0x0008		/* Batch op if possible */
-	u_int		len;
-	caddr_t		src, dst;	/* become iov[] inside kernel */
-	caddr_t		mac;		/* must be big enough for chosen MAC */
-	caddr_t		iv;
-};
-
-/*
- * Parameters for looking up a crypto driver/device by
- * device name or by id.  The latter are returned for
- * created sessions (crid) and completed key operations.
- */
-struct crypt_find_op {
-	int		crid;		/* driver id + flags */
-	char		name[32];	/* device/driver name */
-};
-
-/* bignum parameter, in packed bytes, ... */
-struct crparam {
-	caddr_t		crp_p;
-	u_int		crp_nbits;
-};
-
-#define CRK_MAXPARAM	8
-
-struct crypt_kop {
-	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		crk_status;	/* return status */
-	u_short		crk_iparams;	/* # of input parameters */
-	u_short		crk_oparams;	/* # of output parameters */
-	u_int		crk_crid;	/* NB: only used by CIOCKEY2 (rw) */
-	struct crparam	crk_param[CRK_MAXPARAM];
-};
-#define CRK_ALGORITM_MIN	0
-#define CRK_MOD_EXP		0
-#define CRK_MOD_EXP_CRT		1
-#define CRK_DSA_SIGN		2
-#define CRK_DSA_VERIFY		3
-#define CRK_DH_COMPUTE_KEY	4
-#define CRK_ALGORITHM_MAX	4 /* Keep updated - see below */
-
-#define CRF_MOD_EXP		(1 << CRK_MOD_EXP)
-#define CRF_MOD_EXP_CRT		(1 << CRK_MOD_EXP_CRT)
-#define CRF_DSA_SIGN		(1 << CRK_DSA_SIGN)
-#define CRF_DSA_VERIFY		(1 << CRK_DSA_VERIFY)
-#define CRF_DH_COMPUTE_KEY	(1 << CRK_DH_COMPUTE_KEY)
-
-/*
- * done against open of /dev/crypto, to get a cloned descriptor.
- * Please use F_SETFD against the cloned descriptor.
- */
-#define CRIOGET		_IOWR('c', 100, u_int32_t)
-#define CRIOASYMFEAT	CIOCASYMFEAT
-#define CRIOFINDDEV	CIOCFINDDEV
-
-/* the following are done against the cloned descriptor */
-#define CIOCGSESSION	_IOWR('c', 101, struct session_op)
-#define CIOCFSESSION	_IOW('c', 102, u_int32_t)
-#define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
-#define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
-#define CIOCASYMFEAT	_IOR('c', 105, u_int32_t)
-#define CIOCGSESSION2	_IOWR('c', 106, struct session2_op)
-#define CIOCKEY2	_IOWR('c', 107, struct crypt_kop)
-#define CIOCFINDDEV	_IOWR('c', 108, struct crypt_find_op)
-
-struct cryptotstat {
-	struct timespec	acc;		/* total accumulated time */
-	struct timespec	min;		/* min time */
-	struct timespec	max;		/* max time */
-	u_int32_t	count;		/* number of observations */
-};
-
-struct cryptostats {
-	u_int32_t	cs_ops;		/* symmetric crypto ops submitted */
-	u_int32_t	cs_errs;	/* symmetric crypto ops that failed */
-	u_int32_t	cs_kops;	/* asymetric/key ops submitted */
-	u_int32_t	cs_kerrs;	/* asymetric/key ops that failed */
-	u_int32_t	cs_intrs;	/* crypto swi thread activations */
-	u_int32_t	cs_rets;	/* crypto return thread activations */
-	u_int32_t	cs_blocks;	/* symmetric op driver block */
-	u_int32_t	cs_kblocks;	/* symmetric op driver block */
-	/*
-	 * When CRYPTO_TIMING is defined at compile time and the
-	 * sysctl debug.crypto is set to 1, the crypto system will
-	 * accumulate statistics about how long it takes to process
-	 * crypto requests at various points during processing.
-	 */
-	struct cryptotstat cs_invoke;	/* crypto_dipsatch -> crypto_invoke */
-	struct cryptotstat cs_done;	/* crypto_invoke -> crypto_done */
-	struct cryptotstat cs_cb;	/* crypto_done -> callback */
-	struct cryptotstat cs_finis;	/* callback -> callback return */
-
-	u_int32_t	cs_drops;		/* crypto ops dropped due to congestion */
-};
-
-#ifdef __KERNEL__
-
-/* Standard initialization structure beginning */
-struct cryptoini {
-	int		cri_alg;	/* Algorithm to use */
-	int		cri_klen;	/* Key length, in bits */
-	int		cri_mlen;	/* Number of bytes we want from the
-					   entire hash. 0 means all. */
-	caddr_t		cri_key;	/* key to use */
-	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
-	struct cryptoini *cri_next;
-};
-
-/* Describe boundaries of a single crypto operation */
-struct cryptodesc {
-	int		crd_skip;	/* How many bytes to ignore from start */
-	int		crd_len;	/* How many bytes to process */
-	int		crd_inject;	/* Where to inject results, if applicable */
-	int		crd_flags;
-
-#define CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
-#define CRD_F_IV_PRESENT	0x02	/* When encrypting, IV is already in
-					   place, so don't copy. */
-#define CRD_F_IV_EXPLICIT	0x04	/* IV explicitly provided */
-#define CRD_F_DSA_SHA_NEEDED	0x08	/* Compute SHA-1 of buffer for DSA */
-#define CRD_F_KEY_EXPLICIT	0x10	/* Key explicitly provided */
-#define CRD_F_COMP		0x0f    /* Set when doing compression */
-
-	struct cryptoini	CRD_INI; /* Initialization/context data */
-#define crd_iv		CRD_INI.cri_iv
-#define crd_key		CRD_INI.cri_key
-#define crd_alg		CRD_INI.cri_alg
-#define crd_klen	CRD_INI.cri_klen
-#define crd_mlen	CRD_INI.cri_mlen
-
-	struct cryptodesc *crd_next;
-};
-
-/* Structure describing complete operation */
-struct cryptop {
-	struct list_head crp_next;
-	wait_queue_head_t crp_waitq;
-
-	u_int64_t	crp_sid;	/* Session ID */
-	int		crp_ilen;	/* Input data total length */
-	int		crp_olen;	/* Result total length */
-
-	int		crp_etype;	/*
-					 * Error type (zero means no error).
-					 * All error codes except EAGAIN
-					 * indicate possible data corruption (as in,
-					 * the data have been touched). On all
-					 * errors, the crp_sid may have changed
-					 * (reset to a new one), so the caller
-					 * should always check and use the new
-					 * value on future requests.
-					 */
-	int		crp_flags;
-
-#define CRYPTO_F_SKBUF		0x0001	/* Input/output are skbuf chains */
-#define CRYPTO_F_IOV		0x0002	/* Input/output are uio */
-#define CRYPTO_F_REL		0x0004	/* Must return data in same place */
-#define CRYPTO_F_BATCH		0x0008	/* Batch op if possible */
-#define CRYPTO_F_CBIMM		0x0010	/* Do callback immediately */
-#define CRYPTO_F_DONE		0x0020	/* Operation completed */
-#define CRYPTO_F_CBIFSYNC	0x0040	/* Do CBIMM if op is synchronous */
-
-	caddr_t		crp_buf;	/* Data to be processed */
-	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
-	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
-
-	int (*crp_callback)(struct cryptop *); /* Callback function */
-};
-
-#define CRYPTO_BUF_CONTIG	0x0
-#define CRYPTO_BUF_IOV		0x1
-#define CRYPTO_BUF_SKBUF		0x2
-
-#define CRYPTO_OP_DECRYPT	0x0
-#define CRYPTO_OP_ENCRYPT	0x1
-
-/*
- * Hints passed to process methods.
- */
-#define CRYPTO_HINT_MORE	0x1	/* more ops coming shortly */
-
-struct cryptkop {
-	struct list_head krp_next;
-	wait_queue_head_t krp_waitq;
-
-	int		krp_flags;
-#define CRYPTO_KF_DONE		0x0001	/* Operation completed */
-#define CRYPTO_KF_CBIMM		0x0002	/* Do callback immediately */
-
-	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		krp_status;	/* return status */
-	u_short		krp_iparams;	/* # of input parameters */
-	u_short		krp_oparams;	/* # of output parameters */
-	u_int		krp_crid;	/* desired device, etc. */
-	u_int32_t	krp_hid;
-	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
-	int		(*krp_callback)(struct cryptkop *);
-};
-
-#include <ocf-compat.h>
-
-/*
- * Session ids are 64 bits.  The lower 32 bits contain a "local id" which
- * is a driver-private session identifier.  The upper 32 bits contain a
- * "hardware id" used by the core crypto code to identify the driver and
- * a copy of the driver's capabilities that can be used by client code to
- * optimize operation.
- */
-#define CRYPTO_SESID2HID(_sid)	(((_sid) >> 32) & 0x00ffffff)
-#define CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 32) & 0xff000000)
-#define CRYPTO_SESID2LID(_sid)	(((u_int32_t) (_sid)) & 0xffffffff)
-
-extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
-extern	int crypto_freesession(u_int64_t sid);
-#define CRYPTOCAP_F_HARDWARE	CRYPTO_FLAG_HARDWARE
-#define CRYPTOCAP_F_SOFTWARE	CRYPTO_FLAG_SOFTWARE
-#define CRYPTOCAP_F_SYNC	0x04000000	/* operates synchronously */
-extern	int32_t crypto_get_driverid(device_t dev, int flags);
-extern	int crypto_find_driver(const char *);
-extern	device_t crypto_find_device_byhid(int hid);
-extern	int crypto_getcaps(int hid);
-extern	int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
-	    u_int32_t flags);
-extern	int crypto_kregister(u_int32_t, int, u_int32_t);
-extern	int crypto_unregister(u_int32_t driverid, int alg);
-extern	int crypto_unregister_all(u_int32_t driverid);
-extern	int crypto_dispatch(struct cryptop *crp);
-extern	int crypto_kdispatch(struct cryptkop *);
-#define CRYPTO_SYMQ	0x1
-#define CRYPTO_ASYMQ	0x2
-extern	int crypto_unblock(u_int32_t, int);
-extern	void crypto_done(struct cryptop *crp);
-extern	void crypto_kdone(struct cryptkop *);
-extern	int crypto_getfeat(int *);
-
-extern	void crypto_freereq(struct cryptop *crp);
-extern	struct cryptop *crypto_getreq(int num);
-
-extern  int crypto_usercrypto;      /* userland may do crypto requests */
-extern  int crypto_userasymcrypto;  /* userland may do asym crypto reqs */
-extern  int crypto_devallowsoft;    /* only use hardware crypto */
-
-/*
- * random number support,  crypto_unregister_all will unregister
- */
-extern int crypto_rregister(u_int32_t driverid,
-		int (*read_random)(void *arg, u_int32_t *buf, int len), void *arg);
-extern int crypto_runregister_all(u_int32_t driverid);
-
-/*
- * Crypto-related utility routines used mainly by drivers.
- *
- * XXX these don't really belong here; but for now they're
- *     kept apart from the rest of the system.
- */
-struct uio;
-extern	void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp);
-extern	void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp);
-extern	struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
-
-extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
-	    caddr_t in);
-extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
-	    caddr_t out);
-extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
-	    int (*f)(void *, void *, u_int), void *arg);
-
-#endif /* __KERNEL__ */
-#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/cryptosoft.c b/target/linux/generic-2.6/files/crypto/ocf/cryptosoft.c
deleted file mode 100644
index 52e1570fcc..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/cryptosoft.c
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
- * An OCF module that uses the linux kernel cryptoapi, based on the
- * original cryptosoft for BSD by Angelos D. Keromytis (angelos@cis.upenn.edu)
- * but is mostly unrecognisable,
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2004-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-#include <linux/scatterlist.h>
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
-#include <crypto/hash.h>
-#endif
-
-#include <cryptodev.h>
-#include <uio.h>
-
-struct {
-	softc_device_decl	sc_dev;
-} swcr_softc;
-
-#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK)
-
-#define SW_TYPE_CIPHER		0x01
-#define SW_TYPE_HMAC		0x02
-#define SW_TYPE_HASH		0x04
-#define SW_TYPE_COMP		0x08
-#define SW_TYPE_BLKCIPHER	0x10
-#define SW_TYPE_ALG_MASK	0x1f
-
-#define SW_TYPE_ASYNC		0x8000
-
-/* We change some of the above if we have an async interface */
-
-#define SW_TYPE_ALG_AMASK	(SW_TYPE_ALG_MASK | SW_TYPE_ASYNC)
-
-#define SW_TYPE_ABLKCIPHER	(SW_TYPE_BLKCIPHER | SW_TYPE_ASYNC)
-#define SW_TYPE_AHASH		(SW_TYPE_HASH | SW_TYPE_ASYNC)
-#define SW_TYPE_AHMAC		(SW_TYPE_HMAC | SW_TYPE_ASYNC)
-
-#define SCATTERLIST_MAX 16
-
-struct swcr_data {
-	int					sw_type;
-	int					sw_alg;
-	struct crypto_tfm	*sw_tfm;
-	union {
-		struct {
-			char *sw_key;
-			int  sw_klen;
-			int  sw_mlen;
-		} hmac;
-		void *sw_comp_buf;
-	} u;
-	struct swcr_data	*sw_next;
-};
-
-struct swcr_req {
-	struct swcr_data	*sw_head;
-	struct swcr_data	*sw;
-	struct cryptop		*crp;
-	struct cryptodesc	*crd;
-	struct scatterlist	 sg[SCATTERLIST_MAX];
-	unsigned char		 iv[EALG_MAX_BLOCK_LEN];
-	char				 result[HASH_MAX_LEN];
-	void				*crypto_req;
-};
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static kmem_cache_t *swcr_req_cache;
-#else
-static struct kmem_cache *swcr_req_cache;
-#endif
-
-#ifndef CRYPTO_TFM_MODE_CBC
-/*
- * As of linux-2.6.21 this is no longer defined, and presumably no longer
- * needed to be passed into the crypto core code.
- */
-#define	CRYPTO_TFM_MODE_CBC	0
-#define	CRYPTO_TFM_MODE_ECB	0
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-	/*
-	 * Linux 2.6.19 introduced a new Crypto API, setup macro's to convert new
-	 * API into old API.
-	 */
-
-	/* Symmetric/Block Cipher */
-	struct blkcipher_desc
-	{
-		struct crypto_tfm *tfm;
-		void *info;
-	};
-	#define ecb(X)								#X , CRYPTO_TFM_MODE_ECB
-	#define cbc(X)								#X , CRYPTO_TFM_MODE_CBC
-	#define crypto_has_blkcipher(X, Y, Z)		crypto_alg_available(X, 0)
-	#define crypto_blkcipher_cast(X)			X
-	#define crypto_blkcipher_tfm(X)				X
-	#define crypto_alloc_blkcipher(X, Y, Z)		crypto_alloc_tfm(X, mode)
-	#define crypto_blkcipher_ivsize(X)			crypto_tfm_alg_ivsize(X)
-	#define crypto_blkcipher_blocksize(X)		crypto_tfm_alg_blocksize(X)
-	#define crypto_blkcipher_setkey(X, Y, Z)	crypto_cipher_setkey(X, Y, Z)
-	#define crypto_blkcipher_encrypt_iv(W, X, Y, Z)	\
-				crypto_cipher_encrypt_iv((W)->tfm, X, Y, Z, (u8 *)((W)->info))
-	#define crypto_blkcipher_decrypt_iv(W, X, Y, Z)	\
-				crypto_cipher_decrypt_iv((W)->tfm, X, Y, Z, (u8 *)((W)->info))
-	#define crypto_blkcipher_set_flags(x, y)	/* nop */
-
-	/* Hash/HMAC/Digest */
-	struct hash_desc
-	{
-		struct crypto_tfm *tfm;
-	};
-	#define hmac(X)							#X , 0
-	#define crypto_has_hash(X, Y, Z)		crypto_alg_available(X, 0)
-	#define crypto_hash_cast(X)				X
-	#define crypto_hash_tfm(X)				X
-	#define crypto_alloc_hash(X, Y, Z)		crypto_alloc_tfm(X, mode)
-	#define crypto_hash_digestsize(X)		crypto_tfm_alg_digestsize(X)
-	#define crypto_hash_digest(W, X, Y, Z)	\
-				crypto_digest_digest((W)->tfm, X, sg_num, Z)
-
-	/* Asymmetric Cipher */
-	#define crypto_has_cipher(X, Y, Z)		crypto_alg_available(X, 0)
-
-	/* Compression */
-	#define crypto_has_comp(X, Y, Z)		crypto_alg_available(X, 0)
-	#define crypto_comp_tfm(X)				X
-	#define crypto_comp_cast(X)				X
-	#define crypto_alloc_comp(X, Y, Z)		crypto_alloc_tfm(X, mode)
-	#define plain(X)	#X , 0
-#else
-	#define ecb(X)	"ecb(" #X ")" , 0
-	#define cbc(X)	"cbc(" #X ")" , 0
-	#define hmac(X)	"hmac(" #X ")" , 0
-	#define plain(X)	#X , 0
-#endif /* if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-/* no ablkcipher in older kernels */
-#define crypto_alloc_ablkcipher(a,b,c)		(NULL)
-#define crypto_ablkcipher_tfm(x)			((struct crypto_tfm *)(x))
-#define crypto_ablkcipher_set_flags(a, b)	/* nop */
-#define crypto_ablkcipher_setkey(x, y, z)	(-EINVAL)
-#define	crypto_has_ablkcipher(a,b,c)		(0)
-#else
-#define	HAVE_ABLKCIPHER
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
-/* no ahash in older kernels */
-#define crypto_ahash_tfm(x)					((struct crypto_tfm *)(x))
-#define	crypto_alloc_ahash(a,b,c)			(NULL)
-#define	crypto_ahash_digestsize(x)			0
-#else
-#define	HAVE_AHASH
-#endif
-
-struct crypto_details {
-	char *alg_name;
-	int mode;
-	int sw_type;
-};
-
-static struct crypto_details crypto_details[] = {
-	[CRYPTO_DES_CBC]         = { cbc(des),          SW_TYPE_BLKCIPHER, },
-	[CRYPTO_3DES_CBC]        = { cbc(des3_ede),     SW_TYPE_BLKCIPHER, },
-	[CRYPTO_BLF_CBC]         = { cbc(blowfish),     SW_TYPE_BLKCIPHER, },
-	[CRYPTO_CAST_CBC]        = { cbc(cast5),        SW_TYPE_BLKCIPHER, },
-	[CRYPTO_SKIPJACK_CBC]    = { cbc(skipjack),     SW_TYPE_BLKCIPHER, },
-	[CRYPTO_MD5_HMAC]        = { hmac(md5),         SW_TYPE_HMAC, },
-	[CRYPTO_SHA1_HMAC]       = { hmac(sha1),        SW_TYPE_HMAC, },
-	[CRYPTO_RIPEMD160_HMAC]  = { hmac(ripemd160),   SW_TYPE_HMAC, },
-	[CRYPTO_MD5_KPDK]        = { plain(md5-kpdk),   SW_TYPE_HASH, },
-	[CRYPTO_SHA1_KPDK]       = { plain(sha1-kpdk),  SW_TYPE_HASH, },
-	[CRYPTO_AES_CBC]         = { cbc(aes),          SW_TYPE_BLKCIPHER, },
-	[CRYPTO_ARC4]            = { ecb(arc4),         SW_TYPE_BLKCIPHER, },
-	[CRYPTO_MD5]             = { plain(md5),        SW_TYPE_HASH, },
-	[CRYPTO_SHA1]            = { plain(sha1),       SW_TYPE_HASH, },
-	[CRYPTO_NULL_HMAC]       = { hmac(digest_null), SW_TYPE_HMAC, },
-	[CRYPTO_NULL_CBC]        = { cbc(cipher_null),  SW_TYPE_BLKCIPHER, },
-	[CRYPTO_DEFLATE_COMP]    = { plain(deflate),    SW_TYPE_COMP, },
-	[CRYPTO_SHA2_256_HMAC]   = { hmac(sha256),      SW_TYPE_HMAC, },
-	[CRYPTO_SHA2_384_HMAC]   = { hmac(sha384),      SW_TYPE_HMAC, },
-	[CRYPTO_SHA2_512_HMAC]   = { hmac(sha512),      SW_TYPE_HMAC, },
-	[CRYPTO_CAMELLIA_CBC]    = { cbc(camellia),     SW_TYPE_BLKCIPHER, },
-	[CRYPTO_SHA2_256]        = { plain(sha256),     SW_TYPE_HASH, },
-	[CRYPTO_SHA2_384]        = { plain(sha384),     SW_TYPE_HASH, },
-	[CRYPTO_SHA2_512]        = { plain(sha512),     SW_TYPE_HASH, },
-	[CRYPTO_RIPEMD160]       = { plain(ripemd160),  SW_TYPE_HASH, },
-};
-
-int32_t swcr_id = -1;
-module_param(swcr_id, int, 0444);
-MODULE_PARM_DESC(swcr_id, "Read-Only OCF ID for cryptosoft driver");
-
-int swcr_fail_if_compression_grows = 1;
-module_param(swcr_fail_if_compression_grows, int, 0644);
-MODULE_PARM_DESC(swcr_fail_if_compression_grows,
-                "Treat compression that results in more data as a failure");
-
-int swcr_no_ahash = 0;
-module_param(swcr_no_ahash, int, 0644);
-MODULE_PARM_DESC(swcr_no_ahash,
-                "Do not use async hash/hmac even if available");
-
-int swcr_no_ablk = 0;
-module_param(swcr_no_ablk, int, 0644);
-MODULE_PARM_DESC(swcr_no_ablk,
-                "Do not use async blk ciphers even if available");
-
-static struct swcr_data **swcr_sessions = NULL;
-static u_int32_t swcr_sesnum = 0;
-
-static	int swcr_process(device_t, struct cryptop *, int);
-static	int swcr_newsession(device_t, u_int32_t *, struct cryptoini *);
-static	int swcr_freesession(device_t, u_int64_t);
-
-static device_method_t swcr_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	swcr_newsession),
-	DEVMETHOD(cryptodev_freesession,swcr_freesession),
-	DEVMETHOD(cryptodev_process,	swcr_process),
-};
-
-#define debug swcr_debug
-int swcr_debug = 0;
-module_param(swcr_debug, int, 0644);
-MODULE_PARM_DESC(swcr_debug, "Enable debug");
-
-static void swcr_process_req(struct swcr_req *req);
-
-/*
- * Generate a new software session.
- */
-static int
-swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
-{
-	struct swcr_data **swd;
-	u_int32_t i;
-	int error;
-	char *algo;
-	int mode;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid == NULL || cri == NULL) {
-		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	if (swcr_sessions) {
-		for (i = 1; i < swcr_sesnum; i++)
-			if (swcr_sessions[i] == NULL)
-				break;
-	} else
-		i = 1;		/* NB: to silence compiler warning */
-
-	if (swcr_sessions == NULL || i == swcr_sesnum) {
-		if (swcr_sessions == NULL) {
-			i = 1; /* We leave swcr_sessions[0] empty */
-			swcr_sesnum = CRYPTO_SW_SESSIONS;
-		} else
-			swcr_sesnum *= 2;
-
-		swd = kmalloc(swcr_sesnum * sizeof(struct swcr_data *), SLAB_ATOMIC);
-		if (swd == NULL) {
-			/* Reset session number */
-			if (swcr_sesnum == CRYPTO_SW_SESSIONS)
-				swcr_sesnum = 0;
-			else
-				swcr_sesnum /= 2;
-			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-			return ENOBUFS;
-		}
-		memset(swd, 0, swcr_sesnum * sizeof(struct swcr_data *));
-
-		/* Copy existing sessions */
-		if (swcr_sessions) {
-			memcpy(swd, swcr_sessions,
-			    (swcr_sesnum / 2) * sizeof(struct swcr_data *));
-			kfree(swcr_sessions);
-		}
-
-		swcr_sessions = swd;
-	}
-
-	swd = &swcr_sessions[i];
-	*sid = i;
-
-	while (cri) {
-		*swd = (struct swcr_data *) kmalloc(sizeof(struct swcr_data),
-				SLAB_ATOMIC);
-		if (*swd == NULL) {
-			swcr_freesession(NULL, i);
-			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-			return ENOBUFS;
-		}
-		memset(*swd, 0, sizeof(struct swcr_data));
-
-		if (cri->cri_alg < 0 ||
-				cri->cri_alg>=sizeof(crypto_details)/sizeof(crypto_details[0])){
-			printk("cryptosoft: Unknown algorithm 0x%x\n", cri->cri_alg);
-			swcr_freesession(NULL, i);
-			return EINVAL;
-		}
-
-		algo = crypto_details[cri->cri_alg].alg_name;
-		if (!algo || !*algo) {
-			printk("cryptosoft: Unsupported algorithm 0x%x\n", cri->cri_alg);
-			swcr_freesession(NULL, i);
-			return EINVAL;
-		}
-
-		mode = crypto_details[cri->cri_alg].mode;
-		(*swd)->sw_type = crypto_details[cri->cri_alg].sw_type;
-		(*swd)->sw_alg = cri->cri_alg;
-
-		/* Algorithm specific configuration */
-		switch (cri->cri_alg) {
-		case CRYPTO_NULL_CBC:
-			cri->cri_klen = 0; /* make it work with crypto API */
-			break;
-		default:
-			break;
-		}
-
-		if ((*swd)->sw_type & SW_TYPE_BLKCIPHER) {
-			dprintk("%s crypto_alloc_*blkcipher(%s, 0x%x)\n", __FUNCTION__,
-					algo, mode);
-
-			/* try async first */
-			(*swd)->sw_tfm = swcr_no_ablk ? NULL :
-					crypto_ablkcipher_tfm(crypto_alloc_ablkcipher(algo, 0, 0));
-			if ((*swd)->sw_tfm) {
-				dprintk("%s %s cipher is async\n", __FUNCTION__, algo);
-				(*swd)->sw_type |= SW_TYPE_ASYNC;
-			} else {
-				dprintk("%s %s cipher is sync\n", __FUNCTION__, algo);
-				(*swd)->sw_tfm = crypto_blkcipher_tfm(
-						crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC));
-			}
-			if (!(*swd)->sw_tfm) {
-				dprintk("cryptosoft: crypto_alloc_blkcipher failed(%s, 0x%x)\n",
-						algo,mode);
-				swcr_freesession(NULL, i);
-				return EINVAL;
-			}
-
-			if (debug) {
-				dprintk("%s key:cri->cri_klen=%d,(cri->cri_klen + 7)/8=%d",
-						__FUNCTION__, cri->cri_klen, (cri->cri_klen + 7) / 8);
-				for (i = 0; i < (cri->cri_klen + 7) / 8; i++)
-					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
-							cri->cri_key[i] & 0xff);
-				dprintk("\n");
-			}
-			if ((*swd)->sw_type & SW_TYPE_ASYNC) {
-				/* OCF doesn't enforce keys */
-				crypto_ablkcipher_set_flags(
-						__crypto_ablkcipher_cast((*swd)->sw_tfm),
-							CRYPTO_TFM_REQ_WEAK_KEY);
-				error = crypto_ablkcipher_setkey(
-							__crypto_ablkcipher_cast((*swd)->sw_tfm),
-								cri->cri_key, (cri->cri_klen + 7) / 8);
-			} else {
-				/* OCF doesn't enforce keys */
-				crypto_blkcipher_set_flags(
-						crypto_blkcipher_cast((*swd)->sw_tfm),
-							CRYPTO_TFM_REQ_WEAK_KEY);
-				error = crypto_blkcipher_setkey(
-							crypto_blkcipher_cast((*swd)->sw_tfm),
-								cri->cri_key, (cri->cri_klen + 7) / 8);
-			}
-			if (error) {
-				printk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n", error,
-						(*swd)->sw_tfm->crt_flags);
-				swcr_freesession(NULL, i);
-				return error;
-			}
-		} else if ((*swd)->sw_type & (SW_TYPE_HMAC | SW_TYPE_HASH)) {
-			dprintk("%s crypto_alloc_*hash(%s, 0x%x)\n", __FUNCTION__,
-					algo, mode);
-
-			/* try async first */
-			(*swd)->sw_tfm = swcr_no_ahash ? NULL :
-					crypto_ahash_tfm(crypto_alloc_ahash(algo, 0, 0));
-			if ((*swd)->sw_tfm) {
-				dprintk("%s %s hash is async\n", __FUNCTION__, algo);
-				(*swd)->sw_type |= SW_TYPE_ASYNC;
-			} else {
-				dprintk("%s %s hash is sync\n", __FUNCTION__, algo);
-				(*swd)->sw_tfm = crypto_hash_tfm(
-						crypto_alloc_hash(algo, 0, CRYPTO_ALG_ASYNC));
-			}
-
-			if (!(*swd)->sw_tfm) {
-				dprintk("cryptosoft: crypto_alloc_hash failed(%s,0x%x)\n",
-						algo, mode);
-				swcr_freesession(NULL, i);
-				return EINVAL;
-			}
-
-			(*swd)->u.hmac.sw_klen = (cri->cri_klen + 7) / 8;
-			(*swd)->u.hmac.sw_key = (char *)kmalloc((*swd)->u.hmac.sw_klen,
-					SLAB_ATOMIC);
-			if ((*swd)->u.hmac.sw_key == NULL) {
-				swcr_freesession(NULL, i);
-				dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-				return ENOBUFS;
-			}
-			memcpy((*swd)->u.hmac.sw_key, cri->cri_key, (*swd)->u.hmac.sw_klen);
-			if (cri->cri_mlen) {
-				(*swd)->u.hmac.sw_mlen = cri->cri_mlen;
-			} else if ((*swd)->sw_type & SW_TYPE_ASYNC) {
-				(*swd)->u.hmac.sw_mlen = crypto_ahash_digestsize(
-						__crypto_ahash_cast((*swd)->sw_tfm));
-			} else  {
-				(*swd)->u.hmac.sw_mlen = crypto_hash_digestsize(
-						crypto_hash_cast((*swd)->sw_tfm));
-			}
-		} else if ((*swd)->sw_type & SW_TYPE_COMP) {
-			(*swd)->sw_tfm = crypto_comp_tfm(
-					crypto_alloc_comp(algo, 0, CRYPTO_ALG_ASYNC));
-			if (!(*swd)->sw_tfm) {
-				dprintk("cryptosoft: crypto_alloc_comp failed(%s,0x%x)\n",
-						algo, mode);
-				swcr_freesession(NULL, i);
-				return EINVAL;
-			}
-			(*swd)->u.sw_comp_buf = kmalloc(CRYPTO_MAX_DATA_LEN, SLAB_ATOMIC);
-			if ((*swd)->u.sw_comp_buf == NULL) {
-				swcr_freesession(NULL, i);
-				dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-				return ENOBUFS;
-			}
-		} else {
-			printk("cryptosoft: Unhandled sw_type %d\n", (*swd)->sw_type);
-			swcr_freesession(NULL, i);
-			return EINVAL;
-		}
-
-		cri = cri->cri_next;
-		swd = &((*swd)->sw_next);
-	}
-	return 0;
-}
-
-/*
- * Free a session.
- */
-static int
-swcr_freesession(device_t dev, u_int64_t tid)
-{
-	struct swcr_data *swd;
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid > swcr_sesnum || swcr_sessions == NULL ||
-			swcr_sessions[sid] == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return(EINVAL);
-	}
-
-	/* Silently accept and return */
-	if (sid == 0)
-		return(0);
-
-	while ((swd = swcr_sessions[sid]) != NULL) {
-		swcr_sessions[sid] = swd->sw_next;
-		if (swd->sw_tfm) {
-			switch (swd->sw_type & SW_TYPE_ALG_AMASK) {
-#ifdef HAVE_AHASH
-			case SW_TYPE_AHMAC:
-			case SW_TYPE_AHASH:
-				crypto_free_ahash(__crypto_ahash_cast(swd->sw_tfm));
-				break;
-#endif
-#ifdef HAVE_ABLKCIPHER
-			case SW_TYPE_ABLKCIPHER:
-				crypto_free_ablkcipher(__crypto_ablkcipher_cast(swd->sw_tfm));
-				break;
-#endif
-			case SW_TYPE_BLKCIPHER:
-				crypto_free_blkcipher(crypto_blkcipher_cast(swd->sw_tfm));
-				break;
-			case SW_TYPE_HMAC:
-			case SW_TYPE_HASH:
-				crypto_free_hash(crypto_hash_cast(swd->sw_tfm));
-				break;
-			case SW_TYPE_COMP:
-				crypto_free_comp(crypto_comp_cast(swd->sw_tfm));
-			default:
-				crypto_free_tfm(swd->sw_tfm);
-				break;
-			}
-			swd->sw_tfm = NULL;
-		}
-		if (swd->sw_type & SW_TYPE_COMP) {
-			if (swd->u.sw_comp_buf)
-				kfree(swd->u.sw_comp_buf);
-		} else {
-			if (swd->u.hmac.sw_key)
-				kfree(swd->u.hmac.sw_key);
-		}
-		kfree(swd);
-	}
-	return 0;
-}
-
-#if defined(HAVE_ABLKCIPHER) || defined(HAVE_AHASH)
-/* older kernels had no async interface */
-
-static void swcr_process_callback(struct crypto_async_request *creq, int err)
-{
-	struct swcr_req *req = creq->data;
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (err) {
-		if (err == -EINPROGRESS)
-			return;
-		dprintk("%s() fail %d\n", __FUNCTION__, -err);
-		req->crp->crp_etype = -err;
-		goto done;
-	}
-
-	switch (req->sw->sw_type & SW_TYPE_ALG_AMASK) {
-	case SW_TYPE_AHMAC:
-	case SW_TYPE_AHASH:
-		crypto_copyback(req->crp->crp_flags, req->crp->crp_buf,
-				req->crd->crd_inject, req->sw->u.hmac.sw_mlen, req->result);
-		ahash_request_free(req->crypto_req);
-		break;
-	case SW_TYPE_ABLKCIPHER:
-		ablkcipher_request_free(req->crypto_req);
-		break;
-	default:
-		req->crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	req->crd = req->crd->crd_next;
-	if (req->crd) {
-		swcr_process_req(req);
-		return;
-	}
-
-done:
-	dprintk("%s crypto_done %p\n", __FUNCTION__, req);
-	crypto_done(req->crp);
-	kmem_cache_free(swcr_req_cache, req);
-}
-#endif /* defined(HAVE_ABLKCIPHER) || defined(HAVE_AHASH) */
-
-
-static void swcr_process_req(struct swcr_req *req)
-{
-	struct swcr_data *sw;
-	struct cryptop *crp = req->crp;
-	struct cryptodesc *crd = req->crd;
-	struct sk_buff *skb = (struct sk_buff *) crp->crp_buf;
-	struct uio *uiop = (struct uio *) crp->crp_buf;
-	int sg_num, sg_len, skip;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	/*
-	 * Find the crypto context.
-	 *
-	 * XXX Note that the logic here prevents us from having
-	 * XXX the same algorithm multiple times in a session
-	 * XXX (or rather, we can but it won't give us the right
-	 * XXX results). To do that, we'd need some way of differentiating
-	 * XXX between the various instances of an algorithm (so we can
-	 * XXX locate the correct crypto context).
-	 */
-	for (sw = req->sw_head; sw && sw->sw_alg != crd->crd_alg; sw = sw->sw_next)
-		;
-
-	/* No such context ? */
-	if (sw == NULL) {
-		crp->crp_etype = EINVAL;
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		goto done;
-	}
-
-	req->sw = sw;
-	skip = crd->crd_skip;
-
-	/*
-	 * setup the SG list skip from the start of the buffer
-	 */
-	memset(req->sg, 0, sizeof(req->sg));
-	sg_init_table(req->sg, SCATTERLIST_MAX);
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		int i, len;
-
-		sg_num = 0;
-		sg_len = 0;
-
-		if (skip < skb_headlen(skb)) {
-			len = skb_headlen(skb) - skip;
-			if (len + sg_len > crd->crd_len)
-				len = crd->crd_len - sg_len;
-			sg_set_page(&req->sg[sg_num],
-				virt_to_page(skb->data + skip), len,
-				offset_in_page(skb->data + skip));
-			sg_len += len;
-			sg_num++;
-			skip = 0;
-		} else
-			skip -= skb_headlen(skb);
-
-		for (i = 0; sg_len < crd->crd_len &&
-					i < skb_shinfo(skb)->nr_frags &&
-					sg_num < SCATTERLIST_MAX; i++) {
-			if (skip < skb_shinfo(skb)->frags[i].size) {
-				len = skb_shinfo(skb)->frags[i].size - skip;
-				if (len + sg_len > crd->crd_len)
-					len = crd->crd_len - sg_len;
-				sg_set_page(&req->sg[sg_num],
-					skb_shinfo(skb)->frags[i].page,
-					len,
-					skb_shinfo(skb)->frags[i].page_offset + skip);
-				sg_len += len;
-				sg_num++;
-				skip = 0;
-			} else
-				skip -= skb_shinfo(skb)->frags[i].size;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		int len;
-
-		sg_len = 0;
-		for (sg_num = 0; sg_len < crd->crd_len &&
-				sg_num < uiop->uio_iovcnt &&
-				sg_num < SCATTERLIST_MAX; sg_num++) {
-			if (skip <= uiop->uio_iov[sg_num].iov_len) {
-				len = uiop->uio_iov[sg_num].iov_len - skip;
-				if (len + sg_len > crd->crd_len)
-					len = crd->crd_len - sg_len;
-				sg_set_page(&req->sg[sg_num],
-					virt_to_page(uiop->uio_iov[sg_num].iov_base+skip),
-					len,
-					offset_in_page(uiop->uio_iov[sg_num].iov_base+skip));
-				sg_len += len;
-				skip = 0;
-			} else 
-				skip -= uiop->uio_iov[sg_num].iov_len;
-		}
-	} else {
-		sg_len = (crp->crp_ilen - skip);
-		if (sg_len > crd->crd_len)
-			sg_len = crd->crd_len;
-		sg_set_page(&req->sg[0], virt_to_page(crp->crp_buf + skip),
-			sg_len, offset_in_page(crp->crp_buf + skip));
-		sg_num = 1;
-	}
-
-	switch (sw->sw_type & SW_TYPE_ALG_AMASK) {
-
-#ifdef HAVE_AHASH
-	case SW_TYPE_AHMAC:
-	case SW_TYPE_AHASH:
-		{
-		int ret;
-
-		/* check we have room for the result */
-		if (crp->crp_ilen - crd->crd_inject < sw->u.hmac.sw_mlen) {
-			dprintk("cryptosoft: EINVAL crp_ilen=%d, len=%d, inject=%d "
-					"digestsize=%d\n", crp->crp_ilen, crd->crd_skip + sg_len,
-					crd->crd_inject, sw->u.hmac.sw_mlen);
-			crp->crp_etype = EINVAL;
-			goto done;
-		}
-
-		req->crypto_req =
-				ahash_request_alloc(__crypto_ahash_cast(sw->sw_tfm),GFP_KERNEL);
-		if (!req->crypto_req) {
-			crp->crp_etype = ENOMEM;
-			dprintk("%s,%d: ENOMEM ahash_request_alloc", __FILE__, __LINE__);
-			goto done;
-		}
-
-		ahash_request_set_callback(req->crypto_req,
-				CRYPTO_TFM_REQ_MAY_BACKLOG, swcr_process_callback, req);
-
-		memset(req->result, 0, sizeof(req->result));
-
-		if (sw->sw_type & SW_TYPE_AHMAC)
-			crypto_ahash_setkey(__crypto_ahash_cast(sw->sw_tfm),
-					sw->u.hmac.sw_key, sw->u.hmac.sw_klen);
-		ahash_request_set_crypt(req->crypto_req, req->sg, req->result, sg_len);
-		ret = crypto_ahash_digest(req->crypto_req);
-		switch (ret) {
-		case -EINPROGRESS:
-		case -EBUSY:
-			return;
-		default:
-		case 0:
-			dprintk("hash OP %s %d\n", ret ? "failed" : "success", ret);
-			crp->crp_etype = ret;
-			ahash_request_free(req->crypto_req);
-			goto done;
-		}
-		} break;
-#endif /* HAVE_AHASH */
-
-#ifdef HAVE_ABLKCIPHER
-	case SW_TYPE_ABLKCIPHER: {
-		int ret;
-		unsigned char *ivp = req->iv;
-		int ivsize = 
-			crypto_ablkcipher_ivsize(__crypto_ablkcipher_cast(sw->sw_tfm));
-
-		if (sg_len < crypto_ablkcipher_blocksize(
-				__crypto_ablkcipher_cast(sw->sw_tfm))) {
-			crp->crp_etype = EINVAL;
-			dprintk("%s,%d: EINVAL len %d < %d\n", __FILE__, __LINE__,
-					sg_len, crypto_ablkcipher_blocksize(
-						__crypto_ablkcipher_cast(sw->sw_tfm)));
-			goto done;
-		}
-
-		if (ivsize > sizeof(req->iv)) {
-			crp->crp_etype = EINVAL;
-			dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-			goto done;
-		}
-
-		req->crypto_req = ablkcipher_request_alloc(
-				__crypto_ablkcipher_cast(sw->sw_tfm), GFP_KERNEL);
-		if (!req->crypto_req) {
-			crp->crp_etype = ENOMEM;
-			dprintk("%s,%d: ENOMEM ablkcipher_request_alloc",
-					__FILE__, __LINE__);
-			goto done;
-		}
-
-		ablkcipher_request_set_callback(req->crypto_req,
-				CRYPTO_TFM_REQ_MAY_BACKLOG, swcr_process_callback, req);
-
-		if (crd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			int i, error;
-
-			if (debug) {
-				dprintk("%s key:", __FUNCTION__);
-				for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
-					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
-							crd->crd_key[i] & 0xff);
-				dprintk("\n");
-			}
-			/* OCF doesn't enforce keys */
-			crypto_ablkcipher_set_flags(__crypto_ablkcipher_cast(sw->sw_tfm),
-					CRYPTO_TFM_REQ_WEAK_KEY);
-			error = crypto_ablkcipher_setkey(
-						__crypto_ablkcipher_cast(sw->sw_tfm), crd->crd_key,
-						(crd->crd_klen + 7) / 8);
-			if (error) {
-				dprintk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n",
-						error, sw->sw_tfm->crt_flags);
-				crp->crp_etype = -error;
-			}
-		}
-
-		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-
-			if (crd->crd_flags & CRD_F_IV_EXPLICIT)
-				ivp = crd->crd_iv;
-			else
-				get_random_bytes(ivp, ivsize);
-			/*
-			 * do we have to copy the IV back to the buffer ?
-			 */
-			if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-				crypto_copyback(crp->crp_flags, crp->crp_buf,
-						crd->crd_inject, ivsize, (caddr_t)ivp);
-			}
-			ablkcipher_request_set_crypt(req->crypto_req, req->sg, req->sg,
-					sg_len, ivp);
-			ret = crypto_ablkcipher_encrypt(req->crypto_req);
-
-		} else { /*decrypt */
-
-			if (crd->crd_flags & CRD_F_IV_EXPLICIT)
-				ivp = crd->crd_iv;
-			else
-				crypto_copydata(crp->crp_flags, crp->crp_buf,
-						crd->crd_inject, ivsize, (caddr_t)ivp);
-			ablkcipher_request_set_crypt(req->crypto_req, req->sg, req->sg,
-					sg_len, ivp);
-			ret = crypto_ablkcipher_decrypt(req->crypto_req);
-		}
-
-		switch (ret) {
-		case -EINPROGRESS:
-		case -EBUSY:
-			return;
-		default:
-		case 0:
-			dprintk("crypto OP %s %d\n", ret ? "failed" : "success", ret);
-			crp->crp_etype = ret;
-			goto done;
-		}
-		} break;
-#endif /* HAVE_ABLKCIPHER */
-
-	case SW_TYPE_BLKCIPHER: {
-		unsigned char iv[EALG_MAX_BLOCK_LEN];
-		unsigned char *ivp = iv;
-		struct blkcipher_desc desc;
-		int ivsize = crypto_blkcipher_ivsize(crypto_blkcipher_cast(sw->sw_tfm));
-
-		if (sg_len < crypto_blkcipher_blocksize(
-				crypto_blkcipher_cast(sw->sw_tfm))) {
-			crp->crp_etype = EINVAL;
-			dprintk("%s,%d: EINVAL len %d < %d\n", __FILE__, __LINE__,
-					sg_len, crypto_blkcipher_blocksize(
-						crypto_blkcipher_cast(sw->sw_tfm)));
-			goto done;
-		}
-
-		if (ivsize > sizeof(iv)) {
-			crp->crp_etype = EINVAL;
-			dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-			goto done;
-		}
-
-		if (crd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			int i, error;
-
-			if (debug) {
-				dprintk("%s key:", __FUNCTION__);
-				for (i = 0; i < (crd->crd_klen + 7) / 8; i++)
-					dprintk("%s0x%x", (i % 8) ? " " : "\n    ",
-							crd->crd_key[i] & 0xff);
-				dprintk("\n");
-			}
-			/* OCF doesn't enforce keys */
-			crypto_blkcipher_set_flags(crypto_blkcipher_cast(sw->sw_tfm),
-					CRYPTO_TFM_REQ_WEAK_KEY);
-			error = crypto_blkcipher_setkey(
-						crypto_blkcipher_cast(sw->sw_tfm), crd->crd_key,
-						(crd->crd_klen + 7) / 8);
-			if (error) {
-				dprintk("cryptosoft: setkey failed %d (crt_flags=0x%x)\n",
-						error, sw->sw_tfm->crt_flags);
-				crp->crp_etype = -error;
-			}
-		}
-
-		memset(&desc, 0, sizeof(desc));
-		desc.tfm = crypto_blkcipher_cast(sw->sw_tfm);
-
-		if (crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-
-			if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-				ivp = crd->crd_iv;
-			} else {
-				get_random_bytes(ivp, ivsize);
-			}
-			/*
-			 * do we have to copy the IV back to the buffer ?
-			 */
-			if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-				crypto_copyback(crp->crp_flags, crp->crp_buf,
-						crd->crd_inject, ivsize, (caddr_t)ivp);
-			}
-			desc.info = ivp;
-			crypto_blkcipher_encrypt_iv(&desc, req->sg, req->sg, sg_len);
-
-		} else { /*decrypt */
-
-			if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-				ivp = crd->crd_iv;
-			} else {
-				crypto_copydata(crp->crp_flags, crp->crp_buf,
-						crd->crd_inject, ivsize, (caddr_t)ivp);
-			}
-			desc.info = ivp;
-			crypto_blkcipher_decrypt_iv(&desc, req->sg, req->sg, sg_len);
-		}
-		} break;
-
-	case SW_TYPE_HMAC:
-	case SW_TYPE_HASH:
-		{
-		char result[HASH_MAX_LEN];
-		struct hash_desc desc;
-
-		/* check we have room for the result */
-		if (crp->crp_ilen - crd->crd_inject < sw->u.hmac.sw_mlen) {
-			dprintk("cryptosoft: EINVAL crp_ilen=%d, len=%d, inject=%d "
-					"digestsize=%d\n", crp->crp_ilen, crd->crd_skip + sg_len,
-					crd->crd_inject, sw->u.hmac.sw_mlen);
-			crp->crp_etype = EINVAL;
-			goto done;
-		}
-
-		memset(&desc, 0, sizeof(desc));
-		desc.tfm = crypto_hash_cast(sw->sw_tfm);
-
-		memset(result, 0, sizeof(result));
-
-		if (sw->sw_type & SW_TYPE_HMAC) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-			crypto_hmac(sw->sw_tfm, sw->u.hmac.sw_key, &sw->u.hmac.sw_klen,
-					req->sg, sg_num, result);
-#else
-			crypto_hash_setkey(desc.tfm, sw->u.hmac.sw_key,
-					sw->u.hmac.sw_klen);
-			crypto_hash_digest(&desc, req->sg, sg_len, result);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
-			
-		} else { /* SW_TYPE_HASH */
-			crypto_hash_digest(&desc, req->sg, sg_len, result);
-		}
-
-		crypto_copyback(crp->crp_flags, crp->crp_buf,
-				crd->crd_inject, sw->u.hmac.sw_mlen, result);
-		}
-		break;
-
-	case SW_TYPE_COMP: {
-		void *ibuf = NULL;
-		void *obuf = sw->u.sw_comp_buf;
-		int ilen = sg_len, olen = CRYPTO_MAX_DATA_LEN;
-		int ret = 0;
-
-		/*
-		 * we need to use an additional copy if there is more than one
-		 * input chunk since the kernel comp routines do not handle
-		 * SG yet.  Otherwise we just use the input buffer as is.
-		 * Rather than allocate another buffer we just split the tmp
-		 * buffer we already have.
-		 * Perhaps we should just use zlib directly ?
-		 */
-		if (sg_num > 1) {
-			int blk;
-
-			ibuf = obuf;
-			for (blk = 0; blk < sg_num; blk++) {
-				memcpy(obuf, sg_virt(&req->sg[blk]),
-						req->sg[blk].length);
-				obuf += req->sg[blk].length;
-			}
-			olen -= sg_len;
-		} else
-			ibuf = sg_virt(&req->sg[0]);
-
-		if (crd->crd_flags & CRD_F_ENCRYPT) { /* compress */
-			ret = crypto_comp_compress(crypto_comp_cast(sw->sw_tfm),
-					ibuf, ilen, obuf, &olen);
-			if (!ret && olen > crd->crd_len) {
-				dprintk("cryptosoft: ERANGE compress %d into %d\n",
-						crd->crd_len, olen);
-				if (swcr_fail_if_compression_grows)
-					ret = ERANGE;
-			}
-		} else { /* decompress */
-			ret = crypto_comp_decompress(crypto_comp_cast(sw->sw_tfm),
-					ibuf, ilen, obuf, &olen);
-			if (!ret && (olen + crd->crd_inject) > crp->crp_olen) {
-				dprintk("cryptosoft: ETOOSMALL decompress %d into %d, "
-						"space for %d,at offset %d\n",
-						crd->crd_len, olen, crp->crp_olen, crd->crd_inject);
-				ret = ETOOSMALL;
-			}
-		}
-		if (ret)
-			dprintk("%s,%d: ret = %d\n", __FILE__, __LINE__, ret);
-
-		/*
-		 * on success copy result back,
-		 * linux crpyto API returns -errno,  we need to fix that
-		 */
-		crp->crp_etype = ret < 0 ? -ret : ret;
-		if (ret == 0) {
-			/* copy back the result and return it's size */
-			crypto_copyback(crp->crp_flags, crp->crp_buf,
-					crd->crd_inject, olen, obuf);
-			crp->crp_olen = olen;
-		}
-
-
-		} break;
-
-	default:
-		/* Unknown/unsupported algorithm */
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-done:
-	crypto_done(crp);
-	kmem_cache_free(swcr_req_cache, req);
-}
-
-
-/*
- * Process a crypto request.
- */
-static int
-swcr_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct swcr_req *req = NULL;
-	u_int32_t lid;
-
-	dprintk("%s()\n", __FUNCTION__);
-	/* Sanity check */
-	if (crp == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	crp->crp_etype = 0;
-
-	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	lid = crp->crp_sid & 0xffffffff;
-	if (lid >= swcr_sesnum || lid == 0 || swcr_sessions == NULL ||
-			swcr_sessions[lid] == NULL) {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-
-	/*
-	 * do some error checking outside of the loop for SKB and IOV processing
-	 * this leaves us with valid skb or uiop pointers for later
-	 */
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		struct sk_buff *skb = (struct sk_buff *) crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags >= SCATTERLIST_MAX) {
-			printk("%s,%d: %d nr_frags > SCATTERLIST_MAX", __FILE__, __LINE__,
-					skb_shinfo(skb)->nr_frags);
-			goto done;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		struct uio *uiop = (struct uio *) crp->crp_buf;
-		if (uiop->uio_iovcnt > SCATTERLIST_MAX) {
-			printk("%s,%d: %d uio_iovcnt > SCATTERLIST_MAX", __FILE__, __LINE__,
-					uiop->uio_iovcnt);
-			goto done;
-		}
-	}
-
-	/*
-	 * setup a new request ready for queuing
-	 */
-	req = kmem_cache_alloc(swcr_req_cache, SLAB_ATOMIC);
-	if (req == NULL) {
-		dprintk("%s,%d: ENOMEM\n", __FILE__, __LINE__);
-		crp->crp_etype = ENOMEM;
-		goto done;
-	}
-	memset(req, 0, sizeof(*req));
-
-	req->sw_head = swcr_sessions[lid];
-	req->crp = crp;
-	req->crd = crp->crp_desc;
-
-	swcr_process_req(req);
-	return 0;
-
-done:
-	crypto_done(crp);
-	if (req)
-		kmem_cache_free(swcr_req_cache, req);
-	return 0;
-}
-
-
-static int
-cryptosoft_init(void)
-{
-	int i, sw_type, mode;
-	char *algo;
-
-	dprintk("%s(%p)\n", __FUNCTION__, cryptosoft_init);
-
-	swcr_req_cache = kmem_cache_create("cryptosoft_req",
-				sizeof(struct swcr_req), 0, SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-				, NULL
-#endif
-				);
-	if (!swcr_req_cache) {
-		printk("cryptosoft: failed to create request cache\n");
-		return -ENOENT;
-	}
-
-	softc_device_init(&swcr_softc, "cryptosoft", 0, swcr_methods);
-
-	swcr_id = crypto_get_driverid(softc_get_device(&swcr_softc),
-			CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_SYNC);
-	if (swcr_id < 0) {
-		printk("cryptosoft: Software crypto device cannot initialize!");
-		return -ENODEV;
-	}
-
-#define	REGISTER(alg) \
-		crypto_register(swcr_id, alg, 0,0)
-
-	for (i = 0; i < sizeof(crypto_details)/sizeof(crypto_details[0]); i++) {
-		int found;
-		
-		algo = crypto_details[i].alg_name;
-		if (!algo || !*algo) {
-			dprintk("%s:Algorithm %d not supported\n", __FUNCTION__, i);
-			continue;
-		}
-
-		mode = crypto_details[i].mode;
-		sw_type = crypto_details[i].sw_type;
-
-		found = 0;
-		switch (sw_type & SW_TYPE_ALG_MASK) {
-		case SW_TYPE_CIPHER:
-			found = crypto_has_cipher(algo, 0, CRYPTO_ALG_ASYNC);
-			break;
-		case SW_TYPE_HMAC:
-			found = crypto_has_hash(algo, 0, swcr_no_ahash?CRYPTO_ALG_ASYNC:0);
-			break;
-		case SW_TYPE_HASH:
-			found = crypto_has_hash(algo, 0, swcr_no_ahash?CRYPTO_ALG_ASYNC:0);
-			break;
-		case SW_TYPE_COMP:
-			found = crypto_has_comp(algo, 0, CRYPTO_ALG_ASYNC);
-			break;
-		case SW_TYPE_BLKCIPHER:
-			found = crypto_has_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
-			if (!found && !swcr_no_ablk)
-				found = crypto_has_ablkcipher(algo, 0, 0);
-			break;
-		}
-		if (found) {
-			REGISTER(i);
-		} else {
-			dprintk("%s:Algorithm Type %d not supported (algorithm %d:'%s')\n",
-					__FUNCTION__, sw_type, i, algo);
-		}
-	}
-	return 0;
-}
-
-static void
-cryptosoft_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	crypto_unregister_all(swcr_id);
-	swcr_id = -1;
-	kmem_cache_destroy(swcr_req_cache);
-}
-
-late_initcall(cryptosoft_init);
-module_exit(cryptosoft_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
-MODULE_DESCRIPTION("Cryptosoft (OCF module for kernel crypto)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ep80579/Makefile b/target/linux/generic-2.6/files/crypto/ocf/ep80579/Makefile
deleted file mode 100644
index 9aab295731..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ep80579/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#########################################################################
-#
-#  Targets supported
-#  all     - builds everything and installs
-#  install - identical to all
-#  depend  - build dependencies
-#  clean   - clears derived objects except the .depend files
-#  distclean- clears all derived objects and the .depend file
-#  
-# @par
-# This file is provided under a dual BSD/GPLv2 license.  When using or 
-#   redistributing this file, you may do so under either license.
-# 
-#   GPL LICENSE SUMMARY
-# 
-#   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
-# 
-#   This program is free software; you can redistribute it and/or modify 
-#   it under the terms of version 2 of the GNU General Public License as
-#   published by the Free Software Foundation.
-# 
-#   This program is distributed in the hope that it will be useful, but 
-#   WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   General Public License for more details.
-# 
-#   You should have received a copy of the GNU General Public License 
-#   along with this program; if not, write to the Free Software 
-#   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-#   The full GNU General Public License is included in this distribution 
-#   in the file called LICENSE.GPL.
-# 
-#   Contact Information:
-#   Intel Corporation
-# 
-#   BSD LICENSE 
-# 
-#   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
-#   All rights reserved.
-# 
-#   Redistribution and use in source and binary forms, with or without 
-#   modification, are permitted provided that the following conditions 
-#   are met:
-# 
-#     * Redistributions of source code must retain the above copyright 
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright 
-#       notice, this list of conditions and the following disclaimer in 
-#       the documentation and/or other materials provided with the 
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its 
-#       contributors may be used to endorse or promote products derived 
-#       from this software without specific prior written permission.
-# 
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# 
-#  version: Security.L.1.0.2-229
-############################################################################
-
-
-####################Common variables and definitions########################
-
-ifndef ICP_ROOT
-$(warning ICP_ROOT is undefined. Please set the path to EP80579 release package directory \
-        "-> setenv ICP_ROOT <path>")
-all fastdep:
-	:
-else
-
-ifndef KERNEL_SOURCE_ROOT
-$(error KERNEL_SOURCE_ROOT is undefined. Please set the path to the kernel source directory \
-        "-> setenv KERNEL_SOURCE_ROOT <path>")
-endif
-
-# Ensure The ENV_DIR environmental var is defined.
-ifndef ICP_ENV_DIR
-$(error ICP_ENV_DIR is undefined. Please set the path to EP80579 driver environment.mk file \
-        "-> setenv ICP_ENV_DIR <path>")
-endif
-
-#Add your project environment Makefile
-include ${ICP_ENV_DIR}/environment.mk
-
-#include the makefile with all the default and common Make variable definitions
-include ${ICP_BUILDSYSTEM_PATH}/build_files/common.mk
-
-#Add the name for the executable, Library or Module output definitions
-OUTPUT_NAME= icp_ocf
-
-# List of Source Files to be compiled 
-SOURCES= icp_common.c icp_sym.c icp_asym.c icp_ocf_linux.c
-
-#common includes between all supported OSes
-INCLUDES= -I ${ICP_API_DIR} -I${ICP_LAC_API} \
--I${ICP_OCF_SRC_DIR}
-
-# The location of the os level makefile needs to be changed.
-include ${ICP_ENV_DIR}/${ICP_OS}_${ICP_OS_LEVEL}.mk
-
-# On the line directly below list the outputs you wish to build for,
-# e.g "lib_static lib_shared exe module" as shown below
-install: module
-
-###################Include rules makefiles########################
-include ${ICP_BUILDSYSTEM_PATH}/build_files/rules.mk
-###################End of Rules inclusion#########################
-
-endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_asym.c b/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_asym.c
deleted file mode 100644
index d2641c5455..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_asym.c
+++ /dev/null
@@ -1,1334 +0,0 @@
-/***************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or 
- *   redistributing this file, you may do so under either license.
- * 
- *   GPL LICENSE SUMMARY
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- * 
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- * 
- *   This program is distributed in the hope that it will be useful, but 
- *   WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- *   General Public License for more details.
- * 
- *   You should have received a copy of the GNU General Public License 
- *   along with this program; if not, write to the Free Software 
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution 
- *   in the file called LICENSE.GPL.
- * 
- *   Contact Information:
- *   Intel Corporation
- * 
- *   BSD LICENSE 
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *  version: Security.L.1.0.2-229
- *
- ***************************************************************************/
-
-#include "icp_ocf.h"
-
-/*The following define values (containing the word 'INDEX') are used to find
-the index of each input buffer of the crypto_kop struct (see OCF cryptodev.h).
-These values were found through analysis of the OCF OpenSSL patch. If the
-calling program uses different input buffer positions, these defines will have
-to be changed.*/
-
-/*DIFFIE HELLMAN buffer index values*/
-#define ICP_DH_KRP_PARAM_PRIME_INDEX                            (0)
-#define ICP_DH_KRP_PARAM_BASE_INDEX                             (1)
-#define ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX                    (2)
-#define ICP_DH_KRP_PARAM_RESULT_INDEX                           (3)
-
-/*MOD EXP buffer index values*/
-#define ICP_MOD_EXP_KRP_PARAM_BASE_INDEX                        (0)
-#define ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX                    (1)
-#define ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX                     (2)
-#define ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX                      (3)
-
-/*MOD EXP CRT buffer index values*/
-#define ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX                 (0)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX                 (1)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX                       (2)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX             (3)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX             (4)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX              (5)
-#define ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX                  (6)
-
-/*DSA sign buffer index values*/
-#define ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX                       (0)
-#define ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX                    (1)
-#define ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX                    (2)
-#define ICP_DSA_SIGN_KRP_PARAM_G_INDEX                          (3)
-#define ICP_DSA_SIGN_KRP_PARAM_X_INDEX                          (4)
-#define ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX                   (5)
-#define ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX                   (6)
-
-/*DSA verify buffer index values*/
-#define ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX                     (0)
-#define ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX                  (1)
-#define ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX                  (2)
-#define ICP_DSA_VERIFY_KRP_PARAM_G_INDEX                        (3)
-#define ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX                   (4)
-#define ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX                    (5)
-#define ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX                    (6)
-
-/*DSA sign prime Q vs random number K size check values*/
-#define DONT_RUN_LESS_THAN_CHECK                                (0)
-#define FAIL_A_IS_GREATER_THAN_B                                (1)
-#define FAIL_A_IS_EQUAL_TO_B                                    (1)
-#define SUCCESS_A_IS_LESS_THAN_B                                (0)
-#define DSA_SIGN_RAND_GEN_VAL_CHECK_MAX_ITERATIONS              (500)
-
-/* We need to set a cryptokp success value just in case it is set or allocated
-   and not set to zero outside of this module */
-#define CRYPTO_OP_SUCCESS                                       (0)
-
-/*Function to compute Diffie Hellman (DH) phase 1 or phase 2 key values*/
-static int icp_ocfDrvDHComputeKey(struct cryptkop *krp);
-
-/*Function to compute a Modular Exponentiation (Mod Exp)*/
-static int icp_ocfDrvModExp(struct cryptkop *krp);
-
-/*Function to compute a Mod Exp using the Chinease Remainder Theorem*/
-static int icp_ocfDrvModExpCRT(struct cryptkop *krp);
-
-/*Helper function to compute whether the first big number argument is less than
- the second big number argument */
-static int
-icp_ocfDrvCheckALessThanB(CpaFlatBuffer * pK, CpaFlatBuffer * pQ, int *doCheck);
-
-/*Function to sign an input with DSA R and S keys*/
-static int icp_ocfDrvDsaSign(struct cryptkop *krp);
-
-/*Function to Verify a DSA buffer signature*/
-static int icp_ocfDrvDsaVerify(struct cryptkop *krp);
-
-/*Callback function for DH operation*/
-static void
-icp_ocfDrvDhP1CallBack(void *callbackTag,
-		       CpaStatus status,
-		       void *pOpData, CpaFlatBuffer * pLocalOctetStringPV);
-
-/*Callback function for ME operation*/
-static void
-icp_ocfDrvModExpCallBack(void *callbackTag,
-			 CpaStatus status,
-			 void *pOpData, CpaFlatBuffer * pResult);
-
-/*Callback function for ME CRT operation*/
-static void
-icp_ocfDrvModExpCRTCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData, CpaFlatBuffer * pOutputData);
-
-/*Callback function for DSA sign operation*/
-static void
-icp_ocfDrvDsaRSSignCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData,
-			    CpaBoolean protocolStatus,
-			    CpaFlatBuffer * pR, CpaFlatBuffer * pS);
-
-/*Callback function for DSA Verify operation*/
-static void
-icp_ocfDrvDsaVerifyCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData, CpaBoolean verifyStatus);
-
-/* Name        : icp_ocfDrvPkeProcess
- *
- * Description : This function will choose which PKE process to follow
- * based on the input arguments
- */
-int icp_ocfDrvPkeProcess(icp_device_t dev, struct cryptkop *krp, int hint)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-
-	if (NULL == krp) {
-		DPRINTK("%s(): Invalid input parameters, cryptkop = %p\n",
-			__FUNCTION__, krp);
-		return EINVAL;
-	}
-
-	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
-		krp->krp_status = ECANCELED;
-		return ECANCELED;
-	}
-
-	switch (krp->krp_op) {
-	case CRK_DH_COMPUTE_KEY:
-		DPRINTK("%s() doing DH_COMPUTE_KEY\n", __FUNCTION__);
-		lacStatus = icp_ocfDrvDHComputeKey(krp);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): icp_ocfDrvDHComputeKey failed "
-				"(%d).\n", __FUNCTION__, lacStatus);
-			krp->krp_status = ECANCELED;
-			return ECANCELED;
-		}
-
-		break;
-
-	case CRK_MOD_EXP:
-		DPRINTK("%s() doing MOD_EXP \n", __FUNCTION__);
-		lacStatus = icp_ocfDrvModExp(krp);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): icp_ocfDrvModExp failed (%d).\n",
-				__FUNCTION__, lacStatus);
-			krp->krp_status = ECANCELED;
-			return ECANCELED;
-		}
-
-		break;
-
-	case CRK_MOD_EXP_CRT:
-		DPRINTK("%s() doing MOD_EXP_CRT \n", __FUNCTION__);
-		lacStatus = icp_ocfDrvModExpCRT(krp);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): icp_ocfDrvModExpCRT "
-				"failed (%d).\n", __FUNCTION__, lacStatus);
-			krp->krp_status = ECANCELED;
-			return ECANCELED;
-		}
-
-		break;
-
-	case CRK_DSA_SIGN:
-		DPRINTK("%s() doing DSA_SIGN \n", __FUNCTION__);
-		lacStatus = icp_ocfDrvDsaSign(krp);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): icp_ocfDrvDsaSign "
-				"failed (%d).\n", __FUNCTION__, lacStatus);
-			krp->krp_status = ECANCELED;
-			return ECANCELED;
-		}
-
-		break;
-
-	case CRK_DSA_VERIFY:
-		DPRINTK("%s() doing DSA_VERIFY \n", __FUNCTION__);
-		lacStatus = icp_ocfDrvDsaVerify(krp);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): icp_ocfDrvDsaVerify "
-				"failed (%d).\n", __FUNCTION__, lacStatus);
-			krp->krp_status = ECANCELED;
-			return ECANCELED;
-		}
-
-		break;
-
-	default:
-		EPRINTK("%s(): Asymettric function not "
-			"supported (%d).\n", __FUNCTION__, krp->krp_op);
-		krp->krp_status = EOPNOTSUPP;
-		return EOPNOTSUPP;
-	}
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvSwapBytes
- *
- * Description : This function is used to swap the byte order of a buffer.
- * It has been seen that in general we are passed little endian byte order
- * buffers, but LAC only accepts big endian byte order buffers.
- */
-static void inline icp_ocfDrvSwapBytes(u_int8_t * num, u_int32_t buff_len_bytes)
-{
-
-	int i;
-	u_int8_t *end_ptr;
-	u_int8_t hold_val;
-
-	end_ptr = num + (buff_len_bytes - 1);
-	buff_len_bytes = buff_len_bytes >> 1;
-	for (i = 0; i < buff_len_bytes; i++) {
-		hold_val = *num;
-		*num = *end_ptr;
-		num++;
-		*end_ptr = hold_val;
-		end_ptr--;
-	}
-}
-
-/* Name        : icp_ocfDrvDHComputeKey
- *
- * Description : This function will map Diffie Hellman calls from OCF
- * to the LAC API. OCF uses this function for Diffie Hellman Phase1 and
- * Phase2. LAC has a separate Diffie Hellman Phase2 call, however both phases
- * break down to a modular exponentiation.
- */
-static int icp_ocfDrvDHComputeKey(struct cryptkop *krp)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	void *callbackTag = NULL;
-	CpaCyDhPhase1KeyGenOpData *pPhase1OpData = NULL;
-	CpaFlatBuffer *pLocalOctetStringPV = NULL;
-	uint32_t dh_prime_len_bytes = 0, dh_prime_len_bits = 0;
-
-	/* Input checks - check prime is a multiple of 8 bits to allow for
-	   allocation later */
-	dh_prime_len_bits =
-	    (krp->krp_param[ICP_DH_KRP_PARAM_PRIME_INDEX].crp_nbits);
-
-	/* LAC can reject prime lengths based on prime key sizes, we just
-	   need to make sure we can allocate space for the base and
-	   exponent buffers correctly */
-	if ((dh_prime_len_bits % NUM_BITS_IN_BYTE) != 0) {
-		APRINTK("%s(): Warning Prime number buffer size is not a "
-			"multiple of 8 bits\n", __FUNCTION__);
-	}
-
-	/* Result storage space should be the same size as the prime as this
-	   value can take up the same amount of storage space */
-	if (dh_prime_len_bits !=
-	    krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_nbits) {
-		DPRINTK("%s(): Return Buffer must be the same size "
-			"as the Prime buffer\n", __FUNCTION__);
-		krp->krp_status = EINVAL;
-		return EINVAL;
-	}
-	/* Switch to size in bytes */
-	BITS_TO_BYTES(dh_prime_len_bytes, dh_prime_len_bits);
-
-	callbackTag = krp;
-
-/*All allocations are set to ICP_M_NOWAIT due to the possibility of getting
-called in interrupt context*/
-	pPhase1OpData = icp_kmem_cache_zalloc(drvDH_zone, ICP_M_NOWAIT);
-	if (NULL == pPhase1OpData) {
-		APRINTK("%s():Failed to get memory for key gen data\n",
-			__FUNCTION__);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	pLocalOctetStringPV =
-	    icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
-	if (NULL == pLocalOctetStringPV) {
-		APRINTK("%s():Failed to get memory for pLocalOctetStringPV\n",
-			__FUNCTION__);
-		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	/* Link parameters */
-	pPhase1OpData->primeP.pData =
-	    krp->krp_param[ICP_DH_KRP_PARAM_PRIME_INDEX].crp_p;
-
-	pPhase1OpData->primeP.dataLenInBytes = dh_prime_len_bytes;
-
-	icp_ocfDrvSwapBytes(pPhase1OpData->primeP.pData, dh_prime_len_bytes);
-
-	pPhase1OpData->baseG.pData =
-	    krp->krp_param[ICP_DH_KRP_PARAM_BASE_INDEX].crp_p;
-
-	BITS_TO_BYTES(pPhase1OpData->baseG.dataLenInBytes,
-		      krp->krp_param[ICP_DH_KRP_PARAM_BASE_INDEX].crp_nbits);
-
-	icp_ocfDrvSwapBytes(pPhase1OpData->baseG.pData,
-			    pPhase1OpData->baseG.dataLenInBytes);
-
-	pPhase1OpData->privateValueX.pData =
-	    krp->krp_param[ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX].crp_p;
-
-	BITS_TO_BYTES(pPhase1OpData->privateValueX.dataLenInBytes,
-		      krp->krp_param[ICP_DH_KRP_PARAM_PRIVATE_VALUE_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(pPhase1OpData->privateValueX.pData,
-			    pPhase1OpData->privateValueX.dataLenInBytes);
-
-	/* Output parameters */
-	pLocalOctetStringPV->pData =
-	    krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_p;
-
-	BITS_TO_BYTES(pLocalOctetStringPV->dataLenInBytes,
-		      krp->krp_param[ICP_DH_KRP_PARAM_RESULT_INDEX].crp_nbits);
-
-	lacStatus = cpaCyDhKeyGenPhase1(CPA_INSTANCE_HANDLE_SINGLE,
-					icp_ocfDrvDhP1CallBack,
-					callbackTag, pPhase1OpData,
-					pLocalOctetStringPV);
-
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): DH Phase 1 Key Gen failed (%d).\n",
-			__FUNCTION__, lacStatus);
-		icp_ocfDrvFreeFlatBuffer(pLocalOctetStringPV);
-		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
-	}
-
-	return lacStatus;
-}
-
-/* Name        : icp_ocfDrvModExp
- *
- * Description : This function will map ordinary Modular Exponentiation calls
- * from OCF to the LAC API.
- *
- */
-static int icp_ocfDrvModExp(struct cryptkop *krp)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	void *callbackTag = NULL;
-	CpaCyLnModExpOpData *pModExpOpData = NULL;
-	CpaFlatBuffer *pResult = NULL;
-
-	if ((krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_nbits %
-	     NUM_BITS_IN_BYTE) != 0) {
-		DPRINTK("%s(): Warning - modulus buffer size (%d) is not a "
-			"multiple of 8 bits\n", __FUNCTION__,
-			krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].
-			crp_nbits);
-	}
-
-	/* Result storage space should be the same size as the prime as this
-	   value can take up the same amount of storage space */
-	if (krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_nbits >
-	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].crp_nbits) {
-		APRINTK("%s(): Return Buffer size must be the same or"
-			" greater than the Modulus buffer\n", __FUNCTION__);
-		krp->krp_status = EINVAL;
-		return EINVAL;
-	}
-
-	callbackTag = krp;
-
-	pModExpOpData = icp_kmem_cache_zalloc(drvLnModExp_zone, ICP_M_NOWAIT);
-	if (NULL == pModExpOpData) {
-		APRINTK("%s():Failed to get memory for key gen data\n",
-			__FUNCTION__);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	pResult = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
-	if (NULL == pResult) {
-		APRINTK("%s():Failed to get memory for ModExp result\n",
-			__FUNCTION__);
-		ICP_CACHE_FREE(drvLnModExp_zone, pModExpOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	/* Link parameters */
-	pModExpOpData->modulus.pData =
-	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].crp_p;
-	BITS_TO_BYTES(pModExpOpData->modulus.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_MODULUS_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(pModExpOpData->modulus.pData,
-			    pModExpOpData->modulus.dataLenInBytes);
-
-	DPRINTK("%s : base (%d)\n", __FUNCTION__, krp->
-		krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].crp_nbits);
-	pModExpOpData->base.pData =
-	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].crp_p;
-	BITS_TO_BYTES(pModExpOpData->base.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(pModExpOpData->base.pData,
-			    pModExpOpData->base.dataLenInBytes);
-
-	pModExpOpData->exponent.pData =
-	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX].crp_p;
-	BITS_TO_BYTES(pModExpOpData->exponent.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_KRP_PARAM_EXPONENT_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(pModExpOpData->exponent.pData,
-			    pModExpOpData->exponent.dataLenInBytes);
-	/* Output parameters */
-	pResult->pData =
-	    krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].crp_p,
-	    BITS_TO_BYTES(pResult->dataLenInBytes,
-			  krp->krp_param[ICP_MOD_EXP_KRP_PARAM_RESULT_INDEX].
-			  crp_nbits);
-
-	lacStatus = cpaCyLnModExp(CPA_INSTANCE_HANDLE_SINGLE,
-				  icp_ocfDrvModExpCallBack,
-				  callbackTag, pModExpOpData, pResult);
-
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): Mod Exp Operation failed (%d).\n",
-			__FUNCTION__, lacStatus);
-		krp->krp_status = ECANCELED;
-		icp_ocfDrvFreeFlatBuffer(pResult);
-		ICP_CACHE_FREE(drvLnModExp_zone, pModExpOpData);
-	}
-
-	return lacStatus;
-}
-
-/* Name        : icp_ocfDrvModExpCRT
- *
- * Description : This function will map ordinary Modular Exponentiation Chinese
- * Remainder Theorem implementaion calls from OCF to the LAC API.
- *
- * Note : Mod Exp CRT for this driver is accelerated through LAC RSA type 2
- * decrypt operation. Therefore P and Q input values must always be prime
- * numbers. Although basic primality checks are done in LAC, it is up to the
- * user to do any correct prime number checking before passing the inputs.
- */
-static int icp_ocfDrvModExpCRT(struct cryptkop *krp)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	CpaCyRsaDecryptOpData *rsaDecryptOpData = NULL;
-	void *callbackTag = NULL;
-	CpaFlatBuffer *pOutputData = NULL;
-
-	/*Parameter input checks are all done by LAC, no need to repeat
-	   them here. */
-	callbackTag = krp;
-
-	rsaDecryptOpData =
-	    icp_kmem_cache_zalloc(drvRSADecrypt_zone, ICP_M_NOWAIT);
-	if (NULL == rsaDecryptOpData) {
-		APRINTK("%s():Failed to get memory"
-			" for MOD EXP CRT Op data struct\n", __FUNCTION__);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	rsaDecryptOpData->pRecipientPrivateKey
-	    = icp_kmem_cache_zalloc(drvRSAPrivateKey_zone, ICP_M_NOWAIT);
-	if (NULL == rsaDecryptOpData->pRecipientPrivateKey) {
-		APRINTK("%s():Failed to get memory for MOD EXP CRT"
-			" private key values struct\n", __FUNCTION__);
-		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    version = CPA_CY_RSA_VERSION_TWO_PRIME;
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    privateKeyRepType = CPA_CY_RSA_PRIVATE_KEY_REP_TYPE_2;
-
-	pOutputData = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
-	if (NULL == pOutputData) {
-		APRINTK("%s():Failed to get memory"
-			" for MOD EXP CRT output data\n", __FUNCTION__);
-		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
-			       rsaDecryptOpData->pRecipientPrivateKey);
-		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    version = CPA_CY_RSA_VERSION_TWO_PRIME;
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    privateKeyRepType = CPA_CY_RSA_PRIVATE_KEY_REP_TYPE_2;
-
-	/* Link parameters */
-	rsaDecryptOpData->inputData.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->inputData.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_I_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->inputData.pData,
-			    rsaDecryptOpData->inputData.dataLenInBytes);
-
-	rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.prime1P.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
-		      prime1P.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_P_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.prime1P.pData,
-			    rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.prime1P.dataLenInBytes);
-
-	rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.prime2Q.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
-		      prime2Q.dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_PRIME_Q_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.prime2Q.pData,
-			    rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.prime2Q.dataLenInBytes);
-
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    privateKeyRep2.exponent1Dp.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->privateKeyRep2.
-		      exponent1Dp.dataLenInBytes,
-		      krp->
-		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DP_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.exponent1Dp.pData,
-			    rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.exponent1Dp.dataLenInBytes);
-
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    privateKeyRep2.exponent2Dq.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->
-		      privateKeyRep2.exponent2Dq.dataLenInBytes,
-		      krp->
-		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_EXPONENT_DQ_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.exponent2Dq.pData,
-			    rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.exponent2Dq.dataLenInBytes);
-
-	rsaDecryptOpData->pRecipientPrivateKey->
-	    privateKeyRep2.coefficientQInv.pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX].crp_p;
-	BITS_TO_BYTES(rsaDecryptOpData->pRecipientPrivateKey->
-		      privateKeyRep2.coefficientQInv.dataLenInBytes,
-		      krp->
-		      krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_COEFF_QINV_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.coefficientQInv.pData,
-			    rsaDecryptOpData->pRecipientPrivateKey->
-			    privateKeyRep2.coefficientQInv.dataLenInBytes);
-
-	/* Output Parameter */
-	pOutputData->pData =
-	    krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX].crp_p;
-	BITS_TO_BYTES(pOutputData->dataLenInBytes,
-		      krp->krp_param[ICP_MOD_EXP_CRT_KRP_PARAM_RESULT_INDEX].
-		      crp_nbits);
-
-	lacStatus = cpaCyRsaDecrypt(CPA_INSTANCE_HANDLE_SINGLE,
-				    icp_ocfDrvModExpCRTCallBack,
-				    callbackTag, rsaDecryptOpData, pOutputData);
-
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): Mod Exp CRT Operation failed (%d).\n",
-			__FUNCTION__, lacStatus);
-		krp->krp_status = ECANCELED;
-		icp_ocfDrvFreeFlatBuffer(pOutputData);
-		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
-			       rsaDecryptOpData->pRecipientPrivateKey);
-		ICP_CACHE_FREE(drvRSADecrypt_zone, rsaDecryptOpData);
-	}
-
-	return lacStatus;
-}
-
-/* Name        : icp_ocfDrvCheckALessThanB
- *
- * Description : This function will check whether the first argument is less
- * than the second. It is used to check whether the DSA RS sign Random K
- * value is less than the Prime Q value (as defined in the specification)
- *
- */
-static int
-icp_ocfDrvCheckALessThanB(CpaFlatBuffer * pK, CpaFlatBuffer * pQ, int *doCheck)
-{
-
-	uint8_t *MSB_K = pK->pData;
-	uint8_t *MSB_Q = pQ->pData;
-	uint32_t buffer_lengths_in_bytes = pQ->dataLenInBytes;
-
-	if (DONT_RUN_LESS_THAN_CHECK == *doCheck) {
-		return FAIL_A_IS_GREATER_THAN_B;
-	}
-
-/*Check MSBs
-if A == B, check next MSB
-if A > B, return A_IS_GREATER_THAN_B
-if A < B, return A_IS_LESS_THAN_B (success)
-*/
-	while (*MSB_K == *MSB_Q) {
-		MSB_K++;
-		MSB_Q++;
-
-		buffer_lengths_in_bytes--;
-		if (0 == buffer_lengths_in_bytes) {
-			DPRINTK("%s() Buffers have equal value!!\n",
-				__FUNCTION__);
-			return FAIL_A_IS_EQUAL_TO_B;
-		}
-
-	}
-
-	if (*MSB_K < *MSB_Q) {
-		return SUCCESS_A_IS_LESS_THAN_B;
-	} else {
-		return FAIL_A_IS_GREATER_THAN_B;
-	}
-
-}
-
-/* Name        : icp_ocfDrvDsaSign
- *
- * Description : This function will map DSA RS Sign from OCF to the LAC API.
- *
- * NOTE: From looking at OCF patch to OpenSSL and even the number of input
- * parameters, OCF expects us to generate the random seed value. This value
- * is generated and passed to LAC, however the number is discared in the
- * callback and not returned to the user.
- */
-static int icp_ocfDrvDsaSign(struct cryptkop *krp)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	CpaCyDsaRSSignOpData *dsaRsSignOpData = NULL;
-	void *callbackTag = NULL;
-	CpaCyRandGenOpData randGenOpData;
-	int primeQSizeInBytes = 0;
-	int doCheck = 0;
-	CpaFlatBuffer randData;
-	CpaBoolean protocolStatus = CPA_FALSE;
-	CpaFlatBuffer *pR = NULL;
-	CpaFlatBuffer *pS = NULL;
-
-	callbackTag = krp;
-
-	BITS_TO_BYTES(primeQSizeInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].
-		      crp_nbits);
-
-	if (DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES != primeQSizeInBytes) {
-		APRINTK("%s(): DSA PRIME Q size not equal to the "
-			"FIPS defined 20bytes, = %d\n",
-			__FUNCTION__, primeQSizeInBytes);
-		krp->krp_status = EDOM;
-		return EDOM;
-	}
-
-	dsaRsSignOpData =
-	    icp_kmem_cache_zalloc(drvDSARSSign_zone, ICP_M_NOWAIT);
-	if (NULL == dsaRsSignOpData) {
-		APRINTK("%s():Failed to get memory"
-			" for DSA RS Sign Op data struct\n", __FUNCTION__);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	dsaRsSignOpData->K.pData =
-	    icp_kmem_cache_alloc(drvDSARSSignKValue_zone, ICP_M_NOWAIT);
-
-	if (NULL == dsaRsSignOpData->K.pData) {
-		APRINTK("%s():Failed to get memory"
-			" for DSA RS Sign Op Random value\n", __FUNCTION__);
-		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	pR = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
-	if (NULL == pR) {
-		APRINTK("%s():Failed to get memory"
-			" for DSA signature R\n", __FUNCTION__);
-		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
-			       dsaRsSignOpData->K.pData);
-		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	pS = icp_kmem_cache_zalloc(drvFlatBuffer_zone, ICP_M_NOWAIT);
-	if (NULL == pS) {
-		APRINTK("%s():Failed to get memory"
-			" for DSA signature S\n", __FUNCTION__);
-		icp_ocfDrvFreeFlatBuffer(pR);
-		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
-			       dsaRsSignOpData->K.pData);
-		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	/*link prime number parameter for ease of processing */
-	dsaRsSignOpData->P.pData =
-	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX].crp_p;
-	BITS_TO_BYTES(dsaRsSignOpData->P.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_P_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(dsaRsSignOpData->P.pData,
-			    dsaRsSignOpData->P.dataLenInBytes);
-
-	dsaRsSignOpData->Q.pData =
-	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].crp_p;
-	BITS_TO_BYTES(dsaRsSignOpData->Q.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_PRIME_Q_INDEX].
-		      crp_nbits);
-
-	icp_ocfDrvSwapBytes(dsaRsSignOpData->Q.pData,
-			    dsaRsSignOpData->Q.dataLenInBytes);
-
-	/*generate random number with equal buffer size to Prime value Q,
-	   but value less than Q */
-	dsaRsSignOpData->K.dataLenInBytes = dsaRsSignOpData->Q.dataLenInBytes;
-
-	randGenOpData.generateBits = CPA_TRUE;
-	randGenOpData.lenInBytes = dsaRsSignOpData->K.dataLenInBytes;
-
-	icp_ocfDrvPtrAndLenToFlatBuffer(dsaRsSignOpData->K.pData,
-					dsaRsSignOpData->K.dataLenInBytes,
-					&randData);
-
-	doCheck = 0;
-	while (icp_ocfDrvCheckALessThanB(&(dsaRsSignOpData->K),
-					 &(dsaRsSignOpData->Q), &doCheck)) {
-
-		if (CPA_STATUS_SUCCESS
-		    != cpaCyRandGen(CPA_INSTANCE_HANDLE_SINGLE,
-				    NULL, NULL, &randGenOpData, &randData)) {
-			APRINTK("%s(): ERROR - Failed to generate DSA RS Sign K"
-				"value\n", __FUNCTION__);
-			icp_ocfDrvFreeFlatBuffer(pS);
-			icp_ocfDrvFreeFlatBuffer(pR);
-			ICP_CACHE_FREE(drvDSARSSignKValue_zone,
-				       dsaRsSignOpData->K.pData);
-			ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-			krp->krp_status = EAGAIN;
-			return EAGAIN;
-		}
-
-		doCheck++;
-		if (DSA_SIGN_RAND_GEN_VAL_CHECK_MAX_ITERATIONS == doCheck) {
-			APRINTK("%s(): ERROR - Failed to find DSA RS Sign K "
-				"value less than Q value\n", __FUNCTION__);
-			icp_ocfDrvFreeFlatBuffer(pS);
-			icp_ocfDrvFreeFlatBuffer(pR);
-			ICP_CACHE_FREE(drvDSARSSignKValue_zone,
-				       dsaRsSignOpData->K.pData);
-			ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-			krp->krp_status = EAGAIN;
-			return EAGAIN;
-		}
-
-	}
-	/*Rand Data - no need to swap bytes for pK */
-
-	/* Link parameters */
-	dsaRsSignOpData->G.pData =
-	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_G_INDEX].crp_p;
-	BITS_TO_BYTES(dsaRsSignOpData->G.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_G_INDEX].crp_nbits);
-
-	icp_ocfDrvSwapBytes(dsaRsSignOpData->G.pData,
-			    dsaRsSignOpData->G.dataLenInBytes);
-
-	dsaRsSignOpData->X.pData =
-	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_X_INDEX].crp_p;
-	BITS_TO_BYTES(dsaRsSignOpData->X.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_X_INDEX].crp_nbits);
-	icp_ocfDrvSwapBytes(dsaRsSignOpData->X.pData,
-			    dsaRsSignOpData->X.dataLenInBytes);
-
-	/*OpenSSL dgst parameter is left in big endian byte order, 
-	   therefore no byte swap is required */
-	dsaRsSignOpData->M.pData =
-	    krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX].crp_p;
-	BITS_TO_BYTES(dsaRsSignOpData->M.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_DGST_INDEX].
-		      crp_nbits);
-
-	/* Output Parameters */
-	pS->pData = krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX].crp_p;
-	BITS_TO_BYTES(pS->dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_S_RESULT_INDEX].
-		      crp_nbits);
-
-	pR->pData = krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX].crp_p;
-	BITS_TO_BYTES(pR->dataLenInBytes,
-		      krp->krp_param[ICP_DSA_SIGN_KRP_PARAM_R_RESULT_INDEX].
-		      crp_nbits);
-
-	lacStatus = cpaCyDsaSignRS(CPA_INSTANCE_HANDLE_SINGLE,
-				   icp_ocfDrvDsaRSSignCallBack,
-				   callbackTag, dsaRsSignOpData,
-				   &protocolStatus, pR, pS);
-
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): DSA RS Sign Operation failed (%d).\n",
-			__FUNCTION__, lacStatus);
-		krp->krp_status = ECANCELED;
-		icp_ocfDrvFreeFlatBuffer(pS);
-		icp_ocfDrvFreeFlatBuffer(pR);
-		ICP_CACHE_FREE(drvDSARSSignKValue_zone,
-			       dsaRsSignOpData->K.pData);
-		ICP_CACHE_FREE(drvDSARSSign_zone, dsaRsSignOpData);
-	}
-
-	return lacStatus;
-}
-
-/* Name        : icp_ocfDrvDsaVerify
- *
- * Description : This function will map DSA RS Verify from OCF to the LAC API.
- *
- */
-static int icp_ocfDrvDsaVerify(struct cryptkop *krp)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	CpaCyDsaVerifyOpData *dsaVerifyOpData = NULL;
-	void *callbackTag = NULL;
-	CpaBoolean verifyStatus = CPA_FALSE;
-
-	callbackTag = krp;
-
-	dsaVerifyOpData =
-	    icp_kmem_cache_zalloc(drvDSAVerify_zone, ICP_M_NOWAIT);
-	if (NULL == dsaVerifyOpData) {
-		APRINTK("%s():Failed to get memory"
-			" for DSA Verify Op data struct\n", __FUNCTION__);
-		krp->krp_status = ENOMEM;
-		return ENOMEM;
-	}
-
-	/* Link parameters */
-	dsaVerifyOpData->P.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->P.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_P_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->P.pData,
-			    dsaVerifyOpData->P.dataLenInBytes);
-
-	dsaVerifyOpData->Q.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->Q.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PRIME_Q_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->Q.pData,
-			    dsaVerifyOpData->Q.dataLenInBytes);
-
-	dsaVerifyOpData->G.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_G_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->G.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_G_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->G.pData,
-			    dsaVerifyOpData->G.dataLenInBytes);
-
-	dsaVerifyOpData->Y.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->Y.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_PUBKEY_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->Y.pData,
-			    dsaVerifyOpData->Y.dataLenInBytes);
-
-	/*OpenSSL dgst parameter is left in big endian byte order, 
-	   therefore no byte swap is required */
-	dsaVerifyOpData->M.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->M.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_DGST_INDEX].
-		      crp_nbits);
-
-	dsaVerifyOpData->R.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->R.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_R_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->R.pData,
-			    dsaVerifyOpData->R.dataLenInBytes);
-
-	dsaVerifyOpData->S.pData =
-	    krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX].crp_p;
-	BITS_TO_BYTES(dsaVerifyOpData->S.dataLenInBytes,
-		      krp->krp_param[ICP_DSA_VERIFY_KRP_PARAM_SIG_S_INDEX].
-		      crp_nbits);
-	icp_ocfDrvSwapBytes(dsaVerifyOpData->S.pData,
-			    dsaVerifyOpData->S.dataLenInBytes);
-
-	lacStatus = cpaCyDsaVerify(CPA_INSTANCE_HANDLE_SINGLE,
-				   icp_ocfDrvDsaVerifyCallBack,
-				   callbackTag, dsaVerifyOpData, &verifyStatus);
-
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): DSA Verify Operation failed (%d).\n",
-			__FUNCTION__, lacStatus);
-		ICP_CACHE_FREE(drvDSAVerify_zone, dsaVerifyOpData);
-		krp->krp_status = ECANCELED;
-	}
-
-	return lacStatus;
-}
-
-/* Name        : icp_ocfDrvDhP1Callback
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the DH operation.
- */
-static void
-icp_ocfDrvDhP1CallBack(void *callbackTag,
-		       CpaStatus status,
-		       void *pOpData, CpaFlatBuffer * pLocalOctetStringPV)
-{
-	struct cryptkop *krp = NULL;
-	CpaCyDhPhase1KeyGenOpData *pPhase1OpData = NULL;
-
-	if (NULL == callbackTag) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"callbackTag data is NULL\n", __FUNCTION__);
-		return;
-	}
-	krp = (struct cryptkop *)callbackTag;
-
-	if (NULL == pOpData) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"Operation Data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-	pPhase1OpData = (CpaCyDhPhase1KeyGenOpData *) pOpData;
-
-	if (NULL == pLocalOctetStringPV) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"pLocalOctetStringPV Data is NULL\n", __FUNCTION__);
-		memset(pPhase1OpData, 0, sizeof(CpaCyDhPhase1KeyGenOpData));
-		ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-
-	if (CPA_STATUS_SUCCESS == status) {
-		krp->krp_status = CRYPTO_OP_SUCCESS;
-	} else {
-		APRINTK("%s(): Diffie Hellman Phase1 Key Gen failed - "
-			"Operation Status = %d\n", __FUNCTION__, status);
-		krp->krp_status = ECANCELED;
-	}
-
-	icp_ocfDrvSwapBytes(pLocalOctetStringPV->pData,
-			    pLocalOctetStringPV->dataLenInBytes);
-
-	icp_ocfDrvFreeFlatBuffer(pLocalOctetStringPV);
-	memset(pPhase1OpData, 0, sizeof(CpaCyDhPhase1KeyGenOpData));
-	ICP_CACHE_FREE(drvDH_zone, pPhase1OpData);
-
-	crypto_kdone(krp);
-
-	return;
-}
-
-/* Name        : icp_ocfDrvModExpCallBack
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the Mod Exp operation.
- */
-static void
-icp_ocfDrvModExpCallBack(void *callbackTag,
-			 CpaStatus status,
-			 void *pOpdata, CpaFlatBuffer * pResult)
-{
-	struct cryptkop *krp = NULL;
-	CpaCyLnModExpOpData *pLnModExpOpData = NULL;
-
-	if (NULL == callbackTag) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"callbackTag data is NULL\n", __FUNCTION__);
-		return;
-	}
-	krp = (struct cryptkop *)callbackTag;
-
-	if (NULL == pOpdata) {
-		DPRINTK("%s(): Invalid Mod Exp input parameters - "
-			"Operation Data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-	pLnModExpOpData = (CpaCyLnModExpOpData *) pOpdata;
-
-	if (NULL == pResult) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"pResult data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		memset(pLnModExpOpData, 0, sizeof(CpaCyLnModExpOpData));
-		ICP_CACHE_FREE(drvLnModExp_zone, pLnModExpOpData);
-		crypto_kdone(krp);
-		return;
-	}
-
-	if (CPA_STATUS_SUCCESS == status) {
-		krp->krp_status = CRYPTO_OP_SUCCESS;
-	} else {
-		APRINTK("%s(): LAC Mod Exp Operation failed - "
-			"Operation Status = %d\n", __FUNCTION__, status);
-		krp->krp_status = ECANCELED;
-	}
-
-	icp_ocfDrvSwapBytes(pResult->pData, pResult->dataLenInBytes);
-
-	/*switch base size value back to original */
-	if (pLnModExpOpData->base.pData ==
-	    (uint8_t *) & (krp->
-			   krp_param[ICP_MOD_EXP_KRP_PARAM_BASE_INDEX].
-			   crp_nbits)) {
-		*((uint32_t *) pLnModExpOpData->base.pData) =
-		    ntohl(*((uint32_t *) pLnModExpOpData->base.pData));
-	}
-	icp_ocfDrvFreeFlatBuffer(pResult);
-	memset(pLnModExpOpData, 0, sizeof(CpaCyLnModExpOpData));
-	ICP_CACHE_FREE(drvLnModExp_zone, pLnModExpOpData);
-
-	crypto_kdone(krp);
-
-	return;
-
-}
-
-/* Name        : icp_ocfDrvModExpCRTCallBack
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the Mod Exp CRT operation.
- */
-static void
-icp_ocfDrvModExpCRTCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData, CpaFlatBuffer * pOutputData)
-{
-	struct cryptkop *krp = NULL;
-	CpaCyRsaDecryptOpData *pDecryptData = NULL;
-
-	if (NULL == callbackTag) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"callbackTag data is NULL\n", __FUNCTION__);
-		return;
-	}
-
-	krp = (struct cryptkop *)callbackTag;
-
-	if (NULL == pOpData) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"Operation Data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-	pDecryptData = (CpaCyRsaDecryptOpData *) pOpData;
-
-	if (NULL == pOutputData) {
-		DPRINTK("%s(): Invalid input parameter - "
-			"pOutputData is NULL\n", __FUNCTION__);
-		memset(pDecryptData->pRecipientPrivateKey, 0,
-		       sizeof(CpaCyRsaPrivateKey));
-		ICP_CACHE_FREE(drvRSAPrivateKey_zone,
-			       pDecryptData->pRecipientPrivateKey);
-		memset(pDecryptData, 0, sizeof(CpaCyRsaDecryptOpData));
-		ICP_CACHE_FREE(drvRSADecrypt_zone, pDecryptData);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-
-	if (CPA_STATUS_SUCCESS == status) {
-		krp->krp_status = CRYPTO_OP_SUCCESS;
-	} else {
-		APRINTK("%s(): LAC Mod Exp CRT operation failed - "
-			"Operation Status = %d\n", __FUNCTION__, status);
-		krp->krp_status = ECANCELED;
-	}
-
-	icp_ocfDrvSwapBytes(pOutputData->pData, pOutputData->dataLenInBytes);
-
-	icp_ocfDrvFreeFlatBuffer(pOutputData);
-	memset(pDecryptData->pRecipientPrivateKey, 0,
-	       sizeof(CpaCyRsaPrivateKey));
-	ICP_CACHE_FREE(drvRSAPrivateKey_zone,
-		       pDecryptData->pRecipientPrivateKey);
-	memset(pDecryptData, 0, sizeof(CpaCyRsaDecryptOpData));
-	ICP_CACHE_FREE(drvRSADecrypt_zone, pDecryptData);
-
-	crypto_kdone(krp);
-
-	return;
-}
-
-/* Name        : icp_ocfDrvDsaRSSignCallBack
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the DSA RS sign operation.
- */
-static void
-icp_ocfDrvDsaRSSignCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData,
-			    CpaBoolean protocolStatus,
-			    CpaFlatBuffer * pR, CpaFlatBuffer * pS)
-{
-	struct cryptkop *krp = NULL;
-	CpaCyDsaRSSignOpData *pSignData = NULL;
-
-	if (NULL == callbackTag) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"callbackTag data is NULL\n", __FUNCTION__);
-		return;
-	}
-
-	krp = (struct cryptkop *)callbackTag;
-
-	if (NULL == pOpData) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"Operation Data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-	pSignData = (CpaCyDsaRSSignOpData *) pOpData;
-
-	if (NULL == pR) {
-		DPRINTK("%s(): Invalid input parameter - "
-			"pR sign is NULL\n", __FUNCTION__);
-		icp_ocfDrvFreeFlatBuffer(pS);
-		ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-
-	if (NULL == pS) {
-		DPRINTK("%s(): Invalid input parameter - "
-			"pS sign is NULL\n", __FUNCTION__);
-		icp_ocfDrvFreeFlatBuffer(pR);
-		ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-
-	if (CPA_STATUS_SUCCESS != status) {
-		APRINTK("%s(): LAC DSA RS Sign operation failed - "
-			"Operation Status = %d\n", __FUNCTION__, status);
-		krp->krp_status = ECANCELED;
-	} else {
-		krp->krp_status = CRYPTO_OP_SUCCESS;
-
-		if (CPA_TRUE != protocolStatus) {
-			DPRINTK("%s(): LAC DSA RS Sign operation failed due "
-				"to protocol error\n", __FUNCTION__);
-			krp->krp_status = EIO;
-		}
-	}
-
-	/* Swap bytes only when the callback status is successful and
-	   protocolStatus is set to true */
-	if (CPA_STATUS_SUCCESS == status && CPA_TRUE == protocolStatus) {
-		icp_ocfDrvSwapBytes(pR->pData, pR->dataLenInBytes);
-		icp_ocfDrvSwapBytes(pS->pData, pS->dataLenInBytes);
-	}
-
-	icp_ocfDrvFreeFlatBuffer(pR);
-	icp_ocfDrvFreeFlatBuffer(pS);
-	memset(pSignData->K.pData, 0, pSignData->K.dataLenInBytes);
-	ICP_CACHE_FREE(drvDSARSSignKValue_zone, pSignData->K.pData);
-	memset(pSignData, 0, sizeof(CpaCyDsaRSSignOpData));
-	ICP_CACHE_FREE(drvDSARSSign_zone, pSignData);
-	crypto_kdone(krp);
-
-	return;
-}
-
-/* Name        : icp_ocfDrvDsaVerifyCallback
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the DSA Verify operation.
- */
-static void
-icp_ocfDrvDsaVerifyCallBack(void *callbackTag,
-			    CpaStatus status,
-			    void *pOpData, CpaBoolean verifyStatus)
-{
-
-	struct cryptkop *krp = NULL;
-	CpaCyDsaVerifyOpData *pVerData = NULL;
-
-	if (NULL == callbackTag) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"callbackTag data is NULL\n", __FUNCTION__);
-		return;
-	}
-
-	krp = (struct cryptkop *)callbackTag;
-
-	if (NULL == pOpData) {
-		DPRINTK("%s(): Invalid input parameters - "
-			"Operation Data is NULL\n", __FUNCTION__);
-		krp->krp_status = ECANCELED;
-		crypto_kdone(krp);
-		return;
-	}
-	pVerData = (CpaCyDsaVerifyOpData *) pOpData;
-
-	if (CPA_STATUS_SUCCESS != status) {
-		APRINTK("%s(): LAC DSA Verify operation failed - "
-			"Operation Status = %d\n", __FUNCTION__, status);
-		krp->krp_status = ECANCELED;
-	} else {
-		krp->krp_status = CRYPTO_OP_SUCCESS;
-
-		if (CPA_TRUE != verifyStatus) {
-			DPRINTK("%s(): DSA signature invalid\n", __FUNCTION__);
-			krp->krp_status = EIO;
-		}
-	}
-
-	/* Swap bytes only when the callback status is successful and
-	   verifyStatus is set to true */
-	/*Just swapping back the key values for now. Possibly all
-	   swapped buffers need to be reverted */
-	if (CPA_STATUS_SUCCESS == status && CPA_TRUE == verifyStatus) {
-		icp_ocfDrvSwapBytes(pVerData->R.pData,
-				    pVerData->R.dataLenInBytes);
-		icp_ocfDrvSwapBytes(pVerData->S.pData,
-				    pVerData->S.dataLenInBytes);
-	}
-
-	memset(pVerData, 0, sizeof(CpaCyDsaVerifyOpData));
-	ICP_CACHE_FREE(drvDSAVerify_zone, pVerData);
-	crypto_kdone(krp);
-
-	return;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_common.c b/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_common.c
deleted file mode 100644
index 5d46c0adc6..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_common.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/*************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or 
- *   redistributing this file, you may do so under either license.
- * 
- *   GPL LICENSE SUMMARY
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- * 
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- * 
- *   This program is distributed in the hope that it will be useful, but 
- *   WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- *   General Public License for more details.
- * 
- *   You should have received a copy of the GNU General Public License 
- *   along with this program; if not, write to the Free Software 
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution 
- *   in the file called LICENSE.GPL.
- * 
- *   Contact Information:
- *   Intel Corporation
- * 
- *   BSD LICENSE 
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *  version: Security.L.1.0.2-229
- *
- ***************************************************************************/
-
-/*
- * An OCF module that uses Intel® QuickAssist Integrated Accelerator to do the 
- * crypto.
- *
- * This driver requires the ICP Access Library that is available from Intel in
- * order to operate.
- */
-
-#include "icp_ocf.h"
-
-#define ICP_OCF_COMP_NAME                       "ICP_OCF"
-#define ICP_OCF_VER_MAIN                        (2)
-#define ICP_OCF_VER_MJR                         (1)
-#define ICP_OCF_VER_MNR                         (0)
-
-#define MAX_DEREG_RETRIES                       (100)
-#define DEFAULT_DEREG_RETRIES 			(10)
-#define DEFAULT_DEREG_DELAY_IN_JIFFIES		(10)
-
-/* This defines the maximum number of sessions possible between OCF
-   and the OCF EP80579 Driver. If set to zero, there is no limit. */
-#define DEFAULT_OCF_TO_DRV_MAX_SESSION_COUNT    (0)
-#define NUM_SUPPORTED_CAPABILITIES              (21)
-
-/*Slab zone names*/
-#define ICP_SESSION_DATA_NAME   "icp_ocf.SesDat"
-#define ICP_OP_DATA_NAME        "icp_ocf.OpDat"
-#define ICP_DH_NAME             "icp_ocf.DH"
-#define ICP_MODEXP_NAME         "icp_ocf.ModExp"
-#define ICP_RSA_DECRYPT_NAME    "icp_ocf.RSAdec"
-#define ICP_RSA_PKEY_NAME       "icp_ocf.RSApk"
-#define ICP_DSA_SIGN_NAME       "icp_ocf.DSAsg"
-#define ICP_DSA_VER_NAME        "icp_ocf.DSAver"
-#define ICP_RAND_VAL_NAME       "icp_ocf.DSArnd"
-#define ICP_FLAT_BUFF_NAME      "icp_ocf.FB"
-
-/*Slabs zones*/
-icp_kmem_cache drvSessionData_zone = NULL;
-icp_kmem_cache drvOpData_zone = NULL;
-icp_kmem_cache drvDH_zone = NULL;
-icp_kmem_cache drvLnModExp_zone = NULL;
-icp_kmem_cache drvRSADecrypt_zone = NULL;
-icp_kmem_cache drvRSAPrivateKey_zone = NULL;
-icp_kmem_cache drvDSARSSign_zone = NULL;
-icp_kmem_cache drvDSARSSignKValue_zone = NULL;
-icp_kmem_cache drvDSAVerify_zone = NULL;
-
-/*Slab zones for flatbuffers and bufferlist*/
-icp_kmem_cache drvFlatBuffer_zone = NULL;
-
-static inline int icp_cache_null_check(void)
-{
-	return (drvSessionData_zone && drvOpData_zone
-		&& drvDH_zone && drvLnModExp_zone && drvRSADecrypt_zone
-		&& drvRSAPrivateKey_zone && drvDSARSSign_zone
-		&& drvDSARSSign_zone && drvDSARSSignKValue_zone
-		&& drvDSAVerify_zone && drvFlatBuffer_zone);
-}
-
-/*Function to free all allocated slab caches before exiting the module*/
-static void icp_ocfDrvFreeCaches(void);
-
-int32_t icp_ocfDrvDriverId = INVALID_DRIVER_ID;
-
-/* Module parameter - gives the number of times LAC deregistration shall be
-   re-tried */
-int num_dereg_retries = DEFAULT_DEREG_RETRIES;
-
-/* Module parameter - gives the delay time in jiffies before a LAC session 
-   shall be attempted to be deregistered again */
-int dereg_retry_delay_in_jiffies = DEFAULT_DEREG_DELAY_IN_JIFFIES;
-
-/* Module parameter - gives the maximum number of sessions possible between
-   OCF and the OCF EP80579 Driver. If set to zero, there is no limit.*/
-int max_sessions = DEFAULT_OCF_TO_DRV_MAX_SESSION_COUNT;
-
-/* This is set when the module is removed from the system, no further
-   processing can take place if this is set */
-icp_atomic_t icp_ocfDrvIsExiting = ICP_ATOMIC_INIT(0);
-
-/* This is used to show how many lac sessions were not deregistered*/
-icp_atomic_t lac_session_failed_dereg_count = ICP_ATOMIC_INIT(0);
-
-/* This is used to track the number of registered sessions between OCF and
- * and the OCF EP80579 driver, when max_session is set to value other than
- * zero. This ensures that the max_session set for the OCF and the driver
- * is equal to the LAC registered sessions */
-icp_atomic_t num_ocf_to_drv_registered_sessions = ICP_ATOMIC_INIT(0);
-
-/* Head of linked list used to store session data */
-icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead;
-icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead_FreeMemList;
-
-icp_spinlock_t icp_ocfDrvSymSessInfoListSpinlock;
-
-/*Below pointer is only used in linux, FreeBSD uses the name to
-create its own variable name*/
-icp_workqueue *icp_ocfDrvFreeLacSessionWorkQ = NULL;
-ICP_WORKQUEUE_DEFINE_THREAD(icp_ocfDrvFreeLacSessionWorkQ);
-
-struct icp_drvBuffListInfo defBuffListInfo;
-
-/* Name        : icp_ocfDrvInit
- *
- * Description : This function will register all the symmetric and asymmetric
- * functionality that will be accelerated by the hardware. It will also
- * get a unique driver ID from the OCF and initialise all slab caches
- */
-ICP_MODULE_INIT_FUNC(icp_ocfDrvInit)
-{
-	int ocfStatus = 0;
-
-	IPRINTK("=== %s ver %d.%d.%d ===\n", ICP_OCF_COMP_NAME,
-		ICP_OCF_VER_MAIN, ICP_OCF_VER_MJR, ICP_OCF_VER_MNR);
-
-	if (MAX_DEREG_RETRIES < num_dereg_retries) {
-		EPRINTK("Session deregistration retry count set to greater "
-			"than %d", MAX_DEREG_RETRIES);
-		icp_module_return_code(EINVAL);
-	}
-
-	/* Initialize and Start the Cryptographic component */
-	if (CPA_STATUS_SUCCESS !=
-	    cpaCyStartInstance(CPA_INSTANCE_HANDLE_SINGLE)) {
-		EPRINTK("Failed to initialize and start the instance "
-			"of the Cryptographic component.\n");
-		return icp_module_return_code(EINVAL);
-	}
-
-	icp_spin_lock_init(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	/* Set the default size of BufferList to allocate */
-	memset(&defBuffListInfo, 0, sizeof(struct icp_drvBuffListInfo));
-	if (ICP_OCF_DRV_STATUS_SUCCESS !=
-	    icp_ocfDrvBufferListMemInfo(ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS,
-					&defBuffListInfo)) {
-		EPRINTK("Failed to get bufferlist memory info.\n");
-		return icp_module_return_code(ENOMEM);
-	}
-
-	/*Register OCF EP80579 Driver with OCF */
-	icp_ocfDrvDriverId = ICP_CRYPTO_GET_DRIVERID();
-
-	if (icp_ocfDrvDriverId < 0) {
-		EPRINTK("%s : ICP driver failed to register with OCF!\n",
-			__FUNCTION__);
-		return icp_module_return_code(ENODEV);
-	}
-
-	/*Create all the slab caches used by the OCF EP80579 Driver */
-	drvSessionData_zone =
-	    ICP_CACHE_CREATE(ICP_SESSION_DATA_NAME, struct icp_drvSessionData);
-
-	/* 
-	 * Allocation of the OpData includes the allocation space for meta data.
-	 * The memory after the opData structure is reserved for this meta data.
-	 */
-	drvOpData_zone =
-	    icp_kmem_cache_create(ICP_OP_DATA_NAME,
-				  sizeof(struct icp_drvOpData) +
-				  defBuffListInfo.metaSize,
-				  ICP_KERNEL_CACHE_ALIGN,
-				  ICP_KERNEL_CACHE_NOINIT);
-
-	drvDH_zone = ICP_CACHE_CREATE(ICP_DH_NAME, CpaCyDhPhase1KeyGenOpData);
-
-	drvLnModExp_zone =
-	    ICP_CACHE_CREATE(ICP_MODEXP_NAME, CpaCyLnModExpOpData);
-
-	drvRSADecrypt_zone =
-	    ICP_CACHE_CREATE(ICP_RSA_DECRYPT_NAME, CpaCyRsaDecryptOpData);
-
-	drvRSAPrivateKey_zone =
-	    ICP_CACHE_CREATE(ICP_RSA_PKEY_NAME, CpaCyRsaPrivateKey);
-
-	drvDSARSSign_zone =
-	    ICP_CACHE_CREATE(ICP_DSA_SIGN_NAME, CpaCyDsaRSSignOpData);
-
-	/*too awkward to use a macro here */
-	drvDSARSSignKValue_zone =
-	    ICP_CACHE_CREATE(ICP_RAND_VAL_NAME,
-			     DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES);
-
-	drvDSAVerify_zone =
-	    ICP_CACHE_CREATE(ICP_DSA_VER_NAME, CpaCyDsaVerifyOpData);
-
-	drvFlatBuffer_zone =
-	    ICP_CACHE_CREATE(ICP_FLAT_BUFF_NAME, CpaFlatBuffer);
-
-	if (0 == icp_cache_null_check()) {
-		icp_ocfDrvFreeCaches();
-		EPRINTK("%s() line %d: Not enough memory!\n",
-			__FUNCTION__, __LINE__);
-		return ENOMEM;
-	}
-
-	/* Register the ICP symmetric crypto support. */
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_NULL_CBC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_DES_CBC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_3DES_CBC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_AES_CBC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_ARC4, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_MD5, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_MD5_HMAC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA1, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA1_HMAC, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_256, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_256_HMAC,
-			     ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_384, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_384_HMAC,
-			     ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_512, ocfStatus);
-	ICP_REG_SYM_WITH_OCF(icp_ocfDrvDriverId, CRYPTO_SHA2_512_HMAC,
-			     ocfStatus);
-
-	/* Register the ICP asymmetric algorithm support */
-	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DH_COMPUTE_KEY,
-			      ocfStatus);
-	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_MOD_EXP, ocfStatus);
-	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_MOD_EXP_CRT, ocfStatus);
-	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DSA_SIGN, ocfStatus);
-	ICP_REG_ASYM_WITH_OCF(icp_ocfDrvDriverId, CRK_DSA_VERIFY, ocfStatus);
-
-	/* Register the ICP random number generator support */
-	ICP_REG_RAND_WITH_OCF(icp_ocfDrvDriverId,
-			      icp_ocfDrvReadRandom, NULL, ocfStatus);
-
-	if (OCF_ZERO_FUNCTIONALITY_REGISTERED == ocfStatus) {
-		DPRINTK("%s: Failed to register any device capabilities\n",
-			__FUNCTION__);
-		icp_ocfDrvFreeCaches();
-		icp_ocfDrvDriverId = INVALID_DRIVER_ID;
-		return icp_module_return_code(ECANCELED);
-	}
-
-	DPRINTK("%s: Registered %d of %d device capabilities\n",
-		__FUNCTION__, ocfStatus, NUM_SUPPORTED_CAPABILITIES);
-
-	/*Session data linked list used during module exit */
-	ICP_INIT_LIST_HEAD(&icp_ocfDrvGlobalSymListHead);
-	ICP_INIT_LIST_HEAD(&icp_ocfDrvGlobalSymListHead_FreeMemList);
-
-	ICP_WORKQUEUE_CREATE(icp_ocfDrvFreeLacSessionWorkQ, "icpwq");
-	if (ICP_WORKQUEUE_NULL_CHECK(icp_ocfDrvFreeLacSessionWorkQ)) {
-		EPRINTK("%s: Failed to create single "
-			"thread workqueue\n", __FUNCTION__);
-		icp_ocfDrvFreeCaches();
-		icp_ocfDrvDriverId = INVALID_DRIVER_ID;
-		return icp_module_return_code(ENOMEM);
-	}
-
-	return icp_module_return_code(0);
-}
-
-/* Name        : icp_ocfDrvExit
- *
- * Description : This function will deregister all the symmetric sessions
- * registered with the LAC component. It will also deregister all symmetric
- * and asymmetric functionality that can be accelerated by the hardware via OCF
- * and random number generation if it is enabled.
- */
-ICP_MODULE_EXIT_FUNC(icp_ocfDrvExit)
-{
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	struct icp_drvSessionData *sessionData = NULL;
-	struct icp_drvSessionData *tempSessionData = NULL;
-	int i, remaining_delay_time_in_jiffies = 0;
-
-	/* For FreeBSD the invariant macro below makes function to return     */
-	/* with EBUSY value in the case of any session which has been regi-   */
-	/* stered with LAC not being deregistered.                            */
-	/* The Linux implementation is empty since it is purely to compensate */
-	/* for a limitation of the FreeBSD 7.1 Opencrypto framework.          */
-
-    ICP_MODULE_EXIT_INV();
-
-	/* There is a possibility of a process or new session command being   */
-	/* sent before this variable is incremented. The aim of this variable */
-	/* is to stop a loop of calls creating a deadlock situation which     */
-	/* would prevent the driver from exiting.                             */
-	icp_atomic_set(&icp_ocfDrvIsExiting, 1);
-
-	/*Existing sessions will be routed to another driver after these calls */
-	crypto_unregister_all(icp_ocfDrvDriverId);
-	crypto_runregister_all(icp_ocfDrvDriverId);
-
-	if (ICP_WORKQUEUE_NULL_CHECK(icp_ocfDrvFreeLacSessionWorkQ)) {
-		DPRINTK("%s: workqueue already "
-			"destroyed, therefore module exit "
-			" function already called. Exiting.\n", __FUNCTION__);
-		return ICP_MODULE_EXIT_FUNC_RETURN_VAL;
-	}
-	/*If any sessions are waiting to be deregistered, do that. This also 
-	   flushes the work queue */
-	ICP_WORKQUEUE_DESTROY(icp_ocfDrvFreeLacSessionWorkQ);
-
-	/*ENTER CRITICAL SECTION */
-	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	ICP_LIST_FOR_EACH_ENTRY_SAFE(tempSessionData, sessionData,
-				     &icp_ocfDrvGlobalSymListHead, listNode) {
-		for (i = 0; i < num_dereg_retries; i++) {
-			/*No harm if bad input - LAC will handle error cases */
-			if (ICP_SESSION_RUNNING == tempSessionData->inUse) {
-				lacStatus =
-				    cpaCySymRemoveSession
-				    (CPA_INSTANCE_HANDLE_SINGLE,
-				     tempSessionData->sessHandle);
-				if (CPA_STATUS_SUCCESS == lacStatus) {
-					/* Succesfully deregistered */
-					break;
-				} else if (CPA_STATUS_RETRY != lacStatus) {
-					icp_atomic_inc
-					    (&lac_session_failed_dereg_count);
-					break;
-				}
-
-				/*schedule_timout returns the time left for completion if 
-				 * this task is set to TASK_INTERRUPTIBLE */
-				remaining_delay_time_in_jiffies =
-				    dereg_retry_delay_in_jiffies;
-				while (0 > remaining_delay_time_in_jiffies) {
-					remaining_delay_time_in_jiffies =
-					    icp_schedule_timeout
-					    (&icp_ocfDrvSymSessInfoListSpinlock,
-					     remaining_delay_time_in_jiffies);
-				}
-
-				DPRINTK
-				    ("%s(): Retry %d to deregistrate the session\n",
-				     __FUNCTION__, i);
-			}
-		}
-
-		/*remove from current list */
-		ICP_LIST_DEL(tempSessionData, listNode);
-		/*add to free mem linked list */
-		ICP_LIST_ADD(tempSessionData,
-			     &icp_ocfDrvGlobalSymListHead_FreeMemList,
-			     listNode);
-
-	}
-
-	/*EXIT CRITICAL SECTION */
-	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	/*set back to initial values */
-	sessionData = NULL;
-	/*still have a reference in our list! */
-	tempSessionData = NULL;
-	/*free memory */
-
-	ICP_LIST_FOR_EACH_ENTRY_SAFE(tempSessionData, sessionData,
-				     &icp_ocfDrvGlobalSymListHead_FreeMemList,
-				     listNode) {
-
-		ICP_LIST_DEL(tempSessionData, listNode);
-		/* Free allocated CpaCySymSessionCtx */
-		if (NULL != tempSessionData->sessHandle) {
-			icp_kfree(tempSessionData->sessHandle);
-		}
-		memset(tempSessionData, 0, sizeof(struct icp_drvSessionData));
-		ICP_CACHE_FREE(drvSessionData_zone, tempSessionData);
-	}
-
-	if (0 != icp_atomic_read(&lac_session_failed_dereg_count)) {
-		DPRINTK("%s(): %d LAC sessions were not deregistered "
-			"correctly. This is not a clean exit! \n",
-			__FUNCTION__,
-			icp_atomic_read(&lac_session_failed_dereg_count));
-	}
-
-	icp_ocfDrvFreeCaches();
-	icp_ocfDrvDriverId = INVALID_DRIVER_ID;
-
-	icp_spin_lock_destroy(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	/* Shutdown the Cryptographic component */
-	lacStatus = cpaCyStopInstance(CPA_INSTANCE_HANDLE_SINGLE);
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		DPRINTK("%s(): Failed to stop instance of the "
-			"Cryptographic component.(status == %d)\n",
-			__FUNCTION__, lacStatus);
-	}
-
-	return ICP_MODULE_EXIT_FUNC_RETURN_VAL;
-}
-
-/* Name        : icp_ocfDrvFreeCaches
- *
- * Description : This function deregisters all slab caches
- */
-static void icp_ocfDrvFreeCaches(void)
-{
-	icp_atomic_set(&icp_ocfDrvIsExiting, 1);
-
-	/*Sym Zones */
-	ICP_CACHE_DESTROY(drvSessionData_zone);
-	ICP_CACHE_DESTROY(drvOpData_zone);
-
-	/*Asym zones */
-	ICP_CACHE_DESTROY(drvDH_zone);
-	ICP_CACHE_DESTROY(drvLnModExp_zone);
-	ICP_CACHE_DESTROY(drvRSADecrypt_zone);
-	ICP_CACHE_DESTROY(drvRSAPrivateKey_zone);
-	ICP_CACHE_DESTROY(drvDSARSSignKValue_zone);
-	ICP_CACHE_DESTROY(drvDSARSSign_zone);
-	ICP_CACHE_DESTROY(drvDSAVerify_zone);
-
-	/*FlatBuffer and BufferList Zones */
-	ICP_CACHE_DESTROY(drvFlatBuffer_zone);
-
-}
-
-/* Name        : icp_ocfDrvDeregRetry
- *
- * Description : This function will try to farm the session deregistration
- * off to a work queue. If it fails, nothing more can be done and it
- * returns an error
- */
-int icp_ocfDrvDeregRetry(CpaCySymSessionCtx sessionToDeregister)
-{
-	struct icp_ocfDrvFreeLacSession *workstore = NULL;
-
-	DPRINTK("%s(): Retry - Deregistering session (%p)\n",
-		__FUNCTION__, sessionToDeregister);
-
-	/*make sure the session is not available to be allocated during this
-	   process */
-	icp_atomic_inc(&lac_session_failed_dereg_count);
-
-	/*Farm off to work queue */
-	workstore =
-	    icp_kmalloc(sizeof(struct icp_ocfDrvFreeLacSession), ICP_M_NOWAIT);
-	if (NULL == workstore) {
-		DPRINTK("%s(): unable to free session - no memory available "
-			"for work queue\n", __FUNCTION__);
-		return ENOMEM;
-	}
-
-	workstore->sessionToDeregister = sessionToDeregister;
-
-	icp_init_work(&(workstore->work),
-		      icp_ocfDrvDeferedFreeLacSessionTaskFn, workstore);
-
-	ICP_WORKQUEUE_ENQUEUE(icp_ocfDrvFreeLacSessionWorkQ,
-			      &(workstore->work));
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-
-}
-
-/* Name        : icp_ocfDrvDeferedFreeLacSessionProcess
- *
- * Description : This function will retry (module input parameter)
- * 'num_dereg_retries' times to deregister any symmetric session that recieves a
- * CPA_STATUS_RETRY message from the LAC component. This function is run in
- * Thread context because it is called from a worker thread
- */
-void icp_ocfDrvDeferedFreeLacSessionProcess(void *arg)
-{
-	struct icp_ocfDrvFreeLacSession *workstore = NULL;
-	CpaCySymSessionCtx sessionToDeregister = NULL;
-	int i = 0;
-	int remaining_delay_time_in_jiffies = 0;
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-
-	workstore = (struct icp_ocfDrvFreeLacSession *)arg;
-	if (NULL == workstore) {
-		DPRINTK("%s() function called with null parameter \n",
-			__FUNCTION__);
-		return;
-	}
-
-	sessionToDeregister = workstore->sessionToDeregister;
-	icp_kfree(workstore);
-
-	/*if exiting, give deregistration one more blast only */
-	if (icp_atomic_read(&icp_ocfDrvIsExiting) == CPA_TRUE) {
-		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
-						  sessionToDeregister);
-
-		if (lacStatus != CPA_STATUS_SUCCESS) {
-			DPRINTK("%s() Failed to Dereg LAC session %p "
-				"during module exit\n", __FUNCTION__,
-				sessionToDeregister);
-			return;
-		}
-
-		icp_atomic_dec(&lac_session_failed_dereg_count);
-		return;
-	}
-
-	for (i = 0; i <= num_dereg_retries; i++) {
-		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
-						  sessionToDeregister);
-
-		if (lacStatus == CPA_STATUS_SUCCESS) {
-			icp_atomic_dec(&lac_session_failed_dereg_count);
-			return;
-		}
-		if (lacStatus != CPA_STATUS_RETRY) {
-			DPRINTK("%s() Failed to deregister session - lacStatus "
-				" = %d", __FUNCTION__, lacStatus);
-			break;
-		}
-
-		/*schedule_timout returns the time left for completion if this
-		   task is set to TASK_INTERRUPTIBLE */
-		remaining_delay_time_in_jiffies = dereg_retry_delay_in_jiffies;
-		while (0 < remaining_delay_time_in_jiffies) {
-			remaining_delay_time_in_jiffies =
-			    icp_schedule_timeout(NULL,
-						 remaining_delay_time_in_jiffies);
-		}
-
-	}
-
-	DPRINTK("%s(): Unable to deregister session\n", __FUNCTION__);
-	DPRINTK("%s(): Number of unavailable LAC sessions = %d\n", __FUNCTION__,
-		icp_atomic_read(&lac_session_failed_dereg_count));
-}
-
-/* Name        : icp_ocfDrvPtrAndLenToFlatBuffer 
- *
- * Description : This function converts a "pointer and length" buffer 
- * structure to Fredericksburg Flat Buffer (CpaFlatBuffer) format.
- *
- * This function assumes that the data passed in are valid.
- */
-inline void
-icp_ocfDrvPtrAndLenToFlatBuffer(void *pData, uint32_t len,
-				CpaFlatBuffer * pFlatBuffer)
-{
-	pFlatBuffer->pData = pData;
-	pFlatBuffer->dataLenInBytes = len;
-}
-
-/* Name        : icp_ocfDrvPtrAndLenToBufferList
- *
- * Description : This function converts a "pointer and length" buffer
- * structure to Fredericksburg Scatter/Gather Buffer (CpaBufferList) format.
- *
- * This function assumes that the data passed in are valid.
- */
-inline void
-icp_ocfDrvPtrAndLenToBufferList(void *pDataIn, uint32_t length,
-				CpaBufferList * pBufferList)
-{
-	pBufferList->numBuffers = 1;
-	pBufferList->pBuffers->pData = pDataIn;
-	pBufferList->pBuffers->dataLenInBytes = length;
-}
-
-/* Name        : icp_ocfDrvBufferListToPtrAndLen
- *
- * Description : This function converts Fredericksburg Scatter/Gather Buffer
- * (CpaBufferList) format to a "pointer and length" buffer structure.
- *
- * This function assumes that the data passed in are valid.
- */
-inline void
-icp_ocfDrvBufferListToPtrAndLen(CpaBufferList * pBufferList,
-				void **ppDataOut, uint32_t * pLength)
-{
-	*ppDataOut = pBufferList->pBuffers->pData;
-	*pLength = pBufferList->pBuffers->dataLenInBytes;
-}
-
-/* Name        : icp_ocfDrvBufferListMemInfo
- *
- * Description : This function will set the number of flat buffers in 
- * bufferlist, the size of memory to allocate for the pPrivateMetaData 
- * member of the CpaBufferList.
- */
-int
-icp_ocfDrvBufferListMemInfo(uint16_t numBuffers,
-			    struct icp_drvBuffListInfo *buffListInfo)
-{
-	buffListInfo->numBuffers = numBuffers;
-
-	if (CPA_STATUS_SUCCESS !=
-	    cpaCyBufferListGetMetaSize(CPA_INSTANCE_HANDLE_SINGLE,
-				       buffListInfo->numBuffers,
-				       &(buffListInfo->metaSize))) {
-		EPRINTK("%s() Failed to get buffer list meta size.\n",
-			__FUNCTION__);
-		return ICP_OCF_DRV_STATUS_FAIL;
-	}
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvFreeFlatBuffer
- *
- * Description : This function will deallocate flat buffer.
- */
-inline void icp_ocfDrvFreeFlatBuffer(CpaFlatBuffer * pFlatBuffer)
-{
-	if (pFlatBuffer != NULL) {
-		memset(pFlatBuffer, 0, sizeof(CpaFlatBuffer));
-		ICP_CACHE_FREE(drvFlatBuffer_zone, pFlatBuffer);
-	}
-}
-
-/* Name        : icp_ocfDrvAllocMetaData
- *
- * Description : This function will allocate memory for the
- * pPrivateMetaData member of CpaBufferList.
- */
-inline int
-icp_ocfDrvAllocMetaData(CpaBufferList * pBufferList,
-			struct icp_drvOpData *pOpData)
-{
-	Cpa32U metaSize = 0;
-
-	if (pBufferList->numBuffers <= ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
-		uint8_t *pOpDataStartAddr = (uint8_t *) pOpData;
-
-		if (0 == defBuffListInfo.metaSize) {
-			pBufferList->pPrivateMetaData = NULL;
-			return ICP_OCF_DRV_STATUS_SUCCESS;
-		}
-		/*
-		 * The meta data allocation has been included as part of the 
-		 * op data.  It has been pre-allocated in memory just after the
-		 * icp_drvOpData structure.
-		 */
-		pBufferList->pPrivateMetaData = (void *)(pOpDataStartAddr +
-							 sizeof(struct
-								icp_drvOpData));
-	} else {
-		if (CPA_STATUS_SUCCESS !=
-		    cpaCyBufferListGetMetaSize(CPA_INSTANCE_HANDLE_SINGLE,
-					       pBufferList->numBuffers,
-					       &metaSize)) {
-			EPRINTK("%s() Failed to get buffer list meta size.\n",
-				__FUNCTION__);
-			return ICP_OCF_DRV_STATUS_FAIL;
-		}
-
-		if (0 == metaSize) {
-			pBufferList->pPrivateMetaData = NULL;
-			return ICP_OCF_DRV_STATUS_SUCCESS;
-		}
-
-		pBufferList->pPrivateMetaData =
-		    icp_kmalloc(metaSize, ICP_M_NOWAIT);
-	}
-	if (NULL == pBufferList->pPrivateMetaData) {
-		EPRINTK("%s() Failed to allocate pPrivateMetaData.\n",
-			__FUNCTION__);
-		return ICP_OCF_DRV_STATUS_FAIL;
-	}
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvFreeMetaData
- *
- * Description : This function will deallocate pPrivateMetaData memory.
- */
-inline void icp_ocfDrvFreeMetaData(CpaBufferList * pBufferList)
-{
-	if (NULL == pBufferList->pPrivateMetaData) {
-		return;
-	}
-
-	/*
-	 * Only free the meta data if the BufferList has more than 
-	 * ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS number of buffers.
-	 * Otherwise, the meta data shall be freed when the icp_drvOpData is
-	 * freed.
-	 */
-	if (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS < pBufferList->numBuffers) {
-		icp_kfree(pBufferList->pPrivateMetaData);
-	}
-}
-
-/* Module declaration, init and exit functions */
-ICP_DECLARE_MODULE(icp_ocf, icp_ocfDrvInit, icp_ocfDrvExit);
-ICP_MODULE_DESCRIPTION("OCF Driver for Intel Quick Assist crypto acceleration");
-ICP_MODULE_VERSION(icp_ocf, ICP_OCF_VER_MJR);
-ICP_MODULE_LICENSE("Dual BSD/GPL");
-ICP_MODULE_AUTHOR("Intel");
-
-/* Module parameters */
-ICP_MODULE_PARAM_INT(icp_ocf, num_dereg_retries,
-		     "Number of times to retry LAC Sym Session Deregistration. "
-		     "Default 10, Max 100");
-ICP_MODULE_PARAM_INT(icp_ocf, dereg_retry_delay_in_jiffies, "Delay in jiffies "
-		     "(added to a schedule() function call) before a LAC Sym "
-		     "Session Dereg is retried. Default 10");
-ICP_MODULE_PARAM_INT(icp_ocf, max_sessions,
-		     "This sets the maximum number of sessions "
-		     "between OCF and this driver. If this value is set to zero,"
-		     "max session count checking is disabled. Default is zero(0)");
-
-/* Module dependencies */
-#define MODULE_MIN_VER	1
-#define CRYPTO_MAX_VER	3
-#define LAC_MAX_VER	2
-
-ICP_MODULE_DEPEND(icp_ocf, crypto, MODULE_MIN_VER, MODULE_MIN_VER,
-		  CRYPTO_MAX_VER);
-ICP_MODULE_DEPEND(icp_ocf, cryptodev, MODULE_MIN_VER, MODULE_MIN_VER,
-		  CRYPTO_MAX_VER);
-ICP_MODULE_DEPEND(icp_ocf, icp_crypto, MODULE_MIN_VER, MODULE_MIN_VER,
-		  LAC_MAX_VER);
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_ocf.h b/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_ocf.h
deleted file mode 100644
index d9dde87402..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_ocf.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/***************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or 
- *   redistributing this file, you may do so under either license.
- * 
- *   GPL LICENSE SUMMARY
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- * 
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- * 
- *   This program is distributed in the hope that it will be useful, but 
- *   WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- *   General Public License for more details.
- * 
- *   You should have received a copy of the GNU General Public License 
- *   along with this program; if not, write to the Free Software 
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution 
- *   in the file called LICENSE.GPL.
- * 
- *   Contact Information:
- *   Intel Corporation
- * 
- *   BSD LICENSE 
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *  version: Security.L.1.0.2-229
- *
- ***************************************************************************/
-
-/*
- * OCF driver header file for the Intel ICP processor.
- */
-
-#ifndef ICP_OCF_H_
-#define ICP_OCF_H_
-
-#include <cpa.h>
-#include <cpa_cy_im.h>
-#include <cpa_cy_sym.h>
-#include <cpa_cy_rand.h>
-#include <cpa_cy_dh.h>
-#include <cpa_cy_rsa.h>
-#include <cpa_cy_ln.h>
-#include <cpa_cy_common.h>
-#include <cpa_cy_dsa.h>
-
-#include "icp_os.h"
-
-#define NUM_BITS_IN_BYTE (8)
-#define NUM_BITS_IN_BYTE_MINUS_ONE (NUM_BITS_IN_BYTE -1)
-#define INVALID_DRIVER_ID (-1)
-#define RETURN_RAND_NUM_GEN_FAILED (-1)
-
-/*This is the max block cipher initialisation vector*/
-#define MAX_IV_LEN_IN_BYTES (20)
-/*This is used to check whether the OCF to this driver session limit has
-  been disabled*/
-#define NO_OCF_TO_DRV_MAX_SESSIONS		(0)
-
-/*OCF values mapped here*/
-#define ICP_SHA1_DIGEST_SIZE_IN_BYTES 		(SHA1_HASH_LEN)
-#define ICP_SHA256_DIGEST_SIZE_IN_BYTES 	(SHA2_256_HASH_LEN)
-#define ICP_SHA384_DIGEST_SIZE_IN_BYTES 	(SHA2_384_HASH_LEN)
-#define ICP_SHA512_DIGEST_SIZE_IN_BYTES 	(SHA2_512_HASH_LEN)
-#define ICP_MD5_DIGEST_SIZE_IN_BYTES 		(MD5_HASH_LEN)
-#define ARC4_COUNTER_LEN 			(ARC4_BLOCK_LEN)
-
-#define OCF_REGISTRATION_STATUS_SUCCESS 	(0)
-#define OCF_ZERO_FUNCTIONALITY_REGISTERED 	(0)
-#define ICP_OCF_DRV_NO_CRYPTO_PROCESS_ERROR 	(0)
-#define ICP_OCF_DRV_STATUS_SUCCESS 		(0)
-#define ICP_OCF_DRV_STATUS_FAIL 		(1)
-
-/*Turn on/off debug options*/
-#define ICP_OCF_PRINT_DEBUG_MESSAGES		(0)
-#define ICP_OCF_PRINT_KERN_ALERT		(1)
-#define ICP_OCF_PRINT_KERN_ERRS			(1)
-
-#if ICP_OCF_PRINT_DEBUG_MESSAGES == 1
-#define DPRINTK(args...)      \
-{			      \
-                ICP_IPRINTK(args); \
-}
-
-#else				//ICP_OCF_PRINT_DEBUG_MESSAGES == 1
-
-#define DPRINTK(args...)
-
-#endif				//ICP_OCF_PRINT_DEBUG_MESSAGES == 1
-
-#if ICP_OCF_PRINT_KERN_ALERT == 1
-#define APRINTK(args...)      						\
-{			      						\
-       ICP_APRINTK(args);						\
-}
-
-#else				//ICP_OCF_PRINT_KERN_ALERT == 1
-
-#define APRINTK(args...)
-
-#endif				//ICP_OCF_PRINT_KERN_ALERT == 1
-
-#if ICP_OCF_PRINT_KERN_ERRS == 1
-#define EPRINTK(args...)      \
-{			      \
-       ICP_EPRINTK(args); \
-}
-
-#else				//ICP_OCF_PRINT_KERN_ERRS == 1
-
-#define EPRINTK(args...)
-
-#endif				//ICP_OCF_PRINT_KERN_ERRS == 1
-
-#define IPRINTK(args...)      \
-{			      \
-      ICP_IPRINTK(args); \
-}
-
-/*DSA Prime Q size in bytes (as defined in the standard) */
-#define DSA_RS_SIGN_PRIMEQ_SIZE_IN_BYTES	(20)
-
-#define BITS_TO_BYTES(bytes, bits) 					\
-	bytes = (bits + NUM_BITS_IN_BYTE_MINUS_ONE) / NUM_BITS_IN_BYTE
-
-typedef enum {
-	ICP_OCF_DRV_ALG_CIPHER = 0,
-	ICP_OCF_DRV_ALG_HASH
-} icp_ocf_drv_alg_type_t;
-
-typedef ICP_LIST_HEAD(icp_drvSessionListHead_s,
-		      icp_drvSessionData) icp_drvSessionListHead_t;
-
-/*Values used to derisk chances of performs being called against
-deregistered sessions (for which the slab page has been reclaimed)
-This is not a fix - since page frames are reclaimed from a slab, one cannot
-rely on that memory not being re-used by another app.*/
-typedef enum {
-	ICP_SESSION_INITIALISED = 0x5C5C5C,
-	ICP_SESSION_RUNNING = 0x005C00,
-	ICP_SESSION_DEREGISTERED = 0xC5C5C5
-} usage_derisk;
-
-/* This struct is required for deferred session
- deregistration as a work queue function can
- only have one argument*/
-struct icp_ocfDrvFreeLacSession {
-	CpaCySymSessionCtx sessionToDeregister;
-	icp_workstruct work;
-};
-
-/*
-This is the OCF<->OCF_DRV session object:
-
-1.listNode
-  The first member is a listNode. These session objects are added to a linked
-  list in order to make it easier to remove them all at session exit time.
-
-2.inUse
-  The second member is used to give the session object state and derisk the
-  possibility of OCF batch calls executing against a deregistered session (as
-  described above).
-
-3.sessHandle
-  The third member is a LAC<->OCF_DRV session handle (initialised with the first
-  perform request for that session).
-
-4.lacSessCtx
-  The fourth is the LAC session context. All the parameters for this structure
-  are only known when the first perform request for this session occurs. That is
-  why the OCF EP80579 Driver only registers a new LAC session at perform time
-*/
-struct icp_drvSessionData {
-	ICP_LIST_ENTRY(icp_drvSessionData) listNode;
-	usage_derisk inUse;
-	CpaCySymSessionCtx sessHandle;
-	CpaCySymSessionSetupData lacSessCtx;
-};
-
-/* These are all defined in icp_common.c */
-extern icp_atomic_t lac_session_failed_dereg_count;
-extern icp_atomic_t icp_ocfDrvIsExiting;
-extern icp_atomic_t num_ocf_to_drv_registered_sessions;
-
-extern int32_t icp_ocfDrvDriverId;
-
-extern icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead;
-extern icp_drvSessionListHead_t icp_ocfDrvGlobalSymListHead_FreeMemList;
-extern icp_workqueue *icp_ocfDrvFreeLacSessionWorkQ;
-extern icp_spinlock_t icp_ocfDrvSymSessInfoListSpinlock;
-
-/*Slab zones for symettric functionality, instantiated in icp_common.c*/
-extern icp_kmem_cache drvSessionData_zone;
-extern icp_kmem_cache drvOpData_zone;
-
-/*Slabs zones for asymettric functionality, instantiated in icp_common.c*/
-extern icp_kmem_cache drvDH_zone;
-extern icp_kmem_cache drvLnModExp_zone;
-extern icp_kmem_cache drvRSADecrypt_zone;
-extern icp_kmem_cache drvRSAPrivateKey_zone;
-extern icp_kmem_cache drvDSARSSign_zone;
-extern icp_kmem_cache drvDSARSSignKValue_zone;
-extern icp_kmem_cache drvDSAVerify_zone;
-
-/* Module parameters defined in icp_cpmmon.c*/
-
-/* Module parameters - gives the number of times LAC deregistration shall be
-   re-tried */
-extern int num_dereg_retries;
-
-/* Module parameter - gives the delay time in jiffies before a LAC session 
-   shall be attempted to be deregistered again */
-extern int dereg_retry_delay_in_jiffies;
-
-/* Module parameter - gives the maximum number of sessions possible between
-   OCF and the OCF EP80579 Driver. If set to zero, there is no limit.*/
-extern int max_sessions;
-
-/*Slab zones for flatbuffers and bufferlist*/
-extern icp_kmem_cache drvFlatBuffer_zone;
-
-#define ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS     (16)
-
-struct icp_drvBuffListInfo {
-	Cpa16U numBuffers;
-	Cpa32U metaSize;
-	Cpa32U metaOffset;
-	Cpa32U buffListSize;
-};
-
-extern struct icp_drvBuffListInfo defBuffListInfo;
-
-/* This struct is used to keep a reference to the relevant node in the list
-   of sessionData structs, to the buffer type required by OCF and to the OCF
-   provided crp struct that needs to be returned. All this info is needed in
-   the callback function.*/
-struct icp_drvOpData {
-	CpaCySymOpData lacOpData;
-	uint32_t digestSizeInBytes;
-	struct cryptop *crp;
-	uint8_t bufferType;
-	uint8_t ivData[MAX_IV_LEN_IN_BYTES];
-	uint16_t numBufferListArray;
-	CpaBufferList srcBuffer;
-	CpaFlatBuffer bufferListArray[ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS];
-	CpaBoolean verifyResult;
-};
-
-/* Create a new session between OCF and this driver*/
-int icp_ocfDrvNewSession(icp_device_t dev, uint32_t * sild,
-			 struct cryptoini *cri);
-
-/* Free a session between this driver and the Quick Assist Framework*/
-int icp_ocfDrvFreeLACSession(icp_device_t dev, uint64_t sid);
-
-/* Defer freeing a Quick Assist session*/
-void icp_ocfDrvDeferedFreeLacSessionProcess(void *arg);
-
-/* Process OCF cryptographic request for a symmetric algorithm*/
-int icp_ocfDrvSymProcess(icp_device_t dev, struct cryptop *crp, int hint);
-
-/* Process OCF cryptographic request for an asymmetric algorithm*/
-int icp_ocfDrvPkeProcess(icp_device_t dev, struct cryptkop *krp, int hint);
-
-/* Populate a buffer with random data*/
-int icp_ocfDrvReadRandom(void *arg, uint32_t * buf, int maxwords);
-
-/* Retry Quick Assist session deregistration*/
-int icp_ocfDrvDeregRetry(CpaCySymSessionCtx sessionToDeregister);
-
-/* Convert an OS scatter gather list to a CPA buffer list*/
-int icp_ocfDrvPacketBuffToBufferList(icp_packet_buffer_t * pPacketBuffer,
-				     CpaBufferList * bufferList);
-
-/* Convert a CPA buffer list to an OS scatter gather list*/
-int icp_ocfDrvBufferListToPacketBuff(CpaBufferList * bufferList,
-				     icp_packet_buffer_t ** pPacketBuffer);
-
-/* Get the number of buffers in an OS scatter gather list*/
-uint16_t icp_ocfDrvGetPacketBuffFrags(icp_packet_buffer_t * pPacketBuffer);
-
-/* Convert a single OS buffer to a CPA Flat Buffer*/
-void icp_ocfDrvSinglePacketBuffToFlatBuffer(icp_packet_buffer_t * pPacketBuffer,
-					    CpaFlatBuffer * pFlatBuffer);
-
-/* Add pointer and length to a CPA Flat Buffer structure*/
-void icp_ocfDrvPtrAndLenToFlatBuffer(void *pData, uint32_t len,
-				     CpaFlatBuffer * pFlatBuffer);
-
-/* Convert pointer and length values to a CPA buffer list*/
-void icp_ocfDrvPtrAndLenToBufferList(void *pDataIn, uint32_t length,
-				     CpaBufferList * pBufferList);
-
-/* Convert a CPA buffer list to pointer and length values*/
-void icp_ocfDrvBufferListToPtrAndLen(CpaBufferList * pBufferList,
-				     void **ppDataOut, uint32_t * pLength);
-
-/* Set the number of flat buffers in bufferlist and the size of memory
-   to allocate for the pPrivateMetaData member of the CpaBufferList.*/
-int icp_ocfDrvBufferListMemInfo(uint16_t numBuffers,
-				struct icp_drvBuffListInfo *buffListInfo);
-
-/* Find pointer position of the digest within an OS scatter gather list*/
-uint8_t *icp_ocfDrvPacketBufferDigestPointerFind(struct icp_drvOpData
-						 *drvOpData,
-						 int offsetInBytes,
-						 uint32_t digestSizeInBytes);
-
-/*This top level function is used to find a pointer to where a digest is 
-  stored/needs to be inserted. */
-uint8_t *icp_ocfDrvDigestPointerFind(struct icp_drvOpData *drvOpData,
-				     struct cryptodesc *crp_desc);
-
-/* Free a CPA flat buffer*/
-void icp_ocfDrvFreeFlatBuffer(CpaFlatBuffer * pFlatBuffer);
-
-/* This function will allocate memory for the pPrivateMetaData
-   member of CpaBufferList. */
-int icp_ocfDrvAllocMetaData(CpaBufferList * pBufferList,
-			    struct icp_drvOpData *pOpData);
-
-/* Free data allocated for the pPrivateMetaData
-   member of CpaBufferList.*/
-void icp_ocfDrvFreeMetaData(CpaBufferList * pBufferList);
-
-#define ICP_CACHE_CREATE(cache_ID, cache_name) \
-	icp_kmem_cache_create(cache_ID, sizeof(cache_name),ICP_KERNEL_CACHE_ALIGN,\
-	ICP_KERNEL_CACHE_NOINIT)
-
-#define ICP_CACHE_FREE(args...) \
-	icp_kmem_cache_free (args)
-
-#define ICP_CACHE_DESTROY(slab_zone)\
-{\
-        if(NULL != slab_zone){\
-                icp_kmem_cache_destroy(slab_zone);\
-                slab_zone = NULL;\
-        }\
-}
-
-#endif
-/* ICP_OCF_H_ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_sym.c b/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_sym.c
deleted file mode 100644
index e1c71484a6..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ep80579/icp_sym.c
+++ /dev/null
@@ -1,1153 +0,0 @@
-/***************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or 
- *   redistributing this file, you may do so under either license.
- * 
- *   GPL LICENSE SUMMARY
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- * 
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- * 
- *   This program is distributed in the hope that it will be useful, but 
- *   WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- *   General Public License for more details.
- * 
- *   You should have received a copy of the GNU General Public License 
- *   along with this program; if not, write to the Free Software 
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution 
- *   in the file called LICENSE.GPL.
- * 
- *   Contact Information:
- *   Intel Corporation
- * 
- *   BSD LICENSE 
- * 
- *   Copyright(c) 2007,2008,2009 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *  version: Security.L.1.0.2-229
- *
- ***************************************************************************/
-/*
- * An OCF module that uses the API for Intel® QuickAssist Technology to do the
- * cryptography.
- *
- * This driver requires the ICP Access Library that is available from Intel in
- * order to operate.
- */
-
-#include "icp_ocf.h"
-
-/*This is the call back function for all symmetric cryptographic processes.
-  Its main functionality is to free driver crypto operation structure and to 
-  call back to OCF*/
-static void
-icp_ocfDrvSymCallBack(void *callbackTag,
-		      CpaStatus status,
-		      const CpaCySymOp operationType,
-		      void *pOpData,
-		      CpaBufferList * pDstBuffer, CpaBoolean verifyResult);
-
-/*This function is used to extract crypto processing information from the OCF
-  inputs, so as that it may be passed onto LAC*/
-static int
-icp_ocfDrvProcessDataSetup(struct icp_drvOpData *drvOpData,
-			   struct cryptodesc *crp_desc);
-
-/*This function checks whether the crp_desc argument pertains to a digest or a
-  cipher operation*/
-static int icp_ocfDrvAlgCheck(struct cryptodesc *crp_desc);
-
-/*This function copies all the passed in session context information and stores
-  it in a LAC context structure*/
-static int
-icp_ocfDrvAlgorithmSetup(struct cryptoini *cri,
-			 CpaCySymSessionSetupData * lacSessCtx);
-
-/*This function is used to free an OCF->OCF_DRV session object*/
-static void icp_ocfDrvFreeOCFSession(struct icp_drvSessionData *sessionData);
-
-/*max IOV buffs supported in a UIO structure*/
-#define NUM_IOV_SUPPORTED		(1)
-
-/* Name        : icp_ocfDrvSymCallBack
- *
- * Description : When this function returns it signifies that the LAC
- * component has completed the relevant symmetric operation. 
- *
- * Notes : The callbackTag is a pointer to an icp_drvOpData. This memory
- * object was passed to LAC for the cryptographic processing and contains all
- * the relevant information for cleaning up buffer handles etc. so that the
- * OCF EP80579 Driver portion of this crypto operation can be fully completed.
- */
-static void
-icp_ocfDrvSymCallBack(void *callbackTag,
-		      CpaStatus status,
-		      const CpaCySymOp operationType,
-		      void *pOpData,
-		      CpaBufferList * pDstBuffer, CpaBoolean verifyResult)
-{
-	struct cryptop *crp = NULL;
-	struct icp_drvOpData *temp_drvOpData =
-	    (struct icp_drvOpData *)callbackTag;
-	uint64_t *tempBasePtr = NULL;
-	uint32_t tempLen = 0;
-
-	if (NULL == temp_drvOpData) {
-		DPRINTK("%s(): The callback from the LAC component"
-			" has failed due to Null userOpaque data"
-			"(status == %d).\n", __FUNCTION__, status);
-		DPRINTK("%s(): Unable to call OCF back! \n", __FUNCTION__);
-		return;
-	}
-
-	crp = temp_drvOpData->crp;
-	crp->crp_etype = ICP_OCF_DRV_NO_CRYPTO_PROCESS_ERROR;
-
-	if (NULL == pOpData) {
-		DPRINTK("%s(): The callback from the LAC component"
-			" has failed due to Null Symmetric Op data"
-			"(status == %d).\n", __FUNCTION__, status);
-		crp->crp_etype = ECANCELED;
-		crypto_done(crp);
-		return;
-	}
-
-	if (NULL == pDstBuffer) {
-		DPRINTK("%s(): The callback from the LAC component"
-			" has failed due to Null Dst Bufferlist data"
-			"(status == %d).\n", __FUNCTION__, status);
-		crp->crp_etype = ECANCELED;
-		crypto_done(crp);
-		return;
-	}
-
-	if (CPA_STATUS_SUCCESS == status) {
-
-		if (temp_drvOpData->bufferType == ICP_CRYPTO_F_PACKET_BUF) {
-			if (ICP_OCF_DRV_STATUS_SUCCESS !=
-			    icp_ocfDrvBufferListToPacketBuff(pDstBuffer,
-							     (icp_packet_buffer_t
-							      **)
-							     & (crp->crp_buf))) {
-				EPRINTK("%s(): BufferList to SkBuff "
-					"conversion error.\n", __FUNCTION__);
-				crp->crp_etype = EPERM;
-			}
-		} else {
-			icp_ocfDrvBufferListToPtrAndLen(pDstBuffer,
-							(void **)&tempBasePtr,
-							&tempLen);
-			crp->crp_olen = (int)tempLen;
-		}
-
-	} else {
-		DPRINTK("%s(): The callback from the LAC component has failed"
-			"(status == %d).\n", __FUNCTION__, status);
-
-		crp->crp_etype = ECANCELED;
-	}
-
-	if (temp_drvOpData->numBufferListArray >
-	    ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
-		icp_kfree(pDstBuffer->pBuffers);
-	}
-	icp_ocfDrvFreeMetaData(pDstBuffer);
-	ICP_CACHE_FREE(drvOpData_zone, temp_drvOpData);
-
-	/* Invoke the OCF callback function */
-	crypto_done(crp);
-
-	return;
-}
-
-/* Name        : icp_ocfDrvNewSession 
- *
- * Description : This function will create a new Driver<->OCF session
- *
- * Notes : LAC session registration happens during the first perform call.
- * That is the first time we know all information about a given session.
- */
-int icp_ocfDrvNewSession(icp_device_t dev, uint32_t * sid,
-			 struct cryptoini *cri)
-{
-	struct icp_drvSessionData *sessionData = NULL;
-	uint32_t delete_session = 0;
-
-	/* The SID passed in should be our driver ID. We can return the     */
-	/* local ID (LID) which is a unique identifier which we can use     */
-	/* to differentiate between the encrypt/decrypt LAC session handles */
-	if (NULL == sid) {
-		EPRINTK("%s(): Invalid input parameters - NULL sid.\n",
-			__FUNCTION__);
-		return EINVAL;
-	}
-
-	if (NULL == cri) {
-		EPRINTK("%s(): Invalid input parameters - NULL cryptoini.\n",
-			__FUNCTION__);
-		return EINVAL;
-	}
-
-	if (icp_ocfDrvDriverId != *sid) {
-		EPRINTK("%s(): Invalid input parameters - bad driver ID\n",
-			__FUNCTION__);
-		EPRINTK("\t sid = 0x08%p \n \t cri = 0x08%p \n", sid, cri);
-		return EINVAL;
-	}
-
-	sessionData = icp_kmem_cache_zalloc(drvSessionData_zone, ICP_M_NOWAIT);
-	if (NULL == sessionData) {
-		DPRINTK("%s():No memory for Session Data\n", __FUNCTION__);
-		return ENOMEM;
-	}
-
-	/*ENTER CRITICAL SECTION */
-	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
-	/*put this check in the spinlock so no new sessions can be added to the
-	   linked list when we are exiting */
-	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
-		delete_session++;
-
-	} else if (NO_OCF_TO_DRV_MAX_SESSIONS != max_sessions) {
-		if (icp_atomic_read(&num_ocf_to_drv_registered_sessions) >=
-		    (max_sessions -
-		     icp_atomic_read(&lac_session_failed_dereg_count))) {
-			delete_session++;
-		} else {
-			icp_atomic_inc(&num_ocf_to_drv_registered_sessions);
-			/* Add to session data linked list */
-			ICP_LIST_ADD(sessionData, &icp_ocfDrvGlobalSymListHead,
-				     listNode);
-		}
-
-	} else if (NO_OCF_TO_DRV_MAX_SESSIONS == max_sessions) {
-		ICP_LIST_ADD(sessionData, &icp_ocfDrvGlobalSymListHead,
-			     listNode);
-	}
-
-	sessionData->inUse = ICP_SESSION_INITIALISED;
-
-	/*EXIT CRITICAL SECTION */
-	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	if (delete_session) {
-		DPRINTK("%s():No Session handles available\n", __FUNCTION__);
-		ICP_CACHE_FREE(drvSessionData_zone, sessionData);
-		return EPERM;
-	}
-
-	if (ICP_OCF_DRV_STATUS_SUCCESS !=
-	    icp_ocfDrvAlgorithmSetup(cri, &(sessionData->lacSessCtx))) {
-		DPRINTK("%s():algorithm not supported\n", __FUNCTION__);
-		icp_ocfDrvFreeOCFSession(sessionData);
-		return EINVAL;
-	}
-
-	if (cri->cri_next) {
-		if (cri->cri_next->cri_next != NULL) {
-			DPRINTK("%s():only two chained algorithms supported\n",
-				__FUNCTION__);
-			icp_ocfDrvFreeOCFSession(sessionData);
-			return EPERM;
-		}
-
-		if (ICP_OCF_DRV_STATUS_SUCCESS !=
-		    icp_ocfDrvAlgorithmSetup(cri->cri_next,
-					     &(sessionData->lacSessCtx))) {
-			DPRINTK("%s():second algorithm not supported\n",
-				__FUNCTION__);
-			icp_ocfDrvFreeOCFSession(sessionData);
-			return EINVAL;
-		}
-
-		sessionData->lacSessCtx.symOperation =
-		    CPA_CY_SYM_OP_ALGORITHM_CHAINING;
-	}
-
-	*sid = (uint32_t) sessionData;
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvAlgorithmSetup
- *
- * Description : This function builds the session context data from the
- * information supplied through OCF. Algorithm chain order and whether the
- * session is Encrypt/Decrypt can only be found out at perform time however, so
- * the session is registered with LAC at that time.
- */
-static int
-icp_ocfDrvAlgorithmSetup(struct cryptoini *cri,
-			 CpaCySymSessionSetupData * lacSessCtx)
-{
-
-	lacSessCtx->sessionPriority = CPA_CY_PRIORITY_NORMAL;
-
-	switch (cri->cri_alg) {
-
-	case CRYPTO_NULL_CBC:
-		DPRINTK("%s(): NULL CBC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
-		lacSessCtx->cipherSetupData.cipherAlgorithm =
-		    CPA_CY_SYM_CIPHER_NULL;
-		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
-		break;
-
-	case CRYPTO_DES_CBC:
-		DPRINTK("%s(): DES CBC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
-		lacSessCtx->cipherSetupData.cipherAlgorithm =
-		    CPA_CY_SYM_CIPHER_DES_CBC;
-		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
-		break;
-
-	case CRYPTO_3DES_CBC:
-		DPRINTK("%s(): 3DES CBC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
-		lacSessCtx->cipherSetupData.cipherAlgorithm =
-		    CPA_CY_SYM_CIPHER_3DES_CBC;
-		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
-		break;
-
-	case CRYPTO_AES_CBC:
-		DPRINTK("%s(): AES CBC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
-		lacSessCtx->cipherSetupData.cipherAlgorithm =
-		    CPA_CY_SYM_CIPHER_AES_CBC;
-		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
-		break;
-
-	case CRYPTO_ARC4:
-		DPRINTK("%s(): ARC4\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_CIPHER;
-		lacSessCtx->cipherSetupData.cipherAlgorithm =
-		    CPA_CY_SYM_CIPHER_ARC4;
-		lacSessCtx->cipherSetupData.cipherKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->cipherSetupData.pCipherKey = cri->cri_key;
-		break;
-
-	case CRYPTO_SHA1:
-		DPRINTK("%s(): SHA1\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_SHA1;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA1_DIGEST_SIZE_IN_BYTES);
-
-		break;
-
-	case CRYPTO_SHA1_HMAC:
-		DPRINTK("%s(): SHA1_HMAC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_SHA1;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA1_DIGEST_SIZE_IN_BYTES);
-		lacSessCtx->hashSetupData.authModeSetupData.authKey =
-		    cri->cri_key;
-		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
-
-		break;
-
-	case CRYPTO_SHA2_256:
-		DPRINTK("%s(): SHA256\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA256;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA256_DIGEST_SIZE_IN_BYTES);
-
-		break;
-
-	case CRYPTO_SHA2_256_HMAC:
-		DPRINTK("%s(): SHA256_HMAC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA256;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA256_DIGEST_SIZE_IN_BYTES);
-		lacSessCtx->hashSetupData.authModeSetupData.authKey =
-		    cri->cri_key;
-		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
-
-		break;
-
-	case CRYPTO_SHA2_384:
-		DPRINTK("%s(): SHA384\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA384;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA384_DIGEST_SIZE_IN_BYTES);
-
-		break;
-
-	case CRYPTO_SHA2_384_HMAC:
-		DPRINTK("%s(): SHA384_HMAC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA384;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA384_DIGEST_SIZE_IN_BYTES);
-		lacSessCtx->hashSetupData.authModeSetupData.authKey =
-		    cri->cri_key;
-		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
-
-		break;
-
-	case CRYPTO_SHA2_512:
-		DPRINTK("%s(): SHA512\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA512;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA512_DIGEST_SIZE_IN_BYTES);
-
-		break;
-
-	case CRYPTO_SHA2_512_HMAC:
-		DPRINTK("%s(): SHA512_HMAC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm =
-		    CPA_CY_SYM_HASH_SHA512;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_SHA512_DIGEST_SIZE_IN_BYTES);
-		lacSessCtx->hashSetupData.authModeSetupData.authKey =
-		    cri->cri_key;
-		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
-
-		break;
-
-	case CRYPTO_MD5:
-		DPRINTK("%s(): MD5\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_MD5;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_PLAIN;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_MD5_DIGEST_SIZE_IN_BYTES);
-
-		break;
-
-	case CRYPTO_MD5_HMAC:
-		DPRINTK("%s(): MD5_HMAC\n", __FUNCTION__);
-		lacSessCtx->symOperation = CPA_CY_SYM_OP_HASH;
-		lacSessCtx->hashSetupData.hashAlgorithm = CPA_CY_SYM_HASH_MD5;
-		lacSessCtx->hashSetupData.hashMode = CPA_CY_SYM_HASH_MODE_AUTH;
-		lacSessCtx->hashSetupData.digestResultLenInBytes =
-		    (cri->cri_mlen ?
-		     cri->cri_mlen : ICP_MD5_DIGEST_SIZE_IN_BYTES);
-		lacSessCtx->hashSetupData.authModeSetupData.authKey =
-		    cri->cri_key;
-		lacSessCtx->hashSetupData.authModeSetupData.authKeyLenInBytes =
-		    cri->cri_klen / NUM_BITS_IN_BYTE;
-		lacSessCtx->hashSetupData.authModeSetupData.aadLenInBytes = 0;
-
-		break;
-
-	default:
-		DPRINTK("%s(): ALG Setup FAIL\n", __FUNCTION__);
-		return ICP_OCF_DRV_STATUS_FAIL;
-	}
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvFreeOCFSession
- *
- * Description : This function deletes all existing Session data representing
- * the Cryptographic session established between OCF and this driver. This
- * also includes freeing the memory allocated for the session context. The
- * session object is also removed from the session linked list.
- */
-static void icp_ocfDrvFreeOCFSession(struct icp_drvSessionData *sessionData)
-{
-
-	sessionData->inUse = ICP_SESSION_DEREGISTERED;
-
-	/*ENTER CRITICAL SECTION */
-	icp_spin_lockbh_lock(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
-		/*If the Driver is exiting, allow that process to
-		   handle any deletions */
-		/*EXIT CRITICAL SECTION */
-		icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
-		return;
-	}
-
-	icp_atomic_dec(&num_ocf_to_drv_registered_sessions);
-
-	ICP_LIST_DEL(sessionData, listNode);
-
-	/*EXIT CRITICAL SECTION */
-	icp_spin_lockbh_unlock(&icp_ocfDrvSymSessInfoListSpinlock);
-
-	if (NULL != sessionData->sessHandle) {
-		icp_kfree(sessionData->sessHandle);
-	}
-	ICP_CACHE_FREE(drvSessionData_zone, sessionData);
-}
-
-/* Name        : icp_ocfDrvFreeLACSession
- *
- * Description : This attempts to deregister a LAC session. If it fails, the
- * deregistation retry function is called.
- */
-int icp_ocfDrvFreeLACSession(icp_device_t dev, uint64_t sid)
-{
-	CpaCySymSessionCtx sessionToDeregister = NULL;
-	struct icp_drvSessionData *sessionData = NULL;
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	int retval = 0;
-
-	sessionData = (struct icp_drvSessionData *)CRYPTO_SESID2LID(sid);
-	if (NULL == sessionData) {
-		EPRINTK("%s(): OCF Free session called with Null Session ID.\n",
-			__FUNCTION__);
-		return EINVAL;
-	}
-
-	sessionToDeregister = sessionData->sessHandle;
-
-	if ((ICP_SESSION_INITIALISED != sessionData->inUse) &&
-	    (ICP_SESSION_RUNNING != sessionData->inUse) &&
-	    (ICP_SESSION_DEREGISTERED != sessionData->inUse)) {
-		DPRINTK("%s() Session not initialised.\n", __FUNCTION__);
-		return EINVAL;
-	}
-
-	if (ICP_SESSION_RUNNING == sessionData->inUse) {
-		lacStatus = cpaCySymRemoveSession(CPA_INSTANCE_HANDLE_SINGLE,
-						  sessionToDeregister);
-		if (CPA_STATUS_RETRY == lacStatus) {
-			if (ICP_OCF_DRV_STATUS_SUCCESS !=
-			    icp_ocfDrvDeregRetry(&sessionToDeregister)) {
-				/* the retry function increments the 
-				   dereg failed count */
-				DPRINTK("%s(): LAC failed to deregister the "
-					"session. (localSessionId= %p)\n",
-					__FUNCTION__, sessionToDeregister);
-				retval = EPERM;
-			}
-
-		} else if (CPA_STATUS_SUCCESS != lacStatus) {
-			DPRINTK("%s(): LAC failed to deregister the session. "
-				"localSessionId= %p, lacStatus = %d\n",
-				__FUNCTION__, sessionToDeregister, lacStatus);
-			icp_atomic_inc(&lac_session_failed_dereg_count);
-			retval = EPERM;
-		}
-	} else {
-		DPRINTK("%s() Session not registered with LAC.\n",
-			__FUNCTION__);
-	}
-
-	icp_ocfDrvFreeOCFSession(sessionData);
-	return retval;
-
-}
-
-/* Name        : icp_ocfDrvAlgCheck 
- *
- * Description : This function checks whether the cryptodesc argument pertains
- * to a sym or hash function
- */
-static int icp_ocfDrvAlgCheck(struct cryptodesc *crp_desc)
-{
-
-	if (crp_desc->crd_alg == CRYPTO_3DES_CBC ||
-	    crp_desc->crd_alg == CRYPTO_AES_CBC ||
-	    crp_desc->crd_alg == CRYPTO_DES_CBC ||
-	    crp_desc->crd_alg == CRYPTO_NULL_CBC ||
-	    crp_desc->crd_alg == CRYPTO_ARC4) {
-		return ICP_OCF_DRV_ALG_CIPHER;
-	}
-
-	return ICP_OCF_DRV_ALG_HASH;
-}
-
-/* Name        : icp_ocfDrvSymProcess 
- *
- * Description : This function will map symmetric functionality calls from OCF
- * to the LAC API. It will also allocate memory to store the session context.
- * 
- * Notes: If it is the first perform call for a given session, then a LAC
- * session is registered. After the session is registered, no checks as
- * to whether session paramaters have changed (e.g. alg chain order) are
- * done.
- */
-int icp_ocfDrvSymProcess(icp_device_t dev, struct cryptop *crp, int hint)
-{
-	struct icp_drvSessionData *sessionData = NULL;
-	struct icp_drvOpData *drvOpData = NULL;
-	CpaStatus lacStatus = CPA_STATUS_SUCCESS;
-	Cpa32U sessionCtxSizeInBytes = 0;
-
-	if (NULL == crp) {
-		DPRINTK("%s(): Invalid input parameters, cryptop is NULL\n",
-			__FUNCTION__);
-		return EINVAL;
-	}
-
-	if (NULL == crp->crp_desc) {
-		DPRINTK("%s(): Invalid input parameters, no crp_desc attached "
-			"to crp\n", __FUNCTION__);
-		crp->crp_etype = EINVAL;
-		return EINVAL;
-	}
-
-	if (NULL == crp->crp_buf) {
-		DPRINTK("%s(): Invalid input parameters, no buffer attached "
-			"to crp\n", __FUNCTION__);
-		crp->crp_etype = EINVAL;
-		return EINVAL;
-	}
-
-	if (CPA_TRUE == icp_atomic_read(&icp_ocfDrvIsExiting)) {
-		crp->crp_etype = EFAULT;
-		return EFAULT;
-	}
-
-	sessionData = (struct icp_drvSessionData *)
-	    (CRYPTO_SESID2LID(crp->crp_sid));
-	if (NULL == sessionData) {
-		DPRINTK("%s(): Invalid input parameters, Null Session ID \n",
-			__FUNCTION__);
-		crp->crp_etype = EINVAL;
-		return EINVAL;
-	}
-
-/*If we get a request against a deregisted session, cancel operation*/
-	if (ICP_SESSION_DEREGISTERED == sessionData->inUse) {
-		DPRINTK("%s(): Session ID %d was deregistered \n",
-			__FUNCTION__, (int)(CRYPTO_SESID2LID(crp->crp_sid)));
-		crp->crp_etype = EFAULT;
-		return EFAULT;
-	}
-
-/*If none of the session states are set, then the session structure was either
-  not initialised properly or we are reading from a freed memory area (possible
-  due to OCF batch mode not removing queued requests against deregistered 
-  sessions*/
-	if (ICP_SESSION_INITIALISED != sessionData->inUse &&
-	    ICP_SESSION_RUNNING != sessionData->inUse) {
-		DPRINTK("%s(): Session - ID %d - not properly initialised or "
-			"memory freed back to the kernel \n",
-			__FUNCTION__, (int)(CRYPTO_SESID2LID(crp->crp_sid)));
-		crp->crp_etype = EINVAL;
-		return EINVAL;
-	}
-
-	/*For the below checks, remember error checking is already done in LAC.
-	   We're not validating inputs subsequent to registration */
-	if (sessionData->inUse == ICP_SESSION_INITIALISED) {
-		DPRINTK("%s(): Initialising session\n", __FUNCTION__);
-
-		if (NULL != crp->crp_desc->crd_next) {
-			if (ICP_OCF_DRV_ALG_CIPHER ==
-			    icp_ocfDrvAlgCheck(crp->crp_desc)) {
-
-				sessionData->lacSessCtx.algChainOrder =
-				    CPA_CY_SYM_ALG_CHAIN_ORDER_CIPHER_THEN_HASH;
-
-				if (crp->crp_desc->crd_flags & CRD_F_ENCRYPT) {
-					sessionData->lacSessCtx.cipherSetupData.
-					    cipherDirection =
-					    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
-				} else {
-					sessionData->lacSessCtx.cipherSetupData.
-					    cipherDirection =
-					    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
-				}
-			} else {
-				sessionData->lacSessCtx.algChainOrder =
-				    CPA_CY_SYM_ALG_CHAIN_ORDER_HASH_THEN_CIPHER;
-
-				if (crp->crp_desc->crd_next->crd_flags &
-				    CRD_F_ENCRYPT) {
-					sessionData->lacSessCtx.cipherSetupData.
-					    cipherDirection =
-					    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
-				} else {
-					sessionData->lacSessCtx.cipherSetupData.
-					    cipherDirection =
-					    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
-				}
-
-			}
-
-		} else if (ICP_OCF_DRV_ALG_CIPHER ==
-			   icp_ocfDrvAlgCheck(crp->crp_desc)) {
-			if (crp->crp_desc->crd_flags & CRD_F_ENCRYPT) {
-				sessionData->lacSessCtx.cipherSetupData.
-				    cipherDirection =
-				    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
-			} else {
-				sessionData->lacSessCtx.cipherSetupData.
-				    cipherDirection =
-				    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
-			}
-
-		}
-
-		/*No action required for standalone Auth here */
-
-		/* Allocate memory for SymSessionCtx before the Session Registration */
-		lacStatus =
-		    cpaCySymSessionCtxGetSize(CPA_INSTANCE_HANDLE_SINGLE,
-					      &(sessionData->lacSessCtx),
-					      &sessionCtxSizeInBytes);
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): cpaCySymSessionCtxGetSize failed - %d\n",
-				__FUNCTION__, lacStatus);
-			crp->crp_etype = EINVAL;
-			return EINVAL;
-		}
-		sessionData->sessHandle =
-		    icp_kmalloc(sessionCtxSizeInBytes, ICP_M_NOWAIT);
-		if (NULL == sessionData->sessHandle) {
-			EPRINTK
-			    ("%s(): Failed to get memory for SymSessionCtx\n",
-			     __FUNCTION__);
-			crp->crp_etype = ENOMEM;
-			return ENOMEM;
-		}
-
-		lacStatus = cpaCySymInitSession(CPA_INSTANCE_HANDLE_SINGLE,
-						icp_ocfDrvSymCallBack,
-						&(sessionData->lacSessCtx),
-						sessionData->sessHandle);
-
-		if (CPA_STATUS_SUCCESS != lacStatus) {
-			EPRINTK("%s(): cpaCySymInitSession failed -%d \n",
-				__FUNCTION__, lacStatus);
-			crp->crp_etype = EFAULT;
-			return EFAULT;
-		}
-
-		sessionData->inUse = ICP_SESSION_RUNNING;
-	}
-
-	drvOpData = icp_kmem_cache_zalloc(drvOpData_zone, ICP_M_NOWAIT);
-	if (NULL == drvOpData) {
-		EPRINTK("%s():Failed to get memory for drvOpData\n",
-			__FUNCTION__);
-		crp->crp_etype = ENOMEM;
-		return ENOMEM;
-	}
-
-	drvOpData->lacOpData.pSessionCtx = sessionData->sessHandle;
-	drvOpData->digestSizeInBytes = sessionData->lacSessCtx.hashSetupData.
-	    digestResultLenInBytes;
-	drvOpData->crp = crp;
-
-	/* Set the default buffer list array memory allocation */
-	drvOpData->srcBuffer.pBuffers = drvOpData->bufferListArray;
-	drvOpData->numBufferListArray = ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS;
-
-	if (ICP_OCF_DRV_STATUS_SUCCESS !=
-	    icp_ocfDrvProcessDataSetup(drvOpData, drvOpData->crp->crp_desc)) {
-		crp->crp_etype = EINVAL;
-		goto err;
-	}
-
-	if (drvOpData->crp->crp_desc->crd_next != NULL) {
-		if (icp_ocfDrvProcessDataSetup(drvOpData, drvOpData->crp->
-					       crp_desc->crd_next)) {
-			crp->crp_etype = EINVAL;
-			goto err;
-		}
-
-	}
-
-	/* 
-	 * Allocate buffer list array memory if the data fragment is more than
-	 * the default number (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) and not 
-	 * calculated already
-	 */
-	if (crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
-		if (NULL == drvOpData->lacOpData.pDigestResult) {
-			drvOpData->numBufferListArray =
-			    icp_ocfDrvGetPacketBuffFrags((icp_packet_buffer_t *)
-							 crp->crp_buf);
-		}
-
-		if (ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS <
-		    drvOpData->numBufferListArray) {
-			DPRINTK("%s() numBufferListArray more than default\n",
-				__FUNCTION__);
-			drvOpData->srcBuffer.pBuffers = NULL;
-			drvOpData->srcBuffer.pBuffers =
-			    icp_kmalloc(drvOpData->numBufferListArray *
-					sizeof(CpaFlatBuffer), ICP_M_NOWAIT);
-			if (NULL == drvOpData->srcBuffer.pBuffers) {
-				EPRINTK("%s() Failed to get memory for "
-					"pBuffers\n", __FUNCTION__);
-				ICP_CACHE_FREE(drvOpData_zone, drvOpData);
-				crp->crp_etype = ENOMEM;
-				return ENOMEM;
-			}
-		}
-	}
-
-	/*
-	 * Check the type of buffer structure we got and convert it into
-	 * CpaBufferList format.
-	 */
-	if (crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
-		if (ICP_OCF_DRV_STATUS_SUCCESS !=
-		    icp_ocfDrvPacketBuffToBufferList((icp_packet_buffer_t *)
-						     crp->crp_buf,
-						     &(drvOpData->srcBuffer))) {
-			EPRINTK("%s():Failed to translate from packet buffer "
-				"to bufferlist\n", __FUNCTION__);
-			crp->crp_etype = EINVAL;
-			goto err;
-		}
-
-		drvOpData->bufferType = ICP_CRYPTO_F_PACKET_BUF;
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		/* OCF only supports IOV of one entry. */
-		if (NUM_IOV_SUPPORTED ==
-		    ((struct uio *)(crp->crp_buf))->uio_iovcnt) {
-
-			icp_ocfDrvPtrAndLenToBufferList(((struct uio *)(crp->
-									crp_buf))->
-							uio_iov[0].iov_base,
-							((struct uio *)(crp->
-									crp_buf))->
-							uio_iov[0].iov_len,
-							&(drvOpData->
-							  srcBuffer));
-
-			drvOpData->bufferType = CRYPTO_F_IOV;
-
-		} else {
-			DPRINTK("%s():Unable to handle IOVs with lengths of "
-				"greater than one!\n", __FUNCTION__);
-			crp->crp_etype = EINVAL;
-			goto err;
-		}
-
-	} else {
-		icp_ocfDrvPtrAndLenToBufferList(crp->crp_buf,
-						crp->crp_ilen,
-						&(drvOpData->srcBuffer));
-
-		drvOpData->bufferType = CRYPTO_BUF_CONTIG;
-	}
-
-	/* Allocate srcBuffer's private meta data */
-	if (ICP_OCF_DRV_STATUS_SUCCESS !=
-	    icp_ocfDrvAllocMetaData(&(drvOpData->srcBuffer), drvOpData)) {
-		EPRINTK("%s() icp_ocfDrvAllocMetaData failed\n", __FUNCTION__);
-		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
-		crp->crp_etype = EINVAL;
-		goto err;
-	}
-
-	/* Perform "in-place" crypto operation */
-	lacStatus = cpaCySymPerformOp(CPA_INSTANCE_HANDLE_SINGLE,
-				      (void *)drvOpData,
-				      &(drvOpData->lacOpData),
-				      &(drvOpData->srcBuffer),
-				      &(drvOpData->srcBuffer),
-				      &(drvOpData->verifyResult));
-	if (CPA_STATUS_RETRY == lacStatus) {
-		DPRINTK("%s(): cpaCySymPerformOp retry, lacStatus = %d\n",
-			__FUNCTION__, lacStatus);
-		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
-		crp->crp_etype = ERESTART;
-		goto err;
-	}
-	if (CPA_STATUS_SUCCESS != lacStatus) {
-		EPRINTK("%s(): cpaCySymPerformOp failed, lacStatus = %d\n",
-			__FUNCTION__, lacStatus);
-		memset(&(drvOpData->lacOpData), 0, sizeof(CpaCySymOpData));
-		crp->crp_etype = EINVAL;
-		goto err;
-	}
-
-	return 0;		//OCF success status value
-
-      err:
-	if (drvOpData->numBufferListArray > ICP_OCF_DRV_DEFAULT_BUFFLIST_ARRAYS) {
-		icp_kfree(drvOpData->srcBuffer.pBuffers);
-	}
-	icp_ocfDrvFreeMetaData(&(drvOpData->srcBuffer));
-	ICP_CACHE_FREE(drvOpData_zone, drvOpData);
-
-	return crp->crp_etype;
-}
-
-/* Name        : icp_ocfDrvProcessDataSetup
- *
- * Description : This function will setup all the cryptographic operation data
- *               that is required by LAC to execute the operation.
- */
-static int icp_ocfDrvProcessDataSetup(struct icp_drvOpData *drvOpData,
-				      struct cryptodesc *crp_desc)
-{
-	CpaCyRandGenOpData randGenOpData;
-	CpaFlatBuffer randData;
-
-	drvOpData->lacOpData.packetType = CPA_CY_SYM_PACKET_TYPE_FULL;
-
-	/* Convert from the cryptop to the ICP LAC crypto parameters */
-	switch (crp_desc->crd_alg) {
-	case CRYPTO_NULL_CBC:
-		drvOpData->lacOpData.
-		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToCipherInBytes = crp_desc->crd_len;
-		drvOpData->verifyResult = CPA_FALSE;
-		drvOpData->lacOpData.ivLenInBytes = NULL_BLOCK_LEN;
-		break;
-	case CRYPTO_DES_CBC:
-		drvOpData->lacOpData.
-		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToCipherInBytes = crp_desc->crd_len;
-		drvOpData->verifyResult = CPA_FALSE;
-		drvOpData->lacOpData.ivLenInBytes = DES_BLOCK_LEN;
-		break;
-	case CRYPTO_3DES_CBC:
-		drvOpData->lacOpData.
-		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToCipherInBytes = crp_desc->crd_len;
-		drvOpData->verifyResult = CPA_FALSE;
-		drvOpData->lacOpData.ivLenInBytes = DES3_BLOCK_LEN;
-		break;
-	case CRYPTO_ARC4:
-		drvOpData->lacOpData.
-		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToCipherInBytes = crp_desc->crd_len;
-		drvOpData->verifyResult = CPA_FALSE;
-		drvOpData->lacOpData.ivLenInBytes = ARC4_COUNTER_LEN;
-		break;
-	case CRYPTO_AES_CBC:
-		drvOpData->lacOpData.
-		    cryptoStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToCipherInBytes = crp_desc->crd_len;
-		drvOpData->verifyResult = CPA_FALSE;
-		drvOpData->lacOpData.ivLenInBytes = RIJNDAEL128_BLOCK_LEN;
-		break;
-	case CRYPTO_SHA1:
-	case CRYPTO_SHA1_HMAC:
-	case CRYPTO_SHA2_256:
-	case CRYPTO_SHA2_256_HMAC:
-	case CRYPTO_SHA2_384:
-	case CRYPTO_SHA2_384_HMAC:
-	case CRYPTO_SHA2_512:
-	case CRYPTO_SHA2_512_HMAC:
-	case CRYPTO_MD5:
-	case CRYPTO_MD5_HMAC:
-		drvOpData->lacOpData.
-		    hashStartSrcOffsetInBytes = crp_desc->crd_skip;
-		drvOpData->lacOpData.
-		    messageLenToHashInBytes = crp_desc->crd_len;
-		drvOpData->lacOpData.
-		    pDigestResult =
-		    icp_ocfDrvDigestPointerFind(drvOpData, crp_desc);
-
-		if (NULL == drvOpData->lacOpData.pDigestResult) {
-			DPRINTK("%s(): ERROR - could not calculate "
-				"Digest Result memory address\n", __FUNCTION__);
-			return ICP_OCF_DRV_STATUS_FAIL;
-		}
-
-		drvOpData->lacOpData.digestVerify = CPA_FALSE;
-		break;
-	default:
-		DPRINTK("%s(): Crypto process error - algorithm not "
-			"found \n", __FUNCTION__);
-		return ICP_OCF_DRV_STATUS_FAIL;
-	}
-
-	/* Figure out what the IV is supposed to be */
-	if ((crp_desc->crd_alg == CRYPTO_DES_CBC) ||
-	    (crp_desc->crd_alg == CRYPTO_3DES_CBC) ||
-	    (crp_desc->crd_alg == CRYPTO_AES_CBC)) {
-		/*ARC4 doesn't use an IV */
-		if (crp_desc->crd_flags & CRD_F_IV_EXPLICIT) {
-			/* Explicit IV provided to OCF */
-			drvOpData->lacOpData.pIv = crp_desc->crd_iv;
-		} else {
-			/* IV is not explicitly provided to OCF */
-
-			/* Point the LAC OP Data IV pointer to our allocated
-			   storage location for this session. */
-			drvOpData->lacOpData.pIv = drvOpData->ivData;
-
-			if ((crp_desc->crd_flags & CRD_F_ENCRYPT) &&
-			    ((crp_desc->crd_flags & CRD_F_IV_PRESENT) == 0)) {
-
-				/* Encrypting - need to create IV */
-				randGenOpData.generateBits = CPA_TRUE;
-				randGenOpData.lenInBytes = MAX_IV_LEN_IN_BYTES;
-
-				icp_ocfDrvPtrAndLenToFlatBuffer((Cpa8U *)
-								drvOpData->
-								ivData,
-								MAX_IV_LEN_IN_BYTES,
-								&randData);
-
-				if (CPA_STATUS_SUCCESS !=
-				    cpaCyRandGen(CPA_INSTANCE_HANDLE_SINGLE,
-						 NULL, NULL,
-						 &randGenOpData, &randData)) {
-					DPRINTK("%s(): ERROR - Failed to"
-						" generate"
-						" Initialisation Vector\n",
-						__FUNCTION__);
-					return ICP_OCF_DRV_STATUS_FAIL;
-				}
-
-				crypto_copyback(drvOpData->crp->
-						crp_flags,
-						drvOpData->crp->crp_buf,
-						crp_desc->crd_inject,
-						drvOpData->lacOpData.
-						ivLenInBytes,
-						(caddr_t) (drvOpData->lacOpData.
-							   pIv));
-			} else {
-				/* Reading IV from buffer */
-				crypto_copydata(drvOpData->crp->
-						crp_flags,
-						drvOpData->crp->crp_buf,
-						crp_desc->crd_inject,
-						drvOpData->lacOpData.
-						ivLenInBytes,
-						(caddr_t) (drvOpData->lacOpData.
-							   pIv));
-			}
-
-		}
-
-	}
-
-	return ICP_OCF_DRV_STATUS_SUCCESS;
-}
-
-/* Name        : icp_ocfDrvDigestPointerFind
- *
- * Description : This function is used to find the memory address of where the
- * digest information shall be stored in. Input buffer types are an skbuff, iov
- * or flat buffer. The address is found using the buffer data start address and
- * an offset.
- *
- * Note: In the case of a linux skbuff, the digest address may exist within
- * a memory space linked to from the start buffer. These linked memory spaces
- * must be traversed by the data length offset in order to find the digest start
- * address. Whether there is enough space for the digest must also be checked.
- */
-uint8_t *icp_ocfDrvDigestPointerFind(struct icp_drvOpData * drvOpData,
-				     struct cryptodesc * crp_desc)
-{
-
-	int offsetInBytes = crp_desc->crd_inject;
-	uint32_t digestSizeInBytes = drvOpData->digestSizeInBytes;
-	uint8_t *flat_buffer_base = NULL;
-	int flat_buffer_length = 0;
-
-	if (drvOpData->crp->crp_flags & ICP_CRYPTO_F_PACKET_BUF) {
-
-		return icp_ocfDrvPacketBufferDigestPointerFind(drvOpData,
-							       offsetInBytes,
-							       digestSizeInBytes);
-
-	} else {
-		/* IOV or flat buffer */
-		if (drvOpData->crp->crp_flags & CRYPTO_F_IOV) {
-			/*single IOV check has already been done */
-			flat_buffer_base = ((struct uio *)
-					    (drvOpData->crp->crp_buf))->
-			    uio_iov[0].iov_base;
-			flat_buffer_length = ((struct uio *)
-					      (drvOpData->crp->crp_buf))->
-			    uio_iov[0].iov_len;
-		} else {
-			flat_buffer_base = (uint8_t *) drvOpData->crp->crp_buf;
-			flat_buffer_length = drvOpData->crp->crp_ilen;
-		}
-
-		if (flat_buffer_length < (offsetInBytes + digestSizeInBytes)) {
-			DPRINTK("%s() Not enough space for Digest "
-				"(IOV/Flat Buffer) \n", __FUNCTION__);
-			return NULL;
-		} else {
-			return (uint8_t *) (flat_buffer_base + offsetInBytes);
-		}
-	}
-	DPRINTK("%s() Should not reach this point\n", __FUNCTION__);
-	return NULL;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/Makefile b/target/linux/generic-2.6/files/crypto/ocf/hifn/Makefile
deleted file mode 100644
index 163fed0543..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_HIFN)     += hifn7751.o
-obj-$(CONFIG_OCF_HIFNHIPP) += hifnHIPP.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c
deleted file mode 100644
index e7fd5bb5a3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c
+++ /dev/null
@@ -1,2978 +0,0 @@
-/*	$OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $	*/
-
-/*-
- * Invertex AEON / Hifn 7751 driver
- * Copyright (c) 1999 Invertex Inc. All rights reserved.
- * Copyright (c) 1999 Theo de Raadt
- * Copyright (c) 2000-2001 Network Security Technologies, Inc.
- *			http://www.netsec.net
- * Copyright (c) 2003 Hifn Inc.
- *
- * This driver is based on a previous driver by Invertex, for which they
- * requested:  Please send any comments, feedback, bug-fixes, or feature
- * requests to software@invertex.com.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- *
-__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.40 2007/03/21 03:42:49 sam Exp $");
- */
-
-/*
- * Driver for various Hifn encryption processors.
- */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/skbuff.h>
-#include <asm/io.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-#include <hifn/hifn7751reg.h>
-#include <hifn/hifn7751var.h>
-
-#if 1
-#define	DPRINTF(a...)	if (hifn_debug) { \
-							printk("%s: ", sc ? \
-								device_get_nameunit(sc->sc_dev) : "hifn"); \
-							printk(a); \
-						} else
-#else
-#define	DPRINTF(a...)
-#endif
-
-static inline int
-pci_get_revid(struct pci_dev *dev)
-{
-	u8 rid = 0;
-	pci_read_config_byte(dev, PCI_REVISION_ID, &rid);
-	return rid;
-}
-
-static	struct hifn_stats hifnstats;
-
-#define	debug hifn_debug
-int hifn_debug = 0;
-module_param(hifn_debug, int, 0644);
-MODULE_PARM_DESC(hifn_debug, "Enable debug");
-
-int hifn_maxbatch = 1;
-module_param(hifn_maxbatch, int, 0644);
-MODULE_PARM_DESC(hifn_maxbatch, "max ops to batch w/o interrupt");
-
-int hifn_cache_linesize = 0x10;
-module_param(hifn_cache_linesize, int, 0444);
-MODULE_PARM_DESC(hifn_cache_linesize, "PCI config cache line size");
-
-#ifdef MODULE_PARM
-char *hifn_pllconfig = NULL;
-MODULE_PARM(hifn_pllconfig, "s");
-#else
-char hifn_pllconfig[32]; /* This setting is RO after loading */
-module_param_string(hifn_pllconfig, hifn_pllconfig, 32, 0444);
-#endif
-MODULE_PARM_DESC(hifn_pllconfig, "PLL config, ie., pci66, ext33, ...");
-
-#ifdef HIFN_VULCANDEV
-#include <sys/conf.h>
-#include <sys/uio.h>
-
-static struct cdevsw vulcanpk_cdevsw; /* forward declaration */
-#endif
-
-/*
- * Prototypes and count for the pci_device structure
- */
-static	int  hifn_probe(struct pci_dev *dev, const struct pci_device_id *ent);
-static	void hifn_remove(struct pci_dev *dev);
-
-static	int hifn_newsession(device_t, u_int32_t *, struct cryptoini *);
-static	int hifn_freesession(device_t, u_int64_t);
-static	int hifn_process(device_t, struct cryptop *, int);
-
-static device_method_t hifn_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	hifn_newsession),
-	DEVMETHOD(cryptodev_freesession,hifn_freesession),
-	DEVMETHOD(cryptodev_process,	hifn_process),
-};
-
-static	void hifn_reset_board(struct hifn_softc *, int);
-static	void hifn_reset_puc(struct hifn_softc *);
-static	void hifn_puc_wait(struct hifn_softc *);
-static	int hifn_enable_crypto(struct hifn_softc *);
-static	void hifn_set_retry(struct hifn_softc *sc);
-static	void hifn_init_dma(struct hifn_softc *);
-static	void hifn_init_pci_registers(struct hifn_softc *);
-static	int hifn_sramsize(struct hifn_softc *);
-static	int hifn_dramsize(struct hifn_softc *);
-static	int hifn_ramtype(struct hifn_softc *);
-static	void hifn_sessions(struct hifn_softc *);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-static irqreturn_t hifn_intr(int irq, void *arg);
-#else
-static irqreturn_t hifn_intr(int irq, void *arg, struct pt_regs *regs);
-#endif
-static	u_int hifn_write_command(struct hifn_command *, u_int8_t *);
-static	u_int32_t hifn_next_signature(u_int32_t a, u_int cnt);
-static	void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *);
-static	int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *, int);
-static	int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *);
-static	int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *);
-static	int hifn_dmamap_load_src(struct hifn_softc *, struct hifn_command *);
-static	int hifn_dmamap_load_dst(struct hifn_softc *, struct hifn_command *);
-static	int hifn_init_pubrng(struct hifn_softc *);
-static	void hifn_tick(unsigned long arg);
-static	void hifn_abort(struct hifn_softc *);
-static	void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *);
-
-static	void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t);
-static	void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t);
-
-#ifdef CONFIG_OCF_RANDOMHARVEST
-static	int hifn_read_random(void *arg, u_int32_t *buf, int len);
-#endif
-
-#define HIFN_MAX_CHIPS	8
-static struct hifn_softc *hifn_chip_idx[HIFN_MAX_CHIPS];
-
-static __inline u_int32_t
-READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
-{
-	u_int32_t v = readl(sc->sc_bar0 + reg);
-	sc->sc_bar0_lastreg = (bus_size_t) -1;
-	return (v);
-}
-#define	WRITE_REG_0(sc, reg, val)	hifn_write_reg_0(sc, reg, val)
-
-static __inline u_int32_t
-READ_REG_1(struct hifn_softc *sc, bus_size_t reg)
-{
-	u_int32_t v = readl(sc->sc_bar1 + reg);
-	sc->sc_bar1_lastreg = (bus_size_t) -1;
-	return (v);
-}
-#define	WRITE_REG_1(sc, reg, val)	hifn_write_reg_1(sc, reg, val)
-
-/*
- * map in a given buffer (great on some arches :-)
- */
-
-static int
-pci_map_uio(struct hifn_softc *sc, struct hifn_operand *buf, struct uio *uio)
-{
-	struct iovec *iov = uio->uio_iov;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	buf->mapsize = 0;
-	for (buf->nsegs = 0; buf->nsegs < uio->uio_iovcnt; ) {
-		buf->segs[buf->nsegs].ds_addr = pci_map_single(sc->sc_pcidev,
-				iov->iov_base, iov->iov_len,
-				PCI_DMA_BIDIRECTIONAL);
-		buf->segs[buf->nsegs].ds_len = iov->iov_len;
-		buf->mapsize += iov->iov_len;
-		iov++;
-		buf->nsegs++;
-	}
-	/* identify this buffer by the first segment */
-	buf->map = (void *) buf->segs[0].ds_addr;
-	return(0);
-}
-
-/*
- * map in a given sk_buff
- */
-
-static int
-pci_map_skb(struct hifn_softc *sc,struct hifn_operand *buf,struct sk_buff *skb)
-{
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	buf->mapsize = 0;
-
-	buf->segs[0].ds_addr = pci_map_single(sc->sc_pcidev,
-			skb->data, skb_headlen(skb), PCI_DMA_BIDIRECTIONAL);
-	buf->segs[0].ds_len = skb_headlen(skb);
-	buf->mapsize += buf->segs[0].ds_len;
-
-	buf->nsegs = 1;
-
-	for (i = 0; i < skb_shinfo(skb)->nr_frags; ) {
-		buf->segs[buf->nsegs].ds_len = skb_shinfo(skb)->frags[i].size;
-		buf->segs[buf->nsegs].ds_addr = pci_map_single(sc->sc_pcidev,
-				page_address(skb_shinfo(skb)->frags[i].page) +
-					skb_shinfo(skb)->frags[i].page_offset,
-				buf->segs[buf->nsegs].ds_len, PCI_DMA_BIDIRECTIONAL);
-		buf->mapsize += buf->segs[buf->nsegs].ds_len;
-		buf->nsegs++;
-	}
-
-	/* identify this buffer by the first segment */
-	buf->map = (void *) buf->segs[0].ds_addr;
-	return(0);
-}
-
-/*
- * map in a given contiguous buffer
- */
-
-static int
-pci_map_buf(struct hifn_softc *sc,struct hifn_operand *buf, void *b, int len)
-{
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	buf->mapsize = 0;
-	buf->segs[0].ds_addr = pci_map_single(sc->sc_pcidev,
-			b, len, PCI_DMA_BIDIRECTIONAL);
-	buf->segs[0].ds_len = len;
-	buf->mapsize += buf->segs[0].ds_len;
-	buf->nsegs = 1;
-
-	/* identify this buffer by the first segment */
-	buf->map = (void *) buf->segs[0].ds_addr;
-	return(0);
-}
-
-#if 0 /* not needed at this time */
-static void
-pci_sync_iov(struct hifn_softc *sc, struct hifn_operand *buf)
-{
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	for (i = 0; i < buf->nsegs; i++)
-		pci_dma_sync_single_for_cpu(sc->sc_pcidev, buf->segs[i].ds_addr,
-				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
-}
-#endif
-
-static void
-pci_unmap_buf(struct hifn_softc *sc, struct hifn_operand *buf)
-{
-	int i;
-	DPRINTF("%s()\n", __FUNCTION__);
-	for (i = 0; i < buf->nsegs; i++) {
-		pci_unmap_single(sc->sc_pcidev, buf->segs[i].ds_addr,
-				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
-		buf->segs[i].ds_addr = 0;
-		buf->segs[i].ds_len = 0;
-	}
-	buf->nsegs = 0;
-	buf->mapsize = 0;
-	buf->map = 0;
-}
-
-static const char*
-hifn_partname(struct hifn_softc *sc)
-{
-	/* XXX sprintf numbers when not decoded */
-	switch (pci_get_vendor(sc->sc_pcidev)) {
-	case PCI_VENDOR_HIFN:
-		switch (pci_get_device(sc->sc_pcidev)) {
-		case PCI_PRODUCT_HIFN_6500:	return "Hifn 6500";
-		case PCI_PRODUCT_HIFN_7751:	return "Hifn 7751";
-		case PCI_PRODUCT_HIFN_7811:	return "Hifn 7811";
-		case PCI_PRODUCT_HIFN_7951:	return "Hifn 7951";
-		case PCI_PRODUCT_HIFN_7955:	return "Hifn 7955";
-		case PCI_PRODUCT_HIFN_7956:	return "Hifn 7956";
-		}
-		return "Hifn unknown-part";
-	case PCI_VENDOR_INVERTEX:
-		switch (pci_get_device(sc->sc_pcidev)) {
-		case PCI_PRODUCT_INVERTEX_AEON:	return "Invertex AEON";
-		}
-		return "Invertex unknown-part";
-	case PCI_VENDOR_NETSEC:
-		switch (pci_get_device(sc->sc_pcidev)) {
-		case PCI_PRODUCT_NETSEC_7751:	return "NetSec 7751";
-		}
-		return "NetSec unknown-part";
-	}
-	return "Unknown-vendor unknown-part";
-}
-
-static u_int
-checkmaxmin(struct pci_dev *dev, const char *what, u_int v, u_int min, u_int max)
-{
-	struct hifn_softc *sc = pci_get_drvdata(dev);
-	if (v > max) {
-		device_printf(sc->sc_dev, "Warning, %s %u out of range, "
-			"using max %u\n", what, v, max);
-		v = max;
-	} else if (v < min) {
-		device_printf(sc->sc_dev, "Warning, %s %u out of range, "
-			"using min %u\n", what, v, min);
-		v = min;
-	}
-	return v;
-}
-
-/*
- * Select PLL configuration for 795x parts.  This is complicated in
- * that we cannot determine the optimal parameters without user input.
- * The reference clock is derived from an external clock through a
- * multiplier.  The external clock is either the host bus (i.e. PCI)
- * or an external clock generator.  When using the PCI bus we assume
- * the clock is either 33 or 66 MHz; for an external source we cannot
- * tell the speed.
- *
- * PLL configuration is done with a string: "pci" for PCI bus, or "ext"
- * for an external source, followed by the frequency.  We calculate
- * the appropriate multiplier and PLL register contents accordingly.
- * When no configuration is given we default to "pci66" since that
- * always will allow the card to work.  If a card is using the PCI
- * bus clock and in a 33MHz slot then it will be operating at half
- * speed until the correct information is provided.
- *
- * We use a default setting of "ext66" because according to Mike Ham
- * of HiFn, almost every board in existence has an external crystal
- * populated at 66Mhz. Using PCI can be a problem on modern motherboards,
- * because PCI33 can have clocks from 0 to 33Mhz, and some have
- * non-PCI-compliant spread-spectrum clocks, which can confuse the pll.
- */
-static void
-hifn_getpllconfig(struct pci_dev *dev, u_int *pll)
-{
-	const char *pllspec = hifn_pllconfig;
-	u_int freq, mul, fl, fh;
-	u_int32_t pllconfig;
-	char *nxt;
-
-	if (pllspec == NULL)
-		pllspec = "ext66";
-	fl = 33, fh = 66;
-	pllconfig = 0;
-	if (strncmp(pllspec, "ext", 3) == 0) {
-		pllspec += 3;
-		pllconfig |= HIFN_PLL_REF_SEL;
-		switch (pci_get_device(dev)) {
-		case PCI_PRODUCT_HIFN_7955:
-		case PCI_PRODUCT_HIFN_7956:
-			fl = 20, fh = 100;
-			break;
-#ifdef notyet
-		case PCI_PRODUCT_HIFN_7954:
-			fl = 20, fh = 66;
-			break;
-#endif
-		}
-	} else if (strncmp(pllspec, "pci", 3) == 0)
-		pllspec += 3;
-	freq = strtoul(pllspec, &nxt, 10);
-	if (nxt == pllspec)
-		freq = 66;
-	else
-		freq = checkmaxmin(dev, "frequency", freq, fl, fh);
-	/*
-	 * Calculate multiplier.  We target a Fck of 266 MHz,
-	 * allowing only even values, possibly rounded down.
-	 * Multipliers > 8 must set the charge pump current.
-	 */
-	mul = checkmaxmin(dev, "PLL divisor", (266 / freq) &~ 1, 2, 12);
-	pllconfig |= (mul / 2 - 1) << HIFN_PLL_ND_SHIFT;
-	if (mul > 8)
-		pllconfig |= HIFN_PLL_IS;
-	*pll = pllconfig;
-}
-
-/*
- * Attach an interface that successfully probed.
- */
-static int
-hifn_probe(struct pci_dev *dev, const struct pci_device_id *ent)
-{
-	struct hifn_softc *sc = NULL;
-	char rbase;
-	u_int16_t ena, rev;
-	int rseg, rc;
-	unsigned long mem_start, mem_len;
-	static int num_chips = 0;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (pci_enable_device(dev) < 0)
-		return(-ENODEV);
-
-#ifdef CONFIG_HAVE_PCI_SET_MWI
-	if (pci_set_mwi(dev))
-		return(-ENODEV);
-#endif
-
-	if (!dev->irq) {
-		printk("hifn: found device with no IRQ assigned. check BIOS settings!");
-		pci_disable_device(dev);
-		return(-ENODEV);
-	}
-
-	sc = (struct hifn_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
-	if (!sc)
-		return(-ENOMEM);
-	memset(sc, 0, sizeof(*sc));
-
-	softc_device_init(sc, "hifn", num_chips, hifn_methods);
-
-	sc->sc_pcidev = dev;
-	sc->sc_irq = -1;
-	sc->sc_cid = -1;
-	sc->sc_num = num_chips++;
-	if (sc->sc_num < HIFN_MAX_CHIPS)
-		hifn_chip_idx[sc->sc_num] = sc;
-
-	pci_set_drvdata(sc->sc_pcidev, sc);
-
-	spin_lock_init(&sc->sc_mtx);
-
-	/* XXX handle power management */
-
-	/*
-	 * The 7951 and 795x have a random number generator and
-	 * public key support; note this.
-	 */
-	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
-	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 ||
-	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 ||
-	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956))
-		sc->sc_flags = HIFN_HAS_RNG | HIFN_HAS_PUBLIC;
-	/*
-	 * The 7811 has a random number generator and
-	 * we also note it's identity 'cuz of some quirks.
-	 */
-	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
-	    pci_get_device(dev) == PCI_PRODUCT_HIFN_7811)
-		sc->sc_flags |= HIFN_IS_7811 | HIFN_HAS_RNG;
-
-	/*
-	 * The 795x parts support AES.
-	 */
-	if (pci_get_vendor(dev) == PCI_VENDOR_HIFN &&
-	    (pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 ||
-	     pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) {
-		sc->sc_flags |= HIFN_IS_7956 | HIFN_HAS_AES;
-		/*
-		 * Select PLL configuration.  This depends on the
-		 * bus and board design and must be manually configured
-		 * if the default setting is unacceptable.
-		 */
-		hifn_getpllconfig(dev, &sc->sc_pllconfig);
-	}
-
-	/*
-	 * Setup PCI resources. Note that we record the bus
-	 * tag and handle for each register mapping, this is
-	 * used by the READ_REG_0, WRITE_REG_0, READ_REG_1,
-	 * and WRITE_REG_1 macros throughout the driver.
-	 */
-	mem_start = pci_resource_start(sc->sc_pcidev, 0);
-	mem_len   = pci_resource_len(sc->sc_pcidev, 0);
-	sc->sc_bar0 = (ocf_iomem_t) ioremap(mem_start, mem_len);
-	if (!sc->sc_bar0) {
-		device_printf(sc->sc_dev, "cannot map bar%d register space\n", 0);
-		goto fail;
-	}
-	sc->sc_bar0_lastreg = (bus_size_t) -1;
-
-	mem_start = pci_resource_start(sc->sc_pcidev, 1);
-	mem_len   = pci_resource_len(sc->sc_pcidev, 1);
-	sc->sc_bar1 = (ocf_iomem_t) ioremap(mem_start, mem_len);
-	if (!sc->sc_bar1) {
-		device_printf(sc->sc_dev, "cannot map bar%d register space\n", 1);
-		goto fail;
-	}
-	sc->sc_bar1_lastreg = (bus_size_t) -1;
-
-	/* fix up the bus size */
-	if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
-		device_printf(sc->sc_dev, "No usable DMA configuration, aborting.\n");
-		goto fail;
-	}
-	if (pci_set_consistent_dma_mask(dev, DMA_32BIT_MASK)) {
-		device_printf(sc->sc_dev,
-				"No usable consistent DMA configuration, aborting.\n");
-		goto fail;
-	}
-
-	hifn_set_retry(sc);
-
-	/*
-	 * Setup the area where the Hifn DMA's descriptors
-	 * and associated data structures.
-	 */
-	sc->sc_dma = (struct hifn_dma *) pci_alloc_consistent(dev,
-			sizeof(*sc->sc_dma),
-			&sc->sc_dma_physaddr);
-	if (!sc->sc_dma) {
-		device_printf(sc->sc_dev, "cannot alloc sc_dma\n");
-		goto fail;
-	}
-	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
-
-	/*
-	 * Reset the board and do the ``secret handshake''
-	 * to enable the crypto support.  Then complete the
-	 * initialization procedure by setting up the interrupt
-	 * and hooking in to the system crypto support so we'll
-	 * get used for system services like the crypto device,
-	 * IPsec, RNG device, etc.
-	 */
-	hifn_reset_board(sc, 0);
-
-	if (hifn_enable_crypto(sc) != 0) {
-		device_printf(sc->sc_dev, "crypto enabling failed\n");
-		goto fail;
-	}
-	hifn_reset_puc(sc);
-
-	hifn_init_dma(sc);
-	hifn_init_pci_registers(sc);
-
-	pci_set_master(sc->sc_pcidev);
-
-	/* XXX can't dynamically determine ram type for 795x; force dram */
-	if (sc->sc_flags & HIFN_IS_7956)
-		sc->sc_drammodel = 1;
-	else if (hifn_ramtype(sc))
-		goto fail;
-
-	if (sc->sc_drammodel == 0)
-		hifn_sramsize(sc);
-	else
-		hifn_dramsize(sc);
-
-	/*
-	 * Workaround for NetSec 7751 rev A: half ram size because two
-	 * of the address lines were left floating
-	 */
-	if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC &&
-	    pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751 &&
-	    pci_get_revid(dev) == 0x61)	/*XXX???*/
-		sc->sc_ramsize >>= 1;
-
-	/*
-	 * Arrange the interrupt line.
-	 */
-	rc = request_irq(dev->irq, hifn_intr, IRQF_SHARED, "hifn", sc);
-	if (rc) {
-		device_printf(sc->sc_dev, "could not map interrupt: %d\n", rc);
-		goto fail;
-	}
-	sc->sc_irq = dev->irq;
-
-	hifn_sessions(sc);
-
-	/*
-	 * NB: Keep only the low 16 bits; this masks the chip id
-	 *     from the 7951.
-	 */
-	rev = READ_REG_1(sc, HIFN_1_REVID) & 0xffff;
-
-	rseg = sc->sc_ramsize / 1024;
-	rbase = 'K';
-	if (sc->sc_ramsize >= (1024 * 1024)) {
-		rbase = 'M';
-		rseg /= 1024;
-	}
-	device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram",
-		hifn_partname(sc), rev,
-		rseg, rbase, sc->sc_drammodel ? 'd' : 's');
-	if (sc->sc_flags & HIFN_IS_7956)
-		printf(", pll=0x%x<%s clk, %ux mult>",
-			sc->sc_pllconfig,
-			sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci",
-			2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11));
-	printf("\n");
-
-	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
-	if (sc->sc_cid < 0) {
-		device_printf(sc->sc_dev, "could not get crypto driver id\n");
-		goto fail;
-	}
-
-	WRITE_REG_0(sc, HIFN_0_PUCNFG,
-	    READ_REG_0(sc, HIFN_0_PUCNFG) | HIFN_PUCNFG_CHIPID);
-	ena = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
-
-	switch (ena) {
-	case HIFN_PUSTAT_ENA_2:
-		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0);
-		if (sc->sc_flags & HIFN_HAS_AES)
-			crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
-		/*FALLTHROUGH*/
-	case HIFN_PUSTAT_ENA_1:
-		crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
-		break;
-	}
-
-	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
-		hifn_init_pubrng(sc);
-
-	init_timer(&sc->sc_tickto);
-	sc->sc_tickto.function = hifn_tick;
-	sc->sc_tickto.data = (unsigned long) sc->sc_num;
-	mod_timer(&sc->sc_tickto, jiffies + HZ);
-
-	return (0);
-
-fail:
-    if (sc->sc_cid >= 0)
-        crypto_unregister_all(sc->sc_cid);
-    if (sc->sc_irq != -1)
-        free_irq(sc->sc_irq, sc);
-    if (sc->sc_dma) {
-		/* Turn off DMA polling */
-		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-			HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-
-        pci_free_consistent(sc->sc_pcidev,
-				sizeof(*sc->sc_dma),
-                sc->sc_dma, sc->sc_dma_physaddr);
-	}
-    kfree(sc);
-	return (-ENXIO);
-}
-
-/*
- * Detach an interface that successfully probed.
- */
-static void
-hifn_remove(struct pci_dev *dev)
-{
-	struct hifn_softc *sc = pci_get_drvdata(dev);
-	unsigned long l_flags;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	KASSERT(sc != NULL, ("hifn_detach: null software carrier!"));
-
-	/* disable interrupts */
-	HIFN_LOCK(sc);
-	WRITE_REG_1(sc, HIFN_1_DMA_IER, 0);
-	HIFN_UNLOCK(sc);
-
-	/*XXX other resources */
-	del_timer_sync(&sc->sc_tickto);
-
-	/* Turn off DMA polling */
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-
-	crypto_unregister_all(sc->sc_cid);
-
-	free_irq(sc->sc_irq, sc);
-
-	pci_free_consistent(sc->sc_pcidev, sizeof(*sc->sc_dma),
-                sc->sc_dma, sc->sc_dma_physaddr);
-}
-
-
-static int
-hifn_init_pubrng(struct hifn_softc *sc)
-{
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if ((sc->sc_flags & HIFN_IS_7811) == 0) {
-		/* Reset 7951 public key/rng engine */
-		WRITE_REG_1(sc, HIFN_1_PUB_RESET,
-		    READ_REG_1(sc, HIFN_1_PUB_RESET) | HIFN_PUBRST_RESET);
-
-		for (i = 0; i < 100; i++) {
-			DELAY(1000);
-			if ((READ_REG_1(sc, HIFN_1_PUB_RESET) &
-			    HIFN_PUBRST_RESET) == 0)
-				break;
-		}
-
-		if (i == 100) {
-			device_printf(sc->sc_dev, "public key init failed\n");
-			return (1);
-		}
-	}
-
-	/* Enable the rng, if available */
-#ifdef CONFIG_OCF_RANDOMHARVEST
-	if (sc->sc_flags & HIFN_HAS_RNG) {
-		if (sc->sc_flags & HIFN_IS_7811) {
-			u_int32_t r;
-			r = READ_REG_1(sc, HIFN_1_7811_RNGENA);
-			if (r & HIFN_7811_RNGENA_ENA) {
-				r &= ~HIFN_7811_RNGENA_ENA;
-				WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r);
-			}
-			WRITE_REG_1(sc, HIFN_1_7811_RNGCFG,
-			    HIFN_7811_RNGCFG_DEFL);
-			r |= HIFN_7811_RNGENA_ENA;
-			WRITE_REG_1(sc, HIFN_1_7811_RNGENA, r);
-		} else
-			WRITE_REG_1(sc, HIFN_1_RNG_CONFIG,
-			    READ_REG_1(sc, HIFN_1_RNG_CONFIG) |
-			    HIFN_RNGCFG_ENA);
-
-		sc->sc_rngfirst = 1;
-		crypto_rregister(sc->sc_cid, hifn_read_random, sc);
-	}
-#endif
-
-	/* Enable public key engine, if available */
-	if (sc->sc_flags & HIFN_HAS_PUBLIC) {
-		WRITE_REG_1(sc, HIFN_1_PUB_IEN, HIFN_PUBIEN_DONE);
-		sc->sc_dmaier |= HIFN_DMAIER_PUBDONE;
-		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
-#ifdef HIFN_VULCANDEV
-		sc->sc_pkdev = make_dev(&vulcanpk_cdevsw, 0, 
-					UID_ROOT, GID_WHEEL, 0666,
-					"vulcanpk");
-		sc->sc_pkdev->si_drv1 = sc;
-#endif
-	}
-
-	return (0);
-}
-
-#ifdef CONFIG_OCF_RANDOMHARVEST
-static int
-hifn_read_random(void *arg, u_int32_t *buf, int len)
-{
-	struct hifn_softc *sc = (struct hifn_softc *) arg;
-	u_int32_t sts;
-	int i, rc = 0;
-
-	if (len <= 0)
-		return rc;
-
-	if (sc->sc_flags & HIFN_IS_7811) {
-		/* ONLY VALID ON 7811!!!! */
-		for (i = 0; i < 5; i++) {
-			sts = READ_REG_1(sc, HIFN_1_7811_RNGSTS);
-			if (sts & HIFN_7811_RNGSTS_UFL) {
-				device_printf(sc->sc_dev,
-					      "RNG underflow: disabling\n");
-				/* DAVIDM perhaps return -1 */
-				break;
-			}
-			if ((sts & HIFN_7811_RNGSTS_RDY) == 0)
-				break;
-
-			/*
-			 * There are at least two words in the RNG FIFO
-			 * at this point.
-			 */
-			if (rc < len)
-				buf[rc++] = READ_REG_1(sc, HIFN_1_7811_RNGDAT);
-			if (rc < len)
-				buf[rc++] = READ_REG_1(sc, HIFN_1_7811_RNGDAT);
-		}
-	} else
-		buf[rc++] = READ_REG_1(sc, HIFN_1_RNG_DATA);
-
-	/* NB: discard first data read */
-	if (sc->sc_rngfirst) {
-		sc->sc_rngfirst = 0;
-		rc = 0;
-	}
-
-	return(rc);
-}
-#endif /* CONFIG_OCF_RANDOMHARVEST */
-
-static void
-hifn_puc_wait(struct hifn_softc *sc)
-{
-	int i;
-	int reg = HIFN_0_PUCTRL;
-
-	if (sc->sc_flags & HIFN_IS_7956) {
-		reg = HIFN_0_PUCTRL2;
-	}
-
-	for (i = 5000; i > 0; i--) {
-		DELAY(1);
-		if (!(READ_REG_0(sc, reg) & HIFN_PUCTRL_RESET))
-			break;
-	}
-	if (!i)
-		device_printf(sc->sc_dev, "proc unit did not reset(0x%x)\n",
-				READ_REG_0(sc, HIFN_0_PUCTRL));
-}
-
-/*
- * Reset the processing unit.
- */
-static void
-hifn_reset_puc(struct hifn_softc *sc)
-{
-	/* Reset processing unit */
-	int reg = HIFN_0_PUCTRL;
-
-	if (sc->sc_flags & HIFN_IS_7956) {
-		reg = HIFN_0_PUCTRL2;
-	}
-	WRITE_REG_0(sc, reg, HIFN_PUCTRL_DMAENA);
-
-	hifn_puc_wait(sc);
-}
-
-/*
- * Set the Retry and TRDY registers; note that we set them to
- * zero because the 7811 locks up when forced to retry (section
- * 3.6 of "Specification Update SU-0014-04".  Not clear if we
- * should do this for all Hifn parts, but it doesn't seem to hurt.
- */
-static void
-hifn_set_retry(struct hifn_softc *sc)
-{
-	DPRINTF("%s()\n", __FUNCTION__);
-	/* NB: RETRY only responds to 8-bit reads/writes */
-	pci_write_config_byte(sc->sc_pcidev, HIFN_RETRY_TIMEOUT, 0);
-	pci_write_config_dword(sc->sc_pcidev, HIFN_TRDY_TIMEOUT, 0);
-	/* piggy back the cache line setting here */
-	pci_write_config_byte(sc->sc_pcidev, PCI_CACHE_LINE_SIZE, hifn_cache_linesize);
-}
-
-/*
- * Resets the board.  Values in the regesters are left as is
- * from the reset (i.e. initial values are assigned elsewhere).
- */
-static void
-hifn_reset_board(struct hifn_softc *sc, int full)
-{
-	u_int32_t reg;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	/*
-	 * Set polling in the DMA configuration register to zero.  0x7 avoids
-	 * resetting the board and zeros out the other fields.
-	 */
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-
-	/*
-	 * Now that polling has been disabled, we have to wait 1 ms
-	 * before resetting the board.
-	 */
-	DELAY(1000);
-
-	/* Reset the DMA unit */
-	if (full) {
-		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MODE);
-		DELAY(1000);
-	} else {
-		WRITE_REG_1(sc, HIFN_1_DMA_CNFG,
-		    HIFN_DMACNFG_MODE | HIFN_DMACNFG_MSTRESET);
-		hifn_reset_puc(sc);
-	}
-
-	KASSERT(sc->sc_dma != NULL, ("hifn_reset_board: null DMA tag!"));
-	bzero(sc->sc_dma, sizeof(*sc->sc_dma));
-
-	/* Bring dma unit out of reset */
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-
-	hifn_puc_wait(sc);
-	hifn_set_retry(sc);
-
-	if (sc->sc_flags & HIFN_IS_7811) {
-		for (reg = 0; reg < 1000; reg++) {
-			if (READ_REG_1(sc, HIFN_1_7811_MIPSRST) &
-			    HIFN_MIPSRST_CRAMINIT)
-				break;
-			DELAY(1000);
-		}
-		if (reg == 1000)
-			device_printf(sc->sc_dev, ": cram init timeout\n");
-	} else {
-	  /* set up DMA configuration register #2 */
-	  /* turn off all PK and BAR0 swaps */
-	  WRITE_REG_1(sc, HIFN_1_DMA_CNFG2,
-		      (3 << HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT)|
-		      (3 << HIFN_DMACNFG2_INIT_READ_BURST_SHIFT)|
-		      (2 << HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT)|
-		      (2 << HIFN_DMACNFG2_TGT_READ_BURST_SHIFT));
-	}
-}
-
-static u_int32_t
-hifn_next_signature(u_int32_t a, u_int cnt)
-{
-	int i;
-	u_int32_t v;
-
-	for (i = 0; i < cnt; i++) {
-
-		/* get the parity */
-		v = a & 0x80080125;
-		v ^= v >> 16;
-		v ^= v >> 8;
-		v ^= v >> 4;
-		v ^= v >> 2;
-		v ^= v >> 1;
-
-		a = (v & 1) ^ (a << 1);
-	}
-
-	return a;
-}
-
-
-/*
- * Checks to see if crypto is already enabled.  If crypto isn't enable,
- * "hifn_enable_crypto" is called to enable it.  The check is important,
- * as enabling crypto twice will lock the board.
- */
-static int 
-hifn_enable_crypto(struct hifn_softc *sc)
-{
-	u_int32_t dmacfg, ramcfg, encl, addr, i;
-	char offtbl[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-					  0x00, 0x00, 0x00, 0x00 };
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	ramcfg = READ_REG_0(sc, HIFN_0_PUCNFG);
-	dmacfg = READ_REG_1(sc, HIFN_1_DMA_CNFG);
-
-	/*
-	 * The RAM config register's encrypt level bit needs to be set before
-	 * every read performed on the encryption level register.
-	 */
-	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID);
-
-	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
-
-	/*
-	 * Make sure we don't re-unlock.  Two unlocks kills chip until the
-	 * next reboot.
-	 */
-	if (encl == HIFN_PUSTAT_ENA_1 || encl == HIFN_PUSTAT_ENA_2) {
-#ifdef HIFN_DEBUG
-		if (hifn_debug)
-			device_printf(sc->sc_dev,
-			    "Strong crypto already enabled!\n");
-#endif
-		goto report;
-	}
-
-	if (encl != 0 && encl != HIFN_PUSTAT_ENA_0) {
-#ifdef HIFN_DEBUG
-		if (hifn_debug)
-			device_printf(sc->sc_dev,
-			      "Unknown encryption level 0x%x\n", encl);
-#endif
-		return 1;
-	}
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_UNLOCK |
-	    HIFN_DMACNFG_MSTRESET | HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-	DELAY(1000);
-	addr = READ_REG_1(sc, HIFN_UNLOCK_SECRET1);
-	DELAY(1000);
-	WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, 0);
-	DELAY(1000);
-
-	for (i = 0; i <= 12; i++) {
-		addr = hifn_next_signature(addr, offtbl[i] + 0x101);
-		WRITE_REG_1(sc, HIFN_UNLOCK_SECRET2, addr);
-
-		DELAY(1000);
-	}
-
-	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg | HIFN_PUCNFG_CHIPID);
-	encl = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA;
-
-#ifdef HIFN_DEBUG
-	if (hifn_debug) {
-		if (encl != HIFN_PUSTAT_ENA_1 && encl != HIFN_PUSTAT_ENA_2)
-			device_printf(sc->sc_dev, "Engine is permanently "
-				"locked until next system reset!\n");
-		else
-			device_printf(sc->sc_dev, "Engine enabled "
-				"successfully!\n");
-	}
-#endif
-
-report:
-	WRITE_REG_0(sc, HIFN_0_PUCNFG, ramcfg);
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, dmacfg);
-
-	switch (encl) {
-	case HIFN_PUSTAT_ENA_1:
-	case HIFN_PUSTAT_ENA_2:
-		break;
-	case HIFN_PUSTAT_ENA_0:
-	default:
-		device_printf(sc->sc_dev, "disabled\n");
-		break;
-	}
-
-	return 0;
-}
-
-/*
- * Give initial values to the registers listed in the "Register Space"
- * section of the HIFN Software Development reference manual.
- */
-static void 
-hifn_init_pci_registers(struct hifn_softc *sc)
-{
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/* write fixed values needed by the Initialization registers */
-	WRITE_REG_0(sc, HIFN_0_PUCTRL, HIFN_PUCTRL_DMAENA);
-	WRITE_REG_0(sc, HIFN_0_FIFOCNFG, HIFN_FIFOCNFG_THRESHOLD);
-	WRITE_REG_0(sc, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);
-
-	/* write all 4 ring address registers */
-	WRITE_REG_1(sc, HIFN_1_DMA_CRAR, sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, cmdr[0]));
-	WRITE_REG_1(sc, HIFN_1_DMA_SRAR, sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, srcr[0]));
-	WRITE_REG_1(sc, HIFN_1_DMA_DRAR, sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, dstr[0]));
-	WRITE_REG_1(sc, HIFN_1_DMA_RRAR, sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, resr[0]));
-
-	DELAY(2000);
-
-	/* write status register */
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
-	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS |
-	    HIFN_DMACSR_S_CTRL_DIS | HIFN_DMACSR_C_CTRL_DIS |
-	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_D_DONE | HIFN_DMACSR_D_LAST |
-	    HIFN_DMACSR_D_WAIT | HIFN_DMACSR_D_OVER |
-	    HIFN_DMACSR_R_ABORT | HIFN_DMACSR_R_DONE | HIFN_DMACSR_R_LAST |
-	    HIFN_DMACSR_R_WAIT | HIFN_DMACSR_R_OVER |
-	    HIFN_DMACSR_S_ABORT | HIFN_DMACSR_S_DONE | HIFN_DMACSR_S_LAST |
-	    HIFN_DMACSR_S_WAIT |
-	    HIFN_DMACSR_C_ABORT | HIFN_DMACSR_C_DONE | HIFN_DMACSR_C_LAST |
-	    HIFN_DMACSR_C_WAIT |
-	    HIFN_DMACSR_ENGINE |
-	    ((sc->sc_flags & HIFN_HAS_PUBLIC) ?
-		HIFN_DMACSR_PUBDONE : 0) |
-	    ((sc->sc_flags & HIFN_IS_7811) ?
-		HIFN_DMACSR_ILLW | HIFN_DMACSR_ILLR : 0));
-
-	sc->sc_d_busy = sc->sc_r_busy = sc->sc_s_busy = sc->sc_c_busy = 0;
-	sc->sc_dmaier |= HIFN_DMAIER_R_DONE | HIFN_DMAIER_C_ABORT |
-	    HIFN_DMAIER_D_OVER | HIFN_DMAIER_R_OVER |
-	    HIFN_DMAIER_S_ABORT | HIFN_DMAIER_D_ABORT | HIFN_DMAIER_R_ABORT |
-	    ((sc->sc_flags & HIFN_IS_7811) ?
-		HIFN_DMAIER_ILLW | HIFN_DMAIER_ILLR : 0);
-	sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT;
-	WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
-
-
-	if (sc->sc_flags & HIFN_IS_7956) {
-		u_int32_t pll;
-
-		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING |
-		    HIFN_PUCNFG_TCALLPHASES |
-		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32);
-
-		/* turn off the clocks and insure bypass is set */
-		pll = READ_REG_1(sc, HIFN_1_PLL);
-		pll = (pll &~ (HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL))
-		  | HIFN_PLL_BP | HIFN_PLL_MBSET;
-		WRITE_REG_1(sc, HIFN_1_PLL, pll);
-		DELAY(10*1000);		/* 10ms */
-
-		/* change configuration */
-		pll = (pll &~ HIFN_PLL_CONFIG) | sc->sc_pllconfig;
-		WRITE_REG_1(sc, HIFN_1_PLL, pll);
-		DELAY(10*1000);		/* 10ms */
-
-		/* disable bypass */
-		pll &= ~HIFN_PLL_BP;
-		WRITE_REG_1(sc, HIFN_1_PLL, pll);
-		/* enable clocks with new configuration */
-		pll |= HIFN_PLL_PK_CLK_SEL | HIFN_PLL_PE_CLK_SEL;
-		WRITE_REG_1(sc, HIFN_1_PLL, pll);
-	} else {
-		WRITE_REG_0(sc, HIFN_0_PUCNFG, HIFN_PUCNFG_COMPSING |
-		    HIFN_PUCNFG_DRFR_128 | HIFN_PUCNFG_TCALLPHASES |
-		    HIFN_PUCNFG_TCDRVTOTEM | HIFN_PUCNFG_BUS32 |
-		    (sc->sc_drammodel ? HIFN_PUCNFG_DRAM : HIFN_PUCNFG_SRAM));
-	}
-
-	WRITE_REG_0(sc, HIFN_0_PUISR, HIFN_PUISR_DSTOVER);
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE | HIFN_DMACNFG_LAST |
-	    ((HIFN_POLL_FREQUENCY << 16 ) & HIFN_DMACNFG_POLLFREQ) |
-	    ((HIFN_POLL_SCALAR << 8) & HIFN_DMACNFG_POLLINVAL));
-}
-
-/*
- * The maximum number of sessions supported by the card
- * is dependent on the amount of context ram, which
- * encryption algorithms are enabled, and how compression
- * is configured.  This should be configured before this
- * routine is called.
- */
-static void
-hifn_sessions(struct hifn_softc *sc)
-{
-	u_int32_t pucnfg;
-	int ctxsize;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	pucnfg = READ_REG_0(sc, HIFN_0_PUCNFG);
-
-	if (pucnfg & HIFN_PUCNFG_COMPSING) {
-		if (pucnfg & HIFN_PUCNFG_ENCCNFG)
-			ctxsize = 128;
-		else
-			ctxsize = 512;
-		/*
-		 * 7955/7956 has internal context memory of 32K
-		 */
-		if (sc->sc_flags & HIFN_IS_7956)
-			sc->sc_maxses = 32768 / ctxsize;
-		else
-			sc->sc_maxses = 1 +
-			    ((sc->sc_ramsize - 32768) / ctxsize);
-	} else
-		sc->sc_maxses = sc->sc_ramsize / 16384;
-
-	if (sc->sc_maxses > 2048)
-		sc->sc_maxses = 2048;
-}
-
-/*
- * Determine ram type (sram or dram).  Board should be just out of a reset
- * state when this is called.
- */
-static int
-hifn_ramtype(struct hifn_softc *sc)
-{
-	u_int8_t data[8], dataexpect[8];
-	int i;
-
-	for (i = 0; i < sizeof(data); i++)
-		data[i] = dataexpect[i] = 0x55;
-	if (hifn_writeramaddr(sc, 0, data))
-		return (-1);
-	if (hifn_readramaddr(sc, 0, data))
-		return (-1);
-	if (bcmp(data, dataexpect, sizeof(data)) != 0) {
-		sc->sc_drammodel = 1;
-		return (0);
-	}
-
-	for (i = 0; i < sizeof(data); i++)
-		data[i] = dataexpect[i] = 0xaa;
-	if (hifn_writeramaddr(sc, 0, data))
-		return (-1);
-	if (hifn_readramaddr(sc, 0, data))
-		return (-1);
-	if (bcmp(data, dataexpect, sizeof(data)) != 0) {
-		sc->sc_drammodel = 1;
-		return (0);
-	}
-
-	return (0);
-}
-
-#define	HIFN_SRAM_MAX		(32 << 20)
-#define	HIFN_SRAM_STEP_SIZE	16384
-#define	HIFN_SRAM_GRANULARITY	(HIFN_SRAM_MAX / HIFN_SRAM_STEP_SIZE)
-
-static int
-hifn_sramsize(struct hifn_softc *sc)
-{
-	u_int32_t a;
-	u_int8_t data[8];
-	u_int8_t dataexpect[sizeof(data)];
-	int32_t i;
-
-	for (i = 0; i < sizeof(data); i++)
-		data[i] = dataexpect[i] = i ^ 0x5a;
-
-	for (i = HIFN_SRAM_GRANULARITY - 1; i >= 0; i--) {
-		a = i * HIFN_SRAM_STEP_SIZE;
-		bcopy(&i, data, sizeof(i));
-		hifn_writeramaddr(sc, a, data);
-	}
-
-	for (i = 0; i < HIFN_SRAM_GRANULARITY; i++) {
-		a = i * HIFN_SRAM_STEP_SIZE;
-		bcopy(&i, dataexpect, sizeof(i));
-		if (hifn_readramaddr(sc, a, data) < 0)
-			return (0);
-		if (bcmp(data, dataexpect, sizeof(data)) != 0)
-			return (0);
-		sc->sc_ramsize = a + HIFN_SRAM_STEP_SIZE;
-	}
-
-	return (0);
-}
-
-/*
- * XXX For dram boards, one should really try all of the
- * HIFN_PUCNFG_DSZ_*'s.  This just assumes that PUCNFG
- * is already set up correctly.
- */
-static int
-hifn_dramsize(struct hifn_softc *sc)
-{
-	u_int32_t cnfg;
-
-	if (sc->sc_flags & HIFN_IS_7956) {
-		/*
-		 * 7955/7956 have a fixed internal ram of only 32K.
-		 */
-		sc->sc_ramsize = 32768;
-	} else {
-		cnfg = READ_REG_0(sc, HIFN_0_PUCNFG) &
-		    HIFN_PUCNFG_DRAMMASK;
-		sc->sc_ramsize = 1 << ((cnfg >> 13) + 18);
-	}
-	return (0);
-}
-
-static void
-hifn_alloc_slot(struct hifn_softc *sc, int *cmdp, int *srcp, int *dstp, int *resp)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (dma->cmdi == HIFN_D_CMD_RSIZE) {
-		dma->cmdi = 0;
-		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->cmdr[HIFN_D_CMD_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	}
-	*cmdp = dma->cmdi++;
-	dma->cmdk = dma->cmdi;
-
-	if (dma->srci == HIFN_D_SRC_RSIZE) {
-		dma->srci = 0;
-		dma->srcr[HIFN_D_SRC_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->srcr[HIFN_D_SRC_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	}
-	*srcp = dma->srci++;
-	dma->srck = dma->srci;
-
-	if (dma->dsti == HIFN_D_DST_RSIZE) {
-		dma->dsti = 0;
-		dma->dstr[HIFN_D_DST_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->dstr[HIFN_D_DST_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_DSTR_SYNC(sc, HIFN_D_DST_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	}
-	*dstp = dma->dsti++;
-	dma->dstk = dma->dsti;
-
-	if (dma->resi == HIFN_D_RES_RSIZE) {
-		dma->resi = 0;
-		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->resr[HIFN_D_RES_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	}
-	*resp = dma->resi++;
-	dma->resk = dma->resi;
-}
-
-static int
-hifn_writeramaddr(struct hifn_softc *sc, int addr, u_int8_t *data)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	hifn_base_command_t wc;
-	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ;
-	int r, cmdi, resi, srci, dsti;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	wc.masks = htole16(3 << 13);
-	wc.session_num = htole16(addr >> 14);
-	wc.total_source_count = htole16(8);
-	wc.total_dest_count = htole16(addr & 0x3fff);
-
-	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi);
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
-	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA |
-	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
-
-	/* build write command */
-	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
-	*(hifn_base_command_t *)dma->command_bufs[cmdi] = wc;
-	bcopy(data, &dma->test_src, sizeof(dma->test_src));
-
-	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr
-	    + offsetof(struct hifn_dma, test_src));
-	dma->dstr[dsti].p = htole32(sc->sc_dma_physaddr
-	    + offsetof(struct hifn_dma, test_dst));
-
-	dma->cmdr[cmdi].l = htole32(16 | masks);
-	dma->srcr[srci].l = htole32(8 | masks);
-	dma->dstr[dsti].l = htole32(4 | masks);
-	dma->resr[resi].l = htole32(4 | masks);
-
-	for (r = 10000; r >= 0; r--) {
-		DELAY(10);
-		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0)
-			break;
-	}
-	if (r == 0) {
-		device_printf(sc->sc_dev, "writeramaddr -- "
-		    "result[%d](addr %d) still valid\n", resi, addr);
-		r = -1;
-		return (-1);
-	} else
-		r = 0;
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
-	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS |
-	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS);
-
-	return (r);
-}
-
-static int
-hifn_readramaddr(struct hifn_softc *sc, int addr, u_int8_t *data)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	hifn_base_command_t rc;
-	const u_int32_t masks = HIFN_D_VALID | HIFN_D_LAST | HIFN_D_MASKDONEIRQ;
-	int r, cmdi, srci, dsti, resi;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	rc.masks = htole16(2 << 13);
-	rc.session_num = htole16(addr >> 14);
-	rc.total_source_count = htole16(addr & 0x3fff);
-	rc.total_dest_count = htole16(8);
-
-	hifn_alloc_slot(sc, &cmdi, &srci, &dsti, &resi);
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
-	    HIFN_DMACSR_C_CTRL_ENA | HIFN_DMACSR_S_CTRL_ENA |
-	    HIFN_DMACSR_D_CTRL_ENA | HIFN_DMACSR_R_CTRL_ENA);
-
-	bzero(dma->command_bufs[cmdi], HIFN_MAX_COMMAND);
-	*(hifn_base_command_t *)dma->command_bufs[cmdi] = rc;
-
-	dma->srcr[srci].p = htole32(sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, test_src));
-	dma->test_src = 0;
-	dma->dstr[dsti].p =  htole32(sc->sc_dma_physaddr +
-	    offsetof(struct hifn_dma, test_dst));
-	dma->test_dst = 0;
-	dma->cmdr[cmdi].l = htole32(8 | masks);
-	dma->srcr[srci].l = htole32(8 | masks);
-	dma->dstr[dsti].l = htole32(8 | masks);
-	dma->resr[resi].l = htole32(HIFN_MAX_RESULT | masks);
-
-	for (r = 10000; r >= 0; r--) {
-		DELAY(10);
-		if ((dma->resr[resi].l & htole32(HIFN_D_VALID)) == 0)
-			break;
-	}
-	if (r == 0) {
-		device_printf(sc->sc_dev, "readramaddr -- "
-		    "result[%d](addr %d) still valid\n", resi, addr);
-		r = -1;
-	} else {
-		r = 0;
-		bcopy(&dma->test_dst, data, sizeof(dma->test_dst));
-	}
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR,
-	    HIFN_DMACSR_C_CTRL_DIS | HIFN_DMACSR_S_CTRL_DIS |
-	    HIFN_DMACSR_D_CTRL_DIS | HIFN_DMACSR_R_CTRL_DIS);
-
-	return (r);
-}
-
-/*
- * Initialize the descriptor rings.
- */
-static void 
-hifn_init_dma(struct hifn_softc *sc)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	hifn_set_retry(sc);
-
-	/* initialize static pointer values */
-	for (i = 0; i < HIFN_D_CMD_RSIZE; i++)
-		dma->cmdr[i].p = htole32(sc->sc_dma_physaddr +
-		    offsetof(struct hifn_dma, command_bufs[i][0]));
-	for (i = 0; i < HIFN_D_RES_RSIZE; i++)
-		dma->resr[i].p = htole32(sc->sc_dma_physaddr +
-		    offsetof(struct hifn_dma, result_bufs[i][0]));
-
-	dma->cmdr[HIFN_D_CMD_RSIZE].p =
-	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, cmdr[0]));
-	dma->srcr[HIFN_D_SRC_RSIZE].p =
-	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, srcr[0]));
-	dma->dstr[HIFN_D_DST_RSIZE].p =
-	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, dstr[0]));
-	dma->resr[HIFN_D_RES_RSIZE].p =
-	    htole32(sc->sc_dma_physaddr + offsetof(struct hifn_dma, resr[0]));
-
-	dma->cmdu = dma->srcu = dma->dstu = dma->resu = 0;
-	dma->cmdi = dma->srci = dma->dsti = dma->resi = 0;
-	dma->cmdk = dma->srck = dma->dstk = dma->resk = 0;
-}
-
-/*
- * Writes out the raw command buffer space.  Returns the
- * command buffer size.
- */
-static u_int
-hifn_write_command(struct hifn_command *cmd, u_int8_t *buf)
-{
-	struct hifn_softc *sc = NULL;
-	u_int8_t *buf_pos;
-	hifn_base_command_t *base_cmd;
-	hifn_mac_command_t *mac_cmd;
-	hifn_crypt_command_t *cry_cmd;
-	int using_mac, using_crypt, len, ivlen;
-	u_int32_t dlen, slen;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	buf_pos = buf;
-	using_mac = cmd->base_masks & HIFN_BASE_CMD_MAC;
-	using_crypt = cmd->base_masks & HIFN_BASE_CMD_CRYPT;
-
-	base_cmd = (hifn_base_command_t *)buf_pos;
-	base_cmd->masks = htole16(cmd->base_masks);
-	slen = cmd->src_mapsize;
-	if (cmd->sloplen)
-		dlen = cmd->dst_mapsize - cmd->sloplen + sizeof(u_int32_t);
-	else
-		dlen = cmd->dst_mapsize;
-	base_cmd->total_source_count = htole16(slen & HIFN_BASE_CMD_LENMASK_LO);
-	base_cmd->total_dest_count = htole16(dlen & HIFN_BASE_CMD_LENMASK_LO);
-	dlen >>= 16;
-	slen >>= 16;
-	base_cmd->session_num = htole16(
-	    ((slen << HIFN_BASE_CMD_SRCLEN_S) & HIFN_BASE_CMD_SRCLEN_M) |
-	    ((dlen << HIFN_BASE_CMD_DSTLEN_S) & HIFN_BASE_CMD_DSTLEN_M));
-	buf_pos += sizeof(hifn_base_command_t);
-
-	if (using_mac) {
-		mac_cmd = (hifn_mac_command_t *)buf_pos;
-		dlen = cmd->maccrd->crd_len;
-		mac_cmd->source_count = htole16(dlen & 0xffff);
-		dlen >>= 16;
-		mac_cmd->masks = htole16(cmd->mac_masks |
-		    ((dlen << HIFN_MAC_CMD_SRCLEN_S) & HIFN_MAC_CMD_SRCLEN_M));
-		mac_cmd->header_skip = htole16(cmd->maccrd->crd_skip);
-		mac_cmd->reserved = 0;
-		buf_pos += sizeof(hifn_mac_command_t);
-	}
-
-	if (using_crypt) {
-		cry_cmd = (hifn_crypt_command_t *)buf_pos;
-		dlen = cmd->enccrd->crd_len;
-		cry_cmd->source_count = htole16(dlen & 0xffff);
-		dlen >>= 16;
-		cry_cmd->masks = htole16(cmd->cry_masks |
-		    ((dlen << HIFN_CRYPT_CMD_SRCLEN_S) & HIFN_CRYPT_CMD_SRCLEN_M));
-		cry_cmd->header_skip = htole16(cmd->enccrd->crd_skip);
-		cry_cmd->reserved = 0;
-		buf_pos += sizeof(hifn_crypt_command_t);
-	}
-
-	if (using_mac && cmd->mac_masks & HIFN_MAC_CMD_NEW_KEY) {
-		bcopy(cmd->mac, buf_pos, HIFN_MAC_KEY_LENGTH);
-		buf_pos += HIFN_MAC_KEY_LENGTH;
-	}
-
-	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_KEY) {
-		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) {
-		case HIFN_CRYPT_CMD_ALG_3DES:
-			bcopy(cmd->ck, buf_pos, HIFN_3DES_KEY_LENGTH);
-			buf_pos += HIFN_3DES_KEY_LENGTH;
-			break;
-		case HIFN_CRYPT_CMD_ALG_DES:
-			bcopy(cmd->ck, buf_pos, HIFN_DES_KEY_LENGTH);
-			buf_pos += HIFN_DES_KEY_LENGTH;
-			break;
-		case HIFN_CRYPT_CMD_ALG_RC4:
-			len = 256;
-			do {
-				int clen;
-
-				clen = MIN(cmd->cklen, len);
-				bcopy(cmd->ck, buf_pos, clen);
-				len -= clen;
-				buf_pos += clen;
-			} while (len > 0);
-			bzero(buf_pos, 4);
-			buf_pos += 4;
-			break;
-		case HIFN_CRYPT_CMD_ALG_AES:
-			/*
-			 * AES keys are variable 128, 192 and
-			 * 256 bits (16, 24 and 32 bytes).
-			 */
-			bcopy(cmd->ck, buf_pos, cmd->cklen);
-			buf_pos += cmd->cklen;
-			break;
-		}
-	}
-
-	if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_IV) {
-		switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) {
-		case HIFN_CRYPT_CMD_ALG_AES:
-			ivlen = HIFN_AES_IV_LENGTH;
-			break;
-		default:
-			ivlen = HIFN_IV_LENGTH;
-			break;
-		}
-		bcopy(cmd->iv, buf_pos, ivlen);
-		buf_pos += ivlen;
-	}
-
-	if ((cmd->base_masks & (HIFN_BASE_CMD_MAC|HIFN_BASE_CMD_CRYPT)) == 0) {
-		bzero(buf_pos, 8);
-		buf_pos += 8;
-	}
-
-	return (buf_pos - buf);
-}
-
-static int
-hifn_dmamap_aligned(struct hifn_operand *op)
-{
-	struct hifn_softc *sc = NULL;
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	for (i = 0; i < op->nsegs; i++) {
-		if (op->segs[i].ds_addr & 3)
-			return (0);
-		if ((i != (op->nsegs - 1)) && (op->segs[i].ds_len & 3))
-			return (0);
-	}
-	return (1);
-}
-
-static __inline int
-hifn_dmamap_dstwrap(struct hifn_softc *sc, int idx)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-
-	if (++idx == HIFN_D_DST_RSIZE) {
-		dma->dstr[idx].l = htole32(HIFN_D_VALID | HIFN_D_JUMP |
-		    HIFN_D_MASKDONEIRQ);
-		HIFN_DSTR_SYNC(sc, idx,
-		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-		idx = 0;
-	}
-	return (idx);
-}
-
-static int
-hifn_dmamap_load_dst(struct hifn_softc *sc, struct hifn_command *cmd)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	struct hifn_operand *dst = &cmd->dst;
-	u_int32_t p, l;
-	int idx, used = 0, i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	idx = dma->dsti;
-	for (i = 0; i < dst->nsegs - 1; i++) {
-		dma->dstr[idx].p = htole32(dst->segs[i].ds_addr);
-		dma->dstr[idx].l = htole32(HIFN_D_MASKDONEIRQ | dst->segs[i].ds_len);
-		wmb();
-		dma->dstr[idx].l |= htole32(HIFN_D_VALID);
-		HIFN_DSTR_SYNC(sc, idx,
-		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-		used++;
-
-		idx = hifn_dmamap_dstwrap(sc, idx);
-	}
-
-	if (cmd->sloplen == 0) {
-		p = dst->segs[i].ds_addr;
-		l = HIFN_D_MASKDONEIRQ | HIFN_D_LAST |
-		    dst->segs[i].ds_len;
-	} else {
-		p = sc->sc_dma_physaddr +
-		    offsetof(struct hifn_dma, slop[cmd->slopidx]);
-		l = HIFN_D_MASKDONEIRQ | HIFN_D_LAST |
-		    sizeof(u_int32_t);
-
-		if ((dst->segs[i].ds_len - cmd->sloplen) != 0) {
-			dma->dstr[idx].p = htole32(dst->segs[i].ds_addr);
-			dma->dstr[idx].l = htole32(HIFN_D_MASKDONEIRQ |
-			    (dst->segs[i].ds_len - cmd->sloplen));
-			wmb();
-			dma->dstr[idx].l |= htole32(HIFN_D_VALID);
-			HIFN_DSTR_SYNC(sc, idx,
-			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-			used++;
-
-			idx = hifn_dmamap_dstwrap(sc, idx);
-		}
-	}
-	dma->dstr[idx].p = htole32(p);
-	dma->dstr[idx].l = htole32(l);
-	wmb();
-	dma->dstr[idx].l |= htole32(HIFN_D_VALID);
-	HIFN_DSTR_SYNC(sc, idx, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-	used++;
-
-	idx = hifn_dmamap_dstwrap(sc, idx);
-
-	dma->dsti = idx;
-	dma->dstu += used;
-	return (idx);
-}
-
-static __inline int
-hifn_dmamap_srcwrap(struct hifn_softc *sc, int idx)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-
-	if (++idx == HIFN_D_SRC_RSIZE) {
-		dma->srcr[idx].l = htole32(HIFN_D_VALID |
-		    HIFN_D_JUMP | HIFN_D_MASKDONEIRQ);
-		HIFN_SRCR_SYNC(sc, HIFN_D_SRC_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-		idx = 0;
-	}
-	return (idx);
-}
-
-static int
-hifn_dmamap_load_src(struct hifn_softc *sc, struct hifn_command *cmd)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	struct hifn_operand *src = &cmd->src;
-	int idx, i;
-	u_int32_t last = 0;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	idx = dma->srci;
-	for (i = 0; i < src->nsegs; i++) {
-		if (i == src->nsegs - 1)
-			last = HIFN_D_LAST;
-
-		dma->srcr[idx].p = htole32(src->segs[i].ds_addr);
-		dma->srcr[idx].l = htole32(src->segs[i].ds_len |
-		    HIFN_D_MASKDONEIRQ | last);
-		wmb();
-		dma->srcr[idx].l |= htole32(HIFN_D_VALID);
-		HIFN_SRCR_SYNC(sc, idx,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-
-		idx = hifn_dmamap_srcwrap(sc, idx);
-	}
-	dma->srci = idx;
-	dma->srcu += src->nsegs;
-	return (idx);
-} 
-
-
-static int 
-hifn_crypto(
-	struct hifn_softc *sc,
-	struct hifn_command *cmd,
-	struct cryptop *crp,
-	int hint)
-{
-	struct	hifn_dma *dma = sc->sc_dma;
-	u_int32_t cmdlen, csr;
-	int cmdi, resi, err = 0;
-	unsigned long l_flags;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/*
-	 * need 1 cmd, and 1 res
-	 *
-	 * NB: check this first since it's easy.
-	 */
-	HIFN_LOCK(sc);
-	if ((dma->cmdu + 1) > HIFN_D_CMD_RSIZE ||
-	    (dma->resu + 1) > HIFN_D_RES_RSIZE) {
-#ifdef HIFN_DEBUG
-		if (hifn_debug) {
-			device_printf(sc->sc_dev,
-				"cmd/result exhaustion, cmdu %u resu %u\n",
-				dma->cmdu, dma->resu);
-		}
-#endif
-		hifnstats.hst_nomem_cr++;
-		sc->sc_needwakeup |= CRYPTO_SYMQ;
-		HIFN_UNLOCK(sc);
-		return (ERESTART);
-	}
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		if (pci_map_skb(sc, &cmd->src, cmd->src_skb)) {
-			hifnstats.hst_nomem_load++;
-			err = ENOMEM;
-			goto err_srcmap1;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		if (pci_map_uio(sc, &cmd->src, cmd->src_io)) {
-			hifnstats.hst_nomem_load++;
-			err = ENOMEM;
-			goto err_srcmap1;
-		}
-	} else {
-		if (pci_map_buf(sc, &cmd->src, cmd->src_buf, crp->crp_ilen)) {
-			hifnstats.hst_nomem_load++;
-			err = ENOMEM;
-			goto err_srcmap1;
-		}
-	}
-
-	if (hifn_dmamap_aligned(&cmd->src)) {
-		cmd->sloplen = cmd->src_mapsize & 3;
-		cmd->dst = cmd->src;
-	} else {
-		if (crp->crp_flags & CRYPTO_F_IOV) {
-			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-			err = EINVAL;
-			goto err_srcmap;
-		} else if (crp->crp_flags & CRYPTO_F_SKBUF) {
-#ifdef NOTYET
-			int totlen, len;
-			struct mbuf *m, *m0, *mlast;
-
-			KASSERT(cmd->dst_m == cmd->src_m,
-				("hifn_crypto: dst_m initialized improperly"));
-			hifnstats.hst_unaligned++;
-			/*
-			 * Source is not aligned on a longword boundary.
-			 * Copy the data to insure alignment.  If we fail
-			 * to allocate mbufs or clusters while doing this
-			 * we return ERESTART so the operation is requeued
-			 * at the crypto later, but only if there are
-			 * ops already posted to the hardware; otherwise we
-			 * have no guarantee that we'll be re-entered.
-			 */
-			totlen = cmd->src_mapsize;
-			if (cmd->src_m->m_flags & M_PKTHDR) {
-				len = MHLEN;
-				MGETHDR(m0, M_DONTWAIT, MT_DATA);
-				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
-					m_free(m0);
-					m0 = NULL;
-				}
-			} else {
-				len = MLEN;
-				MGET(m0, M_DONTWAIT, MT_DATA);
-			}
-			if (m0 == NULL) {
-				hifnstats.hst_nomem_mbuf++;
-				err = dma->cmdu ? ERESTART : ENOMEM;
-				goto err_srcmap;
-			}
-			if (totlen >= MINCLSIZE) {
-				MCLGET(m0, M_DONTWAIT);
-				if ((m0->m_flags & M_EXT) == 0) {
-					hifnstats.hst_nomem_mcl++;
-					err = dma->cmdu ? ERESTART : ENOMEM;
-					m_freem(m0);
-					goto err_srcmap;
-				}
-				len = MCLBYTES;
-			}
-			totlen -= len;
-			m0->m_pkthdr.len = m0->m_len = len;
-			mlast = m0;
-
-			while (totlen > 0) {
-				MGET(m, M_DONTWAIT, MT_DATA);
-				if (m == NULL) {
-					hifnstats.hst_nomem_mbuf++;
-					err = dma->cmdu ? ERESTART : ENOMEM;
-					m_freem(m0);
-					goto err_srcmap;
-				}
-				len = MLEN;
-				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_DONTWAIT);
-					if ((m->m_flags & M_EXT) == 0) {
-						hifnstats.hst_nomem_mcl++;
-						err = dma->cmdu ? ERESTART : ENOMEM;
-						mlast->m_next = m;
-						m_freem(m0);
-						goto err_srcmap;
-					}
-					len = MCLBYTES;
-				}
-
-				m->m_len = len;
-				m0->m_pkthdr.len += len;
-				totlen -= len;
-
-				mlast->m_next = m;
-				mlast = m;
-			}
-			cmd->dst_m = m0;
-#else
-			device_printf(sc->sc_dev,
-					"%s,%d: CRYPTO_F_SKBUF unaligned not implemented\n",
-					__FILE__, __LINE__);
-			err = EINVAL;
-			goto err_srcmap;
-#endif
-		} else {
-			device_printf(sc->sc_dev,
-					"%s,%d: unaligned contig buffers not implemented\n",
-					__FILE__, __LINE__);
-			err = EINVAL;
-			goto err_srcmap;
-		}
-	}
-
-	if (cmd->dst_map == NULL) {
-		if (crp->crp_flags & CRYPTO_F_SKBUF) {
-			if (pci_map_skb(sc, &cmd->dst, cmd->dst_skb)) {
-				hifnstats.hst_nomem_map++;
-				err = ENOMEM;
-				goto err_dstmap1;
-			}
-		} else if (crp->crp_flags & CRYPTO_F_IOV) {
-			if (pci_map_uio(sc, &cmd->dst, cmd->dst_io)) {
-				hifnstats.hst_nomem_load++;
-				err = ENOMEM;
-				goto err_dstmap1;
-			}
-		} else {
-			if (pci_map_buf(sc, &cmd->dst, cmd->dst_buf, crp->crp_ilen)) {
-				hifnstats.hst_nomem_load++;
-				err = ENOMEM;
-				goto err_dstmap1;
-			}
-		}
-	}
-
-#ifdef HIFN_DEBUG
-	if (hifn_debug) {
-		device_printf(sc->sc_dev,
-		    "Entering cmd: stat %8x ien %8x u %d/%d/%d/%d n %d/%d\n",
-		    READ_REG_1(sc, HIFN_1_DMA_CSR),
-		    READ_REG_1(sc, HIFN_1_DMA_IER),
-		    dma->cmdu, dma->srcu, dma->dstu, dma->resu,
-		    cmd->src_nsegs, cmd->dst_nsegs);
-	}
-#endif
-
-#if 0
-	if (cmd->src_map == cmd->dst_map) {
-		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-		    BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
-	} else {
-		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-		    BUS_DMASYNC_PREWRITE);
-		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
-		    BUS_DMASYNC_PREREAD);
-	}
-#endif
-
-	/*
-	 * need N src, and N dst
-	 */
-	if ((dma->srcu + cmd->src_nsegs) > HIFN_D_SRC_RSIZE ||
-	    (dma->dstu + cmd->dst_nsegs + 1) > HIFN_D_DST_RSIZE) {
-#ifdef HIFN_DEBUG
-		if (hifn_debug) {
-			device_printf(sc->sc_dev,
-				"src/dst exhaustion, srcu %u+%u dstu %u+%u\n",
-				dma->srcu, cmd->src_nsegs,
-				dma->dstu, cmd->dst_nsegs);
-		}
-#endif
-		hifnstats.hst_nomem_sd++;
-		err = ERESTART;
-		goto err_dstmap;
-	}
-
-	if (dma->cmdi == HIFN_D_CMD_RSIZE) {
-		dma->cmdi = 0;
-		dma->cmdr[HIFN_D_CMD_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->cmdr[HIFN_D_CMD_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_CMDR_SYNC(sc, HIFN_D_CMD_RSIZE,
-		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	}
-	cmdi = dma->cmdi++;
-	cmdlen = hifn_write_command(cmd, dma->command_bufs[cmdi]);
-	HIFN_CMD_SYNC(sc, cmdi, BUS_DMASYNC_PREWRITE);
-
-	/* .p for command/result already set */
-	dma->cmdr[cmdi].l = htole32(cmdlen | HIFN_D_LAST |
-	    HIFN_D_MASKDONEIRQ);
-	wmb();
-	dma->cmdr[cmdi].l |= htole32(HIFN_D_VALID);
-	HIFN_CMDR_SYNC(sc, cmdi,
-	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
-	dma->cmdu++;
-
-	/*
-	 * We don't worry about missing an interrupt (which a "command wait"
-	 * interrupt salvages us from), unless there is more than one command
-	 * in the queue.
-	 */
-	if (dma->cmdu > 1) {
-		sc->sc_dmaier |= HIFN_DMAIER_C_WAIT;
-		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
-	}
-
-	hifnstats.hst_ipackets++;
-	hifnstats.hst_ibytes += cmd->src_mapsize;
-
-	hifn_dmamap_load_src(sc, cmd);
-
-	/*
-	 * Unlike other descriptors, we don't mask done interrupt from
-	 * result descriptor.
-	 */
-#ifdef HIFN_DEBUG
-	if (hifn_debug)
-		device_printf(sc->sc_dev, "load res\n");
-#endif
-	if (dma->resi == HIFN_D_RES_RSIZE) {
-		dma->resi = 0;
-		dma->resr[HIFN_D_RES_RSIZE].l = htole32(HIFN_D_JUMP|HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->resr[HIFN_D_RES_RSIZE].l |= htole32(HIFN_D_VALID);
-		HIFN_RESR_SYNC(sc, HIFN_D_RES_RSIZE,
-		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-	}
-	resi = dma->resi++;
-	KASSERT(dma->hifn_commands[resi] == NULL,
-		("hifn_crypto: command slot %u busy", resi));
-	dma->hifn_commands[resi] = cmd;
-	HIFN_RES_SYNC(sc, resi, BUS_DMASYNC_PREREAD);
-	if ((hint & CRYPTO_HINT_MORE) && sc->sc_curbatch < hifn_maxbatch) {
-		dma->resr[resi].l = htole32(HIFN_MAX_RESULT |
-		    HIFN_D_LAST | HIFN_D_MASKDONEIRQ);
-		wmb();
-		dma->resr[resi].l |= htole32(HIFN_D_VALID);
-		sc->sc_curbatch++;
-		if (sc->sc_curbatch > hifnstats.hst_maxbatch)
-			hifnstats.hst_maxbatch = sc->sc_curbatch;
-		hifnstats.hst_totbatch++;
-	} else {
-		dma->resr[resi].l = htole32(HIFN_MAX_RESULT | HIFN_D_LAST);
-		wmb();
-		dma->resr[resi].l |= htole32(HIFN_D_VALID);
-		sc->sc_curbatch = 0;
-	}
-	HIFN_RESR_SYNC(sc, resi,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-	dma->resu++;
-
-	if (cmd->sloplen)
-		cmd->slopidx = resi;
-
-	hifn_dmamap_load_dst(sc, cmd);
-
-	csr = 0;
-	if (sc->sc_c_busy == 0) {
-		csr |= HIFN_DMACSR_C_CTRL_ENA;
-		sc->sc_c_busy = 1;
-	}
-	if (sc->sc_s_busy == 0) {
-		csr |= HIFN_DMACSR_S_CTRL_ENA;
-		sc->sc_s_busy = 1;
-	}
-	if (sc->sc_r_busy == 0) {
-		csr |= HIFN_DMACSR_R_CTRL_ENA;
-		sc->sc_r_busy = 1;
-	}
-	if (sc->sc_d_busy == 0) {
-		csr |= HIFN_DMACSR_D_CTRL_ENA;
-		sc->sc_d_busy = 1;
-	}
-	if (csr)
-		WRITE_REG_1(sc, HIFN_1_DMA_CSR, csr);
-
-#ifdef HIFN_DEBUG
-	if (hifn_debug) {
-		device_printf(sc->sc_dev, "command: stat %8x ier %8x\n",
-		    READ_REG_1(sc, HIFN_1_DMA_CSR),
-		    READ_REG_1(sc, HIFN_1_DMA_IER));
-	}
-#endif
-
-	sc->sc_active = 5;
-	HIFN_UNLOCK(sc);
-	KASSERT(err == 0, ("hifn_crypto: success with error %u", err));
-	return (err);		/* success */
-
-err_dstmap:
-	if (cmd->src_map != cmd->dst_map)
-		pci_unmap_buf(sc, &cmd->dst);
-err_dstmap1:
-err_srcmap:
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		if (cmd->src_skb != cmd->dst_skb)
-#ifdef NOTYET
-			m_freem(cmd->dst_m);
-#else
-			device_printf(sc->sc_dev,
-					"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
-					__FILE__, __LINE__);
-#endif
-	}
-	pci_unmap_buf(sc, &cmd->src);
-err_srcmap1:
-	HIFN_UNLOCK(sc);
-	return (err);
-}
-
-static void
-hifn_tick(unsigned long arg)
-{
-	struct hifn_softc *sc;
-	unsigned long l_flags;
-
-	if (arg >= HIFN_MAX_CHIPS)
-		return;
-	sc = hifn_chip_idx[arg];
-	if (!sc)
-		return;
-
-	HIFN_LOCK(sc);
-	if (sc->sc_active == 0) {
-		struct hifn_dma *dma = sc->sc_dma;
-		u_int32_t r = 0;
-
-		if (dma->cmdu == 0 && sc->sc_c_busy) {
-			sc->sc_c_busy = 0;
-			r |= HIFN_DMACSR_C_CTRL_DIS;
-		}
-		if (dma->srcu == 0 && sc->sc_s_busy) {
-			sc->sc_s_busy = 0;
-			r |= HIFN_DMACSR_S_CTRL_DIS;
-		}
-		if (dma->dstu == 0 && sc->sc_d_busy) {
-			sc->sc_d_busy = 0;
-			r |= HIFN_DMACSR_D_CTRL_DIS;
-		}
-		if (dma->resu == 0 && sc->sc_r_busy) {
-			sc->sc_r_busy = 0;
-			r |= HIFN_DMACSR_R_CTRL_DIS;
-		}
-		if (r)
-			WRITE_REG_1(sc, HIFN_1_DMA_CSR, r);
-	} else
-		sc->sc_active--;
-	HIFN_UNLOCK(sc);
-	mod_timer(&sc->sc_tickto, jiffies + HZ);
-}
-
-static irqreturn_t
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-hifn_intr(int irq, void *arg)
-#else
-hifn_intr(int irq, void *arg, struct pt_regs *regs)
-#endif
-{
-	struct hifn_softc *sc = arg;
-	struct hifn_dma *dma;
-	u_int32_t dmacsr, restart;
-	int i, u;
-	unsigned long l_flags;
-
-	dmacsr = READ_REG_1(sc, HIFN_1_DMA_CSR);
-
-	/* Nothing in the DMA unit interrupted */
-	if ((dmacsr & sc->sc_dmaier) == 0)
-		return IRQ_NONE;
-
-	HIFN_LOCK(sc);
-
-	dma = sc->sc_dma;
-
-#ifdef HIFN_DEBUG
-	if (hifn_debug) {
-		device_printf(sc->sc_dev,
-		    "irq: stat %08x ien %08x damier %08x i %d/%d/%d/%d k %d/%d/%d/%d u %d/%d/%d/%d\n",
-		    dmacsr, READ_REG_1(sc, HIFN_1_DMA_IER), sc->sc_dmaier,
-		    dma->cmdi, dma->srci, dma->dsti, dma->resi,
-		    dma->cmdk, dma->srck, dma->dstk, dma->resk,
-		    dma->cmdu, dma->srcu, dma->dstu, dma->resu);
-	}
-#endif
-
-	WRITE_REG_1(sc, HIFN_1_DMA_CSR, dmacsr & sc->sc_dmaier);
-
-	if ((sc->sc_flags & HIFN_HAS_PUBLIC) &&
-	    (dmacsr & HIFN_DMACSR_PUBDONE))
-		WRITE_REG_1(sc, HIFN_1_PUB_STATUS,
-		    READ_REG_1(sc, HIFN_1_PUB_STATUS) | HIFN_PUBSTS_DONE);
-
-	restart = dmacsr & (HIFN_DMACSR_D_OVER | HIFN_DMACSR_R_OVER);
-	if (restart)
-		device_printf(sc->sc_dev, "overrun %x\n", dmacsr);
-
-	if (sc->sc_flags & HIFN_IS_7811) {
-		if (dmacsr & HIFN_DMACSR_ILLR)
-			device_printf(sc->sc_dev, "illegal read\n");
-		if (dmacsr & HIFN_DMACSR_ILLW)
-			device_printf(sc->sc_dev, "illegal write\n");
-	}
-
-	restart = dmacsr & (HIFN_DMACSR_C_ABORT | HIFN_DMACSR_S_ABORT |
-	    HIFN_DMACSR_D_ABORT | HIFN_DMACSR_R_ABORT);
-	if (restart) {
-		device_printf(sc->sc_dev, "abort, resetting.\n");
-		hifnstats.hst_abort++;
-		hifn_abort(sc);
-		HIFN_UNLOCK(sc);
-		return IRQ_HANDLED;
-	}
-
-	if ((dmacsr & HIFN_DMACSR_C_WAIT) && (dma->cmdu == 0)) {
-		/*
-		 * If no slots to process and we receive a "waiting on
-		 * command" interrupt, we disable the "waiting on command"
-		 * (by clearing it).
-		 */
-		sc->sc_dmaier &= ~HIFN_DMAIER_C_WAIT;
-		WRITE_REG_1(sc, HIFN_1_DMA_IER, sc->sc_dmaier);
-	}
-
-	/* clear the rings */
-	i = dma->resk; u = dma->resu;
-	while (u != 0) {
-		HIFN_RESR_SYNC(sc, i,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-		if (dma->resr[i].l & htole32(HIFN_D_VALID)) {
-			HIFN_RESR_SYNC(sc, i,
-			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-			break;
-		}
-
-		if (i != HIFN_D_RES_RSIZE) {
-			struct hifn_command *cmd;
-			u_int8_t *macbuf = NULL;
-
-			HIFN_RES_SYNC(sc, i, BUS_DMASYNC_POSTREAD);
-			cmd = dma->hifn_commands[i];
-			KASSERT(cmd != NULL,
-				("hifn_intr: null command slot %u", i));
-			dma->hifn_commands[i] = NULL;
-
-			if (cmd->base_masks & HIFN_BASE_CMD_MAC) {
-				macbuf = dma->result_bufs[i];
-				macbuf += 12;
-			}
-
-			hifn_callback(sc, cmd, macbuf);
-			hifnstats.hst_opackets++;
-			u--;
-		}
-
-		if (++i == (HIFN_D_RES_RSIZE + 1))
-			i = 0;
-	}
-	dma->resk = i; dma->resu = u;
-
-	i = dma->srck; u = dma->srcu;
-	while (u != 0) {
-		if (i == HIFN_D_SRC_RSIZE)
-			i = 0;
-		HIFN_SRCR_SYNC(sc, i,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-		if (dma->srcr[i].l & htole32(HIFN_D_VALID)) {
-			HIFN_SRCR_SYNC(sc, i,
-			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-			break;
-		}
-		i++, u--;
-	}
-	dma->srck = i; dma->srcu = u;
-
-	i = dma->cmdk; u = dma->cmdu;
-	while (u != 0) {
-		HIFN_CMDR_SYNC(sc, i,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-		if (dma->cmdr[i].l & htole32(HIFN_D_VALID)) {
-			HIFN_CMDR_SYNC(sc, i,
-			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-			break;
-		}
-		if (i != HIFN_D_CMD_RSIZE) {
-			u--;
-			HIFN_CMD_SYNC(sc, i, BUS_DMASYNC_POSTWRITE);
-		}
-		if (++i == (HIFN_D_CMD_RSIZE + 1))
-			i = 0;
-	}
-	dma->cmdk = i; dma->cmdu = u;
-
-	HIFN_UNLOCK(sc);
-
-	if (sc->sc_needwakeup) {		/* XXX check high watermark */
-		int wakeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ);
-#ifdef HIFN_DEBUG
-		if (hifn_debug)
-			device_printf(sc->sc_dev,
-				"wakeup crypto (%x) u %d/%d/%d/%d\n",
-				sc->sc_needwakeup,
-				dma->cmdu, dma->srcu, dma->dstu, dma->resu);
-#endif
-		sc->sc_needwakeup &= ~wakeup;
-		crypto_unblock(sc->sc_cid, wakeup);
-	}
-
-	return IRQ_HANDLED;
-}
-
-/*
- * Allocate a new 'session' and return an encoded session id.  'sidp'
- * contains our registration id, and should contain an encoded session
- * id on successful allocation.
- */
-static int
-hifn_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
-{
-	struct hifn_softc *sc = device_get_softc(dev);
-	struct cryptoini *c;
-	int mac = 0, cry = 0, sesn;
-	struct hifn_session *ses = NULL;
-	unsigned long l_flags;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	KASSERT(sc != NULL, ("hifn_newsession: null softc"));
-	if (sidp == NULL || cri == NULL || sc == NULL) {
-		DPRINTF("%s,%d: %s - EINVAL\n", __FILE__, __LINE__, __FUNCTION__);
-		return (EINVAL);
-	}
-
-	HIFN_LOCK(sc);
-	if (sc->sc_sessions == NULL) {
-		ses = sc->sc_sessions = (struct hifn_session *)kmalloc(sizeof(*ses),
-				SLAB_ATOMIC);
-		if (ses == NULL) {
-			HIFN_UNLOCK(sc);
-			return (ENOMEM);
-		}
-		sesn = 0;
-		sc->sc_nsessions = 1;
-	} else {
-		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
-			if (!sc->sc_sessions[sesn].hs_used) {
-				ses = &sc->sc_sessions[sesn];
-				break;
-			}
-		}
-
-		if (ses == NULL) {
-			sesn = sc->sc_nsessions;
-			ses = (struct hifn_session *)kmalloc((sesn + 1) * sizeof(*ses),
-					SLAB_ATOMIC);
-			if (ses == NULL) {
-				HIFN_UNLOCK(sc);
-				return (ENOMEM);
-			}
-			bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
-			bzero(sc->sc_sessions, sesn * sizeof(*ses));
-			kfree(sc->sc_sessions);
-			sc->sc_sessions = ses;
-			ses = &sc->sc_sessions[sesn];
-			sc->sc_nsessions++;
-		}
-	}
-	HIFN_UNLOCK(sc);
-
-	bzero(ses, sizeof(*ses));
-	ses->hs_used = 1;
-
-	for (c = cri; c != NULL; c = c->cri_next) {
-		switch (c->cri_alg) {
-		case CRYPTO_MD5:
-		case CRYPTO_SHA1:
-		case CRYPTO_MD5_HMAC:
-		case CRYPTO_SHA1_HMAC:
-			if (mac) {
-				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-				return (EINVAL);
-			}
-			mac = 1;
-			ses->hs_mlen = c->cri_mlen;
-			if (ses->hs_mlen == 0) {
-				switch (c->cri_alg) {
-				case CRYPTO_MD5:
-				case CRYPTO_MD5_HMAC:
-					ses->hs_mlen = 16;
-					break;
-				case CRYPTO_SHA1:
-				case CRYPTO_SHA1_HMAC:
-					ses->hs_mlen = 20;
-					break;
-				}
-			}
-			break;
-		case CRYPTO_DES_CBC:
-		case CRYPTO_3DES_CBC:
-		case CRYPTO_AES_CBC:
-			/* XXX this may read fewer, does it matter? */
-			read_random(ses->hs_iv,
-				c->cri_alg == CRYPTO_AES_CBC ?
-					HIFN_AES_IV_LENGTH : HIFN_IV_LENGTH);
-			/*FALLTHROUGH*/
-		case CRYPTO_ARC4:
-			if (cry) {
-				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-				return (EINVAL);
-			}
-			cry = 1;
-			break;
-		default:
-			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-			return (EINVAL);
-		}
-	}
-	if (mac == 0 && cry == 0) {
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		return (EINVAL);
-	}
-
-	*sidp = HIFN_SID(device_get_unit(sc->sc_dev), sesn);
-
-	return (0);
-}
-
-/*
- * Deallocate a session.
- * XXX this routine should run a zero'd mac/encrypt key into context ram.
- * XXX to blow away any keys already stored there.
- */
-static int
-hifn_freesession(device_t dev, u_int64_t tid)
-{
-	struct hifn_softc *sc = device_get_softc(dev);
-	int session, error;
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-	unsigned long l_flags;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	KASSERT(sc != NULL, ("hifn_freesession: null softc"));
-	if (sc == NULL) {
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		return (EINVAL);
-	}
-
-	HIFN_LOCK(sc);
-	session = HIFN_SESSION(sid);
-	if (session < sc->sc_nsessions) {
-		bzero(&sc->sc_sessions[session], sizeof(struct hifn_session));
-		error = 0;
-	} else {
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		error = EINVAL;
-	}
-	HIFN_UNLOCK(sc);
-
-	return (error);
-}
-
-static int
-hifn_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct hifn_softc *sc = device_get_softc(dev);
-	struct hifn_command *cmd = NULL;
-	int session, err, ivlen;
-	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (crp == NULL || crp->crp_callback == NULL) {
-		hifnstats.hst_invalid++;
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		return (EINVAL);
-	}
-	session = HIFN_SESSION(crp->crp_sid);
-
-	if (sc == NULL || session >= sc->sc_nsessions) {
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		err = EINVAL;
-		goto errout;
-	}
-
-	cmd = kmalloc(sizeof(struct hifn_command), SLAB_ATOMIC);
-	if (cmd == NULL) {
-		hifnstats.hst_nomem++;
-		err = ENOMEM;
-		goto errout;
-	}
-	memset(cmd, 0, sizeof(*cmd));
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		cmd->src_skb = (struct sk_buff *)crp->crp_buf;
-		cmd->dst_skb = (struct sk_buff *)crp->crp_buf;
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		cmd->src_io = (struct uio *)crp->crp_buf;
-		cmd->dst_io = (struct uio *)crp->crp_buf;
-	} else {
-		cmd->src_buf = crp->crp_buf;
-		cmd->dst_buf = crp->crp_buf;
-	}
-
-	crd1 = crp->crp_desc;
-	if (crd1 == NULL) {
-		DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-		err = EINVAL;
-		goto errout;
-	}
-	crd2 = crd1->crd_next;
-
-	if (crd2 == NULL) {
-		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1 ||
-		    crd1->crd_alg == CRYPTO_MD5) {
-			maccrd = crd1;
-			enccrd = NULL;
-		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
-		    crd1->crd_alg == CRYPTO_3DES_CBC ||
-		    crd1->crd_alg == CRYPTO_AES_CBC ||
-		    crd1->crd_alg == CRYPTO_ARC4) {
-			if ((crd1->crd_flags & CRD_F_ENCRYPT) == 0)
-				cmd->base_masks |= HIFN_BASE_CMD_DECODE;
-			maccrd = NULL;
-			enccrd = crd1;
-		} else {
-			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-			err = EINVAL;
-			goto errout;
-		}
-	} else {
-		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
-                     crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-                     crd1->crd_alg == CRYPTO_MD5 ||
-                     crd1->crd_alg == CRYPTO_SHA1) &&
-		    (crd2->crd_alg == CRYPTO_DES_CBC ||
-		     crd2->crd_alg == CRYPTO_3DES_CBC ||
-		     crd2->crd_alg == CRYPTO_AES_CBC ||
-		     crd2->crd_alg == CRYPTO_ARC4) &&
-		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
-			cmd->base_masks = HIFN_BASE_CMD_DECODE;
-			maccrd = crd1;
-			enccrd = crd2;
-		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
-		     crd1->crd_alg == CRYPTO_ARC4 ||
-		     crd1->crd_alg == CRYPTO_3DES_CBC ||
-		     crd1->crd_alg == CRYPTO_AES_CBC) &&
-		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
-                     crd2->crd_alg == CRYPTO_SHA1_HMAC ||
-                     crd2->crd_alg == CRYPTO_MD5 ||
-                     crd2->crd_alg == CRYPTO_SHA1) &&
-		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
-			enccrd = crd1;
-			maccrd = crd2;
-		} else {
-			/*
-			 * We cannot order the 7751 as requested
-			 */
-			DPRINTF("%s,%d: %s %d,%d,%d - EINVAL\n",__FILE__,__LINE__,__FUNCTION__, crd1->crd_alg, crd2->crd_alg, crd1->crd_flags & CRD_F_ENCRYPT);
-			err = EINVAL;
-			goto errout;
-		}
-	}
-
-	if (enccrd) {
-		cmd->enccrd = enccrd;
-		cmd->base_masks |= HIFN_BASE_CMD_CRYPT;
-		switch (enccrd->crd_alg) {
-		case CRYPTO_ARC4:
-			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_RC4;
-			break;
-		case CRYPTO_DES_CBC:
-			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_DES |
-			    HIFN_CRYPT_CMD_MODE_CBC |
-			    HIFN_CRYPT_CMD_NEW_IV;
-			break;
-		case CRYPTO_3DES_CBC:
-			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_3DES |
-			    HIFN_CRYPT_CMD_MODE_CBC |
-			    HIFN_CRYPT_CMD_NEW_IV;
-			break;
-		case CRYPTO_AES_CBC:
-			cmd->cry_masks |= HIFN_CRYPT_CMD_ALG_AES |
-			    HIFN_CRYPT_CMD_MODE_CBC |
-			    HIFN_CRYPT_CMD_NEW_IV;
-			break;
-		default:
-			DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-			err = EINVAL;
-			goto errout;
-		}
-		if (enccrd->crd_alg != CRYPTO_ARC4) {
-			ivlen = ((enccrd->crd_alg == CRYPTO_AES_CBC) ?
-				HIFN_AES_IV_LENGTH : HIFN_IV_LENGTH);
-			if (enccrd->crd_flags & CRD_F_ENCRYPT) {
-				if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-					bcopy(enccrd->crd_iv, cmd->iv, ivlen);
-				else
-					bcopy(sc->sc_sessions[session].hs_iv,
-					    cmd->iv, ivlen);
-
-				if ((enccrd->crd_flags & CRD_F_IV_PRESENT)
-				    == 0) {
-					crypto_copyback(crp->crp_flags,
-					    crp->crp_buf, enccrd->crd_inject,
-					    ivlen, cmd->iv);
-				}
-			} else {
-				if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-					bcopy(enccrd->crd_iv, cmd->iv, ivlen);
-				else {
-					crypto_copydata(crp->crp_flags,
-					    crp->crp_buf, enccrd->crd_inject,
-					    ivlen, cmd->iv);
-				}
-			}
-		}
-
-		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT)
-			cmd->cry_masks |= HIFN_CRYPT_CMD_NEW_KEY;
-		cmd->ck = enccrd->crd_key;
-		cmd->cklen = enccrd->crd_klen >> 3;
-		cmd->cry_masks |= HIFN_CRYPT_CMD_NEW_KEY;
-
-		/* 
-		 * Need to specify the size for the AES key in the masks.
-		 */
-		if ((cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) ==
-		    HIFN_CRYPT_CMD_ALG_AES) {
-			switch (cmd->cklen) {
-			case 16:
-				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_128;
-				break;
-			case 24:
-				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_192;
-				break;
-			case 32:
-				cmd->cry_masks |= HIFN_CRYPT_CMD_KSZ_256;
-				break;
-			default:
-				DPRINTF("%s,%d: %s - EINVAL\n",__FILE__,__LINE__,__FUNCTION__);
-				err = EINVAL;
-				goto errout;
-			}
-		}
-	}
-
-	if (maccrd) {
-		cmd->maccrd = maccrd;
-		cmd->base_masks |= HIFN_BASE_CMD_MAC;
-
-		switch (maccrd->crd_alg) {
-		case CRYPTO_MD5:
-			cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
-			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH |
-			    HIFN_MAC_CMD_POS_IPSEC;
-                       break;
-		case CRYPTO_MD5_HMAC:
-			cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
-			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC |
-			    HIFN_MAC_CMD_POS_IPSEC | HIFN_MAC_CMD_TRUNC;
-			break;
-		case CRYPTO_SHA1:
-			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 |
-			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH |
-			    HIFN_MAC_CMD_POS_IPSEC;
-			break;
-		case CRYPTO_SHA1_HMAC:
-			cmd->mac_masks |= HIFN_MAC_CMD_ALG_SHA1 |
-			    HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC |
-			    HIFN_MAC_CMD_POS_IPSEC | HIFN_MAC_CMD_TRUNC;
-			break;
-		}
-
-		if (maccrd->crd_alg == CRYPTO_SHA1_HMAC ||
-		     maccrd->crd_alg == CRYPTO_MD5_HMAC) {
-			cmd->mac_masks |= HIFN_MAC_CMD_NEW_KEY;
-			bcopy(maccrd->crd_key, cmd->mac, maccrd->crd_klen >> 3);
-			bzero(cmd->mac + (maccrd->crd_klen >> 3),
-			    HIFN_MAC_KEY_LENGTH - (maccrd->crd_klen >> 3));
-		}
-	}
-
-	cmd->crp = crp;
-	cmd->session_num = session;
-	cmd->softc = sc;
-
-	err = hifn_crypto(sc, cmd, crp, hint);
-	if (!err) {
-		return 0;
-	} else if (err == ERESTART) {
-		/*
-		 * There weren't enough resources to dispatch the request
-		 * to the part.  Notify the caller so they'll requeue this
-		 * request and resubmit it again soon.
-		 */
-#ifdef HIFN_DEBUG
-		if (hifn_debug)
-			device_printf(sc->sc_dev, "requeue request\n");
-#endif
-		kfree(cmd);
-		sc->sc_needwakeup |= CRYPTO_SYMQ;
-		return (err);
-	}
-
-errout:
-	if (cmd != NULL)
-		kfree(cmd);
-	if (err == EINVAL)
-		hifnstats.hst_invalid++;
-	else
-		hifnstats.hst_nomem++;
-	crp->crp_etype = err;
-	crypto_done(crp);
-	return (err);
-}
-
-static void
-hifn_abort(struct hifn_softc *sc)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	struct hifn_command *cmd;
-	struct cryptop *crp;
-	int i, u;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	i = dma->resk; u = dma->resu;
-	while (u != 0) {
-		cmd = dma->hifn_commands[i];
-		KASSERT(cmd != NULL, ("hifn_abort: null command slot %u", i));
-		dma->hifn_commands[i] = NULL;
-		crp = cmd->crp;
-
-		if ((dma->resr[i].l & htole32(HIFN_D_VALID)) == 0) {
-			/* Salvage what we can. */
-			u_int8_t *macbuf;
-
-			if (cmd->base_masks & HIFN_BASE_CMD_MAC) {
-				macbuf = dma->result_bufs[i];
-				macbuf += 12;
-			} else
-				macbuf = NULL;
-			hifnstats.hst_opackets++;
-			hifn_callback(sc, cmd, macbuf);
-		} else {
-#if 0
-			if (cmd->src_map == cmd->dst_map) {
-				bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-				    BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
-			} else {
-				bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-				    BUS_DMASYNC_POSTWRITE);
-				bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
-				    BUS_DMASYNC_POSTREAD);
-			}
-#endif
-
-			if (cmd->src_skb != cmd->dst_skb) {
-#ifdef NOTYET
-				m_freem(cmd->src_m);
-				crp->crp_buf = (caddr_t)cmd->dst_m;
-#else
-				device_printf(sc->sc_dev,
-						"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
-						__FILE__, __LINE__);
-#endif
-			}
-
-			/* non-shared buffers cannot be restarted */
-			if (cmd->src_map != cmd->dst_map) {
-				/*
-				 * XXX should be EAGAIN, delayed until
-				 * after the reset.
-				 */
-				crp->crp_etype = ENOMEM;
-				pci_unmap_buf(sc, &cmd->dst);
-			} else
-				crp->crp_etype = ENOMEM;
-
-			pci_unmap_buf(sc, &cmd->src);
-
-			kfree(cmd);
-			if (crp->crp_etype != EAGAIN)
-				crypto_done(crp);
-		}
-
-		if (++i == HIFN_D_RES_RSIZE)
-			i = 0;
-		u--;
-	}
-	dma->resk = i; dma->resu = u;
-
-	hifn_reset_board(sc, 1);
-	hifn_init_dma(sc);
-	hifn_init_pci_registers(sc);
-}
-
-static void
-hifn_callback(struct hifn_softc *sc, struct hifn_command *cmd, u_int8_t *macbuf)
-{
-	struct hifn_dma *dma = sc->sc_dma;
-	struct cryptop *crp = cmd->crp;
-	struct cryptodesc *crd;
-	int i, u, ivlen;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-#if 0
-	if (cmd->src_map == cmd->dst_map) {
-		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-		    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
-	} else {
-		bus_dmamap_sync(sc->sc_dmat, cmd->src_map,
-		    BUS_DMASYNC_POSTWRITE);
-		bus_dmamap_sync(sc->sc_dmat, cmd->dst_map,
-		    BUS_DMASYNC_POSTREAD);
-	}
-#endif
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		if (cmd->src_skb != cmd->dst_skb) {
-#ifdef NOTYET
-			crp->crp_buf = (caddr_t)cmd->dst_m;
-			totlen = cmd->src_mapsize;
-			for (m = cmd->dst_m; m != NULL; m = m->m_next) {
-				if (totlen < m->m_len) {
-					m->m_len = totlen;
-					totlen = 0;
-				} else
-					totlen -= m->m_len;
-			}
-			cmd->dst_m->m_pkthdr.len = cmd->src_m->m_pkthdr.len;
-			m_freem(cmd->src_m);
-#else
-			device_printf(sc->sc_dev,
-					"%s,%d: CRYPTO_F_SKBUF src != dst not implemented\n",
-					__FILE__, __LINE__);
-#endif
-		}
-	}
-
-	if (cmd->sloplen != 0) {
-		crypto_copyback(crp->crp_flags, crp->crp_buf,
-		    cmd->src_mapsize - cmd->sloplen, cmd->sloplen,
-		    (caddr_t)&dma->slop[cmd->slopidx]);
-	}
-
-	i = dma->dstk; u = dma->dstu;
-	while (u != 0) {
-		if (i == HIFN_D_DST_RSIZE)
-			i = 0;
-#if 0
-		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-#endif
-		if (dma->dstr[i].l & htole32(HIFN_D_VALID)) {
-#if 0
-			bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
-			    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-#endif
-			break;
-		}
-		i++, u--;
-	}
-	dma->dstk = i; dma->dstu = u;
-
-	hifnstats.hst_obytes += cmd->dst_mapsize;
-
-	if ((cmd->base_masks & (HIFN_BASE_CMD_CRYPT | HIFN_BASE_CMD_DECODE)) ==
-	    HIFN_BASE_CMD_CRYPT) {
-		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-			if (crd->crd_alg != CRYPTO_DES_CBC &&
-			    crd->crd_alg != CRYPTO_3DES_CBC &&
-			    crd->crd_alg != CRYPTO_AES_CBC)
-				continue;
-			ivlen = ((crd->crd_alg == CRYPTO_AES_CBC) ?
-				HIFN_AES_IV_LENGTH : HIFN_IV_LENGTH);
-			crypto_copydata(crp->crp_flags, crp->crp_buf,
-			    crd->crd_skip + crd->crd_len - ivlen, ivlen,
-			    cmd->softc->sc_sessions[cmd->session_num].hs_iv);
-			break;
-		}
-	}
-
-	if (macbuf != NULL) {
-		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-                        int len;
-
-			if (crd->crd_alg != CRYPTO_MD5 &&
-			    crd->crd_alg != CRYPTO_SHA1 &&
-			    crd->crd_alg != CRYPTO_MD5_HMAC &&
-			    crd->crd_alg != CRYPTO_SHA1_HMAC) {
-				continue;
-			}
-			len = cmd->softc->sc_sessions[cmd->session_num].hs_mlen;
-			crypto_copyback(crp->crp_flags, crp->crp_buf,
-			    crd->crd_inject, len, macbuf);
-			break;
-		}
-	}
-
-	if (cmd->src_map != cmd->dst_map)
-		pci_unmap_buf(sc, &cmd->dst);
-	pci_unmap_buf(sc, &cmd->src);
-	kfree(cmd);
-	crypto_done(crp);
-}
-
-/*
- * 7811 PB3 rev/2 parts lock-up on burst writes to Group 0
- * and Group 1 registers; avoid conditions that could create
- * burst writes by doing a read in between the writes.
- *
- * NB: The read we interpose is always to the same register;
- *     we do this because reading from an arbitrary (e.g. last)
- *     register may not always work.
- */
-static void
-hifn_write_reg_0(struct hifn_softc *sc, bus_size_t reg, u_int32_t val)
-{
-	if (sc->sc_flags & HIFN_IS_7811) {
-		if (sc->sc_bar0_lastreg == reg - 4)
-			readl(sc->sc_bar0 + HIFN_0_PUCNFG);
-		sc->sc_bar0_lastreg = reg;
-	}
-	writel(val, sc->sc_bar0 + reg);
-}
-
-static void
-hifn_write_reg_1(struct hifn_softc *sc, bus_size_t reg, u_int32_t val)
-{
-	if (sc->sc_flags & HIFN_IS_7811) {
-		if (sc->sc_bar1_lastreg == reg - 4)
-			readl(sc->sc_bar1 + HIFN_1_REVID);
-		sc->sc_bar1_lastreg = reg;
-	}
-	writel(val, sc->sc_bar1 + reg);
-}
-
-
-static struct pci_device_id hifn_pci_tbl[] = {
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7951,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7955,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7956,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_NETSEC, PCI_PRODUCT_NETSEC_7751,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_INVERTEX, PCI_PRODUCT_INVERTEX_AEON,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7811,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	/*
-	 * Other vendors share this PCI ID as well, such as
-	 * http://www.powercrypt.com, and obviously they also
-	 * use the same key.
-	 */
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7751,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ 0, 0, 0, 0, 0, 0, }
-};
-MODULE_DEVICE_TABLE(pci, hifn_pci_tbl);
-
-static struct pci_driver hifn_driver = {
-	.name         = "hifn",
-	.id_table     = hifn_pci_tbl,
-	.probe        =	hifn_probe,
-	.remove       = hifn_remove,
-	/* add PM stuff here one day */
-};
-
-static int __init hifn_init (void)
-{
-	struct hifn_softc *sc = NULL;
-	int rc;
-
-	DPRINTF("%s(%p)\n", __FUNCTION__, hifn_init);
-
-	rc = pci_register_driver(&hifn_driver);
-	pci_register_driver_compat(&hifn_driver, rc);
-
-	return rc;
-}
-
-static void __exit hifn_exit (void)
-{
-	pci_unregister_driver(&hifn_driver);
-}
-
-module_init(hifn_init);
-module_exit(hifn_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("OCF driver for hifn PCI crypto devices");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751reg.h b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751reg.h
deleted file mode 100644
index ccf54f9c4e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751reg.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/* $FreeBSD: src/sys/dev/hifn/hifn7751reg.h,v 1.7 2007/03/21 03:42:49 sam Exp $ */
-/*	$OpenBSD: hifn7751reg.h,v 1.35 2002/04/08 17:49:42 jason Exp $	*/
-
-/*-
- * Invertex AEON / Hifn 7751 driver
- * Copyright (c) 1999 Invertex Inc. All rights reserved.
- * Copyright (c) 1999 Theo de Raadt
- * Copyright (c) 2000-2001 Network Security Technologies, Inc.
- *			http://www.netsec.net
- *
- * Please send any comments, feedback, bug-fixes, or feature requests to
- * software@invertex.com.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-#ifndef __HIFN_H__
-#define	__HIFN_H__
-
-/*
- * Some PCI configuration space offset defines.  The names were made
- * identical to the names used by the Linux kernel.
- */
-#define	HIFN_BAR0		PCIR_BAR(0)	/* PUC register map */
-#define	HIFN_BAR1		PCIR_BAR(1)	/* DMA register map */
-#define	HIFN_TRDY_TIMEOUT	0x40
-#define	HIFN_RETRY_TIMEOUT	0x41
-
-/*
- * PCI vendor and device identifiers
- * (the names are preserved from their OpenBSD source).
- */
-#define	PCI_VENDOR_HIFN		0x13a3		/* Hifn */
-#define	PCI_PRODUCT_HIFN_7751	0x0005		/* 7751 */
-#define	PCI_PRODUCT_HIFN_6500	0x0006		/* 6500 */
-#define	PCI_PRODUCT_HIFN_7811	0x0007		/* 7811 */
-#define	PCI_PRODUCT_HIFN_7855	0x001f		/* 7855 */
-#define	PCI_PRODUCT_HIFN_7951	0x0012		/* 7951 */
-#define	PCI_PRODUCT_HIFN_7955	0x0020		/* 7954/7955 */
-#define	PCI_PRODUCT_HIFN_7956	0x001d		/* 7956 */
-
-#define	PCI_VENDOR_INVERTEX	0x14e1		/* Invertex */
-#define	PCI_PRODUCT_INVERTEX_AEON 0x0005	/* AEON */
-
-#define	PCI_VENDOR_NETSEC	0x1660		/* NetSec */
-#define	PCI_PRODUCT_NETSEC_7751	0x7751		/* 7751 */
-
-/*
- * The values below should multiple of 4 -- and be large enough to handle
- * any command the driver implements.
- *
- * MAX_COMMAND = base command + mac command + encrypt command +
- *			mac-key + rc4-key
- * MAX_RESULT  = base result + mac result + mac + encrypt result
- *			
- *
- */
-#define	HIFN_MAX_COMMAND	(8 + 8 + 8 + 64 + 260)
-#define	HIFN_MAX_RESULT		(8 + 4 + 20 + 4)
-
-/*
- * hifn_desc_t
- *
- * Holds an individual descriptor for any of the rings.
- */
-typedef struct hifn_desc {
-	volatile u_int32_t l;		/* length and status bits */
-	volatile u_int32_t p;
-} hifn_desc_t;
-
-/*
- * Masks for the "length" field of struct hifn_desc.
- */
-#define	HIFN_D_LENGTH		0x0000ffff	/* length bit mask */
-#define	HIFN_D_MASKDONEIRQ	0x02000000	/* mask the done interrupt */
-#define	HIFN_D_DESTOVER		0x04000000	/* destination overflow */
-#define	HIFN_D_OVER		0x08000000	/* overflow */
-#define	HIFN_D_LAST		0x20000000	/* last descriptor in chain */
-#define	HIFN_D_JUMP		0x40000000	/* jump descriptor */
-#define	HIFN_D_VALID		0x80000000	/* valid bit */
-
-
-/*
- * Processing Unit Registers (offset from BASEREG0)
- */
-#define	HIFN_0_PUDATA		0x00	/* Processing Unit Data */
-#define	HIFN_0_PUCTRL		0x04	/* Processing Unit Control */
-#define	HIFN_0_PUISR		0x08	/* Processing Unit Interrupt Status */
-#define	HIFN_0_PUCNFG		0x0c	/* Processing Unit Configuration */
-#define	HIFN_0_PUIER		0x10	/* Processing Unit Interrupt Enable */
-#define	HIFN_0_PUSTAT		0x14	/* Processing Unit Status/Chip ID */
-#define	HIFN_0_FIFOSTAT		0x18	/* FIFO Status */
-#define	HIFN_0_FIFOCNFG		0x1c	/* FIFO Configuration */
-#define	HIFN_0_PUCTRL2		0x28	/* Processing Unit Control (2nd map) */
-#define	HIFN_0_MUTE1		0x80
-#define	HIFN_0_MUTE2		0x90
-#define	HIFN_0_SPACESIZE	0x100	/* Register space size */
-
-/* Processing Unit Control Register (HIFN_0_PUCTRL) */
-#define	HIFN_PUCTRL_CLRSRCFIFO	0x0010	/* clear source fifo */
-#define	HIFN_PUCTRL_STOP	0x0008	/* stop pu */
-#define	HIFN_PUCTRL_LOCKRAM	0x0004	/* lock ram */
-#define	HIFN_PUCTRL_DMAENA	0x0002	/* enable dma */
-#define	HIFN_PUCTRL_RESET	0x0001	/* Reset processing unit */
-
-/* Processing Unit Interrupt Status Register (HIFN_0_PUISR) */
-#define	HIFN_PUISR_CMDINVAL	0x8000	/* Invalid command interrupt */
-#define	HIFN_PUISR_DATAERR	0x4000	/* Data error interrupt */
-#define	HIFN_PUISR_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
-#define	HIFN_PUISR_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
-#define	HIFN_PUISR_DSTOVER	0x0200	/* Destination overrun interrupt */
-#define	HIFN_PUISR_SRCCMD	0x0080	/* Source command interrupt */
-#define	HIFN_PUISR_SRCCTX	0x0040	/* Source context interrupt */
-#define	HIFN_PUISR_SRCDATA	0x0020	/* Source data interrupt */
-#define	HIFN_PUISR_DSTDATA	0x0010	/* Destination data interrupt */
-#define	HIFN_PUISR_DSTRESULT	0x0004	/* Destination result interrupt */
-
-/* Processing Unit Configuration Register (HIFN_0_PUCNFG) */
-#define	HIFN_PUCNFG_DRAMMASK	0xe000	/* DRAM size mask */
-#define	HIFN_PUCNFG_DSZ_256K	0x0000	/* 256k dram */
-#define	HIFN_PUCNFG_DSZ_512K	0x2000	/* 512k dram */
-#define	HIFN_PUCNFG_DSZ_1M	0x4000	/* 1m dram */
-#define	HIFN_PUCNFG_DSZ_2M	0x6000	/* 2m dram */
-#define	HIFN_PUCNFG_DSZ_4M	0x8000	/* 4m dram */
-#define	HIFN_PUCNFG_DSZ_8M	0xa000	/* 8m dram */
-#define	HIFN_PUNCFG_DSZ_16M	0xc000	/* 16m dram */
-#define	HIFN_PUCNFG_DSZ_32M	0xe000	/* 32m dram */
-#define	HIFN_PUCNFG_DRAMREFRESH	0x1800	/* DRAM refresh rate mask */
-#define	HIFN_PUCNFG_DRFR_512	0x0000	/* 512 divisor of ECLK */
-#define	HIFN_PUCNFG_DRFR_256	0x0800	/* 256 divisor of ECLK */
-#define	HIFN_PUCNFG_DRFR_128	0x1000	/* 128 divisor of ECLK */
-#define	HIFN_PUCNFG_TCALLPHASES	0x0200	/* your guess is as good as mine... */
-#define	HIFN_PUCNFG_TCDRVTOTEM	0x0100	/* your guess is as good as mine... */
-#define	HIFN_PUCNFG_BIGENDIAN	0x0080	/* DMA big endian mode */
-#define	HIFN_PUCNFG_BUS32	0x0040	/* Bus width 32bits */
-#define	HIFN_PUCNFG_BUS16	0x0000	/* Bus width 16 bits */
-#define	HIFN_PUCNFG_CHIPID	0x0020	/* Allow chipid from PUSTAT */
-#define	HIFN_PUCNFG_DRAM	0x0010	/* Context RAM is DRAM */
-#define	HIFN_PUCNFG_SRAM	0x0000	/* Context RAM is SRAM */
-#define	HIFN_PUCNFG_COMPSING	0x0004	/* Enable single compression context */
-#define	HIFN_PUCNFG_ENCCNFG	0x0002	/* Encryption configuration */
-
-/* Processing Unit Interrupt Enable Register (HIFN_0_PUIER) */
-#define	HIFN_PUIER_CMDINVAL	0x8000	/* Invalid command interrupt */
-#define	HIFN_PUIER_DATAERR	0x4000	/* Data error interrupt */
-#define	HIFN_PUIER_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
-#define	HIFN_PUIER_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
-#define	HIFN_PUIER_DSTOVER	0x0200	/* Destination overrun interrupt */
-#define	HIFN_PUIER_SRCCMD	0x0080	/* Source command interrupt */
-#define	HIFN_PUIER_SRCCTX	0x0040	/* Source context interrupt */
-#define	HIFN_PUIER_SRCDATA	0x0020	/* Source data interrupt */
-#define	HIFN_PUIER_DSTDATA	0x0010	/* Destination data interrupt */
-#define	HIFN_PUIER_DSTRESULT	0x0004	/* Destination result interrupt */
-
-/* Processing Unit Status Register/Chip ID (HIFN_0_PUSTAT) */
-#define	HIFN_PUSTAT_CMDINVAL	0x8000	/* Invalid command interrupt */
-#define	HIFN_PUSTAT_DATAERR	0x4000	/* Data error interrupt */
-#define	HIFN_PUSTAT_SRCFIFO	0x2000	/* Source FIFO ready interrupt */
-#define	HIFN_PUSTAT_DSTFIFO	0x1000	/* Destination FIFO ready interrupt */
-#define	HIFN_PUSTAT_DSTOVER	0x0200	/* Destination overrun interrupt */
-#define	HIFN_PUSTAT_SRCCMD	0x0080	/* Source command interrupt */
-#define	HIFN_PUSTAT_SRCCTX	0x0040	/* Source context interrupt */
-#define	HIFN_PUSTAT_SRCDATA	0x0020	/* Source data interrupt */
-#define	HIFN_PUSTAT_DSTDATA	0x0010	/* Destination data interrupt */
-#define	HIFN_PUSTAT_DSTRESULT	0x0004	/* Destination result interrupt */
-#define	HIFN_PUSTAT_CHIPREV	0x00ff	/* Chip revision mask */
-#define	HIFN_PUSTAT_CHIPENA	0xff00	/* Chip enabled mask */
-#define	HIFN_PUSTAT_ENA_2	0x1100	/* Level 2 enabled */
-#define	HIFN_PUSTAT_ENA_1	0x1000	/* Level 1 enabled */
-#define	HIFN_PUSTAT_ENA_0	0x3000	/* Level 0 enabled */
-#define	HIFN_PUSTAT_REV_2	0x0020	/* 7751 PT6/2 */
-#define	HIFN_PUSTAT_REV_3	0x0030	/* 7751 PT6/3 */
-
-/* FIFO Status Register (HIFN_0_FIFOSTAT) */
-#define	HIFN_FIFOSTAT_SRC	0x7f00	/* Source FIFO available */
-#define	HIFN_FIFOSTAT_DST	0x007f	/* Destination FIFO available */
-
-/* FIFO Configuration Register (HIFN_0_FIFOCNFG) */
-#define	HIFN_FIFOCNFG_THRESHOLD	0x0400	/* must be written as this value */
-
-/*
- * DMA Interface Registers (offset from BASEREG1)
- */
-#define	HIFN_1_DMA_CRAR		0x0c	/* DMA Command Ring Address */
-#define	HIFN_1_DMA_SRAR		0x1c	/* DMA Source Ring Address */
-#define	HIFN_1_DMA_RRAR		0x2c	/* DMA Result Ring Address */
-#define	HIFN_1_DMA_DRAR		0x3c	/* DMA Destination Ring Address */
-#define	HIFN_1_DMA_CSR		0x40	/* DMA Status and Control */
-#define	HIFN_1_DMA_IER		0x44	/* DMA Interrupt Enable */
-#define	HIFN_1_DMA_CNFG		0x48	/* DMA Configuration */
-#define	HIFN_1_PLL		0x4c	/* 7955/7956: PLL config */
-#define	HIFN_1_7811_RNGENA	0x60	/* 7811: rng enable */
-#define	HIFN_1_7811_RNGCFG	0x64	/* 7811: rng config */
-#define	HIFN_1_7811_RNGDAT	0x68	/* 7811: rng data */
-#define	HIFN_1_7811_RNGSTS	0x6c	/* 7811: rng status */
-#define	HIFN_1_DMA_CNFG2	0x6c	/* 7955/7956: dma config #2 */
-#define	HIFN_1_7811_MIPSRST	0x94	/* 7811: MIPS reset */
-#define	HIFN_1_REVID		0x98	/* Revision ID */
-
-#define	HIFN_1_PUB_RESET	0x204	/* Public/RNG Reset */
-#define	HIFN_1_PUB_BASE		0x300	/* Public Base Address */
-#define	HIFN_1_PUB_OPLEN	0x304	/* 7951-compat Public Operand Length */
-#define	HIFN_1_PUB_OP		0x308	/* 7951-compat Public Operand */
-#define	HIFN_1_PUB_STATUS	0x30c	/* 7951-compat Public Status */
-#define	HIFN_1_PUB_IEN		0x310	/* Public Interrupt enable */
-#define	HIFN_1_RNG_CONFIG	0x314	/* RNG config */
-#define	HIFN_1_RNG_DATA		0x318	/* RNG data */
-#define	HIFN_1_PUB_MODE		0x320	/* PK mode */
-#define	HIFN_1_PUB_FIFO_OPLEN	0x380	/* first element of oplen fifo */
-#define	HIFN_1_PUB_FIFO_OP	0x384	/* first element of op fifo */
-#define	HIFN_1_PUB_MEM		0x400	/* start of Public key memory */
-#define	HIFN_1_PUB_MEMEND	0xbff	/* end of Public key memory */
-
-/* DMA Status and Control Register (HIFN_1_DMA_CSR) */
-#define	HIFN_DMACSR_D_CTRLMASK	0xc0000000	/* Destinition Ring Control */
-#define	HIFN_DMACSR_D_CTRL_NOP	0x00000000	/* Dest. Control: no-op */
-#define	HIFN_DMACSR_D_CTRL_DIS	0x40000000	/* Dest. Control: disable */
-#define	HIFN_DMACSR_D_CTRL_ENA	0x80000000	/* Dest. Control: enable */
-#define	HIFN_DMACSR_D_ABORT	0x20000000	/* Destinition Ring PCIAbort */
-#define	HIFN_DMACSR_D_DONE	0x10000000	/* Destinition Ring Done */
-#define	HIFN_DMACSR_D_LAST	0x08000000	/* Destinition Ring Last */
-#define	HIFN_DMACSR_D_WAIT	0x04000000	/* Destinition Ring Waiting */
-#define	HIFN_DMACSR_D_OVER	0x02000000	/* Destinition Ring Overflow */
-#define	HIFN_DMACSR_R_CTRL	0x00c00000	/* Result Ring Control */
-#define	HIFN_DMACSR_R_CTRL_NOP	0x00000000	/* Result Control: no-op */
-#define	HIFN_DMACSR_R_CTRL_DIS	0x00400000	/* Result Control: disable */
-#define	HIFN_DMACSR_R_CTRL_ENA	0x00800000	/* Result Control: enable */
-#define	HIFN_DMACSR_R_ABORT	0x00200000	/* Result Ring PCI Abort */
-#define	HIFN_DMACSR_R_DONE	0x00100000	/* Result Ring Done */
-#define	HIFN_DMACSR_R_LAST	0x00080000	/* Result Ring Last */
-#define	HIFN_DMACSR_R_WAIT	0x00040000	/* Result Ring Waiting */
-#define	HIFN_DMACSR_R_OVER	0x00020000	/* Result Ring Overflow */
-#define	HIFN_DMACSR_S_CTRL	0x0000c000	/* Source Ring Control */
-#define	HIFN_DMACSR_S_CTRL_NOP	0x00000000	/* Source Control: no-op */
-#define	HIFN_DMACSR_S_CTRL_DIS	0x00004000	/* Source Control: disable */
-#define	HIFN_DMACSR_S_CTRL_ENA	0x00008000	/* Source Control: enable */
-#define	HIFN_DMACSR_S_ABORT	0x00002000	/* Source Ring PCI Abort */
-#define	HIFN_DMACSR_S_DONE	0x00001000	/* Source Ring Done */
-#define	HIFN_DMACSR_S_LAST	0x00000800	/* Source Ring Last */
-#define	HIFN_DMACSR_S_WAIT	0x00000400	/* Source Ring Waiting */
-#define	HIFN_DMACSR_ILLW	0x00000200	/* Illegal write (7811 only) */
-#define	HIFN_DMACSR_ILLR	0x00000100	/* Illegal read (7811 only) */
-#define	HIFN_DMACSR_C_CTRL	0x000000c0	/* Command Ring Control */
-#define	HIFN_DMACSR_C_CTRL_NOP	0x00000000	/* Command Control: no-op */
-#define	HIFN_DMACSR_C_CTRL_DIS	0x00000040	/* Command Control: disable */
-#define	HIFN_DMACSR_C_CTRL_ENA	0x00000080	/* Command Control: enable */
-#define	HIFN_DMACSR_C_ABORT	0x00000020	/* Command Ring PCI Abort */
-#define	HIFN_DMACSR_C_DONE	0x00000010	/* Command Ring Done */
-#define	HIFN_DMACSR_C_LAST	0x00000008	/* Command Ring Last */
-#define	HIFN_DMACSR_C_WAIT	0x00000004	/* Command Ring Waiting */
-#define	HIFN_DMACSR_PUBDONE	0x00000002	/* Public op done (7951 only) */
-#define	HIFN_DMACSR_ENGINE	0x00000001	/* Command Ring Engine IRQ */
-
-/* DMA Interrupt Enable Register (HIFN_1_DMA_IER) */
-#define	HIFN_DMAIER_D_ABORT	0x20000000	/* Destination Ring PCIAbort */
-#define	HIFN_DMAIER_D_DONE	0x10000000	/* Destination Ring Done */
-#define	HIFN_DMAIER_D_LAST	0x08000000	/* Destination Ring Last */
-#define	HIFN_DMAIER_D_WAIT	0x04000000	/* Destination Ring Waiting */
-#define	HIFN_DMAIER_D_OVER	0x02000000	/* Destination Ring Overflow */
-#define	HIFN_DMAIER_R_ABORT	0x00200000	/* Result Ring PCI Abort */
-#define	HIFN_DMAIER_R_DONE	0x00100000	/* Result Ring Done */
-#define	HIFN_DMAIER_R_LAST	0x00080000	/* Result Ring Last */
-#define	HIFN_DMAIER_R_WAIT	0x00040000	/* Result Ring Waiting */
-#define	HIFN_DMAIER_R_OVER	0x00020000	/* Result Ring Overflow */
-#define	HIFN_DMAIER_S_ABORT	0x00002000	/* Source Ring PCI Abort */
-#define	HIFN_DMAIER_S_DONE	0x00001000	/* Source Ring Done */
-#define	HIFN_DMAIER_S_LAST	0x00000800	/* Source Ring Last */
-#define	HIFN_DMAIER_S_WAIT	0x00000400	/* Source Ring Waiting */
-#define	HIFN_DMAIER_ILLW	0x00000200	/* Illegal write (7811 only) */
-#define	HIFN_DMAIER_ILLR	0x00000100	/* Illegal read (7811 only) */
-#define	HIFN_DMAIER_C_ABORT	0x00000020	/* Command Ring PCI Abort */
-#define	HIFN_DMAIER_C_DONE	0x00000010	/* Command Ring Done */
-#define	HIFN_DMAIER_C_LAST	0x00000008	/* Command Ring Last */
-#define	HIFN_DMAIER_C_WAIT	0x00000004	/* Command Ring Waiting */
-#define	HIFN_DMAIER_PUBDONE	0x00000002	/* public op done (7951 only) */
-#define	HIFN_DMAIER_ENGINE	0x00000001	/* Engine IRQ */
-
-/* DMA Configuration Register (HIFN_1_DMA_CNFG) */
-#define	HIFN_DMACNFG_BIGENDIAN	0x10000000	/* big endian mode */
-#define	HIFN_DMACNFG_POLLFREQ	0x00ff0000	/* Poll frequency mask */
-#define	HIFN_DMACNFG_UNLOCK	0x00000800
-#define	HIFN_DMACNFG_POLLINVAL	0x00000700	/* Invalid Poll Scalar */
-#define	HIFN_DMACNFG_LAST	0x00000010	/* Host control LAST bit */
-#define	HIFN_DMACNFG_MODE	0x00000004	/* DMA mode */
-#define	HIFN_DMACNFG_DMARESET	0x00000002	/* DMA Reset # */
-#define	HIFN_DMACNFG_MSTRESET	0x00000001	/* Master Reset # */
-
-/* DMA Configuration Register (HIFN_1_DMA_CNFG2) */
-#define	HIFN_DMACNFG2_PKSWAP32	(1 << 19)	/* swap the OPLEN/OP reg */
-#define	HIFN_DMACNFG2_PKSWAP8	(1 << 18)	/* swap the bits of OPLEN/OP */
-#define	HIFN_DMACNFG2_BAR0_SWAP32 (1<<17)	/* swap the bytes of BAR0 */
-#define	HIFN_DMACNFG2_BAR1_SWAP8 (1<<16)	/* swap the bits  of BAR0 */
-#define	HIFN_DMACNFG2_INIT_WRITE_BURST_SHIFT 12
-#define	HIFN_DMACNFG2_INIT_READ_BURST_SHIFT 8
-#define	HIFN_DMACNFG2_TGT_WRITE_BURST_SHIFT 4
-#define	HIFN_DMACNFG2_TGT_READ_BURST_SHIFT  0
-
-/* 7811 RNG Enable Register (HIFN_1_7811_RNGENA) */
-#define	HIFN_7811_RNGENA_ENA	0x00000001	/* enable RNG */
-
-/* 7811 RNG Config Register (HIFN_1_7811_RNGCFG) */
-#define	HIFN_7811_RNGCFG_PRE1	0x00000f00	/* first prescalar */
-#define	HIFN_7811_RNGCFG_OPRE	0x00000080	/* output prescalar */
-#define	HIFN_7811_RNGCFG_DEFL	0x00000f80	/* 2 words/ 1/100 sec */
-
-/* 7811 RNG Status Register (HIFN_1_7811_RNGSTS) */
-#define	HIFN_7811_RNGSTS_RDY	0x00004000	/* two numbers in FIFO */
-#define	HIFN_7811_RNGSTS_UFL	0x00001000	/* rng underflow */
-
-/* 7811 MIPS Reset Register (HIFN_1_7811_MIPSRST) */
-#define	HIFN_MIPSRST_BAR2SIZE	0xffff0000	/* sdram size */
-#define	HIFN_MIPSRST_GPRAMINIT	0x00008000	/* gpram can be accessed */
-#define	HIFN_MIPSRST_CRAMINIT	0x00004000	/* ctxram can be accessed */
-#define	HIFN_MIPSRST_LED2	0x00000400	/* external LED2 */
-#define	HIFN_MIPSRST_LED1	0x00000200	/* external LED1 */
-#define	HIFN_MIPSRST_LED0	0x00000100	/* external LED0 */
-#define	HIFN_MIPSRST_MIPSDIS	0x00000004	/* disable MIPS */
-#define	HIFN_MIPSRST_MIPSRST	0x00000002	/* warm reset MIPS */
-#define	HIFN_MIPSRST_MIPSCOLD	0x00000001	/* cold reset MIPS */
-
-/* Public key reset register (HIFN_1_PUB_RESET) */
-#define	HIFN_PUBRST_RESET	0x00000001	/* reset public/rng unit */
-
-/* Public operation register (HIFN_1_PUB_OP) */
-#define	HIFN_PUBOP_AOFFSET	0x0000003e	/* A offset */
-#define	HIFN_PUBOP_BOFFSET	0x00000fc0	/* B offset */
-#define	HIFN_PUBOP_MOFFSET	0x0003f000	/* M offset */
-#define	HIFN_PUBOP_OP_MASK	0x003c0000	/* Opcode: */
-#define	HIFN_PUBOP_OP_NOP	0x00000000	/*  NOP */
-#define	HIFN_PUBOP_OP_ADD	0x00040000	/*  ADD */
-#define	HIFN_PUBOP_OP_ADDC	0x00080000	/*  ADD w/carry */
-#define	HIFN_PUBOP_OP_SUB	0x000c0000	/*  SUB */
-#define	HIFN_PUBOP_OP_SUBC	0x00100000	/*  SUB w/carry */
-#define	HIFN_PUBOP_OP_MODADD	0x00140000	/*  Modular ADD */
-#define	HIFN_PUBOP_OP_MODSUB	0x00180000	/*  Modular SUB */
-#define	HIFN_PUBOP_OP_INCA	0x001c0000	/*  INC A */
-#define	HIFN_PUBOP_OP_DECA	0x00200000	/*  DEC A */
-#define	HIFN_PUBOP_OP_MULT	0x00240000	/*  MULT */
-#define	HIFN_PUBOP_OP_MODMULT	0x00280000	/*  Modular MULT */
-#define	HIFN_PUBOP_OP_MODRED	0x002c0000	/*  Modular Red */
-#define	HIFN_PUBOP_OP_MODEXP	0x00300000	/*  Modular Exp */
-
-/* Public operand length register (HIFN_1_PUB_OPLEN) */
-#define	HIFN_PUBOPLEN_MODLEN	0x0000007f
-#define	HIFN_PUBOPLEN_EXPLEN	0x0003ff80
-#define	HIFN_PUBOPLEN_REDLEN	0x003c0000
-
-/* Public status register (HIFN_1_PUB_STATUS) */
-#define	HIFN_PUBSTS_DONE	0x00000001	/* operation done */
-#define	HIFN_PUBSTS_CARRY	0x00000002	/* carry */
-#define	HIFN_PUBSTS_FIFO_EMPTY	0x00000100	/* fifo empty */
-#define	HIFN_PUBSTS_FIFO_FULL	0x00000200	/* fifo full */
-#define	HIFN_PUBSTS_FIFO_OVFL	0x00000400	/* fifo overflow */
-#define	HIFN_PUBSTS_FIFO_WRITE	0x000f0000	/* fifo write */
-#define	HIFN_PUBSTS_FIFO_READ	0x0f000000	/* fifo read */
-
-/* Public interrupt enable register (HIFN_1_PUB_IEN) */
-#define	HIFN_PUBIEN_DONE	0x00000001	/* operation done interrupt */
-
-/* Random number generator config register (HIFN_1_RNG_CONFIG) */
-#define	HIFN_RNGCFG_ENA		0x00000001	/* enable rng */
-
-/*
- * Register offsets in register set 1
- */
-
-#define	HIFN_UNLOCK_SECRET1	0xf4
-#define	HIFN_UNLOCK_SECRET2	0xfc
-
-/*
- * PLL config register
- *
- * This register is present only on 7954/7955/7956 parts. It must be
- * programmed according to the bus interface method used by the h/w.
- * Note that the parts require a stable clock.  Since the PCI clock
- * may vary the reference clock must usually be used.  To avoid
- * overclocking the core logic, setup must be done carefully, refer
- * to the driver for details.  The exact multiplier required varies
- * by part and system configuration; refer to the Hifn documentation.
- */
-#define	HIFN_PLL_REF_SEL	0x00000001	/* REF/HBI clk selection */
-#define	HIFN_PLL_BP		0x00000002	/* bypass (used during setup) */
-/* bit 2 reserved */
-#define	HIFN_PLL_PK_CLK_SEL	0x00000008	/* public key clk select */
-#define	HIFN_PLL_PE_CLK_SEL	0x00000010	/* packet engine clk select */
-/* bits 5-9 reserved */
-#define	HIFN_PLL_MBSET		0x00000400	/* must be set to 1 */
-#define	HIFN_PLL_ND		0x00003800	/* Fpll_ref multiplier select */
-#define	HIFN_PLL_ND_SHIFT	11
-#define	HIFN_PLL_ND_2		0x00000000	/* 2x */
-#define	HIFN_PLL_ND_4		0x00000800	/* 4x */
-#define	HIFN_PLL_ND_6		0x00001000	/* 6x */
-#define	HIFN_PLL_ND_8		0x00001800	/* 8x */
-#define	HIFN_PLL_ND_10		0x00002000	/* 10x */
-#define	HIFN_PLL_ND_12		0x00002800	/* 12x */
-/* bits 14-15 reserved */
-#define	HIFN_PLL_IS		0x00010000	/* charge pump current select */
-/* bits 17-31 reserved */
-
-/*
- * Board configuration specifies only these bits.
- */
-#define	HIFN_PLL_CONFIG		(HIFN_PLL_IS|HIFN_PLL_ND|HIFN_PLL_REF_SEL)
-
-/*
- * Public Key Engine Mode Register
- */
-#define	HIFN_PKMODE_HOSTINVERT	(1 << 0)	/* HOST INVERT */
-#define	HIFN_PKMODE_ENHANCED	(1 << 1)	/* Enable enhanced mode */
-
-
-/*********************************************************************
- * Structs for board commands 
- *
- *********************************************************************/
-
-/*
- * Structure to help build up the command data structure.
- */
-typedef struct hifn_base_command {
-	volatile u_int16_t masks;
-	volatile u_int16_t session_num;
-	volatile u_int16_t total_source_count;
-	volatile u_int16_t total_dest_count;
-} hifn_base_command_t;
-
-#define	HIFN_BASE_CMD_MAC		0x0400
-#define	HIFN_BASE_CMD_CRYPT		0x0800
-#define	HIFN_BASE_CMD_DECODE		0x2000
-#define	HIFN_BASE_CMD_SRCLEN_M		0xc000
-#define	HIFN_BASE_CMD_SRCLEN_S		14
-#define	HIFN_BASE_CMD_DSTLEN_M		0x3000
-#define	HIFN_BASE_CMD_DSTLEN_S		12
-#define	HIFN_BASE_CMD_LENMASK_HI	0x30000
-#define	HIFN_BASE_CMD_LENMASK_LO	0x0ffff
-
-/*
- * Structure to help build up the command data structure.
- */
-typedef struct hifn_crypt_command {
-	volatile u_int16_t masks;
-	volatile u_int16_t header_skip;
-	volatile u_int16_t source_count;
-	volatile u_int16_t reserved;
-} hifn_crypt_command_t;
-
-#define	HIFN_CRYPT_CMD_ALG_MASK		0x0003		/* algorithm: */
-#define	HIFN_CRYPT_CMD_ALG_DES		0x0000		/*   DES */
-#define	HIFN_CRYPT_CMD_ALG_3DES		0x0001		/*   3DES */
-#define	HIFN_CRYPT_CMD_ALG_RC4		0x0002		/*   RC4 */
-#define	HIFN_CRYPT_CMD_ALG_AES		0x0003		/*   AES */
-#define	HIFN_CRYPT_CMD_MODE_MASK	0x0018		/* Encrypt mode: */
-#define	HIFN_CRYPT_CMD_MODE_ECB		0x0000		/*   ECB */
-#define	HIFN_CRYPT_CMD_MODE_CBC		0x0008		/*   CBC */
-#define	HIFN_CRYPT_CMD_MODE_CFB		0x0010		/*   CFB */
-#define	HIFN_CRYPT_CMD_MODE_OFB		0x0018		/*   OFB */
-#define	HIFN_CRYPT_CMD_CLR_CTX		0x0040		/* clear context */
-#define	HIFN_CRYPT_CMD_NEW_KEY		0x0800		/* expect new key */
-#define	HIFN_CRYPT_CMD_NEW_IV		0x1000		/* expect new iv */
-
-#define	HIFN_CRYPT_CMD_SRCLEN_M		0xc000
-#define	HIFN_CRYPT_CMD_SRCLEN_S		14
-
-#define	HIFN_CRYPT_CMD_KSZ_MASK		0x0600		/* AES key size: */
-#define	HIFN_CRYPT_CMD_KSZ_128		0x0000		/*   128 bit */
-#define	HIFN_CRYPT_CMD_KSZ_192		0x0200		/*   192 bit */
-#define	HIFN_CRYPT_CMD_KSZ_256		0x0400		/*   256 bit */
-
-/*
- * Structure to help build up the command data structure.
- */
-typedef struct hifn_mac_command {
-	volatile u_int16_t masks;
-	volatile u_int16_t header_skip;
-	volatile u_int16_t source_count;
-	volatile u_int16_t reserved;
-} hifn_mac_command_t;
-
-#define	HIFN_MAC_CMD_ALG_MASK		0x0001
-#define	HIFN_MAC_CMD_ALG_SHA1		0x0000
-#define	HIFN_MAC_CMD_ALG_MD5		0x0001
-#define	HIFN_MAC_CMD_MODE_MASK		0x000c
-#define	HIFN_MAC_CMD_MODE_HMAC		0x0000
-#define	HIFN_MAC_CMD_MODE_SSL_MAC	0x0004
-#define	HIFN_MAC_CMD_MODE_HASH		0x0008
-#define	HIFN_MAC_CMD_MODE_FULL		0x0004
-#define	HIFN_MAC_CMD_TRUNC		0x0010
-#define	HIFN_MAC_CMD_RESULT		0x0020
-#define	HIFN_MAC_CMD_APPEND		0x0040
-#define	HIFN_MAC_CMD_SRCLEN_M		0xc000
-#define	HIFN_MAC_CMD_SRCLEN_S		14
-
-/*
- * MAC POS IPsec initiates authentication after encryption on encodes
- * and before decryption on decodes.
- */
-#define	HIFN_MAC_CMD_POS_IPSEC		0x0200
-#define	HIFN_MAC_CMD_NEW_KEY		0x0800
-
-/*
- * The poll frequency and poll scalar defines are unshifted values used
- * to set fields in the DMA Configuration Register.
- */
-#ifndef HIFN_POLL_FREQUENCY
-#define	HIFN_POLL_FREQUENCY	0x1
-#endif
-
-#ifndef HIFN_POLL_SCALAR
-#define	HIFN_POLL_SCALAR	0x0
-#endif
-
-#define	HIFN_MAX_SEGLEN 	0xffff		/* maximum dma segment len */
-#define	HIFN_MAX_DMALEN		0x3ffff		/* maximum dma length */
-#endif /* __HIFN_H__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751var.h b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751var.h
deleted file mode 100644
index 9a5f2319db..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751var.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/* $FreeBSD: src/sys/dev/hifn/hifn7751var.h,v 1.9 2007/03/21 03:42:49 sam Exp $ */
-/*	$OpenBSD: hifn7751var.h,v 1.42 2002/04/08 17:49:42 jason Exp $	*/
-
-/*-
- * Invertex AEON / Hifn 7751 driver
- * Copyright (c) 1999 Invertex Inc. All rights reserved.
- * Copyright (c) 1999 Theo de Raadt
- * Copyright (c) 2000-2001 Network Security Technologies, Inc.
- *			http://www.netsec.net
- *
- * Please send any comments, feedback, bug-fixes, or feature requests to
- * software@invertex.com.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef __HIFN7751VAR_H__
-#define __HIFN7751VAR_H__
-
-#ifdef __KERNEL__
-
-/*
- * Some configurable values for the driver.  By default command+result
- * descriptor rings are the same size.  The src+dst descriptor rings
- * are sized at 3.5x the number of potential commands.  Slower parts
- * (e.g. 7951) tend to run out of src descriptors; faster parts (7811)
- * src+cmd/result descriptors.  It's not clear that increasing the size
- * of the descriptor rings helps performance significantly as other
- * factors tend to come into play (e.g. copying misaligned packets).
- */
-#define	HIFN_D_CMD_RSIZE	24	/* command descriptors */
-#define	HIFN_D_SRC_RSIZE	((HIFN_D_CMD_RSIZE * 7) / 2)	/* source descriptors */
-#define	HIFN_D_RES_RSIZE	HIFN_D_CMD_RSIZE	/* result descriptors */
-#define	HIFN_D_DST_RSIZE	HIFN_D_SRC_RSIZE	/* destination descriptors */
-
-/*
- *  Length values for cryptography
- */
-#define HIFN_DES_KEY_LENGTH		8
-#define HIFN_3DES_KEY_LENGTH		24
-#define HIFN_MAX_CRYPT_KEY_LENGTH	HIFN_3DES_KEY_LENGTH
-#define HIFN_IV_LENGTH			8
-#define	HIFN_AES_IV_LENGTH		16
-#define HIFN_MAX_IV_LENGTH		HIFN_AES_IV_LENGTH
-
-/*
- *  Length values for authentication
- */
-#define HIFN_MAC_KEY_LENGTH		64
-#define HIFN_MD5_LENGTH			16
-#define HIFN_SHA1_LENGTH		20
-#define HIFN_MAC_TRUNC_LENGTH		12
-
-#define MAX_SCATTER 64
-
-/*
- * Data structure to hold all 4 rings and any other ring related data.
- */
-struct hifn_dma {
-	/*
-	 *  Descriptor rings.  We add +1 to the size to accomidate the
-	 *  jump descriptor.
-	 */
-	struct hifn_desc	cmdr[HIFN_D_CMD_RSIZE+1];
-	struct hifn_desc	srcr[HIFN_D_SRC_RSIZE+1];
-	struct hifn_desc	dstr[HIFN_D_DST_RSIZE+1];
-	struct hifn_desc	resr[HIFN_D_RES_RSIZE+1];
-
-	struct hifn_command	*hifn_commands[HIFN_D_RES_RSIZE];
-
-	u_char			command_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_COMMAND];
-	u_char			result_bufs[HIFN_D_CMD_RSIZE][HIFN_MAX_RESULT];
-	u_int32_t		slop[HIFN_D_CMD_RSIZE];
-
-	u_int64_t		test_src, test_dst;
-
-	/*
-	 *  Our current positions for insertion and removal from the desriptor
-	 *  rings. 
-	 */
-	int			cmdi, srci, dsti, resi;
-	volatile int		cmdu, srcu, dstu, resu;
-	int			cmdk, srck, dstk, resk;
-};
-
-struct hifn_session {
-	int hs_used;
-	int hs_mlen;
-	u_int8_t hs_iv[HIFN_MAX_IV_LENGTH];
-};
-
-#define	HIFN_RING_SYNC(sc, r, i, f)					\
-	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
-
-#define	HIFN_CMDR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), cmdr, (i), (f))
-#define	HIFN_RESR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), resr, (i), (f))
-#define	HIFN_SRCR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), srcr, (i), (f))
-#define	HIFN_DSTR_SYNC(sc, i, f)	HIFN_RING_SYNC((sc), dstr, (i), (f))
-
-#define	HIFN_CMD_SYNC(sc, i, f)						\
-	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
-
-#define	HIFN_RES_SYNC(sc, i, f)						\
-	/* DAVIDM bus_dmamap_sync((sc)->sc_dmat, (sc)->sc_dmamap, (f)) */
-
-typedef int bus_size_t;
-
-/*
- * Holds data specific to a single HIFN board.
- */
-struct hifn_softc {
-	softc_device_decl		 sc_dev;
-
-	struct pci_dev		*sc_pcidev;	/* PCI device pointer */
-	spinlock_t		sc_mtx;		/* per-instance lock */
-
-	int			sc_num;		/* for multiple devs */
-
-	ocf_iomem_t		sc_bar0;
-	bus_size_t		sc_bar0_lastreg;/* bar0 last reg written */
-	ocf_iomem_t		sc_bar1;
-	bus_size_t		sc_bar1_lastreg;/* bar1 last reg written */
-
-	int			sc_irq;
-
-	u_int32_t		sc_dmaier;
-	u_int32_t		sc_drammodel;	/* 1=dram, 0=sram */
-	u_int32_t		sc_pllconfig;	/* 7954/7955/7956 PLL config */
-
-	struct hifn_dma		*sc_dma;
-	dma_addr_t		sc_dma_physaddr;/* physical address of sc_dma */
-
-	int			sc_dmansegs;
-	int32_t			sc_cid;
-	int			sc_maxses;
-	int			sc_nsessions;
-	struct hifn_session	*sc_sessions;
-	int			sc_ramsize;
-	int			sc_flags;
-#define	HIFN_HAS_RNG		0x1	/* includes random number generator */
-#define	HIFN_HAS_PUBLIC		0x2	/* includes public key support */
-#define	HIFN_HAS_AES		0x4	/* includes AES support */
-#define	HIFN_IS_7811		0x8	/* Hifn 7811 part */
-#define	HIFN_IS_7956		0x10	/* Hifn 7956/7955 don't have SDRAM */
-
-	struct timer_list	sc_tickto;	/* for managing DMA */
-
-	int			sc_rngfirst;
-	int			sc_rnghz;	/* RNG polling frequency */
-
-	int			sc_c_busy;	/* command ring busy */
-	int			sc_s_busy;	/* source data ring busy */
-	int			sc_d_busy;	/* destination data ring busy */
-	int			sc_r_busy;	/* result ring busy */
-	int			sc_active;	/* for initial countdown */
-	int			sc_needwakeup;	/* ops q'd wating on resources */
-	int			sc_curbatch;	/* # ops submitted w/o int */
-	int			sc_suspended;
-#ifdef HIFN_VULCANDEV
-	struct cdev            *sc_pkdev;
-#endif
-};
-
-#define	HIFN_LOCK(_sc)		spin_lock_irqsave(&(_sc)->sc_mtx, l_flags)
-#define	HIFN_UNLOCK(_sc)	spin_unlock_irqrestore(&(_sc)->sc_mtx, l_flags)
-
-/*
- *  hifn_command_t
- *
- *  This is the control structure used to pass commands to hifn_encrypt().
- *
- *  flags
- *  -----
- *  Flags is the bitwise "or" values for command configuration.  A single
- *  encrypt direction needs to be set:
- *
- *	HIFN_ENCODE or HIFN_DECODE
- *
- *  To use cryptography, a single crypto algorithm must be included:
- *
- *	HIFN_CRYPT_3DES or HIFN_CRYPT_DES
- *
- *  To use authentication is used, a single MAC algorithm must be included:
- *
- *	HIFN_MAC_MD5 or HIFN_MAC_SHA1
- *
- *  By default MD5 uses a 16 byte hash and SHA-1 uses a 20 byte hash.
- *  If the value below is set, hash values are truncated or assumed
- *  truncated to 12 bytes:
- *
- *	HIFN_MAC_TRUNC
- *
- *  Keys for encryption and authentication can be sent as part of a command,
- *  or the last key value used with a particular session can be retrieved
- *  and used again if either of these flags are not specified.
- *
- *	HIFN_CRYPT_NEW_KEY, HIFN_MAC_NEW_KEY
- *
- *  session_num
- *  -----------
- *  A number between 0 and 2048 (for DRAM models) or a number between 
- *  0 and 768 (for SRAM models).  Those who don't want to use session
- *  numbers should leave value at zero and send a new crypt key and/or
- *  new MAC key on every command.  If you use session numbers and
- *  don't send a key with a command, the last key sent for that same
- *  session number will be used.
- *
- *  Warning:  Using session numbers and multiboard at the same time
- *            is currently broken.
- *
- *  mbuf
- *  ----
- *  Either fill in the mbuf pointer and npa=0 or
- *	 fill packp[] and packl[] and set npa to > 0
- * 
- *  mac_header_skip
- *  ---------------
- *  The number of bytes of the source_buf that are skipped over before
- *  authentication begins.  This must be a number between 0 and 2^16-1
- *  and can be used by IPsec implementers to skip over IP headers.
- *  *** Value ignored if authentication not used ***
- *
- *  crypt_header_skip
- *  -----------------
- *  The number of bytes of the source_buf that are skipped over before
- *  the cryptographic operation begins.  This must be a number between 0
- *  and 2^16-1.  For IPsec, this number will always be 8 bytes larger
- *  than the auth_header_skip (to skip over the ESP header).
- *  *** Value ignored if cryptography not used ***
- *
- */
-struct hifn_operand {
-	union {
-		struct sk_buff *skb;
-		struct uio *io;
-		unsigned char *buf;
-	} u;
-	void		*map;
-	bus_size_t	mapsize;
-	int		nsegs;
-	struct {
-	    dma_addr_t  ds_addr;
-	    int         ds_len;
-	} segs[MAX_SCATTER];
-};
-
-struct hifn_command {
-	u_int16_t session_num;
-	u_int16_t base_masks, cry_masks, mac_masks;
-	u_int8_t iv[HIFN_MAX_IV_LENGTH], *ck, mac[HIFN_MAC_KEY_LENGTH];
-	int cklen;
-	int sloplen, slopidx;
-
-	struct hifn_operand src;
-	struct hifn_operand dst;
-
-	struct hifn_softc *softc;
-	struct cryptop *crp;
-	struct cryptodesc *enccrd, *maccrd;
-};
-
-#define	src_skb		src.u.skb
-#define	src_io		src.u.io
-#define	src_map		src.map
-#define	src_mapsize	src.mapsize
-#define	src_segs	src.segs
-#define	src_nsegs	src.nsegs
-#define	src_buf		src.u.buf
-
-#define	dst_skb		dst.u.skb
-#define	dst_io		dst.u.io
-#define	dst_map		dst.map
-#define	dst_mapsize	dst.mapsize
-#define	dst_segs	dst.segs
-#define	dst_nsegs	dst.nsegs
-#define	dst_buf		dst.u.buf
-
-/*
- *  Return values for hifn_crypto()
- */
-#define HIFN_CRYPTO_SUCCESS	0
-#define HIFN_CRYPTO_BAD_INPUT	(-1)
-#define HIFN_CRYPTO_RINGS_FULL	(-2)
-
-/**************************************************************************
- *
- *  Function:  hifn_crypto
- *
- *  Purpose:   Called by external drivers to begin an encryption on the
- *             HIFN board.
- *
- *  Blocking/Non-blocking Issues
- *  ============================
- *  The driver cannot block in hifn_crypto (no calls to tsleep) currently.
- *  hifn_crypto() returns HIFN_CRYPTO_RINGS_FULL if there is not enough
- *  room in any of the rings for the request to proceed.
- *
- *  Return Values
- *  =============
- *  0 for success, negative values on error
- *
- *  Defines for negative error codes are:
- *  
- *    HIFN_CRYPTO_BAD_INPUT  :  The passed in command had invalid settings.
- *    HIFN_CRYPTO_RINGS_FULL :  All DMA rings were full and non-blocking
- *                              behaviour was requested.
- *
- *************************************************************************/
-
-/*
- * Convert back and forth from 'sid' to 'card' and 'session'
- */
-#define HIFN_CARD(sid)		(((sid) & 0xf0000000) >> 28)
-#define HIFN_SESSION(sid)	((sid) & 0x000007ff)
-#define HIFN_SID(crd,ses)	(((crd) << 28) | ((ses) & 0x7ff))
-
-#endif /* _KERNEL */
-
-struct hifn_stats {
-	u_int64_t hst_ibytes;
-	u_int64_t hst_obytes;
-	u_int32_t hst_ipackets;
-	u_int32_t hst_opackets;
-	u_int32_t hst_invalid;
-	u_int32_t hst_nomem;		/* malloc or one of hst_nomem_* */
-	u_int32_t hst_abort;
-	u_int32_t hst_noirq;		/* IRQ for no reason */
-	u_int32_t hst_totbatch;		/* ops submitted w/o interrupt */
-	u_int32_t hst_maxbatch;		/* max ops submitted together */
-	u_int32_t hst_unaligned;	/* unaligned src caused copy */
-	/*
-	 * The following divides hst_nomem into more specific buckets.
-	 */
-	u_int32_t hst_nomem_map;	/* bus_dmamap_create failed */
-	u_int32_t hst_nomem_load;	/* bus_dmamap_load_* failed */
-	u_int32_t hst_nomem_mbuf;	/* MGET* failed */
-	u_int32_t hst_nomem_mcl;	/* MCLGET* failed */
-	u_int32_t hst_nomem_cr;		/* out of command/result descriptor */
-	u_int32_t hst_nomem_sd;		/* out of src/dst descriptors */
-};
-
-#endif /* __HIFN7751VAR_H__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPP.c b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPP.c
deleted file mode 100644
index 802708d72c..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPP.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/*-
- * Driver for Hifn HIPP-I/II chipset
- * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored by Hifn Inc.
- *
- */
-
-/*
- * Driver for various Hifn encryption processors.
- */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/skbuff.h>
-#include <linux/uio.h>
-#include <linux/sysfs.h>
-#include <linux/miscdevice.h>
-#include <asm/io.h>
-
-#include <cryptodev.h>
-
-#include "hifnHIPPreg.h"
-#include "hifnHIPPvar.h"
-
-#if 1
-#define	DPRINTF(a...)	if (hipp_debug) { \
-							printk("%s: ", sc ? \
-								device_get_nameunit(sc->sc_dev) : "hifn"); \
-							printk(a); \
-						} else
-#else
-#define	DPRINTF(a...)
-#endif
-
-typedef int bus_size_t;
-
-static inline int
-pci_get_revid(struct pci_dev *dev)
-{
-	u8 rid = 0;
-	pci_read_config_byte(dev, PCI_REVISION_ID, &rid);
-	return rid;
-}
-
-#define debug hipp_debug
-int hipp_debug = 0;
-module_param(hipp_debug, int, 0644);
-MODULE_PARM_DESC(hipp_debug, "Enable debug");
-
-int hipp_maxbatch = 1;
-module_param(hipp_maxbatch, int, 0644);
-MODULE_PARM_DESC(hipp_maxbatch, "max ops to batch w/o interrupt");
-
-static	int  hipp_probe(struct pci_dev *dev, const struct pci_device_id *ent);
-static	void hipp_remove(struct pci_dev *dev);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-static irqreturn_t hipp_intr(int irq, void *arg);
-#else
-static irqreturn_t hipp_intr(int irq, void *arg, struct pt_regs *regs);
-#endif
-
-static int hipp_num_chips = 0;
-static struct hipp_softc *hipp_chip_idx[HIPP_MAX_CHIPS];
-
-static	int hipp_newsession(device_t, u_int32_t *, struct cryptoini *);
-static	int hipp_freesession(device_t, u_int64_t);
-static	int hipp_process(device_t, struct cryptop *, int);
-
-static device_method_t hipp_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	hipp_newsession),
-	DEVMETHOD(cryptodev_freesession,hipp_freesession),
-	DEVMETHOD(cryptodev_process,	hipp_process),
-};
-
-static __inline u_int32_t
-READ_REG(struct hipp_softc *sc, unsigned int barno, bus_size_t reg)
-{
-	u_int32_t v = readl(sc->sc_bar[barno] + reg);
-	//sc->sc_bar0_lastreg = (bus_size_t) -1;
-	return (v);
-}
-static __inline void
-WRITE_REG(struct hipp_softc *sc, unsigned int barno, bus_size_t reg, u_int32_t val)
-{
-	writel(val, sc->sc_bar[barno] + reg);
-}
-
-#define READ_REG_0(sc, reg)         READ_REG(sc, 0, reg)
-#define WRITE_REG_0(sc, reg, val)   WRITE_REG(sc,0, reg, val)
-#define READ_REG_1(sc, reg)         READ_REG(sc, 1, reg)
-#define WRITE_REG_1(sc, reg, val)   WRITE_REG(sc,1, reg, val)
-
-static int
-hipp_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
-{
-	return EINVAL;
-}
-
-static int
-hipp_freesession(device_t dev, u_int64_t tid)
-{
-	return EINVAL;
-}
-
-static int
-hipp_process(device_t dev, struct cryptop *crp, int hint)
-{
-	return EINVAL;
-}
-
-static const char*
-hipp_partname(struct hipp_softc *sc, char buf[128], size_t blen)
-{
-	char *n = NULL;
-
-	switch (pci_get_vendor(sc->sc_pcidev)) {
-	case PCI_VENDOR_HIFN:
-		switch (pci_get_device(sc->sc_pcidev)) {
-		case PCI_PRODUCT_HIFN_7855:	n = "Hifn 7855";
-		case PCI_PRODUCT_HIFN_8155:	n = "Hifn 8155";
-		case PCI_PRODUCT_HIFN_6500:	n = "Hifn 6500";
-		}
-	}
-
-	if(n==NULL) {
-		snprintf(buf, blen, "VID=%02x,PID=%02x",
-			 pci_get_vendor(sc->sc_pcidev),
-			 pci_get_device(sc->sc_pcidev));
-	} else {
-		buf[0]='\0';
-		strncat(buf, n, blen);
-	}
-	return buf;
-}
-
-struct hipp_fs_entry {
-	struct attribute attr;
-	/* other stuff */
-};
-
-
-static ssize_t
-cryptoid_show(struct device *dev,
-	      struct device_attribute *attr,
-	      char *buf)						
-{								
-	struct hipp_softc *sc;					
-
-	sc = pci_get_drvdata(to_pci_dev (dev));
-	return sprintf (buf, "%d\n", sc->sc_cid);
-}
-
-struct device_attribute hipp_dev_cryptoid = __ATTR_RO(cryptoid);
-
-/*
- * Attach an interface that successfully probed.
- */
-static int
-hipp_probe(struct pci_dev *dev, const struct pci_device_id *ent)
-{
-	struct hipp_softc *sc = NULL;
-	int i;
-	//char rbase;
-	//u_int16_t ena;
-	int rev;
-	//int rseg;
-	int rc;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (pci_enable_device(dev) < 0)
-		return(-ENODEV);
-
-#ifdef CONFIG_HAVE_PCI_SET_MWI
-	if (pci_set_mwi(dev))
-		return(-ENODEV);
-#endif
-
-	if (!dev->irq) {
-		printk("hifn: found device with no IRQ assigned. check BIOS settings!");
-		pci_disable_device(dev);
-		return(-ENODEV);
-	}
-
-	sc = (struct hipp_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
-	if (!sc)
-		return(-ENOMEM);
-	memset(sc, 0, sizeof(*sc));
-
-	softc_device_init(sc, "hifn-hipp", hipp_num_chips, hipp_methods);
-
-	sc->sc_pcidev = dev;
-	sc->sc_irq = -1;
-	sc->sc_cid = -1;
-	sc->sc_num = hipp_num_chips++;
-
-	if (sc->sc_num < HIPP_MAX_CHIPS)
-		hipp_chip_idx[sc->sc_num] = sc;
-
-	pci_set_drvdata(sc->sc_pcidev, sc);
-
-	spin_lock_init(&sc->sc_mtx);
-
-	/*
-	 * Setup PCI resources.
-	 * The READ_REG_0, WRITE_REG_0, READ_REG_1,
-	 * and WRITE_REG_1 macros throughout the driver are used
-	 * to permit better debugging.
-	 */
-	for(i=0; i<4; i++) {
-		unsigned long mem_start, mem_len;
-		mem_start = pci_resource_start(sc->sc_pcidev, i);
-		mem_len   = pci_resource_len(sc->sc_pcidev, i);
-		sc->sc_barphy[i] = (caddr_t)mem_start;
-		sc->sc_bar[i] = (ocf_iomem_t) ioremap(mem_start, mem_len);
-		if (!sc->sc_bar[i]) {
-			device_printf(sc->sc_dev, "cannot map bar%d register space\n", i);
-			goto fail;
-		}
-	}
-
-	//hipp_reset_board(sc, 0);
-	pci_set_master(sc->sc_pcidev);
-
-	/*
-	 * Arrange the interrupt line.
-	 */
-	rc = request_irq(dev->irq, hipp_intr, IRQF_SHARED, "hifn", sc);
-	if (rc) {
-		device_printf(sc->sc_dev, "could not map interrupt: %d\n", rc);
-		goto fail;
-	}
-	sc->sc_irq = dev->irq;
-
-	rev = READ_REG_1(sc, HIPP_1_REVID) & 0xffff;
-
-	{
-		char b[32];
-		device_printf(sc->sc_dev, "%s, rev %u",
-			      hipp_partname(sc, b, sizeof(b)), rev);
-	}
-
-#if 0
-	if (sc->sc_flags & HIFN_IS_7956)
-		printf(", pll=0x%x<%s clk, %ux mult>",
-			sc->sc_pllconfig,
-			sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci",
-			2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11));
-#endif
-	printf("\n");
-
-	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
-	if (sc->sc_cid < 0) {
-		device_printf(sc->sc_dev, "could not get crypto driver id\n");
-		goto fail;
-	}
-
-#if 0 /* cannot work with a non-GPL module */
-	/* make a sysfs entry to let the world know what entry we got */
-	sysfs_create_file(&sc->sc_pcidev->dev.kobj, &hipp_dev_cryptoid.attr);
-#endif
-
-#if 0
-	init_timer(&sc->sc_tickto);
-	sc->sc_tickto.function = hifn_tick;
-	sc->sc_tickto.data = (unsigned long) sc->sc_num;
-	mod_timer(&sc->sc_tickto, jiffies + HZ);
-#endif
-
-#if 0 /* no code here yet ?? */
-	crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
-#endif
-
-	return (0);
-
-fail:
-	if (sc->sc_cid >= 0)
-		crypto_unregister_all(sc->sc_cid);
-	if (sc->sc_irq != -1)
-		free_irq(sc->sc_irq, sc);
-	
-#if 0
-	if (sc->sc_dma) {
-		/* Turn off DMA polling */
-		WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-			    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-		
-		pci_free_consistent(sc->sc_pcidev,
-				    sizeof(*sc->sc_dma),
-				    sc->sc_dma, sc->sc_dma_physaddr);
-	}
-#endif
-	kfree(sc);
-	return (-ENXIO);
-}
-
-/*
- * Detach an interface that successfully probed.
- */
-static void
-hipp_remove(struct pci_dev *dev)
-{
-	struct hipp_softc *sc = pci_get_drvdata(dev);
-	unsigned long l_flags;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/* disable interrupts */
-	HIPP_LOCK(sc);
-
-#if 0
-	WRITE_REG_1(sc, HIFN_1_DMA_IER, 0);
-	HIFN_UNLOCK(sc);
-
-	/*XXX other resources */
-	del_timer_sync(&sc->sc_tickto);
-
-	/* Turn off DMA polling */
-	WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET |
-	    HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE);
-#endif
-
-	crypto_unregister_all(sc->sc_cid);
-
-	free_irq(sc->sc_irq, sc);
-
-#if 0
-	pci_free_consistent(sc->sc_pcidev, sizeof(*sc->sc_dma),
-                sc->sc_dma, sc->sc_dma_physaddr);
-#endif
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-static irqreturn_t hipp_intr(int irq, void *arg)
-#else
-static irqreturn_t hipp_intr(int irq, void *arg, struct pt_regs *regs)
-#endif
-{
-	struct hipp_softc *sc = arg;
-
-	sc = sc; /* shut up compiler */
-
-	return IRQ_HANDLED;
-}
-
-static struct pci_device_id hipp_pci_tbl[] = {
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7855,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_8155,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ 0 }
-};
-MODULE_DEVICE_TABLE(pci, hipp_pci_tbl);
-
-static struct pci_driver hipp_driver = {
-	.name         = "hipp",
-	.id_table     = hipp_pci_tbl,
-	.probe        =	hipp_probe,
-	.remove       = hipp_remove,
-	/* add PM stuff here one day */
-};
-
-static int __init hipp_init (void)
-{
-	struct hipp_softc *sc = NULL;
-	int rc;
-
-	DPRINTF("%s(%p)\n", __FUNCTION__, hipp_init);
-
-	rc = pci_register_driver(&hipp_driver);
-	pci_register_driver_compat(&hipp_driver, rc);
-
-	return rc;
-}
-
-static void __exit hipp_exit (void)
-{
-	pci_unregister_driver(&hipp_driver);
-}
-
-module_init(hipp_init);
-module_exit(hipp_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("Michael Richardson <mcr@xelerance.com>");
-MODULE_DESCRIPTION("OCF driver for hifn HIPP-I/II PCI crypto devices");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPreg.h b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPreg.h
deleted file mode 100644
index 8c0e72038f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPreg.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Hifn HIPP-I/HIPP-II (7855/8155) driver.
- * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored by Hifn inc.
- *
- */
-
-#ifndef __HIFNHIPP_H__
-#define	__HIFNHIPP_H__
-
-/*
- * PCI vendor and device identifiers
- */
-#define	PCI_VENDOR_HIFN		0x13a3		/* Hifn */
-#define	PCI_PRODUCT_HIFN_6500	0x0006		/* 6500 */
-#define	PCI_PRODUCT_HIFN_7855	0x001f		/* 7855 */
-#define	PCI_PRODUCT_HIFN_8155	0x999		/* XXX 8155 */
-
-#define HIPP_1_REVID            0x01 /* BOGUS */
-
-#endif /* __HIPP_H__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPvar.h b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPvar.h
deleted file mode 100644
index 61d292fb5e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifnHIPPvar.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Hifn HIPP-I/HIPP-II (7855/8155) driver.
- * Copyright (c) 2006 Michael Richardson <mcr@xelerance.com> * 
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored by Hifn inc.
- *
- */
-
-#ifndef __HIFNHIPPVAR_H__
-#define __HIFNHIPPVAR_H__
-
-#define HIPP_MAX_CHIPS 8
-
-/*
- * Holds data specific to a single Hifn HIPP-I board.
- */
-struct hipp_softc {
-	softc_device_decl		 sc_dev;
-
-	struct pci_dev		*sc_pcidev;	/* device backpointer */
-	ocf_iomem_t             sc_bar[5];
-	caddr_t		        sc_barphy[5];   /* physical address */
-	int			sc_num;		/* for multiple devs */
-	spinlock_t		sc_mtx;		/* per-instance lock */
-	int32_t			sc_cid;
-	int			sc_irq;
-
-#if 0
-
-	u_int32_t		sc_dmaier;
-	u_int32_t		sc_drammodel;	/* 1=dram, 0=sram */
-	u_int32_t		sc_pllconfig;	/* 7954/7955/7956 PLL config */
-
-	struct hifn_dma		*sc_dma;
-	dma_addr_t		sc_dma_physaddr;/* physical address of sc_dma */
-
-	int			sc_dmansegs;
-	int			sc_maxses;
-	int			sc_nsessions;
-	struct hifn_session	*sc_sessions;
-	int			sc_ramsize;
-	int			sc_flags;
-#define	HIFN_HAS_RNG		0x1	/* includes random number generator */
-#define	HIFN_HAS_PUBLIC		0x2	/* includes public key support */
-#define	HIFN_HAS_AES		0x4	/* includes AES support */
-#define	HIFN_IS_7811		0x8	/* Hifn 7811 part */
-#define	HIFN_IS_7956		0x10	/* Hifn 7956/7955 don't have SDRAM */
-
-	struct timer_list	sc_tickto;	/* for managing DMA */
-
-	int			sc_rngfirst;
-	int			sc_rnghz;	/* RNG polling frequency */
-
-	int			sc_c_busy;	/* command ring busy */
-	int			sc_s_busy;	/* source data ring busy */
-	int			sc_d_busy;	/* destination data ring busy */
-	int			sc_r_busy;	/* result ring busy */
-	int			sc_active;	/* for initial countdown */
-	int			sc_needwakeup;	/* ops q'd wating on resources */
-	int			sc_curbatch;	/* # ops submitted w/o int */
-	int			sc_suspended;
-	struct miscdevice       sc_miscdev;
-#endif
-};
-
-#define	HIPP_LOCK(_sc)		spin_lock_irqsave(&(_sc)->sc_mtx, l_flags)
-#define	HIPP_UNLOCK(_sc)	spin_unlock_irqrestore(&(_sc)->sc_mtx, l_flags)
-
-#endif /* __HIFNHIPPVAR_H__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/Makefile b/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/Makefile
deleted file mode 100644
index d94a3b79fa..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-#
-# You will need to point this at your Intel ixp425 includes,  this portion
-# of the Makefile only really works under SGLinux with the appropriate libs
-# installed.  They can be downloaded from http://www.snapgear.org/
-#
-ifeq ($(CONFIG_CPU_IXP46X),y)
-IXPLATFORM = ixp46X
-else
-ifeq ($(CONFIG_CPU_IXP43X),y)
-IXPLATFORM = ixp43X
-else
-IXPLATFORM = ixp42X
-endif
-endif
-
-ifdef CONFIG_IXP400_LIB_2_4
-IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.4/ixp400_xscale_sw
-OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.4/ixp_osal
-endif
-ifdef CONFIG_IXP400_LIB_2_1
-IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.1/ixp400_xscale_sw
-OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.1/ixp_osal
-endif
-ifdef CONFIG_IXP400_LIB_2_0
-IX_XSCALE_SW = $(ROOTDIR)/modules/ixp425/ixp400-2.0/ixp400_xscale_sw
-OSAL_DIR     = $(ROOTDIR)/modules/ixp425/ixp400-2.0/ixp_osal
-endif
-ifdef IX_XSCALE_SW
-ifdef CONFIG_IXP400_LIB_2_4
-IXP_CFLAGS = \
-	-I$(ROOTDIR)/. \
-	-I$(IX_XSCALE_SW)/src/include \
-	-I$(OSAL_DIR)/common/include/ \
-	-I$(OSAL_DIR)/common/include/modules/ \
-	-I$(OSAL_DIR)/common/include/modules/ddk/ \
-	-I$(OSAL_DIR)/common/include/modules/bufferMgt/ \
-	-I$(OSAL_DIR)/common/include/modules/ioMem/ \
-	-I$(OSAL_DIR)/common/os/linux/include/ \
-	-I$(OSAL_DIR)/common/os/linux/include/core/  \
-	-I$(OSAL_DIR)/common/os/linux/include/modules/ \
-	-I$(OSAL_DIR)/common/os/linux/include/modules/ddk/ \
-	-I$(OSAL_DIR)/common/os/linux/include/modules/bufferMgt/ \
-	-I$(OSAL_DIR)/common/os/linux/include/modules/ioMem/ \
-	-I$(OSAL_DIR)/platforms/$(IXPLATFORM)/include/ \
-	-I$(OSAL_DIR)/platforms/$(IXPLATFORM)/os/linux/include/ \
-	-DENABLE_IOMEM -DENABLE_BUFFERMGT -DENABLE_DDK \
-	-DUSE_IXP4XX_CRYPTO
-else
-IXP_CFLAGS = \
-	-I$(ROOTDIR)/. \
-	-I$(IX_XSCALE_SW)/src/include \
-	-I$(OSAL_DIR)/ \
-	-I$(OSAL_DIR)/os/linux/include/ \
-	-I$(OSAL_DIR)/os/linux/include/modules/ \
-	-I$(OSAL_DIR)/os/linux/include/modules/ioMem/ \
-	-I$(OSAL_DIR)/os/linux/include/modules/bufferMgt/ \
-	-I$(OSAL_DIR)/os/linux/include/core/  \
-	-I$(OSAL_DIR)/os/linux/include/platforms/ \
-	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ \
-	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ixp425 \
-	-I$(OSAL_DIR)/os/linux/include/platforms/ixp400/ixp465 \
-	-I$(OSAL_DIR)/os/linux/include/core/ \
-	-I$(OSAL_DIR)/include/ \
-	-I$(OSAL_DIR)/include/modules/ \
-	-I$(OSAL_DIR)/include/modules/bufferMgt/ \
-	-I$(OSAL_DIR)/include/modules/ioMem/ \
-	-I$(OSAL_DIR)/include/platforms/ \
-	-I$(OSAL_DIR)/include/platforms/ixp400/ \
-	-DUSE_IXP4XX_CRYPTO
-endif
-endif
-ifdef CONFIG_IXP400_LIB_1_4
-IXP_CFLAGS   = \
-	-I$(ROOTDIR)/. \
-	-I$(ROOTDIR)/modules/ixp425/ixp400-1.4/ixp400_xscale_sw/src/include \
-	-I$(ROOTDIR)/modules/ixp425/ixp400-1.4/ixp400_xscale_sw/src/linux \
-	-DUSE_IXP4XX_CRYPTO
-endif
-ifndef IXPDIR
-IXPDIR = ixp-version-is-not-supported
-endif
-
-ifeq ($(CONFIG_CPU_IXP46X),y)
-IXP_CFLAGS += -D__ixp46X
-else
-ifeq ($(CONFIG_CPU_IXP43X),y)
-IXP_CFLAGS += -D__ixp43X
-else
-IXP_CFLAGS += -D__ixp42X
-endif
-endif
-
-obj-$(CONFIG_OCF_IXP4XX) += ixp4xx.o
-
-obj ?= .
-EXTRA_CFLAGS += $(IXP_CFLAGS) -I$(obj)/.. -I$(obj)/.
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c b/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c
deleted file mode 100644
index d5414a4ef5..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ixp4xx/ixp4xx.c
+++ /dev/null
@@ -1,1324 +0,0 @@
-/*
- * An OCF module that uses Intels IXP CryptACC API to do the crypto.
- * This driver requires the IXP400 Access Library that is available
- * from Intel in order to operate (or compile).
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/interrupt.h>
-#include <asm/scatterlist.h>
-
-#include <IxTypes.h>
-#include <IxOsBuffMgt.h>
-#include <IxNpeDl.h>
-#include <IxCryptoAcc.h>
-#include <IxQMgr.h>
-#include <IxOsServices.h>
-#include <IxOsCacheMMU.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-
-#ifndef IX_MBUF_PRIV
-#define IX_MBUF_PRIV(x) ((x)->priv)
-#endif
-
-struct ixp_data;
-
-struct ixp_q {
-	struct list_head	 ixp_q_list;
-	struct ixp_data		*ixp_q_data;
-	struct cryptop		*ixp_q_crp;
-	struct cryptodesc	*ixp_q_ccrd;
-	struct cryptodesc	*ixp_q_acrd;
-	IX_MBUF				 ixp_q_mbuf;
-	UINT8				*ixp_hash_dest; /* Location for hash in client buffer */
-	UINT8				*ixp_hash_src; /* Location of hash in internal buffer */
-	unsigned char		 ixp_q_iv_data[IX_CRYPTO_ACC_MAX_CIPHER_IV_LENGTH];
-	unsigned char		*ixp_q_iv;
-};
-
-struct ixp_data {
-	int					 ixp_registered;	/* is the context registered */
-	int					 ixp_crd_flags;		/* detect direction changes */
-
-	int					 ixp_cipher_alg;
-	int					 ixp_auth_alg;
-
-	UINT32				 ixp_ctx_id;
-	UINT32				 ixp_hash_key_id;	/* used when hashing */
-	IxCryptoAccCtx		 ixp_ctx;
-	IX_MBUF				 ixp_pri_mbuf;
-	IX_MBUF				 ixp_sec_mbuf;
-
-	struct work_struct   ixp_pending_work;
-	struct work_struct   ixp_registration_work;
-	struct list_head	 ixp_q;				/* unprocessed requests */
-};
-
-#ifdef __ixp46X
-
-#define	MAX_IOP_SIZE	64	/* words */
-#define	MAX_OOP_SIZE	128
-
-#define	MAX_PARAMS		3
-
-struct ixp_pkq {
-	struct list_head			 pkq_list;
-	struct cryptkop				*pkq_krp;
-
-	IxCryptoAccPkeEauInOperands	 pkq_op;
-	IxCryptoAccPkeEauOpResult	 pkq_result;
-
-	UINT32						 pkq_ibuf0[MAX_IOP_SIZE];
-	UINT32						 pkq_ibuf1[MAX_IOP_SIZE];
-	UINT32						 pkq_ibuf2[MAX_IOP_SIZE];
-	UINT32						 pkq_obuf[MAX_OOP_SIZE];
-};
-
-static LIST_HEAD(ixp_pkq); /* current PK wait list */
-static struct ixp_pkq *ixp_pk_cur;
-static spinlock_t ixp_pkq_lock;
-
-#endif /* __ixp46X */
-
-static int ixp_blocked = 0;
-
-static int32_t			 ixp_id = -1;
-static struct ixp_data **ixp_sessions = NULL;
-static u_int32_t		 ixp_sesnum = 0;
-
-static int ixp_process(device_t, struct cryptop *, int);
-static int ixp_newsession(device_t, u_int32_t *, struct cryptoini *);
-static int ixp_freesession(device_t, u_int64_t);
-#ifdef __ixp46X
-static int ixp_kprocess(device_t, struct cryptkop *krp, int hint);
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static kmem_cache_t *qcache;
-#else
-static struct kmem_cache *qcache;
-#endif
-
-#define debug ixp_debug
-static int ixp_debug = 0;
-module_param(ixp_debug, int, 0644);
-MODULE_PARM_DESC(ixp_debug, "Enable debug");
-
-static int ixp_init_crypto = 1;
-module_param(ixp_init_crypto, int, 0444); /* RO after load/boot */
-MODULE_PARM_DESC(ixp_init_crypto, "Call ixCryptoAccInit (default is 1)");
-
-static void ixp_process_pending(void *arg);
-static void ixp_registration(void *arg);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void ixp_process_pending_wq(struct work_struct *work);
-static void ixp_registration_wq(struct work_struct *work);
-#endif
-
-/*
- * dummy device structure
- */
-
-static struct {
-	softc_device_decl	sc_dev;
-} ixpdev;
-
-static device_method_t ixp_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	ixp_newsession),
-	DEVMETHOD(cryptodev_freesession,ixp_freesession),
-	DEVMETHOD(cryptodev_process,	ixp_process),
-#ifdef __ixp46X
-	DEVMETHOD(cryptodev_kprocess,	ixp_kprocess),
-#endif
-};
-
-/*
- * Generate a new software session.
- */
-static int
-ixp_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
-{
-	struct ixp_data *ixp;
-	u_int32_t i;
-#define AUTH_LEN(cri, def) \
-	(cri->cri_mlen ? cri->cri_mlen : (def))
-
-	dprintk("%s():alg %d\n", __FUNCTION__,cri->cri_alg);
-	if (sid == NULL || cri == NULL) {
-		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	if (ixp_sessions) {
-		for (i = 1; i < ixp_sesnum; i++)
-			if (ixp_sessions[i] == NULL)
-				break;
-	} else
-		i = 1;		/* NB: to silence compiler warning */
-
-	if (ixp_sessions == NULL || i == ixp_sesnum) {
-		struct ixp_data **ixpd;
-
-		if (ixp_sessions == NULL) {
-			i = 1; /* We leave ixp_sessions[0] empty */
-			ixp_sesnum = CRYPTO_SW_SESSIONS;
-		} else
-			ixp_sesnum *= 2;
-
-		ixpd = kmalloc(ixp_sesnum * sizeof(struct ixp_data *), SLAB_ATOMIC);
-		if (ixpd == NULL) {
-			/* Reset session number */
-			if (ixp_sesnum == CRYPTO_SW_SESSIONS)
-				ixp_sesnum = 0;
-			else
-				ixp_sesnum /= 2;
-			dprintk("%s,%d: ENOBUFS\n", __FILE__, __LINE__);
-			return ENOBUFS;
-		}
-		memset(ixpd, 0, ixp_sesnum * sizeof(struct ixp_data *));
-
-		/* Copy existing sessions */
-		if (ixp_sessions) {
-			memcpy(ixpd, ixp_sessions,
-			    (ixp_sesnum / 2) * sizeof(struct ixp_data *));
-			kfree(ixp_sessions);
-		}
-
-		ixp_sessions = ixpd;
-	}
-
-	ixp_sessions[i] = (struct ixp_data *) kmalloc(sizeof(struct ixp_data),
-			SLAB_ATOMIC);
-	if (ixp_sessions[i] == NULL) {
-		ixp_freesession(NULL, i);
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return ENOBUFS;
-	}
-
-	*sid = i;
-
-	ixp = ixp_sessions[i];
-	memset(ixp, 0, sizeof(*ixp));
-
-	ixp->ixp_cipher_alg = -1;
-	ixp->ixp_auth_alg = -1;
-	ixp->ixp_ctx_id = -1;
-	INIT_LIST_HEAD(&ixp->ixp_q);
-
-	ixp->ixp_ctx.useDifferentSrcAndDestMbufs = 0;
-
-	while (cri) {
-		switch (cri->cri_alg) {
-		case CRYPTO_DES_CBC:
-			ixp->ixp_cipher_alg = cri->cri_alg;
-			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_DES;
-			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
-			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
-			ixp->ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
-			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen =
-						IX_CRYPTO_ACC_DES_IV_64;
-			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
-					cri->cri_key, (cri->cri_klen + 7) / 8);
-			break;
-
-		case CRYPTO_3DES_CBC:
-			ixp->ixp_cipher_alg = cri->cri_alg;
-			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_3DES;
-			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
-			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
-			ixp->ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
-			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen =
-						IX_CRYPTO_ACC_DES_IV_64;
-			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
-					cri->cri_key, (cri->cri_klen + 7) / 8);
-			break;
-
-		case CRYPTO_RIJNDAEL128_CBC:
-			ixp->ixp_cipher_alg = cri->cri_alg;
-			ixp->ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_AES;
-			ixp->ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
-			ixp->ixp_ctx.cipherCtx.cipherKeyLen = (cri->cri_klen + 7) / 8;
-			ixp->ixp_ctx.cipherCtx.cipherBlockLen = 16;
-			ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen = 16;
-			memcpy(ixp->ixp_ctx.cipherCtx.key.cipherKey,
-					cri->cri_key, (cri->cri_klen + 7) / 8);
-			break;
-
-		case CRYPTO_MD5:
-		case CRYPTO_MD5_HMAC:
-			ixp->ixp_auth_alg = cri->cri_alg;
-			ixp->ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_MD5;
-			ixp->ixp_ctx.authCtx.authDigestLen = AUTH_LEN(cri, MD5_HASH_LEN);
-			ixp->ixp_ctx.authCtx.aadLen = 0;
-			/* Only MD5_HMAC needs a key */
-			if (cri->cri_alg == CRYPTO_MD5_HMAC) {
-				ixp->ixp_ctx.authCtx.authKeyLen = (cri->cri_klen + 7) / 8;
-				if (ixp->ixp_ctx.authCtx.authKeyLen >
-						sizeof(ixp->ixp_ctx.authCtx.key.authKey)) {
-					printk(
-						"ixp4xx: Invalid key length for MD5_HMAC - %d bits\n",
-							cri->cri_klen);
-					ixp_freesession(NULL, i);
-					return EINVAL;
-				}
-				memcpy(ixp->ixp_ctx.authCtx.key.authKey,
-						cri->cri_key, (cri->cri_klen + 7) / 8);
-			}
-			break;
-
-		case CRYPTO_SHA1:
-		case CRYPTO_SHA1_HMAC:
-			ixp->ixp_auth_alg = cri->cri_alg;
-			ixp->ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_SHA1;
-			ixp->ixp_ctx.authCtx.authDigestLen = AUTH_LEN(cri, SHA1_HASH_LEN);
-			ixp->ixp_ctx.authCtx.aadLen = 0;
-			/* Only SHA1_HMAC needs a key */
-			if (cri->cri_alg == CRYPTO_SHA1_HMAC) {
-				ixp->ixp_ctx.authCtx.authKeyLen = (cri->cri_klen + 7) / 8;
-				if (ixp->ixp_ctx.authCtx.authKeyLen >
-						sizeof(ixp->ixp_ctx.authCtx.key.authKey)) {
-					printk(
-						"ixp4xx: Invalid key length for SHA1_HMAC - %d bits\n",
-							cri->cri_klen);
-					ixp_freesession(NULL, i);
-					return EINVAL;
-				}
-				memcpy(ixp->ixp_ctx.authCtx.key.authKey,
-						cri->cri_key, (cri->cri_klen + 7) / 8);
-			}
-			break;
-
-		default:
-			printk("ixp: unknown algo 0x%x\n", cri->cri_alg);
-			ixp_freesession(NULL, i);
-			return EINVAL;
-		}
-		cri = cri->cri_next;
-	}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-	INIT_WORK(&ixp->ixp_pending_work, ixp_process_pending_wq);
-	INIT_WORK(&ixp->ixp_registration_work, ixp_registration_wq);
-#else
-	INIT_WORK(&ixp->ixp_pending_work, ixp_process_pending, ixp);
-	INIT_WORK(&ixp->ixp_registration_work, ixp_registration, ixp);
-#endif
-
-	return 0;
-}
-
-
-/*
- * Free a session.
- */
-static int
-ixp_freesession(device_t dev, u_int64_t tid)
-{
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid > ixp_sesnum || ixp_sessions == NULL ||
-			ixp_sessions[sid] == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	/* Silently accept and return */
-	if (sid == 0)
-		return 0;
-
-	if (ixp_sessions[sid]) {
-		if (ixp_sessions[sid]->ixp_ctx_id != -1) {
-			ixCryptoAccCtxUnregister(ixp_sessions[sid]->ixp_ctx_id);
-			ixp_sessions[sid]->ixp_ctx_id = -1;
-		}
-		kfree(ixp_sessions[sid]);
-	}
-	ixp_sessions[sid] = NULL;
-	if (ixp_blocked) {
-		ixp_blocked = 0;
-		crypto_unblock(ixp_id, CRYPTO_SYMQ);
-	}
-	return 0;
-}
-
-
-/*
- * callback for when hash processing is complete
- */
-
-static void
-ixp_hash_perform_cb(
-	UINT32 hash_key_id,
-	IX_MBUF *bufp,
-	IxCryptoAccStatus status)
-{
-	struct ixp_q *q;
-
-	dprintk("%s(%u, %p, 0x%x)\n", __FUNCTION__, hash_key_id, bufp, status);
-
-	if (bufp == NULL) {
-		printk("ixp: NULL buf in %s\n", __FUNCTION__);
-		return;
-	}
-
-	q = IX_MBUF_PRIV(bufp);
-	if (q == NULL) {
-		printk("ixp: NULL priv in %s\n", __FUNCTION__);
-		return;
-	}
-
-	if (status == IX_CRYPTO_ACC_STATUS_SUCCESS) {
-		/* On success, need to copy hash back into original client buffer */
-		memcpy(q->ixp_hash_dest, q->ixp_hash_src,
-				(q->ixp_q_data->ixp_auth_alg == CRYPTO_SHA1) ?
-					SHA1_HASH_LEN : MD5_HASH_LEN);
-	}
-	else {
-		printk("ixp: hash perform failed status=%d\n", status);
-		q->ixp_q_crp->crp_etype = EINVAL;
-	}
-
-	/* Free internal buffer used for hashing */
-	kfree(IX_MBUF_MDATA(&q->ixp_q_mbuf));
-
-	crypto_done(q->ixp_q_crp);
-	kmem_cache_free(qcache, q);
-}
-
-/*
- * setup a request and perform it
- */
-static void
-ixp_q_process(struct ixp_q *q)
-{
-	IxCryptoAccStatus status;
-	struct ixp_data *ixp = q->ixp_q_data;
-	int auth_off = 0;
-	int auth_len = 0;
-	int crypt_off = 0;
-	int crypt_len = 0;
-	int icv_off = 0;
-	char *crypt_func;
-
-	dprintk("%s(%p)\n", __FUNCTION__, q);
-
-	if (q->ixp_q_ccrd) {
-		if (q->ixp_q_ccrd->crd_flags & CRD_F_IV_EXPLICIT) {
-			q->ixp_q_iv = q->ixp_q_ccrd->crd_iv;
-		} else {
-			q->ixp_q_iv = q->ixp_q_iv_data;
-			crypto_copydata(q->ixp_q_crp->crp_flags, q->ixp_q_crp->crp_buf,
-					q->ixp_q_ccrd->crd_inject,
-					ixp->ixp_ctx.cipherCtx.cipherInitialVectorLen,
-					(caddr_t) q->ixp_q_iv);
-		}
-
-		if (q->ixp_q_acrd) {
-			auth_off = q->ixp_q_acrd->crd_skip;
-			auth_len = q->ixp_q_acrd->crd_len;
-			icv_off  = q->ixp_q_acrd->crd_inject;
-		}
-
-		crypt_off = q->ixp_q_ccrd->crd_skip;
-		crypt_len = q->ixp_q_ccrd->crd_len;
-	} else { /* if (q->ixp_q_acrd) */
-		auth_off = q->ixp_q_acrd->crd_skip;
-		auth_len = q->ixp_q_acrd->crd_len;
-		icv_off  = q->ixp_q_acrd->crd_inject;
-	}
-
-	if (q->ixp_q_crp->crp_flags & CRYPTO_F_SKBUF) {
-		struct sk_buff *skb = (struct sk_buff *) q->ixp_q_crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags) {
-			/*
-			 * DAVIDM fix this limitation one day by using
-			 * a buffer pool and chaining,  it is not currently
-			 * needed for current user/kernel space acceleration
-			 */
-			printk("ixp: Cannot handle fragmented skb's yet !\n");
-			q->ixp_q_crp->crp_etype = ENOENT;
-			goto done;
-		}
-		IX_MBUF_MLEN(&q->ixp_q_mbuf) =
-				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) =  skb->len;
-		IX_MBUF_MDATA(&q->ixp_q_mbuf) = skb->data;
-	} else if (q->ixp_q_crp->crp_flags & CRYPTO_F_IOV) {
-		struct uio *uiop = (struct uio *) q->ixp_q_crp->crp_buf;
-		if (uiop->uio_iovcnt != 1) {
-			/*
-			 * DAVIDM fix this limitation one day by using
-			 * a buffer pool and chaining,  it is not currently
-			 * needed for current user/kernel space acceleration
-			 */
-			printk("ixp: Cannot handle more than 1 iovec yet !\n");
-			q->ixp_q_crp->crp_etype = ENOENT;
-			goto done;
-		}
-		IX_MBUF_MLEN(&q->ixp_q_mbuf) =
-				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) = uiop->uio_iov[0].iov_len;
-		IX_MBUF_MDATA(&q->ixp_q_mbuf) = uiop->uio_iov[0].iov_base;
-	} else /* contig buffer */ {
-		IX_MBUF_MLEN(&q->ixp_q_mbuf)  =
-				IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) = q->ixp_q_crp->crp_ilen;
-		IX_MBUF_MDATA(&q->ixp_q_mbuf) = q->ixp_q_crp->crp_buf;
-	}
-
-	IX_MBUF_PRIV(&q->ixp_q_mbuf) = q;
-
-	if (ixp->ixp_auth_alg == CRYPTO_SHA1 || ixp->ixp_auth_alg == CRYPTO_MD5) {
-		/*
-		 * For SHA1 and MD5 hash, need to create an internal buffer that is big
-		 * enough to hold the original data + the appropriate padding for the
-		 * hash algorithm.
-		 */
-		UINT8 *tbuf = NULL;
-
-		IX_MBUF_MLEN(&q->ixp_q_mbuf) = IX_MBUF_PKT_LEN(&q->ixp_q_mbuf) =
-			((IX_MBUF_MLEN(&q->ixp_q_mbuf) * 8) + 72 + 511) / 8;
-		tbuf = kmalloc(IX_MBUF_MLEN(&q->ixp_q_mbuf), SLAB_ATOMIC);
-		
-		if (IX_MBUF_MDATA(&q->ixp_q_mbuf) == NULL) {
-			printk("ixp: kmalloc(%u, SLAB_ATOMIC) failed\n",
-					IX_MBUF_MLEN(&q->ixp_q_mbuf));
-			q->ixp_q_crp->crp_etype = ENOMEM;
-			goto done;
-		}
-		memcpy(tbuf, &(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_off], auth_len);
-
-		/* Set location in client buffer to copy hash into */
-		q->ixp_hash_dest =
-			&(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_off + auth_len];
-
-		IX_MBUF_MDATA(&q->ixp_q_mbuf) = tbuf;
-
-		/* Set location in internal buffer for where hash starts */
-		q->ixp_hash_src = &(IX_MBUF_MDATA(&q->ixp_q_mbuf))[auth_len];
-
-		crypt_func = "ixCryptoAccHashPerform";
-		status = ixCryptoAccHashPerform(ixp->ixp_ctx.authCtx.authAlgo,
-				&q->ixp_q_mbuf, ixp_hash_perform_cb, 0, auth_len, auth_len,
-				&ixp->ixp_hash_key_id);
-	}
-	else {
-		crypt_func = "ixCryptoAccAuthCryptPerform";
-		status = ixCryptoAccAuthCryptPerform(ixp->ixp_ctx_id, &q->ixp_q_mbuf,
-			NULL, auth_off, auth_len, crypt_off, crypt_len, icv_off,
-			q->ixp_q_iv);
-	}
-
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
-		return;
-
-	if (IX_CRYPTO_ACC_STATUS_QUEUE_FULL == status) {
-		q->ixp_q_crp->crp_etype = ENOMEM;
-		goto done;
-	}
-
-	printk("ixp: %s failed %u\n", crypt_func, status);
-	q->ixp_q_crp->crp_etype = EINVAL;
-
-done:
-	crypto_done(q->ixp_q_crp);
-	kmem_cache_free(qcache, q);
-}
-
-
-/*
- * because we cannot process the Q from the Register callback
- * we do it here on a task Q.
- */
-
-static void
-ixp_process_pending(void *arg)
-{
-	struct ixp_data *ixp = arg;
-	struct ixp_q *q = NULL;
-
-	dprintk("%s(%p)\n", __FUNCTION__, arg);
-
-	if (!ixp)
-		return;
-
-	while (!list_empty(&ixp->ixp_q)) {
-		q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
-		list_del(&q->ixp_q_list);
-		ixp_q_process(q);
-	}
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void
-ixp_process_pending_wq(struct work_struct *work)
-{
-	struct ixp_data *ixp = container_of(work, struct ixp_data, ixp_pending_work);
-	ixp_process_pending(ixp);
-}
-#endif
-
-/*
- * callback for when context registration is complete
- */
-
-static void
-ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp, IxCryptoAccStatus status)
-{
-	int i;
-	struct ixp_data *ixp;
-	struct ixp_q *q;
-
-	dprintk("%s(%d, %p, %d)\n", __FUNCTION__, ctx_id, bufp, status);
-
-	/*
-	 * free any buffer passed in to this routine
-	 */
-	if (bufp) {
-		IX_MBUF_MLEN(bufp) = IX_MBUF_PKT_LEN(bufp) = 0;
-		kfree(IX_MBUF_MDATA(bufp));
-		IX_MBUF_MDATA(bufp) = NULL;
-	}
-
-	for (i = 0; i < ixp_sesnum; i++) {
-		ixp = ixp_sessions[i];
-		if (ixp && ixp->ixp_ctx_id == ctx_id)
-			break;
-	}
-	if (i >= ixp_sesnum) {
-		printk("ixp: invalid context id %d\n", ctx_id);
-		return;
-	}
-
-	if (IX_CRYPTO_ACC_STATUS_WAIT == status) {
-		/* this is normal to free the first of two buffers */
-		dprintk("ixp: register not finished yet.\n");
-		return;
-	}
-
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS != status) {
-		printk("ixp: register failed 0x%x\n", status);
-		while (!list_empty(&ixp->ixp_q)) {
-			q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
-			list_del(&q->ixp_q_list);
-			q->ixp_q_crp->crp_etype = EINVAL;
-			crypto_done(q->ixp_q_crp);
-			kmem_cache_free(qcache, q);
-		}
-		return;
-	}
-
-	/*
-	 * we are now registered,  we cannot start processing the Q here
-	 * or we get strange errors with AES (DES/3DES seem to be ok).
-	 */
-	ixp->ixp_registered = 1;
-	schedule_work(&ixp->ixp_pending_work);
-}
-
-
-/*
- * callback for when data processing is complete
- */
-
-static void
-ixp_perform_cb(
-	UINT32 ctx_id,
-	IX_MBUF *sbufp,
-	IX_MBUF *dbufp,
-	IxCryptoAccStatus status)
-{
-	struct ixp_q *q;
-
-	dprintk("%s(%d, %p, %p, 0x%x)\n", __FUNCTION__, ctx_id, sbufp,
-			dbufp, status);
-
-	if (sbufp == NULL) {
-		printk("ixp: NULL sbuf in ixp_perform_cb\n");
-		return;
-	}
-
-	q = IX_MBUF_PRIV(sbufp);
-	if (q == NULL) {
-		printk("ixp: NULL priv in ixp_perform_cb\n");
-		return;
-	}
-
-	if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
-		printk("ixp: perform failed status=%d\n", status);
-		q->ixp_q_crp->crp_etype = EINVAL;
-	}
-
-	crypto_done(q->ixp_q_crp);
-	kmem_cache_free(qcache, q);
-}
-
-
-/*
- * registration is not callable at IRQ time,  so we defer
- * to a task queue,  this routines completes the registration for us
- * when the task queue runs
- *
- * Unfortunately this means we cannot tell OCF that the driver is blocked,
- * we do that on the next request.
- */
-
-static void
-ixp_registration(void *arg)
-{
-	struct ixp_data *ixp = arg;
-	struct ixp_q *q = NULL;
-	IX_MBUF *pri = NULL, *sec = NULL;
-	int status = IX_CRYPTO_ACC_STATUS_SUCCESS;
-
-	if (!ixp) {
-		printk("ixp: ixp_registration with no arg\n");
-		return;
-	}
-
-	if (ixp->ixp_ctx_id != -1) {
-		ixCryptoAccCtxUnregister(ixp->ixp_ctx_id);
-		ixp->ixp_ctx_id = -1;
-	}
-
-	if (list_empty(&ixp->ixp_q)) {
-		printk("ixp: ixp_registration with no Q\n");
-		return;
-	}
-
-	/*
-	 * setup the primary and secondary buffers
-	 */
-	q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
-	if (q->ixp_q_acrd) {
-		pri = &ixp->ixp_pri_mbuf;
-		sec = &ixp->ixp_sec_mbuf;
-		IX_MBUF_MLEN(pri)  = IX_MBUF_PKT_LEN(pri) = 128;
-		IX_MBUF_MDATA(pri) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
-		IX_MBUF_MLEN(sec)  = IX_MBUF_PKT_LEN(sec) = 128;
-		IX_MBUF_MDATA(sec) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
-	}
-
-	/* Only need to register if a crypt op or HMAC op */
-	if (!(ixp->ixp_auth_alg == CRYPTO_SHA1 ||
-				ixp->ixp_auth_alg == CRYPTO_MD5)) {
-		status = ixCryptoAccCtxRegister(
-					&ixp->ixp_ctx,
-					pri, sec,
-					ixp_register_cb,
-					ixp_perform_cb,
-					&ixp->ixp_ctx_id);
-	}
-	else {
-		/* Otherwise we start processing pending q */
-		schedule_work(&ixp->ixp_pending_work);
-	}
-
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
-		return;
-
-	if (IX_CRYPTO_ACC_STATUS_EXCEED_MAX_TUNNELS == status) {
-		printk("ixp: ixCryptoAccCtxRegister failed (out of tunnels)\n");
-		ixp_blocked = 1;
-		/* perhaps we should return EGAIN on queued ops ? */
-		return;
-	}
-
-	printk("ixp: ixCryptoAccCtxRegister failed %d\n", status);
-	ixp->ixp_ctx_id = -1;
-
-	/*
-	 * everything waiting is toasted
-	 */
-	while (!list_empty(&ixp->ixp_q)) {
-		q = list_entry(ixp->ixp_q.next, struct ixp_q, ixp_q_list);
-		list_del(&q->ixp_q_list);
-		q->ixp_q_crp->crp_etype = ENOENT;
-		crypto_done(q->ixp_q_crp);
-		kmem_cache_free(qcache, q);
-	}
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void
-ixp_registration_wq(struct work_struct *work)
-{
-	struct ixp_data *ixp = container_of(work, struct ixp_data,
-								ixp_registration_work);
-	ixp_registration(ixp);
-}
-#endif
-
-/*
- * Process a request.
- */
-static int
-ixp_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct ixp_data *ixp;
-	unsigned int lid;
-	struct ixp_q *q = NULL;
-	int status;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	/* Sanity check */
-	if (crp == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	crp->crp_etype = 0;
-
-	if (ixp_blocked)
-		return ERESTART;
-
-	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	/*
-	 * find the session we are using
-	 */
-
-	lid = crp->crp_sid & 0xffffffff;
-	if (lid >= ixp_sesnum || lid == 0 || ixp_sessions == NULL ||
-			ixp_sessions[lid] == NULL) {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-	ixp = ixp_sessions[lid];
-
-	/*
-	 * setup a new request ready for queuing
-	 */
-	q = kmem_cache_alloc(qcache, SLAB_ATOMIC);
-	if (q == NULL) {
-		dprintk("%s,%d: ENOMEM\n", __FILE__, __LINE__);
-		crp->crp_etype = ENOMEM;
-		goto done;
-	}
-	/*
-	 * save some cycles by only zeroing the important bits
-	 */
-	memset(&q->ixp_q_mbuf, 0, sizeof(q->ixp_q_mbuf));
-	q->ixp_q_ccrd = NULL;
-	q->ixp_q_acrd = NULL;
-	q->ixp_q_crp = crp;
-	q->ixp_q_data = ixp;
-
-	/*
-	 * point the cipher and auth descriptors appropriately
-	 * check that we have something to do
-	 */
-	if (crp->crp_desc->crd_alg == ixp->ixp_cipher_alg)
-		q->ixp_q_ccrd = crp->crp_desc;
-	else if (crp->crp_desc->crd_alg == ixp->ixp_auth_alg)
-		q->ixp_q_acrd = crp->crp_desc;
-	else {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: bad desc match: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-	if (crp->crp_desc->crd_next) {
-		if (crp->crp_desc->crd_next->crd_alg == ixp->ixp_cipher_alg)
-			q->ixp_q_ccrd = crp->crp_desc->crd_next;
-		else if (crp->crp_desc->crd_next->crd_alg == ixp->ixp_auth_alg)
-			q->ixp_q_acrd = crp->crp_desc->crd_next;
-		else {
-			crp->crp_etype = ENOENT;
-			dprintk("%s,%d: bad desc match: ENOENT\n", __FILE__, __LINE__);
-			goto done;
-		}
-	}
-
-	/*
-	 * If there is a direction change for this context then we mark it as
-	 * unregistered and re-register is for the new direction.  This is not
-	 * a very expensive operation and currently only tends to happen when
-	 * user-space application are doing benchmarks
-	 *
-	 * DM - we should be checking for pending requests before unregistering.
-	 */
-	if (q->ixp_q_ccrd && ixp->ixp_registered &&
-			ixp->ixp_crd_flags != (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT)) {
-		dprintk("%s - detected direction change on session\n", __FUNCTION__);
-		ixp->ixp_registered = 0;
-	}
-
-	/*
-	 * if we are registered,  call straight into the perform code
-	 */
-	if (ixp->ixp_registered) {
-		ixp_q_process(q);
-		return 0;
-	}
-
-	/*
-	 * the only part of the context not set in newsession is the direction
-	 * dependent parts
-	 */
-	if (q->ixp_q_ccrd) {
-		ixp->ixp_crd_flags = (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT);
-		if (q->ixp_q_ccrd->crd_flags & CRD_F_ENCRYPT) {
-			ixp->ixp_ctx.operation = q->ixp_q_acrd ?
-					IX_CRYPTO_ACC_OP_ENCRYPT_AUTH : IX_CRYPTO_ACC_OP_ENCRYPT;
-		} else {
-			ixp->ixp_ctx.operation = q->ixp_q_acrd ?
-					IX_CRYPTO_ACC_OP_AUTH_DECRYPT : IX_CRYPTO_ACC_OP_DECRYPT;
-		}
-	} else {
-		/* q->ixp_q_acrd must be set if we are here */
-		ixp->ixp_ctx.operation = IX_CRYPTO_ACC_OP_AUTH_CALC;
-	}
-
-	status = list_empty(&ixp->ixp_q);
-	list_add_tail(&q->ixp_q_list, &ixp->ixp_q);
-	if (status)
-		schedule_work(&ixp->ixp_registration_work);
-	return 0;
-
-done:
-	if (q)
-		kmem_cache_free(qcache, q);
-	crypto_done(crp);
-	return 0;
-}
-
-
-#ifdef __ixp46X
-/*
- * key processing support for the ixp465
- */
-
-
-/*
- * copy a BN (LE) into a buffer (BE) an fill out the op appropriately
- * assume zeroed and only copy bits that are significant
- */
-
-static int
-ixp_copy_ibuf(struct crparam *p, IxCryptoAccPkeEauOperand *op, UINT32 *buf)
-{
-	unsigned char *src = (unsigned char *) p->crp_p;
-	unsigned char *dst;
-	int len, bits = p->crp_nbits;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	if (bits > MAX_IOP_SIZE * sizeof(UINT32) * 8) {
-		dprintk("%s - ibuf too big (%d > %d)\n", __FUNCTION__,
-				bits, MAX_IOP_SIZE * sizeof(UINT32) * 8);
-		return -1;
-	}
-
-	len = (bits + 31) / 32; /* the number UINT32's needed */
-
-	dst = (unsigned char *) &buf[len];
-	dst--;
-
-	while (bits > 0) {
-		*dst-- = *src++;
-		bits -= 8;
-	}
-
-#if 0 /* no need to zero remaining bits as it is done during request alloc */
-	while (dst > (unsigned char *) buf)
-		*dst-- = '\0';
-#endif
-
-	op->pData = buf;
-	op->dataLen = len;
-	return 0;
-}
-
-/*
- * copy out the result,  be as forgiving as we can about small output buffers
- */
-
-static int
-ixp_copy_obuf(struct crparam *p, IxCryptoAccPkeEauOpResult *op, UINT32 *buf)
-{
-	unsigned char *dst = (unsigned char *) p->crp_p;
-	unsigned char *src = (unsigned char *) buf;
-	int len, z, bits = p->crp_nbits;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	len = op->dataLen * sizeof(UINT32);
-
-	/* skip leading zeroes to be small buffer friendly */
-	z = 0;
-	while (z < len && src[z] == '\0')
-		z++;
-
-	src += len;
-	src--;
-	len -= z;
-
-	while (len > 0 && bits > 0) {
-		*dst++ = *src--;
-		len--;
-		bits -= 8;
-	}
-
-	while (bits > 0) {
-		*dst++ = '\0';
-		bits -= 8;
-	}
-
-	if (len > 0) {
-		dprintk("%s - obuf is %d (z=%d, ob=%d) bytes too small\n",
-				__FUNCTION__, len, z, p->crp_nbits / 8);
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/*
- * the parameter offsets for exp_mod
- */
-
-#define IXP_PARAM_BASE 0
-#define IXP_PARAM_EXP  1
-#define IXP_PARAM_MOD  2
-#define IXP_PARAM_RES  3
-
-/*
- * key processing complete callback,  is also used to start processing
- * by passing a NULL for pResult
- */
-
-static void
-ixp_kperform_cb(
-	IxCryptoAccPkeEauOperation operation,
-	IxCryptoAccPkeEauOpResult *pResult,
-	BOOL carryOrBorrow,
-	IxCryptoAccStatus status)
-{
-	struct ixp_pkq *q, *tmp;
-	unsigned long flags;
-
-	dprintk("%s(0x%x, %p, %d, 0x%x)\n", __FUNCTION__, operation, pResult,
-			carryOrBorrow, status);
-
-	/* handle a completed request */
-	if (pResult) {
-		if (ixp_pk_cur && &ixp_pk_cur->pkq_result == pResult) {
-			q = ixp_pk_cur;
-			if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
-				dprintk("%s() - op failed 0x%x\n", __FUNCTION__, status);
-				q->pkq_krp->krp_status = ERANGE; /* could do better */
-			} else {
-				/* copy out the result */
-				if (ixp_copy_obuf(&q->pkq_krp->krp_param[IXP_PARAM_RES],
-						&q->pkq_result, q->pkq_obuf))
-					q->pkq_krp->krp_status = ERANGE;
-			}
-			crypto_kdone(q->pkq_krp);
-			kfree(q);
-			ixp_pk_cur = NULL;
-		} else
-			printk("%s - callback with invalid result pointer\n", __FUNCTION__);
-	}
-
-	spin_lock_irqsave(&ixp_pkq_lock, flags);
-	if (ixp_pk_cur || list_empty(&ixp_pkq)) {
-		spin_unlock_irqrestore(&ixp_pkq_lock, flags);
-		return;
-	}
-
-	list_for_each_entry_safe(q, tmp, &ixp_pkq, pkq_list) {
-
-		list_del(&q->pkq_list);
-		ixp_pk_cur = q;
-
-		spin_unlock_irqrestore(&ixp_pkq_lock, flags);
-
-		status = ixCryptoAccPkeEauPerform(
-				IX_CRYPTO_ACC_OP_EAU_MOD_EXP,
-				&q->pkq_op,
-				ixp_kperform_cb,
-				&q->pkq_result);
-	
-		if (status == IX_CRYPTO_ACC_STATUS_SUCCESS) {
-			dprintk("%s() - ixCryptoAccPkeEauPerform SUCCESS\n", __FUNCTION__);
-			return; /* callback will return here for callback */
-		} else if (status == IX_CRYPTO_ACC_STATUS_RETRY) {
-			printk("%s() - ixCryptoAccPkeEauPerform RETRY\n", __FUNCTION__);
-		} else {
-			printk("%s() - ixCryptoAccPkeEauPerform failed %d\n",
-					__FUNCTION__, status);
-		}
-		q->pkq_krp->krp_status = ERANGE; /* could do better */
-		crypto_kdone(q->pkq_krp);
-		kfree(q);
-		spin_lock_irqsave(&ixp_pkq_lock, flags);
-	}
-	spin_unlock_irqrestore(&ixp_pkq_lock, flags);
-}
-
-
-static int
-ixp_kprocess(device_t dev, struct cryptkop *krp, int hint)
-{
-	struct ixp_pkq *q;
-	int rc = 0;
-	unsigned long flags;
-
-	dprintk("%s l1=%d l2=%d l3=%d l4=%d\n", __FUNCTION__,
-			krp->krp_param[IXP_PARAM_BASE].crp_nbits,
-			krp->krp_param[IXP_PARAM_EXP].crp_nbits,
-			krp->krp_param[IXP_PARAM_MOD].crp_nbits,
-			krp->krp_param[IXP_PARAM_RES].crp_nbits);
-
-
-	if (krp->krp_op != CRK_MOD_EXP) {
-		krp->krp_status = EOPNOTSUPP;
-		goto err;
-	}
-
-	q = (struct ixp_pkq *) kmalloc(sizeof(*q), GFP_KERNEL);
-	if (q == NULL) {
-		krp->krp_status = ENOMEM;
-		goto err;
-	}
-
-	/*
-	 * The PKE engine does not appear to zero the output buffer
-	 * appropriately, so we need to do it all here.
-	 */
-	memset(q, 0, sizeof(*q));
-
-	q->pkq_krp = krp;
-	INIT_LIST_HEAD(&q->pkq_list);
-
-	if (ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_BASE], &q->pkq_op.modExpOpr.M,
-			q->pkq_ibuf0))
-		rc = 1;
-	if (!rc && ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_EXP],
-				&q->pkq_op.modExpOpr.e, q->pkq_ibuf1))
-		rc = 2;
-	if (!rc && ixp_copy_ibuf(&krp->krp_param[IXP_PARAM_MOD],
-				&q->pkq_op.modExpOpr.N, q->pkq_ibuf2))
-		rc = 3;
-
-	if (rc) {
-		kfree(q);
-		krp->krp_status = ERANGE;
-		goto err;
-	}
-
-	q->pkq_result.pData           = q->pkq_obuf;
-	q->pkq_result.dataLen         =
-			(krp->krp_param[IXP_PARAM_RES].crp_nbits + 31) / 32;
-
-	spin_lock_irqsave(&ixp_pkq_lock, flags);
-	list_add_tail(&q->pkq_list, &ixp_pkq);
-	spin_unlock_irqrestore(&ixp_pkq_lock, flags);
-
-	if (!ixp_pk_cur)
-		ixp_kperform_cb(0, NULL, 0, 0);
-	return (0);
-
-err:
-	crypto_kdone(krp);
-	return (0);
-}
-
-
-
-#ifdef CONFIG_OCF_RANDOMHARVEST
-/*
- * We run the random number generator output through SHA so that it
- * is FIPS compliant.
- */
-
-static volatile int sha_done = 0;
-static unsigned char sha_digest[20];
-
-static void
-ixp_hash_cb(UINT8 *digest, IxCryptoAccStatus status)
-{
-	dprintk("%s(%p, %d)\n", __FUNCTION__, digest, status);
-	if (sha_digest != digest)
-		printk("digest error\n");
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
-		sha_done = 1;
-	else
-		sha_done = -status;
-}
-
-static int
-ixp_read_random(void *arg, u_int32_t *buf, int maxwords)
-{
-	IxCryptoAccStatus status;
-	int i, n, rc;
-
-	dprintk("%s(%p, %d)\n", __FUNCTION__, buf, maxwords);
-	memset(buf, 0, maxwords * sizeof(*buf));
-	status = ixCryptoAccPkePseudoRandomNumberGet(maxwords, buf);
-	if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
-		dprintk("%s: ixCryptoAccPkePseudoRandomNumberGet failed %d\n",
-				__FUNCTION__, status);
-		return 0;
-	}
-
-	/*
-	 * run the random data through SHA to make it look more random
-	 */
-
-	n = sizeof(sha_digest); /* process digest bytes at a time */
-
-	rc = 0;
-	for (i = 0; i < maxwords; i += n / sizeof(*buf)) {
-		if ((maxwords - i) * sizeof(*buf) < n)
-			n = (maxwords - i) * sizeof(*buf);
-		sha_done = 0;
-		status = ixCryptoAccPkeHashPerform(IX_CRYPTO_ACC_AUTH_SHA1,
-				(UINT8 *) &buf[i], n, ixp_hash_cb, sha_digest);
-		if (status != IX_CRYPTO_ACC_STATUS_SUCCESS) {
-			dprintk("ixCryptoAccPkeHashPerform failed %d\n", status);
-			return -EIO;
-		}
-		while (!sha_done)
-			schedule();
-		if (sha_done < 0) {
-			dprintk("ixCryptoAccPkeHashPerform failed CB %d\n", -sha_done);
-			return 0;
-		}
-		memcpy(&buf[i], sha_digest, n);
-		rc += n / sizeof(*buf);;
-	}
-
-	return rc;
-}
-#endif /* CONFIG_OCF_RANDOMHARVEST */
-
-#endif /* __ixp46X */
-
-
-
-/*
- * our driver startup and shutdown routines
- */
-
-static int
-ixp_init(void)
-{
-	dprintk("%s(%p)\n", __FUNCTION__, ixp_init);
-
-	if (ixp_init_crypto && ixCryptoAccInit() != IX_CRYPTO_ACC_STATUS_SUCCESS)
-		printk("ixCryptoAccInit failed, assuming already initialised!\n");
-
-	qcache = kmem_cache_create("ixp4xx_q", sizeof(struct ixp_q), 0,
-				SLAB_HWCACHE_ALIGN, NULL
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-				, NULL
-#endif
-				  );
-	if (!qcache) {
-		printk("failed to create Qcache\n");
-		return -ENOENT;
-	}
-
-	memset(&ixpdev, 0, sizeof(ixpdev));
-	softc_device_init(&ixpdev, "ixp4xx", 0, ixp_methods);
-
-	ixp_id = crypto_get_driverid(softc_get_device(&ixpdev),
-				CRYPTOCAP_F_HARDWARE);
-	if (ixp_id < 0)
-		panic("IXP/OCF crypto device cannot initialize!");
-
-#define	REGISTER(alg) \
-	crypto_register(ixp_id,alg,0,0)
-
-	REGISTER(CRYPTO_DES_CBC);
-	REGISTER(CRYPTO_3DES_CBC);
-	REGISTER(CRYPTO_RIJNDAEL128_CBC);
-#ifdef CONFIG_OCF_IXP4XX_SHA1_MD5
-	REGISTER(CRYPTO_MD5);
-	REGISTER(CRYPTO_SHA1);
-#endif
-	REGISTER(CRYPTO_MD5_HMAC);
-	REGISTER(CRYPTO_SHA1_HMAC);
-#undef REGISTER
-
-#ifdef __ixp46X
-	spin_lock_init(&ixp_pkq_lock);
-	/*
-	 * we do not enable the go fast options here as they can potentially
-	 * allow timing based attacks
-	 *
-	 * http://www.openssl.org/news/secadv_20030219.txt
-	 */
-	ixCryptoAccPkeEauExpConfig(0, 0);
-	crypto_kregister(ixp_id, CRK_MOD_EXP, 0);
-#ifdef CONFIG_OCF_RANDOMHARVEST
-	crypto_rregister(ixp_id, ixp_read_random, NULL);
-#endif
-#endif
-
-	return 0;
-}
-
-static void
-ixp_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	crypto_unregister_all(ixp_id);
-	ixp_id = -1;
-	kmem_cache_destroy(qcache);
-	qcache = NULL;
-}
-
-module_init(ixp_init);
-module_exit(ixp_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("David McCullough <dmccullough@cyberguard.com>");
-MODULE_DESCRIPTION("ixp (OCF module for IXP4xx crypto)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/Makefile b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/Makefile
deleted file mode 100644
index 6dafd0048a..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_KIRKWOOD) += mv_cesa.o
-
-mv_cesa-y := cesa/mvCesa.o cesa/mvLru.o cesa/mvMD5.o cesa/mvSHA1.o cesa/AES/mvAesAlg.o cesa/AES/mvAesApi.o cesa/mvCesaDebug.o cesa_ocf_drv.o
-
-# Extra objects required by the CESA driver
-mv_cesa-y += mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.o mvHal/kw_family/boardEnv/mvBoardEnvLib.o mvHal/mv_hal/twsi/mvTwsi.o mvHal/kw_family/ctrlEnv/sys/mvCpuIf.o mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.o mvHal/kw_family/ctrlEnv/sys/mvSysDram.o mvHal/linux_oss/mvOs.o mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.o mvHal/mv_hal/gpp/mvGpp.o mvHal/kw_family/ctrlEnv/sys/mvSysPex.o mvHal/mv_hal/pex/mvPex.o mvHal/kw_family/boardEnv/mvBoardEnvSpec.o mvHal/common/mvCommon.o mvHal/common/mvDebug.o mvHal/kw_family/ctrlEnv/sys/mvSysCesa.o
-
-ifdef src
-EXTRA_CFLAGS += -I$(src)/.. -I$(src)/cesa -I$(src)/mvHal -I$(src)/mvHal/common -I$(src)/mvHal/kw_family -I$(src)/mvHal/mv_hal -I$(src)/mvHal/linux_oss -I$(src)
-endif
-
-EXTRA_CFLAGS += -DMV_LINUX -DMV_CPU_LE -DMV_ARM -DMV_INCLUDE_CESA -DMV_INCLUDE_PEX -DMV_CACHE_COHERENCY=3
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h
deleted file mode 100644
index 07a8601f82..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAes.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* mvAes.h   v2.0   August '99
- * Reference ANSI C code
- */
-
-/*  AES Cipher header file for ANSI C Submissions
-      Lawrence E. Bassham III
-      Computer Security Division
-      National Institute of Standards and Technology
-
-      April 15, 1998
-
-    This sample is to assist implementers developing to the Cryptographic 
-API Profile for AES Candidate Algorithm Submissions.  Please consult this 
-document as a cross-reference.
-
-    ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
-MUST BE DOCUMENTED.  CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
-THE STRING "CHANGE POSSIBLE".  FUNCTION CALLS AND THEIR PARAMETERS CANNOT 
-BE CHANGED.  STRUCTURES CAN BE ALTERED TO ALLOW IMPLEMENTERS TO INCLUDE 
-IMPLEMENTATION SPECIFIC INFORMATION.
-*/
-
-/*  Includes:
-	Standard include files
-*/
-
-#include "mvOs.h"
-
-
-/*  Error Codes - CHANGE POSSIBLE: inclusion of additional error codes  */
-
-/*  Key direction is invalid, e.g., unknown value */
-#define     AES_BAD_KEY_DIR        -1  
-
-/*  Key material not of correct length */
-#define     AES_BAD_KEY_MAT        -2  
-
-/*  Key passed is not valid  */
-#define     AES_BAD_KEY_INSTANCE   -3  
-
-/*  Params struct passed to cipherInit invalid */
-#define     AES_BAD_CIPHER_MODE    -4  
-
-/*  Cipher in wrong state (e.g., not initialized) */
-#define     AES_BAD_CIPHER_STATE   -5  
-
-#define     AES_BAD_CIPHER_INSTANCE   -7 
-
-
-/*  Function protoypes  */
-/*  CHANGED: makeKey(): parameter blockLen added
-                        this parameter is absolutely necessary if you want to
-			setup the round keys in a variable block length setting 
-	     cipherInit(): parameter blockLen added (for obvious reasons)		
- */
-int     aesMakeKey(MV_U8 *expandedKey, MV_U8 *keyMaterial, int keyLen, int blockLen);
-int     aesBlockEncrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
-                    MV_U32 *plain, int numBlocks, MV_U32 *cipher);
-int     aesBlockDecrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
-                    MV_U32 *plain, int numBlocks, MV_U32 *cipher);
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c
deleted file mode 100644
index a65dc28932..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* rijndael-alg-ref.c   v2.0   August '99
- * Reference ANSI C code
- * authors: Paulo Barreto
- *          Vincent Rijmen, K.U.Leuven
- *
- * This code is placed in the public domain.
- */
-
-#include "mvOs.h"
-
-#include "mvAesAlg.h"
-
-#include "mvAesBoxes.dat"
-
-
-MV_U8 mul1(MV_U8 aa, MV_U8 bb);
-void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC);
-void ShiftRow128Enc(MV_U8 a[4][MAXBC]);
-void ShiftRow128Dec(MV_U8 a[4][MAXBC]);
-void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]);
-void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]);
-void InvMixColumn(MV_U8 a[4][MAXBC]);
-
-
-#define mul(aa, bb) (mask[bb] & Alogtable[aa + Logtable[bb]])
-                         
-MV_U8 mul1(MV_U8 aa, MV_U8 bb)
-{
-    return mask[bb] & Alogtable[aa + Logtable[bb]];
-}
-
-
-void KeyAddition(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC], MV_U8 BC) 
-{
-	/* Exor corresponding text input and round key input bytes
-	 */
-    ((MV_U32*)(&(a[0][0])))[0] ^= ((MV_U32*)(&(rk[0][0])))[0];
-    ((MV_U32*)(&(a[1][0])))[0] ^= ((MV_U32*)(&(rk[1][0])))[0];
-    ((MV_U32*)(&(a[2][0])))[0] ^= ((MV_U32*)(&(rk[2][0])))[0];
-    ((MV_U32*)(&(a[3][0])))[0] ^= ((MV_U32*)(&(rk[3][0])))[0];
-
-}
-
-void ShiftRow128Enc(MV_U8 a[4][MAXBC]) {
-	/* Row 0 remains unchanged
-	 * The other three rows are shifted a variable amount
-	 */
-	MV_U8 tmp[MAXBC];
-	
-    tmp[0] = a[1][1];
-    tmp[1] = a[1][2];
-    tmp[2] = a[1][3];
-    tmp[3] = a[1][0];
-
-    ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-     /*
-    a[1][0] = tmp[0];
-    a[1][1] = tmp[1];
-    a[1][2] = tmp[2];
-    a[1][3] = tmp[3];
-       */
-    tmp[0] = a[2][2];
-    tmp[1] = a[2][3];
-    tmp[2] = a[2][0];
-    tmp[3] = a[2][1];
-
-    ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-      /*
-    a[2][0] = tmp[0];
-    a[2][1] = tmp[1];
-    a[2][2] = tmp[2];
-    a[2][3] = tmp[3];
-    */
-    tmp[0] = a[3][3];
-    tmp[1] = a[3][0];
-    tmp[2] = a[3][1];
-    tmp[3] = a[3][2];
-
-    ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-    /*
-    a[3][0] = tmp[0];
-    a[3][1] = tmp[1];
-    a[3][2] = tmp[2];
-    a[3][3] = tmp[3];
-    */
-}  
-
-void ShiftRow128Dec(MV_U8 a[4][MAXBC]) {
-	/* Row 0 remains unchanged
-	 * The other three rows are shifted a variable amount
-	 */
-   	MV_U8 tmp[MAXBC];
-	
-    tmp[0] = a[1][3];
-    tmp[1] = a[1][0];
-    tmp[2] = a[1][1];
-    tmp[3] = a[1][2];
-
-    ((MV_U32*)(&(a[1][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-    /*
-    a[1][0] = tmp[0];
-    a[1][1] = tmp[1];
-    a[1][2] = tmp[2];
-    a[1][3] = tmp[3];
-    */
-
-    tmp[0] = a[2][2];
-    tmp[1] = a[2][3];
-    tmp[2] = a[2][0];
-    tmp[3] = a[2][1];
-
-    ((MV_U32*)(&(a[2][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-    /*
-    a[2][0] = tmp[0];
-    a[2][1] = tmp[1];
-    a[2][2] = tmp[2];
-    a[2][3] = tmp[3];
-    */
-
-    tmp[0] = a[3][1];
-    tmp[1] = a[3][2];
-    tmp[2] = a[3][3];
-    tmp[3] = a[3][0];
-
-    ((MV_U32*)(&(a[3][0])))[0] = ((MV_U32*)(&(tmp[0])))[0];
-    /*
-    a[3][0] = tmp[0];
-    a[3][1] = tmp[1];
-    a[3][2] = tmp[2];
-    a[3][3] = tmp[3];
-    */
-}  
-
-void Substitution(MV_U8 a[4][MAXBC], MV_U8 box[256]) {
-	/* Replace every byte of the input by the byte at that place
-	 * in the nonlinear S-box
-	 */
-	int i, j;
-	
-	for(i = 0; i < 4; i++)
-		for(j = 0; j < 4; j++) a[i][j] = box[a[i][j]] ;
-}
-   
-void MixColumn(MV_U8 a[4][MAXBC], MV_U8 rk[4][MAXBC]) {
-        /* Mix the four bytes of every column in a linear way
-	 */
-	MV_U8 b[4][MAXBC];
-	int i, j;
-		
-	for(j = 0; j < 4; j++){
-        b[0][j] = mul(25,a[0][j]) ^ mul(1,a[1][j]) ^ a[2][j] ^ a[3][j];
-        b[1][j] = mul(25,a[1][j]) ^ mul(1,a[2][j]) ^ a[3][j] ^ a[0][j];
-        b[2][j] = mul(25,a[2][j]) ^ mul(1,a[3][j]) ^ a[0][j] ^ a[1][j];
-        b[3][j] = mul(25,a[3][j]) ^ mul(1,a[0][j]) ^ a[1][j] ^ a[2][j];
-    }
-	for(i = 0; i < 4; i++)
-		/*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/
-        ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0] ^ ((MV_U32*)(&(rk[i][0])))[0];;
-}
-
-void InvMixColumn(MV_U8 a[4][MAXBC]) {
-        /* Mix the four bytes of every column in a linear way
-	 * This is the opposite operation of Mixcolumn
-	 */
-	MV_U8 b[4][MAXBC];
-	int i, j;
-	
-	for(j = 0; j < 4; j++){
-        b[0][j] = mul(223,a[0][j]) ^ mul(104,a[1][j]) ^ mul(238,a[2][j]) ^ mul(199,a[3][j]);
-        b[1][j] = mul(223,a[1][j]) ^ mul(104,a[2][j]) ^ mul(238,a[3][j]) ^ mul(199,a[0][j]);
-        b[2][j] = mul(223,a[2][j]) ^ mul(104,a[3][j]) ^ mul(238,a[0][j]) ^ mul(199,a[1][j]);
-        b[3][j] = mul(223,a[3][j]) ^ mul(104,a[0][j]) ^ mul(238,a[1][j]) ^ mul(199,a[2][j]);
-    }
-	for(i = 0; i < 4; i++)
-		/*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/
-        ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0];
-}
-
-int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 W[MAXROUNDS+1][4][MAXBC]) 
-{
-	/* Calculate the necessary round keys
-	 * The number of calculations depends on keyBits and blockBits
-	 */
-	int KC, BC, ROUNDS;
-	int i, j, t, rconpointer = 0;
-	MV_U8 tk[4][MAXKC];   
-
-	switch (keyBits) {
-	case 128: KC = 4; break;
-	case 192: KC = 6; break;
-	case 256: KC = 8; break;
-	default : return (-1);
-	}
-
-	switch (blockBits) {
-	case 128: BC = 4; break;
-	case 192: BC = 6; break;
-	case 256: BC = 8; break;
-	default : return (-2);
-	}
-
-	switch (keyBits >= blockBits ? keyBits : blockBits) {
-	case 128: ROUNDS = 10; break;
-	case 192: ROUNDS = 12; break;
-	case 256: ROUNDS = 14; break;
-	default : return (-3); /* this cannot happen */
-	}
-
-	
-	for(j = 0; j < KC; j++)
-		for(i = 0; i < 4; i++)
-			tk[i][j] = k[i][j];
-	t = 0;
-	/* copy values into round key array */
-	for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
-		for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
-		
-	while (t < (ROUNDS+1)*BC) { /* while not enough round key material calculated */
-		/* calculate new values */
-		for(i = 0; i < 4; i++)
-			tk[i][0] ^= S[tk[(i+1)%4][KC-1]];
-		tk[0][0] ^= rcon[rconpointer++];
-
-		if (KC != 8)
-			for(j = 1; j < KC; j++)
-				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
-		else {
-			for(j = 1; j < KC/2; j++)
-				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
-			for(i = 0; i < 4; i++) tk[i][KC/2] ^= S[tk[i][KC/2 - 1]];
-			for(j = KC/2 + 1; j < KC; j++)
-				for(i = 0; i < 4; i++) tk[i][j] ^= tk[i][j-1];
-	}
-	/* copy values into round key array */
-	for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
-		for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
-	}		
-
-	return 0;
-}
-      
-        
-
-int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds)
-{
-	/* Encryption of one block. 
-	 */
-	int r, BC, ROUNDS;
-
-    BC = 4;
-    ROUNDS = rounds;
-
-	/* begin with a key addition
-	 */
-
-	KeyAddition(a,rk[0],BC); 
-
-    /* ROUNDS-1 ordinary rounds
-	 */
-	for(r = 1; r < ROUNDS; r++) {
-		Substitution(a,S);
-		ShiftRow128Enc(a);
-		MixColumn(a, rk[r]);
-		/*KeyAddition(a,rk[r],BC);*/
-	}
-	
-	/* Last round is special: there is no MixColumn
-	 */
-	Substitution(a,S);
-	ShiftRow128Enc(a);
-	KeyAddition(a,rk[ROUNDS],BC);
-
-	return 0;
-}   
-
-
-int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds)
-{
-	int r, BC, ROUNDS;
-	
-    BC = 4;
-    ROUNDS = rounds;
-
-	/* To decrypt: apply the inverse operations of the encrypt routine,
-	 *             in opposite order
-	 * 
-	 * (KeyAddition is an involution: it 's equal to its inverse)
-	 * (the inverse of Substitution with table S is Substitution with the inverse table of S)
-	 * (the inverse of Shiftrow is Shiftrow over a suitable distance)
-	 */
-
-        /* First the special round:
-	 *   without InvMixColumn
-	 *   with extra KeyAddition
-	 */
-	KeyAddition(a,rk[ROUNDS],BC);
-    ShiftRow128Dec(a);               
-	Substitution(a,Si);
-	
-	/* ROUNDS-1 ordinary rounds
-	 */
-	for(r = ROUNDS-1; r > 0; r--) {
-		KeyAddition(a,rk[r],BC);
-		InvMixColumn(a);      
-		ShiftRow128Dec(a);               
-		Substitution(a,Si);
-
-	}
-	
-	/* End with the extra key addition
-	 */
-	
-	KeyAddition(a,rk[0],BC);    
-
-	return 0;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h
deleted file mode 100644
index ec81e403fa..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesAlg.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* rijndael-alg-ref.h   v2.0   August '99
- * Reference ANSI C code
- * authors: Paulo Barreto
- *          Vincent Rijmen, K.U.Leuven
- */
-#ifndef __RIJNDAEL_ALG_H
-#define __RIJNDAEL_ALG_H
-
-#define MAXBC				(128/32)
-#define MAXKC				(256/32)
-#define MAXROUNDS			14
-
-
-int rijndaelKeySched (MV_U8 k[4][MAXKC], int keyBits, int blockBits, MV_U8 rk[MAXROUNDS+1][4][MAXBC]);
-
-int rijndaelEncrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds);
-int rijndaelDecrypt128(MV_U8 a[4][MAXBC], MV_U8 rk[MAXROUNDS+1][4][MAXBC], int rounds);
-
-#endif /* __RIJNDAEL_ALG_H */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c
deleted file mode 100644
index b432dc6e66..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/AES/mvAesApi.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* rijndael-api-ref.c   v2.1   April 2000
- * Reference ANSI C code
- * authors: v2.0 Paulo Barreto
- *               Vincent Rijmen, K.U.Leuven
- *          v2.1 Vincent Rijmen, K.U.Leuven
- *
- * This code is placed in the public domain.
- */
-#include "mvOs.h"
-
-#include "mvAes.h"
-#include "mvAesAlg.h"
-
-
-/*  Defines:
-	Add any additional defines you need
-*/
-
-#define     MODE_ECB        1    /*  Are we ciphering in ECB mode?   */
-#define     MODE_CBC        2    /*  Are we ciphering in CBC mode?   */
-#define     MODE_CFB1       3    /*  Are we ciphering in 1-bit CFB mode? */
-
-
-int     aesMakeKey(MV_U8 *expandedKey, MV_U8 *keyMaterial, int keyLen, int blockLen)
-{
-    MV_U8   W[MAXROUNDS+1][4][MAXBC];
-	MV_U8   k[4][MAXKC];
-    MV_U8   j;
-	int     i, rounds, KC;
-	
-	if (expandedKey == NULL) 
-    {
-		return AES_BAD_KEY_INSTANCE;
-	}
-
-	if (!((keyLen == 128) || (keyLen == 192) || (keyLen == 256))) 
-    { 
-		return AES_BAD_KEY_MAT;
-	}
-
-	if (keyMaterial == NULL) 
-    {
-		return AES_BAD_KEY_MAT;
-	}
-
-	/* initialize key schedule: */ 
- 	for(i=0; i<keyLen/8; i++) 
-    {
-		j = keyMaterial[i];
-		k[i % 4][i / 4] = j; 
-	}	
-	
-	rijndaelKeySched (k, keyLen, blockLen, W);
-#ifdef MV_AES_DEBUG
-    {
-        MV_U8*  pW = &W[0][0][0];
-        int     x;
-
-        mvOsPrintf("Expended Key: size = %d\n", sizeof(W));
-        for(i=0; i<sizeof(W); i++)
-        {
-            mvOsPrintf("%02x ", pW[i]);
-        }
-        for(i=0; i<MAXROUNDS+1; i++)
-        {
-            mvOsPrintf("\n Round #%02d: ", i);
-            for(x=0; x<MAXBC; x++)
-            {
-                mvOsPrintf("%02x%02x%02x%02x ", 
-                    W[i][0][x], W[i][1][x], W[i][2][x], W[i][3][x]);
-            }
-            mvOsPrintf("\n");
-        }
-    }
-#endif /* MV_AES_DEBUG */
-  	switch (keyLen) 
-    {
-	    case 128: 
-            rounds = 10;
-            KC = 4; 
-            break;
-	    case 192: 
-            rounds = 12;
-            KC = 6; 
-            break;
-	    case 256: 
-            rounds = 14;
-            KC = 8; 
-            break;
-	    default : 
-            return (-1);
-	}
-
-    for(i=0; i<MAXBC; i++)
-    {
-        for(j=0; j<4; j++)
-        {
-            expandedKey[i*4+j] = W[rounds][j][i];
-        }
-    }
-    for(; i<KC; i++)
-    {
-        for(j=0; j<4; j++)
-        {
-            expandedKey[i*4+j] = W[rounds-1][j][i+MAXBC-KC];
-        }
-    }
-
-	
-	return 0;
-}
-
-int     aesBlockEncrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
-                        MV_U32 *plain, int numBlocks, MV_U32 *cipher)
-{
-	int     i, j, t;
-	MV_U8   block[4][MAXBC];
-    int     rounds;
-    char    *input, *outBuffer;
-
-    input = (char*)plain;
-    outBuffer = (char*)cipher;
-
-        /* check parameter consistency: */
-    if( (expandedKey == NULL) || ((keyLen != 128) && (keyLen != 192) && (keyLen != 256))) 
-    {
-        return AES_BAD_KEY_MAT;
-    }
-    if ((mode != MODE_ECB && mode != MODE_CBC))
-    {
-        return AES_BAD_CIPHER_STATE;
-    }
-
-	switch (keyLen) 
-    {
-	    case 128: rounds = 10; break;
-	    case 192: rounds = 12; break;
-	    case 256: rounds = 14; break;
-	    default : return (-3); /* this cannot happen */
-	}
-
-	
-	switch (mode) 
-    {
-	    case MODE_ECB: 
-		    for (i = 0; i < numBlocks; i++) 
-            {
-			    for (j = 0; j < 4; j++) 
-                {
-				    for(t = 0; t < 4; t++)
-				        /* parse input stream into rectangular array */
-					    block[t][j] = input[16*i+4*j+t] & 0xFF;
-			    }                           
-			    rijndaelEncrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
-			    for (j = 0; j < 4; j++) 
-                {           
-				    /* parse rectangular array into output ciphertext bytes */
-				    for(t = 0; t < 4; t++)
-                        outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
-
-			    }
-		    }
-		    break;
-		
-	    case MODE_CBC:
-		    for (j = 0; j < 4; j++) 
-            {
-			    for(t = 0; t < 4; t++)
-			    /* parse initial value into rectangular array */
-					block[t][j] = IV[t+4*j] & 0xFF;
-			}
-		    for (i = 0; i < numBlocks; i++) 
-            {
-			    for (j = 0; j < 4; j++) 
-                {
-				    for(t = 0; t < 4; t++)
-				        /* parse input stream into rectangular array and exor with 
-				        IV or the previous ciphertext */
-					    block[t][j] ^= input[16*i+4*j+t] & 0xFF;
-			    }
-			    rijndaelEncrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
-			    for (j = 0; j < 4; j++) 
-                {
-				    /* parse rectangular array into output ciphertext bytes */
-				    for(t = 0; t < 4; t++)
-					    outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
-			    }
-		    }
-		    break;
-	
-	    default: return AES_BAD_CIPHER_STATE;
-	}
-	
-	return 0;
-}
-
-int     aesBlockDecrypt128(MV_U8 mode, MV_U8 *IV, MV_U8 *expandedKey, int  keyLen, 
-                            MV_U32 *srcData, int numBlocks, MV_U32 *dstData)
-{
-	int     i, j, t;
-	MV_U8   block[4][MAXBC];
-    MV_U8   iv[4][MAXBC];    
-    int     rounds;
-    char    *input, *outBuffer;
-
-    input = (char*)srcData;
-    outBuffer = (char*)dstData;
-
-    if (expandedKey == NULL) 
-    {
-		return AES_BAD_KEY_MAT;
-	}
-
-    /* check parameter consistency: */
-    if (keyLen != 128 && keyLen != 192 && keyLen != 256)
-    {
-        return AES_BAD_KEY_MAT;
-    }
-    if ((mode != MODE_ECB && mode != MODE_CBC)) 
-    {
-        return AES_BAD_CIPHER_STATE;
-    }
-
-	switch (keyLen) 
-    {
-	    case 128: rounds = 10; break;
-	    case 192: rounds = 12; break;
-	    case 256: rounds = 14; break;
-	    default : return (-3); /* this cannot happen */
-	}
-
-	
-	switch (mode) 
-    {
-	    case MODE_ECB: 
-		    for (i = 0; i < numBlocks; i++) 
-            {
-			    for (j = 0; j < 4; j++) 
-                {
-				    for(t = 0; t < 4; t++)
-                    {
-				        /* parse input stream into rectangular array */
-					    block[t][j] = input[16*i+4*j+t] & 0xFF;
-                    }
-			    }
-			    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
-			    for (j = 0; j < 4; j++) 
-                {
-				    /* parse rectangular array into output ciphertext bytes */
-				    for(t = 0; t < 4; t++)
-					    outBuffer[16*i+4*j+t] = (MV_U8) block[t][j];
-			    }
-		    }
-		    break;
-		
-	    case MODE_CBC:
-		    /* first block */
-		    for (j = 0; j < 4; j++) 
-            {
-			    for(t = 0; t < 4; t++)
-                {
-			        /* parse input stream into rectangular array */
-				    block[t][j] = input[4*j+t] & 0xFF;
-                    iv[t][j] = block[t][j];
-                }
-		    }
-		    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
-		
-		    for (j = 0; j < 4; j++) 
-            {
-			    /* exor the IV and parse rectangular array into output ciphertext bytes */
-			    for(t = 0; t < 4; t++)
-                {
-				    outBuffer[4*j+t] = (MV_U8) (block[t][j] ^ IV[t+4*j]);
-                    IV[t+4*j] = iv[t][j];
-                }
-		    }
-		
-		    /* next blocks */
-		    for (i = 1; i < numBlocks; i++) 
-            {
-			    for (j = 0; j < 4; j++) 
-                {
-				    for(t = 0; t < 4; t++)
-                    {
-				        /* parse input stream into rectangular array */
-                        iv[t][j] = input[16*i+4*j+t] & 0xFF;
-					    block[t][j] = iv[t][j];
-                    }
-			    }
-			    rijndaelDecrypt128(block, (MV_U8 (*)[4][MAXBC])expandedKey, rounds);
-			
-			    for (j = 0; j < 4; j++) 
-                {
-				    /* exor previous ciphertext block and parse rectangular array 
-				       into output ciphertext bytes */
-				    for(t = 0; t < 4; t++)
-                    {
-					    outBuffer[16*i+4*j+t] = (MV_U8) (block[t][j] ^ IV[t+4*j]);
-                        IV[t+4*j] = iv[t][j];
-                    }
-			    }
-		    }
-		    break;
-	
-	    default: return AES_BAD_CIPHER_STATE;
-	}
-	
-	return 0;
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.c
deleted file mode 100644
index 17ab086f07..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.c
+++ /dev/null
@@ -1,3126 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "cesa/mvCesa.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#undef CESA_DEBUG
-
-
-/********** Global variables **********/
-
-/*  If request size is more than MV_CESA_MAX_BUF_SIZE the
- *  request is processed as fragmented request.
- */
-
-MV_CESA_STATS           cesaStats;
-
-MV_BUF_INFO             cesaSramSaBuf;
-short                   cesaLastSid = -1;
-MV_CESA_SA*             pCesaSAD = NULL;
-MV_U16                  cesaMaxSA = 0;
-
-MV_CESA_REQ*            pCesaReqFirst = NULL;
-MV_CESA_REQ*            pCesaReqLast = NULL;
-MV_CESA_REQ*            pCesaReqEmpty = NULL;
-MV_CESA_REQ*            pCesaReqProcess = NULL;
-int                     cesaQueueDepth = 0;
-int                     cesaReqResources = 0;
-
-MV_CESA_SRAM_MAP*       cesaSramVirtPtr = NULL;
-MV_U32                  cesaCryptEngBase = 0;
-void			*cesaOsHandle = NULL;
-#if (MV_CESA_VERSION >= 3)
-MV_U32			cesaChainLength = 0;
-int                     chainReqNum = 0;
-MV_U32			chainIndex = 0;
-MV_CESA_REQ*  		pNextActiveChain = 0;
-MV_CESA_REQ*		pEndCurrChain = 0;
-MV_BOOL			isFirstReq = MV_TRUE;
-#endif
-
-static INLINE MV_U8*  mvCesaSramAddrGet(void)
-{
-#ifdef MV_CESA_NO_SRAM
-    return (MV_U8*)cesaSramVirtPtr;
-#else
-    return (MV_U8*)cesaCryptEngBase;
-#endif /* MV_CESA_NO_SRAM */
-}
-
-static INLINE MV_ULONG    mvCesaSramVirtToPhys(void* pDev, MV_U8* pSramVirt)
-{
-#ifdef MV_CESA_NO_SRAM
-    return (MV_ULONG)mvOsIoVirtToPhy(NULL, pSramVirt);
-#else
-    return (MV_ULONG)pSramVirt;
-#endif /* MV_CESA_NO_SRAM */
-}
-
-/* Internal Function prototypes */
-
-static INLINE void      mvCesaSramDescrBuild(MV_U32 config, int frag,
-                                 int cryptoOffset, int ivOffset, int cryptoLength,
-                                 int macOffset, int digestOffset, int macLength, int macTotalLen,
-                                 MV_CESA_REQ *pCesaReq, MV_DMA_DESC* pDmaDesc);
-
-static INLINE void      mvCesaSramSaUpdate(short sid, MV_DMA_DESC *pDmaDesc);
-
-static INLINE int       mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf, 
-                                MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
-                                int offset, int copySize, MV_BOOL skipFlush);
-
-static void        mvCesaHmacIvGet(MV_CESA_MAC_MODE macMode, unsigned char key[], int keyLength,
-                                    unsigned char innerIV[], unsigned char outerIV[]);
-
-static MV_STATUS   mvCesaFragAuthComplete(MV_CESA_REQ* pReq, MV_CESA_SA* pSA,
-                                          int macDataSize);
-
-static MV_CESA_COMMAND*   mvCesaCtrModeInit(void);
-
-static MV_STATUS   mvCesaCtrModePrepare(MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd);
-static MV_STATUS   mvCesaCtrModeComplete(MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd);
-static void        mvCesaCtrModeFinish(MV_CESA_COMMAND *pCmd);
-
-static INLINE MV_STATUS mvCesaReqProcess(MV_CESA_REQ* pReq);
-static MV_STATUS   mvCesaFragReqProcess(MV_CESA_REQ* pReq, MV_U8 frag);
-
-static INLINE MV_STATUS mvCesaParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd, MV_U8* pFixOffset);
-static INLINE MV_STATUS mvCesaFragParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd);
-
-static INLINE void      mvCesaFragSizeFind(MV_CESA_SA* pSA, MV_CESA_REQ* pReq, 
-                               int cryptoOffset, int macOffset,
-                               int* pCopySize, int* pCryptoDataSize, int* pMacDataSize);
-static MV_STATUS        mvCesaMbufCacheUnmap(MV_CESA_MBUF* pMbuf, int offset, int size);
-
-
-/* Go to the next request in the request queue */
-static INLINE MV_CESA_REQ* MV_CESA_REQ_NEXT_PTR(MV_CESA_REQ* pReq)
-{
-    if(pReq == pCesaReqLast)
-        return pCesaReqFirst;
-
-    return pReq+1;
-}
-
-#if (MV_CESA_VERSION >= 3)
-/* Go to the previous request in the request queue */
-static INLINE MV_CESA_REQ* MV_CESA_REQ_PREV_PTR(MV_CESA_REQ* pReq)
-{
-    if(pReq == pCesaReqFirst)
-        return pCesaReqLast;
-
-    return pReq-1;
-}
-
-#endif
-
-
-static INLINE void mvCesaReqProcessStart(MV_CESA_REQ* pReq)
-{
-    int frag;
-
-#if (MV_CESA_VERSION >= 3)
-    pReq->state = MV_CESA_CHAIN;
-#else
-    pReq->state = MV_CESA_PROCESS;
-#endif
-    cesaStats.startCount++;
-
-    if(pReq->fragMode == MV_CESA_FRAG_NONE)
-    {
-        frag = 0;
-    }
-    else
-    {
-        frag = pReq->frags.nextFrag;
-        pReq->frags.nextFrag++;
-    }
-#if (MV_CESA_VERSION >= 2)
-    /* Enable TDMA engine */
-    MV_REG_WRITE(MV_CESA_TDMA_CURR_DESC_PTR_REG, 0);
-    MV_REG_WRITE(MV_CESA_TDMA_NEXT_DESC_PTR_REG, 
-            (MV_U32)mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
-#else
-    /* Enable IDMA engine */
-    MV_REG_WRITE(IDMA_CURR_DESC_PTR_REG(0), 0);
-    MV_REG_WRITE(IDMA_NEXT_DESC_PTR_REG(0), 
-            (MV_U32)mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
-#endif /* MV_CESA_VERSION >= 2 */
-
-#if defined(MV_BRIDGE_SYNC_REORDER) 
-    mvOsBridgeReorderWA();
-#endif
-
-    /* Start Accelerator */
-    MV_REG_WRITE(MV_CESA_CMD_REG, MV_CESA_CMD_CHAN_ENABLE_MASK);
-}
-
-
-/*******************************************************************************
-* mvCesaHalInit - Initialize the CESA driver
-*
-* DESCRIPTION:
-*       This function initialize the CESA driver.
-*       1) Session database
-*       2) Request queue
-*       4) DMA descriptor lists - one list per request. Each list
-*           has MV_CESA_MAX_DMA_DESC descriptors.
-*
-* INPUT:
-*       numOfSession    - maximum number of supported sessions
-*       queueDepth      - number of elements in the request queue.
-*       pSramBase       - virtual address of Sram
-*	osHandle	- A handle used by the OS to allocate memory for the 
-*			  module (Passed to the OS Services layer)
-*
-* RETURN:
-*       MV_OK           - Success
-*       MV_NO_RESOURCE  - Fail, can't allocate resources:
-*                         Session database, request queue,
-*                         DMA descriptors list, LRU cache database.
-*       MV_NOT_ALIGNED  - Sram base address is not 8 byte aligned.
-*
-*******************************************************************************/
-MV_STATUS mvCesaHalInit (int numOfSession, int queueDepth, char* pSramBase, MV_U32 cryptEngBase,
-			 void *osHandle)
-{
-    int     i, req;
-    MV_U32  descOffsetReg, configReg;
-    MV_CESA_SRAM_SA *pSramSA;
-
-
-    mvOsPrintf("mvCesaInit: sessions=%d, queue=%d, pSram=%p\n",
-                numOfSession, queueDepth, pSramBase);
-
-    cesaOsHandle = osHandle;
-    /* Create Session database */
-    pCesaSAD = mvOsMalloc(sizeof(MV_CESA_SA)*numOfSession);
-    if(pCesaSAD == NULL)
-    {
-        mvOsPrintf("mvCesaInit: Can't allocate %u bytes for %d SAs\n",
-                    sizeof(MV_CESA_SA)*numOfSession, numOfSession);
-        mvCesaFinish();
-        return MV_NO_RESOURCE;
-    }
-    memset(pCesaSAD, 0, sizeof(MV_CESA_SA)*numOfSession);
-    cesaMaxSA = numOfSession;
-
-    /* Allocate imag of sramSA in the DRAM */
-    cesaSramSaBuf.bufSize = sizeof(MV_CESA_SRAM_SA)*numOfSession + 
-                                    CPU_D_CACHE_LINE_SIZE;
-
-    cesaSramSaBuf.bufVirtPtr = mvOsIoCachedMalloc(osHandle,cesaSramSaBuf.bufSize,
-						  &cesaSramSaBuf.bufPhysAddr,
-						  &cesaSramSaBuf.memHandle);
-        
-    if(cesaSramSaBuf.bufVirtPtr == NULL)
-    {
-        mvOsPrintf("mvCesaInit: Can't allocate %d bytes for sramSA structures\n", 
-                    cesaSramSaBuf.bufSize);
-        mvCesaFinish();
-        return MV_NO_RESOURCE;
-    }
-    memset(cesaSramSaBuf.bufVirtPtr, 0, cesaSramSaBuf.bufSize); 
-    pSramSA = (MV_CESA_SRAM_SA*)MV_ALIGN_UP((MV_ULONG)cesaSramSaBuf.bufVirtPtr, 
-                                                       CPU_D_CACHE_LINE_SIZE);
-    for(i=0; i<numOfSession; i++)
-    {
-        pCesaSAD[i].pSramSA = &pSramSA[i];
-    }
-
-    /* Create request queue */
-    pCesaReqFirst = mvOsMalloc(sizeof(MV_CESA_REQ)*queueDepth);
-    if(pCesaReqFirst == NULL)
-    {
-        mvOsPrintf("mvCesaInit: Can't allocate %u bytes for %d requests\n",
-                    sizeof(MV_CESA_REQ)*queueDepth, queueDepth);
-        mvCesaFinish();
-        return MV_NO_RESOURCE;
-    }
-    memset(pCesaReqFirst, 0, sizeof(MV_CESA_REQ)*queueDepth);
-    pCesaReqEmpty = pCesaReqFirst;
-    pCesaReqLast = pCesaReqFirst + (queueDepth-1);
-    pCesaReqProcess = pCesaReqEmpty;
-    cesaQueueDepth = queueDepth;
-    cesaReqResources = queueDepth;
-#if (MV_CESA_VERSION >= 3)
-    cesaChainLength = MAX_CESA_CHAIN_LENGTH; 
-#endif
-    /* pSramBase must be 8 byte aligned */
-    if( MV_IS_NOT_ALIGN((MV_ULONG)pSramBase, 8) )
-    {
-        mvOsPrintf("mvCesaInit: pSramBase (%p) must be 8 byte aligned\n",
-                pSramBase);
-        mvCesaFinish();
-        return MV_NOT_ALIGNED;
-    }
-    cesaSramVirtPtr = (MV_CESA_SRAM_MAP*)pSramBase;
-    
-    cesaCryptEngBase = cryptEngBase;
-
-    /*memset(cesaSramVirtPtr, 0, sizeof(MV_CESA_SRAM_MAP));*/
-
-    /* Clear registers */
-    MV_REG_WRITE( MV_CESA_CFG_REG, 0);
-    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
-    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
-
-    /* Initialize DMA descriptor lists for all requests in Request queue */
-    descOffsetReg = configReg = 0;
-    for(req=0; req<queueDepth; req++)
-    {
-        int             frag;
-        MV_CESA_REQ*    pReq;
-        MV_DMA_DESC*    pDmaDesc;
-
-        pReq = &pCesaReqFirst[req];
-
-        pReq->cesaDescBuf.bufSize = sizeof(MV_CESA_DESC)*MV_CESA_MAX_REQ_FRAGS + 
-                                        CPU_D_CACHE_LINE_SIZE;
-
-	pReq->cesaDescBuf.bufVirtPtr = 
-		mvOsIoCachedMalloc(osHandle,pReq->cesaDescBuf.bufSize,
-				   &pReq->cesaDescBuf.bufPhysAddr,
-				   &pReq->cesaDescBuf.memHandle);
-
-        if(pReq->cesaDescBuf.bufVirtPtr == NULL)
-        {
-            mvOsPrintf("mvCesaInit: req=%d, Can't allocate %d bytes for CESA descriptors\n", 
-                        req, pReq->cesaDescBuf.bufSize);
-                mvCesaFinish();
-                return MV_NO_RESOURCE;
-            }
-        memset(pReq->cesaDescBuf.bufVirtPtr, 0, pReq->cesaDescBuf.bufSize); 
-        pReq->pCesaDesc = (MV_CESA_DESC*)MV_ALIGN_UP((MV_ULONG)pReq->cesaDescBuf.bufVirtPtr, 
-                                                                CPU_D_CACHE_LINE_SIZE);
-
-        pReq->dmaDescBuf.bufSize = sizeof(MV_DMA_DESC)*MV_CESA_MAX_DMA_DESC*MV_CESA_MAX_REQ_FRAGS + 
-                                    CPU_D_CACHE_LINE_SIZE;
-
-        pReq->dmaDescBuf.bufVirtPtr = 
-		mvOsIoCachedMalloc(osHandle,pReq->dmaDescBuf.bufSize,
-				   &pReq->dmaDescBuf.bufPhysAddr,
-				   &pReq->dmaDescBuf.memHandle);
-
-        if(pReq->dmaDescBuf.bufVirtPtr == NULL)
-        {
-            mvOsPrintf("mvCesaInit: req=%d, Can't allocate %d bytes for DMA descriptor list\n", 
-                        req, pReq->dmaDescBuf.bufSize);
-            mvCesaFinish();
-            return MV_NO_RESOURCE;
-        }
-        memset(pReq->dmaDescBuf.bufVirtPtr, 0, pReq->dmaDescBuf.bufSize); 
-        pDmaDesc = (MV_DMA_DESC*)MV_ALIGN_UP((MV_ULONG)pReq->dmaDescBuf.bufVirtPtr, 
-                                                       CPU_D_CACHE_LINE_SIZE);
-
-        for(frag=0; frag<MV_CESA_MAX_REQ_FRAGS; frag++)
-        {
-            MV_CESA_DMA*    pDma = &pReq->dma[frag];
-
-            pDma->pDmaFirst = pDmaDesc;
-            pDma->pDmaLast = NULL;
-            
-            for(i=0; i<MV_CESA_MAX_DMA_DESC-1; i++)
-            {
-                /* link all DMA descriptors together */
-                pDma->pDmaFirst[i].phyNextDescPtr = 
-                        MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pDmaDesc[i+1]));
-            }
-            pDma->pDmaFirst[i].phyNextDescPtr = 0;
-            mvOsCacheFlush(NULL, &pDma->pDmaFirst[0], MV_CESA_MAX_DMA_DESC*sizeof(MV_DMA_DESC));        
-
-            pDmaDesc += MV_CESA_MAX_DMA_DESC;
-        }        
-    }
-    /*mvCesaCryptoIvSet(NULL, MV_CESA_MAX_IV_LENGTH);*/
-    descOffsetReg = (MV_U16)((MV_U8*)&cesaSramVirtPtr->desc - mvCesaSramAddrGet());
-    MV_REG_WRITE(MV_CESA_CHAN_DESC_OFFSET_REG, descOffsetReg);
-
-    configReg |= (MV_CESA_CFG_WAIT_DMA_MASK | MV_CESA_CFG_ACT_DMA_MASK);
-#if (MV_CESA_VERSION >= 3)
-    configReg |= MV_CESA_CFG_CHAIN_MODE_MASK;
-#endif
-
-#if (MV_CESA_VERSION >= 2)
-    /* Initialize TDMA engine */
-    MV_REG_WRITE(MV_CESA_TDMA_CTRL_REG, MV_CESA_TDMA_CTRL_VALUE);
-    MV_REG_WRITE(MV_CESA_TDMA_BYTE_COUNT_REG, 0);
-    MV_REG_WRITE(MV_CESA_TDMA_CURR_DESC_PTR_REG, 0);
-#else
-    /* Initialize IDMA #0 engine */
-    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), 0);
-    MV_REG_WRITE(IDMA_BYTE_COUNT_REG(0), 0);
-    MV_REG_WRITE(IDMA_CURR_DESC_PTR_REG(0), 0);
-    MV_REG_WRITE(IDMA_CTRL_HIGH_REG(0), ICCHR_ENDIAN_LITTLE
-#ifdef MV_CPU_LE
-      		| ICCHR_DESC_BYTE_SWAP_EN
-#endif
-		 );
-    /* Clear Cause Byte of IDMA channel to be used */
-    MV_REG_WRITE( IDMA_CAUSE_REG, ~ICICR_CAUSE_MASK_ALL(0));
-    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), MV_CESA_IDMA_CTRL_LOW_VALUE);
-#endif /* (MV_CESA_VERSION >= 2) */
-
-    /* Set CESA configuration registers */
-    MV_REG_WRITE( MV_CESA_CFG_REG, configReg);
-    mvCesaDebugStatsClear();
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaFinish - Shutdown the CESA driver
-*
-* DESCRIPTION:
-*       This function shutdown the CESA driver and free all allocted resources.
-*
-* INPUT:    None
-*
-* RETURN:
-*       MV_OK   - Success
-*       Other   - Fail
-*
-*******************************************************************************/
-MV_STATUS   mvCesaFinish (void)
-{
-    int             req;
-    MV_CESA_REQ*    pReq;
-
-    mvOsPrintf("mvCesaFinish: \n");
-
-    cesaSramVirtPtr = NULL;
-
-    /* Free all resources: DMA list, etc. */
-    for(req=0; req<cesaQueueDepth; req++)
-    {
-    	pReq = &pCesaReqFirst[req];
-        if(pReq->dmaDescBuf.bufVirtPtr != NULL)
-        {
-        	mvOsIoCachedFree(cesaOsHandle,pReq->dmaDescBuf.bufSize,
-				 pReq->dmaDescBuf.bufPhysAddr,
-				 pReq->dmaDescBuf.bufVirtPtr,
-				 pReq->dmaDescBuf.memHandle);
-        }
-        if(pReq->cesaDescBuf.bufVirtPtr != NULL)
-        {
-                mvOsIoCachedFree(cesaOsHandle,pReq->cesaDescBuf.bufSize,
-				 pReq->cesaDescBuf.bufPhysAddr,
-				 pReq->cesaDescBuf.bufVirtPtr,
-				 pReq->cesaDescBuf.memHandle);
-        }
-    }
-#if (MV_CESA_VERSION < 2)
-    MV_REG_WRITE(IDMA_CTRL_LOW_REG(0), 0);
-#endif /* (MV_CESA_VERSION < 2) */
-
-    /* Free request queue */
-    if(pCesaReqFirst != NULL)
-    {
-        mvOsFree(pCesaReqFirst);
-        pCesaReqFirst = pCesaReqLast = NULL;
-        pCesaReqEmpty = pCesaReqProcess = NULL;
-        cesaQueueDepth = cesaReqResources = 0;
-    }
-    /* Free SA database */
-    if(pCesaSAD != NULL)
-    {
-        mvOsFree(pCesaSAD);
-        pCesaSAD = NULL;
-        cesaMaxSA = 0;
-    }
-    MV_REG_WRITE( MV_CESA_CFG_REG, 0);
-    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
-    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaCryptoIvSet - Set IV value for Crypto algorithm working in CBC mode
-*
-* DESCRIPTION:
-*    This function set IV value using by Crypto algorithms in CBC mode.
-*   Each channel has its own IV value.
-*   This function gets IV value from the caller. If no IV value passed from
-*   the caller or only part of IV passed, the function will init the rest part
-*   of IV value (or the whole IV) by random value.
-*
-* INPUT:
-*       MV_U8*  pIV     - Pointer to IV value supplied by user. If pIV==NULL
-*                       the function will generate random IV value.
-*       int     ivSize  - size (in bytes) of IV provided by user. If ivSize is
-*                       smaller than maximum IV size, the function will complete
-*                       IV by random value.
-*
-* RETURN:
-*       MV_OK   - Success
-*       Other   - Fail
-*
-*******************************************************************************/
-MV_STATUS   mvCesaCryptoIvSet(MV_U8* pIV, int ivSize)
-{
-    MV_U8*  pSramIV;
-#if defined(MV646xx)
-    mvOsPrintf("mvCesaCryptoIvSet: ERR. shouldn't use this call on MV64660\n");
-#endif
-    pSramIV = cesaSramVirtPtr->cryptoIV;
-    if(ivSize > MV_CESA_MAX_IV_LENGTH)
-    {
-        mvOsPrintf("mvCesaCryptoIvSet: ivSize (%d) is too large\n", ivSize);
-        ivSize = MV_CESA_MAX_IV_LENGTH;
-    }
-    if(pIV != NULL)
-    {
-        memcpy(pSramIV, pIV, ivSize);
-        ivSize = MV_CESA_MAX_IV_LENGTH - ivSize;
-        pSramIV += ivSize;
-    }
-
-    while(ivSize > 0)
-    {
-        int size, mv_random = mvOsRand();
-
-        size = MV_MIN(ivSize, sizeof(mv_random));
-        memcpy(pSramIV, (void*)&mv_random, size);
-
-        pSramIV += size;
-        ivSize -= size;
-    }
-/*
-    mvOsCacheFlush(NULL, cesaSramVirtPtr->cryptoIV,
-                                MV_CESA_MAX_IV_LENGTH);
-    mvOsCacheInvalidate(NULL, cesaSramVirtPtr->cryptoIV,
-                              MV_CESA_MAX_IV_LENGTH);
-*/
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaSessionOpen - Open new uni-directional crypto session
-*
-* DESCRIPTION:
-*       This function open new session.
-*
-* INPUT:
-*       MV_CESA_OPEN_SESSION *pSession - pointer to new session input parameters
-*
-* OUTPUT:
-*       short           *pSid  - session ID, should be used for all future
-*                                   requests over this session.
-*
-* RETURN:
-*       MV_OK           - Session opend successfully.
-*       MV_FULL         - All sessions are in use, no free place in
-*                       SA database.
-*       MV_BAD_PARAM    - One of session input parameters is invalid.
-*
-*******************************************************************************/
-MV_STATUS   mvCesaSessionOpen(MV_CESA_OPEN_SESSION *pSession, short* pSid)
-{
-    short       sid;
-    MV_U32      config = 0;
-    int         digestSize;
-
-    cesaStats.openedCount++;
-    
-    /* Find free entry in SAD */
-    for(sid=0; sid<cesaMaxSA; sid++)
-    {
-        if(pCesaSAD[sid].valid == 0)
-        {
-            break;
-        }
-    }
-    if(sid == cesaMaxSA)
-    {
-        mvOsPrintf("mvCesaSessionOpen: SA Database is FULL\n");
-        return MV_FULL;
-    }
-
-    /* Check Input parameters for Open session */
-    if (pSession->operation >= MV_CESA_MAX_OPERATION)
-    {
-        mvOsPrintf("mvCesaSessionOpen: Unexpected operation %d\n",
-                    pSession->operation);
-        return MV_BAD_PARAM;
-    }
-    config |= (pSession->operation << MV_CESA_OPERATION_OFFSET);
-
-    if( (pSession->direction != MV_CESA_DIR_ENCODE) &&
-        (pSession->direction != MV_CESA_DIR_DECODE) )
-    {
-        mvOsPrintf("mvCesaSessionOpen: Unexpected direction %d\n",
-                    pSession->direction);
-        return MV_BAD_PARAM;
-    }
-    config |= (pSession->direction << MV_CESA_DIRECTION_BIT);
-    /* Clear SA entry */
-    /* memset(&pCesaSAD[sid], 0, sizeof(pCesaSAD[sid])); */
-
-    /* Check AUTH parameters and update SA entry */
-    if(pSession->operation != MV_CESA_CRYPTO_ONLY)
-    {
-        /* For HMAC (MD5 and SHA1) - Maximum Key size is 64 bytes */
-        if( (pSession->macMode == MV_CESA_MAC_HMAC_MD5) ||
-            (pSession->macMode == MV_CESA_MAC_HMAC_SHA1) )
-        {
-            if(pSession->macKeyLength > MV_CESA_MAX_MAC_KEY_LENGTH)
-            {
-                mvOsPrintf("mvCesaSessionOpen: macKeyLength %d is too large\n",
-                            pSession->macKeyLength);
-                return MV_BAD_PARAM;
-            }
-            mvCesaHmacIvGet(pSession->macMode, pSession->macKey, pSession->macKeyLength,
-                            pCesaSAD[sid].pSramSA->macInnerIV, 
-                            pCesaSAD[sid].pSramSA->macOuterIV);
-            pCesaSAD[sid].macKeyLength = pSession->macKeyLength;
-        }
-        switch(pSession->macMode)
-        {
-            case MV_CESA_MAC_MD5:
-            case MV_CESA_MAC_HMAC_MD5:
-                digestSize = MV_CESA_MD5_DIGEST_SIZE;
-                break;
-
-            case MV_CESA_MAC_SHA1:
-            case MV_CESA_MAC_HMAC_SHA1:
-                digestSize = MV_CESA_SHA1_DIGEST_SIZE;
-                break;
-
-            default:
-                mvOsPrintf("mvCesaSessionOpen: Unexpected macMode %d\n",
-                            pSession->macMode);
-                return MV_BAD_PARAM;
-        }
-        config |= (pSession->macMode << MV_CESA_MAC_MODE_OFFSET);
-
-        /* Supported digest sizes: MD5 - 16 bytes (128 bits), */
-        /* SHA1 - 20 bytes (160 bits) or 12 bytes (96 bits) for both */
-        if( (pSession->digestSize != digestSize) && (pSession->digestSize != 12))
-        {
-            mvOsPrintf("mvCesaSessionOpen: Unexpected digest size %d\n",
-                        pSession->digestSize);
-            mvOsPrintf("\t Valid values [bytes]: MD5-16, SHA1-20, Both-12\n");
-            return MV_BAD_PARAM;
-        }
-        pCesaSAD[sid].digestSize = pSession->digestSize;
-
-        if(pCesaSAD[sid].digestSize == 12)
-        {
-            /* Set MV_CESA_MAC_DIGEST_SIZE_BIT if digest size is 96 bits */
-            config |= (MV_CESA_MAC_DIGEST_96B << MV_CESA_MAC_DIGEST_SIZE_BIT);
-        }
-    }
-
-    /* Check CRYPTO parameters and update SA entry */
-    if(pSession->operation != MV_CESA_MAC_ONLY)
-    {
-        switch(pSession->cryptoAlgorithm)
-        {
-            case MV_CESA_CRYPTO_DES:
-                pCesaSAD[sid].cryptoKeyLength = MV_CESA_DES_KEY_LENGTH;
-                pCesaSAD[sid].cryptoBlockSize = MV_CESA_DES_BLOCK_SIZE;
-                break;
-
-            case MV_CESA_CRYPTO_3DES:
-                pCesaSAD[sid].cryptoKeyLength = MV_CESA_3DES_KEY_LENGTH;
-                pCesaSAD[sid].cryptoBlockSize = MV_CESA_DES_BLOCK_SIZE;
-                /* Only EDE mode is supported */
-                config |= (MV_CESA_CRYPTO_3DES_EDE <<
-                            MV_CESA_CRYPTO_3DES_MODE_BIT);
-                break;
-
-            case MV_CESA_CRYPTO_AES:
-                switch(pSession->cryptoKeyLength)
-                {
-                    case 16:
-                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_128_KEY_LENGTH;
-                        config |= (MV_CESA_CRYPTO_AES_KEY_128 <<
-                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
-                        break;
-
-                    case 24:
-                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_192_KEY_LENGTH;
-                        config |= (MV_CESA_CRYPTO_AES_KEY_192 <<
-                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
-                        break;
-
-                    case 32:
-                    default:
-                        pCesaSAD[sid].cryptoKeyLength = MV_CESA_AES_256_KEY_LENGTH;
-                        config |= (MV_CESA_CRYPTO_AES_KEY_256 <<
-                                       MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET);
-                        break;
-                }
-                pCesaSAD[sid].cryptoBlockSize = MV_CESA_AES_BLOCK_SIZE;
-                break;
-
-            default:
-                mvOsPrintf("mvCesaSessionOpen: Unexpected cryptoAlgorithm %d\n",
-                            pSession->cryptoAlgorithm);
-                return MV_BAD_PARAM;
-        }
-        config |= (pSession->cryptoAlgorithm << MV_CESA_CRYPTO_ALG_OFFSET);
-
-        if(pSession->cryptoKeyLength != pCesaSAD[sid].cryptoKeyLength)
-        {
-            mvOsPrintf("cesaSessionOpen: Wrong CryptoKeySize %d != %d\n",
-                        pSession->cryptoKeyLength, pCesaSAD[sid].cryptoKeyLength);
-            return MV_BAD_PARAM;
-        }
-        
-        /* Copy Crypto key */
-        if( (pSession->cryptoAlgorithm == MV_CESA_CRYPTO_AES) &&
-            (pSession->direction == MV_CESA_DIR_DECODE))
-        {
-            /* Crypto Key for AES decode is computed from original key material */
-            /* and depend on cryptoKeyLength (128/192/256 bits) */
-            aesMakeKey(pCesaSAD[sid].pSramSA->cryptoKey, pSession->cryptoKey, 
-                        pSession->cryptoKeyLength*8, MV_CESA_AES_BLOCK_SIZE*8);
-        }
-        else
-        {
-                /*panic("mvCesaSessionOpen2");*/
-                memcpy(pCesaSAD[sid].pSramSA->cryptoKey, pSession->cryptoKey, 
-                    pCesaSAD[sid].cryptoKeyLength);
-            
-        }
-        
-        switch(pSession->cryptoMode)
-        {
-            case MV_CESA_CRYPTO_ECB:
-                pCesaSAD[sid].cryptoIvSize = 0;
-                break;
-
-            case MV_CESA_CRYPTO_CBC:
-                pCesaSAD[sid].cryptoIvSize = pCesaSAD[sid].cryptoBlockSize;
-                break;
-
-            case MV_CESA_CRYPTO_CTR:
-                /* Supported only for AES algorithm */
-                if(pSession->cryptoAlgorithm != MV_CESA_CRYPTO_AES)
-                {
-                    mvOsPrintf("mvCesaSessionOpen: CRYPTO CTR mode supported for AES only\n");
-                    return MV_BAD_PARAM;
-                }
-                pCesaSAD[sid].cryptoIvSize = 0;
-                pCesaSAD[sid].ctrMode = 1;
-                /* Replace to ECB mode for HW */
-                pSession->cryptoMode = MV_CESA_CRYPTO_ECB;
-                break;
-
-            default:
-                mvOsPrintf("mvCesaSessionOpen: Unexpected cryptoMode %d\n",
-                            pSession->cryptoMode);
-                return MV_BAD_PARAM;
-        }
-        
-        config |= (pSession->cryptoMode << MV_CESA_CRYPTO_MODE_BIT);
-    }
-    pCesaSAD[sid].config = config;
-    
-    mvOsCacheFlush(NULL, pCesaSAD[sid].pSramSA, sizeof(MV_CESA_SRAM_SA));
-    if(pSid != NULL)
-        *pSid = sid;
-
-    pCesaSAD[sid].valid = 1;
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaSessionClose - Close active crypto session
-*
-* DESCRIPTION:
-*       This function closes existing session
-*
-* INPUT:
-*       short sid   - Unique identifier of the session to be closed
-*
-* RETURN:
-*       MV_OK        - Session closed successfully.
-*       MV_BAD_PARAM - Session identifier is out of valid range.
-*       MV_NOT_FOUND - There is no active session with such ID.
-*
-*******************************************************************************/
-MV_STATUS mvCesaSessionClose(short sid)
-{
-    cesaStats.closedCount++;
-
-    if(sid >= cesaMaxSA)
-    {
-        mvOsPrintf("CESA Error: sid (%d) is too big\n", sid);
-        return MV_BAD_PARAM;
-    }
-    if(pCesaSAD[sid].valid == 0)
-    {
-        mvOsPrintf("CESA Warning: Session (sid=%d) is invalid\n", sid);
-        return MV_NOT_FOUND;
-    }
-    if(cesaLastSid == sid)
-        cesaLastSid = -1;
-
-    pCesaSAD[sid].valid = 0;
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaAction - Perform crypto operation
-*
-* DESCRIPTION:
-*       This function set new CESA request FIFO queue for further HW processing.
-*       The function checks request parameters before set new request to the queue.
-*       If one of the CESA channels is ready for processing the request will be
-*       passed to HW. When request processing is finished the CESA interrupt will
-*       be generated by HW. The caller should call mvCesaReadyGet() function to
-*       complete request processing and get result.
-*
-* INPUT:
-*       MV_CESA_COMMAND *pCmd   - pointer to new CESA request.
-*                               It includes pointers to Source and Destination
-*                               buffers, session identifier get from
-*                               mvCesaSessionOpen() function, pointer to caller
-*                               private data and all needed crypto parameters.
-*
-* RETURN:
-*       MV_OK             - request successfully added to request queue
-*                         and will be processed.
-*       MV_NO_MORE        - request successfully added to request queue and will
-*                         be processed, but request queue became Full and next
-*                         request will not be accepted.
-*       MV_NO_RESOURCE    - request queue is FULL and the request can not
-*                         be processed.
-*       MV_OUT_OF_CPU_MEM - memory allocation needed for request processing is
-*                         failed. Request can not be processed.
-*       MV_NOT_ALLOWED    - This mixed request (CRYPTO+MAC) can not be processed
-*                         as one request and should be splitted for two requests:
-*                         CRYPTO_ONLY and MAC_ONLY.
-*       MV_BAD_PARAM      - One of the request parameters is out of valid range.
-*                         The request can not be processed.
-*
-*******************************************************************************/
-MV_STATUS   mvCesaAction (MV_CESA_COMMAND *pCmd)
-{
-    MV_STATUS       status;
-    MV_CESA_REQ*    pReq = pCesaReqEmpty;
-    int             sid = pCmd->sessionId;
-    MV_CESA_SA*     pSA = &pCesaSAD[sid];
-#if (MV_CESA_VERSION >= 3)
-     MV_CESA_REQ*   pFromReq;
-     MV_CESA_REQ*   pToReq;
-#endif
-    cesaStats.reqCount++;
-
-    /* Check that the request queue is not FULL */
-    if(cesaReqResources == 0)
-        return MV_NO_RESOURCE;
-
-    if( (sid >= cesaMaxSA) || (!pSA->valid) )
-    {
-        mvOsPrintf("CESA Action Error: Session sid=%d is INVALID\n", sid);
-        return MV_BAD_PARAM;
-    }
-    pSA->count++;
-
-    if(pSA->ctrMode)
-    {
-        /* AES in CTR mode can't be mixed with Authentication */
-        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-            (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-        {
-            mvOsPrintf("mvCesaAction : CRYPTO CTR mode can't be mixed with AUTH\n");
-            return MV_NOT_ALLOWED;
-        }
-        /* All other request parameters should not be checked because key stream */
-        /* (not user data) processed by AES HW engine */
-        pReq->pOrgCmd = pCmd;
-        /* Allocate temporary pCmd structure for Key stream */
-        pCmd = mvCesaCtrModeInit();
-        if(pCmd == NULL)
-            return MV_OUT_OF_CPU_MEM;
-
-        /* Prepare Key stream */
-        mvCesaCtrModePrepare(pCmd, pReq->pOrgCmd);
-        pReq->fixOffset = 0;
-    }
-    else
-    {
-        /* Check request parameters and calculae fixOffset */
-        status = mvCesaParamCheck(pSA, pCmd, &pReq->fixOffset);
-        if(status != MV_OK)
-        {
-            return status;
-        }
-    }
-    pReq->pCmd = pCmd;
-
-    /* Check if the packet need fragmentation */
-    if(pCmd->pSrc->mbufSize <= sizeof(cesaSramVirtPtr->buf) )
-    {
-        /* request size is smaller than single buffer size */
-        pReq->fragMode = MV_CESA_FRAG_NONE;
-
-        /* Prepare NOT fragmented packets */
-        status = mvCesaReqProcess(pReq);
-        if(status != MV_OK)
-        {
-            mvOsPrintf("CesaReady: ReqProcess error: pReq=%p, status=0x%x\n",
-                        pReq, status);
-        }
-#if (MV_CESA_VERSION >= 3)
-	pReq->frags.numFrag = 1;
-#endif
-    }
-    else
-    {
-        MV_U8     frag = 0;
-
-        /* request size is larger than buffer size - needs fragmentation */
-
-        /* Check restrictions for processing fragmented packets */
-        status = mvCesaFragParamCheck(pSA, pCmd);
-        if(status != MV_OK)
-            return status;
-
-        pReq->fragMode = MV_CESA_FRAG_FIRST;
-        pReq->frags.nextFrag = 0;
-
-        /* Prepare Process Fragmented packets */
-        while(pReq->fragMode != MV_CESA_FRAG_LAST)
-        {
-            if(frag >= MV_CESA_MAX_REQ_FRAGS)
-            {
-                mvOsPrintf("mvCesaAction Error: Too large request frag=%d\n", frag);
-                return MV_OUT_OF_CPU_MEM;
-            }
-            status = mvCesaFragReqProcess(pReq, frag);
-            if(status == MV_OK) {
-#if (MV_CESA_VERSION >= 3)
-		if(frag) {
-			pReq->dma[frag-1].pDmaLast->phyNextDescPtr = 
-				MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, pReq->dma[frag].pDmaFirst));
-			mvOsCacheFlush(NULL, pReq->dma[frag-1].pDmaLast, sizeof(MV_DMA_DESC));
-		}
-#endif
-                frag++;
-        }
-        }
-        pReq->frags.numFrag = frag;
-#if (MV_CESA_VERSION >= 3)
-	if(chainReqNum) {	
-		chainReqNum += pReq->frags.numFrag;
-		if(chainReqNum >= MAX_CESA_CHAIN_LENGTH)
-			chainReqNum = MAX_CESA_CHAIN_LENGTH;
-	}		
-#endif
-    }
-
-    pReq->state = MV_CESA_PENDING;
-
-    pCesaReqEmpty = MV_CESA_REQ_NEXT_PTR(pReq);
-    cesaReqResources -= 1;
-
-/* #ifdef CESA_DEBUG */
-    if( (cesaQueueDepth - cesaReqResources) > cesaStats.maxReqCount)
-        cesaStats.maxReqCount = (cesaQueueDepth - cesaReqResources);
-/* #endif CESA_DEBUG */
-
-    cesaLastSid = sid;
-
-#if (MV_CESA_VERSION >= 3)
-    /* Are we within chain bounderies and follows the first request ? */
-    if((chainReqNum > 0) && (chainReqNum < MAX_CESA_CHAIN_LENGTH)) {
-	if(chainIndex) {
-		pFromReq = MV_CESA_REQ_PREV_PTR(pReq); 
-		pToReq = pReq;
-		pReq->state = MV_CESA_CHAIN;
-		/* assume concatenating is possible */
-		pFromReq->dma[pFromReq->frags.numFrag-1].pDmaLast->phyNextDescPtr = 
-			MV_32BIT_LE(mvCesaVirtToPhys(&pToReq->dmaDescBuf, pToReq->dma[0].pDmaFirst));
-		mvOsCacheFlush(NULL, pFromReq->dma[pFromReq->frags.numFrag-1].pDmaLast, sizeof(MV_DMA_DESC));
-			
-		/* align active & next pointers */
-		if(pNextActiveChain->state != MV_CESA_PENDING)
-			pEndCurrChain = pNextActiveChain = MV_CESA_REQ_NEXT_PTR(pReq);
-	}
-	else { /* we have only one chain, start new one */
-		chainReqNum = 0;
-		chainIndex++;
-		/* align active & next pointers  */
-		if(pNextActiveChain->state != MV_CESA_PENDING)
-			pEndCurrChain = pNextActiveChain = pReq;
-	}
-    }
-    else {
-		/* In case we concatenate full chain */
-		if(chainReqNum == MAX_CESA_CHAIN_LENGTH) {
-			chainIndex++;
-			if(pNextActiveChain->state != MV_CESA_PENDING)
-				pEndCurrChain = pNextActiveChain = pReq;
-			chainReqNum = 0;
-		}
-		
-		pReq = pCesaReqProcess;
-		if(pReq->state == MV_CESA_PENDING) {
-			pNextActiveChain = pReq;
-			pEndCurrChain = MV_CESA_REQ_NEXT_PTR(pReq);
-        		/* Start Process new request */
- 	      		mvCesaReqProcessStart(pReq);
-    		}
-    }
-
-    chainReqNum++;
-
-    if((chainIndex < MAX_CESA_CHAIN_LENGTH) && (chainReqNum > cesaStats.maxChainUsage))
-	cesaStats.maxChainUsage = chainReqNum;
-
-#else
-
-    /* Check status of CESA channels and process requests if possible */
-    pReq = pCesaReqProcess;
-    if(pReq->state == MV_CESA_PENDING)
-    {
-        /* Start Process new request */
-        mvCesaReqProcessStart(pReq);
-    }
-#endif
-    /* If request queue became FULL - return MV_NO_MORE */
-    if(cesaReqResources == 0)
-        return MV_NO_MORE;
-
-    return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvCesaReadyGet - Get crypto request that processing is finished
-*
-* DESCRIPTION:
-*       This function complete request processing and return ready request to
-*       caller. To don't miss interrupts the caller must call this function
-*       while MV_OK or MV_TERMINATE values returned.
-*
-* INPUT:
-*   MV_U32          chanMap  - map of CESA channels finished thier job
-*                              accordingly with CESA Cause register.
-*   MV_CESA_RESULT* pResult  - pointer to structure contains information
-*                            about ready request. It includes pointer to
-*                            user private structure "pReqPrv", session identifier
-*                            for this request "sessionId" and return code.
-*                            Return code set to MV_FAIL if calculated digest value
-*                            on decode direction is different than digest value
-*                            in the packet.
-*
-* RETURN:
-*       MV_OK           - Success, ready request is returned.
-*       MV_NOT_READY    - Next request is not ready yet. New interrupt will
-*                       be generated for futher request processing.
-*       MV_EMPTY        - There is no more request for processing.
-*       MV_BUSY         - Fragmented request is not ready yet.
-*       MV_TERMINATE    - Call this function once more to complete processing
-*                       of fragmented request.
-*
-*******************************************************************************/
-MV_STATUS mvCesaReadyGet(MV_CESA_RESULT* pResult)
-{
-    MV_STATUS       status, readyStatus = MV_NOT_READY;
-    MV_U32          statusReg;
-    MV_CESA_REQ*    pReq;
-    MV_CESA_SA*     pSA;
-
-#if (MV_CESA_VERSION >= 3)
-    if(isFirstReq == MV_TRUE) {
-	if(chainIndex == 0)
-		chainReqNum = 0;
-	
-	isFirstReq = MV_FALSE;
-
-	if(pNextActiveChain->state == MV_CESA_PENDING) {
-		/* Start request Process */
-		mvCesaReqProcessStart(pNextActiveChain);
-		pEndCurrChain = pNextActiveChain;
-		if(chainIndex > 0)
-			chainIndex--;
-		/* Update pNextActiveChain to next chain head */
-		   while(pNextActiveChain->state == MV_CESA_CHAIN)
-			pNextActiveChain = MV_CESA_REQ_NEXT_PTR(pNextActiveChain);
-    	}    
-    }
-    
-    /* Check if there are more processed requests - can we remove pEndCurrChain ??? */
-    if(pCesaReqProcess == pEndCurrChain) {
-		isFirstReq = MV_TRUE;
-		pEndCurrChain = pNextActiveChain;
-#else
-    if(pCesaReqProcess->state != MV_CESA_PROCESS) {
-#endif
-        return MV_EMPTY;
-    }
-
-#ifdef CESA_DEBUG
-    statusReg = MV_REG_READ(MV_CESA_STATUS_REG);
-    if( statusReg & MV_CESA_STATUS_ACTIVE_MASK )
-    {
-        mvOsPrintf("mvCesaReadyGet: Not Ready, Status = 0x%x\n", statusReg);
-        cesaStats.notReadyCount++;
-        return MV_NOT_READY;
-    }
-#endif /* CESA_DEBUG */
-
-    cesaStats.readyCount++;
-
-    pReq = pCesaReqProcess;
-    pSA = &pCesaSAD[pReq->pCmd->sessionId];
-
-    pResult->retCode = MV_OK;
-    if(pReq->fragMode != MV_CESA_FRAG_NONE)
-    {
-        MV_U8*          pNewDigest;
-      int             frag;
-#if (MV_CESA_VERSION >= 3)
-      pReq->frags.nextFrag = 1;
-      while(pReq->frags.nextFrag <= pReq->frags.numFrag) {
-#endif
-	frag = (pReq->frags.nextFrag - 1);
-
-        /* Restore DMA descriptor list */
-        pReq->dma[frag].pDmaLast->phyNextDescPtr = 
-                MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pReq->dma[frag].pDmaLast[1]));
-        pReq->dma[frag].pDmaLast = NULL;
-
-        /* Special processing for finished fragmented request */
-        if(pReq->frags.nextFrag >= pReq->frags.numFrag)
-        {
-            mvCesaMbufCacheUnmap(pReq->pCmd->pDst, 0, pReq->pCmd->pDst->mbufSize);
-
-            /* Fragmented packet is ready */
-            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-            {
-                int  macDataSize = pReq->pCmd->macLength - pReq->frags.macSize;
-
-                if(macDataSize != 0)
-                {
-                    /* Calculate all other blocks by SW */
-                    mvCesaFragAuthComplete(pReq, pSA, macDataSize);
-                }
-
-                /* Copy new digest from SRAM to the Destination buffer */
-                pNewDigest = cesaSramVirtPtr->buf + pReq->frags.newDigestOffset;
-                status = mvCesaCopyToMbuf(pNewDigest, pReq->pCmd->pDst,
-                                   pReq->pCmd->digestOffset, pSA->digestSize);
-
-                /* For decryption: Compare new digest value with original one */
-                if((pSA->config & MV_CESA_DIRECTION_MASK) ==
-                            (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
-                {
-                    if( memcmp(pNewDigest, pReq->frags.orgDigest, pSA->digestSize) != 0)
-                    {
-/*
-                        mvOsPrintf("Digest error: chan=%d, newDigest=%p, orgDigest=%p, status = 0x%x\n",
-                            chan, pNewDigest, pReq->frags.orgDigest, MV_REG_READ(MV_CESA_STATUS_REG));
-*/
-                        /* Signiture verification is failed */
-                        pResult->retCode = MV_FAIL;
-                    }
-                }
-            }
-            readyStatus = MV_OK;
-        }
-#if (MV_CESA_VERSION >= 3)
-	pReq->frags.nextFrag++;
-      }
-#endif
-    }
-    else
-    {
-        mvCesaMbufCacheUnmap(pReq->pCmd->pDst, 0, pReq->pCmd->pDst->mbufSize);
-
-        /* Restore DMA descriptor list */
-        pReq->dma[0].pDmaLast->phyNextDescPtr = 
-                MV_32BIT_LE(mvCesaVirtToPhys(&pReq->dmaDescBuf, &pReq->dma[0].pDmaLast[1]));
-        pReq->dma[0].pDmaLast = NULL;
-        if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) ) &&
-            ((pSA->config & MV_CESA_DIRECTION_MASK) ==
-                        (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT)) )
-        {
-            /* For AUTH on decode : Check Digest result in Status register */
-            statusReg = MV_REG_READ(MV_CESA_STATUS_REG);
-            if(statusReg & MV_CESA_STATUS_DIGEST_ERR_MASK)
-            {
-/*
-                mvOsPrintf("Digest error: chan=%d, status = 0x%x\n",
-                        chan, statusReg);
-*/
-                /* Signiture verification is failed */
-                pResult->retCode = MV_FAIL;
-            }
-        }
-        readyStatus = MV_OK;
-    }
-
-    if(readyStatus == MV_OK)
-    {
-        /* If Request is ready - Prepare pResult structure */
-        pResult->pReqPrv = pReq->pCmd->pReqPrv;
-        pResult->sessionId = pReq->pCmd->sessionId;
-
-        pReq->state = MV_CESA_IDLE;
-        pCesaReqProcess = MV_CESA_REQ_NEXT_PTR(pReq);
-        cesaReqResources++;
-
-        if(pSA->ctrMode)
-        {
-            /* For AES CTR mode - complete processing and free allocated resources */
-            mvCesaCtrModeComplete(pReq->pOrgCmd, pReq->pCmd);
-            mvCesaCtrModeFinish(pReq->pCmd);
-            pReq->pOrgCmd = NULL;
-        }
-    }
-
-#if (MV_CESA_VERSION < 3)
-    if(pCesaReqProcess->state == MV_CESA_PROCESS)
-    {
-        /* Start request Process */
-        mvCesaReqProcessStart(pCesaReqProcess);
-        if(readyStatus == MV_NOT_READY)
-            readyStatus = MV_BUSY;
-    }
-    else if(pCesaReqProcess != pCesaReqEmpty)
-    {
-        /* Start process new request from the queue */
-        mvCesaReqProcessStart(pCesaReqProcess);
-    }
-#endif 
-    return readyStatus;
-}
-
-/***************** Functions to work with CESA_MBUF structure ******************/
-
-/*******************************************************************************
-* mvCesaMbufOffset - Locate offset in the Mbuf structure
-*
-* DESCRIPTION:
-*       This function locates offset inside Multi-Bufeer structure.
-*       It get fragment number and place in the fragment where the offset
-*       is located.
-*
-*
-* INPUT:
-*   MV_CESA_MBUF* pMbuf  - Pointer to multi-buffer structure
-*   int           offset - Offset from the beginning of the data presented by
-*                        the Mbuf structure.
-*
-* OUTPUT:
-*   int*        pBufOffset  - Offset from the beginning of the fragment where
-*                           the offset is located.
-*
-* RETURN:
-*       int - Number of fragment, where the offset is located\
-*
-*******************************************************************************/
-int     mvCesaMbufOffset(MV_CESA_MBUF* pMbuf, int offset, int* pBufOffset)
-{
-    int frag = 0;
-
-    while(offset > 0)
-    {
-        if(frag >= pMbuf->numFrags)
-        {
-            mvOsPrintf("mvCesaMbufOffset: Error: frag (%d) > numFrags (%d)\n",
-                    frag, pMbuf->numFrags);
-            return MV_INVALID;
-        }
-        if(offset < pMbuf->pFrags[frag].bufSize)
-        {
-            break;
-        }
-        offset -= pMbuf->pFrags[frag].bufSize;
-        frag++;
-    }
-    if(pBufOffset != NULL)
-        *pBufOffset = offset;
-
-    return frag;
-}
-
-/*******************************************************************************
-* mvCesaCopyFromMbuf - Copy data from the Mbuf structure to continuous buffer
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*   MV_U8*          pDstBuf  - Pointer to continuous buffer, where data is
-*                              copied to.
-*   MV_CESA_MBUF*   pSrcMbuf - Pointer to multi-buffer structure where data is
-*                              copied from.
-*   int             offset   - Offset in the Mbuf structure where located first
-*                            byte of data should be copied.
-*   int             size     - Size of data should be copied
-*
-* RETURN:
-*       MV_OK           - Success, all data is copied successfully.
-*       MV_OUT_OF_RANGE - Failed, offset is out of Multi-buffer data range.
-*                         No data is copied.
-*       MV_EMPTY        - Multi-buffer structure has not enough data to copy
-*                       Data from the offset to end of Mbuf data is copied.
-*
-*******************************************************************************/
-MV_STATUS   mvCesaCopyFromMbuf(MV_U8* pDstBuf, MV_CESA_MBUF* pSrcMbuf,
-                               int offset, int size)
-{
-    int     frag, fragOffset, bufSize;
-    MV_U8*  pBuf;
-
-    if(size == 0)
-        return MV_OK;
-
-    frag = mvCesaMbufOffset(pSrcMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return MV_OUT_OF_RANGE;
-    }
-
-    bufSize = pSrcMbuf->pFrags[frag].bufSize - fragOffset;
-    pBuf = pSrcMbuf->pFrags[frag].bufVirtPtr + fragOffset;
-    while(MV_TRUE)
-    {
-        if(size <= bufSize)
-        {
-            memcpy(pDstBuf, pBuf, size);
-            return MV_OK;
-        }
-        memcpy(pDstBuf, pBuf, bufSize);
-        size -= bufSize;
-        frag++;
-        pDstBuf += bufSize;
-        if(frag >= pSrcMbuf->numFrags)
-            break;
-
-        bufSize = pSrcMbuf->pFrags[frag].bufSize;
-        pBuf = pSrcMbuf->pFrags[frag].bufVirtPtr;
-    }
-    mvOsPrintf("mvCesaCopyFromMbuf: Mbuf is EMPTY - %d bytes isn't copied\n",
-                size);
-    return MV_EMPTY;
-}
-
-/*******************************************************************************
-* mvCesaCopyToMbuf - Copy data from continuous buffer to the Mbuf structure
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*   MV_U8*          pSrcBuf  - Pointer to continuous buffer, where data is
-*                              copied from.
-*   MV_CESA_MBUF*   pDstMbuf - Pointer to multi-buffer structure where data is
-*                              copied to.
-*   int             offset   - Offset in the Mbuf structure where located first
-*                            byte of data should be copied.
-*   int             size     - Size of data should be copied
-*
-* RETURN:
-*       MV_OK           - Success, all data is copied successfully.
-*       MV_OUT_OF_RANGE - Failed, offset is out of Multi-buffer data range.
-*                         No data is copied.
-*       MV_FULL         - Multi-buffer structure has not enough place to copy
-*                       all data. Data from the offset to end of Mbuf data
-*                       is copied.
-*
-*******************************************************************************/
-MV_STATUS   mvCesaCopyToMbuf(MV_U8* pSrcBuf, MV_CESA_MBUF* pDstMbuf,
-                               int offset, int size)
-{
-    int     frag, fragOffset, bufSize;
-    MV_U8*  pBuf;
-
-    if(size == 0)
-        return MV_OK;
-
-    frag = mvCesaMbufOffset(pDstMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return MV_OUT_OF_RANGE;
-    }
-
-    bufSize = pDstMbuf->pFrags[frag].bufSize - fragOffset;
-    pBuf = pDstMbuf->pFrags[frag].bufVirtPtr + fragOffset;
-    while(MV_TRUE)
-    {
-        if(size <= bufSize)
-        {
-            memcpy(pBuf, pSrcBuf, size);
-            return MV_OK;
-        }
-        memcpy(pBuf, pSrcBuf, bufSize);
-        size -= bufSize;
-        frag++;
-        pSrcBuf += bufSize;
-        if(frag >= pDstMbuf->numFrags)
-            break;
-
-        bufSize = pDstMbuf->pFrags[frag].bufSize;
-        pBuf = pDstMbuf->pFrags[frag].bufVirtPtr;
-    }
-    mvOsPrintf("mvCesaCopyToMbuf: Mbuf is FULL - %d bytes isn't copied\n",
-                size);
-    return MV_FULL;
-}
-
-/*******************************************************************************
-* mvCesaMbufCopy - Copy data from one Mbuf structure to the other Mbuf structure
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*
-*   MV_CESA_MBUF*   pDstMbuf - Pointer to multi-buffer structure where data is
-*                              copied to.
-*   int      dstMbufOffset   - Offset in the dstMbuf structure where first byte
-*                            of data should be copied to.
-*   MV_CESA_MBUF*   pSrcMbuf - Pointer to multi-buffer structure where data is
-*                              copied from.
-*   int      srcMbufOffset   - Offset in the srcMbuf structure where first byte
-*                            of data should be copied from.
-*   int             size     - Size of data should be copied
-*
-* RETURN:
-*       MV_OK           - Success, all data is copied successfully.
-*       MV_OUT_OF_RANGE - Failed, srcMbufOffset or dstMbufOffset is out of
-*                       srcMbuf or dstMbuf structure correspondently.
-*                       No data is copied.
-*       MV_BAD_SIZE     - srcMbuf or dstMbuf structure is too small to copy
-*                       all data. Partial data is copied
-*
-*******************************************************************************/
-MV_STATUS   mvCesaMbufCopy(MV_CESA_MBUF* pMbufDst, int dstMbufOffset,
-                           MV_CESA_MBUF* pMbufSrc, int srcMbufOffset, int size)
-{
-    int     srcFrag, dstFrag, srcSize, dstSize, srcOffset, dstOffset;
-    int     copySize;
-    MV_U8   *pSrc, *pDst;
-
-    if(size == 0)
-        return MV_OK;
-
-    srcFrag = mvCesaMbufOffset(pMbufSrc, srcMbufOffset, &srcOffset);
-    if(srcFrag == MV_INVALID)
-    {
-        mvOsPrintf("CESA srcMbuf Error: offset (%d) out of range\n", srcMbufOffset);
-        return MV_OUT_OF_RANGE;
-    }
-    pSrc = pMbufSrc->pFrags[srcFrag].bufVirtPtr + srcOffset;
-    srcSize = pMbufSrc->pFrags[srcFrag].bufSize - srcOffset;
-
-    dstFrag = mvCesaMbufOffset(pMbufDst, dstMbufOffset, &dstOffset);
-    if(dstFrag == MV_INVALID)
-    {
-        mvOsPrintf("CESA dstMbuf Error: offset (%d) out of range\n", dstMbufOffset);
-        return MV_OUT_OF_RANGE;
-    }
-    pDst = pMbufDst->pFrags[dstFrag].bufVirtPtr + dstOffset;
-    dstSize = pMbufDst->pFrags[dstFrag].bufSize - dstOffset;
-
-    while(size > 0)
-    {
-        copySize = MV_MIN(srcSize, dstSize);
-        if(size <= copySize)
-        {
-            memcpy(pDst, pSrc, size);
-            return MV_OK;
-        }
-        memcpy(pDst, pSrc, copySize);
-        size -= copySize;
-        srcSize -= copySize;
-        dstSize -= copySize;
-
-        if(srcSize == 0)
-        {
-            srcFrag++;
-            if(srcFrag >= pMbufSrc->numFrags)
-                break;
-
-            pSrc = pMbufSrc->pFrags[srcFrag].bufVirtPtr;
-            srcSize = pMbufSrc->pFrags[srcFrag].bufSize;
-        }
-
-        if(dstSize == 0)
-        {
-            dstFrag++;
-            if(dstFrag >= pMbufDst->numFrags)
-                break;
-
-            pDst = pMbufDst->pFrags[dstFrag].bufVirtPtr;
-            dstSize = pMbufDst->pFrags[dstFrag].bufSize;
-        }
-    }
-    mvOsPrintf("mvCesaMbufCopy: BAD size - %d bytes isn't copied\n",
-                size);
-
-    return MV_BAD_SIZE;
-}
-
-static MV_STATUS   mvCesaMbufCacheUnmap(MV_CESA_MBUF* pMbuf, int offset, int size)
-{
-    int     frag, fragOffset, bufSize;
-    MV_U8*  pBuf;
-
-    if(size == 0)
-        return MV_OK;
-
-    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return MV_OUT_OF_RANGE;
-    }
-
-    bufSize = pMbuf->pFrags[frag].bufSize - fragOffset;
-    pBuf = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
-    while(MV_TRUE)
-    {
-        if(size <= bufSize)
-        {
-            mvOsCacheUnmap(NULL, mvOsIoVirtToPhy(NULL, pBuf), size);
-            return MV_OK;
-        }
-
-        mvOsCacheUnmap(NULL, mvOsIoVirtToPhy(NULL, pBuf), bufSize);
-        size -= bufSize;
-        frag++;
-        if(frag >= pMbuf->numFrags)
-            break;
-
-        bufSize = pMbuf->pFrags[frag].bufSize;
-        pBuf = pMbuf->pFrags[frag].bufVirtPtr;
-    }
-    mvOsPrintf("%s: Mbuf is FULL - %d bytes isn't Unmapped\n",
-                __FUNCTION__, size);
-    return MV_FULL;
-}
-
-
-/*************************************** Local Functions ******************************/
-
-/*******************************************************************************
-* mvCesaFragReqProcess - Process fragmented request
-*
-* DESCRIPTION:
-*       This function processes a fragment of fragmented request (First, Middle or Last)
-*
-*
-* INPUT:
-*       MV_CESA_REQ* pReq   - Pointer to the request in the request queue.
-*
-* RETURN:
-*       MV_OK        - The fragment is successfully passed to HW for processing.
-*       MV_TERMINATE - Means, that HW finished its work on this packet and no more
-*                    interrupts will be generated for this request.
-*                    Function mvCesaReadyGet() must be called to complete request
-*                    processing and get request result.
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaFragReqProcess(MV_CESA_REQ* pReq, MV_U8 frag)
-{
-    int                     i, copySize, cryptoDataSize, macDataSize, sid;
-    int                     cryptoIvOffset, digestOffset;
-    MV_U32                  config;
-    MV_CESA_COMMAND*        pCmd = pReq->pCmd;
-    MV_CESA_SA*             pSA;
-    MV_CESA_MBUF*           pMbuf;
-    MV_DMA_DESC*            pDmaDesc = pReq->dma[frag].pDmaFirst;
-    MV_U8*                  pSramBuf = cesaSramVirtPtr->buf;
-    int                     macTotalLen = 0;
-    int                     fixOffset, cryptoOffset, macOffset;
-
-    cesaStats.fragCount++;
-
-    sid = pReq->pCmd->sessionId;
-
-    pSA = &pCesaSAD[sid];
-
-    cryptoIvOffset = digestOffset = 0;
-    i = macDataSize = 0;
-    cryptoDataSize = 0;
-
-    /* First fragment processing */
-    if(pReq->fragMode == MV_CESA_FRAG_FIRST)
-    {
-        /* pReq->frags monitors processing of fragmented request between fragments */
-        pReq->frags.bufOffset = 0;
-        pReq->frags.cryptoSize = 0;
-        pReq->frags.macSize = 0;
-
-        config = pSA->config | (MV_CESA_FRAG_FIRST << MV_CESA_FRAG_MODE_OFFSET);
-
-        /* fixOffset can be not equal to zero only for FIRST fragment */
-        fixOffset = pReq->fixOffset;
-        /* For FIRST fragment crypto and mac offsets are taken from pCmd */
-        cryptoOffset = pCmd->cryptoOffset;
-        macOffset = pCmd->macOffset;
-
-        copySize = sizeof(cesaSramVirtPtr->buf) - pReq->fixOffset;
-
-        /* Find fragment size: Must meet all requirements for CRYPTO and MAC
-         * cryptoDataSize   - size of data will be encrypted/decrypted in this fragment
-         * macDataSize      - size of data will be signed/verified in this fragment
-         * copySize         - size of data will be copied from srcMbuf to SRAM and
-         *                  back to dstMbuf for this fragment
-         */
-        mvCesaFragSizeFind(pSA, pReq, cryptoOffset, macOffset,
-                        &copySize, &cryptoDataSize, &macDataSize);
-
-        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET))
-        {
-            /* CryptoIV special processing */
-            if( (pSA->config & MV_CESA_CRYPTO_MODE_MASK) ==
-                (MV_CESA_CRYPTO_CBC << MV_CESA_CRYPTO_MODE_BIT) )
-            {
-                /* In CBC mode for encode direction when IV from user */
-                if( (pCmd->ivFromUser) &&
-                    ((pSA->config & MV_CESA_DIRECTION_MASK) ==
-                        (MV_CESA_DIR_ENCODE << MV_CESA_DIRECTION_BIT)) )
-                {
-
-                    /* For Crypto Encode in CBC mode HW always takes IV from SRAM IVPointer,
-                    * (not from IVBufPointer). So when ivFromUser==1, we should copy IV from user place
-                    * in the buffer to SRAM IVPointer
-                    */
-                    i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
-                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
-                }
-
-                /* Special processing when IV is not located in the first fragment */
-                if(pCmd->ivOffset > (copySize - pSA->cryptoIvSize))
-                {
-                    /* Prepare dummy place for cryptoIV in SRAM */
-                    cryptoIvOffset = cesaSramVirtPtr->tempCryptoIV - mvCesaSramAddrGet();
-
-                    /* For Decryption: Copy IV value from pCmd->ivOffset to Special SRAM place */
-                    if((pSA->config & MV_CESA_DIRECTION_MASK) ==
-                            (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
-                    {
-                        i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->tempCryptoIV, &pDmaDesc[i],
-                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
-                    }
-                    else
-                    {
-                        /* For Encryption when IV is NOT from User: */
-                        /* Copy IV from SRAM to buffer (pCmd->ivOffset) */
-                        if(pCmd->ivFromUser == 0)
-                        {
-                            /* copy IV value from cryptoIV to Buffer (pCmd->ivOffset) */
-                            i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
-                                    MV_TRUE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
-                        }
-                    }
-                }
-                else
-                {
-                    cryptoIvOffset = pCmd->ivOffset;
-                }
-            }
-        }
-
-        if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-        {
-            /* MAC digest special processing on Decode direction */
-            if((pSA->config & MV_CESA_DIRECTION_MASK) ==
-                        (MV_CESA_DIR_DECODE << MV_CESA_DIRECTION_BIT))
-            {
-                /* Save digest from pCmd->digestOffset */
-                mvCesaCopyFromMbuf(pReq->frags.orgDigest,
-                               pCmd->pSrc, pCmd->digestOffset, pSA->digestSize);
-
-                /* If pCmd->digestOffset is not located on the first */
-                if(pCmd->digestOffset > (copySize - pSA->digestSize))
-                {
-                    MV_U8  digestZero[MV_CESA_MAX_DIGEST_SIZE];
-
-                    /* Set zeros to pCmd->digestOffset (DRAM) */
-                    memset(digestZero, 0, MV_CESA_MAX_DIGEST_SIZE);
-                    mvCesaCopyToMbuf(digestZero, pCmd->pSrc, pCmd->digestOffset, pSA->digestSize);
-
-                    /* Prepare dummy place for digest in SRAM */
-                    digestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
-                }
-                else
-                {
-                    digestOffset = pCmd->digestOffset;
-                }
-            }
-        }
-        /* Update SA in SRAM */
-        if(cesaLastSid != sid)
-        {
-            mvCesaSramSaUpdate(sid, &pDmaDesc[i]);
-            i++;
-        }
-
-        pReq->fragMode = MV_CESA_FRAG_MIDDLE;
-    }
-    else
-    {
-        /* Continue fragment */
-        fixOffset = 0;
-        cryptoOffset = 0;
-        macOffset = 0;
-        if( (pCmd->pSrc->mbufSize - pReq->frags.bufOffset) <= sizeof(cesaSramVirtPtr->buf))
-        {
-            /* Last fragment */
-            config = pSA->config | (MV_CESA_FRAG_LAST << MV_CESA_FRAG_MODE_OFFSET);
-            pReq->fragMode = MV_CESA_FRAG_LAST;
-            copySize = pCmd->pSrc->mbufSize - pReq->frags.bufOffset;
-
-            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-            {
-                macDataSize = pCmd->macLength - pReq->frags.macSize;
-
-                /* If pCmd->digestOffset is not located on last fragment */
-                if(pCmd->digestOffset < pReq->frags.bufOffset)
-                {
-                    /* Prepare dummy place for digest in SRAM */
-                    digestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
-                }
-                else
-                {
-                    digestOffset = pCmd->digestOffset - pReq->frags.bufOffset;
-                }
-                pReq->frags.newDigestOffset = digestOffset;
-                macTotalLen = pCmd->macLength;
-
-                /* HW can't calculate the Digest correctly for fragmented packets
-                 * in the following cases:
-                 *  - MV88F5182                                           ||
-                 *  - MV88F5181L when total macLength more that 16 Kbytes ||
-                 *  - total macLength more that 64 Kbytes
-                 */
-                if( (mvCtrlModelGet() == MV_5182_DEV_ID) ||
-                    ( (mvCtrlModelGet() == MV_5181_DEV_ID) &&
-                      (mvCtrlRevGet() >= MV_5181L_A0_REV)  &&
-                      (pCmd->macLength >= (1 << 14)) ) )
-                {
-                    return MV_TERMINATE;
-                }
-            }
-            if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
-            {
-                cryptoDataSize = pCmd->cryptoLength - pReq->frags.cryptoSize;
-            }
-
-            /* cryptoIvOffset - don't care */
-        }
-        else
-        {
-            /* WA for MV88F5182 SHA1 and MD5 fragmentation mode */
-            if( (mvCtrlModelGet() == MV_5182_DEV_ID) &&
-                (((pSA->config & MV_CESA_MAC_MODE_MASK) ==
-                    (MV_CESA_MAC_MD5 << MV_CESA_MAC_MODE_OFFSET)) ||
-                ((pSA->config & MV_CESA_MAC_MODE_MASK) ==
-                    (MV_CESA_MAC_SHA1 << MV_CESA_MAC_MODE_OFFSET))) )
-            {
-                pReq->frags.newDigestOffset = cesaSramVirtPtr->tempDigest - mvCesaSramAddrGet();
-                pReq->fragMode = MV_CESA_FRAG_LAST;
-
-                return MV_TERMINATE;
-            }
-            /* Middle fragment */
-            config = pSA->config | (MV_CESA_FRAG_MIDDLE << MV_CESA_FRAG_MODE_OFFSET);
-            copySize = sizeof(cesaSramVirtPtr->buf);
-            /* digestOffset and cryptoIvOffset - don't care */
-
-            /* Find fragment size */
-            mvCesaFragSizeFind(pSA, pReq, cryptoOffset, macOffset,
-                            &copySize, &cryptoDataSize, &macDataSize);
-        }
-    }
-    /********* Prepare DMA descriptors to copy from pSrc to SRAM *********/
-    pMbuf = pCmd->pSrc;
-    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
-                                MV_FALSE, pReq->frags.bufOffset, copySize, pCmd->skipFlush);
-
-    /* Prepare CESA descriptor to copy from DRAM to SRAM by DMA */
-    mvCesaSramDescrBuild(config, frag, 
-                cryptoOffset + fixOffset, cryptoIvOffset + fixOffset,
-                cryptoDataSize, macOffset + fixOffset,
-                digestOffset + fixOffset, macDataSize, macTotalLen,
-                pReq, &pDmaDesc[i]);
-    i++;
-
-   /* Add special descriptor Ownership for CPU */
-    pDmaDesc[i].byteCnt = 0;
-    pDmaDesc[i].phySrcAdd = 0;
-    pDmaDesc[i].phyDestAdd = 0;
-    i++;
-
-    /********* Prepare DMA descriptors to copy from SRAM to pDst *********/
-    pMbuf = pCmd->pDst;
-    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
-                                MV_TRUE, pReq->frags.bufOffset, copySize, pCmd->skipFlush);
-
-    /* Next field of Last DMA descriptor must be NULL */
-    pDmaDesc[i-1].phyNextDescPtr = 0;
-    pReq->dma[frag].pDmaLast = &pDmaDesc[i-1];
-    mvOsCacheFlush(NULL, pReq->dma[frag].pDmaFirst, 
-                    i*sizeof(MV_DMA_DESC));
-
-    /*mvCesaDebugDescriptor(&cesaSramVirtPtr->desc[frag]);*/
-
-    pReq->frags.bufOffset += copySize;
-    pReq->frags.cryptoSize += cryptoDataSize;
-    pReq->frags.macSize += macDataSize;
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvCesaReqProcess - Process regular (Non-fragmented) request
-*
-* DESCRIPTION:
-*       This function processes the whole (not fragmented) request
-*
-* INPUT:
-*       MV_CESA_REQ* pReq   - Pointer to the request in the request queue.
-*
-* RETURN:
-*       MV_OK   - The request is successfully passed to HW for processing.
-*       Other   - Failure. The request will not be processed
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaReqProcess(MV_CESA_REQ* pReq)
-{
-    MV_CESA_MBUF    *pMbuf;
-    MV_DMA_DESC     *pDmaDesc;
-    MV_U8           *pSramBuf;
-    int             sid, i, fixOffset;
-    MV_CESA_SA      *pSA;
-    MV_CESA_COMMAND *pCmd = pReq->pCmd;
-
-    cesaStats.procCount++;
-
-    sid = pCmd->sessionId;
-    pSA = &pCesaSAD[sid];
-    pDmaDesc = pReq->dma[0].pDmaFirst;
-    pSramBuf = cesaSramVirtPtr->buf;
-    fixOffset = pReq->fixOffset;
-
-/*
-    mvOsPrintf("mvCesaReqProcess: sid=%d, pSA=%p, pDmaDesc=%p, pSramBuf=%p\n",
-                sid, pSA, pDmaDesc, pSramBuf);
-*/
-    i = 0;
-
-    /* Crypto IV Special processing in CBC mode for Encryption direction */
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) != (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) &&
-        ((pSA->config & MV_CESA_CRYPTO_MODE_MASK) == (MV_CESA_CRYPTO_CBC << MV_CESA_CRYPTO_MODE_BIT)) &&
-        ((pSA->config & MV_CESA_DIRECTION_MASK) == (MV_CESA_DIR_ENCODE << MV_CESA_DIRECTION_BIT)) &&
-        (pCmd->ivFromUser) )
-    {
-        /* For Crypto Encode in CBC mode HW always takes IV from SRAM IVPointer,
-         * (not from IVBufPointer). So when ivFromUser==1, we should copy IV from user place
-         * in the buffer to SRAM IVPointer
-         */
-        i += mvCesaDmaCopyPrepare(pCmd->pSrc, cesaSramVirtPtr->cryptoIV, &pDmaDesc[i],
-                                    MV_FALSE, pCmd->ivOffset, pSA->cryptoIvSize, pCmd->skipFlush);
-    }
-
-    /* Update SA in SRAM */
-    if(cesaLastSid != sid)
-    {
-        mvCesaSramSaUpdate(sid, &pDmaDesc[i]);
-        i++;
-    }
-
-    /********* Prepare DMA descriptors to copy from pSrc to SRAM *********/
-    pMbuf = pCmd->pSrc;
-    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
-                                MV_FALSE, 0, pMbuf->mbufSize, pCmd->skipFlush);
-
-    /* Prepare Security Accelerator descriptor to SRAM words 0 - 7 */
-    mvCesaSramDescrBuild(pSA->config, 0, pCmd->cryptoOffset + fixOffset, 
-                        pCmd->ivOffset + fixOffset, pCmd->cryptoLength,
-                        pCmd->macOffset + fixOffset, pCmd->digestOffset + fixOffset,
-                        pCmd->macLength, pCmd->macLength, pReq, &pDmaDesc[i]);
-    i++;
-
-   /* Add special descriptor Ownership for CPU */
-    pDmaDesc[i].byteCnt = 0;
-    pDmaDesc[i].phySrcAdd = 0;
-    pDmaDesc[i].phyDestAdd = 0;
-    i++;
-
-    /********* Prepare DMA descriptors to copy from SRAM to pDst *********/
-    pMbuf = pCmd->pDst;
-    i += mvCesaDmaCopyPrepare(pMbuf, pSramBuf + fixOffset, &pDmaDesc[i],
-                                MV_TRUE, 0, pMbuf->mbufSize, pCmd->skipFlush);
-
-    /* Next field of Last DMA descriptor must be NULL */
-    pDmaDesc[i-1].phyNextDescPtr = 0;
-    pReq->dma[0].pDmaLast = &pDmaDesc[i-1];
-    mvOsCacheFlush(NULL, pReq->dma[0].pDmaFirst, i*sizeof(MV_DMA_DESC));
-            
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvCesaSramDescrBuild - Set CESA descriptor in SRAM
-*
-* DESCRIPTION:
-*       This function builds CESA descriptor in SRAM from all Command parameters
-*
-*
-* INPUT:
-*       int     chan            - CESA channel uses the descriptor
-*       MV_U32  config          - 32 bits of WORD_0 in CESA descriptor structure
-*       int     cryptoOffset    - Offset from the beginning of SRAM buffer where
-*                               data for encryption/decription is started.
-*       int     ivOffset        - Offset of crypto IV from the SRAM base. Valid only
-*                               for first fragment.
-*       int     cryptoLength    - Size (in bytes) of data for encryption/descryption
-*                               operation on this fragment.
-*       int     macOffset       - Offset from the beginning of SRAM buffer where
-*                               data for Authentication is started
-*       int     digestOffset    - Offset from the beginning of SRAM buffer where
-*                               digest is located. Valid for first and last fragments.
-*       int     macLength       - Size (in bytes) of data for Authentication
-*                               operation on this fragment.
-*       int     macTotalLen     - Toatl size (in bytes) of data for Authentication
-*                               operation on the whole request (packet). Valid for
-*                               last fragment only.
-*
-* RETURN:   None
-*
-*******************************************************************************/
-static void    mvCesaSramDescrBuild(MV_U32 config, int frag, 
-                             int cryptoOffset, int ivOffset, int cryptoLength,
-                             int macOffset, int digestOffset, int macLength,
-                             int macTotalLen, MV_CESA_REQ* pReq, MV_DMA_DESC* pDmaDesc)
-{    
-    MV_CESA_DESC*   pCesaDesc = &pReq->pCesaDesc[frag];
-    MV_CESA_DESC*   pSramDesc = pSramDesc = &cesaSramVirtPtr->desc;
-    MV_U16          sramBufOffset = (MV_U16)((MV_U8*)cesaSramVirtPtr->buf - mvCesaSramAddrGet());
-
-    pCesaDesc->config = MV_32BIT_LE(config);
-
-    if( (config & MV_CESA_OPERATION_MASK) !=
-         (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
-    {
-        /* word 1 */
-        pCesaDesc->cryptoSrcOffset = MV_16BIT_LE(sramBufOffset + cryptoOffset);
-        pCesaDesc->cryptoDstOffset = MV_16BIT_LE(sramBufOffset + cryptoOffset);
-        /* word 2 */
-        pCesaDesc->cryptoDataLen = MV_16BIT_LE(cryptoLength);
-        /* word 3 */
-        pCesaDesc->cryptoKeyOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.cryptoKey - 
-                                                            mvCesaSramAddrGet()));
-        /* word 4 */
-        pCesaDesc->cryptoIvOffset  = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->cryptoIV -
-                                                            mvCesaSramAddrGet()));
-        pCesaDesc->cryptoIvBufOffset = MV_16BIT_LE(sramBufOffset + ivOffset);
-    }
-
-    if( (config & MV_CESA_OPERATION_MASK) !=
-         (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-    {
-        /* word 5 */
-        pCesaDesc->macSrcOffset = MV_16BIT_LE(sramBufOffset + macOffset);
-        pCesaDesc->macTotalLen = MV_16BIT_LE(macTotalLen);
-
-        /* word 6 */
-        pCesaDesc->macDigestOffset = MV_16BIT_LE(sramBufOffset + digestOffset);
-        pCesaDesc->macDataLen = MV_16BIT_LE(macLength);
-
-        /* word 7 */
-        pCesaDesc->macInnerIvOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.macInnerIV - 
-                                 mvCesaSramAddrGet()));
-        pCesaDesc->macOuterIvOffset = MV_16BIT_LE((MV_U16)(cesaSramVirtPtr->sramSA.macOuterIV - 
-                                 mvCesaSramAddrGet()));
-    }
-    /* Prepare DMA descriptor to CESA descriptor from DRAM to SRAM */
-    pDmaDesc->phySrcAdd = MV_32BIT_LE(mvCesaVirtToPhys(&pReq->cesaDescBuf, pCesaDesc));
-    pDmaDesc->phyDestAdd = MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (MV_U8*)pSramDesc));
-    pDmaDesc->byteCnt = MV_32BIT_LE(sizeof(MV_CESA_DESC) | BIT31);
-                                
-    /* flush Source buffer */
-    mvOsCacheFlush(NULL, pCesaDesc, sizeof(MV_CESA_DESC));
-}
-
-/*******************************************************************************
-* mvCesaSramSaUpdate - Move required SA information to SRAM if needed.
-*
-* DESCRIPTION:
-*   Copy to SRAM values of the required SA.
-*
-*
-* INPUT:
-*       short       sid          - Session ID needs SRAM Cache update
-*       MV_DMA_DESC *pDmaDesc   - Pointer to DMA descriptor used to
-*                                copy SA values from DRAM to SRAM.
-*
-* RETURN:
-*       MV_OK           - Cache entry for this SA copied to SRAM.
-*       MV_NO_CHANGE    - Cache entry for this SA already exist in SRAM
-*
-*******************************************************************************/
-static INLINE void   mvCesaSramSaUpdate(short sid, MV_DMA_DESC *pDmaDesc)
-{
-    MV_CESA_SA      *pSA = &pCesaSAD[sid];
-
-    /* Prepare DMA descriptor to Copy CACHE_SA from SA database in DRAM to SRAM */
-     pDmaDesc->byteCnt = MV_32BIT_LE(sizeof(MV_CESA_SRAM_SA) | BIT31);
-    pDmaDesc->phySrcAdd = MV_32BIT_LE(mvCesaVirtToPhys(&cesaSramSaBuf, pSA->pSramSA));
-     pDmaDesc->phyDestAdd =
-          MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (MV_U8*)&cesaSramVirtPtr->sramSA));
-
-    /* Source buffer is already flushed during OpenSession*/
-    /*mvOsCacheFlush(NULL, &pSA->sramSA, sizeof(MV_CESA_SRAM_SA));*/
-}
-
-/*******************************************************************************
-* mvCesaDmaCopyPrepare - prepare DMA descriptor list to copy data presented by
-*                       Mbuf structure from DRAM to SRAM
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_MBUF*   pMbuf       - pointer to Mbuf structure contains request
-*                                   data in DRAM
-*       MV_U8*          pSramBuf    - pointer to buffer in SRAM where data should
-*                                   be copied to.
-*       MV_DMA_DESC*    pDmaDesc   - pointer to first DMA descriptor for this copy.
-*                                   The function set number of DMA descriptors needed
-*                                   to copy the copySize bytes from Mbuf.
-*       MV_BOOL         isToMbuf    - Copy direction.
-*                                   MV_TRUE means copy from SRAM buffer to Mbuf in DRAM.
-*                                   MV_FALSE means copy from Mbuf in DRAM to SRAM buffer.
-*       int             offset      - Offset in the Mbuf structure that copy should be
-*                                   started from.
-*       int             copySize    - Size of data should be copied.
-*
-* RETURN:
-*       int  - number of DMA descriptors used for the copy.
-*
-*******************************************************************************/
-#ifndef MV_NETBSD
-static INLINE int    mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf, 
-                        MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
-                        int offset, int copySize, MV_BOOL skipFlush)
-{
-    int     bufOffset, bufSize, size, frag, i;
-    MV_U8*  pBuf;
-
-    i = 0;
-
-    /* Calculate start place for copy: fragment number and offset in the fragment */
-    frag = mvCesaMbufOffset(pMbuf, offset, &bufOffset);
-    bufSize = pMbuf->pFrags[frag].bufSize - bufOffset;
-    pBuf = pMbuf->pFrags[frag].bufVirtPtr + bufOffset;
-
-    /* Size accumulate total copy size */
-    size = 0;
-
-    /* Create DMA lists to copy mBuf from pSrc to SRAM */
-    while(size < copySize)
-    {
-        /* Find copy size for each DMA descriptor */
-        bufSize = MV_MIN(bufSize, (copySize - size));
-        pDmaDesc[i].byteCnt = MV_32BIT_LE(bufSize | BIT31);
-        if(isToMbuf)
-        {
-            pDmaDesc[i].phyDestAdd = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
-            pDmaDesc[i].phySrcAdd  =
-                MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (pSramBuf + size)));
-            /* invalidate the buffer */
-	    if(skipFlush == MV_FALSE)
-            	mvOsCacheInvalidate(NULL, pBuf, bufSize);
-        }
-        else
-        {
-            pDmaDesc[i].phySrcAdd = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
-            pDmaDesc[i].phyDestAdd =
-                MV_32BIT_LE(mvCesaSramVirtToPhys(NULL, (pSramBuf + size)));
-            /* flush the buffer */
-	    if(skipFlush == MV_FALSE)
-            	mvOsCacheFlush(NULL, pBuf, bufSize);
-        }
-
-        /* Count number of used DMA descriptors */
-        i++;
-        size += bufSize;
-
-        /* go to next fragment in the Mbuf */
-        frag++;
-        pBuf = pMbuf->pFrags[frag].bufVirtPtr;
-        bufSize = pMbuf->pFrags[frag].bufSize;
-    }
-    return i;
-}
-#else /* MV_NETBSD */
-static int    mvCesaDmaCopyPrepare(MV_CESA_MBUF* pMbuf, MV_U8* pSramBuf,
-                        MV_DMA_DESC* pDmaDesc, MV_BOOL isToMbuf,
-                        int offset, int copySize, MV_BOOL skipFlush)
-{
-	int bufOffset, bufSize, thisSize, size, frag, i;
-	MV_ULONG bufPhys, sramPhys;
-    MV_U8*  pBuf;
-
-	/*
-	 * Calculate start place for copy: fragment number and offset in
-	 * the fragment
-	 */
-    frag = mvCesaMbufOffset(pMbuf, offset, &bufOffset);
-
-	/*
-	 * Get SRAM physical address only once. We can update it in-place
-	 * as we build the descriptor chain.
-	 */
-	sramPhys = mvCesaSramVirtToPhys(NULL, pSramBuf);
-
-	/*
-	 * 'size' accumulates total copy size, 'i' counts desccriptors.
-	 */
-	size = i = 0;
-
-	/* Create DMA lists to copy mBuf from pSrc to SRAM */
-	while (size < copySize) {
-		/*
-		 * Calculate # of bytes to copy from the current fragment,
-		 * and the pointer to the start of data
-		 */
-    bufSize = pMbuf->pFrags[frag].bufSize - bufOffset;
-    pBuf = pMbuf->pFrags[frag].bufVirtPtr + bufOffset;
-		bufOffset = 0;	/* First frag may be non-zero */
-		frag++;
-
-		/*
-		 * As long as there is data in the current fragment...
-		 */
-		while (bufSize > 0) {
-			/*
-			 * Ensure we don't cross an MMU page boundary.
-			 * XXX: This is NetBSD-specific, but it is a
-			 * quick and dirty way to fix the problem.
-			 * A true HAL would rely on the OS-specific
-			 * driver to do this...
-			 */
-			thisSize = PAGE_SIZE -
-			    (((MV_ULONG)pBuf) & (PAGE_SIZE - 1));
-			thisSize = MV_MIN(bufSize, thisSize);
-			/*
-			 * Make sure we don't copy more than requested
-			 */
-			if (thisSize > (copySize - size)) {
-				thisSize = copySize - size;
-				bufSize = 0;
-			}
-
-			/*
-			 * Physicall address of this fragment
-			 */
-			bufPhys = MV_32BIT_LE(mvOsIoVirtToPhy(NULL, pBuf));
-
-			/*
-			 * Set up the descriptor
-			 */
-		        pDmaDesc[i].byteCnt = MV_32BIT_LE(thisSize | BIT31);
-		        if(isToMbuf) {
-				pDmaDesc[i].phyDestAdd = bufPhys;
-				pDmaDesc[i].phySrcAdd  = MV_32BIT_LE(sramPhys);
-            /* invalidate the buffer */
-				if(skipFlush == MV_FALSE)
-					mvOsCacheInvalidate(NULL, pBuf, thisSize);
-			} else {
-				pDmaDesc[i].phySrcAdd = bufPhys;
-				pDmaDesc[i].phyDestAdd = MV_32BIT_LE(sramPhys);
-            /* flush the buffer */
-				if(skipFlush == MV_FALSE)
-					mvOsCacheFlush(NULL, pBuf, thisSize);
-			}
-
-			pDmaDesc[i].phyNextDescPtr =
-			    MV_32BIT_LE(mvOsIoVirtToPhy(NULL,(&pDmaDesc[i+1])));
-
-        /* flush the DMA desc */
-        mvOsCacheFlush(NULL, &pDmaDesc[i], sizeof(MV_DMA_DESC));
-
-			/* Update state */
-			bufSize -= thisSize;
-			sramPhys += thisSize;
-			pBuf += thisSize;
-			size += thisSize;
-        i++;
-		}
-	}
-
-    return i;
-}
-#endif /* MV_NETBSD */
-/*******************************************************************************
-* mvCesaHmacIvGet - Calculate Inner and Outter values from HMAC key
-*
-* DESCRIPTION:
-*       This function calculate Inner and Outer values used for HMAC algorithm.
-*       This operation allows improve performance fro the whole HMAC processing.
-*
-* INPUT:
-*       MV_CESA_MAC_MODE    macMode     - Authentication mode: HMAC_MD5 or HMAC_SHA1.
-*       unsigned char       key[]       - Pointer to HMAC key.
-*       int                 keyLength   - Size of HMAC key (maximum 64 bytes)
-*
-* OUTPUT:
-*       unsigned char       innerIV[]   - HASH(key^inner)
-*       unsigned char       outerIV[]   - HASH(key^outter)
-*
-* RETURN:   None
-*
-*******************************************************************************/
-static void    mvCesaHmacIvGet(MV_CESA_MAC_MODE macMode, unsigned char key[], int keyLength,
-                     unsigned char innerIV[], unsigned char outerIV[])
-{
-    unsigned char   inner[MV_CESA_MAX_MAC_KEY_LENGTH];
-    unsigned char   outer[MV_CESA_MAX_MAC_KEY_LENGTH];
-    int             i, digestSize = 0;
-#if defined(MV_CPU_LE) || defined(MV_PPC)
-    MV_U32          swapped32, val32, *pVal32;
-#endif 
-    for(i=0; i<keyLength; i++)
-    {
-        inner[i] = 0x36 ^ key[i];
-        outer[i] = 0x5c ^ key[i];
-    }
-
-    for(i=keyLength; i<MV_CESA_MAX_MAC_KEY_LENGTH; i++)
-    {
-        inner[i] = 0x36;
-        outer[i] = 0x5c;
-    }
-    if(macMode == MV_CESA_MAC_HMAC_MD5)
-    {
-        MV_MD5_CONTEXT  ctx;
-
-        mvMD5Init(&ctx);
-        mvMD5Update(&ctx, inner, MV_CESA_MAX_MAC_KEY_LENGTH);
-
-        memcpy(innerIV, ctx.buf, MV_CESA_MD5_DIGEST_SIZE);
-        memset(&ctx, 0, sizeof(ctx));
-
-        mvMD5Init(&ctx);
-        mvMD5Update(&ctx, outer, MV_CESA_MAX_MAC_KEY_LENGTH);
-        memcpy(outerIV, ctx.buf, MV_CESA_MD5_DIGEST_SIZE);
-        memset(&ctx, 0, sizeof(ctx));
-        digestSize = MV_CESA_MD5_DIGEST_SIZE;
-    }
-    else if(macMode == MV_CESA_MAC_HMAC_SHA1)
-    {
-        MV_SHA1_CTX  ctx;
-
-        mvSHA1Init(&ctx);
-        mvSHA1Update(&ctx, inner, MV_CESA_MAX_MAC_KEY_LENGTH);
-        memcpy(innerIV, ctx.state, MV_CESA_SHA1_DIGEST_SIZE);
-        memset(&ctx, 0, sizeof(ctx));
-
-        mvSHA1Init(&ctx);
-        mvSHA1Update(&ctx, outer, MV_CESA_MAX_MAC_KEY_LENGTH);
-        memcpy(outerIV, ctx.state, MV_CESA_SHA1_DIGEST_SIZE);
-        memset(&ctx, 0, sizeof(ctx));
-        digestSize = MV_CESA_SHA1_DIGEST_SIZE;
-    }
-    else
-    {
-        mvOsPrintf("hmacGetIV: Unexpected macMode %d\n", macMode);
-    }
-#if defined(MV_CPU_LE) || defined(MV_PPC)
-    /* 32 bits Swap of Inner and Outer values */
-    pVal32 = (MV_U32*)innerIV;
-    for(i=0; i<digestSize/4; i++)
-    {
-        val32 = *pVal32;
-        swapped32 = MV_BYTE_SWAP_32BIT(val32);
-        *pVal32 = swapped32;
-        pVal32++;
-    }
-    pVal32 = (MV_U32*)outerIV;
-    for(i=0; i<digestSize/4; i++)
-    {
-        val32 = *pVal32;
-        swapped32 = MV_BYTE_SWAP_32BIT(val32);
-        *pVal32 = swapped32;
-        pVal32++;
-    }
-#endif  /* defined(MV_CPU_LE) || defined(MV_PPC) */
-}
-
-
-/*******************************************************************************
-* mvCesaFragSha1Complete - Complete SHA1 authentication started by HW using SW
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_MBUF*   pMbuf           - Pointer to Mbuf structure where data
-*                                       for SHA1 is placed.
-*       int             offset          - Offset in the Mbuf structure where
-*                                       unprocessed data for SHA1 is started.
-*       MV_U8*          pOuterIV        - Pointer to OUTER for this session.
-*                                       If pOuterIV==NULL - MAC mode is HASH_SHA1
-*                                       If pOuterIV!=NULL - MAC mode is HMAC_SHA1
-*       int             macLeftSize     - Size of unprocessed data for SHA1.
-*       int             macTotalSize    - Total size of data for SHA1 in the
-*                                       request (processed + unprocessed)
-*
-* OUTPUT:
-*       MV_U8*     pDigest  - Pointer to place where calculated Digest will
-*                           be stored.
-*
-* RETURN:   None
-*
-*******************************************************************************/
-static void    mvCesaFragSha1Complete(MV_CESA_MBUF* pMbuf, int offset,
-                                      MV_U8* pOuterIV, int macLeftSize,
-                                      int macTotalSize, MV_U8* pDigest)
-{
-    MV_SHA1_CTX     ctx;
-    MV_U8           *pData;
-    int             i, frag, fragOffset, size;
-
-    /* Read temporary Digest from HW */
-    for(i=0; i<MV_CESA_SHA1_DIGEST_SIZE/4; i++)
-    {
-        ctx.state[i] = MV_REG_READ(MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i));
-    }
-    /* Initialize MV_SHA1_CTX structure */
-    memset(ctx.buffer, 0, 64);
-    /* Set count[0] in bits. 32 bits is enough for 512 MBytes */
-    /* so count[1] is always 0 */
-    ctx.count[0] = ((macTotalSize - macLeftSize) * 8);
-    ctx.count[1] = 0;
-
-    /* If HMAC - add size of Inner block (64 bytes) ro count[0] */
-    if(pOuterIV != NULL)
-        ctx.count[0] += (64 * 8);
-
-    /* Get place of unprocessed data in the Mbuf structure */
-    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return;
-    }
-
-    pData = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
-    size = pMbuf->pFrags[frag].bufSize - fragOffset;
-
-    /* Complete Inner part */
-    while(macLeftSize > 0)
-    {
-        if(macLeftSize <= size)
-        {
-            mvSHA1Update(&ctx, pData, macLeftSize);
-            break;
-        }
-        mvSHA1Update(&ctx, pData, size);
-        macLeftSize -= size;
-        frag++;
-        pData = pMbuf->pFrags[frag].bufVirtPtr;
-        size = pMbuf->pFrags[frag].bufSize;
-    }
-    mvSHA1Final(pDigest, &ctx);
-/*
-    mvOsPrintf("mvCesaFragSha1Complete: pOuterIV=%p, macLeftSize=%d, macTotalSize=%d\n",
-                pOuterIV, macLeftSize, macTotalSize);
-    mvDebugMemDump(pDigest, MV_CESA_SHA1_DIGEST_SIZE, 1);
-*/
-
-    if(pOuterIV != NULL)
-    {
-        /* If HMAC - Complete Outer part */
-        for(i=0; i<MV_CESA_SHA1_DIGEST_SIZE/4; i++)
-        {
-#if defined(MV_CPU_LE) || defined(MV_ARM)
-            ctx.state[i] = MV_BYTE_SWAP_32BIT(((MV_U32*)pOuterIV)[i]);
-#else
-	    ctx.state[i] = ((MV_U32*)pOuterIV)[i];
-#endif
-	}
-        memset(ctx.buffer, 0, 64);
-
-        ctx.count[0] = 64*8;
-        ctx.count[1] = 0;
-        mvSHA1Update(&ctx, pDigest, MV_CESA_SHA1_DIGEST_SIZE);
-        mvSHA1Final(pDigest, &ctx);
-    }
-}
-
-/*******************************************************************************
-* mvCesaFragMd5Complete - Complete MD5 authentication started by HW using SW
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_MBUF*   pMbuf           - Pointer to Mbuf structure where data
-*                                       for SHA1 is placed.
-*       int             offset          - Offset in the Mbuf structure where
-*                                       unprocessed data for MD5 is started.
-*       MV_U8*          pOuterIV        - Pointer to OUTER for this session.
-*                                       If pOuterIV==NULL - MAC mode is HASH_MD5
-*                                       If pOuterIV!=NULL - MAC mode is HMAC_MD5
-*       int             macLeftSize     - Size of unprocessed data for MD5.
-*       int             macTotalSize    - Total size of data for MD5 in the
-*                                       request (processed + unprocessed)
-*
-* OUTPUT:
-*       MV_U8*     pDigest  - Pointer to place where calculated Digest will
-*                           be stored.
-*
-* RETURN:   None
-*
-*******************************************************************************/
-static void    mvCesaFragMd5Complete(MV_CESA_MBUF* pMbuf, int offset,
-                                     MV_U8* pOuterIV, int macLeftSize,
-                                     int macTotalSize, MV_U8* pDigest)
-{
-    MV_MD5_CONTEXT  ctx;
-    MV_U8           *pData;
-    int             i, frag, fragOffset, size;
-
-    /* Read temporary Digest from HW */
-    for(i=0; i<MV_CESA_MD5_DIGEST_SIZE/4; i++)
-    {
-        ctx.buf[i] = MV_REG_READ(MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i));
-    }
-    memset(ctx.in, 0, 64);
-
-    /* Set count[0] in bits. 32 bits is enough for 512 MBytes */
-    /* so count[1] is always 0 */
-    ctx.bits[0] = ((macTotalSize - macLeftSize) * 8);
-    ctx.bits[1] = 0;
-
-    /* If HMAC - add size of Inner block (64 bytes) ro count[0] */
-    if(pOuterIV != NULL)
-        ctx.bits[0] += (64 * 8);
-
-    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return;
-    }
-
-    pData = pMbuf->pFrags[frag].bufVirtPtr + fragOffset;
-    size = pMbuf->pFrags[frag].bufSize - fragOffset;
-
-    /* Complete Inner part */
-    while(macLeftSize > 0)
-    {
-        if(macLeftSize <= size)
-        {
-            mvMD5Update(&ctx, pData, macLeftSize);
-            break;
-        }
-        mvMD5Update(&ctx, pData, size);
-        macLeftSize -= size;
-        frag++;
-        pData = pMbuf->pFrags[frag].bufVirtPtr;
-        size = pMbuf->pFrags[frag].bufSize;
-    }
-    mvMD5Final(pDigest, &ctx);
-
-/*
-    mvOsPrintf("mvCesaFragMd5Complete: pOuterIV=%p, macLeftSize=%d, macTotalSize=%d\n",
-                pOuterIV, macLeftSize, macTotalSize);
-    mvDebugMemDump(pDigest, MV_CESA_MD5_DIGEST_SIZE, 1);
-*/
-    if(pOuterIV != NULL)
-    {
-        /* Complete Outer part */
-        for(i=0; i<MV_CESA_MD5_DIGEST_SIZE/4; i++)
-        {
-#if defined(MV_CPU_LE) || defined(MV_ARM)
-            ctx.buf[i] = MV_BYTE_SWAP_32BIT(((MV_U32*)pOuterIV)[i]);
-#else
-	    ctx.buf[i] = ((MV_U32*)pOuterIV)[i];
-#endif
-	}
-        memset(ctx.in, 0, 64);
-
-        ctx.bits[0] = 64*8;
-        ctx.bits[1] = 0;
-        mvMD5Update(&ctx, pDigest, MV_CESA_MD5_DIGEST_SIZE);
-        mvMD5Final(pDigest, &ctx);
-    }
-}
-
-/*******************************************************************************
-* mvCesaFragAuthComplete -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_REQ*    pReq,
-*       MV_CESA_SA*     pSA,
-*       int             macDataSize
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaFragAuthComplete(MV_CESA_REQ* pReq, MV_CESA_SA* pSA,
-                               int macDataSize)
-{
-    MV_CESA_COMMAND*        pCmd = pReq->pCmd;
-    MV_U8*                  pDigest;
-    MV_CESA_MAC_MODE        macMode;
-    MV_U8*                  pOuterIV = NULL;
-
-    /* Copy data from Source fragment to Destination */
-    if(pCmd->pSrc != pCmd->pDst)
-    {
-        mvCesaMbufCopy(pCmd->pDst, pReq->frags.bufOffset,
-                       pCmd->pSrc, pReq->frags.bufOffset, macDataSize);
-    }
-
-/*
-    mvCesaCopyFromMbuf(cesaSramVirtPtr->buf[0], pCmd->pSrc, pReq->frags.bufOffset, macDataSize);
-    mvCesaCopyToMbuf(cesaSramVirtPtr->buf[0], pCmd->pDst, pReq->frags.bufOffset, macDataSize);
-*/
-    pDigest = (mvCesaSramAddrGet() + pReq->frags.newDigestOffset);
-
-    macMode = (pSA->config & MV_CESA_MAC_MODE_MASK) >> MV_CESA_MAC_MODE_OFFSET;
-/*
-    mvOsPrintf("macDataSize=%d, macLength=%d, digestOffset=%d, macMode=%d\n",
-            macDataSize, pCmd->macLength, pCmd->digestOffset, macMode);
-*/
-    switch(macMode)
-    {
-        case MV_CESA_MAC_HMAC_MD5:
-            pOuterIV = pSA->pSramSA->macOuterIV;
-
-        case MV_CESA_MAC_MD5:
-            mvCesaFragMd5Complete(pCmd->pDst, pReq->frags.bufOffset, pOuterIV,
-                               macDataSize, pCmd->macLength, pDigest);
-        break;
-
-        case MV_CESA_MAC_HMAC_SHA1:
-            pOuterIV = pSA->pSramSA->macOuterIV;
-
-        case MV_CESA_MAC_SHA1:
-            mvCesaFragSha1Complete(pCmd->pDst, pReq->frags.bufOffset, pOuterIV,
-                               macDataSize, pCmd->macLength, pDigest);
-        break;
-
-        default:
-            mvOsPrintf("mvCesaFragAuthComplete: Unexpected macMode %d\n", macMode);
-            return MV_BAD_PARAM;
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaCtrModeInit -
-*
-* DESCRIPTION:
-*
-*
-* INPUT: NONE
-*
-*
-* RETURN:
-*       MV_CESA_COMMAND*
-*
-*******************************************************************************/
-static MV_CESA_COMMAND*    mvCesaCtrModeInit(void)
-{
-    MV_CESA_MBUF    *pMbuf;
-    MV_U8           *pBuf;
-    MV_CESA_COMMAND *pCmd;
-
-    pBuf = mvOsMalloc(sizeof(MV_CESA_COMMAND) +
-                      sizeof(MV_CESA_MBUF) + sizeof(MV_BUF_INFO) + 100);
-    if(pBuf == NULL)
-    {
-        mvOsPrintf("mvCesaSessionOpen: Can't allocate %u bytes for CTR Mode\n",
-                    sizeof(MV_CESA_COMMAND) + sizeof(MV_CESA_MBUF) + sizeof(MV_BUF_INFO) );
-        return NULL;
-    }
-    pCmd = (MV_CESA_COMMAND*)pBuf;
-    pBuf += sizeof(MV_CESA_COMMAND);
-
-    pMbuf = (MV_CESA_MBUF*)pBuf;
-    pBuf += sizeof(MV_CESA_MBUF);
-
-    pMbuf->pFrags = (MV_BUF_INFO*)pBuf;
-
-    pMbuf->numFrags = 1;
-    pCmd->pSrc = pMbuf;
-    pCmd->pDst = pMbuf;
-/*
-    mvOsPrintf("CtrModeInit: pCmd=%p, pSrc=%p, pDst=%p, pFrags=%p\n",
-                pCmd, pCmd->pSrc, pCmd->pDst,
-                pMbuf->pFrags);
-*/
-    return pCmd;
-}
-
-/*******************************************************************************
-* mvCesaCtrModePrepare -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static MV_STATUS    mvCesaCtrModePrepare(MV_CESA_COMMAND *pCtrModeCmd, MV_CESA_COMMAND *pCmd)
-{
-    MV_CESA_MBUF    *pMbuf;
-    MV_U8           *pBuf, *pIV;
-    MV_U32          counter, *pCounter;
-    int             cryptoSize = MV_ALIGN_UP(pCmd->cryptoLength, MV_CESA_AES_BLOCK_SIZE);
-/*
-    mvOsPrintf("CtrModePrepare: pCmd=%p, pCtrSrc=%p, pCtrDst=%p, pOrgCmd=%p, pOrgSrc=%p, pOrgDst=%p\n",
-                pCmd, pCmd->pSrc, pCmd->pDst,
-                pCtrModeCmd, pCtrModeCmd->pSrc, pCtrModeCmd->pDst);
-*/
-    pMbuf = pCtrModeCmd->pSrc;
-
-    /* Allocate buffer for Key stream */
-    pBuf = mvOsIoCachedMalloc(cesaOsHandle,cryptoSize, 
-			      &pMbuf->pFrags[0].bufPhysAddr,
-			      &pMbuf->pFrags[0].memHandle);
-    if(pBuf == NULL)
-    {
-        mvOsPrintf("mvCesaCtrModePrepare: Can't allocate %d bytes\n", cryptoSize);
-        return MV_OUT_OF_CPU_MEM;
-    }
-    memset(pBuf, 0, cryptoSize);
-    mvOsCacheFlush(NULL, pBuf, cryptoSize);
-
-    pMbuf->pFrags[0].bufVirtPtr = pBuf;
-    pMbuf->mbufSize = cryptoSize;
-    pMbuf->pFrags[0].bufSize = cryptoSize;
-
-    pCtrModeCmd->pReqPrv = pCmd->pReqPrv;
-    pCtrModeCmd->sessionId = pCmd->sessionId;
-
-    /* ivFromUser and ivOffset are don't care */
-    pCtrModeCmd->cryptoOffset = 0;
-    pCtrModeCmd->cryptoLength = cryptoSize;
-
-    /* digestOffset, macOffset and macLength are don't care */
-
-    mvCesaCopyFromMbuf(pBuf, pCmd->pSrc, pCmd->ivOffset, MV_CESA_AES_BLOCK_SIZE);
-    pCounter = (MV_U32*)(pBuf + (MV_CESA_AES_BLOCK_SIZE - sizeof(counter)));
-    counter = *pCounter;
-    counter = MV_32BIT_BE(counter);
-    pIV = pBuf;
-    cryptoSize -= MV_CESA_AES_BLOCK_SIZE;
-
-    /* fill key stream */
-    while(cryptoSize > 0)
-    {
-        pBuf += MV_CESA_AES_BLOCK_SIZE;
-        memcpy(pBuf, pIV, MV_CESA_AES_BLOCK_SIZE - sizeof(counter));
-        pCounter = (MV_U32*)(pBuf + (MV_CESA_AES_BLOCK_SIZE - sizeof(counter)));
-        counter++;
-        *pCounter = MV_32BIT_BE(counter);
-        cryptoSize -= MV_CESA_AES_BLOCK_SIZE;
-    }
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaCtrModeComplete -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaCtrModeComplete(MV_CESA_COMMAND *pOrgCmd, MV_CESA_COMMAND *pCmd)
-{
-    int         srcFrag, dstFrag, srcOffset, dstOffset, keyOffset, srcSize, dstSize;
-    int         cryptoSize = pCmd->cryptoLength;
-    MV_U8       *pSrc, *pDst, *pKey;
-    MV_STATUS   status = MV_OK;
-/*
-    mvOsPrintf("CtrModeComplete: pCmd=%p, pCtrSrc=%p, pCtrDst=%p, pOrgCmd=%p, pOrgSrc=%p, pOrgDst=%p\n",
-                pCmd, pCmd->pSrc, pCmd->pDst,
-                pOrgCmd, pOrgCmd->pSrc, pOrgCmd->pDst);
-*/
-    /* XOR source data with key stream to destination data */
-    pKey = pCmd->pDst->pFrags[0].bufVirtPtr;
-    keyOffset = 0;
-
-    if( (pOrgCmd->pSrc != pOrgCmd->pDst) &&
-        (pOrgCmd->cryptoOffset > 0) )
-    {
-        /* Copy Prefix from source buffer to destination buffer */
-
-        status = mvCesaMbufCopy(pOrgCmd->pDst, 0,
-                                pOrgCmd->pSrc, 0, pOrgCmd->cryptoOffset);
-/*
-        status = mvCesaCopyFromMbuf(tempBuf, pOrgCmd->pSrc,
-                       0, pOrgCmd->cryptoOffset);
-        status = mvCesaCopyToMbuf(tempBuf, pOrgCmd->pDst,
-                       0, pOrgCmd->cryptoOffset);
-*/
-    }
-
-    srcFrag = mvCesaMbufOffset(pOrgCmd->pSrc, pOrgCmd->cryptoOffset, &srcOffset);
-    pSrc = pOrgCmd->pSrc->pFrags[srcFrag].bufVirtPtr;
-    srcSize = pOrgCmd->pSrc->pFrags[srcFrag].bufSize;
-
-    dstFrag = mvCesaMbufOffset(pOrgCmd->pDst, pOrgCmd->cryptoOffset, &dstOffset);
-    pDst = pOrgCmd->pDst->pFrags[dstFrag].bufVirtPtr;
-    dstSize = pOrgCmd->pDst->pFrags[dstFrag].bufSize;
-
-    while(cryptoSize > 0)
-    {
-        pDst[dstOffset] = (pSrc[srcOffset] ^ pKey[keyOffset]);
-
-        cryptoSize--;
-        dstOffset++;
-        srcOffset++;
-        keyOffset++;
-
-        if(srcOffset >= srcSize)
-        {
-            srcFrag++;
-            srcOffset = 0;
-            pSrc = pOrgCmd->pSrc->pFrags[srcFrag].bufVirtPtr;
-            srcSize = pOrgCmd->pSrc->pFrags[srcFrag].bufSize;
-        }
-
-        if(dstOffset >= dstSize)
-        {
-            dstFrag++;
-            dstOffset = 0;
-            pDst = pOrgCmd->pDst->pFrags[dstFrag].bufVirtPtr;
-            dstSize = pOrgCmd->pDst->pFrags[dstFrag].bufSize;
-        }
-    }
-
-    if(pOrgCmd->pSrc != pOrgCmd->pDst)
-    {
-        /* Copy Suffix from source buffer to destination buffer */
-        srcOffset = pOrgCmd->cryptoOffset + pOrgCmd->cryptoLength;
-
-        if( (pOrgCmd->pDst->mbufSize - srcOffset) > 0)
-        {
-            status = mvCesaMbufCopy(pOrgCmd->pDst, srcOffset,
-                                    pOrgCmd->pSrc, srcOffset,
-                                    pOrgCmd->pDst->mbufSize - srcOffset);
-        }
-
-/*
-        status = mvCesaCopyFromMbuf(tempBuf, pOrgCmd->pSrc,
-                                srcOffset, pOrgCmd->pSrc->mbufSize - srcOffset);
-        status = mvCesaCopyToMbuf(tempBuf, pOrgCmd->pDst,
-                       srcOffset, pOrgCmd->pDst->mbufSize - srcOffset);
-*/
-    }
-
-    /* Free buffer used for Key stream */
-    mvOsIoCachedFree(cesaOsHandle,pCmd->pDst->pFrags[0].bufSize,
-		     pCmd->pDst->pFrags[0].bufPhysAddr,
-                     pCmd->pDst->pFrags[0].bufVirtPtr,
-		     pCmd->pDst->pFrags[0].memHandle);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaCtrModeFinish -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_COMMAND* pCmd
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static void    mvCesaCtrModeFinish(MV_CESA_COMMAND* pCmd)
-{
-    mvOsFree(pCmd);
-}
-
-/*******************************************************************************
-* mvCesaParamCheck -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd, MV_U8* pFixOffset
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd,
-                                    MV_U8* pFixOffset)
-{
-    MV_U8   fixOffset = 0xFF;
-
-    /* Check AUTH operation parameters */
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET)) )
-    {
-        /* MAC offset should be at least 4 byte aligned */
-        if( MV_IS_NOT_ALIGN(pCmd->macOffset, 4) )
-        {
-            mvOsPrintf("mvCesaAction: macOffset %d must be 4 byte aligned\n",
-                    pCmd->macOffset);
-            return MV_BAD_PARAM;
-        }
-        /* Digest offset must be 4 byte aligned */
-        if( MV_IS_NOT_ALIGN(pCmd->digestOffset, 4) )
-        {
-            mvOsPrintf("mvCesaAction: digestOffset %d must be 4 byte aligned\n",
-                    pCmd->digestOffset);
-            return MV_BAD_PARAM;
-        }
-        /* In addition all offsets should be the same alignment: 8 or 4 */
-        if(fixOffset == 0xFF)
-        {
-            fixOffset = (pCmd->macOffset % 8);
-        }
-        else
-        {
-            if( (pCmd->macOffset % 8) != fixOffset)
-            {
-                mvOsPrintf("mvCesaAction: macOffset %d mod 8 must be equal %d\n",
-                                pCmd->macOffset, fixOffset);
-                return MV_BAD_PARAM;
-            }
-        }
-        if( (pCmd->digestOffset % 8) != fixOffset)
-        {
-            mvOsPrintf("mvCesaAction: digestOffset %d mod 8 must be equal %d\n",
-                                pCmd->digestOffset, fixOffset);
-            return MV_BAD_PARAM;
-        }
-    }
-    /* Check CRYPTO operation parameters */
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) )
-    {
-        /* CryptoOffset should be at least 4 byte aligned */
-        if( MV_IS_NOT_ALIGN(pCmd->cryptoOffset, 4)  )
-        {
-            mvOsPrintf("CesaAction: cryptoOffset=%d must be 4 byte aligned\n",
-                        pCmd->cryptoOffset);
-            return MV_BAD_PARAM;
-        }
-        /* cryptoLength should be the whole number of blocks */
-        if( MV_IS_NOT_ALIGN(pCmd->cryptoLength, pSA->cryptoBlockSize) )
-        {
-            mvOsPrintf("mvCesaAction: cryptoLength=%d must be %d byte aligned\n",
-                        pCmd->cryptoLength, pSA->cryptoBlockSize);
-            return MV_BAD_PARAM;
-        }
-        if(fixOffset == 0xFF)
-        {
-            fixOffset = (pCmd->cryptoOffset % 8);
-        }
-        else
-        {
-            /* In addition all offsets should be the same alignment: 8 or 4 */
-            if( (pCmd->cryptoOffset % 8) != fixOffset)
-            {
-                mvOsPrintf("mvCesaAction: cryptoOffset %d mod 8 must be equal %d \n",
-                                pCmd->cryptoOffset, fixOffset);
-                return MV_BAD_PARAM;
-            }
-        }
-
-        /* check for CBC mode */
-        if(pSA->cryptoIvSize > 0)
-        {
-            /* cryptoIV must not be part of CryptoLength */
-            if( ((pCmd->ivOffset + pSA->cryptoIvSize) > pCmd->cryptoOffset) &&
-                (pCmd->ivOffset < (pCmd->cryptoOffset + pCmd->cryptoLength)) )
-            {
-                mvOsPrintf("mvCesaFragParamCheck: cryptoIvOffset (%d) is part of cryptoLength (%d+%d)\n",
-                        pCmd->ivOffset, pCmd->macOffset, pCmd->macLength);
-                return MV_BAD_PARAM;
-            }
-
-            /* ivOffset must be 4 byte aligned */
-            if( MV_IS_NOT_ALIGN(pCmd->ivOffset, 4) )
-            {
-                mvOsPrintf("CesaAction: ivOffset=%d must be 4 byte aligned\n",
-                            pCmd->ivOffset);
-                return MV_BAD_PARAM;
-            }
-            /* In addition all offsets should be the same alignment: 8 or 4 */
-            if( (pCmd->ivOffset % 8) != fixOffset)
-            {
-                mvOsPrintf("mvCesaAction: ivOffset %d mod 8 must be %d\n",
-                                pCmd->ivOffset, fixOffset);
-                return MV_BAD_PARAM;
-            }
-        }
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaFragParamCheck -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static MV_STATUS   mvCesaFragParamCheck(MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd)
-{
-    int     offset;
-
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET)) )
-    {
-        /* macOffset must be less that SRAM buffer size */
-        if(pCmd->macOffset > (sizeof(cesaSramVirtPtr->buf) - MV_CESA_AUTH_BLOCK_SIZE))
-        {
-            mvOsPrintf("mvCesaFragParamCheck: macOffset is too large (%d)\n",
-                        pCmd->macOffset);
-            return MV_BAD_PARAM;
-        }
-        /* macOffset+macSize must be more than mbufSize - SRAM buffer size */
-        if( ((pCmd->macOffset + pCmd->macLength) > pCmd->pSrc->mbufSize) ||
-            ((pCmd->pSrc->mbufSize - (pCmd->macOffset + pCmd->macLength)) >=
-             sizeof(cesaSramVirtPtr->buf)) )
-        {
-            mvOsPrintf("mvCesaFragParamCheck: macLength is too large (%d), mbufSize=%d\n",
-                        pCmd->macLength, pCmd->pSrc->mbufSize);
-            return MV_BAD_PARAM;
-        }
-    }
-
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET)) )
-    {
-        /* cryptoOffset must be less that SRAM buffer size */
-        /* 4 for possible fixOffset */
-        if( (pCmd->cryptoOffset + 4) > (sizeof(cesaSramVirtPtr->buf) - pSA->cryptoBlockSize))
-        {
-            mvOsPrintf("mvCesaFragParamCheck: cryptoOffset is too large (%d)\n",
-                        pCmd->cryptoOffset);
-            return MV_BAD_PARAM;
-        }
-
-        /* cryptoOffset+cryptoSize must be more than mbufSize - SRAM buffer size */
-        if( ((pCmd->cryptoOffset + pCmd->cryptoLength) > pCmd->pSrc->mbufSize) ||
-            ((pCmd->pSrc->mbufSize - (pCmd->cryptoOffset + pCmd->cryptoLength)) >=
-             (sizeof(cesaSramVirtPtr->buf) - pSA->cryptoBlockSize)) )
-        {
-            mvOsPrintf("mvCesaFragParamCheck: cryptoLength is too large (%d), mbufSize=%d\n",
-                        pCmd->cryptoLength, pCmd->pSrc->mbufSize);
-            return MV_BAD_PARAM;
-        }
-    }
-
-    /* When MAC_THEN_CRYPTO or CRYPTO_THEN_MAC */
-    if( ((pSA->config & MV_CESA_OPERATION_MASK) ==
-            (MV_CESA_MAC_THEN_CRYPTO << MV_CESA_OPERATION_OFFSET)) ||
-        ((pSA->config & MV_CESA_OPERATION_MASK) ==
-            (MV_CESA_CRYPTO_THEN_MAC << MV_CESA_OPERATION_OFFSET)) )
-    {
-        if( (mvCtrlModelGet() == MV_5182_DEV_ID) ||
-            ( (mvCtrlModelGet() == MV_5181_DEV_ID) &&
-              (mvCtrlRevGet() >= MV_5181L_A0_REV)  &&
-              (pCmd->macLength >= (1 << 14)) ) )
-        {
-            return MV_NOT_ALLOWED;
-        }
-
-        /* abs(cryptoOffset-macOffset) must be aligned cryptoBlockSize */
-        if(pCmd->cryptoOffset > pCmd->macOffset)
-        {
-            offset = pCmd->cryptoOffset - pCmd->macOffset;
-        }
-        else
-        {
-            offset = pCmd->macOffset - pCmd->cryptoOffset;
-        }
-
-        if( MV_IS_NOT_ALIGN(offset,  pSA->cryptoBlockSize) )
-        {
-/*
-            mvOsPrintf("mvCesaFragParamCheck: (cryptoOffset - macOffset) must be %d byte aligned\n",
-                        pSA->cryptoBlockSize);
-*/
-            return MV_NOT_ALLOWED;
-        }
-        /* Digest must not be part of CryptoLength */
-        if( ((pCmd->digestOffset + pSA->digestSize) > pCmd->cryptoOffset) &&
-            (pCmd->digestOffset < (pCmd->cryptoOffset + pCmd->cryptoLength)) )
-        {
-/*
-            mvOsPrintf("mvCesaFragParamCheck: digestOffset (%d) is part of cryptoLength (%d+%d)\n",
-                        pCmd->digestOffset, pCmd->cryptoOffset, pCmd->cryptoLength);
-*/
-            return MV_NOT_ALLOWED;
-        }
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCesaFragSizeFind -
-*
-* DESCRIPTION:
-*
-*
-* INPUT:
-*       MV_CESA_SA* pSA, MV_CESA_COMMAND *pCmd,
-*       int cryptoOffset, int macOffset,
-*
-* OUTPUT:
-*       int* pCopySize, int* pCryptoDataSize, int* pMacDataSize
-*
-* RETURN:
-*       MV_STATUS
-*
-*******************************************************************************/
-static void   mvCesaFragSizeFind(MV_CESA_SA* pSA, MV_CESA_REQ* pReq,
-                                 int cryptoOffset, int macOffset,
-                          int* pCopySize, int* pCryptoDataSize, int* pMacDataSize)
-{
-    MV_CESA_COMMAND *pCmd = pReq->pCmd;
-    int             cryptoDataSize, macDataSize, copySize;
-
-    cryptoDataSize = macDataSize = 0;
-    copySize = *pCopySize;
-
-    if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-                (MV_CESA_MAC_ONLY << MV_CESA_OPERATION_OFFSET) )
-    {
-        cryptoDataSize = MV_MIN( (copySize - cryptoOffset),
-                                 (pCmd->cryptoLength - (pReq->frags.cryptoSize + 1)) );
-
-        /* cryptoSize for each fragment must be the whole number of blocksSize */
-        if( MV_IS_NOT_ALIGN(cryptoDataSize, pSA->cryptoBlockSize) )
-        {
-            cryptoDataSize = MV_ALIGN_DOWN(cryptoDataSize, pSA->cryptoBlockSize);
-            copySize = cryptoOffset + cryptoDataSize;
-        }
-    }
-    if( (pSA->config & MV_CESA_OPERATION_MASK) !=
-             (MV_CESA_CRYPTO_ONLY << MV_CESA_OPERATION_OFFSET) )
-    {
-        macDataSize = MV_MIN( (copySize - macOffset),
-                              (pCmd->macLength - (pReq->frags.macSize + 1)));
-
-        /* macSize for each fragment (except last) must be the whole number of blocksSize */
-        if( MV_IS_NOT_ALIGN(macDataSize, MV_CESA_AUTH_BLOCK_SIZE) )
-        {
-            macDataSize = MV_ALIGN_DOWN(macDataSize, MV_CESA_AUTH_BLOCK_SIZE);
-            copySize = macOffset + macDataSize;
-        }
-        cryptoDataSize = copySize - cryptoOffset;
-    }
-    *pCopySize = copySize;
-
-    if(pCryptoDataSize != NULL)
-        *pCryptoDataSize = cryptoDataSize;
-
-    if(pMacDataSize != NULL)
-        *pMacDataSize = macDataSize;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.h
deleted file mode 100644
index 115274ffee..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesa.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvCesa.h - Header File for Cryptographic Engines and Security Accelerator
-*
-* DESCRIPTION:
-*       This header file contains macros typedefs and function declaration for
-*       the Marvell Cryptographic Engines and Security Accelerator.
-*
-*******************************************************************************/
-
-#ifndef __mvCesa_h__
-#define __mvCesa_h__
-
-#include "mvOs.h"
-#include "mvCommon.h"
-#include "mvDebug.h"
-
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-#include "cesa/mvMD5.h"
-#include "cesa/mvSHA1.h"
-
-#include "cesa/mvCesa.h"
-#include "cesa/AES/mvAes.h"
-#include "mvSysHwConfig.h"
-
-#ifdef MV_INCLUDE_IDMA
-#include "idma/mvIdma.h"
-#include "idma/mvIdmaRegs.h"
-#else
-/* Redefine MV_DMA_DESC structure */
-typedef struct _mvDmaDesc
-{
-    MV_U32 	byteCnt;        /* The total number of bytes to transfer        */
-    MV_U32 	phySrcAdd;	    /* The physical source address                  */
-    MV_U32 	phyDestAdd;     /* The physical destination address             */
-    MV_U32	phyNextDescPtr; /* If we are using chain mode DMA transfer,     */
-				            /* then this pointer should point to the        */
-                            /* physical address of the next descriptor,     */
-                            /* otherwise it should be NULL.                 */
-}MV_DMA_DESC;
-#endif /* MV_INCLUDE_IDMA */
-
-#include "cesa/mvCesaRegs.h"
-
-#define MV_CESA_AUTH_BLOCK_SIZE         64 /* bytes */
-
-#define MV_CESA_MD5_DIGEST_SIZE         16 /* bytes */
-#define MV_CESA_SHA1_DIGEST_SIZE        20 /* bytes */
-
-#define MV_CESA_MAX_DIGEST_SIZE         MV_CESA_SHA1_DIGEST_SIZE
-
-#define MV_CESA_DES_KEY_LENGTH          8   /* bytes = 64 bits */
-#define MV_CESA_3DES_KEY_LENGTH         24  /* bytes = 192 bits */
-#define MV_CESA_AES_128_KEY_LENGTH      16  /* bytes = 128 bits */
-#define MV_CESA_AES_192_KEY_LENGTH      24  /* bytes = 192 bits */
-#define MV_CESA_AES_256_KEY_LENGTH      32  /* bytes = 256 bits */
-
-#define MV_CESA_MAX_CRYPTO_KEY_LENGTH   MV_CESA_AES_256_KEY_LENGTH
-
-#define MV_CESA_DES_BLOCK_SIZE          8 /* bytes = 64 bits */
-#define MV_CESA_3DES_BLOCK_SIZE         8 /* bytes = 64 bits */
-
-#define MV_CESA_AES_BLOCK_SIZE          16 /* bytes = 128 bits */
-
-#define MV_CESA_MAX_IV_LENGTH           MV_CESA_AES_BLOCK_SIZE
-
-#define MV_CESA_MAX_MAC_KEY_LENGTH      64 /* bytes */
-
-typedef struct
-{
-	MV_U8               cryptoKey[MV_CESA_MAX_CRYPTO_KEY_LENGTH];
-	MV_U8               macKey[MV_CESA_MAX_MAC_KEY_LENGTH];
-	MV_CESA_OPERATION   operation;
-	MV_CESA_DIRECTION   direction;
-	MV_CESA_CRYPTO_ALG  cryptoAlgorithm;
-	MV_CESA_CRYPTO_MODE cryptoMode;
-   	MV_U8               cryptoKeyLength;
-	MV_CESA_MAC_MODE    macMode;
-	MV_U8               macKeyLength;
-	MV_U8               digestSize;
-
-} MV_CESA_OPEN_SESSION;
-
-typedef struct
-{
-    MV_BUF_INFO *pFrags;
-	MV_U16	    numFrags;
-    MV_U16      mbufSize;
-
-} MV_CESA_MBUF;
-
-typedef struct
-{
-    void* 	pReqPrv; /* instead of reqId */
-    MV_U32 	retCode;
-    MV_16   sessionId;
-
-} MV_CESA_RESULT;
-
-typedef void    (*MV_CESA_CALLBACK) (MV_CESA_RESULT* pResult);
-
-
-typedef struct
-{
-    void*               pReqPrv;    /* instead of reqId */
-    MV_CESA_MBUF*       pSrc;
-    MV_CESA_MBUF*       pDst;
-    MV_CESA_CALLBACK*   pFuncCB;
-    MV_16               sessionId;
-    MV_U16              ivFromUser;
-    MV_U16              ivOffset;
-    MV_U16              cryptoOffset;
-    MV_U16              cryptoLength;
-    MV_U16              digestOffset;
-    MV_U16              macOffset;
-    MV_U16              macLength;
-    MV_BOOL		skipFlush;
-} MV_CESA_COMMAND;
-
-
-
-MV_STATUS   mvCesaHalInit (int numOfSession, int queueDepth, char* pSramBase, MV_U32 cryptEngBase, void *osHandle);
-MV_STATUS   mvCesaFinish (void);
-MV_STATUS   mvCesaSessionOpen(MV_CESA_OPEN_SESSION *pSession, short* pSid);
-MV_STATUS   mvCesaSessionClose(short sid);
-MV_STATUS   mvCesaCryptoIvSet(MV_U8* pIV, int ivSize);
-
-MV_STATUS   mvCesaAction (MV_CESA_COMMAND* pCmd);
-
-MV_U32      mvCesaInProcessGet(void);
-MV_STATUS   mvCesaReadyDispatch(void);
-MV_STATUS   mvCesaReadyGet(MV_CESA_RESULT* pResult);
-MV_BOOL     mvCesaIsReady(void);
-
-int     	mvCesaMbufOffset(MV_CESA_MBUF* pMbuf, int offset, int* pBufOffset);
-MV_STATUS   mvCesaCopyFromMbuf(MV_U8* pDst, MV_CESA_MBUF* pSrcMbuf,
-                               int offset, int size);
-MV_STATUS   mvCesaCopyToMbuf(MV_U8* pSrc, MV_CESA_MBUF* pDstMbuf,
-                               int offset, int size);
-MV_STATUS   mvCesaMbufCopy(MV_CESA_MBUF* pMbufDst, int dstMbufOffset,
-                           MV_CESA_MBUF* pMbufSrc, int srcMbufOffset, int size);
-
-/********** Debug functions ********/
-
-void        mvCesaDebugMbuf(const char* str, MV_CESA_MBUF *pMbuf, int offset, int size);
-void        mvCesaDebugSA(short sid, int mode);
-void        mvCesaDebugStats(void);
-void        mvCesaDebugStatsClear(void);
-void        mvCesaDebugRegs(void);
-void        mvCesaDebugStatus(void);
-void        mvCesaDebugQueue(int mode);
-void        mvCesaDebugSram(int mode);
-void        mvCesaDebugSAD(int mode);
-
-
-/********  CESA Private definitions ********/
-#if (MV_CESA_VERSION >= 2)
-#if (MV_CACHE_COHERENCY  == MV_CACHE_COHER_SW)
-#define MV_CESA_TDMA_CTRL_VALUE       MV_CESA_TDMA_DST_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
-                                    | MV_CESA_TDMA_SRC_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
-                                    | MV_CESA_TDMA_OUTSTAND_READ_EN_MASK                   \
-				    | MV_CESA_TDMA_NO_BYTE_SWAP_MASK			   \
-                                    | MV_CESA_TDMA_ENABLE_MASK
-#else
-#define MV_CESA_TDMA_CTRL_VALUE       MV_CESA_TDMA_DST_BURST_MASK(MV_CESA_TDMA_BURST_32B)  \
-                                    | MV_CESA_TDMA_SRC_BURST_MASK(MV_CESA_TDMA_BURST_128B) \
-                                    /*| MV_CESA_TDMA_OUTSTAND_READ_EN_MASK                   */\
-                                    | MV_CESA_TDMA_ENABLE_MASK
-
-#endif
-#else
-#define MV_CESA_IDMA_CTRL_LOW_VALUE   ICCLR_DST_BURST_LIM_128BYTE   \
-                                    | ICCLR_SRC_BURST_LIM_128BYTE   \
-                                    | ICCLR_INT_MODE_MASK           \
-                                    | ICCLR_BLOCK_MODE              \
-                                    | ICCLR_CHAN_ENABLE             \
-                                    | ICCLR_DESC_MODE_16M
-#endif /* MV_CESA_VERSION >= 2 */
-
-#define MV_CESA_MAX_PKT_SIZE        (64 * 1024)
-#define MV_CESA_MAX_MBUF_FRAGS      20
-
-#define MV_CESA_MAX_REQ_FRAGS       ( (MV_CESA_MAX_PKT_SIZE / MV_CESA_MAX_BUF_SIZE) + 1)
-
-#define MV_CESA_MAX_DMA_DESC    (MV_CESA_MAX_MBUF_FRAGS*2 + 5)
-
-#define MAX_CESA_CHAIN_LENGTH	20
-
-typedef enum
-{
-    MV_CESA_IDLE     = 0,
-    MV_CESA_PENDING,
-    MV_CESA_PROCESS,
-    MV_CESA_READY,
-#if (MV_CESA_VERSION >= 3)
-    MV_CESA_CHAIN,
-#endif
-} MV_CESA_STATE;
-
-
-/* Session database */
-
-/* Map of Key materials of the session in SRAM.
- * Each field must be 8 byte aligned
- * Total size: 32 + 24 + 24 = 80 bytes
- */
-typedef struct
-{
-    MV_U8  cryptoKey[MV_CESA_MAX_CRYPTO_KEY_LENGTH];
-    MV_U8  macInnerIV[MV_CESA_MAX_DIGEST_SIZE];
-    MV_U8  reservedInner[4];
-    MV_U8  macOuterIV[MV_CESA_MAX_DIGEST_SIZE];
-    MV_U8  reservedOuter[4];
-
-} MV_CESA_SRAM_SA;
-
-typedef struct
-{
-    MV_CESA_SRAM_SA*    pSramSA;
-    MV_U32              config;
-    MV_U8               cryptoKeyLength;
-    MV_U8               cryptoIvSize;
-    MV_U8               cryptoBlockSize;
-    MV_U8               digestSize;
-    MV_U8               macKeyLength;
-    MV_U8               valid;
-    MV_U8               ctrMode;
-    MV_U32              count;
-
-} MV_CESA_SA;
-
-/* DMA list management */
-typedef struct
-{
-    MV_DMA_DESC*    pDmaFirst;
-    MV_DMA_DESC*    pDmaLast;
-
-} MV_CESA_DMA;
-
-
-typedef struct
-{
-    MV_U8               numFrag;
-    MV_U8               nextFrag;
-    int                 bufOffset;
-    int                 cryptoSize;
-    int                 macSize;
-    int                 newDigestOffset;
-    MV_U8               orgDigest[MV_CESA_MAX_DIGEST_SIZE];
-
-} MV_CESA_FRAGS;
-
-/* Request queue */
-typedef struct
-{
-    MV_U8               state;
-    MV_U8               fragMode;
-    MV_U8               fixOffset;
-    MV_CESA_COMMAND*    pCmd;
-    MV_CESA_COMMAND*    pOrgCmd;
-    MV_BUF_INFO         dmaDescBuf;
-    MV_CESA_DMA         dma[MV_CESA_MAX_REQ_FRAGS];
-    MV_BUF_INFO         cesaDescBuf;
-    MV_CESA_DESC*       pCesaDesc;
-    MV_CESA_FRAGS       frags;
-
-
-} MV_CESA_REQ;
-
-
-/* SRAM map */
-/* Total SRAM size calculation */
-/*  SRAM size =
- *              MV_CESA_MAX_BUF_SIZE  +
- *              sizeof(MV_CESA_DESC)  +
- *              MV_CESA_MAX_IV_LENGTH +
- *              MV_CESA_MAX_IV_LENGTH +
- *              MV_CESA_MAX_DIGEST_SIZE +
- *              sizeof(MV_CESA_SRAM_SA)
- *            = 1600 + 32 + 16 + 16 + 24 + 80 + 280 (reserved) = 2048 bytes
- *            = 3200 + 32 + 16 + 16 + 24 + 80 + 728 (reserved) = 4096 bytes
- */
-typedef struct
-{
-    MV_U8               buf[MV_CESA_MAX_BUF_SIZE];
-    MV_CESA_DESC        desc;
-    MV_U8               cryptoIV[MV_CESA_MAX_IV_LENGTH];
-    MV_U8               tempCryptoIV[MV_CESA_MAX_IV_LENGTH];
-    MV_U8               tempDigest[MV_CESA_MAX_DIGEST_SIZE+4];
-    MV_CESA_SRAM_SA     sramSA;
-
-} MV_CESA_SRAM_MAP;
-
-
-typedef struct
-{
-    MV_U32  openedCount;
-    MV_U32  closedCount;
-    MV_U32  fragCount;
-    MV_U32  reqCount;
-    MV_U32  maxReqCount;
-    MV_U32  procCount;
-    MV_U32  readyCount;
-    MV_U32  notReadyCount;
-    MV_U32  startCount;
-#if (MV_CESA_VERSION >= 3)
-    MV_U32  maxChainUsage;
-#endif
-
-} MV_CESA_STATS;
-
-
-/* External variables */
-
-extern MV_CESA_STATS    cesaStats;
-extern MV_CESA_FRAGS    cesaFrags;
-
-extern MV_BUF_INFO      cesaSramSaBuf;
-
-extern MV_CESA_SA*       pCesaSAD;
-extern MV_U16            cesaMaxSA;
-
-extern MV_CESA_REQ*      pCesaReqFirst;
-extern MV_CESA_REQ*      pCesaReqLast;
-extern MV_CESA_REQ*      pCesaReqEmpty;
-extern MV_CESA_REQ*      pCesaReqProcess;
-extern int               cesaQueueDepth;
-extern int               cesaReqResources;
-#if (MV_CESA_VERSION>= 3)
-extern MV_U32		cesaChainLength;
-#endif
-
-extern MV_CESA_SRAM_MAP*  cesaSramVirtPtr;
-extern MV_U32           cesaSramPhysAddr;
-
-static INLINE MV_ULONG  mvCesaVirtToPhys(MV_BUF_INFO* pBufInfo, void* pVirt)
-{
-    return (pBufInfo->bufPhysAddr + ((MV_U8*)pVirt - pBufInfo->bufVirtPtr));
-}
-
-/* Additional DEBUG functions */
-void        mvCesaDebugSramSA(MV_CESA_SRAM_SA* pSramSA, int mode);
-void        mvCesaDebugCmd(MV_CESA_COMMAND* pCmd,  int mode);
-void        mvCesaDebugDescriptor(MV_CESA_DESC* pDesc);
-
-
-
-#endif /* __mvCesa_h__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c
deleted file mode 100644
index 31b78a8053..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaDebug.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mvDebug.h"
-
-#include "cesa/mvMD5.h"
-#include "cesa/mvSHA1.h"
-
-#include "cesa/mvCesa.h"
-#include "cesa/mvCesaRegs.h"
-#include "cesa/AES/mvAes.h"
-
-static const char*   mvCesaDebugStateStr(MV_CESA_STATE state)
-{
-    switch(state)
-    {
-        case MV_CESA_IDLE:
-            return "Idle";
-
-        case MV_CESA_PENDING:
-            return "Pend";
-
-        case MV_CESA_PROCESS:
-            return "Proc";
-
-        case MV_CESA_READY:
-            return "Ready";
-
-        default:
-            break;
-    }
-    return "Unknown";
-}
-
-static const char*   mvCesaDebugOperStr(MV_CESA_OPERATION oper)
-{
-    switch(oper)
-    {
-        case MV_CESA_MAC_ONLY:
-            return "MacOnly";
-
-        case MV_CESA_CRYPTO_ONLY:
-            return "CryptoOnly";
-
-        case MV_CESA_MAC_THEN_CRYPTO:
-            return "MacCrypto";
-
-        case MV_CESA_CRYPTO_THEN_MAC:
-            return "CryptoMac";
-
-        default:
-            break;
-    }
-    return "Null";
-}
-
-static const char* mvCesaDebugCryptoAlgStr(MV_CESA_CRYPTO_ALG cryptoAlg)
-{
-    switch(cryptoAlg)
-    {
-        case MV_CESA_CRYPTO_DES:
-            return "DES";
-
-        case MV_CESA_CRYPTO_3DES:
-            return "3DES";
-
-        case MV_CESA_CRYPTO_AES:
-            return "AES";
-
-        default:
-            break;
-    }
-    return "Null";
-}
-
-static const char* mvCesaDebugMacModeStr(MV_CESA_MAC_MODE macMode)
-{
-    switch(macMode)
-    {
-        case MV_CESA_MAC_MD5:
-            return "MD5";
-
-        case MV_CESA_MAC_SHA1:
-            return "SHA1";
-
-        case MV_CESA_MAC_HMAC_MD5:
-            return "HMAC-MD5";
-
-        case MV_CESA_MAC_HMAC_SHA1:
-            return "HMAC_SHA1";
-
-        default:
-            break;
-    }
-    return "Null";
-}
-
-void    mvCesaDebugCmd(MV_CESA_COMMAND* pCmd,  int mode)
-{
-    mvOsPrintf("pCmd=%p, pReqPrv=%p, pSrc=%p, pDst=%p, pCB=%p, sid=%d\n",
-                pCmd, pCmd->pReqPrv, pCmd->pSrc, pCmd->pDst,
-                pCmd->pFuncCB, pCmd->sessionId);
-    mvOsPrintf("isUser=%d, ivOffs=%d, crOffs=%d, crLen=%d, digest=%d, macOffs=%d, macLen=%d\n",
-                pCmd->ivFromUser, pCmd->ivOffset, pCmd->cryptoOffset, pCmd->cryptoLength,
-                pCmd->digestOffset, pCmd->macOffset, pCmd->macLength);
-}
-
-/* no need to use in tool */
-void     mvCesaDebugMbuf(const char* str, MV_CESA_MBUF *pMbuf, int offset, int size)
-{
-    int frag, len, fragOffset;
-
-    if(str != NULL)
-        mvOsPrintf("%s: pMbuf=%p, numFrags=%d, mbufSize=%d\n",
-                    str, pMbuf, pMbuf->numFrags, pMbuf->mbufSize);
-
-    frag = mvCesaMbufOffset(pMbuf, offset, &fragOffset);
-    if(frag == MV_INVALID)
-    {
-        mvOsPrintf("CESA Mbuf Error: offset (%d) out of range\n", offset);
-        return;
-    }
-
-    for(; frag<pMbuf->numFrags; frag++)
-    {
-        mvOsPrintf("#%2d. bufVirt=%p, bufSize=%d\n",
-                    frag, pMbuf->pFrags[frag].bufVirtPtr,
-                    pMbuf->pFrags[frag].bufSize);
-        if(size > 0)
-        {
-            len = MV_MIN(pMbuf->pFrags[frag].bufSize, size);
-            mvDebugMemDump(pMbuf->pFrags[frag].bufVirtPtr+fragOffset, len, 1);
-            size -= len;
-            fragOffset = 0;
-        }
-    }
-}
-
-void    mvCesaDebugRegs(void)
-{
-    mvOsPrintf("\t CESA Registers:\n");
-
-    mvOsPrintf("MV_CESA_CMD_REG                     : 0x%X = 0x%08x\n",
-                MV_CESA_CMD_REG,
-                MV_REG_READ( MV_CESA_CMD_REG ) );
-
-    mvOsPrintf("MV_CESA_CHAN_DESC_OFFSET_REG        : 0x%X = 0x%08x\n",
-                MV_CESA_CHAN_DESC_OFFSET_REG,
-                MV_REG_READ(MV_CESA_CHAN_DESC_OFFSET_REG) );
-
-    mvOsPrintf("MV_CESA_CFG_REG                     : 0x%X = 0x%08x\n",
-                MV_CESA_CFG_REG,
-                MV_REG_READ( MV_CESA_CFG_REG ) );
-
-    mvOsPrintf("MV_CESA_STATUS_REG                  : 0x%X = 0x%08x\n",
-                MV_CESA_STATUS_REG,
-                MV_REG_READ( MV_CESA_STATUS_REG ) );
-
-    mvOsPrintf("MV_CESA_ISR_CAUSE_REG               : 0x%X = 0x%08x\n",
-                MV_CESA_ISR_CAUSE_REG,
-                MV_REG_READ( MV_CESA_ISR_CAUSE_REG ) );
-
-    mvOsPrintf("MV_CESA_ISR_MASK_REG                : 0x%X = 0x%08x\n",
-                MV_CESA_ISR_MASK_REG,
-                MV_REG_READ( MV_CESA_ISR_MASK_REG ) );
-#if (MV_CESA_VERSION >= 2)
-    mvOsPrintf("MV_CESA_TDMA_CTRL_REG               : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_CTRL_REG, 
-                MV_REG_READ( MV_CESA_TDMA_CTRL_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_BYTE_COUNT_REG         : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_BYTE_COUNT_REG, 
-                MV_REG_READ( MV_CESA_TDMA_BYTE_COUNT_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_SRC_ADDR_REG           : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_SRC_ADDR_REG, 
-                MV_REG_READ( MV_CESA_TDMA_SRC_ADDR_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_DST_ADDR_REG           : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_DST_ADDR_REG, 
-                MV_REG_READ( MV_CESA_TDMA_DST_ADDR_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_NEXT_DESC_PTR_REG      : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_NEXT_DESC_PTR_REG, 
-                MV_REG_READ( MV_CESA_TDMA_NEXT_DESC_PTR_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_CURR_DESC_PTR_REG      : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_CURR_DESC_PTR_REG, 
-                MV_REG_READ( MV_CESA_TDMA_CURR_DESC_PTR_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_ERROR_CAUSE_REG        : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_ERROR_CAUSE_REG, 
-                MV_REG_READ( MV_CESA_TDMA_ERROR_CAUSE_REG ) );
-
-    mvOsPrintf("MV_CESA_TDMA_ERROR_MASK_REG         : 0x%X = 0x%08x\n", 
-                MV_CESA_TDMA_ERROR_MASK_REG, 
-                MV_REG_READ( MV_CESA_TDMA_ERROR_CAUSE_REG ) );
-
-#endif
-}
-
-void    mvCesaDebugStatus(void)
-{
-    mvOsPrintf("\n\t CESA Status\n\n");
-
-    mvOsPrintf("pReqQ=%p, qDepth=%d, reqSize=%ld bytes, qRes=%d, ",
-                pCesaReqFirst, cesaQueueDepth, sizeof(MV_CESA_REQ),
-                cesaReqResources);
-#if (MV_CESA_VERSION >= 3)
-    mvOsPrintf("chainLength=%u\n",cesaChainLength);
-#else
-   mvOsPrintf("\n"); 	
-#endif
-
-    mvOsPrintf("pSAD=%p, maxSA=%d, sizeSA=%ld bytes\n",
-                pCesaSAD, cesaMaxSA, sizeof(MV_CESA_SA));
-
-    mvOsPrintf("\n");
-
-    mvCesaDebugRegs();
-    mvCesaDebugStats();
-    mvCesaDebugStatsClear();
-}
-
-void    mvCesaDebugDescriptor(MV_CESA_DESC* pDesc)
-{
-    mvOsPrintf("config=0x%08x, crSrcOffs=0x%04x, crDstOffs=0x%04x\n",
-            pDesc->config, pDesc->cryptoSrcOffset, pDesc->cryptoDstOffset);
-
-    mvOsPrintf("crLen=0x%04x, crKeyOffs=0x%04x, ivOffs=0x%04x, ivBufOffs=0x%04x\n",
-            pDesc->cryptoDataLen, pDesc->cryptoKeyOffset,
-            pDesc->cryptoIvOffset, pDesc->cryptoIvBufOffset);
-
-    mvOsPrintf("macSrc=0x%04x, digest=0x%04x, macLen=0x%04x, inIv=0x%04x, outIv=0x%04x\n",
-            pDesc->macSrcOffset, pDesc->macDigestOffset, pDesc->macDataLen,
-            pDesc->macInnerIvOffset, pDesc->macOuterIvOffset);
-}
-
-void    mvCesaDebugQueue(int mode)
-{
-    mvOsPrintf("\n\t CESA Request Queue:\n\n");
-
-    mvOsPrintf("pFirstReq=%p, pLastReq=%p, qDepth=%d, reqSize=%ld bytes\n",
-                pCesaReqFirst, pCesaReqLast, cesaQueueDepth, sizeof(MV_CESA_REQ));
-
-    mvOsPrintf("pEmpty=%p, pProcess=%p, qResources=%d\n",
-                pCesaReqEmpty, pCesaReqProcess,
-                cesaReqResources);
-
-    if(mode != 0)
-    {
-        int             count = 0;
-        MV_CESA_REQ*    pReq = pCesaReqFirst;
-
-        for(count=0; count<cesaQueueDepth; count++)
-        {
-            /* Print out requsts */
-            mvOsPrintf("%02d. pReq=%p, state=%s, frag=0x%x, pCmd=%p, pDma=%p, pDesc=%p\n",
-                count, pReq, mvCesaDebugStateStr(pReq->state),
-                pReq->fragMode, pReq->pCmd, pReq->dma[0].pDmaFirst, &pReq->pCesaDesc[0]);
-            if(pReq->fragMode != MV_CESA_FRAG_NONE)
-            {
-                int frag;
-
-                mvOsPrintf("pFrags=%p, num=%d, next=%d, bufOffset=%d, cryptoSize=%d, macSize=%d\n",
-                            &pReq->frags, pReq->frags.numFrag, pReq->frags.nextFrag,
-                            pReq->frags.bufOffset, pReq->frags.cryptoSize, pReq->frags.macSize);
-                for(frag=0; frag<pReq->frags.numFrag; frag++)
-                {
-                    mvOsPrintf("#%d: pDmaFirst=%p, pDesc=%p\n", frag,
-                                pReq->dma[frag].pDmaFirst, &pReq->pCesaDesc[frag]);
-                }
-            }
-            if(mode > 1)
-            {
-                /* Print out Command */
-                mvCesaDebugCmd(pReq->pCmd, mode);
-
-                /* Print out Descriptor */
-                mvCesaDebugDescriptor(&pReq->pCesaDesc[0]);
-            }
-            pReq++;
-        }
-    }
-}
-
-
-void    mvCesaDebugSramSA(MV_CESA_SRAM_SA* pSramSA, int mode)
-{
-    if(pSramSA == NULL)
-    {
-        mvOsPrintf("cesaSramSA: Unexpected pSramSA=%p\n", pSramSA);
-        return;
-    }
-    mvOsPrintf("pSramSA=%p, sizeSramSA=%ld bytes\n",
-                pSramSA, sizeof(MV_CESA_SRAM_SA));
-
-    if(mode != 0)
-    {
-        mvOsPrintf("cryptoKey=%p, maxCryptoKey=%d bytes\n",
-                    pSramSA->cryptoKey, MV_CESA_MAX_CRYPTO_KEY_LENGTH);
-        mvDebugMemDump(pSramSA->cryptoKey, MV_CESA_MAX_CRYPTO_KEY_LENGTH, 1);
-
-        mvOsPrintf("macInnerIV=%p, maxInnerIV=%d bytes\n",
-                    pSramSA->macInnerIV, MV_CESA_MAX_DIGEST_SIZE);
-        mvDebugMemDump(pSramSA->macInnerIV, MV_CESA_MAX_DIGEST_SIZE, 1);
-
-        mvOsPrintf("macOuterIV=%p, maxOuterIV=%d bytes\n",
-                    pSramSA->macOuterIV, MV_CESA_MAX_DIGEST_SIZE);
-        mvDebugMemDump(pSramSA->macOuterIV, MV_CESA_MAX_DIGEST_SIZE, 1);
-    }
-}
-
-void    mvCesaDebugSA(short sid, int mode)
-{
-    MV_CESA_OPERATION   oper;
-    MV_CESA_DIRECTION   dir;
-    MV_CESA_CRYPTO_ALG  cryptoAlg;
-    MV_CESA_CRYPTO_MODE cryptoMode;
-    MV_CESA_MAC_MODE    macMode;
-    MV_CESA_SA*         pSA = &pCesaSAD[sid];
-
-    if( (pSA->valid) || ((pSA->count != 0) && (mode > 0)) || (mode >= 2) )
-    {
-        mvOsPrintf("\n\nCESA SA Entry #%d (%p) - %s (count=%d)\n",
-                    sid, pSA,
-                    pSA->valid ? "Valid" : "Invalid", pSA->count);
-
-        oper = (pSA->config & MV_CESA_OPERATION_MASK) >> MV_CESA_OPERATION_OFFSET;
-        dir  = (pSA->config & MV_CESA_DIRECTION_MASK) >> MV_CESA_DIRECTION_BIT;
-        mvOsPrintf("%s - %s ", mvCesaDebugOperStr(oper),
-                    (dir == MV_CESA_DIR_ENCODE) ? "Encode" : "Decode");
-        if(oper != MV_CESA_MAC_ONLY)
-        {
-            cryptoAlg = (pSA->config & MV_CESA_CRYPTO_ALG_MASK) >> MV_CESA_CRYPTO_ALG_OFFSET;
-            cryptoMode = (pSA->config & MV_CESA_CRYPTO_MODE_MASK) >> MV_CESA_CRYPTO_MODE_BIT;
-            mvOsPrintf("- %s - %s ", mvCesaDebugCryptoAlgStr(cryptoAlg),
-                        (cryptoMode == MV_CESA_CRYPTO_ECB) ? "ECB" : "CBC");
-        }
-        if(oper != MV_CESA_CRYPTO_ONLY)
-        {
-            macMode = (pSA->config & MV_CESA_MAC_MODE_MASK) >> MV_CESA_MAC_MODE_OFFSET;
-            mvOsPrintf("- %s ", mvCesaDebugMacModeStr(macMode));
-        }
-        mvOsPrintf("\n");
-
-        if(mode > 0)
-        {
-            mvOsPrintf("config=0x%08x, cryptoKeySize=%d, digestSize=%d\n",
-                        pCesaSAD[sid].config, pCesaSAD[sid].cryptoKeyLength,
-                        pCesaSAD[sid].digestSize);
-
-            mvCesaDebugSramSA(pCesaSAD[sid].pSramSA, mode);
-        }
-    }
-}
-
-
-/**/
-void    mvCesaDebugSram(int mode)
-{
-    mvOsPrintf("\n\t SRAM contents: size=%ld, pVirt=%p\n\n",
-            sizeof(MV_CESA_SRAM_MAP), cesaSramVirtPtr);
-
-    mvOsPrintf("\n\t Sram buffer: size=%d, pVirt=%p\n",
-                    MV_CESA_MAX_BUF_SIZE, cesaSramVirtPtr->buf);
-        if(mode != 0)
-            mvDebugMemDump(cesaSramVirtPtr->buf, 64, 1);
-
-    mvOsPrintf("\n");
-    mvOsPrintf("\n\t Sram descriptor: size=%ld, pVirt=%p\n",
-                    sizeof(MV_CESA_DESC), &cesaSramVirtPtr->desc);
-    if(mode != 0)
-    {
-        mvOsPrintf("\n");
-        mvCesaDebugDescriptor(&cesaSramVirtPtr->desc);
-    }
-    mvOsPrintf("\n\t Sram IV: size=%d, pVirt=%p\n",
-                    MV_CESA_MAX_IV_LENGTH, &cesaSramVirtPtr->cryptoIV);
-    if(mode != 0)
-    {
-        mvOsPrintf("\n");
-        mvDebugMemDump(cesaSramVirtPtr->cryptoIV, MV_CESA_MAX_IV_LENGTH, 1);
-    }
-    mvOsPrintf("\n");
-    mvCesaDebugSramSA(&cesaSramVirtPtr->sramSA, 0);
-}
-
-void    mvCesaDebugSAD(int mode)
-{
-    int sid;
-
-    mvOsPrintf("\n\t Cesa SAD status: pSAD=%p, maxSA=%d\n",
-                pCesaSAD, cesaMaxSA);
-
-    for(sid=0; sid<cesaMaxSA; sid++)
-    {
-        mvCesaDebugSA(sid, mode);
-    }
-}
-
-void    mvCesaDebugStats(void)
-{
-    mvOsPrintf("\n\t Cesa Statistics\n");
-
-    mvOsPrintf("Opened=%u, Closed=%u\n",
-                cesaStats.openedCount, cesaStats.closedCount);
-    mvOsPrintf("Req=%u, maxReq=%u, frags=%u, start=%u\n",
-                cesaStats.reqCount, cesaStats.maxReqCount,
-                cesaStats.fragCount, cesaStats.startCount);
-#if (MV_CESA_VERSION >= 3)
-    mvOsPrintf("maxChainUsage=%u\n",cesaStats.maxChainUsage);
-#endif
-    mvOsPrintf("\n");
-    mvOsPrintf("proc=%u, ready=%u, notReady=%u\n",
-                cesaStats.procCount, cesaStats.readyCount, cesaStats.notReadyCount);
-}
-
-void    mvCesaDebugStatsClear(void)
-{
-    memset(&cesaStats, 0, sizeof(cesaStats));
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h
deleted file mode 100644
index b12e44b14b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaRegs.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __mvCesaRegs_h__
-#define __mvCesaRegs_h__
-
-#include "mvTypes.h"
-
-typedef struct
-{
-    /* word 0 */
-    MV_U32  config;
-    /* word 1 */    
-    MV_U16  cryptoSrcOffset;
-    MV_U16  cryptoDstOffset;
-    /* word 2 */    
-    MV_U16  cryptoDataLen;
-    MV_U16  reserved1;
-    /* word 3 */
-    MV_U16  cryptoKeyOffset;
-    MV_U16  reserved2;
-    /* word 4 */
-    MV_U16  cryptoIvOffset;
-    MV_U16  cryptoIvBufOffset;
-    /* word 5 */
-    MV_U16  macSrcOffset;
-    MV_U16  macTotalLen;
-    /* word 6 */
-    MV_U16  macDigestOffset;
-    MV_U16  macDataLen;
-    /* word 7 */
-    MV_U16  macInnerIvOffset;
-    MV_U16  macOuterIvOffset;
-
-} MV_CESA_DESC;
-
-/* operation */
-typedef enum 
-{
-    MV_CESA_MAC_ONLY         = 0,
-    MV_CESA_CRYPTO_ONLY      = 1,
-    MV_CESA_MAC_THEN_CRYPTO  = 2,
-    MV_CESA_CRYPTO_THEN_MAC  = 3,
-    
-    MV_CESA_MAX_OPERATION
-
-} MV_CESA_OPERATION;
-
-#define MV_CESA_OPERATION_OFFSET        0
-#define MV_CESA_OPERATION_MASK          (0x3 << MV_CESA_OPERATION_OFFSET)
-
-/* mac algorithm */
-typedef enum 
-{   
-    MV_CESA_MAC_NULL        = 0,
-    MV_CESA_MAC_MD5         = 4,
-    MV_CESA_MAC_SHA1        = 5,
-    MV_CESA_MAC_HMAC_MD5    = 6,
-    MV_CESA_MAC_HMAC_SHA1   = 7,
-
-} MV_CESA_MAC_MODE;
-
-#define MV_CESA_MAC_MODE_OFFSET         4
-#define MV_CESA_MAC_MODE_MASK           (0x7 << MV_CESA_MAC_MODE_OFFSET)
-
-typedef enum
-{
-    MV_CESA_MAC_DIGEST_FULL = 0,
-    MV_CESA_MAC_DIGEST_96B  = 1,
-
-} MV_CESA_MAC_DIGEST_SIZE;
-
-#define MV_CESA_MAC_DIGEST_SIZE_BIT     7
-#define MV_CESA_MAC_DIGEST_SIZE_MASK    (1 << MV_CESA_MAC_DIGEST_SIZE_BIT)
-
-
-typedef enum 
-{
-    MV_CESA_CRYPTO_NULL = 0,
-    MV_CESA_CRYPTO_DES  = 1,
-    MV_CESA_CRYPTO_3DES = 2,
-    MV_CESA_CRYPTO_AES  = 3,
-
-} MV_CESA_CRYPTO_ALG;
-
-#define MV_CESA_CRYPTO_ALG_OFFSET       8
-#define MV_CESA_CRYPTO_ALG_MASK         (0x3 << MV_CESA_CRYPTO_ALG_OFFSET)
-
-
-/* direction */
-typedef enum 
-{
-    MV_CESA_DIR_ENCODE = 0,
-    MV_CESA_DIR_DECODE = 1,
-
-} MV_CESA_DIRECTION;
-
-#define MV_CESA_DIRECTION_BIT           12
-#define MV_CESA_DIRECTION_MASK          (1 << MV_CESA_DIRECTION_BIT)
-
-/* crypto IV mode */
-typedef enum 
-{
-    MV_CESA_CRYPTO_ECB = 0,
-    MV_CESA_CRYPTO_CBC = 1,
-
-    /* NO HW Support */
-    MV_CESA_CRYPTO_CTR = 10,
-
-} MV_CESA_CRYPTO_MODE;
-
-#define MV_CESA_CRYPTO_MODE_BIT         16
-#define MV_CESA_CRYPTO_MODE_MASK        (1 << MV_CESA_CRYPTO_MODE_BIT)         
-
-/* 3DES mode */
-typedef enum 
-{
-    MV_CESA_CRYPTO_3DES_EEE = 0,
-    MV_CESA_CRYPTO_3DES_EDE = 1,
-
-} MV_CESA_CRYPTO_3DES_MODE;
-
-#define MV_CESA_CRYPTO_3DES_MODE_BIT    20
-#define MV_CESA_CRYPTO_3DES_MODE_MASK   (1 << MV_CESA_CRYPTO_3DES_MODE_BIT)
-
-
-/* AES Key Length */
-typedef enum 
-{
-    MV_CESA_CRYPTO_AES_KEY_128 = 0,
-    MV_CESA_CRYPTO_AES_KEY_192 = 1,
-    MV_CESA_CRYPTO_AES_KEY_256 = 2,
-
-} MV_CESA_CRYPTO_AES_KEY_LEN;
-
-#define MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET   24
-#define MV_CESA_CRYPTO_AES_KEY_LEN_MASK     (0x3 << MV_CESA_CRYPTO_AES_KEY_LEN_OFFSET)
-
-/* Fragmentation mode */
-typedef enum 
-{
-    MV_CESA_FRAG_NONE   = 0,
-    MV_CESA_FRAG_FIRST  = 1,
-    MV_CESA_FRAG_LAST   = 2,
-    MV_CESA_FRAG_MIDDLE = 3,
-
-} MV_CESA_FRAG_MODE;
-
-#define MV_CESA_FRAG_MODE_OFFSET            30
-#define MV_CESA_FRAG_MODE_MASK              (0x3 << MV_CESA_FRAG_MODE_OFFSET)
-/*---------------------------------------------------------------------------*/
-
-/********** Security Accelerator Command Register **************/
-#define MV_CESA_CMD_REG                     (MV_CESA_REG_BASE + 0xE00)
-
-#define MV_CESA_CMD_CHAN_ENABLE_BIT         0  
-#define MV_CESA_CMD_CHAN_ENABLE_MASK        (1 << MV_CESA_CMD_CHAN_ENABLE_BIT)
-
-#define MV_CESA_CMD_CHAN_DISABLE_BIT        2  
-#define MV_CESA_CMD_CHAN_DISABLE_MASK       (1 << MV_CESA_CMD_CHAN_DISABLE_BIT)  
-
-/********** Security Accelerator Descriptor Pointers Register **********/
-#define MV_CESA_CHAN_DESC_OFFSET_REG        (MV_CESA_REG_BASE + 0xE04)
-
-/********** Security Accelerator Configuration Register **********/
-#define MV_CESA_CFG_REG                     (MV_CESA_REG_BASE + 0xE08)
-
-#define MV_CESA_CFG_STOP_DIGEST_ERR_BIT     0
-#define MV_CESA_CFG_STOP_DIGEST_ERR_MASK    (1 << MV_CESA_CFG_STOP_DIGEST_ERR_BIT)
-
-#define MV_CESA_CFG_WAIT_DMA_BIT            7
-#define MV_CESA_CFG_WAIT_DMA_MASK           (1 << MV_CESA_CFG_WAIT_DMA_BIT)
-          
-#define MV_CESA_CFG_ACT_DMA_BIT             9
-#define MV_CESA_CFG_ACT_DMA_MASK            (1 << MV_CESA_CFG_ACT_DMA_BIT)
-
-#define MV_CESA_CFG_CHAIN_MODE_BIT          11
-#define MV_CESA_CFG_CHAIN_MODE_MASK         (1 << MV_CESA_CFG_CHAIN_MODE_BIT)
-
-/********** Security Accelerator Status Register ***********/
-#define MV_CESA_STATUS_REG                  (MV_CESA_REG_BASE + 0xE0C)
-
-#define MV_CESA_STATUS_ACTIVE_BIT           0
-#define MV_CESA_STATUS_ACTIVE_MASK          (1 << MV_CESA_STATUS_ACTIVE_BIT)
-
-#define MV_CESA_STATUS_DIGEST_ERR_BIT       8
-#define MV_CESA_STATUS_DIGEST_ERR_MASK      (1 << MV_CESA_STATUS_DIGEST_ERR_BIT)
-
-
-/* Cryptographic Engines and Security Accelerator Interrupt Cause Register */
-#define MV_CESA_ISR_CAUSE_REG               (MV_CESA_REG_BASE + 0xE20)
-
-/* Cryptographic Engines and Security Accelerator Interrupt Mask Register */
-#define MV_CESA_ISR_MASK_REG                (MV_CESA_REG_BASE + 0xE24)
-
-#define MV_CESA_CAUSE_AUTH_MASK             (1 << 0)
-#define MV_CESA_CAUSE_DES_MASK              (1 << 1)
-#define MV_CESA_CAUSE_AES_ENCR_MASK         (1 << 2)
-#define MV_CESA_CAUSE_AES_DECR_MASK         (1 << 3)
-#define MV_CESA_CAUSE_DES_ALL_MASK          (1 << 4)
-
-#define MV_CESA_CAUSE_ACC_BIT               5
-#define MV_CESA_CAUSE_ACC_MASK              (1 << MV_CESA_CAUSE_ACC_BIT)
-
-#define MV_CESA_CAUSE_ACC_DMA_BIT           7
-#define MV_CESA_CAUSE_ACC_DMA_MASK          (1 << MV_CESA_CAUSE_ACC_DMA_BIT)
-#define MV_CESA_CAUSE_ACC_DMA_ALL_MASK      (3 << MV_CESA_CAUSE_ACC_DMA_BIT)
-
-#define MV_CESA_CAUSE_DMA_COMPL_BIT         9
-#define MV_CESA_CAUSE_DMA_COMPL_MASK        (1 << MV_CESA_CAUSE_DMA_COMPL_BIT)
-
-#define MV_CESA_CAUSE_DMA_OWN_ERR_BIT       10
-#define MV_CESA_CAUSE_DMA_OWN_ERR_MASK      (1 < MV_CESA_CAUSE_DMA_OWN_ERR_BIT)
-
-#define MV_CESA_CAUSE_DMA_CHAIN_PKT_BIT     11
-#define MV_CESA_CAUSE_DMA_CHAIN_PKT_MASK    (1 < MV_CESA_CAUSE_DMA_CHAIN_PKT_BIT)
-
-
-#define MV_CESA_AUTH_DATA_IN_REG            (MV_CESA_REG_BASE + 0xd38)
-#define MV_CESA_AUTH_BIT_COUNT_LOW_REG      (MV_CESA_REG_BASE + 0xd20)
-#define MV_CESA_AUTH_BIT_COUNT_HIGH_REG     (MV_CESA_REG_BASE + 0xd24)
-
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_REG(i) (MV_CESA_REG_BASE + 0xd00 + (i<<2))
-
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_A_REG  (MV_CESA_REG_BASE + 0xd00)
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_B_REG  (MV_CESA_REG_BASE + 0xd04)
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_C_REG  (MV_CESA_REG_BASE + 0xd08)
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_D_REG  (MV_CESA_REG_BASE + 0xd0c)
-#define MV_CESA_AUTH_INIT_VAL_DIGEST_E_REG  (MV_CESA_REG_BASE + 0xd10)
-#define MV_CESA_AUTH_COMMAND_REG            (MV_CESA_REG_BASE + 0xd18)
-
-#define MV_CESA_AUTH_ALGORITHM_BIT          0
-#define MV_CESA_AUTH_ALGORITHM_MD5          (0<<AUTH_ALGORITHM_BIT)
-#define MV_CESA_AUTH_ALGORITHM_SHA1         (1<<AUTH_ALGORITHM_BIT)
-
-#define MV_CESA_AUTH_IV_MODE_BIT            1
-#define MV_CESA_AUTH_IV_MODE_INIT           (0<<AUTH_IV_MODE_BIT)
-#define MV_CESA_AUTH_IV_MODE_CONTINUE       (1<<AUTH_IV_MODE_BIT)
-
-#define MV_CESA_AUTH_DATA_BYTE_SWAP_BIT     2
-#define MV_CESA_AUTH_DATA_BYTE_SWAP_MASK    (1<<AUTH_DATA_BYTE_SWAP_BIT)
-
-
-#define MV_CESA_AUTH_IV_BYTE_SWAP_BIT       4
-#define MV_CESA_AUTH_IV_BYTE_SWAP_MASK      (1<<AUTH_IV_BYTE_SWAP_BIT)
-
-#define MV_CESA_AUTH_TERMINATION_BIT        31
-#define MV_CESA_AUTH_TERMINATION_MASK       (1<<AUTH_TERMINATION_BIT)
-
-
-/*************** TDMA Control Register ************************************************/
-#define MV_CESA_TDMA_CTRL_REG               (MV_CESA_TDMA_REG_BASE + 0x840)
-
-#define MV_CESA_TDMA_BURST_32B              3   
-#define MV_CESA_TDMA_BURST_128B             4   
-
-#define MV_CESA_TDMA_DST_BURST_OFFSET       0
-#define MV_CESA_TDMA_DST_BURST_ALL_MASK     (0x7<<MV_CESA_TDMA_DST_BURST_OFFSET)
-#define MV_CESA_TDMA_DST_BURST_MASK(burst)  ((burst)<<MV_CESA_TDMA_DST_BURST_OFFSET)
-
-#define MV_CESA_TDMA_OUTSTAND_READ_EN_BIT   4
-#define MV_CESA_TDMA_OUTSTAND_READ_EN_MASK  (1<<MV_CESA_TDMA_OUTSTAND_READ_EN_BIT)
-
-#define MV_CESA_TDMA_SRC_BURST_OFFSET       6
-#define MV_CESA_TDMA_SRC_BURST_ALL_MASK     (0x7<<MV_CESA_TDMA_SRC_BURST_OFFSET)
-#define MV_CESA_TDMA_SRC_BURST_MASK(burst)  ((burst)<<MV_CESA_TDMA_SRC_BURST_OFFSET)
-
-#define MV_CESA_TDMA_CHAIN_MODE_BIT         9
-#define MV_CESA_TDMA_NON_CHAIN_MODE_MASK    (1<<MV_CESA_TDMA_CHAIN_MODE_BIT)
-
-#define MV_CESA_TDMA_BYTE_SWAP_BIT	    11
-#define MV_CESA_TDMA_BYTE_SWAP_MASK	    (0 << MV_CESA_TDMA_BYTE_SWAP_BIT)
-#define MV_CESA_TDMA_NO_BYTE_SWAP_MASK	    (1 << MV_CESA_TDMA_BYTE_SWAP_BIT)		    	
-
-#define MV_CESA_TDMA_ENABLE_BIT		    12
-#define MV_CESA_TDMA_ENABLE_MASK            (1<<MV_CESA_TDMA_ENABLE_BIT)
-			    
-#define MV_CESA_TDMA_FETCH_NEXT_DESC_BIT    13	
-#define MV_CESA_TDMA_FETCH_NEXT_DESC_MASK   (1<<MV_CESA_TDMA_FETCH_NEXT_DESC_BIT)	
-
-#define MV_CESA_TDMA_CHAN_ACTIVE_BIT	    14    
-#define MV_CESA_TDMA_CHAN_ACTIVE_MASK       (1<<MV_CESA_TDMA_CHAN_ACTIVE_BIT)
-/*------------------------------------------------------------------------------------*/
-
-#define MV_CESA_TDMA_BYTE_COUNT_REG         (MV_CESA_TDMA_REG_BASE + 0x800)
-#define MV_CESA_TDMA_SRC_ADDR_REG           (MV_CESA_TDMA_REG_BASE + 0x810)
-#define MV_CESA_TDMA_DST_ADDR_REG           (MV_CESA_TDMA_REG_BASE + 0x820)
-#define MV_CESA_TDMA_NEXT_DESC_PTR_REG      (MV_CESA_TDMA_REG_BASE + 0x830)
-#define MV_CESA_TDMA_CURR_DESC_PTR_REG      (MV_CESA_TDMA_REG_BASE + 0x870)
-
-#define MV_CESA_TDMA_ERROR_CAUSE_REG        (MV_CESA_TDMA_REG_BASE + 0x8C0)
-#define MV_CESA_TDMA_ERROR_MASK_REG         (MV_CESA_TDMA_REG_BASE + 0x8C4)
-
-
-#endif /* __mvCesaRegs_h__ */ 
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c
deleted file mode 100644
index a74828c2f4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvCesaTest.c
+++ /dev/null
@@ -1,3096 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-
-#if defined(MV_VXWORKS)
-
-#include "sysLib.h"
-#include "logLib.h"
-#include "tickLib.h"
-#include "intLib.h"
-#include "config.h"
-
-
-SEM_ID      cesaSemId = NULL;
-SEM_ID      cesaWaitSemId = NULL;
-
-#define CESA_TEST_LOCK(flags)       flags = intLock()
-#define CESA_TEST_UNLOCK(flags)     intUnlock(flags)
-
-#define CESA_TEST_WAIT_INIT()       cesaWaitSemId = semBCreate(SEM_Q_PRIORITY, SEM_EMPTY)
-#define CESA_TEST_WAKE_UP()         semGive(cesaWaitSemId)
-#define CESA_TEST_WAIT(cond, ms)    semTake(cesaWaitSemId, (sysClkRateGet()*ms)/1000)
-
-#define CESA_TEST_TICK_GET()        tickGet()
-#define CESA_TEST_TICK_TO_MS(tick)  (((tick)*1000)/sysClkRateGet())
-
-#elif defined(MV_LINUX)
-
-#include <linux/wait.h>
-wait_queue_head_t   cesaTest_waitq;
-spinlock_t          cesaLock;
-
-#define CESA_TEST_LOCK(flags)       spin_lock_irqsave( &cesaLock, flags)
-#define CESA_TEST_UNLOCK(flags)     spin_unlock_irqrestore( &cesaLock, flags);
-
-#define CESA_TEST_WAIT_INIT()       init_waitqueue_head(&cesaTest_waitq)
-#define CESA_TEST_WAKE_UP()         wake_up(&cesaTest_waitq)
-#define CESA_TEST_WAIT(cond, ms)    wait_event_timeout(cesaTest_waitq, (cond), msecs_to_jiffies(ms))
-
-#define CESA_TEST_TICK_GET()        jiffies
-#define CESA_TEST_TICK_TO_MS(tick)  jiffies_to_msecs(tick)
-
-#elif defined(MV_NETBSD)
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-static int	cesaLock;
-
-#define	CESA_TEST_LOCK(flags)		flags = splnet()
-#define	CESA_TEST_UNLOCK(flags)		splx(flags)
-
-#define	CESA_TEST_WAIT_INIT()		/* nothing */
-#define	CESA_TEST_WAKE_UP()		wakeup(&cesaLock)
-#define	CESA_TEST_WAIT(cond, ms)	\
-do {					\
-	while (!(cond))			\
-		tsleep(&cesaLock, PWAIT, "cesatest",mstohz(ms)); \
-} while (/*CONSTCOND*/0)
-
-#define	CESA_TEST_TICK_GET()		hardclock_ticks
-#define	CESA_TEST_TICK_TO_MS(tick)	((1000/hz)*(tick))
-
-#define	request_irq(i,h,t,n,a)	\
-	!mv_intr_establish((i),IPL_NET,(int(*)(void *))(h),(a))
-
-#else
-#error "Only Linux, VxWorks, or NetBSD OS are supported"
-#endif
-
-#include "mvDebug.h"
-
-#include "mvSysHwConfig.h"
-#include "boardEnv/mvBoardEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "cntmr/mvCntmr.h"
-#include "cesa/mvCesa.h"
-#include "cesa/mvCesaRegs.h"
-#include "cesa/mvMD5.h"
-#include "cesa/mvSHA1.h"
-
-#if defined(CONFIG_MV646xx)
-#include "marvell_pic.h"
-#endif
-
-#define MV_CESA_USE_TIMER_ID    0
-#define CESA_DEF_BUF_SIZE       1500
-#define CESA_DEF_BUF_NUM        1
-#define CESA_DEF_SESSION_NUM    32
-
-#define CESA_DEF_ITER_NUM       100
-
-#define CESA_DEF_REQ_SIZE       256
-
-
-/* CESA Tests Debug */
-#undef CESA_TEST_DEBUG
-
-#ifdef CESA_TEST_DEBUG
-
-#   define CESA_TEST_DEBUG_PRINT(msg)   mvOsPrintf msg
-#   define CESA_TEST_DEBUG_CODE(code)   code
-
-typedef struct
-{
-    int             type;       /* 0 - isrEmpty, 1 - cesaReadyGet, 2 - cesaAction */
-    MV_U32          timeStamp;
-    MV_U32          cause;
-    MV_U32          realCause;
-    MV_U32          dmaCause;
-    int             resources;
-    MV_CESA_REQ*    pReqReady;
-    MV_CESA_REQ*    pReqEmpty;
-    MV_CESA_REQ*    pReqProcess;
-} MV_CESA_TEST_TRACE;
-
-#define MV_CESA_TEST_TRACE_SIZE      25
-
-static int cesaTestTraceIdx = 0;
-static MV_CESA_TEST_TRACE    cesaTestTrace[MV_CESA_TEST_TRACE_SIZE];
-
-static void cesaTestTraceAdd(int type, MV_U32 cause)
-{
-    cesaTestTrace[cesaTestTraceIdx].type = type;
-    cesaTestTrace[cesaTestTraceIdx].cause = cause;
-    cesaTestTrace[cesaTestTraceIdx].realCause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
-    cesaTestTrace[cesaTestTraceIdx].dmaCause = MV_REG_READ(IDMA_CAUSE_REG);
-    cesaTestTrace[cesaTestTraceIdx].resources = cesaReqResources;
-    cesaTestTrace[cesaTestTraceIdx].pReqReady = pCesaReqReady;
-    cesaTestTrace[cesaTestTraceIdx].pReqEmpty = pCesaReqEmpty;
-    cesaTestTrace[cesaTestTraceIdx].pReqProcess = pCesaReqProcess;
-    cesaTestTrace[cesaTestTraceIdx].timeStamp = mvCntmrRead(MV_CESA_USE_TIMER_ID);
-    cesaTestTraceIdx++;
-    if(cesaTestTraceIdx == MV_CESA_TEST_TRACE_SIZE)
-        cesaTestTraceIdx = 0;
-}
-
-#else
-
-#   define CESA_TEST_DEBUG_PRINT(msg)
-#   define CESA_TEST_DEBUG_CODE(code)
-
-#endif /* CESA_TEST_DEBUG */
-
-int                 cesaExpReqId=0;
-int                 cesaCbIter=0;
-
-int                 cesaIdx;
-int                 cesaIteration;
-int                 cesaRateSize;
-int                 cesaReqSize;
-unsigned long       cesaTaskId;
-int                 cesaBufNum;
-int                 cesaBufSize;
-int                 cesaCheckOffset;
-int                 cesaCheckSize;
-int                 cesaCheckMode;
-int                 cesaTestIdx;
-int                 cesaCaseIdx;
-
-
-MV_U32      cesaTestIsrCount = 0;
-MV_U32      cesaTestIsrMissCount = 0;
-
-MV_U32      cesaCryptoError = 0;
-MV_U32      cesaReqIdError  = 0;
-MV_U32      cesaError = 0;
-
-char*       cesaHexBuffer = NULL;
-
-char*       cesaBinBuffer = NULL;
-char*       cesaExpBinBuffer = NULL;
-
-char*       cesaInputHexStr  = NULL;
-char*       cesaOutputHexStr = NULL;
-
-MV_BUF_INFO         cesaReqBufs[CESA_DEF_REQ_SIZE];
-
-MV_CESA_COMMAND*    cesaCmdRing;
-MV_CESA_RESULT      cesaResult;
-
-int                 cesaTestFull = 0;
-
-MV_BOOL             cesaIsReady = MV_FALSE;
-MV_U32              cesaCycles = 0;
-MV_U32              cesaBeginTicks = 0;
-MV_U32              cesaEndTicks = 0;
-MV_U32              cesaRate = 0;
-MV_U32              cesaRateAfterDot = 0;
-
-void 		    *cesaTestOSHandle = NULL;
-
-enum
-{
-    CESA_FAST_CHECK_MODE = 0,
-    CESA_FULL_CHECK_MODE,
-    CESA_NULL_CHECK_MODE,
-    CESA_SHOW_CHECK_MODE,
-    CESA_SW_SHOW_CHECK_MODE,
-    CESA_SW_NULL_CHECK_MODE,
-
-    CESA_MAX_CHECK_MODE
-};
-
-enum
-{
-    DES_TEST_TYPE         = 0,
-    TRIPLE_DES_TEST_TYPE  = 1,
-    AES_TEST_TYPE         = 2,
-    MD5_TEST_TYPE         = 3,
-    SHA_TEST_TYPE         = 4,
-    COMBINED_TEST_TYPE    = 5,
-
-    MAX_TEST_TYPE
-};
-
-/* Tests data base */
-typedef struct
-{
-    short           sid;
-    char            cryptoAlgorithm;    /* DES/3DES/AES */
-    char            cryptoMode;         /* ECB or CBC */
-    char            macAlgorithm;       /* MD5 / SHA1 */
-    char            operation;          /* CRYPTO/HMAC/CRYPTO+HMAC/HMAC+CRYPTO */
-    char            direction;          /* ENCODE(SIGN)/DECODE(VERIFY) */
-    unsigned char*  pCryptoKey;
-    int             cryptoKeySize;
-    unsigned char*  pMacKey;
-    int             macKeySize;
-    const char*     name;
-
-} MV_CESA_TEST_SESSION;
-
-typedef struct
-{
-    MV_CESA_TEST_SESSION*   pSessions;
-    int                     numSessions;
-
-} MV_CESA_TEST_DB_ENTRY;
-
-typedef struct
-{
-    char*           plainHexStr;
-    char*           cipherHexStr;
-    unsigned char*  pCryptoIV;
-    int             cryptoLength;
-    int             macLength;
-    int             digestOffset;
-
-} MV_CESA_TEST_CASE;
-
-typedef struct
-{
-    int     size;
-    const char* outputHexStr;
-
-} MV_CESA_SIZE_TEST;
-
-static unsigned char    cryptoKey1[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-                                        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-                                        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
-
-static unsigned char    cryptoKey7[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
-static unsigned char    iv1[]        = {0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef};
-
-
-static unsigned char    cryptoKey2[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
-
-static unsigned char    cryptoKey3[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-                                        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17};
-
-static unsigned char    cryptoKey4[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                                        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-                                        0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-                                        0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f};
-
-static unsigned char    cryptoKey5[] = {0x56, 0xe4, 0x7a, 0x38, 0xc5, 0x59, 0x89, 0x74,
-                                        0xbc, 0x46, 0x90, 0x3d, 0xba, 0x29, 0x03, 0x49};
-
-
-static unsigned char    key3des1[]   = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
-                                        0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
-                                        0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23};
-
-/*  Input ASCII string: The quick brown fox jump  */
-static char  plain3des1[]           =   "54686520717566636B2062726F776E20666F78206A756D70";
-static char  cipher3des1[]          =   "A826FD8CE53B855FCCE21C8112256FE668D5C05DD9B6B900";
-
-static unsigned char    key3des2[]  = {0x62, 0x7f, 0x46, 0x0e, 0x08, 0x10, 0x4a, 0x10,
-                                       0x43, 0xcd, 0x26, 0x5d, 0x58, 0x40, 0xea, 0xf1,
-                                       0x31, 0x3e, 0xdf, 0x97, 0xdf, 0x2a, 0x8a, 0x8c};
-
-static unsigned char    iv3des2[]   = {0x8e, 0x29, 0xf7, 0x5e, 0xa7, 0x7e, 0x54, 0x75};
-
-static char  plain3des2[]           = "326a494cd33fe756";
-
-static char  cipher3desCbc2[]       = "8e29f75ea77e5475"
-                                      "b22b8d66de970692";
-
-static unsigned char    key3des3[]  = {0x37, 0xae, 0x5e, 0xbf, 0x46, 0xdf, 0xf2, 0xdc,
-                                       0x07, 0x54, 0xb9, 0x4f, 0x31, 0xcb, 0xb3, 0x85,
-                                       0x5e, 0x7f, 0xd3, 0x6d, 0xc8, 0x70, 0xbf, 0xae};
-
-static unsigned char    iv3des3[]   = {0x3d, 0x1d, 0xe3, 0xcc, 0x13, 0x2e, 0x3b, 0x65};
-
-static char  plain3des3[]           = "84401f78fe6c10876d8ea23094ea5309";
-
-static char  cipher3desCbc3[]       = "3d1de3cc132e3b65"
-                                      "7b1f7c7e3b1c948ebd04a75ffba7d2f5";
-
-static unsigned char    iv5[]        = {0x8c, 0xe8, 0x2e, 0xef, 0xbe, 0xa0, 0xda, 0x3c,
-                                        0x44, 0x69, 0x9e, 0xd7, 0xdb, 0x51, 0xb7, 0xd9};
-
-static unsigned char    aesCtrKey[]  = {0x76, 0x91, 0xBE, 0x03, 0x5E, 0x50, 0x20, 0xA8,
-                                        0xAC, 0x6E, 0x61, 0x85, 0x29, 0xF9, 0xA0, 0xDC};
-
-static unsigned char    mdKey1[]     = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                                        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
-
-static unsigned char    mdKey2[]     = {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa};
-
-static unsigned char    shaKey1[]    = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                                        0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                                        0x0b, 0x0b, 0x0b, 0x0b};
-
-static unsigned char    shaKey2[]    = {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                                        0xaa, 0xaa, 0xaa, 0xaa};
-
-static unsigned char    mdKey4[]     = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                                        0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10};
-
-static unsigned char    shaKey4[]    = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-                                        0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
-                                        0x11, 0x12, 0x13, 0x14};
-
-
-static MV_CESA_TEST_SESSION   desTestSessions[] =
-{
-/*000*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
-             NULL, 0,
-             "DES ECB encode",
-        },
-/*001*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
-             NULL, 0,
-             "DES ECB decode",
-        },
-/*002*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
-             NULL, 0,
-             "DES CBC encode"
-        },
-/*003*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey7, sizeof(cryptoKey7)/sizeof(cryptoKey7[0]),
-             NULL, 0,
-             "DES CBC decode"
-        },
-/*004*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0, NULL, 0,
-              "NULL Crypto Algorithm encode"
-        },
-};
-
-
-static MV_CESA_TEST_SESSION   tripleDesTestSessions[] =
-{
-/*100*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             NULL, 0,
-             "3DES ECB encode",
-        },
-/*101*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             NULL, 0,
-             "3DES ECB decode",
-        },
-/*102*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             NULL, 0,
-             "3DES CBC encode"
-        },
-/*103*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             NULL, 0,
-             "3DES CBC decode"
-        },
-/*104*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             key3des1, sizeof(key3des1),
-             NULL, 0,
-             "3DES ECB encode"
-        },
-/*105*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             key3des2, sizeof(key3des2),
-             NULL, 0,
-             "3DES ECB encode"
-        },
-/*106*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             key3des3, sizeof(key3des3),
-             NULL, 0,
-             "3DES ECB encode"
-        },
-};
-
-
-static MV_CESA_TEST_SESSION   aesTestSessions[] =
-{
-/*200*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey2, sizeof(cryptoKey2)/sizeof(cryptoKey2[0]),
-             NULL, 0,
-             "AES-128 ECB encode"
-        },
-/*201*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey2, sizeof(cryptoKey2)/sizeof(cryptoKey2[0]),
-             NULL, 0,
-             "AES-128 ECB decode"
-        },
-/*202*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
-             NULL, 0,
-             "AES-128 CBC encode"
-        },
-/*203*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
-             NULL, 0,
-             "AES-128 CBC decode"
-        },
-/*204*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey3, sizeof(cryptoKey3)/sizeof(cryptoKey3[0]),
-             NULL, 0,
-             "AES-192 ECB encode"
-        },
-/*205*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey3, sizeof(cryptoKey3)/sizeof(cryptoKey3[0]),
-             NULL, 0,
-             "AES-192 ECB decode"
-        },
-/*206*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey4, sizeof(cryptoKey4)/sizeof(cryptoKey4[0]),
-             NULL, 0,
-             "AES-256 ECB encode"
-        },
-/*207*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_DECODE,
-             cryptoKey4, sizeof(cryptoKey4)/sizeof(cryptoKey4[0]),
-             NULL, 0,
-             "AES-256 ECB decode"
-        },
-/*208*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CTR,
-             MV_CESA_MAC_NULL, MV_CESA_CRYPTO_ONLY,
-             MV_CESA_DIR_ENCODE,
-             aesCtrKey, sizeof(aesCtrKey)/sizeof(aesCtrKey[0]),
-             NULL, 0,
-             "AES-128 CTR encode"
-        },
-};
-
-
-static MV_CESA_TEST_SESSION   md5TestSessions[] =
-{
-/*300*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             mdKey1, sizeof(mdKey1),
-             "HMAC-MD5 Generate Signature"
-        },
-/*301*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_DECODE,
-             NULL, 0,
-             mdKey1, sizeof(mdKey1),
-             "HMAC-MD5 Verify Signature"
-        },
-/*302*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             mdKey2, sizeof(mdKey2),
-             "HMAC-MD5 Generate Signature"
-        },
-/*303*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_DECODE,
-             NULL, 0,
-             mdKey2, sizeof(mdKey2),
-             "HMAC-MD5 Verify Signature"
-        },
-/*304*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             mdKey4, sizeof(mdKey4),
-             "HMAC-MD5 Generate Signature"
-        },
-/*305*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_MD5, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             NULL, 0,
-             "HASH-MD5 Generate Signature"
-        },
-};
-
-
-static MV_CESA_TEST_SESSION   shaTestSessions[] =
-{
-/*400*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             shaKey1, sizeof(shaKey1),
-             "HMAC-SHA1 Generate Signature"
-        },
-/*401*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_DECODE,
-             NULL, 0,
-             shaKey1, sizeof(shaKey1),
-             "HMAC-SHA1 Verify Signature"
-        },
-/*402*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             shaKey2, sizeof(shaKey2),
-             "HMAC-SHA1 Generate Signature"
-        },
-/*403*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_DECODE,
-             NULL, 0,
-             shaKey2, sizeof(shaKey2),
-             "HMAC-SHA1 Verify Signature"
-        },
-/*404*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             shaKey4, sizeof(shaKey4),
-             "HMAC-SHA1 Generate Signature"
-        },
-/*405*/ {-1, MV_CESA_CRYPTO_NULL, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_SHA1, MV_CESA_MAC_ONLY,
-             MV_CESA_DIR_ENCODE,
-             NULL, 0,
-             NULL, 0,
-             "HASH-SHA1 Generate Signature"
-        },
-};
-
-static MV_CESA_TEST_SESSION   combinedTestSessions[] =
-{
-/*500*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, MV_CESA_DES_KEY_LENGTH,
-             mdKey4, sizeof(mdKey4),
-             "DES + MD5 encode"
-        },
-/*501*/ {-1, MV_CESA_CRYPTO_DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, MV_CESA_DES_KEY_LENGTH,
-             shaKey4, sizeof(shaKey4),
-             "DES + SHA1 encode"
-        },
-/*502*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             mdKey4, sizeof(mdKey4),
-             "3DES + MD5 encode"
-        },
-/*503*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             shaKey4, sizeof(shaKey4),
-             "3DES + SHA1 encode"
-        },
-/*504*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             mdKey4, sizeof(mdKey4),
-             "3DES CBC + MD5 encode"
-        },
-/*505*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             shaKey4, sizeof(shaKey4),
-             "3DES CBC + SHA1 encode"
-        },
-/*506*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
-             mdKey4, sizeof(mdKey4),
-             "AES-128 CBC + MD5 encode"
-        },
-/*507*/ {-1, MV_CESA_CRYPTO_AES, MV_CESA_CRYPTO_CBC,
-             MV_CESA_MAC_HMAC_SHA1, MV_CESA_CRYPTO_THEN_MAC,
-             MV_CESA_DIR_ENCODE,
-             cryptoKey5, sizeof(cryptoKey5)/sizeof(cryptoKey5[0]),
-             shaKey4, sizeof(shaKey4),
-             "AES-128 CBC + SHA1 encode"
-        },
-/*508*/ {-1, MV_CESA_CRYPTO_3DES, MV_CESA_CRYPTO_ECB,
-             MV_CESA_MAC_HMAC_MD5, MV_CESA_MAC_THEN_CRYPTO,
-             MV_CESA_DIR_DECODE,
-             cryptoKey1, sizeof(cryptoKey1)/sizeof(cryptoKey1[0]),
-             mdKey4, sizeof(mdKey4),
-             "HMAC-MD5 + 3DES decode"
-        },
-};
-
-
-static MV_CESA_TEST_DB_ENTRY cesaTestsDB[MAX_TEST_TYPE+1] =
-{
-    { desTestSessions,       sizeof(desTestSessions)/sizeof(desTestSessions[0]) },
-    { tripleDesTestSessions, sizeof(tripleDesTestSessions)/sizeof(tripleDesTestSessions[0]) },
-    { aesTestSessions,       sizeof(aesTestSessions)/sizeof(aesTestSessions[0]) },
-    { md5TestSessions,       sizeof(md5TestSessions)/sizeof(md5TestSessions[0]) },
-    { shaTestSessions,       sizeof(shaTestSessions)/sizeof(shaTestSessions[0]) },
-    { combinedTestSessions,  sizeof(combinedTestSessions)/sizeof(combinedTestSessions[0]) },
-    { NULL,                  0 }
-};
-
-
-char  cesaNullPlainHexText[]   = "000000000000000000000000000000000000000000000000";
-
-char  cesaPlainAsciiText[]     = "Now is the time for all ";
-char  cesaPlainHexEbc[]        = "4e6f77206973207468652074696d6520666f7220616c6c20";
-char  cesaCipherHexEcb[]       = "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53";
-char  cesaPlainHexCbc[]        = "1234567890abcdef4e6f77206973207468652074696d6520666f7220616c6c20";
-char  cesaCipherHexCbc[]       = "1234567890abcdefe5c7cdde872bf27c43e934008c389c0f683788499a7c05f6";
-
-char  cesaAesPlainHexEcb[]     = "000102030405060708090a0b0c0d0e0f";
-char  cesaAes128cipherHexEcb[] = "0a940bb5416ef045f1c39458c653ea5a";
-char  cesaAes192cipherHexEcb[] = "0060bffe46834bb8da5cf9a61ff220ae";
-char  cesaAes256cipherHexEcb[] = "5a6e045708fb7196f02e553d02c3a692";
-
-char  cesaAsciiStr1[]          = "Hi There";
-char  cesaDataHexStr1[]        = "4869205468657265";
-char  cesaHmacMd5digestHex1[]  = "9294727a3638bb1c13f48ef8158bfc9d";
-char  cesaHmacSha1digestHex1[] = "b617318655057264e28bc0b6fb378c8ef146be00";
-char  cesaDataAndMd5digest1[]  = "48692054686572659294727a3638bb1c13f48ef8158bfc9d";
-char  cesaDataAndSha1digest1[] = "4869205468657265b617318655057264e28bc0b6fb378c8ef146be00";
-
-char  cesaAesPlainText[]       = "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
-                                 "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-                                 "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-                                 "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf";
-
-char  cesaAes128CipherCbc[]    = "c30e32ffedc0774e6aff6af0869f71aa"
-                                 "0f3af07a9a31a9c684db207eb0ef8e4e"
-                                 "35907aa632c3ffdf868bb7b29d3d46ad"
-                                 "83ce9f9a102ee99d49a53e87f4c3da55";
-
-char  cesaAesIvPlainText[]     = "8ce82eefbea0da3c44699ed7db51b7d9"
-                                 "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
-                                 "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-                                 "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-                                 "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf";
-
-char  cesaAes128IvCipherCbc[]  = "8ce82eefbea0da3c44699ed7db51b7d9"
-                                 "c30e32ffedc0774e6aff6af0869f71aa"
-                                 "0f3af07a9a31a9c684db207eb0ef8e4e"
-                                 "35907aa632c3ffdf868bb7b29d3d46ad"
-                                 "83ce9f9a102ee99d49a53e87f4c3da55";
-
-char  cesaAesCtrPlain[]        = "00E0017B27777F3F4A1786F000000001"
-                                 "000102030405060708090A0B0C0D0E0F"
-                                 "101112131415161718191A1B1C1D1E1F"
-                                 "20212223";
-
-char  cesaAesCtrCipher[]       = "00E0017B27777F3F4A1786F000000001"
-                                 "C1CF48A89F2FFDD9CF4652E9EFDB72D7"
-                                 "4540A42BDE6D7836D59A5CEAAEF31053"
-                                 "25B2072F";
-
-
-
-/* Input cesaHmacHex3 is '0xdd' repeated 50 times */
-char  cesaHmacMd5digestHex3[]  = "56be34521d144c88dbb8c733f0e8b3f6";
-char  cesaHmacSha1digestHex3[] = "125d7342b9ac11cd91a39af48aa17b4f63f175d3";
-char  cesaDataHexStr3[50*2+1]          = "";
-char  cesaDataAndMd5digest3[sizeof(cesaDataHexStr3)+sizeof(cesaHmacMd5digestHex3)+8*2+1] = "";
-char  cesaDataAndSha1digest3[sizeof(cesaDataHexStr3)+sizeof(cesaHmacSha1digestHex3)+8*2+1] = "";
-
-/* Ascii string is "abc" */
-char hashHexStr3[] = "616263";
-char hashMd5digest3[] = "900150983cd24fb0d6963f7d28e17f72";
-char hashSha1digest3[] = "a9993e364706816aba3e25717850c26c9cd0d89d";
-
-char hashHexStr80[]     = "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930"
-                          "31323334353637383930";
-
-char hashMd5digest80[]           = "57edf4a22be3c955ac49da2e2107b67a";
-
-char tripleDesThenMd5digest80[]  = "b7726a03aad490bd6c5a452a89a1b271";
-char tripleDesThenSha1digest80[] = "b2ddeaca91030eab5b95a234ef2c0f6e738ff883";
-
-char cbc3desThenMd5digest80[]    = "6f463057e1a90e0e91ae505b527bcec0";
-char cbc3desThenSha1digest80[]   = "1b002ed050be743aa98860cf35659646bb8efcc0";
-
-char cbcAes128ThenMd5digest80[]  = "6b6e863ac5a71d15e3e9b1c86c9ba05f";
-char cbcAes128ThenSha1digest80[] = "13558472d1fc1c90dffec6e5136c7203452d509b";
-
-
-static MV_CESA_TEST_CASE  cesaTestCases[] =
-{
- /*     plainHexStr          cipherHexStr               IV    crypto  mac     digest */
- /*                                                           Length  Length  Offset */
- /*0*/ { NULL,               NULL,                      NULL,   0,      0,      -1  },
- /*1*/ { cesaPlainHexEbc,    cesaCipherHexEcb,          NULL,   24,     0,      -1  },
- /*2*/ { cesaPlainHexCbc,    cesaCipherHexCbc,          NULL,   24,     0,      -1  },
- /*3*/ { cesaAesPlainHexEcb, cesaAes128cipherHexEcb,    NULL,   16,     0,      -1  },
- /*4*/ { cesaAesPlainHexEcb, cesaAes192cipherHexEcb,    NULL,   16,     0,      -1  },
- /*5*/ { cesaAesPlainHexEcb, cesaAes256cipherHexEcb,    NULL,   16,     0,      -1  },
- /*6*/ { cesaDataHexStr1,    cesaHmacMd5digestHex1,     NULL,   0,      8,      -1  },
- /*7*/ { NULL,               cesaDataAndMd5digest1,     NULL,   0,      8,      -1  },
- /*8*/ { cesaDataHexStr3,    cesaHmacMd5digestHex3,     NULL,   0,      50,     -1  },
- /*9*/ { NULL,               cesaDataAndMd5digest3,     NULL,   0,      50,     -1  },
-/*10*/ { cesaAesPlainText,   cesaAes128IvCipherCbc,     iv5,    64,     0,      -1  },
-/*11*/ { cesaDataHexStr1,    cesaHmacSha1digestHex1,    NULL,   0,      8,      -1  },
-/*12*/ { NULL,               cesaDataAndSha1digest1,    NULL,   0,      8,      -1  },
-/*13*/ { cesaDataHexStr3,    cesaHmacSha1digestHex3,    NULL,   0,      50,     -1  },
-/*14*/ { NULL,               cesaDataAndSha1digest3,    NULL,   0,      50,     -1  },
-/*15*/ { hashHexStr3,        hashMd5digest3,            NULL,   0,      3,      -1  },
-/*16*/ { hashHexStr3,        hashSha1digest3,           NULL,   0,      3,      -1  },
-/*17*/ { hashHexStr80,       tripleDesThenMd5digest80,  NULL,   80,     80,     -1  },
-/*18*/ { hashHexStr80,       tripleDesThenSha1digest80, NULL,   80,     80,     -1  },
-/*19*/ { hashHexStr80,       cbc3desThenMd5digest80,    iv1,    80,     80,     -1  },
-/*20*/ { hashHexStr80,       cbc3desThenSha1digest80,   iv1,    80,     80,     -1  },
-/*21*/ { hashHexStr80,       cbcAes128ThenMd5digest80,  iv5,    80,     80,     -1  },
-/*22*/ { hashHexStr80,       cbcAes128ThenSha1digest80, iv5,    80,     80,     -1  },
-/*23*/ { cesaAesCtrPlain,    cesaAesCtrCipher,          NULL,   36,     0,      -1  },
-/*24*/ { cesaAesIvPlainText, cesaAes128IvCipherCbc,     NULL,   64,     0,      -1  },
-/*25*/ { plain3des1,         cipher3des1,               NULL,   0,      0,      -1  },
-/*26*/ { plain3des2,         cipher3desCbc2,            iv3des2,0,      0,      -1  },
-/*27*/ { plain3des3,         cipher3desCbc3,            iv3des3,0,      0,      -1  },
-};
-
-
-/* Key         = 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
- *               0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
- * Input 0xdd repeated "size" times
- */
-static MV_CESA_SIZE_TEST     mdMultiSizeTest302[] =
-{
-    { 80,   "7a031a640c14a4872814930b1ef3a5b2" },
-    { 512,  "5488e6c5a14dc72a79f28312ca5b939b" },
-    { 1000, "d00814f586a8b78a05724239d2531821" },
-    { 1001, "bf07df7b7f49d3f5b5ecacd4e9e63281" },
-    { 1002, "1ed4a1a802e87817a819d4e37bb4d0f7" },
-    { 1003, "5972ab64a4f265ee371dac2f2f137f90" },
-    { 1004, "71f95e7ec3aa7df2548e90898abdb28e" },
-    { 1005, "e082790b4857fcfc266e92e59e608814" },
-    { 1006, "9500f02fd8ac7fde8b10e4fece9a920d" },
-    { 1336, "e42edcce57d0b75b01aa09d71427948b" },
-    { 1344, "bb5454ada0deb49ba0a97ffd60f57071" },
-    { 1399, "0f44d793e744b24d53f44f295082ee8c" },
-    { 1400, "359de8a03a9b707928c6c60e0e8d79f1" },
-    { 1401, "e913858b484cbe2b384099ea88d8855b" },
-    { 1402, "d9848a164af53620e0540c1d7d87629e" },
-    { 1403, "0c9ee1c2c9ef45e9b625c26cbaf3e822" },
-    { 1404, "12edd4f609416e3c936170360561b064" },
-    { 1405, "7fc912718a05446395345009132bf562" },
-    { 1406, "882f17425e579ff0d85a91a59f308aa0" },
-    { 1407, "005cae408630a2fb5db82ad9db7e59da" },
-    { 1408, "64655f8b404b3fea7a3e3e609bc5088f" },
-    { 1409, "4a145284a7f74e01b6bb1a0ec6a0dd80" },
-    { 2048, "67caf64475650732def374ebb8bde3fd" },
-    { 2049, "6c84f11f472825f7e6cd125c2981884b" },
-    { 2050, "8999586754a73a99efbe4dbad2816d41" },
-    { 2051, "ba6946b610e098d286bc81091659dfff" },
-    { 2052, "d0afa01c92d4d13def2b024f36faed83" },
-    { 3072, "61d8beac61806afa2585d74a9a0e6974" },
-    { 3074, "f6501a28dcc24d1e4770505c51a87ed3" },
-    { 3075, "ea4a6929be67e33e61ff475369248b73" },
-    { 4048, "aa8c4d68f282a07e7385acdfa69f4bed" },
-    { 4052, "afb5ed2c0e1d430ea59e59ed5ed6b18a" },
-    { 4058, "9e8553f9bdd43aebe0bd729f0e600c99" },
-    { 6144, "f628f3e5d183fe5cdd3a5abee39cf872" },
-    { 6150, "89a3efcea9a2f25f919168ad4a1fd292" },
-    { 6400, "cdd176b7fb747873efa4da5e32bdf88f" },
-    { 6528, "b1d707b027354aca152c45ee559ccd3f" },
-    { 8192, "c600ea4429ac47f9941f09182166e51a" },
-    {16384, "16e8754bfbeb4c649218422792267a37" },
-    {18432, "0fd0607521b0aa8b52219cfbe215f63e" },
-    { 0, NULL },
-};
-
-/* Key         = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- */
-static MV_CESA_SIZE_TEST     mdMultiSizeTest304[] =
-{
-    { 80,   "a456c4723fee6068530af5a2afa71627" },
-    { 512,  "f85c2a2344f5de68b432208ad13e5794" },
-    { 1000, "35464d6821fd4a293a41eb84e274c8c5" },
-    { 1001, "c08eedbdce60cceb54bc2d732bb32c8b" },
-    { 1002, "5664f71800c011cc311cb6943339c1b8" },
-    { 1003, "779c723b044c585dc7802b13e8501bdc" },
-    { 1004, "55e500766a2c307bc5c5fdd15e4cacd4" },
-    { 1005, "d5f978954f5c38529d1679d2b714f068" },
-    { 1006, "cd3efc827ce628b7281b72172693abf9" },
-    { 1336, "6f04479910785878ae6335b8d1e87edf" },
-    { 1344, "b6d27b50c2bce1ba2a8e1b5cc4324368" },
-    { 1399, "65f70a1d4c86e5eaeb0704c8a7816795" },
-    { 1400, "3394b5adc4cb3ff98843ca260a44a88a" },
-    { 1401, "3a06f3582033a66a4e57e0603ce94e74" },
-    { 1402, "e4d97f5ed51edc48abfa46eeb5c31752" },
-    { 1403, "3d05e40b080ee3bedf293cb87b7140e7" },
-    { 1404, "8cf294fc3cd153ab18dccb2a52cbf244" },
-    { 1405, "d1487bd42f6edd9b4dab316631159221" },
-    { 1406, "0527123b6bf6936cf5d369dc18c6c70f" },
-    { 1407, "3224a06639db70212a0cd1ae1fcc570a" },
-    { 1408, "a9e13335612c0356f5e2c27086e86c43" },
-    { 1409, "a86d1f37d1ed8a3552e9a4f04dceea98" },
-    { 2048, "396905c9b961cd0f6152abfb69c4449c" },
-    { 2049, "49f39bff85d9dcf059fadb89efc4a70f" },
-    { 2050, "3a2b4823bc4d0415656550226a63e34a" },
-    { 2051, "dec60580d406c782540f398ad0bcc7e0" },
-    { 2052, "32f76610a14310309eb748fe025081bf" },
-    { 3072, "45edc1a42bf9d708a621076b63b774da" },
-    { 3074, "9be1b333fe7c0c9f835fb369dc45f778" },
-    { 3075, "8c06fcac7bd0e7b7a17fd6508c09a549" },
-    { 4048, "0ddaef848184bf0ad98507a10f1e90e4" },
-    { 4052, "81976bcaeb274223983996c137875cb8" },
-    { 4058, "0b0a7a1c82bc7cbc64d8b7cd2dc2bb22" },
-    { 6144, "1c24056f52725ede2dff0d7f9fc9855f" },
-    { 6150, "b7f4b65681c4e43ee68ca466ca9ca4ec" },
-    { 6400, "443bbaab9f7331ddd4bf11b659cd43c8" },
-    { 6528, "216f44f23047cfee03a7a64f88f9a995" },
-    { 8192, "ac7a993b2cad54879dba1bde63e39097" },
-    { 8320, "55ed7be9682d6c0025b3221a62088d08" },
-    {16384, "c6c722087653b62007aea668277175e5" },
-    {18432, "f1faca8e907872c809e14ffbd85792d6" },
-    { 0, NULL },
-};
-
-/* HASH-MD5
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- *               repeated "size" times
- */
-static MV_CESA_SIZE_TEST     mdMultiSizeTest305[] =
-{
-    { 80,   "57edf4a22be3c955ac49da2e2107b67a" },
-    { 512,  "c729ae8f0736cc377a9767a660eaa04e" },
-    { 1000, "f1257a8659eb92d36fe14c6bf3852a6a" },
-    { 1001, "f8a46fe8ea04fdc8c7de0e84042d3878" },
-    { 1002, "da188dd67bff87d58aa3c02af2d0cc0f" },
-    { 1003, "961753017feee04c9b93a8e51658a829" },
-    { 1004, "dd68c4338608dcc87807a711636bf2af" },
-    { 1005, "e338d567d3ce66bf69ada29658a8759b" },
-    { 1006, "443c9811e8b92599b0b149e8d7ec700a" },
-    { 1336, "89a98511706008ba4cbd0b4a24fa5646" },
-    { 1344, "335a919805f370b9e402a62c6fe01739" },
-    { 1399, "5d18d0eddcd84212fe28d812b5e80e3b" },
-    { 1400, "6b695c240d2dffd0dffc99459ca76db6" },
-    { 1401, "49590f61298a76719bc93a57a30136f5" },
-    { 1402, "94c2999fa3ef1910a683d69b2b8476f2" },
-    { 1403, "37073a02ab00ecba2645c57c228860db" },
-    { 1404, "1bcd06994fce28b624f0c5fdc2dcdd2b" },
-    { 1405, "11b93671a64c95079e8cf9e7cddc8b3d" },
-    { 1406, "4b6695772a4c66313fa4871017d05f36" },
-    { 1407, "d1539b97fbfda1c075624e958de19c5b" },
-    { 1408, "b801b9b69920907cd018e8063092ede9" },
-    { 1409, "b765f1406cfe78e238273ed01bbcaf7e" },
-    { 2048, "1d7e2c64ac29e2b3fb4c272844ed31f5" },
-    { 2049, "71d38fac49c6b1f4478d8d88447bcdd0" },
-    { 2050, "141c34a5592b1bebfa731e0b23d0cdba" },
-    { 2051, "c5e1853f21c59f5d6039bd13d4b380d8" },
-    { 2052, "dd44a0d128b63d4b5cccd967906472d7" },
-    { 3072, "37d158e33b21390822739d13db7b87fe" },
-    { 3074, "aef3b209d01d39d0597fe03634bbf441" },
-    { 3075, "335ffb428eabf210bada96d74d5a4012" },
-    { 4048, "2434c2b43d798d2819487a886261fc64" },
-    { 4052, "ac2fa84a8a33065b2e92e36432e861f8" },
-    { 4058, "856781f85616c341c3533d090c1e1e84" },
-    { 6144, "e5d134c652c18bf19833e115f7a82e9b" },
-    { 6150, "a09a353be7795fac2401dac5601872e6" },
-    { 6400, "08b9033ac6a1821398f50af75a2dbc83" },
-    { 6528, "3d47aa193a8540c091e7e02f779e6751" },
-    { 8192, "d3164e710c0626f6f395b38f20141cb7" },
-    { 8320, "b727589d9183ff4e8491dd24466974a3" },
-    {16384, "3f54d970793d2274d5b20d10a69938ac" },
-    {18432, "f558511dcf81985b7a1bb57fad970531" },
-    { 0, NULL },
-};
-
-
-/* Key         = 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
- *               0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
- *               0xaa, 0xaa, 0xaa, 0xaa
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- */
-static MV_CESA_SIZE_TEST     shaMultiSizeTest402[] =
-{
-    { 80,   "e812f370e659705a1649940d1f78cd7af18affd3" },
-    { 512,  "e547f886b2c15d995ed76a8a924cb408c8080f66" },
-    { 1000, "239443194409f1a5342ecde1a092c8f3a3ed790a" },
-    { 1001, "f278ab9a102850a9f48dc4e9e6822afe2d0c52b5" },
-    { 1002, "8bcc667df5ab6ece988b3af361d09747c77f4e72" },
-    { 1003, "0fae6046c7dc1d3e356b25af836f6077a363f338" },
-    { 1004, "0ea48401cc92ae6bc92ae76685269cb0167fbe1a" },
-    { 1005, "ecbcd7c879b295bafcd8766cbeac58cc371e31d1" },
-    { 1006, "eb4a4a3d07d1e9a15e6f1ab8a9c47f243e27324c" },
-    { 1336, "f5950ee1d77c10e9011d2149699c9366fe52529c" },
-    { 1344, "b04263604a63c351b0b3b9cf1785b4bdba6c8838" },
-    { 1399, "8cb1cff61d5b784045974a2fc69386e3b8d24218" },
-    { 1400, "9bb2f3fcbeddb2b90f0be797cd647334a2816d51" },
-    { 1401, "23ae462a7a0cb440f7445791079a5d75a535dd33" },
-    { 1402, "832974b524a4d3f9cc2f45a3cabf5ccef65cd2aa" },
-    { 1403, "d1c683742fe404c3c20d5704a5430e7832a7ec95" },
-    { 1404, "867c79042e64f310628e219d8b85594cd0c7adc3" },
-    { 1405, "c9d81d49d13d94358f56ccfd61af02b36c69f7c3" },
-    { 1406, "0df43daab2786172f9b8d07d61f14a070cf1287a" },
-    { 1407, "0fd8f3ad7f169534b274d4c66bbddd89f759e391" },
-    { 1408, "3987511182b18473a564436003139b808fa46343" },
-    { 1409, "ef667e063c9e9f539a8987a8d0bd3066ee85d901" },
-    { 2048, "921109c99f3fedaca21727156d5f2b4460175327" },
-    { 2049, "47188600dd165eb45f27c27196d3c46f4f042c1b" },
-    { 2050, "8831939904009338de10e7fa670847041387807d" },
-    { 2051, "2f8ebb5db2997d614e767be1050366f3641e7520" },
-    { 2052, "669e51cd730dae158d3bef8adba075bd95a0d011" },
-    { 3072, "cfee66cfd83abc8451af3c96c6b35a41cc6c55f5" },
-    { 3074, "216ea26f02976a261b7d21a4dd3085157bedfabd" },
-    { 3075, "bd612ebba021fd8e012b14c3bd60c8c5161fabc0" },
-    { 4048, "c2564c1fdf2d5e9d7dde7aace2643428e90662e8" },
-    { 4052, "91ce61fe924b445dfe7b5a1dcd10a27caec16df6" },
-    { 4058, "db2a9be5ee8124f091c7ebd699266c5de223c164" },
-    { 6144, "855109903feae2ba3a7a05a326b8a171116eb368" },
-    { 6150, "37520bb3a668294d9c7b073e7e3daf8fee248a78" },
-    { 6400, "60a353c841b6d2b1a05890349dad2fa33c7536b7" },
-    { 6528, "9e53a43a69bb42d7c8522ca8bd632e421d5edb36" },
-    { 8192, "a918cb0da862eaea0a33ee0efea50243e6b4927c" },
-    { 8320, "29a5dcf55d1db29cd113fcf0572ae414f1c71329" },
-    {16384, "6fb27966138e0c8d5a0d65ace817ebd53633cee1" },
-    {18432, "ca09900d891c7c9ae2a559b10f63a217003341c1" },
-    { 0, NULL },
-};
-
-/* Key         = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- *               0x11, 0x12, 0x13, 0x14
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- */
-static MV_CESA_SIZE_TEST     shaMultiSizeTest404[] =
-{
-    { 80,   "beaf20a34b06a87558d156c0949bc3957d40222e" },
-    { 512,  "3353955358d886bc2940a3c7f337ff7dafb59c7b" },
-    { 1000, "8737a542c5e9b2b6244b757ebb69d5bd602a829f" },
-    { 1001, "fd9e7582d8a5d3c9fe3b923e4e6a41b07a1eb4d4" },
-    { 1002, "a146d14a6fc3c274ff600568f4d75b977989e00d" },
-    { 1003, "be22601bbc027ddef2dec97d30b3dc424fd803c5" },
-    { 1004, "3e71fe99b2fe2b7bfdf4dbf0c7f3da25d7ea35e7" },
-    { 1005, "2c422735d7295408fddd76f5e8a83a2a8da13df3" },
-    { 1006, "6d875319049314b61855101a647b9ba3313428e6" },
-    { 1336, "c1631ea80bad9dc43a180712461b65a0598c711c" },
-    { 1344, "816069bf91d34581005746e2e0283d0f9c7b7605" },
-    { 1399, "4e139866dc61cfcb8b67ca2ebd637b3a538593af" },
-    { 1400, "ff2a0f8dd2b02c5417910f6f55d33a78e081a723" },
-    { 1401, "ab00c12be62336964cbce31ae97fe2a0002984d5" },
-    { 1402, "61349e7f999f3a1acc56c3e9a5060a9c4a7b05b6" },
-    { 1403, "3edbc0f61e435bc1317fa27d840076093fb79353" },
-    { 1404, "d052c6dfdbe63d45dab23ef9893e2aa4636aca1e" },
-    { 1405, "0cc16b7388d67bf0add15a31e6e6c753cfae4987" },
-    { 1406, "c96ba7eaad74253c38c22101b558d2850b1d1b90" },
-    { 1407, "3445428a40d2c6556e7c55797ad8d323b61a48d9" },
-    { 1408, "8d6444f937a09317c89834187b8ea9b8d3a8c56b" },
-    { 1409, "c700acd3ecd19014ea2bdb4d42510c467e088475" },
-    { 2048, "ee27d2a0cb77470c2f496212dfd68b5bb7b04e4b" },
-    { 2049, "683762d7a02983b26a6d046e6451d9cd82c25932" },
-    { 2050, "0fd20f1d55a9ee18363c2a6fd54aa13aee69992f" },
-    { 2051, "86c267d8cc4bc8d59090e4f8b303da960fd228b7" },
-    { 2052, "452395ae05b3ec503eea34f86fc0832485ad97c1" },
-    { 3072, "75198e3cfd0b9bcff2dabdf8e38e6fdaa33ca49a" },
-    { 3074, "4e24785ef080141ce4aab4675986d9acea624d7c" },
-    { 3075, "3a20c5978dd637ec0e809bf84f0d9ccf30bc65bf" },
-    { 4048, "3c32da256be7a7554922bf5fed51b0d2d09e59ad" },
-    { 4052, "fff898426ea16e54325ae391a32c6c9bce4c23c0" },
-    { 4058, "c800b9e562e1c91e1310116341a3c91d37f848ec" },
-    { 6144, "d91d509d0cc4376c2d05bf9a5097717a373530e6" },
-    { 6150, "d957030e0f13c5df07d9eec298542d8f94a07f12" },
-    { 6400, "bb745313c3d7dc17b3f955e5534ad500a1082613" },
-    { 6528, "77905f80d9ca82080bbb3e5654896dabfcfd1bdb" },
-    { 8192, "5237fd9a81830c974396f99f32047586612ff3c0" },
-    { 8320, "57668e28d5f2dba0839518a11db0f6af3d7e08bf" },
-    {16384, "62e093fde467f0748087beea32e9af97d5c61241" },
-    {18432, "845fb33130c7d6ea554fd5aacb9c50cf7ccb5929" },
-    { 0, NULL },
-};
-
-/* HASH-SHA1
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- *               repeated "size" times
- */
-static MV_CESA_SIZE_TEST     shaMultiSizeTest405[] =
-{
-    { 80,   "50abf5706a150990a08b2c5ea40fa0e585554732" },
-    { 512,  "f14516a08948fa27917a974d219741a697ba0087" },
-    { 1000, "0bd18c378d5788817eb4f1e5dc07d867efa5cbf4" },
-    { 1001, "ca29b85c35db1b8aef83c977893a11159d1b7aa2" },
-    { 1002, "d83bc973eaaedb8a31437994dabbb3304b0be086" },
-    { 1003, "2cf7bbef0acd6c00536b5c58ca470df9a3a90b6c" },
-    { 1004, "e4375d09b1223385a8a393066f8209acfd936a80" },
-    { 1005, "1029b38043e027745d019ce1d2d68e3d8b9d8f99" },
-    { 1006, "deea16dcebbd8ac137e2b984deb639b9fb5e9680" },
-    { 1336, "ea031b065fff63dcfb6a41956e4777520cdbc55d" },
-    { 1344, "b52096c6445e6c0a8355995c70dc36ae186c863c" },
-    { 1399, "cde2f6f8379870db4b32cf17471dc828a8dbff2b" },
-    { 1400, "e53ff664064bc09fe5054c650806bd42d8179518" },
-    { 1401, "d1156db5ddafcace64cdb510ff0d4af9b9a8ad64" },
-    { 1402, "34ede0e9a909dd84a2ae291539105c0507b958e1" },
-    { 1403, "a772ca3536da77e6ad3251e4f9e1234a4d7b87c0" },
-    { 1404, "29740fd2b04e7a8bfd32242db6233156ad699948" },
-    { 1405, "65b17397495b70ce4865dad93bf991b74c97cce1" },
-    { 1406, "a7ee89cd0754061fdb91af7ea6abad2c69d542e3" },
-    { 1407, "3eebf82f7420188e23d328b7ce93580b279a5715" },
-    { 1408, "e08d3363a8b9a490dfb3a4c453452b8f114deeec" },
-    { 1409, "95d74df739181a4ff30b8c39e28793a36598e924" },
-    { 2048, "aa40262509c2abf84aab0197f83187fc90056d91" },
-    { 2049, "7dec28ef105bc313bade8d9a7cdeac58b99de5ea" },
-    { 2050, "d2e30f77ec81197de20f56588a156094ecb88450" },
-    { 2051, "6b22ccc874833e96551a39da0c0edcaa0d969d92" },
-    { 2052, "f843141e57875cd669af58744bc60aa9ea59549c" },
-    { 3072, "09c5fedeaa62c132e673cc3c608a00142273d086" },
-    { 3074, "b09e95eea9c7b1b007a58accec488301901a7f3d" },
-    { 3075, "e6226b77b4ada287a8c9bbcf4ed71eec5ce632dc" },
-    { 4048, "e99394894f855821951ddddf5bfc628547435f5c" },
-    { 4052, "32d2f1af38be9cfba6cd03d55a254d0b3e1eb382" },
-    { 4058, "d906552a4f2aca3a22e1fecccbcd183d7289d0ef" },
-    { 6144, "2e7f62d35a860988e1224dc0543204af19316041" },
-    { 6150, "d6b89698ee133df46fec9d552fadc328aa5a1b51" },
-    { 6400, "dff50e90c46853988fa3a4b4ce5dda6945aae976" },
-    { 6528, "9e63ec0430b96db02d38bc78357a2f63de2ab7f8" },
-    { 8192, "971eb71ed60394d5ab5abb12e88420bdd41b5992" },
-    { 8320, "91606a31b46afeaac965cecf87297e791b211013" },
-    {16384, "547f830a5ec1f5f170ce818f156b1002cabc7569" },
-    {18432, "f16f272787f3b8d539652e4dc315af6ab4fda0ef" },
-    { 0, NULL },
-};
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef;
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to 3DES block size (8 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     tripleDesMdMultiSizeTest502[] =
-{
-    {   64, "9586962a2aaaef28803dec2e17807a7f" },
-    {   80, "b7726a03aad490bd6c5a452a89a1b271" },
-    {  352, "f1ed9563aecc3c0d2766eb2bed3b4e4c" },
-    {  512, "0f9decb11ab40fe86f4d4d9397bc020e" },
-    { 1000, "3ba69deac12cab8ff9dff7dbd9669927" },
-    { 1336, "6cf47bf1e80e03e2c1d0945bc50d37d2" },
-    { 1344, "4be388dab21ceb3fa1b8d302e9b821f7" },
-    { 1400, "a58b79fb21dd9bfc6ec93e3b99fb0ef1" },
-    { 1408, "8bc97379fc2ac3237effcdd4f7a86528" },
-    { 2048, "1339f03ab3076f25a20bc4cba16eb5bf" },
-    { 3072, "731204d2d90c4b36ae41f5e1fb874288" },
-    { 4048, "c028d998cfda5642547b7e1ed5ea16e4" },
-    { 6144, "b1b19cd910cc51bd22992f1e59f1e068" },
-    { 6400, "44e4613496ba622deb0e7cb768135a2f" },
-    { 6528, "3b06b0a86f8db9cd67f9448dfcf10549" },
-    { 8192, "d581780b7163138a0f412be681457d82" },
-    {16384, "03b8ac05527faaf1bed03df149c65ccf" },
-    {18432, "677c8a86a41dab6c5d81b85b8fb10ff6" },
-    { 0, NULL },
-};
-
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef;
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- *               0x11, 0x12, 0x13, 0x14
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to 3DES block size (8 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     tripleDesShaMultiSizeTest503[] =
-{
-    {   64, "44a1e9bcbfc1429630d9ea68b7a48b0427a684f2" },
-    {   80, "b2ddeaca91030eab5b95a234ef2c0f6e738ff883" },
-    {  352, "4b91864c7ff629bdff75d9726421f76705452aaf" },
-    {  512, "6dd37faceeb2aa98ba74f4242ed6734a4d546af5" },
-    { 1000, "463661c30300be512a9df40904f0757cde5f1141" },
-    { 1336, "b931f831d9034fe59c65176400b039fe9c1f44a5" },
-    { 1344, "af8866b1cd4a4887d6185bfe72470ffdfb3648e1" },
-    { 1400, "49c6caf07296d5e31d2504d088bc5b20c3ee7cdb" },
-    { 1408, "fcae8deedbc6ebf0763575dc7e9de075b448a0f4" },
-    { 2048, "edece5012146c1faa0dd10f50b183ba5d2af58ac" },
-    { 3072, "5b83625adb43a488b8d64fecf39bb766818547b7" },
-    { 4048, "d2c533678d26c970293af60f14c8279dc708bfc9" },
-    { 6144, "b8f67af4f991b08b725f969b049ebf813bfacc5c" },
-    { 6400, "d9a6c7f746ac7a60ef2edbed2841cf851c25cfb0" },
-    { 6528, "376792b8c8d18161d15579fb7829e6e3a27e9946" },
-    { 8192, "d890eabdca195b34ef8724b28360cffa92ae5655" },
-    {16384, "a167ee52639ec7bf19aee9c6e8f76667c14134b9" },
-    {18432, "e4396ab56f67296b220985a12078f4a0e365d2cc" },
-    { 0, NULL },
-};
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef
- * IV          = 0x12345678, 0x90abcdef
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to 3DES block size (8 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     cbc3desMdMultiSizeTest504[] =
-{
-    {   64, "8d10e00802460ede0058c139ba48bd2d" },
-    {   80, "6f463057e1a90e0e91ae505b527bcec0" },
-    {  352, "4938d48bdf86aece2c6851e7c6079788" },
-    {  512, "516705d59f3cf810ebf2a13a23a7d42e" },
-    { 1000, "a5a000ee5c830e67ddc6a2d2e5644b31" },
-    { 1336, "44af60087b74ed07950088efbe3b126a" },
-    { 1344, "1f5b39e0577920af731dabbfcf6dfc2a" },
-    { 1400, "6804ea640e29b9cd39e08bc37dbce734" },
-    { 1408, "4fb436624b02516fc9d1535466574bf9" },
-    { 2048, "c909b0985c423d8d86719f701e9e83db" },
-    { 3072, "cfe0bc34ef97213ee3d3f8b10122db21" },
-    { 4048, "03ea10b5ae4ddeb20aed6af373082ed1" },
-    { 6144, "b9a0ff4f87fc14b3c2dc6f0ed0998fdf" },
-    { 6400, "6995f85d9d4985dd99e974ec7dda9dd6" },
-    { 6528, "bbbb548ce2fa3d58467f6a6a5168a0e6" },
-    { 8192, "afe101fbe745bb449ae4f50d10801456" },
-    {16384, "9741706d0b1c923340c4660ff97cacdf" },
-    {18432, "b0217becb73cb8f61fd79c7ce9d023fb" },
-    { 0, NULL },
-};
-
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef;
- * IV          = 0x12345678, 0x90abcdef
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- *               0x11, 0x12, 0x13, 0x14
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to 3DES block size (8 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     cbc3desShaMultiSizeTest505[] =
-{
-    {   64, "409187e5bdb0be4a7754ca3747f7433dc4f01b98" },
-    {   80, "1b002ed050be743aa98860cf35659646bb8efcc0" },
-    {  352, "6cbf7ebe50fa4fa6eecc19eca23f9eae553ccfff" },
-    {  512, "cfb5253fb4bf72b743320c30c7e48c54965853b0" },
-    { 1000, "95e04e1ca2937e7c5a9aba9e42d2bcdb8a7af21f" },
-    { 1336, "3b5c1f5eee5837ebf67b83ae01405542d77a6627" },
-    { 1344, "2b3d42ab25615437f98a1ee310b81d07a02badc2" },
-    { 1400, "7f8687df7c1af44e4baf3c934b6cca5ab6bc993e" },
-    { 1408, "473a581c5f04f7527d50793c845471ac87e86430" },
-    { 2048, "e41d20cae7ebe34e6e828ed62b1e5734019037bb" },
-    { 3072, "275664afd7a561d804e6b0d204e53939cde653ae" },
-    { 4048, "0d220cc5b34aeeb46bbbd637dde6290b5a8285a3" },
-    { 6144, "cb393ddcc8b1c206060625b7d822ef9839e67bc5" },
-    { 6400, "dd3317e2a627fc04800f74a4b05bfda00fab0347" },
-    { 6528, "8a74c3b2441ab3f5a7e08895cc432566219a7c41" },
-    { 8192, "b8e6ef3a549ed0e005bd5b8b1a5fe6689e9711a7" },
-    {16384, "55f59404008276cdac0e2ba0d193af2d40eac5ce" },
-    {18432, "86ae6c4fc72369a54cce39938e2d0296cd9c6ec5" },
-    { 0, NULL },
-};
-
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef
- * IV          = 0x12345678, 0x90abcdef
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to AES block size (16 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     cbcAes128md5multiSizeTest506[] =
-{
-    {   16, "7ca4c2ba866751598720c5c4aa0d6786" },
-    {   64, "7dba7fb988e80da609b1fea7254bced8" },
-    {   80, "6b6e863ac5a71d15e3e9b1c86c9ba05f" },
-    {  352, "a1ceb9c2e3021002400d525187a9f38c" },
-    {  512, "596c055c1c55db748379223164075641" },
-    { 1008, "f920989c02f3b3603f53c99d89492377" },
-    { 1344, "2e496b73759d77ed32ea222dbd2e7b41" },
-    { 1408, "7178c046b3a8d772efdb6a71c4991ea4" },
-    { 2048, "a917f0099c69eb94079a8421714b6aad" },
-    { 3072, "693cd5033d7f5391d3c958519fa9e934" },
-    { 4048, "139dca91bcff65b3c40771749052906b" },
-    { 6144, "428d9cef6df4fb70a6e9b6bbe4819e55" },
-    { 6400, "9c0b909e76daa811e12b1fc17000a0c4" },
-    { 6528, "ad876f6297186a7be1f1b907ed860eda" },
-    { 8192, "479cbbaca37dd3191ea1f3e8134a0ef4" },
-    {16384, "60fda559c74f91df538100c9842f2f15" },
-    {18432, "4a3eb1cba1fa45f3981270953f720c42" },
-    { 0, NULL },
-};
-
-
-/* CryptoKey   = 0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef,
- *               0x01234567, 0x89abcdef;
- * IV          = 0x12345678, 0x90abcdef
- * MacKey      = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
- *               0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
- *               0x11, 0x12, 0x13, 0x14
- * InputHexStr = "31323334353637383930" (ASCII = "1234567890")
- * Note: only sizes aligned to AES block size (16 bytes) allowed
- */
-static MV_CESA_SIZE_TEST     cbcAes128sha1multiSizeTest507[] =
-{
-    {   16, "9aa8dc1c45f0946daf78057fa978759c625c1fee" },
-    {   64, "9f588fc1ede851e5f8b20256abc9979465ae2189" },
-    {   80, "13558472d1fc1c90dffec6e5136c7203452d509b" },
-    {  352, "6b93518e006cfaa1f7adb24615e7291fb0a27e06" },
-    {  512, "096874951a77fbbf333e49d80c096ee2016e09bd" },
-    { 1008, "696fc203c2e4b5ae0ec5d1db3f623c490bc6dbac" },
-    { 1344, "79bf77509935ccd3528caaac6a5eb6481f74029b" },
-    { 1408, "627f9462b95fc188e8cfa7eec15119bdc5d4fcf1" },
-    { 2048, "3d50d0c005feba92fe41502d609fced9c882b4d1" },
-    { 3072, "758807e5b983e3a91c06fb218fe0f73f77111e94" },
-    { 4048, "ca90e85242e33f005da3504416a52098d0d31fb2" },
-    { 6144, "8044c1d4fd06642dfc46990b4f18b61ef1e972cf" },
-    { 6400, "166f1f4ea57409f04feba9fb1e39af0e00bd6f43" },
-    { 6528, "0389016a39485d6e330f8b4215ddf718b404f7e9" },
-    { 8192, "6df7ee2a8b61d6f7f860ce8dbf778f0c2a5b508b" },
-    {16384, "a70a6d8dfa1f91ded621c3dbaed34162bc48783f" },
-    {18432, "8dfad627922ce15df1eed10bdbed49244efa57db" },
-    { 0, NULL },
-};
-
-
-void    cesaTestPrintStatus(void);
-
-
-/*------------------------- LOCAL FUNCTIONs ---------------------------------*/
-MV_STATUS testCmd(int sid, int iter, MV_CESA_COMMAND* pCmd,
-                  MV_CESA_TEST_SESSION* pTestSession, MV_U8* pIV, int ivSize);
-MV_STATUS testClose(int idx);
-MV_STATUS testOpen(int idx);
-void close_session(int sid);
-void cesaTestCheckReady(const MV_CESA_RESULT *r);
-void cesaCheckReady(MV_CESA_RESULT* r);
-void printTestResults(int idx, MV_STATUS status, int checkMode);
-void cesaLastResult(void);
-void cesaTestPrintReq(int req, int offset, int size);
-
-void cesaTestPrintStatus(void);
-void cesaTestPrintSession(int idx);
-void sizeTest(int testIdx, int iter, int checkMode);
-void multiTest(int iter, int reqSize, int checkMode);
-void oneTest(int testIdx, int caseIdx,int iter, int reqSize, int checkMode);
-void multiSizeTest(int idx, int iter, int checkMode, char* inputData);
-void cesaTest(int iter, int reqSize, int checkMode);
-void cesaOneTest(int testIdx, int caseIdx,int iter, int reqSize, int checkMode);
-void combiTest(int iter, int reqSize, int checkMode);
-void shaTest(int iter, int reqSize, int checkMode);
-void mdTest(int iter, int reqSize, int checkMode);
-void aesTest(int iter, int reqSize, int checkMode);
-void tripleDesTest(int iter, int reqSize, int checkMode);
-void desTest(int iter, int reqSize, int checkMode);
-void cesaTestStop(void);
-MV_STATUS testRun(int idx, int caseIdx, int iter,int reqSize, int checkMode);
-void cesaTestStart(int bufNum, int bufSize);
-
-
-static MV_U32      getRate(MV_U32* remainder)
-{
-    MV_U32     kBits, milliSec, rate;
-
-    milliSec = 0;
-    if( (cesaEndTicks - cesaBeginTicks) > 0)
-    {
-        milliSec = CESA_TEST_TICK_TO_MS(cesaEndTicks - cesaBeginTicks);
-    }
-    if(milliSec == 0)
-    {
-        if(remainder != NULL)
-            *remainder = 0;
-        return 0;
-    }
-
-    kBits = (cesaIteration*cesaRateSize*8)/1000;
-    rate = kBits/milliSec;
-    if(remainder != NULL)
-        *remainder = ((kBits % milliSec)*10)/milliSec;
-
-    return rate;
-}
-
-static char*    extractMbuf(MV_CESA_MBUF *pMbuf,
-                            int offset, int size, char* hexStr)
-{
-    mvCesaCopyFromMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset, size);
-    mvBinToHex((const MV_U8*)cesaBinBuffer, hexStr, size);
-
-    return hexStr;
-}
-
-static MV_BOOL  cesaCheckMbuf(MV_CESA_MBUF *pMbuf,
-                          const char* hexString, int offset,
-                          int checkSize)
-{
-    MV_BOOL     isFailed = MV_FALSE;
-    MV_STATUS   status;
-    int         size = strlen(hexString)/2;
-    int         checkedSize = 0;
-/*
-    mvOsPrintf("cesaCheckMbuf: pMbuf=%p, offset=%d, checkSize=%d, mBufSize=%d\n",
-                pMbuf, offset, checkSize, pMbuf->mbufSize);
-*/
-    if(pMbuf->mbufSize < (checkSize + offset))
-    {
-        mvOsPrintf("checkSize (%d) is too large: offset=%d, mbufSize=%d\n",
-                    checkSize, offset, pMbuf->mbufSize);
-        return MV_TRUE;
-    }
-    status = mvCesaCopyFromMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset, checkSize);
-    if(status != MV_OK)
-    {
-        mvOsPrintf("CesaTest: Can't copy %d bytes from Mbuf=%p to checkBuf=%p\n",
-                    checkSize, pMbuf, cesaBinBuffer);
-        return MV_TRUE;
-    }
-/*
-    mvDebugMemDump(cesaBinBuffer, size, 1);
-*/
-    mvHexToBin(hexString, (MV_U8*)cesaExpBinBuffer, size);
-
-    /* Compare buffers */
-    while(checkSize > checkedSize)
-    {
-        size = MV_MIN(size, (checkSize - checkedSize));
-        if(memcmp(cesaExpBinBuffer, &cesaBinBuffer[checkedSize], size) != 0)
-        {
-            mvOsPrintf("CheckMbuf failed: checkSize=%d, size=%d, checkedSize=%d\n",
-                        checkSize, size, checkedSize);
-            mvDebugMemDump(&cesaBinBuffer[checkedSize], size, 1);
-            mvDebugMemDump(cesaExpBinBuffer, size, 1);
-
-            isFailed = MV_TRUE;
-            break;
-        }
-        checkedSize += size;
-    }
-
-    return isFailed;
-}
-
-static MV_STATUS    cesaSetMbuf(MV_CESA_MBUF *pMbuf,
-                        const char* hexString,
-                        int offset, int reqSize)
-{
-    MV_STATUS   status = MV_OK;
-    int         copySize, size = strlen(hexString)/2;
-
-    mvHexToBin(hexString, (MV_U8*)cesaBinBuffer, size);
-
-    copySize = 0;
-    while(reqSize > copySize)
-    {
-        size = MV_MIN(size, (reqSize - copySize));
-
-        status = mvCesaCopyToMbuf((MV_U8*)cesaBinBuffer, pMbuf, offset+copySize, size);
-        if(status != MV_OK)
-        {
-            mvOsPrintf("cesaSetMbuf Error: Copy %d of %d bytes to MBuf\n",
-                        copySize, reqSize);
-            break;
-        }
-        copySize += size;
-    }
-    pMbuf->mbufSize = offset+copySize;
-    return status;
-}
-
-static  MV_CESA_TEST_SESSION* getTestSessionDb(int idx, int* pTestIdx)
-{
-    int                 testIdx, dbIdx = idx/100;
-
-    if(dbIdx > MAX_TEST_TYPE)
-    {
-        mvOsPrintf("Wrong index %d - No such test type\n", idx);
-        return NULL;
-    }
-    testIdx = idx % 100;
-
-    if(testIdx >= cesaTestsDB[dbIdx].numSessions)
-    {
-        mvOsPrintf("Wrong index %d - No such test\n", idx);
-        return NULL;
-    }
-    if(pTestIdx != NULL)
-        *pTestIdx = testIdx;
-
-    return  cesaTestsDB[dbIdx].pSessions;
-}
-
-/* Debug */
-void    cesaTestPrintReq(int req, int offset, int size)
-{
-    MV_CESA_MBUF*   pMbuf;
-
-    mvOsPrintf("cesaTestPrintReq: req=%d, offset=%d, size=%d\n", 
-                req, offset, size);
-    mvDebugMemDump(cesaCmdRing, 128, 4);
-
-    pMbuf = cesaCmdRing[req].pSrc;
-    mvCesaDebugMbuf("src", pMbuf, offset,size);
-    pMbuf = cesaCmdRing[req].pDst;
-    mvCesaDebugMbuf("dst", pMbuf, offset, size);
-
-    cesaTestPrintStatus();
-}
-
-void    cesaLastResult(void)
-{
-        mvOsPrintf("Last Result: ReqId = %d, SessionId = %d, rc = (%d)\n",
-                (MV_U32)cesaResult.pReqPrv, cesaResult.sessionId,
-                cesaResult.retCode);
-}
-
-void    printTestResults(int idx, MV_STATUS status, int checkMode)
-{
-    int                     testIdx;
-    MV_CESA_TEST_SESSION*   pTestSessions = getTestSessionDb(idx, &testIdx);
-
-    if(pTestSessions == NULL)
-        return;
-
-    mvOsPrintf("%-35s %4dx%-4d : ", pTestSessions[testIdx].name,
-            cesaIteration, cesaReqSize);
-    if( (status == MV_OK)      &&
-        (cesaCryptoError == 0) &&
-        (cesaError == 0)       &&
-        (cesaReqIdError == 0) )
-    {
-        mvOsPrintf("Passed, Rate=%3u.%u Mbps (%5u cpp)\n", 
-                     cesaRate, cesaRateAfterDot, cesaEndTicks - cesaBeginTicks);
-    }
-    else
-    {
-        mvOsPrintf("Failed, Status = 0x%x\n", status);
-        if(cesaCryptoError > 0)
-            mvOsPrintf("cryptoError : %d\n", cesaCryptoError);
-        if(cesaReqIdError > 0)
-            mvOsPrintf("reqIdError  : %d\n", cesaReqIdError);
-        if(cesaError > 0)
-            mvOsPrintf("cesaError  : %d\n", cesaError);
-    }
-    if(cesaTestIsrMissCount > 0)
-        mvOsPrintf("cesaIsrMissed  : %d\n", cesaTestIsrMissCount);
-}
-
-void cesaCheckReady(MV_CESA_RESULT* r)
-{
-    int             reqId;
-    MV_CESA_MBUF    *pMbuf;
-    MV_BOOL         isFailed;
-
-    cesaResult  =  *r;
-    reqId = (int)cesaResult.pReqPrv;
-    pMbuf = cesaCmdRing[reqId].pDst;
-
-/*
-    mvOsPrintf("cesaCheckReady: reqId=%d, checkOffset=%d, checkSize=%d\n",
-                    reqId, cesaCheckOffset, cesaCheckSize);
-*/
-    /* Check expected reqId */
-    if(reqId != cesaExpReqId)
-    {
-        cesaReqIdError++;
-/*
-        mvOsPrintf("CESA reqId Error: cbIter=%d (%d), reqId=%d, expReqId=%d\n",
-                    cesaCbIter, cesaIteration, reqId, cesaExpReqId);
-*/
-    }
-    else
-    {
-        if( (cesaCheckMode == CESA_FULL_CHECK_MODE) ||
-            (cesaCheckMode == CESA_FAST_CHECK_MODE) )
-        {
-            if(cesaResult.retCode != MV_OK)
-            {
-                cesaError++;
-
-                mvOsPrintf("CESA Error: cbIter=%d (%d), reqId=%d, rc=%d\n",
-                            cesaCbIter, cesaIteration, reqId, cesaResult.retCode);
-            }
-            else
-            {
-                if( (cesaCheckSize > 0) && (cesaOutputHexStr != NULL) )
-                {
-                    /* Check expected output */
-
-                    isFailed = cesaCheckMbuf(pMbuf, cesaOutputHexStr, cesaCheckOffset, cesaCheckSize);
-                    if(isFailed)
-                    {
-                        mvOsPrintf("CESA Crypto Error: cbIter=%d (%d), reqId=%d\n",
-                                    cesaCbIter, cesaIteration, reqId);
-
-                        CESA_TEST_DEBUG_PRINT(("Error: reqId=%d, reqSize=%d, checkOffset=%d, checkSize=%d\n",
-                                    reqId, cesaReqSize, cesaCheckOffset, cesaCheckSize));
-
-                        CESA_TEST_DEBUG_PRINT(("Output str: %s\n", cesaOutputHexStr));
-
-                        CESA_TEST_DEBUG_CODE( mvCesaDebugMbuf("error", pMbuf, 0, cesaCheckOffset+cesaCheckSize) );
-
-                        cesaCryptoError++;
-                    }
-                }
-            }
-        }
-    }
-    if(cesaCheckMode == CESA_SHOW_CHECK_MODE)
-    {
-        extractMbuf(pMbuf, cesaCheckOffset, cesaCheckSize, cesaHexBuffer);
-        mvOsPrintf("%4d, %s\n", cesaCheckOffset, cesaHexBuffer);
-    }
-
-    cesaCbIter++;
-    if(cesaCbIter >= cesaIteration)
-    {
-        cesaCbIter = 0;
-        cesaExpReqId = 0;
-        cesaIsReady = MV_TRUE;
-
-        cesaEndTicks = CESA_TEST_TICK_GET();
-        cesaRate = getRate(&cesaRateAfterDot);
-    }
-    else
-    {
-        cesaExpReqId = reqId + 1;
-        if(cesaExpReqId == CESA_DEF_REQ_SIZE)
-            cesaExpReqId = 0;
-    }
-}
-
-
-#ifdef MV_NETBSD
-static int cesaTestReadyIsr(void *arg)
-#else
-#ifdef __KERNEL__
-static irqreturn_t cesaTestReadyIsr( int irq , void *dev_id)
-#endif
-#ifdef MV_VXWORKS
-void   cesaTestReadyIsr(void)
-#endif
-#endif
-{
-    MV_U32          cause;
-    MV_STATUS       status;
-    MV_CESA_RESULT  result;
-
-    cesaTestIsrCount++;
-    /* Clear cause register */
-    cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
-    if( (cause & MV_CESA_CAUSE_ACC_DMA_ALL_MASK) == 0)
-    {
-        mvOsPrintf("cesaTestReadyIsr: cause=0x%x\n", cause);
-#ifdef MV_NETBSD
-        return 0;
-#else
-#ifdef __KERNEL__
-        return 1;
-#else
-        return;
-#endif
-#endif
-    }
-
-    MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
-
-    while(MV_TRUE)
-    {
-        /* Get Ready requests */
-        status = mvCesaReadyGet(&result);
-        if(status == MV_OK)
-            cesaCheckReady(&result);
-
-        break;
-    }
-    if( (cesaTestFull == 1) && (status != MV_BUSY) )
-    {
-        cesaTestFull = 0;
-        CESA_TEST_WAKE_UP();
-    }
-
-#ifdef __KERNEL__
-    return 1;
-#endif
-}
-
-void
-cesaTestCheckReady(const MV_CESA_RESULT *r)
-{
-	MV_CESA_RESULT result = *r;
-
-	cesaCheckReady(&result);
-
-	if (cesaTestFull == 1) {
-		cesaTestFull = 0;
-		CESA_TEST_WAKE_UP();
-	}
-}
-
-static INLINE int   open_session(MV_CESA_OPEN_SESSION* pOs)
-{
-    MV_U16      sid;
-    MV_STATUS   status;
-
-    status = mvCesaSessionOpen(pOs, (short*)&sid);
-    if(status != MV_OK)
-    {
-        mvOsPrintf("CesaTest: Can't open new session - status = 0x%x\n",
-                    status);
-        return -1;
-    }
-
-    return  (int)sid;
-}
-
-void close_session(int sid)
-{
-    MV_STATUS   status;
-
-    status = mvCesaSessionClose(sid);
-    if(status != MV_OK)
-    {
-        mvOsPrintf("CesaTest: Can't close session %d - status = 0x%x\n",
-                    sid, status);
-    }
-}
-
-MV_STATUS testOpen(int idx)
-{
-    MV_CESA_OPEN_SESSION    os;
-    int                     sid, i, testIdx;
-    MV_CESA_TEST_SESSION*   pTestSession;
-    MV_U16          digestSize = 0;
-
-    pTestSession = getTestSessionDb(idx, &testIdx);
-    if(pTestSession == NULL)
-    {
-        mvOsPrintf("Test %d is not exist\n", idx);
-        return MV_BAD_PARAM;
-    }
-    pTestSession = &pTestSession[testIdx];
-
-    if(pTestSession->sid != -1)
-    {
-        mvOsPrintf("Session for test %d already created: sid=%d\n",
-                    idx, pTestSession->sid);
-        return MV_OK;
-    }
-
-    os.cryptoAlgorithm = pTestSession->cryptoAlgorithm;
-    os.macMode = pTestSession->macAlgorithm;
-    switch(os.macMode)
-    {
-        case MV_CESA_MAC_MD5:
-        case MV_CESA_MAC_HMAC_MD5:
-            digestSize = MV_CESA_MD5_DIGEST_SIZE;
-            break;
-
-        case MV_CESA_MAC_SHA1:
-        case MV_CESA_MAC_HMAC_SHA1:
-            digestSize = MV_CESA_SHA1_DIGEST_SIZE;
-            break;
-
-        case MV_CESA_MAC_NULL:
-            digestSize = 0;
-    }
-    os.cryptoMode = pTestSession->cryptoMode;
-    os.direction = pTestSession->direction;
-    os.operation = pTestSession->operation;
-
-    for(i=0; i<pTestSession->cryptoKeySize; i++)
-        os.cryptoKey[i] = pTestSession->pCryptoKey[i];
-
-    os.cryptoKeyLength = pTestSession->cryptoKeySize;
-
-    for(i=0; i<pTestSession->macKeySize; i++)
-        os.macKey[i] = pTestSession->pMacKey[i];
-
-    os.macKeyLength = pTestSession->macKeySize;
-    os.digestSize = digestSize;
-
-    sid = open_session(&os);
-    if(sid == -1)
-    {
-        mvOsPrintf("Can't open session for test %d: rc=0x%x\n",
-                    idx, cesaResult.retCode);
-        return cesaResult.retCode;
-    }
-    CESA_TEST_DEBUG_PRINT(("Opened session: sid = %d\n", sid));
-    pTestSession->sid = sid;
-    return MV_OK;
-}
-
-MV_STATUS   testClose(int idx)
-{
-    int                     testIdx;
-    MV_CESA_TEST_SESSION*   pTestSession;
-
-    pTestSession = getTestSessionDb(idx, &testIdx);
-    if(pTestSession == NULL)
-    {
-        mvOsPrintf("Test %d is not exist\n", idx);
-        return MV_BAD_PARAM;
-    }
-    pTestSession = &pTestSession[testIdx];
-
-    if(pTestSession->sid == -1)
-    {
-        mvOsPrintf("Test session %d is not opened\n", idx);
-        return MV_NO_SUCH;
-    }
-
-    close_session(pTestSession->sid);
-    pTestSession->sid = -1;
-
-    return MV_OK;
-}
-
-MV_STATUS testCmd(int sid, int iter, MV_CESA_COMMAND* pCmd,
-             MV_CESA_TEST_SESSION* pTestSession, MV_U8* pIV, int ivSize)
-{
-    int                 cmdReqId = 0;
-    int                 i;
-    MV_STATUS           rc = MV_OK;
-    char                ivZeroHex[] = "0000";
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    if(pCmd == NULL)
-    {
-        mvOsPrintf("testCmd failed: pCmd=NULL\n");
-        return MV_BAD_PARAM;
-    }
-    pCmd->sessionId = sid;
-
-    cesaCryptoError = 0;
-    cesaReqIdError = 0;
-    cesaError = 0;
-    cesaTestIsrMissCount = 0;
-    cesaIsReady = MV_FALSE;
-    cesaIteration = iter;
-
-    if(cesaInputHexStr == NULL)
-        cesaInputHexStr = cesaPlainHexEbc;
-
-    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
-    {
-        pCmd->pSrc = (MV_CESA_MBUF*)(cesaCmdRing[i].pSrc);
-        if(pIV != NULL)
-        {
-            /* If IV from SA - set IV in Source buffer to zeros */
-            cesaSetMbuf(pCmd->pSrc, ivZeroHex, 0, pCmd->cryptoOffset);
-            cesaSetMbuf(pCmd->pSrc, cesaInputHexStr, pCmd->cryptoOffset,
-                        (cesaReqSize - pCmd->cryptoOffset));
-        }
-        else
-        {
-            cesaSetMbuf(pCmd->pSrc, cesaInputHexStr, 0, cesaReqSize);
-        }
-        pCmd->pDst = (MV_CESA_MBUF*)(cesaCmdRing[i].pDst);
-        cesaSetMbuf(pCmd->pDst, cesaNullPlainHexText, 0, cesaReqSize);
-
-        memcpy(&cesaCmdRing[i], pCmd, sizeof(*pCmd));
-    }
-
-    if(cesaCheckMode == CESA_SW_SHOW_CHECK_MODE)
-    {
-        MV_U8   pDigest[MV_CESA_MAX_DIGEST_SIZE];
-
-        if(pTestSession->macAlgorithm == MV_CESA_MAC_MD5)
-        {
-            mvMD5(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, pDigest);
-            mvOsPrintf("SW HASH_MD5: reqSize=%d, macLength=%d\n",
-                        cesaReqSize, pCmd->macLength);
-            mvDebugMemDump(pDigest, MV_CESA_MD5_DIGEST_SIZE, 1);
-            return MV_OK;
-        }
-        if(pTestSession->macAlgorithm == MV_CESA_MAC_SHA1)
-        {
-            mvSHA1(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, pDigest);
-            mvOsPrintf("SW HASH_SHA1: reqSize=%d, macLength=%d\n",
-                        cesaReqSize, pCmd->macLength);
-            mvDebugMemDump(pDigest, MV_CESA_SHA1_DIGEST_SIZE, 1);
-            return MV_OK;
-        }
-    }
-
-    cesaBeginTicks = CESA_TEST_TICK_GET();
-    CESA_TEST_DEBUG_CODE( memset(cesaTestTrace, 0, sizeof(cesaTestTrace));
-                     cesaTestTraceIdx = 0;
-    );
-
-    if(cesaCheckMode == CESA_SW_NULL_CHECK_MODE)
-    {
-        volatile MV_U8   pDigest[MV_CESA_MAX_DIGEST_SIZE];
-
-        for(i=0; i<iter; i++)
-        {
-            if(pTestSession->macAlgorithm == MV_CESA_MAC_MD5)
-            {
-                mvMD5(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, (unsigned char*)pDigest);
-            }
-            if(pTestSession->macAlgorithm == MV_CESA_MAC_SHA1)
-            {
-                mvSHA1(pCmd->pSrc->pFrags[0].bufVirtPtr, pCmd->macLength, (MV_U8 *)pDigest);
-            }
-        }
-        cesaEndTicks = CESA_TEST_TICK_GET();
-        cesaRate = getRate(&cesaRateAfterDot);
-        cesaIsReady = MV_TRUE;
-
-        return MV_OK;
-    }
-
-    /*cesaTestIsrCount = 0;*/
-    /*mvCesaDebugStatsClear();*/
-
-#ifndef MV_NETBSD
-    MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
-#endif
-
-    for(i=0; i<iter; i++)
-    {
-        unsigned long flags;
-
-        pCmd = &cesaCmdRing[cmdReqId];
-        pCmd->pReqPrv = (void*)cmdReqId;
-
-        CESA_TEST_LOCK(flags);
-
-        rc = mvCesaAction(pCmd);
-        if(rc == MV_NO_RESOURCE)
-            cesaTestFull = 1;
-
-        CESA_TEST_UNLOCK(flags);
-
-        if(rc == MV_NO_RESOURCE)
-        {
-            CESA_TEST_LOCK(flags);
-            CESA_TEST_WAIT( (cesaTestFull == 0), 100);
-            CESA_TEST_UNLOCK(flags);
-            if(cesaTestFull == 1)
-            {
-                mvOsPrintf("CESA Test timeout: i=%d, iter=%d, cesaTestFull=%d\n",
-                            i, iter, cesaTestFull);
-                cesaTestFull = 0;
-                return MV_TIMEOUT;
-            }
-
-            CESA_TEST_LOCK(flags);
-
-            rc = mvCesaAction(pCmd);
-
-            CESA_TEST_UNLOCK(flags);
-        }
-        if( (rc != MV_OK) && (rc != MV_NO_MORE) )
-        {
-            mvOsPrintf("mvCesaAction failed: rc=%d\n", rc);
-            return rc;
-        }
-
-        cmdReqId++;
-        if(cmdReqId >= CESA_DEF_REQ_SIZE)
-            cmdReqId = 0;
-
-#ifdef MV_LINUX
-        /* Reschedule each 16 requests */
-        if( (i & 0xF) == 0)
-            schedule();
-#endif
-    }
-    return MV_OK;
-}
-
-void    cesaTestStart(int bufNum, int bufSize)
-{
-    int             i, j, idx;
-    MV_CESA_MBUF    *pMbufSrc, *pMbufDst;
-    MV_BUF_INFO     *pFragsSrc, *pFragsDst;
-    char            *pBuf;
-#ifndef MV_NETBSD
-    int             numOfSessions, queueDepth;
-    char            *pSram;
-    MV_STATUS       status;
-    MV_CPU_DEC_WIN  addrDecWin;
-#endif
-
-    cesaCmdRing = mvOsMalloc(sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
-    if(cesaCmdRing == NULL)
-    {
-        mvOsPrintf("testStart: Can't allocate %ld bytes of memory\n",
-                sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
-        return;
-    }
-    memset(cesaCmdRing, 0, sizeof(MV_CESA_COMMAND) * CESA_DEF_REQ_SIZE);
-
-    if(bufNum == 0)
-        bufNum = CESA_DEF_BUF_NUM;
-
-    if(bufSize == 0)
-        bufSize = CESA_DEF_BUF_SIZE;
-
-    cesaBufNum = bufNum;
-    cesaBufSize = bufSize;
-    mvOsPrintf("CESA test started: bufNum = %d, bufSize = %d\n",
-                bufNum, bufSize);
-
-    cesaHexBuffer = mvOsMalloc(2*bufNum*bufSize);
-    if(cesaHexBuffer == NULL)
-    {
-        mvOsPrintf("testStart: Can't malloc %d bytes for cesaHexBuffer.\n",
-                    2*bufNum*bufSize);
-        return;
-    }
-    memset(cesaHexBuffer, 0, (2*bufNum*bufSize));
-
-    cesaBinBuffer = mvOsMalloc(bufNum*bufSize);
-    if(cesaBinBuffer == NULL)
-    {
-        mvOsPrintf("testStart: Can't malloc %d bytes for cesaBinBuffer\n",
-                    bufNum*bufSize);
-        return;
-    }
-    memset(cesaBinBuffer, 0, (bufNum*bufSize));
-
-    cesaExpBinBuffer = mvOsMalloc(bufNum*bufSize);
-    if(cesaExpBinBuffer == NULL)
-    {
-        mvOsPrintf("testStart: Can't malloc %d bytes for cesaExpBinBuffer\n",
-                    bufNum*bufSize);
-        return;
-    }
-    memset(cesaExpBinBuffer, 0, (bufNum*bufSize));
-
-    CESA_TEST_WAIT_INIT();
-
-    pMbufSrc = mvOsMalloc(sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
-    pFragsSrc = mvOsMalloc(sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
-
-    pMbufDst = mvOsMalloc(sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
-    pFragsDst = mvOsMalloc(sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
-
-    if( (pMbufSrc == NULL) || (pFragsSrc == NULL) ||
-        (pMbufDst == NULL) || (pFragsDst == NULL) )
-    {
-        mvOsPrintf("testStart: Can't malloc Src and Dst pMbuf and pFrags structures.\n");
-        /* !!!! Dima cesaTestCleanup();*/
-        return;
-    }
-
-    memset(pMbufSrc, 0, sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
-    memset(pFragsSrc, 0, sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
-
-    memset(pMbufDst, 0, sizeof(MV_CESA_MBUF) * CESA_DEF_REQ_SIZE);
-    memset(pFragsDst, 0, sizeof(MV_BUF_INFO) * bufNum * CESA_DEF_REQ_SIZE);
-
-    mvOsPrintf("Cesa Test Start: pMbufSrc=%p, pFragsSrc=%p, pMbufDst=%p, pFragsDst=%p\n",
-                pMbufSrc, pFragsSrc, pMbufDst, pFragsDst);
-
-    idx = 0;
-    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
-    {
-        pBuf = mvOsIoCachedMalloc(cesaTestOSHandle,bufSize * bufNum * 2,
-				  &cesaReqBufs[i].bufPhysAddr,
-				  &cesaReqBufs[i].memHandle);
-		if(pBuf == NULL)
-    	{
-        	mvOsPrintf("testStart: Can't malloc %d bytes for pBuf\n",
-                    bufSize * bufNum * 2);
-        	return;
-    	}
-
-        memset(pBuf, 0, bufSize * bufNum * 2);
-        mvOsCacheFlush(cesaTestOSHandle,pBuf, bufSize * bufNum * 2);
-        if(pBuf == NULL)
-        {
-            mvOsPrintf("cesaTestStart: Can't allocate %d bytes for req_%d buffers\n",
-                        bufSize * bufNum * 2, i);
-            return;
-        }
-
-        cesaReqBufs[i].bufVirtPtr = (MV_U8*)pBuf;
-        cesaReqBufs[i].bufSize =  bufSize * bufNum * 2;
-
-        cesaCmdRing[i].pSrc = &pMbufSrc[i];
-        cesaCmdRing[i].pSrc->pFrags = &pFragsSrc[idx];
-        cesaCmdRing[i].pSrc->numFrags = bufNum;
-        cesaCmdRing[i].pSrc->mbufSize = 0;
-
-        cesaCmdRing[i].pDst = &pMbufDst[i];
-        cesaCmdRing[i].pDst->pFrags = &pFragsDst[idx];
-        cesaCmdRing[i].pDst->numFrags = bufNum;
-        cesaCmdRing[i].pDst->mbufSize = 0;
-
-        for(j=0; j<bufNum; j++)
-        {
-            cesaCmdRing[i].pSrc->pFrags[j].bufVirtPtr = (MV_U8*)pBuf;
-            cesaCmdRing[i].pSrc->pFrags[j].bufSize = bufSize;
-            pBuf += bufSize;
-            cesaCmdRing[i].pDst->pFrags[j].bufVirtPtr = (MV_U8*)pBuf;
-            cesaCmdRing[i].pDst->pFrags[j].bufSize = bufSize;
-            pBuf += bufSize;
-        }
-        idx += bufNum;
-    }
-
-#ifndef MV_NETBSD
-    if (mvCpuIfTargetWinGet(CRYPT_ENG, &addrDecWin) == MV_OK)
-        pSram = (char*)addrDecWin.addrWin.baseLow;
-    else
-    {
-        mvOsPrintf("mvCesaInit: ERR. mvCpuIfTargetWinGet failed\n");
-        return;
-    }
-
-#ifdef MV_CESA_NO_SRAM
-    pSram = mvOsMalloc(4*1024+8);
-    if(pSram == NULL)
-    {
-        mvOsPrintf("CesaTest: can't allocate %d bytes for SRAM simulation\n",
-                4*1024+8);
-        /* !!!! Dima cesaTestCleanup();*/
-        return;
-    }
-    pSram = (MV_U8*)MV_ALIGN_UP((MV_U32)pSram, 8);
-#endif /* MV_CESA_NO_SRAM */
-
-    numOfSessions = CESA_DEF_SESSION_NUM;
-    queueDepth = CESA_DEF_REQ_SIZE - MV_CESA_MAX_CHAN;
-
-    status = mvCesaInit(numOfSessions, queueDepth, pSram, NULL);
-    if(status != MV_OK)
-    {
-        mvOsPrintf("mvCesaInit is Failed: status = 0x%x\n", status);
-        /* !!!! Dima cesaTestCleanup();*/
-        return;
-    }
-#endif /* !MV_NETBSD */
-
-    /* Prepare data for tests */
-    for(i=0; i<50; i++)
-        strcat((char*)cesaDataHexStr3, "dd");
-
-    strcpy((char*)cesaDataAndMd5digest3,  cesaDataHexStr3);
-    strcpy((char*)cesaDataAndSha1digest3, cesaDataHexStr3);
-
-    /* Digest must be 8 byte aligned */
-    for(; i<56; i++)
-    {
-        strcat((char*)cesaDataAndMd5digest3, "00");
-        strcat((char*)cesaDataAndSha1digest3, "00");
-    }
-    strcat((char*)cesaDataAndMd5digest3,  cesaHmacMd5digestHex3);
-    strcat((char*)cesaDataAndSha1digest3, cesaHmacSha1digestHex3);
-
-#ifndef MV_NETBSD
-    MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
-    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, MV_CESA_CAUSE_ACC_DMA_MASK);
-#endif
-
-#ifdef MV_VXWORKS
-    {
-        MV_STATUS       status;
-
-        status = intConnect((VOIDFUNCPTR *)INT_LVL_CESA, cesaTestReadyIsr, (int)NULL);
-        if (status != OK)
-        {
-            mvOsPrintf("CESA: Can't connect CESA (%d) interrupt, status=0x%x \n",
-                        INT_LVL_CESA, status);
-            /* !!!! Dima cesaTestCleanup();*/
-            return;
-        }
-        cesaSemId = semMCreate(SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
-        if(cesaSemId == NULL)
-        {
-            mvOsPrintf("cesaTestStart: Can't create semaphore\n");
-            return;
-        }
-        intEnable(INT_LVL_CESA);
-    }
-#endif /* MV_VXWORKS */
-
-#if !defined(MV_NETBSD) && defined(__KERNEL__)
-        if( request_irq(CESA_IRQ, cesaTestReadyIsr, (SA_INTERRUPT) , "cesa_test", NULL ) ) 
-        {
-            mvOsPrintf( "cannot assign irq\n" );
-            /* !!!! Dima cesaTestCleanup();*/
-            return;
-        }
-        spin_lock_init( &cesaLock );
-#endif
-}
-
-MV_STATUS   testRun(int idx, int caseIdx, int iter,
-                    int reqSize, int checkMode)
-{
-    int                     testIdx, count, sid, digestSize;
-    int                     blockSize;
-    MV_CESA_TEST_SESSION*   pTestSession;
-    MV_CESA_COMMAND         cmd;
-    MV_STATUS               status;
-
-    memset(&cmd, 0, sizeof(cmd));
-
-    pTestSession = getTestSessionDb(idx, &testIdx);
-    if(pTestSession == NULL)
-    {
-        mvOsPrintf("Test %d is not exist\n", idx);
-        return MV_BAD_PARAM;
-    }
-    pTestSession = &pTestSession[testIdx];
-
-    sid = pTestSession->sid;
-    if(sid == -1)
-    {
-        mvOsPrintf("Test %d is not opened\n", idx);
-        return MV_BAD_STATE;
-    }
-    switch(pTestSession->cryptoAlgorithm)
-    {
-        case MV_CESA_CRYPTO_DES:
-        case MV_CESA_CRYPTO_3DES:
-            blockSize = MV_CESA_DES_BLOCK_SIZE;
-            break;
-
-        case MV_CESA_CRYPTO_AES:
-            blockSize = MV_CESA_AES_BLOCK_SIZE;
-            break;
-
-        case MV_CESA_CRYPTO_NULL:
-            blockSize = 0;
-            break;
-
-        default:
-            mvOsPrintf("cesaTestRun: Bad CryptoAlgorithm=%d\n",
-                pTestSession->cryptoAlgorithm);
-        return MV_BAD_PARAM;
-    }
-    switch(pTestSession->macAlgorithm)
-    {
-        case MV_CESA_MAC_MD5:
-        case MV_CESA_MAC_HMAC_MD5:
-            digestSize = MV_CESA_MD5_DIGEST_SIZE;
-            break;
-
-        case MV_CESA_MAC_SHA1:
-        case MV_CESA_MAC_HMAC_SHA1:
-            digestSize = MV_CESA_SHA1_DIGEST_SIZE;
-            break;
-        default:
-            digestSize = 0;
-    }
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    if(pTestSession->direction == MV_CESA_DIR_ENCODE)
-    {
-        cesaOutputHexStr = cesaTestCases[caseIdx].cipherHexStr;
-        cesaInputHexStr = cesaTestCases[caseIdx].plainHexStr;
-    }
-    else
-    {
-        cesaOutputHexStr = cesaTestCases[caseIdx].plainHexStr;
-        cesaInputHexStr = cesaTestCases[caseIdx].cipherHexStr;
-    }
-
-    cmd.sessionId = sid;
-    if(checkMode == CESA_FAST_CHECK_MODE)
-    {
-        cmd.cryptoLength = cesaTestCases[caseIdx].cryptoLength;
-        cmd.macLength = cesaTestCases[caseIdx].macLength;
-    }
-    else
-    {
-        cmd.cryptoLength = reqSize;
-        cmd.macLength = reqSize;
-    }
-    cesaRateSize = cmd.cryptoLength;
-    cesaReqSize = cmd.cryptoLength;
-    cmd.cryptoOffset = 0;
-    if(pTestSession->operation != MV_CESA_MAC_ONLY)
-    {
-        if( (pTestSession->cryptoMode == MV_CESA_CRYPTO_CBC) ||
-            (pTestSession->cryptoMode == MV_CESA_CRYPTO_CTR) )
-        {
-            cmd.ivOffset = 0;
-            cmd.cryptoOffset = blockSize;
-            if(cesaTestCases[caseIdx].pCryptoIV == NULL)
-            {
-                cmd.ivFromUser = 1;
-            }
-            else
-            {
-                cmd.ivFromUser = 0;
-                mvCesaCryptoIvSet(cesaTestCases[caseIdx].pCryptoIV, blockSize);
-            }
-            cesaReqSize = cmd.cryptoOffset + cmd.cryptoLength;
-        }
-    }
-
-/*
-    mvOsPrintf("ivFromUser=%d, cryptoLength=%d, cesaReqSize=%d, cryptoOffset=%d\n",
-                cmd.ivFromUser, cmd.cryptoLength, cesaReqSize, cmd.cryptoOffset);
-*/
-    if(pTestSession->operation != MV_CESA_CRYPTO_ONLY)
-    {
-        cmd.macOffset = cmd.cryptoOffset;
-
-        if(cesaTestCases[caseIdx].digestOffset == -1)
-        {
-            cmd.digestOffset = cmd.macOffset + cmd.macLength;
-            cmd.digestOffset = MV_ALIGN_UP(cmd.digestOffset, 8);
-        }
-        else
-        {
-            cmd.digestOffset = cesaTestCases[caseIdx].digestOffset;
-        }
-        if( (cmd.digestOffset + digestSize) > cesaReqSize)
-            cesaReqSize = cmd.digestOffset + digestSize;
-    }
-
-    cesaCheckMode = checkMode;
-
-    if(checkMode == CESA_NULL_CHECK_MODE)
-    {
-        cesaCheckSize = 0;
-        cesaCheckOffset = 0;
-    }
-    else
-    {
-        if(pTestSession->operation == MV_CESA_CRYPTO_ONLY)
-        {
-            cesaCheckOffset = 0;
-            cesaCheckSize = cmd.cryptoLength;
-        }
-        else
-        {
-            cesaCheckSize = digestSize;
-            cesaCheckOffset = cmd.digestOffset;
-        }
-    }
-/*
-    mvOsPrintf("reqSize=%d, checkSize=%d, checkOffset=%d, checkMode=%d\n",
-                cesaReqSize, cesaCheckSize, cesaCheckOffset, cesaCheckMode);
-
-    mvOsPrintf("blockSize=%d, ivOffset=%d, ivFromUser=%d, crOffset=%d, crLength=%d\n",
-                blockSize, cmd.ivOffset, cmd.ivFromUser,
-                cmd.cryptoOffset, cmd.cryptoLength);
-
-    mvOsPrintf("macOffset=%d, digestOffset=%d, macLength=%d\n",
-                cmd.macOffset, cmd.digestOffset, cmd.macLength);
-*/
-    status = testCmd(sid, iter, &cmd, pTestSession,
-                     cesaTestCases[caseIdx].pCryptoIV, blockSize);
-
-    if(status != MV_OK)
-        return status;
-
-    /* Wait when all callbacks is received */
-    count = 0;
-    while(cesaIsReady == MV_FALSE)
-    {
-        mvOsSleep(10);
-        count++;
-        if(count > 100)
-        {
-            mvOsPrintf("testRun: Timeout occured\n");
-            return MV_TIMEOUT;
-        }
-    }
-
-    return MV_OK;
-}
-
-
-void cesaTestStop(void)
-{
-    MV_CESA_MBUF    *pMbufSrc, *pMbufDst;
-    MV_BUF_INFO     *pFragsSrc, *pFragsDst;
-    int             i;
-
-    /* Release all allocated memories */
-    pMbufSrc = (MV_CESA_MBUF*)(cesaCmdRing[0].pSrc);
-    pFragsSrc = cesaCmdRing[0].pSrc->pFrags;
-
-    pMbufDst = (MV_CESA_MBUF*)(cesaCmdRing[0].pDst);
-    pFragsDst = cesaCmdRing[0].pDst->pFrags;
-
-    mvOsFree(pMbufSrc);
-    mvOsFree(pMbufDst);
-    mvOsFree(pFragsSrc);
-    mvOsFree(pFragsDst);
-
-    for(i=0; i<CESA_DEF_REQ_SIZE; i++)
-    {
-        mvOsIoCachedFree(cesaTestOSHandle,cesaReqBufs[i].bufSize,
-			 cesaReqBufs[i].bufPhysAddr,cesaReqBufs[i].bufVirtPtr,
-			 cesaReqBufs[i].memHandle);
-    }
-    cesaDataHexStr3[0] = '\0';
-}
-
-void    desTest(int iter, int reqSize, int checkMode)
-{
-    int         mode, i;
-    MV_STATUS   status;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-    i = iter;
-    if(mode != CESA_NULL_CHECK_MODE)
-        i = 1;
-
-    testOpen(0);
-    testOpen(1);
-    testOpen(2);
-    testOpen(3);
-
-/* DES / ECB mode / Encrypt only */
-    status = testRun(0, 1, iter, reqSize, checkMode);
-    printTestResults(0, status, checkMode);
-
-/* DES / ECB mode / Decrypt only */
-    status = testRun(1, 1, iter, reqSize, checkMode);
-    printTestResults(1, status, checkMode);
-
-/* DES / CBC mode / Encrypt only */
-    status = testRun(2, 2, i, reqSize, mode);
-    printTestResults(2, status, mode);
-
-/* DES / CBC mode / Decrypt only */
-    status = testRun(3, 2, iter, reqSize, mode);
-    printTestResults(3, status, mode);
-
-    testClose(0);
-    testClose(1);
-    testClose(2);
-    testClose(3);
-}
-
-void    tripleDesTest(int iter, int reqSize, int checkMode)
-{
-    int         mode, i;
-    MV_STATUS   status;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-    i = iter;
-    if(mode != CESA_NULL_CHECK_MODE)
-        i = 1;
-
-    testOpen(100);
-    testOpen(101);
-    testOpen(102);
-    testOpen(103);
-
-/* 3DES / ECB mode / Encrypt only */
-    status = testRun(100, 1, iter, reqSize, checkMode);
-    printTestResults(100, status, checkMode);
-
-/* 3DES / ECB mode / Decrypt only */
-    status = testRun(101, 1, iter, reqSize, checkMode);
-    printTestResults(101, status, checkMode);
-
-/* 3DES / CBC mode / Encrypt only */
-    status = testRun(102, 2, i, reqSize, mode);
-    printTestResults(102, status, mode);
-
-/* 3DES / CBC mode / Decrypt only */
-    status = testRun(103, 2, iter, reqSize, mode);
-    printTestResults(103, status, mode);
-
-    testClose(100);
-    testClose(101);
-    testClose(102);
-    testClose(103);
-}
-
-void    aesTest(int iter, int reqSize, int checkMode)
-{
-    MV_STATUS   status;
-    int         mode, i;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-
-    i = iter;
-    if(mode != CESA_NULL_CHECK_MODE)
-        i = 1;
-
-    testOpen(200);
-    testOpen(201);
-    testOpen(202);
-    testOpen(203);
-    testOpen(204);
-    testOpen(205);
-    testOpen(206);
-    testOpen(207);
-    testOpen(208);
-
-/* AES-128 Encode ECB mode */
-    status = testRun(200, 3, iter, reqSize, checkMode);
-    printTestResults(200, status, checkMode);
-
-/* AES-128 Decode ECB mode */
-    status = testRun(201, 3, iter, reqSize, checkMode);
-    printTestResults(201, status, checkMode);
-
-/* AES-128 Encode CBC mode (IV from SA) */
-    status = testRun(202, 10, i, reqSize, mode);
-    printTestResults(202, status, mode);
-
-/* AES-128 Encode CBC mode (IV from User) */
-    status = testRun(202, 24, i, reqSize, mode);
-    printTestResults(202, status, mode);
-
-/* AES-128 Decode CBC mode */
-    status = testRun(203, 24, iter, reqSize, mode);
-    printTestResults(203, status, checkMode);
-
-/* AES-192 Encode ECB mode */
-    status = testRun(204, 4, iter, reqSize, checkMode);
-    printTestResults(204, status, checkMode);
-
-/* AES-192 Decode ECB mode */
-    status = testRun(205, 4, iter, reqSize, checkMode);
-    printTestResults(205, status, checkMode);
-
-/* AES-256 Encode ECB mode */
-    status = testRun(206, 5, iter, reqSize, checkMode);
-    printTestResults(206, status, checkMode);
-
-/* AES-256 Decode ECB mode */
-    status = testRun(207, 5, iter, reqSize, checkMode);
-    printTestResults(207, status, checkMode);
-
-#if defined(MV_LINUX)
-/* AES-128 Encode CTR mode */
-    status = testRun(208, 23, iter, reqSize, mode);
-    printTestResults(208, status, checkMode);
-#endif
-    testClose(200);
-    testClose(201);
-    testClose(202);
-    testClose(203);
-    testClose(204);
-    testClose(205);
-    testClose(206);
-    testClose(207);
-    testClose(208);
-}
-
-
-void    mdTest(int iter, int reqSize, int checkMode)
-{
-    int         mode;
-    MV_STATUS   status;
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-
-    testOpen(300);
-    testOpen(301);
-    testOpen(302);
-    testOpen(303);
-    testOpen(305);
-
-/* HMAC-MD5 Generate signature test */
-    status = testRun(300, 6, iter, reqSize, mode);
-    printTestResults(300, status, checkMode);
-
-/* HMAC-MD5 Verify Signature test */
-    status = testRun(301, 7, iter, reqSize, mode);
-    printTestResults(301, status, checkMode);
-
-/* HMAC-MD5 Generate signature test */
-    status = testRun(302, 8, iter, reqSize, mode);
-    printTestResults(302, status, checkMode);
-
-/* HMAC-MD5 Verify Signature test */
-    status = testRun(303, 9, iter, reqSize, mode);
-    printTestResults(303, status, checkMode);
-
-/* HASH-MD5 Generate signature test */
-    status = testRun(305, 15, iter, reqSize, mode);
-    printTestResults(305, status, checkMode);
-
-    testClose(300);
-    testClose(301);
-    testClose(302);
-    testClose(303);
-    testClose(305);
-}
-
-void    shaTest(int iter, int reqSize, int checkMode)
-{
-    int         mode;
-    MV_STATUS   status;
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-
-    testOpen(400);
-    testOpen(401);
-    testOpen(402);
-    testOpen(403);
-    testOpen(405);
-
-/* HMAC-SHA1 Generate signature test */
-    status = testRun(400, 11, iter, reqSize, mode);
-    printTestResults(400, status, checkMode);
-
-/* HMAC-SHA1 Verify Signature test */
-    status = testRun(401, 12, iter, reqSize, mode);
-    printTestResults(401, status, checkMode);
-
-/* HMAC-SHA1 Generate signature test */
-    status = testRun(402, 13, iter, reqSize, mode);
-    printTestResults(402, status, checkMode);
-
-/* HMAC-SHA1 Verify Signature test */
-    status = testRun(403, 14, iter, reqSize, mode);
-    printTestResults(403, status, checkMode);
-
-/* HMAC-SHA1 Generate signature test */
-    status = testRun(405, 16, iter, reqSize, mode);
-    printTestResults(405, status, checkMode);
-
-    testClose(400);
-    testClose(401);
-    testClose(402);
-    testClose(403);
-    testClose(405);
-}
-
-void    combiTest(int iter, int reqSize, int checkMode)
-{
-    MV_STATUS   status;
-    int         mode, i;
-
-    mode = checkMode;
-    if(checkMode == CESA_FULL_CHECK_MODE)
-        mode = CESA_FAST_CHECK_MODE;
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    i = iter;
-    if(mode != CESA_NULL_CHECK_MODE)
-        i = 1;
-
-    testOpen(500);
-    testOpen(501);
-    testOpen(502);
-    testOpen(503);
-    testOpen(504);
-    testOpen(505);
-    testOpen(506);
-    testOpen(507);
-
-/* DES ECB + MD5 encode test */
-    status = testRun(500, 17, iter, reqSize, mode);
-    printTestResults(500, status, mode);
-
-/* DES ECB + SHA1 encode test */
-    status = testRun(501, 18, iter, reqSize, mode);
-    printTestResults(501, status, mode);
-
-/* 3DES ECB + MD5 encode test */
-    status = testRun(502, 17, iter, reqSize, mode);
-    printTestResults(502, status, mode);
-
-/* 3DES ECB + SHA1 encode test */
-    status = testRun(503, 18, iter, reqSize, mode);
-    printTestResults(503, status, mode);
-
-/* 3DES CBC + MD5 encode test */
-    status = testRun(504, 19, i, reqSize, mode);
-    printTestResults(504, status, mode);
-
-/* 3DES CBC + SHA1 encode test */
-    status = testRun(505, 20, i, reqSize, mode);
-    printTestResults(505, status, mode);
-
-/* AES-128 CBC + MD5 encode test */
-    status = testRun(506, 21, i, reqSize, mode);
-    printTestResults(506, status, mode);
-
-/* AES-128 CBC + SHA1 encode test */
-    status = testRun(507, 22, i, reqSize, mode);
-    printTestResults(507, status, mode);
-
-    testClose(500);
-    testClose(501);
-    testClose(502);
-    testClose(503);
-    testClose(504);
-    testClose(505);
-    testClose(506);
-    testClose(507);
-}
-
-void    cesaOneTest(int testIdx, int caseIdx,
-                    int iter, int reqSize, int checkMode)
-{
-    MV_STATUS   status;
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    mvOsPrintf("test=%d, case=%d, size=%d, iter=%d\n",
-                testIdx, caseIdx, reqSize, iter);
-
-    status = testOpen(testIdx);
-
-    status = testRun(testIdx, caseIdx, iter, reqSize, checkMode);
-    printTestResults(testIdx, status, checkMode);
-    status = testClose(testIdx);
-
-}
-
-void    cesaTest(int iter, int reqSize, int checkMode)
-{
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    mvOsPrintf("%d iteration\n", iter);
-    mvOsPrintf("%d size\n\n", reqSize);
-
-/* DES tests */
-    desTest(iter, reqSize, checkMode);
-
-/* 3DES tests */
-    tripleDesTest(iter, reqSize, checkMode);
-
-/* AES tests */
-    aesTest(iter, reqSize, checkMode);
-
-/* MD5 tests */
-    mdTest(iter, reqSize, checkMode);
-
-/* SHA-1 tests */
-    shaTest(iter, reqSize, checkMode);
-}
-
-void    multiSizeTest(int idx, int iter, int checkMode, char* inputData)
-{
-    MV_STATUS               status;
-    int                     i;
-    MV_CESA_SIZE_TEST*      pMultiTest;
-
-    if( testOpen(idx) != MV_OK)
-        return;
-
-    if(iter == 0)
-        iter = CESA_DEF_ITER_NUM;
-
-    if(checkMode == CESA_SHOW_CHECK_MODE)
-    {
-        iter = 1;
-    }
-    else
-        checkMode = CESA_FULL_CHECK_MODE;
-
-    cesaTestCases[0].plainHexStr = inputData;
-    cesaTestCases[0].pCryptoIV = NULL;
-
-    switch(idx)
-    {
-        case 302:
-            pMultiTest = mdMultiSizeTest302;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = cesaDataHexStr3;
-            break;
-
-        case 304:
-            pMultiTest = mdMultiSizeTest304;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 305:
-            pMultiTest = mdMultiSizeTest305;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 402:
-            pMultiTest = shaMultiSizeTest402;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 404:
-            pMultiTest = shaMultiSizeTest404;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 405:
-            pMultiTest = shaMultiSizeTest405;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 502:
-            pMultiTest = tripleDesMdMultiSizeTest502;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 503:
-            pMultiTest = tripleDesShaMultiSizeTest503;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 504:
-            iter = 1;
-            pMultiTest = cbc3desMdMultiSizeTest504;
-            cesaTestCases[0].pCryptoIV = iv1;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 505:
-            iter = 1;
-            pMultiTest = cbc3desShaMultiSizeTest505;
-            cesaTestCases[0].pCryptoIV = iv1;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 506:
-            iter = 1;
-            pMultiTest = cbcAes128md5multiSizeTest506;
-            cesaTestCases[0].pCryptoIV = iv5;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        case 507:
-            iter = 1;
-            pMultiTest = cbcAes128sha1multiSizeTest507;
-            cesaTestCases[0].pCryptoIV = iv5;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-            break;
-
-        default:
-            iter = 1;
-            checkMode = CESA_SHOW_CHECK_MODE;
-            pMultiTest = mdMultiSizeTest302;
-            if(inputData == NULL)
-                cesaTestCases[0].plainHexStr = hashHexStr80;
-    }
-    i = 0;
-    while(pMultiTest[i].outputHexStr != NULL)
-    {
-        cesaTestCases[0].cipherHexStr = (char *)pMultiTest[i].outputHexStr;
-        status = testRun(idx, 0, iter, pMultiTest[i].size,
-                         checkMode);
-        if(checkMode != CESA_SHOW_CHECK_MODE)
-        {
-            cesaReqSize = pMultiTest[i].size;
-            printTestResults(idx, status, checkMode);
-        }
-        if(status != MV_OK)
-            break;
-        i++;
-    }
-    testClose(idx);
-/*
-    mvCesaDebugStatus();
-    cesaTestPrintStatus();
-*/
-}
-
-void    open_session_test(int idx, int caseIdx, int iter)
-{
-    int         reqIdError, cryptoError, openErrors, i;
-    int         openErrDisp[100];
-    MV_STATUS   status;
-
-    memset(openErrDisp, 0, sizeof(openErrDisp));
-    openErrors = 0;
-    reqIdError = 0;
-    cryptoError = 0;
-    for(i=0; i<iter; i++)
-    {
-        status = testOpen(idx);
-        if(status != MV_OK)
-        {
-            openErrors++;
-            openErrDisp[status]++;
-        }
-        else
-        {
-            testRun(idx, caseIdx, 1, 0, CESA_FAST_CHECK_MODE);
-            if(cesaCryptoError > 0)
-                cryptoError++;
-            if(cesaReqIdError > 0)
-                reqIdError++;
-
-            testClose(idx);
-        }
-    }
-    if(cryptoError > 0)
-        mvOsPrintf("cryptoError : %d\n", cryptoError);
-    if(reqIdError > 0)
-        mvOsPrintf("reqIdError  : %d\n", reqIdError);
-
-    if(openErrors > 0)
-    {
-        mvOsPrintf("Open Errors = %d\n", openErrors);
-        for(i=0; i<100; i++)
-        {
-            if(openErrDisp[i] != 0)
-                mvOsPrintf("Error %d - occurs %d times\n", i, openErrDisp[i]);
-        }
-    }
-}
-
-
-void    loopback_test(int idx, int iter, int size, char* pPlainData)
-{
-}
-
-
-#if defined(MV_VXWORKS)
-int testMode = 0;
-unsigned __TASKCONV cesaTask(void* args)
-{
-    int reqSize = cesaReqSize;
-
-    if(testMode == 0)
-    {
-        cesaOneTest(cesaTestIdx, cesaCaseIdx, cesaIteration,
-                    reqSize, cesaCheckMode);
-    }
-    else
-    {
-        if(testMode == 1)
-        {
-            cesaTest(cesaIteration, reqSize, cesaCheckMode);
-            combiTest(cesaIteration, reqSize, cesaCheckMode);
-        }
-        else
-        {
-            multiSizeTest(cesaIdx, cesaIteration, cesaCheckMode, NULL);
-        }
-    }
-    return 0;
-}
-
-void oneTest(int testIdx, int caseIdx,
-              int iter, int reqSize, int checkMode)
-{
-    long    rc;
-
-    cesaIteration = iter;
-    cesaReqSize = cesaRateSize = reqSize;
-    cesaCheckMode = checkMode;
-    testMode = 0;
-    cesaTestIdx = testIdx;
-    cesaCaseIdx = caseIdx;
-    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
-    if (rc != MV_OK)
-    {
-        mvOsPrintf("hMW: Can't create CESA multiCmd test task, rc = %ld\n", rc);
-    }
-}
-
-void multiTest(int iter, int reqSize, int checkMode)
-{
-    long    rc;
-
-    cesaIteration = iter;
-    cesaCheckMode = checkMode;
-    cesaReqSize = reqSize;
-    testMode = 1;
-    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
-    if (rc != MV_OK)
-    {
-        mvOsPrintf("hMW: Can't create CESA multiCmd test task, rc = %ld\n", rc);
-    }
-}
-
-void sizeTest(int testIdx, int iter, int checkMode)
-{
-    long    rc;
-
-    cesaIteration = iter;
-        cesaCheckMode = checkMode;
-        testMode = 2;
-        cesaIdx = testIdx;
-    rc = mvOsTaskCreate("CESA_T", 100, 4*1024, cesaTask, NULL, &cesaTaskId);
-    if (rc != MV_OK)
-    {
-        mvOsPrintf("hMW: Can't create CESA test task, rc = %ld\n", rc);
-    }
-}
-
-#endif /* MV_VXWORKS */
-
-extern void    mvCesaDebugSA(short sid, int mode);
-void    cesaTestPrintSession(int idx)
-{
-    int                     testIdx;
-    MV_CESA_TEST_SESSION*   pTestSession;
-
-    pTestSession = getTestSessionDb(idx, &testIdx);
-    if(pTestSession == NULL)
-    {
-        mvOsPrintf("Test %d is not exist\n", idx);
-        return;
-    }
-    pTestSession = &pTestSession[testIdx];
-
-    if(pTestSession->sid == -1)
-    {
-        mvOsPrintf("Test session %d is not opened\n", idx);
-        return;
-    }
-
-    mvCesaDebugSA(pTestSession->sid, 1);
-}
-
-void    cesaTestPrintStatus(void)
-{
-    mvOsPrintf("\n\t Cesa Test Status\n\n");
-
-    mvOsPrintf("isrCount=%d\n",
-                cesaTestIsrCount);
-
-#ifdef CESA_TEST_DEBUG
-    {
-        int i, j;
-        j = cesaTestTraceIdx;
-        mvOsPrintf("No  Type  Cause   rCause   iCause   Res     Time     pReady    pProc    pEmpty\n");
-        for(i=0; i<MV_CESA_TEST_TRACE_SIZE; i++)
-        {
-            mvOsPrintf("%02d.  %d   0x%04x  0x%04x   0x%04x   0x%02x   0x%02x   %02d   0x%06x  %p  %p  %p\n",
-                j, cesaTestTrace[j].type, cesaTestTrace[j].cause, cesaTestTrace[j].realCause,
-                cesaTestTrace[j].dmaCause, cesaTestTrace[j].resources, cesaTestTrace[j].timeStamp,
-                cesaTestTrace[j].pReqReady, cesaTestTrace[j].pReqProcess, cesaTestTrace[j].pReqEmpty);
-            j++;
-            if(j == MV_CESA_TEST_TRACE_SIZE)
-                j = 0;
-        }
-    }
-#endif /* CESA_TEST_DEBUG */
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.c
deleted file mode 100644
index 9ab29a883a..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mvLru.h"
-/* LRU Cache support */
-
-
-/* Init LRU cache database */
-MV_LRU_CACHE*   mvLruCacheInit(int numOfEntries)
-{
-    int             i;
-    MV_LRU_CACHE*   pLruCache;
-
-    pLruCache = mvOsMalloc(sizeof(MV_LRU_CACHE));
-    if(pLruCache == NULL)
-    {
-        return NULL;
-    }
-    memset(pLruCache, 0, sizeof(MV_LRU_CACHE));
-
-    pLruCache->table = mvOsMalloc(numOfEntries*sizeof(MV_LRU_ENTRY));
-    if(pLruCache->table == NULL)
-    {
-        mvOsFree(pLruCache);
-        return NULL;
-    }
-    memset(pLruCache->table, 0, numOfEntries*sizeof(MV_LRU_ENTRY));
-    pLruCache->tableSize = numOfEntries;
-
-    for(i=0; i<numOfEntries; i++)
-    {
-        pLruCache->table[i].next = i+1;
-        pLruCache->table[i].prev = i-1;         
-    }
-    pLruCache->least = 0;
-    pLruCache->most = numOfEntries-1;   
-
-    return pLruCache;
-}
-
-void    mvLruCacheFinish(MV_LRU_CACHE* pLruCache)
-{
-    mvOsFree(pLruCache->table);
-    mvOsFree(pLruCache);
-}
-
-/* Update LRU cache database after using cache Index */
-void    mvLruCacheIdxUpdate(MV_LRU_CACHE* pLruHndl, int cacheIdx)
-{
-    int prev, next;
-
-    if(cacheIdx == pLruHndl->most)
-        return;
-
-    next = pLruHndl->table[cacheIdx].next;
-    if(cacheIdx == pLruHndl->least)
-    {
-        pLruHndl->least = next;
-    }
-    else
-    {
-        prev = pLruHndl->table[cacheIdx].prev;
-
-        pLruHndl->table[next].prev = prev;
-        pLruHndl->table[prev].next = next;
-    }
-
-    pLruHndl->table[pLruHndl->most].next = cacheIdx;
-    pLruHndl->table[cacheIdx].prev = pLruHndl->most;
-    pLruHndl->most = cacheIdx;
-}
-
-/* Delete LRU cache entry */
-void    mvLruCacheIdxDelete(MV_LRU_CACHE* pLruHndl, int cacheIdx)
-{
-    int prev, next;
-
-    if(cacheIdx == pLruHndl->least)
-        return;
-
-    prev = pLruHndl->table[cacheIdx].prev;
-    if(cacheIdx == pLruHndl->most)
-    {
-        pLruHndl->most = prev;
-    }
-    else
-    {
-        next = pLruHndl->table[cacheIdx].next;
-
-        pLruHndl->table[next].prev = prev;
-        pLruHndl->table[prev].next = next;
-    }
-    pLruHndl->table[pLruHndl->least].prev = cacheIdx;
-    pLruHndl->table[cacheIdx].next = pLruHndl->least;
-    pLruHndl->least = cacheIdx;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.h
deleted file mode 100644
index 896e7f81c1..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvLru.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-/*******************************************************************************
-* mvLru.h - Header File for Least Recently Used Cache algorithm
-*
-* DESCRIPTION:
-*       This header file contains macros typedefs and function declaration for
-*       the Least Recently Used Cache algorithm.
-*
-*******************************************************************************/
-
-#ifndef __mvLru_h__
-#define __mvLru_h__
-
-
-typedef struct
-{
-    int next;
-    int prev;
-} MV_LRU_ENTRY;
-
-typedef struct
-{
-    int             least;
-    int             most;
-    MV_LRU_ENTRY*   table;
-    int             tableSize;
-
-}MV_LRU_CACHE;
-
-
-/* Find Cache index for replacement LRU */
-static INLINE int     mvLruCacheIdxFind(MV_LRU_CACHE* pLruHndl)
-{
-    return pLruHndl->least;
-}
-
-/* Init LRU cache module */
-MV_LRU_CACHE*   mvLruCacheInit(int numOfEntries);
-
-/* Finish LRU cache module */
-void    mvLruCacheFinish(MV_LRU_CACHE* pLruHndl);
-
-/* Update LRU cache database after using cache Index */
-void    mvLruCacheIdxUpdate(MV_LRU_CACHE* pLruHndl, int cacheIdx);
-
-/* Delete LRU cache entry */
-void    mvLruCacheIdxDelete(MV_LRU_CACHE* pLruHndl, int cacheIdx);
-
-
-#endif /* __mvLru_h__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.c
deleted file mode 100644
index 189f6292ef..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mvMD5.h"
-
-static void mvMD5Transform(MV_U32 buf[4], MV_U32 const in[MV_MD5_MAC_LEN]);
- 
-#ifdef  MV_CPU_LE
-#define mvByteReverse(buf, len)   /* Nothing */
-#else
-static void mvByteReverse(unsigned char *buf, unsigned longs);
-
-/*
- * Note: this code is harmless on little-endian machines.
- */
-static void mvByteReverse(unsigned char *buf, unsigned longs)
-{
-    MV_U32 t;
-
-    do 
-    {
-        t = (MV_U32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-                      ((unsigned) buf[1] << 8 | buf[0]);
-        *(MV_U32 *) buf = t;
-        buf += 4;
-    } while (--longs);
-}
-#endif
-
-/*
- * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
- * initialization constants.
- */
-void    mvMD5Init(MV_MD5_CONTEXT *ctx)
-{
-    ctx->buf[0] = 0x67452301;
-    ctx->buf[1] = 0xefcdab89;
-    ctx->buf[2] = 0x98badcfe;
-    ctx->buf[3] = 0x10325476;
-
-    ctx->bits[0] = 0;
-    ctx->bits[1] = 0;
-}
-
-/*
- * Update context to reflect the concatenation of another buffer full
- * of bytes.
- */
-void    mvMD5Update(MV_MD5_CONTEXT *ctx, unsigned char const *buf, unsigned len)
-{
-    MV_U32 t;
-
-    /* Update bitcount */
-
-    t = ctx->bits[0];
-    if ((ctx->bits[0] = t + ((MV_U32) len << 3)) < t)
-        ctx->bits[1]++;         /* Carry from low to high */
-    ctx->bits[1] += len >> 29;
-
-    t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
-
-    /* Handle any leading odd-sized chunks */
-
-    if (t) 
-    {
-        unsigned char *p = (unsigned char *) ctx->in + t;
-
-        t = 64 - t;
-        if (len < t) 
-        {
-            memcpy(p, buf, len);
-            return;
-        }
-        memcpy(p, buf, t);
-        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
-        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
-        buf += t;
-        len -= t;
-    }
-    /* Process data in 64-byte chunks */
-
-    while (len >= 64) 
-    {
-        memcpy(ctx->in, buf, 64);
-        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
-        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
-        buf += 64;
-        len -= 64;
-    }
-
-    /* Handle any remaining bytes of data. */
-
-    memcpy(ctx->in, buf, len);
-}
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-void    mvMD5Final(unsigned char digest[MV_MD5_MAC_LEN], MV_MD5_CONTEXT *ctx)
-{
-    unsigned count;
-    unsigned char *p;
-
-    /* Compute number of bytes mod 64 */
-    count = (ctx->bits[0] >> 3) & 0x3F;
-
-    /* Set the first char of padding to 0x80.  This is safe since there is
-       always at least one byte free */
-    p = ctx->in + count;
-    *p++ = 0x80;
-
-    /* Bytes of padding needed to make 64 bytes */
-    count = 64 - 1 - count;
-
-    /* Pad out to 56 mod 64 */
-    if (count < 8) 
-    {
-        /* Two lots of padding:  Pad the first block to 64 bytes */
-        memset(p, 0, count);
-        mvByteReverse(ctx->in, MV_MD5_MAC_LEN);
-        mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
-
-        /* Now fill the next block with 56 bytes */
-        memset(ctx->in, 0, 56);
-    } 
-    else 
-    {
-        /* Pad block to 56 bytes */
-        memset(p, 0, count - 8);
-    }
-    mvByteReverse(ctx->in, 14);
-
-    /* Append length in bits and transform */
-    ((MV_U32 *) ctx->in)[14] = ctx->bits[0];
-    ((MV_U32 *) ctx->in)[15] = ctx->bits[1];
-
-    mvMD5Transform(ctx->buf, (MV_U32 *) ctx->in);
-    mvByteReverse((unsigned char *) ctx->buf, 4);
-    memcpy(digest, ctx->buf, MV_MD5_MAC_LEN);
-    memset(ctx, 0, sizeof(ctx));        /* In case it's sensitive */
-}
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-        ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data.  MD5Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-static void mvMD5Transform(MV_U32 buf[4], MV_U32 const in[MV_MD5_MAC_LEN])
-{
-    register MV_U32 a, b, c, d;
-
-    a = buf[0];
-    b = buf[1];
-    c = buf[2];
-    d = buf[3];
-
-    MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-    MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-    MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-    MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-    MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-    MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-    MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-    MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-    MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-    MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-    MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-    MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-    MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-    MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-    MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-    MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-    MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-    MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-    MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-    MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-    MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-    MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-    MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-    MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-    MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-    MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-    MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-    MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-    MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-    MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-    MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-    MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-    MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-    MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-    MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-    MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-    MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-    MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-    MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-    MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-    MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-    MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-    MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-    MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-    MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-    MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-    MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-    MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-    MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-    MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-    MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-    MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-    MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-    MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-    MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-    MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-    MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-    MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-    MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-    MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-    MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-    MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-    MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-    MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-    buf[0] += a;
-    buf[1] += b;
-    buf[2] += c;
-    buf[3] += d;
-}
-
-void    mvMD5(unsigned char const *buf, unsigned len, unsigned char* digest)
-{
-    MV_MD5_CONTEXT  ctx;
-
-    mvMD5Init(&ctx);
-    mvMD5Update(&ctx, buf, len);
-    mvMD5Final(digest, &ctx);
-}
-
-
-void    mvHmacMd5(unsigned char const* text, int text_len,
-                  unsigned char const* key, int key_len,
-                  unsigned char* digest)
-{
-    int             i;
-    MV_MD5_CONTEXT  ctx;
-    unsigned char   k_ipad[64+1]; /* inner padding - key XORd with ipad */
-    unsigned char   k_opad[64+1]; /* outer padding - key XORd with opad */
-
-    /* start out by storing key in pads */
-    memset(k_ipad, 0, 64);
-    memcpy(k_ipad, key, key_len);
-    memset(k_opad, 0, 64);
-    memcpy(k_opad, key, key_len);
-
-    /* XOR key with ipad and opad values */
-    for (i=0; i<64; i++) 
-    {
-	    k_ipad[i] ^= 0x36;
-	    k_opad[i] ^= 0x5c;
-    }
-
-    /* perform inner MD5 */
-    mvMD5Init(&ctx);                   /* init ctx for 1st pass */
-    mvMD5Update(&ctx, k_ipad, 64);    /* start with inner pad */
-    mvMD5Update(&ctx, text, text_len); /* then text of datagram */
-    mvMD5Final(digest, &ctx);          /* finish up 1st pass */
-
-    /* perform outer MD5 */
-    mvMD5Init(&ctx);                   /* init ctx for 2nd pass */
-    mvMD5Update(&ctx, k_opad, 64);     /* start with outer pad */
-    mvMD5Update(&ctx, digest, 16);     /* then results of 1st hash */
-    mvMD5Final(digest, &ctx);          /* finish up 2nd pass */
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.h
deleted file mode 100644
index d05c6b66fb..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvMD5.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __mvMD5_h__
-#define __mvMD5_h__
-
-#include "mvMD5.h"
-
-#define MV_MD5_MAC_LEN 16
- 
- 
-typedef struct 
-{
-    MV_U32 buf[4];
-    MV_U32 bits[2];
-    MV_U8  in[64];
-
-} MV_MD5_CONTEXT;
- 
-void mvMD5Init(MV_MD5_CONTEXT *context);
-void mvMD5Update(MV_MD5_CONTEXT *context, unsigned char const *buf,
-                unsigned len);
-void mvMD5Final(unsigned char digest[16], MV_MD5_CONTEXT *context);
-
-void mvMD5(unsigned char const *buf, unsigned len, unsigned char* digest);
-
-void mvHmacMd5(unsigned char const* text, int text_len,
-                  unsigned char const* key, int key_len,
-                  unsigned char* digest);
-  
-
-#endif /* __mvMD5_h__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.c
deleted file mode 100644
index 0e0786b0ca..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mvSHA1.h"
-
-#define SHA1HANDSOFF  
-
-typedef union 
-{
-    MV_U8   c[64];
-    MV_U32  l[16];
-
-} CHAR64LONG16;
-
-static void mvSHA1Transform(MV_U32 state[5], const MV_U8 *buffer); 
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
- 
-#ifdef MV_CPU_LE
-#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | \
-        (rol(block->l[i], 8) & 0x00FF00FF))
-#else
-#define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ \
-        block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) \
-        z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
-        w = rol(w, 30);
-#define R1(v,w,x,y,z,i) \
-        z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
-        w = rol(w, 30);
-#define R2(v,w,x,y,z,i) \
-        z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30);
-#define R3(v,w,x,y,z,i) \
-        z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \
-        w = rol(w, 30);
-#define R4(v,w,x,y,z,i) \
-        z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \
-        w=rol(w, 30);
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-static void    mvSHA1Transform(MV_U32 state[5], const MV_U8 *buffer)
-{
-    MV_U32          a, b, c, d, e;
-    CHAR64LONG16*   block;
-
-#ifdef SHA1HANDSOFF
-    static MV_U32  workspace[16];
-
-    block = (CHAR64LONG16 *) workspace;
-    memcpy(block, buffer, 64);
-#else
-    block = (CHAR64LONG16 *) buffer;
-#endif
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-    /* Wipe variables */
-    a = b = c = d = e = 0;
-}
-
-void    mvSHA1Init(MV_SHA1_CTX* context)
-{
-    /* SHA1 initialization constants */
-    context->state[0] = 0x67452301;
-    context->state[1] = 0xEFCDAB89;
-    context->state[2] = 0x98BADCFE;
-    context->state[3] = 0x10325476;
-    context->state[4] = 0xC3D2E1F0;
-    context->count[0] = context->count[1] = 0;
-}
-
-
-/* Run your data through this. */
-void    mvSHA1Update(MV_SHA1_CTX *context, MV_U8 const *data, 
-                     unsigned int len)
-{
-    MV_U32 i, j;
-
-    j = (context->count[0] >> 3) & 63;
-    if ((context->count[0] += len << 3) < (len << 3))
-            context->count[1]++;
-    context->count[1] += (len >> 29);
-    if ((j + len) > 63) 
-    {
-        memcpy(&context->buffer[j], data, (i = 64-j));
-        mvSHA1Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) 
-        {
-            mvSHA1Transform(context->state, &data[i]);
-        }
-        j = 0;
-    }
-    else
-    {
-        i = 0;
-    }
-    memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-void    mvSHA1Final(MV_U8* digest, MV_SHA1_CTX* context)
-{
-    MV_U32  i;
-    MV_U8   finalcount[8];
-
-    for (i = 0; i < 8; i++) 
-    {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >>
-                      ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-    }
-    mvSHA1Update(context, (const unsigned char *) "\200", 1);
-    while ((context->count[0] & 504) != 448) 
-    {
-        mvSHA1Update(context, (const unsigned char *) "\0", 1);
-    }
-    mvSHA1Update(context, finalcount, 8);  /* Should cause a mvSHA1Transform()
-                                          */
-    for (i = 0; i < 20; i++) 
-    {
-        digest[i] = (unsigned char)
-                    ((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
-    }
-    /* Wipe variables */
-    i = 0;
-    memset(context->buffer, 0, 64);
-    memset(context->state, 0, 20);
-    memset(context->count, 0, 8);
-    memset(finalcount, 0, 8);
-
-#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
-    mvSHA1Transform(context->state, context->buffer);
-#endif 
-}
-
-
-void mvSHA1(MV_U8 const *buf, unsigned int len, MV_U8* digest)
-{
-    MV_SHA1_CTX  ctx;
-
-    mvSHA1Init(&ctx);
-    mvSHA1Update(&ctx, buf, len);
-    mvSHA1Final(digest, &ctx);
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.h
deleted file mode 100644
index 17df9fcdbf..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa/mvSHA1.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __mvSHA1_h__
-#define __mvSHA1_h__
-
-#include "mvSHA1.h"
-
-#define MV_SHA1_MAC_LEN 20
- 
- 
-typedef struct 
-{
-    MV_U32 state[5];
-    MV_U32 count[2];
-    MV_U8  buffer[64];
-
-} MV_SHA1_CTX; 
- 
-void mvSHA1Init(MV_SHA1_CTX *context);
-void mvSHA1Update(MV_SHA1_CTX *context, MV_U8 const *buf, unsigned int len);
-void mvSHA1Final(MV_U8* digest, MV_SHA1_CTX *context);
-
-void mvSHA1(MV_U8 const *buf, unsigned int len, MV_U8* digest);
-  
-
-#endif /* __mvSHA1_h__ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa_ocf_drv.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
deleted file mode 100644
index ccf92276c0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/cesa_ocf_drv.c
+++ /dev/null
@@ -1,1296 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-*******************************************************************************/
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/mm.h>
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <linux/platform_device.h>
-#include <asm/scatterlist.h>
-#include <linux/spinlock.h>
-#include "ctrlEnv/sys/mvSysCesa.h"
-#include "cesa/mvCesa.h" /* moved here before cryptodev.h due to include dependencies */
-#include <cryptodev.h>
-#include <uio.h>
-#include <plat/mv_cesa.h>
-#include <linux/mbus.h>
-#include "mvDebug.h"
-
-#include "cesa/mvMD5.h"
-#include "cesa/mvSHA1.h"
-
-#include "cesa/mvCesaRegs.h"
-#include "cesa/AES/mvAes.h"
-#include "cesa/mvLru.h"
-
-#undef  RT_DEBUG
-#ifdef RT_DEBUG
-static int debug = 1;
-module_param(debug, int, 1);
-MODULE_PARM_DESC(debug, "Enable debug");
-#undef dprintk
-#define dprintk(a...)	if (debug) { printk(a); } else
-#else
-static int debug = 0;
-#undef dprintk
-#define dprintk(a...)
-#endif
-
-
-/* TDMA Regs */
-#define WINDOW_BASE(i) 0xA00 + (i << 3)
-#define WINDOW_CTRL(i) 0xA04 + (i << 3)
-
-/* interrupt handling */
-#undef CESA_OCF_POLLING
-#undef CESA_OCF_TASKLET
-
-#if defined(CESA_OCF_POLLING) && defined(CESA_OCF_TASKLET)
-#error "don't use both tasklet and polling mode"
-#endif
-
-extern int cesaReqResources;
-/* support for spliting action into 2 actions */
-#define CESA_OCF_SPLIT
-
-/* general defines */
-#define CESA_OCF_MAX_SES 128
-#define CESA_Q_SIZE	 64
-
-
-/* data structures */
-struct cesa_ocf_data {
-        int                                      cipher_alg;
-        int                                      auth_alg;
-	int					 encrypt_tn_auth;
-#define  auth_tn_decrypt  encrypt_tn_auth
-	int					 ivlen;
-	int 					 digestlen;
-	short					 sid_encrypt;
-	short					 sid_decrypt;
-	/* fragment workaround sessions */
-	short					 frag_wa_encrypt;
-	short					 frag_wa_decrypt;
-	short					 frag_wa_auth;
-};
-
-/* CESA device data */
-struct cesa_dev {
-	void __iomem *sram;
-	void __iomem *reg;
-        struct mv_cesa_platform_data *plat_data;
-	int irq;
-};
-
-#define DIGEST_BUF_SIZE	32
-struct cesa_ocf_process {
-	MV_CESA_COMMAND 			cesa_cmd;
-	MV_CESA_MBUF 				cesa_mbuf;	
-	MV_BUF_INFO  				cesa_bufs[MV_CESA_MAX_MBUF_FRAGS];
-	char					digest[DIGEST_BUF_SIZE];
-	int					digest_len;
-	struct cryptop 				*crp;
-	int 					need_cb;
-};
-
-/* global variables */
-static int32_t			cesa_ocf_id 		= -1;
-static struct cesa_ocf_data 	*cesa_ocf_sessions[CESA_OCF_MAX_SES];
-static spinlock_t 		cesa_lock;
-static struct cesa_dev cesa_device;
-
-/* static APIs */
-static int 		cesa_ocf_process	(device_t, struct cryptop *, int);
-static int 		cesa_ocf_newsession	(device_t, u_int32_t *, struct cryptoini *);
-static int 		cesa_ocf_freesession	(device_t, u_int64_t);
-static void 		cesa_callback		(unsigned long);
-static irqreturn_t	cesa_interrupt_handler	(int, void *);
-#ifdef CESA_OCF_POLLING
-static void cesa_interrupt_polling(void);
-#endif
-#ifdef CESA_OCF_TASKLET
-static struct tasklet_struct cesa_ocf_tasklet;
-#endif
-
-static struct timeval          tt_start;
-static struct timeval          tt_end;
-
-/*
- * dummy device structure
- */
-
-static struct {
-	softc_device_decl	sc_dev;
-} mv_cesa_dev;
-
-static device_method_t mv_cesa_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	cesa_ocf_newsession),
-	DEVMETHOD(cryptodev_freesession,cesa_ocf_freesession),
-	DEVMETHOD(cryptodev_process,	cesa_ocf_process),
-	DEVMETHOD(cryptodev_kprocess,	NULL),
-};
-
-
-
-/* Add debug Trace */
-#undef CESA_OCF_TRACE_DEBUG
-#ifdef CESA_OCF_TRACE_DEBUG
-
-#define MV_CESA_USE_TIMER_ID    0
-
-typedef struct
-{
-    int             type;       /* 0 - isrEmpty, 1 - cesaReadyGet, 2 - cesaAction */
-    MV_U32          timeStamp;
-    MV_U32          cause;
-    MV_U32          realCause;
-    MV_U32          dmaCause;
-    int             resources;
-    MV_CESA_REQ*    pReqReady;
-    MV_CESA_REQ*    pReqEmpty;
-    MV_CESA_REQ*    pReqProcess;
-} MV_CESA_TEST_TRACE;
-
-#define MV_CESA_TEST_TRACE_SIZE      50
-
-static int cesaTestTraceIdx = 0;
-static MV_CESA_TEST_TRACE    cesaTestTrace[MV_CESA_TEST_TRACE_SIZE];
-
-static void cesaTestTraceAdd(int type)
-{
-    cesaTestTrace[cesaTestTraceIdx].type = type;
-    cesaTestTrace[cesaTestTraceIdx].realCause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
-    //cesaTestTrace[cesaTestTraceIdx].idmaCause = MV_REG_READ(IDMA_CAUSE_REG);
-    cesaTestTrace[cesaTestTraceIdx].resources = cesaReqResources;
-    cesaTestTrace[cesaTestTraceIdx].pReqReady = pCesaReqReady;
-    cesaTestTrace[cesaTestTraceIdx].pReqEmpty = pCesaReqEmpty;
-    cesaTestTrace[cesaTestTraceIdx].pReqProcess = pCesaReqProcess;
-    cesaTestTrace[cesaTestTraceIdx].timeStamp = mvCntmrRead(MV_CESA_USE_TIMER_ID);
-    cesaTestTraceIdx++;
-    if(cesaTestTraceIdx == MV_CESA_TEST_TRACE_SIZE)
-        cesaTestTraceIdx = 0;
-}
-
-#else /* CESA_OCF_TRACE_DEBUG */
-
-#define cesaTestTraceAdd(x)
-
-#endif /* CESA_OCF_TRACE_DEBUG */
-
-unsigned int
-get_usec(unsigned int start)
-{
-	if(start) {
-		do_gettimeofday (&tt_start);
-		return 0;
-	}
-	else {
-        	do_gettimeofday (&tt_end);
-        	tt_end.tv_sec -= tt_start.tv_sec;
-        	tt_end.tv_usec -= tt_start.tv_usec;
-        	if (tt_end.tv_usec < 0) {
-                	tt_end.tv_usec += 1000 * 1000;
-                	tt_end.tv_sec -= 1;
-        	}
-	}
-	printk("time taken is  %d\n", (unsigned int)(tt_end.tv_usec + tt_end.tv_sec * 1000000));
-	return (tt_end.tv_usec + tt_end.tv_sec * 1000000);
-}
-
-#ifdef RT_DEBUG
-/* 
- * check that the crp action match the current session
- */
-static int 
-ocf_check_action(struct cryptop *crp, struct cesa_ocf_data *cesa_ocf_cur_ses) {
-	int count = 0;
-	int encrypt = 0, decrypt = 0, auth = 0;
-	struct cryptodesc *crd;
-
-        /* Go through crypto descriptors, processing as we go */
-        for (crd = crp->crp_desc; crd; crd = crd->crd_next, count++) {
-		if(count > 2) {
-			printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
-			return 1;
-		}
-		
-		/* Encryption /Decryption */
-		if(crd->crd_alg == cesa_ocf_cur_ses->cipher_alg) {
-			/* check that the action is compatible with session */
-			if(encrypt || decrypt) {
-				printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
-				return 1;
-			}
-
-			if(crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-				if( (count == 2) && (cesa_ocf_cur_ses->encrypt_tn_auth) ) {
-					printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
-					return 1;
-				}
-				encrypt++;
-			}
-			else { 					/* decrypt */
-				if( (count == 2) && !(cesa_ocf_cur_ses->auth_tn_decrypt) ) {
-					printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
-					return 1;
-				}
-				decrypt++;
-			}
-
-		}
-		/* Authentication */
-		else if(crd->crd_alg == cesa_ocf_cur_ses->auth_alg) {
-			/* check that the action is compatible with session */
-			if(auth) {
-				printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
-				return 1;
-			}
-			if( (count == 2) && (decrypt) && (cesa_ocf_cur_ses->auth_tn_decrypt)) {
-				printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
-				return 1;
-			}
-			if( (count == 2) && (encrypt) && !(cesa_ocf_cur_ses->encrypt_tn_auth)) {
-				printk("%s,%d: sequence isn't supported by this session.\n", __FILE__, __LINE__);
-				return 1;
-			}
-			auth++;
-		} 
-		else {
-			printk("%s,%d: Alg isn't supported by this session.\n", __FILE__, __LINE__);
-			return 1;
-		}
-	}
-	return 0;
-
-}
-#endif
-
-/*
- * Process a request.
- */
-static int 
-cesa_ocf_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct cesa_ocf_process *cesa_ocf_cmd = NULL;
-	struct cesa_ocf_process *cesa_ocf_cmd_wa = NULL;
-	MV_CESA_COMMAND	*cesa_cmd;
-	struct cryptodesc *crd;
-	struct cesa_ocf_data *cesa_ocf_cur_ses;
-	int sid = 0, temp_len = 0, i;
-	int encrypt = 0, decrypt = 0, auth = 0;
-	int  status;
-	struct sk_buff *skb = NULL;
-	struct uio *uiop = NULL;
-	unsigned char *ivp;
-	MV_BUF_INFO *p_buf_info;	
-	MV_CESA_MBUF *p_mbuf_info;
-	unsigned long flags;
-
-        dprintk("%s()\n", __FUNCTION__);
-
-	if( cesaReqResources <= 1 ) {
-                dprintk("%s,%d: ERESTART\n", __FILE__, __LINE__);
-                return ERESTART;
-	}
-
-#ifdef RT_DEBUG
-        /* Sanity check */
-        if (crp == NULL) {
-                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-                return EINVAL;
-        }
-
-        if (crp->crp_desc == NULL || crp->crp_buf == NULL ) {
-                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-                crp->crp_etype = EINVAL;
-                return EINVAL;
-        }
-
-        sid = crp->crp_sid & 0xffffffff;
-        if ((sid >= CESA_OCF_MAX_SES) || (cesa_ocf_sessions[sid] == NULL)) {
-                crp->crp_etype = ENOENT;
-                printk("%s,%d: ENOENT session %d \n", __FILE__, __LINE__, sid);
-                return EINVAL;
-        }
-#endif
-
-	sid = crp->crp_sid & 0xffffffff;
-	crp->crp_etype = 0;
-	cesa_ocf_cur_ses = cesa_ocf_sessions[sid];
-
-#ifdef RT_DEBUG
-	if(ocf_check_action(crp, cesa_ocf_cur_ses)){
-		goto p_error;
-	}
-#endif
-
-	/* malloc a new  cesa process */	
-	cesa_ocf_cmd = kmalloc(sizeof(struct cesa_ocf_process), GFP_ATOMIC);
-	
-        if (cesa_ocf_cmd == NULL) {
-            	printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
-            	goto p_error;
-      	}
-	memset(cesa_ocf_cmd, 0, sizeof(struct cesa_ocf_process));
-
-	/* init cesa_process */
-	cesa_ocf_cmd->crp = crp;
-	/* always call callback */
-	cesa_ocf_cmd->need_cb = 1;
-
-	/* init cesa_cmd for usage of the HALs */
-	cesa_cmd = &cesa_ocf_cmd->cesa_cmd;
-	cesa_cmd->pReqPrv = (void *)cesa_ocf_cmd;
-	cesa_cmd->sessionId = cesa_ocf_cur_ses->sid_encrypt; /* defualt use encrypt */
-
-	/* prepare src buffer 	*/
-	/* we send the entire buffer to the HAL, even if only part of it should be encrypt/auth.  */
-	/* if not using seesions for both encrypt and auth, then it will be wiser to to copy only */
-	/* from skip to crd_len. 								  */
-	p_buf_info = cesa_ocf_cmd->cesa_bufs;	
-	p_mbuf_info = &cesa_ocf_cmd->cesa_mbuf;
-
-	p_buf_info += 2; /* save 2 first buffers for IV and digest - 
-			    we won't append them to the end since, they 
-			    might be places in an unaligned addresses. */
-	
-	p_mbuf_info->pFrags = p_buf_info;
-	temp_len = 0;
-
-	/* handle SKB */
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		
-		dprintk("%s,%d: handle SKB.\n", __FILE__, __LINE__);
-		skb = (struct sk_buff *) crp->crp_buf;
-
-                if (skb_shinfo(skb)->nr_frags >= (MV_CESA_MAX_MBUF_FRAGS - 1)) {
-                        printk("%s,%d: %d nr_frags > MV_CESA_MAX_MBUF_FRAGS", __FILE__, __LINE__, skb_shinfo(skb)->nr_frags);
-                        goto p_error;
-                }
-
-		p_mbuf_info->mbufSize = skb->len;
-		temp_len = skb->len;
-        	/* first skb fragment */
-        	p_buf_info->bufSize = skb_headlen(skb);
-        	p_buf_info->bufVirtPtr = skb->data;
-		p_buf_info++;
-
-        	/* now handle all other skb fragments */
-        	for ( i = 0; i < skb_shinfo(skb)->nr_frags; i++ ) {
-            		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-            		p_buf_info->bufSize = frag->size;
-            		p_buf_info->bufVirtPtr = page_address(frag->page) + frag->page_offset;
-            		p_buf_info++;
-        	}
-        	p_mbuf_info->numFrags = skb_shinfo(skb)->nr_frags + 1;
-	}
-	/* handle UIO */
-	else if(crp->crp_flags & CRYPTO_F_IOV) {
-	
-		dprintk("%s,%d: handle UIO.\n", __FILE__, __LINE__);
-		uiop = (struct uio *) crp->crp_buf;
-
-                if (uiop->uio_iovcnt > (MV_CESA_MAX_MBUF_FRAGS - 1)) {
-                        printk("%s,%d: %d uio_iovcnt > MV_CESA_MAX_MBUF_FRAGS \n", __FILE__, __LINE__, uiop->uio_iovcnt);
-                        goto p_error;
-                }
-
-		p_mbuf_info->mbufSize = crp->crp_ilen;
-		p_mbuf_info->numFrags = uiop->uio_iovcnt;
-		for(i = 0; i < uiop->uio_iovcnt; i++) {
-			p_buf_info->bufVirtPtr = uiop->uio_iov[i].iov_base;
-			p_buf_info->bufSize = uiop->uio_iov[i].iov_len;
-			temp_len += p_buf_info->bufSize;
-			dprintk("%s,%d: buf %x-> addr %x, size %x \n"
-				, __FILE__, __LINE__, i, (unsigned int)p_buf_info->bufVirtPtr, p_buf_info->bufSize);
-			p_buf_info++;			
-		}
-
-	}
-	/* handle CONTIG */
-	else {
-		dprintk("%s,%d: handle CONTIG.\n", __FILE__, __LINE__); 
-		p_mbuf_info->numFrags = 1;
-		p_mbuf_info->mbufSize = crp->crp_ilen;
-		p_buf_info->bufVirtPtr = crp->crp_buf;
-		p_buf_info->bufSize = crp->crp_ilen;
-		temp_len = crp->crp_ilen;
-		p_buf_info++;
-	}
-	
-	/* Support up to 64K why? cause! */
-	if(crp->crp_ilen > 64*1024) {
-		printk("%s,%d: buf too big %x \n", __FILE__, __LINE__, crp->crp_ilen);
-		goto p_error;
-	}
-
-	if( temp_len != crp->crp_ilen ) {
-		printk("%s,%d: warning size don't match.(%x %x) \n", __FILE__, __LINE__, temp_len, crp->crp_ilen);
-	}	
-
-	cesa_cmd->pSrc = p_mbuf_info;
-	cesa_cmd->pDst = p_mbuf_info;
-	
-	/* restore p_buf_info to point to first available buf */
-	p_buf_info = cesa_ocf_cmd->cesa_bufs;	
-	p_buf_info += 1; 
-
-
-        /* Go through crypto descriptors, processing as we go */
-        for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-		
-		/* Encryption /Decryption */
-		if(crd->crd_alg == cesa_ocf_cur_ses->cipher_alg) {
-
-			dprintk("%s,%d: cipher", __FILE__, __LINE__);
-
-			cesa_cmd->cryptoOffset = crd->crd_skip;
-    	              	cesa_cmd->cryptoLength = crd->crd_len;
-
-			if(crd->crd_flags & CRD_F_ENCRYPT) { /* encrypt */
-				dprintk(" encrypt \n");
-				encrypt++;
-
-				/* handle IV */
-				if (crd->crd_flags & CRD_F_IV_EXPLICIT) {  /* IV from USER */
-					dprintk("%s,%d: IV from USER (offset %x) \n", __FILE__, __LINE__, crd->crd_inject);
-					cesa_cmd->ivFromUser = 1;
-					ivp = crd->crd_iv;
-
-                                	/*
-                                 	 * do we have to copy the IV back to the buffer ?
-                                 	 */
-                                	if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-						dprintk("%s,%d: copy the IV back to the buffer\n", __FILE__, __LINE__);
-						cesa_cmd->ivOffset = crd->crd_inject;
-						crypto_copy_bits_back(crp->crp_buf, crd->crd_inject, ivp, cesa_ocf_cur_ses->ivlen);
-                                	}
-					else {
-						dprintk("%s,%d: don't copy the IV back to the buffer \n", __FILE__, __LINE__);
-						p_mbuf_info->numFrags++;
-						p_mbuf_info->mbufSize += cesa_ocf_cur_ses->ivlen; 
-						p_mbuf_info->pFrags = p_buf_info;
-
-						p_buf_info->bufVirtPtr = ivp;
-						p_buf_info->bufSize = cesa_ocf_cur_ses->ivlen; 
-						p_buf_info--;
-
-						/* offsets */
-						cesa_cmd->ivOffset = 0;
-						cesa_cmd->cryptoOffset += cesa_ocf_cur_ses->ivlen;
-						if(auth) {
-							cesa_cmd->macOffset += cesa_ocf_cur_ses->ivlen;
-							cesa_cmd->digestOffset += cesa_ocf_cur_ses->ivlen; 
-						}	
-					}
-                                }
-				else {					/* random IV */
-					dprintk("%s,%d: random IV \n", __FILE__, __LINE__);
-					cesa_cmd->ivFromUser = 0;
-
-                                	/*
-                                 	 * do we have to copy the IV back to the buffer ?
-                                 	 */
-					/* in this mode the HAL will always copy the IV */
-					/* given by the session to the ivOffset  	*/
-					if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-						cesa_cmd->ivOffset = crd->crd_inject;
-					} 
-					else {
-						/* if IV isn't copy, then how will the user know which IV did we use??? */
-						printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-						goto p_error; 
-					}
-				}
-			}
-			else { 					/* decrypt */
-				dprintk(" decrypt \n");
-				decrypt++;
-				cesa_cmd->sessionId = cesa_ocf_cur_ses->sid_decrypt;
-
-				/* handle IV */
-				if (crd->crd_flags & CRD_F_IV_EXPLICIT) {
-					dprintk("%s,%d: IV from USER \n", __FILE__, __LINE__);
-					/* append the IV buf to the mbuf */
-					cesa_cmd->ivFromUser = 1;	
-					p_mbuf_info->numFrags++;
-					p_mbuf_info->mbufSize += cesa_ocf_cur_ses->ivlen; 
-					p_mbuf_info->pFrags = p_buf_info;
-
-					p_buf_info->bufVirtPtr = crd->crd_iv;
-					p_buf_info->bufSize = cesa_ocf_cur_ses->ivlen; 
-					p_buf_info--;
-
-					/* offsets */
-					cesa_cmd->ivOffset = 0;
-					cesa_cmd->cryptoOffset += cesa_ocf_cur_ses->ivlen;
-					if(auth) {
-						cesa_cmd->macOffset += cesa_ocf_cur_ses->ivlen;
-						cesa_cmd->digestOffset += cesa_ocf_cur_ses->ivlen; 
-					}
-                                }
-				else {
-					dprintk("%s,%d: IV inside the buffer \n", __FILE__, __LINE__);
-					cesa_cmd->ivFromUser = 0;
-					cesa_cmd->ivOffset = crd->crd_inject;
-				}
-			}
-
-		}
-		/* Authentication */
-		else if(crd->crd_alg == cesa_ocf_cur_ses->auth_alg) {
-			dprintk("%s,%d:  Authentication \n", __FILE__, __LINE__);
-			auth++;
-			cesa_cmd->macOffset = crd->crd_skip;
-			cesa_cmd->macLength = crd->crd_len;
-
-			/* digest + mac */
-			cesa_cmd->digestOffset = crd->crd_inject;
-		} 
-		else {
-			printk("%s,%d: Alg isn't supported by this session.\n", __FILE__, __LINE__);
-			goto p_error;
-		}
-	}
-
-	dprintk("\n");
-	dprintk("%s,%d: Sending Action: \n", __FILE__, __LINE__);
-	dprintk("%s,%d: IV from user: %d. IV offset %x \n",  __FILE__, __LINE__, cesa_cmd->ivFromUser, cesa_cmd->ivOffset);
-	dprintk("%s,%d: crypt offset %x len %x \n", __FILE__, __LINE__, cesa_cmd->cryptoOffset, cesa_cmd->cryptoLength);
-	dprintk("%s,%d: Auth offset %x len %x \n", __FILE__, __LINE__, cesa_cmd->macOffset, cesa_cmd->macLength);
-	dprintk("%s,%d: set digest in offset %x . \n", __FILE__, __LINE__, cesa_cmd->digestOffset);
-	if(debug) {
-		mvCesaDebugMbuf("SRC BUFFER", cesa_cmd->pSrc, 0, cesa_cmd->pSrc->mbufSize);
-	}
-
-
-	/* send action to HAL */
-	spin_lock_irqsave(&cesa_lock, flags);
-	status = mvCesaAction(cesa_cmd);
-	spin_unlock_irqrestore(&cesa_lock, flags);
-
-	/* action not allowed */
-	if(status == MV_NOT_ALLOWED) {
-#ifdef CESA_OCF_SPLIT
-		/* if both encrypt and auth try to split */
-		if(auth && (encrypt || decrypt)) {
-			MV_CESA_COMMAND	*cesa_cmd_wa;
-
-			/* malloc a new cesa process and init it */	
-			cesa_ocf_cmd_wa = kmalloc(sizeof(struct cesa_ocf_process), GFP_ATOMIC);
-	
-        		if (cesa_ocf_cmd_wa == NULL) {
-            			printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
-            			goto p_error;
-      			}
-			memcpy(cesa_ocf_cmd_wa, cesa_ocf_cmd, sizeof(struct cesa_ocf_process));
-			cesa_cmd_wa = &cesa_ocf_cmd_wa->cesa_cmd;
-			cesa_cmd_wa->pReqPrv = (void *)cesa_ocf_cmd_wa;
-			cesa_ocf_cmd_wa->need_cb = 0;
-
-			/* break requests to two operation, first operation completion won't call callback */
-			if((decrypt) && (cesa_ocf_cur_ses->auth_tn_decrypt)) {
-				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
-				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_decrypt;
-			}
-			else if((decrypt) && !(cesa_ocf_cur_ses->auth_tn_decrypt)) {
-				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_decrypt;
-				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
-			}
-			else if((encrypt) && (cesa_ocf_cur_ses->encrypt_tn_auth)) {
-				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_encrypt;
-				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
-			}
-			else if((encrypt) && !(cesa_ocf_cur_ses->encrypt_tn_auth)){
-				cesa_cmd_wa->sessionId = cesa_ocf_cur_ses->frag_wa_auth;
-				cesa_cmd->sessionId = cesa_ocf_cur_ses->frag_wa_encrypt;
-			}
-			else {
-				printk("%s,%d: Unsupporterd fragment wa mode \n", __FILE__, __LINE__);
-            			goto p_error;
-			}
-
-			/* send the 2 actions to the HAL */
-			spin_lock_irqsave(&cesa_lock, flags);
-			status = mvCesaAction(cesa_cmd_wa);
-			spin_unlock_irqrestore(&cesa_lock, flags);
-
-			if((status != MV_NO_MORE) && (status != MV_OK)) {
-				printk("%s,%d: cesa action failed, status = 0x%x\n", __FILE__, __LINE__, status);
-				goto p_error;
-			}
-			spin_lock_irqsave(&cesa_lock, flags);
-			status = mvCesaAction(cesa_cmd);
-			spin_unlock_irqrestore(&cesa_lock, flags);
-
-		}
-		/* action not allowed and can't split */
-		else 
-#endif
-		{
-			goto p_error;
-		}
-	}
-
-	/* Hal Q is full, send again. This should never happen */
-	if(status == MV_NO_RESOURCE) {
-		printk("%s,%d: cesa no more resources \n", __FILE__, __LINE__);
-		if(cesa_ocf_cmd)
-			kfree(cesa_ocf_cmd);
-		if(cesa_ocf_cmd_wa)
-			kfree(cesa_ocf_cmd_wa);
-		return ERESTART;
-	} 
-	else if((status != MV_NO_MORE) && (status != MV_OK)) {
-                printk("%s,%d: cesa action failed, status = 0x%x\n", __FILE__, __LINE__, status);
-		goto p_error;
-        }
-
-
-#ifdef CESA_OCF_POLLING
-	cesa_interrupt_polling();
-#endif
-	cesaTestTraceAdd(5);
-
-	return 0;
-p_error:
-	crp->crp_etype = EINVAL;
-	if(cesa_ocf_cmd)
-		kfree(cesa_ocf_cmd);
-	if(cesa_ocf_cmd_wa)
-		kfree(cesa_ocf_cmd_wa);
-       	return EINVAL;
-}
-
-/*
- * cesa callback. 
- */
-static void
-cesa_callback(unsigned long dummy)
-{
-	struct cesa_ocf_process *cesa_ocf_cmd = NULL;
-	struct cryptop 		*crp = NULL;
-	MV_CESA_RESULT  	result[MV_CESA_MAX_CHAN];
-	int 			res_idx = 0,i;
-	MV_STATUS               status;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-#ifdef CESA_OCF_TASKLET
-	disable_irq(cesa_device.irq);
-#endif
-    while(MV_TRUE) {
-	
-		 /* Get Ready requests */
-		spin_lock(&cesa_lock);
-		status = mvCesaReadyGet(&result[res_idx]);
-		spin_unlock(&cesa_lock);
-
-	        cesaTestTraceAdd(2);	
-
-		    if(status != MV_OK) {
-#ifdef CESA_OCF_POLLING
-		        if(status == MV_BUSY) { /* Fragment */
-			        cesa_interrupt_polling();
-			        return;
-		        }
-#endif
-	    	    break;
-    	    }
-	        res_idx++;
-		    break;
-	    }
-	
-	for(i = 0; i < res_idx; i++) {
-
-		if(!result[i].pReqPrv) {
-			printk("%s,%d: warning private is NULL\n", __FILE__, __LINE__);
-			break;
-		}
-
-		cesa_ocf_cmd = result[i].pReqPrv;
-		crp = cesa_ocf_cmd->crp; 
-
-		// ignore HMAC error.
-		//if(result->retCode)
-		//	crp->crp_etype = EIO;	
-	
-#if  defined(CESA_OCF_POLLING) 
-		if(!cesa_ocf_cmd->need_cb){
-			cesa_interrupt_polling();
-		}	
-#endif
-		if(cesa_ocf_cmd->need_cb) {
-			if(debug) {
-				mvCesaDebugMbuf("DST BUFFER", cesa_ocf_cmd->cesa_cmd.pDst, 0, cesa_ocf_cmd->cesa_cmd.pDst->mbufSize);
-			}
-			crypto_done(crp);
-		}
-		kfree(cesa_ocf_cmd);
-    	}
-#ifdef CESA_OCF_TASKLET
-	enable_irq(cesa_device.irq);
-#endif
-
-	cesaTestTraceAdd(3);
-
-	return;
-}
-
-#ifdef CESA_OCF_POLLING
-static void
-cesa_interrupt_polling(void)
-{
-        u32                  	cause;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-  	/* Read cause register */
-	do {
-		cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
-		cause &= MV_CESA_CAUSE_ACC_DMA_ALL_MASK;
-
-	} while (cause == 0);
-		
-	/* clear interrupts */
-    	MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
-
-	cesa_callback(0);
-
-	return;
-}
-
-#endif
-
-/*
- * cesa Interrupt polling routine.
- */
-static irqreturn_t
-cesa_interrupt_handler(int irq, void *arg)
-{
-        u32                  	cause;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	cesaTestTraceAdd(0);
-
-  	/* Read cause register */
-	cause = MV_REG_READ(MV_CESA_ISR_CAUSE_REG);
-
-    	if( (cause & MV_CESA_CAUSE_ACC_DMA_ALL_MASK) == 0)
-    	{
-        /* Empty interrupt */
-		dprintk("%s,%d: cesaTestReadyIsr: cause=0x%x\n", __FILE__, __LINE__, cause);
-        	return IRQ_HANDLED;
-    	}
-	
-	/* clear interrupts */
-    	MV_REG_WRITE(MV_CESA_ISR_CAUSE_REG, 0);
-
-	cesaTestTraceAdd(1);
-#ifdef CESA_OCF_TASKLET	
-	tasklet_hi_schedule(&cesa_ocf_tasklet);
-#else
-	cesa_callback(0);
-#endif
-	return IRQ_HANDLED;
-}
-
-/*
- * Open a session.
- */
-static int 
-/*cesa_ocf_newsession(void *arg, u_int32_t *sid, struct cryptoini *cri)*/
-cesa_ocf_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri)
-{
-	u32 status = 0, i;
-	u32 count = 0, auth = 0, encrypt =0;
-	struct cesa_ocf_data *cesa_ocf_cur_ses;
-	MV_CESA_OPEN_SESSION cesa_session;
-	MV_CESA_OPEN_SESSION *cesa_ses = &cesa_session;
-
-
-        dprintk("%s()\n", __FUNCTION__);
-        if (sid == NULL || cri == NULL) {
-                printk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-                return EINVAL;
-        }
-
-	/* leave first empty like in other implementations */
-        for (i = 1; i < CESA_OCF_MAX_SES; i++) {
-       		if (cesa_ocf_sessions[i] == NULL)
-               		break;
-	}
-
-	if(i >= CESA_OCF_MAX_SES) {
-		printk("%s,%d: no more sessions \n", __FILE__, __LINE__);
-                return EINVAL;
-	}
-
-        cesa_ocf_sessions[i] = (struct cesa_ocf_data *) kmalloc(sizeof(struct cesa_ocf_data), GFP_ATOMIC);
-        if (cesa_ocf_sessions[i] == NULL) {
-                cesa_ocf_freesession(NULL, i);
-                printk("%s,%d: ENOBUFS \n", __FILE__, __LINE__);
-                return ENOBUFS;
-        }
-	dprintk("%s,%d: new session %d \n", __FILE__, __LINE__, i);
-	
-        *sid = i;
-        cesa_ocf_cur_ses = cesa_ocf_sessions[i];
-        memset(cesa_ocf_cur_ses, 0, sizeof(struct cesa_ocf_data));
-	cesa_ocf_cur_ses->sid_encrypt = -1;
-	cesa_ocf_cur_ses->sid_decrypt = -1;
-	cesa_ocf_cur_ses->frag_wa_encrypt = -1;
-	cesa_ocf_cur_ses->frag_wa_decrypt = -1;
-	cesa_ocf_cur_ses->frag_wa_auth = -1;
-
-	/* init the session */	
-	memset(cesa_ses, 0, sizeof(MV_CESA_OPEN_SESSION));
-	count = 1;
-        while (cri) {	
-		if(count > 2) {
-        		printk("%s,%d: don't support more then 2 operations\n", __FILE__, __LINE__);
-        		goto error;
-		}
-                switch (cri->cri_alg) {
-		case CRYPTO_AES_CBC:
-			dprintk("%s,%d: (%d) AES CBC \n", __FILE__, __LINE__, count);
-			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
-			cesa_ocf_cur_ses->ivlen = MV_CESA_AES_BLOCK_SIZE;
-			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_AES;
-			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
-			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
-        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
-        			goto error;
-			}
-			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
-			dprintk("%s,%d: key length %d \n", __FILE__, __LINE__, cri->cri_klen/8);
-			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
-			encrypt += count;
-			break;
-                case CRYPTO_3DES_CBC:
-			dprintk("%s,%d: (%d) 3DES CBC \n", __FILE__, __LINE__, count);
-			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
-			cesa_ocf_cur_ses->ivlen = MV_CESA_3DES_BLOCK_SIZE;
-			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_3DES;
-			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
-			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
-        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
-        			goto error;
-			}
-			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
-			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
-			encrypt += count;
-			break;
-                case CRYPTO_DES_CBC:
-			dprintk("%s,%d: (%d) DES CBC \n", __FILE__, __LINE__, count);
-			cesa_ocf_cur_ses->cipher_alg = cri->cri_alg;
-			cesa_ocf_cur_ses->ivlen = MV_CESA_DES_BLOCK_SIZE;
-			cesa_ses->cryptoAlgorithm = MV_CESA_CRYPTO_DES;
-			cesa_ses->cryptoMode = MV_CESA_CRYPTO_CBC;
-			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
-        			printk("%s,%d: CRYPTO key too long.\n", __FILE__, __LINE__);
-        			goto error;
-			}
-			memcpy(cesa_ses->cryptoKey, cri->cri_key, cri->cri_klen/8);
-			cesa_ses->cryptoKeyLength = cri->cri_klen/8;
-			encrypt += count;
-			break;
-                case CRYPTO_MD5:
-                case CRYPTO_MD5_HMAC:
-			dprintk("%s,%d: (%d) %sMD5 CBC \n", __FILE__, __LINE__, count, (cri->cri_alg != CRYPTO_MD5)? "H-":" ");
-                        cesa_ocf_cur_ses->auth_alg = cri->cri_alg;
-			cesa_ocf_cur_ses->digestlen = (cri->cri_alg == CRYPTO_MD5)? MV_CESA_MD5_DIGEST_SIZE : 12;
-			cesa_ses->macMode = (cri->cri_alg == CRYPTO_MD5)? MV_CESA_MAC_MD5 : MV_CESA_MAC_HMAC_MD5;
-			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
-        			printk("%s,%d: MAC key too long. \n", __FILE__, __LINE__);
-        			goto error;
-			}
-			cesa_ses->macKeyLength = cri->cri_klen/8;
-			memcpy(cesa_ses->macKey, cri->cri_key, cri->cri_klen/8);
-			cesa_ses->digestSize = cesa_ocf_cur_ses->digestlen; 
-			auth += count;
-			break;
-                case CRYPTO_SHA1:
-                case CRYPTO_SHA1_HMAC:
-			dprintk("%s,%d: (%d) %sSHA1 CBC \n", __FILE__, __LINE__, count, (cri->cri_alg != CRYPTO_SHA1)? "H-":" ");
-                        cesa_ocf_cur_ses->auth_alg = cri->cri_alg;
-			cesa_ocf_cur_ses->digestlen = (cri->cri_alg == CRYPTO_SHA1)? MV_CESA_SHA1_DIGEST_SIZE : 12; 
-			cesa_ses->macMode = (cri->cri_alg == CRYPTO_SHA1)? MV_CESA_MAC_SHA1 : MV_CESA_MAC_HMAC_SHA1;
-			if(cri->cri_klen/8 > MV_CESA_MAX_CRYPTO_KEY_LENGTH) {
-        			printk("%s,%d: MAC key too long. \n", __FILE__, __LINE__);
-        			goto error;
-			}
-			cesa_ses->macKeyLength = cri->cri_klen/8;
-			memcpy(cesa_ses->macKey, cri->cri_key, cri->cri_klen/8);
-			cesa_ses->digestSize = cesa_ocf_cur_ses->digestlen;
-			auth += count;
-			break;
-                default:
-                        printk("%s,%d: unknown algo 0x%x\n", __FILE__, __LINE__, cri->cri_alg);
-                        goto error;
-                }
-                cri = cri->cri_next;
-		count++;
-        }
-
-	if((encrypt > 2) || (auth > 2)) {
-		printk("%s,%d: session mode is not supported.\n", __FILE__, __LINE__);
-                goto error;
-	}
-	/* create new sessions in HAL */
-	if(encrypt) {
-		cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
-		/* encrypt session */
-		if(auth == 1) {
-			cesa_ses->operation = MV_CESA_MAC_THEN_CRYPTO;
-		}
-		else if(auth == 2) {
-			cesa_ses->operation = MV_CESA_CRYPTO_THEN_MAC;
-			cesa_ocf_cur_ses->encrypt_tn_auth = 1;
-		}
-		else {
-			cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
-		}
-		cesa_ses->direction = MV_CESA_DIR_ENCODE;
-		status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_encrypt);
-    		if(status != MV_OK) {
-        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-        		goto error;
-    		}	
-		/* decrypt session */
-		if( cesa_ses->operation == MV_CESA_MAC_THEN_CRYPTO ) {
-			cesa_ses->operation = MV_CESA_CRYPTO_THEN_MAC;
-		}
-		else if( cesa_ses->operation == MV_CESA_CRYPTO_THEN_MAC ) {
-			cesa_ses->operation = MV_CESA_MAC_THEN_CRYPTO;
-		}
-		cesa_ses->direction = MV_CESA_DIR_DECODE;
-		status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_decrypt);
-		if(status != MV_OK) {
-        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-        		goto error;
-    		}
-
-		/* preapre one action sessions for case we will need to split an action */
-#ifdef CESA_OCF_SPLIT
-		if(( cesa_ses->operation == MV_CESA_MAC_THEN_CRYPTO ) || 
-			( cesa_ses->operation == MV_CESA_CRYPTO_THEN_MAC )) {
-			/* open one session for encode and one for decode */
-			cesa_ses->operation = MV_CESA_CRYPTO_ONLY;
-			cesa_ses->direction = MV_CESA_DIR_ENCODE;
-			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_encrypt);
-    			if(status != MV_OK) {
-        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-        			goto error;
-    			}
-
-			cesa_ses->direction = MV_CESA_DIR_DECODE;
-			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_decrypt);
-    			if(status != MV_OK) {
-        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-        			goto error;
-    			}
-			/* open one session for auth */	
-			cesa_ses->operation = MV_CESA_MAC_ONLY;
-			cesa_ses->direction = MV_CESA_DIR_ENCODE;
-			status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->frag_wa_auth);
-			if(status != MV_OK) {
-        			printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-				goto error;
-    			}
-		}
-#endif
-	}
-	else { /* only auth */
-		cesa_ses->operation = MV_CESA_MAC_ONLY;
-		cesa_ses->direction = MV_CESA_DIR_ENCODE;
-        	status = mvCesaSessionOpen(cesa_ses, &cesa_ocf_cur_ses->sid_encrypt);
-		if(status != MV_OK) {
-        		printk("%s,%d: Can't open new session - status = 0x%x\n", __FILE__, __LINE__, status);
-			goto error;
-    		}
-	}
-	
-        return 0;
-error:
-     	cesa_ocf_freesession(NULL, *sid);
-      	return EINVAL;	
-
-}
-
-
-/*
- * Free a session.
- */
-static int
-cesa_ocf_freesession(device_t dev, u_int64_t tid)
-{
-        struct cesa_ocf_data *cesa_ocf_cur_ses;
-        u_int32_t sid = CRYPTO_SESID2LID(tid);
-	//unsigned long flags;
-
-        dprintk("%s() %d \n", __FUNCTION__, sid);
-        if ( (sid >= CESA_OCF_MAX_SES) || (cesa_ocf_sessions[sid] == NULL) ) {
-                printk("%s,%d: EINVAL can't free session %d \n", __FILE__, __LINE__, sid);
-                return(EINVAL);
-        }
-
-        /* Silently accept and return */
-        if (sid == 0)
-                return(0);
-
-	/* release session from HAL */
-	cesa_ocf_cur_ses = cesa_ocf_sessions[sid];
-     	if (cesa_ocf_cur_ses->sid_encrypt != -1) {
-		mvCesaSessionClose(cesa_ocf_cur_ses->sid_encrypt);
-	}
-	if (cesa_ocf_cur_ses->sid_decrypt != -1) {
-		mvCesaSessionClose(cesa_ocf_cur_ses->sid_decrypt);
-	}
-     	if (cesa_ocf_cur_ses->frag_wa_encrypt != -1) {
-		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_encrypt);
-	}
-	if (cesa_ocf_cur_ses->frag_wa_decrypt != -1) {
-		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_decrypt);
-	}
-	if (cesa_ocf_cur_ses->frag_wa_auth != -1) {
-		mvCesaSessionClose(cesa_ocf_cur_ses->frag_wa_auth);
-	}
-
-      	kfree(cesa_ocf_cur_ses);
-	cesa_ocf_sessions[sid] = NULL;
-
-        return 0;
-}
-
-
-/* TDMA Window setup */
-
-static void __init
-setup_tdma_mbus_windows(struct cesa_dev *dev)
-{
-    int i;
-    
-    for (i = 0; i < 4; i++) {
-        writel(0, dev->reg + WINDOW_BASE(i));
-        writel(0, dev->reg + WINDOW_CTRL(i));
-    }
-    
-    for (i = 0; i < dev->plat_data->dram->num_cs; i++) {
-        struct mbus_dram_window *cs = dev->plat_data->dram->cs + i;
-        writel(
-            ((cs->size - 1) & 0xffff0000) |
-            (cs->mbus_attr << 8) |
-            (dev->plat_data->dram->mbus_dram_target_id << 4) | 1,
-            dev->reg + WINDOW_CTRL(i)
-        );
-        writel(cs->base, dev->reg + WINDOW_BASE(i));
-    }
-}
-                                        
-/*
- * our driver startup and shutdown routines
- */
-static int
-mv_cesa_ocf_init(struct platform_device *pdev)
-{
-#if defined(CONFIG_MV78200) || defined(CONFIG_MV632X)
-	if (MV_FALSE == mvSocUnitIsMappedToThisCpu(CESA))
-	{
-		dprintk("CESA is not mapped to this CPU\n");
-		return -ENODEV;
-	}		
-#endif
-
-	dprintk("%s\n", __FUNCTION__);
-	memset(&mv_cesa_dev, 0, sizeof(mv_cesa_dev));
-	softc_device_init(&mv_cesa_dev, "MV CESA", 0, mv_cesa_methods);
-	cesa_ocf_id = crypto_get_driverid(softc_get_device(&mv_cesa_dev),CRYPTOCAP_F_HARDWARE);
-
-	if (cesa_ocf_id < 0)
-		panic("MV CESA crypto device cannot initialize!");
-
-	dprintk("%s,%d: cesa ocf device id is %d \n", __FILE__, __LINE__, cesa_ocf_id);
-
-	/* CESA unit is auto power on off */
-#if 0
-	if (MV_FALSE == mvCtrlPwrClckGet(CESA_UNIT_ID,0))
-	{
-		printk("\nWarning CESA %d is Powered Off\n",0);
-		return EINVAL;
-	}
-#endif
-
-	memset(&cesa_device, 0, sizeof(struct cesa_dev));
-	/* Get the IRQ, and crypto memory regions */
-	{
-		struct resource *res;
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");
-		
-		if (!res)
-			return -ENXIO;
-		
-		cesa_device.sram = ioremap(res->start, res->end - res->start + 1);
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
-		
-		if (!res) {
-		        iounmap(cesa_device.sram);
-			return -ENXIO;
-                }
-                cesa_device.reg = ioremap(res->start, res->end - res->start + 1);
-		cesa_device.irq = platform_get_irq(pdev, 0);
-		cesa_device.plat_data = pdev->dev.platform_data;
-	        setup_tdma_mbus_windows(&cesa_device);	
-		
-	}
-	
-	
-	if( MV_OK != mvCesaInit(CESA_OCF_MAX_SES*5, CESA_Q_SIZE, cesa_device.reg,
-				NULL) ) {
-            	printk("%s,%d: mvCesaInit Failed. \n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	/* clear and unmask Int */
-	MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
-#ifndef CESA_OCF_POLLING
-    MV_REG_WRITE( MV_CESA_ISR_MASK_REG, MV_CESA_CAUSE_ACC_DMA_MASK);
-#endif
-#ifdef CESA_OCF_TASKLET
-	tasklet_init(&cesa_ocf_tasklet, cesa_callback, (unsigned int) 0);
-#endif
-	/* register interrupt */
-	if( request_irq( cesa_device.irq, cesa_interrupt_handler,
-                             (IRQF_DISABLED) , "cesa", &cesa_ocf_id) < 0) {
-            	printk("%s,%d: cannot assign irq %x\n", __FILE__, __LINE__, cesa_device.reg);
-		return EINVAL;
-        }
-
-
-	memset(cesa_ocf_sessions, 0, sizeof(struct cesa_ocf_data *) * CESA_OCF_MAX_SES);
-
-#define	REGISTER(alg) \
-	crypto_register(cesa_ocf_id, alg, 0,0)
-	REGISTER(CRYPTO_AES_CBC);
-	REGISTER(CRYPTO_DES_CBC);
-	REGISTER(CRYPTO_3DES_CBC);
-	REGISTER(CRYPTO_MD5);
-	REGISTER(CRYPTO_MD5_HMAC);
-	REGISTER(CRYPTO_SHA1);
-	REGISTER(CRYPTO_SHA1_HMAC);
-#undef REGISTER
-
-	return 0;
-}
-
-static void
-mv_cesa_ocf_exit(struct platform_device *pdev)
-{
-	dprintk("%s()\n", __FUNCTION__);
-
-	crypto_unregister_all(cesa_ocf_id);
-	cesa_ocf_id = -1;
-	iounmap(cesa_device.reg);
-	iounmap(cesa_device.sram);
-	free_irq(cesa_device.irq, NULL);
-	
-	/* mask and clear Int */
-	MV_REG_WRITE( MV_CESA_ISR_MASK_REG, 0);
-	MV_REG_WRITE( MV_CESA_ISR_CAUSE_REG, 0);
-    	
-
-	if( MV_OK != mvCesaFinish() ) {
-            	printk("%s,%d: mvCesaFinish Failed. \n", __FILE__, __LINE__);
-		return;
-	}
-}
-
-
-void cesa_ocf_debug(void)
-{
-
-#ifdef CESA_OCF_TRACE_DEBUG
-    {
-        int i, j;
-        j = cesaTestTraceIdx;
-        mvOsPrintf("No  Type   rCause   iCause   Proc   Isr   Res     Time     pReady    pProc    pEmpty\n");
-        for(i=0; i<MV_CESA_TEST_TRACE_SIZE; i++)
-        {
-            mvOsPrintf("%02d.  %d   0x%04x   0x%04x   0x%02x   0x%02x   %02d   0x%06x  %p  %p  %p\n",
-                j, cesaTestTrace[j].type, cesaTestTrace[j].realCause,
-                cesaTestTrace[j].idmaCause, 
-                cesaTestTrace[j].resources, cesaTestTrace[j].timeStamp,
-                cesaTestTrace[j].pReqReady, cesaTestTrace[j].pReqProcess, cesaTestTrace[j].pReqEmpty);
-            j++;
-            if(j == MV_CESA_TEST_TRACE_SIZE)
-                j = 0;
-        }
-    }
-#endif
-
-}
-
-static struct platform_driver marvell_cesa = {
-	.probe		= mv_cesa_ocf_init,
-	.remove		= mv_cesa_ocf_exit,
-	.driver		= {
-		.owner	= THIS_MODULE,
-		.name	= "mv_crypto",
-	},
-};
-
-MODULE_ALIAS("platform:mv_crypto");
-
-static int __init mv_cesa_init(void)
-{
-	return platform_driver_register(&marvell_cesa);
-}
-
-module_init(mv_cesa_init);
-
-static void __exit mv_cesa_exit(void)
-{
-	platform_driver_unregister(&marvell_cesa);
-}
-
-module_exit(mv_cesa_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Ronen Shitrit");
-MODULE_DESCRIPTION("OCF module for Orion CESA crypto");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h
deleted file mode 100644
index 3769dde2fd..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mv802_3.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmv802_3h
-#define __INCmv802_3h
-
-
-/* includes */
-#include "mvTypes.h"
-
-/* Defines */
-#define MV_MAX_ETH_DATA     1500
-
-/* 802.3 types */
-#define MV_IP_TYPE                  0x0800
-#define MV_IP_ARP_TYPE              0x0806
-#define MV_APPLE_TALK_ARP_TYPE      0x80F3
-#define MV_NOVELL_IPX_TYPE          0x8137
-#define MV_EAPOL_TYPE				0x888e
-
-
-
-/* Encapsulation header for RFC1042 and Ethernet_tunnel */
-
-#define MV_RFC1042_SNAP_HEADER     {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}
-
-#define MV_ETH_SNAP_LSB             0xF8
-
-
-#define	MV_MAC_ADDR_SIZE	(6)
-#define MV_MAC_STR_SIZE		(20)
-#define MV_VLAN_HLEN		(4)
-
-/* This macro checks for a multicast mac address    */
-#define MV_IS_MULTICAST_MAC(mac)  (((mac)[0] & 0x1) == 1)
-
-
-/* This macro checks for an broadcast mac address     */
-#define MV_IS_BROADCAST_MAC(mac)            \
-       (((mac)[0] == 0xFF) &&       \
-        ((mac)[1] == 0xFF) &&       \
-        ((mac)[2] == 0xFF) &&       \
-        ((mac)[3] == 0xFF) &&       \
-        ((mac)[4] == 0xFF) &&       \
-        ((mac)[5] == 0xFF))
-
-
-/* Typedefs */
-typedef struct
-{
-    MV_U8     pDA[MV_MAC_ADDR_SIZE];
-    MV_U8     pSA[MV_MAC_ADDR_SIZE];
-    MV_U16    typeOrLen;
-
-} MV_802_3_HEADER;
-
-enum {
-  MV_IP_PROTO_NULL	= 0,    /* Dummy protocol for TCP               */
-  MV_IP_PROTO_ICMP	= 1,    /* Internet Control Message Protocol    */
-  MV_IP_PROTO_IGMP	= 2,    /* Internet Group Management Protocol   */
-  MV_IP_PROTO_IPIP	= 4,    /* IPIP tunnels (older KA9Q tunnels use 94) */
-  MV_IP_PROTO_TCP	= 6,    /* Transmission Control Protocol        */
-  MV_IP_PROTO_EGP	= 8,    /* Exterior Gateway Protocol            */
-  MV_IP_PROTO_PUP	= 12,   /* PUP protocol                         */
-  MV_IP_PROTO_UDP	= 17,   /* User Datagram Protocol               */
-  MV_IP_PROTO_IDP	= 22,   /* XNS IDP protocol                     */
-  MV_IP_PROTO_DCCP	= 33,   /* Datagram Congestion Control Protocol */
-  MV_IP_PROTO_IPV6	= 41,   /* IPv6-in-IPv4 tunnelling              */
-  MV_IP_PROTO_RSVP	= 46,   /* RSVP protocol                        */
-  MV_IP_PROTO_GRE	= 47,   /* Cisco GRE tunnels (rfc 1701,1702)    */
-  MV_IP_PROTO_ESP	= 50,   /* Encapsulation Security Payload protocol */
-  MV_IP_PROTO_AH	= 51,   /* Authentication Header protocol       */
-  MV_IP_PROTO_BEETPH	= 94,   /* IP option pseudo header for BEET     */
-  MV_IP_PROTO_PIM	= 103, 
-  MV_IP_PROTO_COMP	= 108,  /* Compression Header protocol          */
-  MV_IP_PROTO_ZERO_HOP	= 114,  /* Any 0 hop protocol (IANA)            */
-  MV_IP_PROTO_SCTP	= 132,  /* Stream Control Transport Protocol    */
-  MV_IP_PROTO_UDPLITE	= 136,  /* UDP-Lite (RFC 3828)                  */
-
-  MV_IP_PROTO_RAW	= 255,  /* Raw IP packets                       */
-  MV_IP_PROTO_MAX
-};
-
-typedef struct
-{
-    MV_U8   version;
-    MV_U8   tos;
-    MV_U16  totalLength;
-    MV_U16  identifier;
-    MV_U16  fragmentCtrl;
-    MV_U8   ttl;
-    MV_U8   protocol;
-    MV_U16  checksum;
-    MV_U32  srcIP;
-    MV_U32  dstIP;
-
-} MV_IP_HEADER; 
-
-typedef struct
-{       
-    MV_U32 spi;
-    MV_U32 seqNum;
-} MV_ESP_HEADER; 
-
-#define MV_ICMP_ECHOREPLY          0       /* Echo Reply                   */
-#define MV_ICMP_DEST_UNREACH       3       /* Destination Unreachable      */
-#define MV_ICMP_SOURCE_QUENCH      4       /* Source Quench                */
-#define MV_ICMP_REDIRECT           5       /* Redirect (change route)      */
-#define MV_ICMP_ECHO               8       /* Echo Request                 */
-#define MV_ICMP_TIME_EXCEEDED      11      /* Time Exceeded                */
-#define MV_ICMP_PARAMETERPROB      12      /* Parameter Problem            */
-#define MV_ICMP_TIMESTAMP          13      /* Timestamp Request            */
-#define MV_ICMP_TIMESTAMPREPLY     14      /* Timestamp Reply              */
-#define MV_ICMP_INFO_REQUEST       15      /* Information Request          */
-#define MV_ICMP_INFO_REPLY         16      /* Information Reply            */
-#define MV_ICMP_ADDRESS            17      /* Address Mask Request         */
-#define MV_ICMP_ADDRESSREPLY       18      /* Address Mask Reply           */
-
-typedef struct
-{
-    MV_U8   type;
-    MV_U8   code;
-    MV_U16  checksum;
-    MV_U16  id;
-    MV_U16  sequence;
-
-} MV_ICMP_ECHO_HEADER;
-
-typedef struct
-{
-    MV_U16  source;
-    MV_U16  dest;
-    MV_U32  seq;
-    MV_U32  ack_seq;
-    MV_U16  flags;
-    MV_U16  window;
-    MV_U16  chksum;
-    MV_U16  urg_offset;
-
-} MV_TCP_HEADER;
-
-typedef struct
-{
-    MV_U16  source;
-    MV_U16  dest;
-    MV_U16  len;
-    MV_U16  check;
-
-} MV_UDP_HEADER;
-
-#endif /* __INCmv802_3h */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c
deleted file mode 100644
index dc0e0cfc45..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mv802_3.h"
-#include "mvCommon.h"
-
-
-/*******************************************************************************
-* mvMacStrToHex - Convert MAC format string to hex.
-*
-* DESCRIPTION:
-*		This function convert MAC format string to hex.
-*
-* INPUT:
-*       macStr - MAC address string. Fornat of address string is 
-*                uu:vv:ww:xx:yy:zz, where ":" can be any delimiter.
-*
-* OUTPUT:
-*       macHex - MAC in hex format.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvMacStrToHex(const char* macStr, MV_U8* macHex)
-{
-    int i;
-    char tmp[3];
-
-    for(i = 0; i < MV_MAC_ADDR_SIZE; i++)
-    {
-        tmp[0] = macStr[(i * 3) + 0];
-        tmp[1] = macStr[(i * 3) + 1];
-        tmp[2] = '\0';
-        macHex[i] = (MV_U8) (strtol(tmp, NULL, 16));
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvMacHexToStr - Convert MAC in hex format to string format.
-*
-* DESCRIPTION:
-*		This function convert MAC in hex format to string format.
-*
-* INPUT:
-*       macHex - MAC in hex format.
-*
-* OUTPUT:
-*       macStr - MAC address string. String format is uu:vv:ww:xx:yy:zz.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvMacHexToStr(MV_U8* macHex, char* macStr)
-{
-	int i;
-
-    for(i = 0; i < MV_MAC_ADDR_SIZE; i++)
-    {
-        mvOsSPrintf(&macStr[i * 3], "%02x:", macHex[i]);
-    }
-    macStr[(i * 3) - 1] = '\0';
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSizePrint - Print the given size with size unit description.
-*
-* DESCRIPTION:
-*		This function print the given size with size unit description.
-*       FOr example when size paramter is 0x180000, the function prints:
-*       "size 1MB+500KB"
-*
-* INPUT:
-*       size - Size in bytes.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvSizePrint(MV_U32 size)
-{
-    mvOsOutput("size ");
-
-    if(size >= _1G)
-    {
-        mvOsOutput("%3dGB ", size / _1G);
-        size %= _1G;
-        if(size)
-            mvOsOutput("+");
-    }
-    if(size >= _1M )
-    {
-        mvOsOutput("%3dMB ", size / _1M);
-        size %= _1M;
-        if(size)
-            mvOsOutput("+");
-    }
-    if(size >= _1K)
-    {
-        mvOsOutput("%3dKB ", size / _1K);
-        size %= _1K;
-        if(size)
-            mvOsOutput("+");
-    }
-    if(size > 0)
-    {
-        mvOsOutput("%3dB ", size);
-    }
-}
-
-/*******************************************************************************
-* mvHexToBin - Convert hex to binary
-*
-* DESCRIPTION:
-*		This function Convert hex to binary.
-*
-* INPUT:
-*       pHexStr - hex buffer pointer.
-*       size    - Size to convert.
-*
-* OUTPUT:
-*       pBin - Binary buffer pointer.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvHexToBin(const char* pHexStr, MV_U8* pBin, int size)
-{
-  	int     j, i;
-    char    tmp[3];
-    MV_U8   byte;
-    
-    for(j=0, i=0; j<size; j++, i+=2)
-    {
-        tmp[0] = pHexStr[i];
-        tmp[1] = pHexStr[i+1];
-        tmp[2] = '\0';
-        byte = (MV_U8) (strtol(tmp, NULL, 16) & 0xFF);
-        pBin[j] =  byte;     
-    }
-}
-
-void     mvAsciiToHex(const char* asciiStr, char* hexStr)
-{
-	int	i=0;
-
-	while(asciiStr[i] != 0)
-	{
-		mvOsSPrintf(&hexStr[i*2], "%02x", asciiStr[i]);
-		i++;
-	}
-	hexStr[i*2] = 0;
-}
-
-
-void    mvBinToHex(const MV_U8* bin, char* hexStr, int size)
-{
-	int i;
-
-    for(i=0; i<size; i++)
-    {
-        mvOsSPrintf(&hexStr[i*2], "%02x", bin[i]);
-    }
-    hexStr[i*2] = '\0';
-}
-
-void    mvBinToAscii(const MV_U8* bin, char* asciiStr, int size)
-{
-	int i;
- 
-    for(i=0; i<size; i++)
-    {
-        mvOsSPrintf(&asciiStr[i*2], "%c", bin[i]);
-    }
-    asciiStr[i*2] = '\0';
-}
-
-/*******************************************************************************
-* mvLog2 - 
-*
-* DESCRIPTION:
-*	Calculate the Log2 of a given number.
-*
-* INPUT:
-*       num - A number to calculate the Log2 for.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Log 2 of the input number, or 0xFFFFFFFF if input is 0.
-*
-*******************************************************************************/
-MV_U32 mvLog2(MV_U32	num)
-{
-	MV_U32 result = 0;
-	if(num == 0)
-		return 0xFFFFFFFF;
-	while(num != 1)
-	{
-		num = num >> 1;
-		result++;
-	}
-	return result;
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h
deleted file mode 100644
index c8e9ce1001..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-
-#ifndef __INCmvCommonh
-#define __INCmvCommonh
-
-#include "mvTypes.h"
-
-/* Swap tool */
-
-/* 16bit nibble swap. For example 0x1234 -> 0x2143                          */
-#define MV_NIBBLE_SWAP_16BIT(X)    (((X&0xf) << 4) |     \
-                                    ((X&0xf0) >> 4) |    \
-                                    ((X&0xf00) << 4) |   \
-                                    ((X&0xf000) >> 4))
-        
-/* 32bit nibble swap. For example 0x12345678 -> 0x21436587                  */
-#define MV_NIBBLE_SWAP_32BIT(X)    (((X&0xf) << 4) |       \
-                                    ((X&0xf0) >> 4) |      \
-                                    ((X&0xf00) << 4) |     \
-                                    ((X&0xf000) >> 4) |    \
-                                    ((X&0xf0000) << 4) |   \
-                                    ((X&0xf00000) >> 4) |  \
-                                    ((X&0xf000000) << 4) | \
-                                    ((X&0xf0000000) >> 4))
-
-/* 16bit byte swap. For example 0x1122 -> 0x2211                            */
-#define MV_BYTE_SWAP_16BIT(X) ((((X)&0xff)<<8) | (((X)&0xff00)>>8))
-
-/* 32bit byte swap. For example 0x11223344 -> 0x44332211                    */
-#define MV_BYTE_SWAP_32BIT(X) ((((X)&0xff)<<24) |                       \
-                               (((X)&0xff00)<<8) |                      \
-                               (((X)&0xff0000)>>8) |                    \
-                               (((X)&0xff000000)>>24))
-
-/* 64bit byte swap. For example 0x11223344.55667788 -> 0x88776655.44332211  */
-#define MV_BYTE_SWAP_64BIT(X) ((l64) ((((X)&0xffULL)<<56) |             \
-                                      (((X)&0xff00ULL)<<40) |           \
-                                      (((X)&0xff0000ULL)<<24) |         \
-                                      (((X)&0xff000000ULL)<<8) |        \
-                                      (((X)&0xff00000000ULL)>>8) |      \
-                                      (((X)&0xff0000000000ULL)>>24) |   \
-                                      (((X)&0xff000000000000ULL)>>40) | \
-                                      (((X)&0xff00000000000000ULL)>>56)))
-
-/* Endianess macros.                                                        */
-#if defined(MV_CPU_LE)
-    #define MV_16BIT_LE(X)  (X) 
-    #define MV_32BIT_LE(X)  (X)
-    #define MV_64BIT_LE(X)  (X)
-    #define MV_16BIT_BE(X)  MV_BYTE_SWAP_16BIT(X)
-    #define MV_32BIT_BE(X)  MV_BYTE_SWAP_32BIT(X)
-    #define MV_64BIT_BE(X)  MV_BYTE_SWAP_64BIT(X)
-#elif defined(MV_CPU_BE)
-    #define MV_16BIT_LE(X)  MV_BYTE_SWAP_16BIT(X) 
-    #define MV_32BIT_LE(X)  MV_BYTE_SWAP_32BIT(X)
-    #define MV_64BIT_LE(X)  MV_BYTE_SWAP_64BIT(X)
-    #define MV_16BIT_BE(X)  (X)
-    #define MV_32BIT_BE(X)  (X)
-    #define MV_64BIT_BE(X)  (X)
-#else
-    #error "CPU endianess isn't defined!\n"
-#endif 
-
-
-/* Bit field definitions */
-#define NO_BIT      0x00000000
-#define BIT0        0x00000001
-#define BIT1        0x00000002
-#define BIT2        0x00000004
-#define BIT3        0x00000008
-#define BIT4        0x00000010
-#define BIT5        0x00000020
-#define BIT6        0x00000040
-#define BIT7        0x00000080
-#define BIT8        0x00000100
-#define BIT9        0x00000200
-#define BIT10       0x00000400
-#define BIT11       0x00000800
-#define BIT12       0x00001000
-#define BIT13       0x00002000
-#define BIT14       0x00004000
-#define BIT15       0x00008000
-#define BIT16       0x00010000
-#define BIT17       0x00020000
-#define BIT18       0x00040000
-#define BIT19       0x00080000
-#define BIT20       0x00100000
-#define BIT21       0x00200000
-#define BIT22       0x00400000
-#define BIT23       0x00800000
-#define BIT24       0x01000000
-#define BIT25       0x02000000
-#define BIT26       0x04000000
-#define BIT27       0x08000000
-#define BIT28       0x10000000
-#define BIT29       0x20000000
-#define BIT30       0x40000000
-#define BIT31       0x80000000
-
-/* Handy sizes */
-#define _1K         0x00000400
-#define _2K         0x00000800
-#define _4K         0x00001000
-#define _8K         0x00002000
-#define _16K        0x00004000
-#define _32K        0x00008000
-#define _64K        0x00010000
-#define _128K       0x00020000
-#define _256K       0x00040000
-#define _512K       0x00080000
-
-#define _1M         0x00100000
-#define _2M         0x00200000
-#define _4M         0x00400000
-#define _8M         0x00800000
-#define _16M        0x01000000
-#define _32M        0x02000000
-#define _64M        0x04000000
-#define _128M       0x08000000
-#define _256M       0x10000000
-#define _512M       0x20000000
-
-#define _1G         0x40000000
-#define _2G         0x80000000
-
-/* Tclock and Sys clock define */
-#define _100MHz     100000000
-#define _125MHz     125000000
-#define _133MHz     133333334
-#define _150MHz     150000000
-#define _160MHz     160000000
-#define _166MHz     166666667
-#define _175MHz     175000000
-#define _178MHz     178000000
-#define _183MHz     183333334
-#define _187MHz     187000000
-#define _192MHz     192000000
-#define _194MHz     194000000
-#define _200MHz     200000000
-#define _233MHz     233333334
-#define _250MHz     250000000
-#define _266MHz     266666667
-#define _300MHz     300000000
-
-/* For better address window table readability */
-#define EN			MV_TRUE
-#define DIS			MV_FALSE
-#define N_A			-1			/* Not applicable */
-
-/* Cache configuration options for memory (DRAM, SRAM, ... ) */
-
-/* Memory uncached, HW or SW cache coherency is not needed */
-#define MV_UNCACHED             0   
-/* Memory cached, HW cache coherency supported in WriteThrough mode */
-#define MV_CACHE_COHER_HW_WT    1
-/* Memory cached, HW cache coherency supported in WriteBack mode */
-#define MV_CACHE_COHER_HW_WB    2
-/* Memory cached, No HW cache coherency, Cache coherency must be in SW */
-#define MV_CACHE_COHER_SW       3
-
-               
-/* Macro for testing aligment. Positive if number is NOT aligned   */
-#define MV_IS_NOT_ALIGN(number, align)      ((number) & ((align) - 1))
-
-/* Macro for alignment up. For example, MV_ALIGN_UP(0x0330, 0x20) = 0x0340   */
-#define MV_ALIGN_UP(number, align)                                          \
-(((number) & ((align) - 1)) ? (((number) + (align)) & ~((align)-1)) : (number))
-
-/* Macro for alignment down. For example, MV_ALIGN_UP(0x0330, 0x20) = 0x0320 */
-#define MV_ALIGN_DOWN(number, align) ((number) & ~((align)-1))
-
-/* This macro returns absolute value                                        */
-#define MV_ABS(number)  (((int)(number) < 0) ? -(int)(number) : (int)(number))
-
-
-/* Bit fields manipulation macros                                           */
-
-/* An integer word which its 'x' bit is set                                 */
-#define MV_BIT_MASK(bitNum)         (1 << (bitNum) )     
-
-/* Checks wheter bit 'x' in integer word is set                             */
-#define MV_BIT_CHECK(word, bitNum)  ( (word) & MV_BIT_MASK(bitNum) )
-
-/* Clear (reset) bit 'x' in integer word (RMW - Read-Modify-Write)          */
-#define MV_BIT_CLEAR(word, bitNum)  ( (word) &= ~(MV_BIT_MASK(bitNum)) )
-
-/* Set bit 'x' in integer word (RMW)                                        */
-#define MV_BIT_SET(word, bitNum)    ( (word) |= MV_BIT_MASK(bitNum) )
-
-/* Invert bit 'x' in integer word (RMW)                                     */
-#define MV_BIT_INV(word, bitNum)    ( (word) ^= MV_BIT_MASK(bitNum) )
-
-/* Get the min between 'a' or 'b'                                           */
-#define MV_MIN(a,b)    (((a) < (b)) ? (a) : (b)) 
-
-/* Get the max between 'a' or 'b'                                           */
-#define MV_MAX(a,b)    (((a) < (b)) ? (b) : (a)) 
-
-/* Temporary */
-#define mvOsDivide(num, div)        \
-({                                  \
-    int i=0, rem=(num);             \
-                                    \
-    while(rem >= (div))             \
-    {                               \
-        rem -= (div);               \
-        i++;                        \
-    }                               \
-    (i);                            \
-})
-
-/* Temporary */
-#define mvOsReminder(num, div)      \
-({                                  \
-    int rem = (num);                \
-                                    \
-    while(rem >= (div))             \
-        rem -= (div);               \
-    (rem);                          \
-})
-
-#define MV_IP_QUAD(ipAddr)    ((ipAddr >> 24) & 0xFF), ((ipAddr >> 16) & 0xFF), \
-                              ((ipAddr >> 8) & 0xFF), ((ipAddr >> 0) & 0xFF)
-
-#define MV_IS_POWER_OF_2(num) ((num != 0) && ((num & (num - 1)) == 0))
-
-#ifndef MV_ASMLANGUAGE
-/* mvCommon API list */
-
-MV_VOID     mvHexToBin(const char* pHexStr, MV_U8* pBin, int size);
-void        mvAsciiToHex(const char* asciiStr, char* hexStr);
-void        mvBinToHex(const MV_U8* bin, char* hexStr, int size);
-void        mvBinToAscii(const MV_U8* bin, char* asciiStr, int size);
-
-MV_STATUS mvMacStrToHex(const char* macStr, MV_U8* macHex);
-MV_STATUS mvMacHexToStr(MV_U8* macHex, char* macStr);
-void        mvSizePrint(MV_U32);
-
-MV_U32 mvLog2(MV_U32 num);
-
-#endif /* MV_ASMLANGUAGE */
-
-
-#endif	/* __INCmvCommonh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c
deleted file mode 100644
index 087f36d325..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-
-/* includes */
-#include "mvOs.h"
-#include "mv802_3.h"
-#include "mvCommon.h"
-#include "mvDebug.h"
-
-/* Global variables effect on behave MV_DEBUG_PRINT and MV_DEBUG_CODE macros
- * mvDebug  - map of bits (one for each module) bit=1 means enable 
- *          debug code and messages for this module
- * mvModuleDebug - array of 32 bits varables one for each module
- */
-MV_U32    mvDebug = 0;
-MV_U32    mvDebugModules[MV_MODULE_MAX];
- 
-/* Init mvModuleDebug array to default values */
-void    mvDebugInit(void)
-{
-    int     bit;
-
-    mvDebug = 0;
-    for(bit=0; bit<MV_MODULE_MAX; bit++)
-    {
-        mvDebugModules[bit] = MV_DEBUG_FLAG_ERR | MV_DEBUG_FLAG_STATS;
-        mvDebug |= MV_BIT_MASK(bit);
-    }
-}
- 
-void    mvDebugModuleEnable(MV_MODULE_ID module, MV_BOOL isEnable)
-{    
-    if (isEnable)
-    {
-       MV_BIT_SET(mvDebug, module);               
-    }
-    else
-       MV_BIT_CLEAR(mvDebug, module);                   
-}
- 
-void    mvDebugModuleSetFlags(MV_MODULE_ID module, MV_U32 flags)
-{ 
-    mvDebugModules[module] |= flags;
-}
-
-void    mvDebugModuleClearFlags(MV_MODULE_ID module, MV_U32 flags)
-{ 
-    mvDebugModules[module] &= ~flags;
-}
-
-/* Dump memory in specific format: 
- * address: X1X1X1X1 X2X2X2X2 ... X8X8X8X8 
- */
-void mvDebugMemDump(void* addr, int size, int access)
-{
-    int     i, j;
-    MV_U32  memAddr = (MV_U32)addr;
-
-    if(access == 0)
-        access = 1;
-
-    if( (access != 4) && (access != 2) && (access != 1) )
-    {
-        mvOsPrintf("%d wrong access size. Access must be 1 or 2 or 4\n",
-                    access);
-        return;
-    }
-    memAddr = MV_ALIGN_DOWN( (unsigned int)addr, 4);
-    size = MV_ALIGN_UP(size, 4);
-    addr = (void*)MV_ALIGN_DOWN( (unsigned int)addr, access);
-    while(size > 0)
-    {
-        mvOsPrintf("%08x: ", memAddr);
-        i = 0;
-        /* 32 bytes in the line */
-        while(i < 32)
-        {
-            if(memAddr >= (MV_U32)addr)
-            {
-                switch(access)
-                {
-                    case 1:
-                        if( memAddr == CPU_PHY_MEM(memAddr) )
-                        {
-                            mvOsPrintf("%02x ", MV_MEMIO8_READ(memAddr));
-                        }
-                        else
-                        {
-                            mvOsPrintf("%02x ", *((MV_U8*)memAddr));
-                        }
-                        break;
-
-                    case 2:
-                        if( memAddr == CPU_PHY_MEM(memAddr) )
-                        {
-                            mvOsPrintf("%04x ", MV_MEMIO16_READ(memAddr));
-                        }
-                        else
-                        {
-                            mvOsPrintf("%04x ", *((MV_U16*)memAddr));
-                        }
-                        break;
-
-                    case 4:
-                        if( memAddr == CPU_PHY_MEM(memAddr) )
-                        {
-                            mvOsPrintf("%08x ", MV_MEMIO32_READ(memAddr));
-                        }
-                        else
-                        {
-                            mvOsPrintf("%08x ", *((MV_U32*)memAddr));
-                        }
-                        break;
-                }
-            }
-            else
-            {
-                for(j=0; j<(access*2+1); j++)
-                    mvOsPrintf(" ");
-            }
-            i += access;
-            memAddr += access;
-            size -= access;
-            if(size <= 0)
-                break;
-        }
-        mvOsPrintf("\n");
-    }
-}
-
-void mvDebugPrintBufInfo(BUF_INFO* pBufInfo, int size, int access)
-{
-	if(pBufInfo == NULL)
-	{
-		mvOsPrintf("\n!!! pBufInfo = NULL\n");
-		return;
-	}
-    mvOsPrintf("\n*** pBufInfo=0x%x, cmdSts=0x%08x, pBuf=0x%x, bufSize=%d\n",
-               (unsigned int)pBufInfo, 
-			   (unsigned int)pBufInfo->cmdSts, 
-			   (unsigned int)pBufInfo->pBuff, 
-			   (unsigned int)pBufInfo->bufSize);
-    mvOsPrintf("pData=0x%x, byteCnt=%d, pNext=0x%x, uInfo1=0x%x, uInfo2=0x%x\n",
-               (unsigned int)pBufInfo->pData, 
-			   (unsigned int)pBufInfo->byteCnt, 
-			   (unsigned int)pBufInfo->pNextBufInfo,
-               (unsigned int)pBufInfo->userInfo1, 
-			   (unsigned int)pBufInfo->userInfo2);
-    if(pBufInfo->pData != NULL)
-    {
-        if(size > pBufInfo->byteCnt)
-            size = pBufInfo->byteCnt;
-        mvDebugMemDump(pBufInfo->pData, size, access);
-    }
-}
-
-void mvDebugPrintPktInfo(MV_PKT_INFO* pPktInfo, int size, int access)
-{
-    int frag, len;
-
-	if(pPktInfo == NULL)
-	{
-		mvOsPrintf("\n!!! pPktInfo = NULL\n");
-		return;
-	}
-    mvOsPrintf("\npPkt=%p, stat=0x%08x, numFr=%d, size=%d, pFr=%p, osInfo=0x%lx\n",
-                pPktInfo, pPktInfo->status, pPktInfo->numFrags, pPktInfo->pktSize, 
-                pPktInfo->pFrags, pPktInfo->osInfo);
-    
-    for(frag=0; frag<pPktInfo->numFrags; frag++)
-    {
-        mvOsPrintf("#%2d. bufVirt=%p, bufSize=%d\n", 
-                    frag, pPktInfo->pFrags[frag].bufVirtPtr, 
-                    pPktInfo->pFrags[frag].bufSize);
-        if(size > 0)
-        {
-            len = MV_MIN((int)pPktInfo->pFrags[frag].bufSize, size);
-            mvDebugMemDump(pPktInfo->pFrags[frag].bufVirtPtr, len, access);
-            size -= len;
-        }
-    }
-    
-}
-
-void    mvDebugPrintIpAddr(MV_U32 ipAddr)
-{
-    mvOsPrintf("%d.%d.%d.%d", ((ipAddr >> 24) & 0xFF), ((ipAddr >> 16) & 0xFF),
-                              ((ipAddr >> 8) & 0xFF), ((ipAddr >> 0) & 0xFF));
-}
-
-void    mvDebugPrintMacAddr(const MV_U8* pMacAddr)
-{
-    int     i;
-
-    mvOsPrintf("%02x", (unsigned int)pMacAddr[0]);
-    for(i=1; i<MV_MAC_ADDR_SIZE; i++)
-    {
-        mvOsPrintf(":%02x", pMacAddr[i]);
-    }
-    /* mvOsPrintf("\n");*/
-}
-
-
-/******* There are three functions deals with MV_DEBUG_TIMES structure ********/
-
-/* Reset MV_DEBUG_TIMES entry */
-void mvDebugResetTimeEntry(MV_DEBUG_TIMES* pTimeEntry, int count, char* pName)
-{
-    pTimeEntry->begin = 0;
-    pTimeEntry->count = count;
-    pTimeEntry->end = 0;
-    pTimeEntry->left = pTimeEntry->count;
-    pTimeEntry->total = 0;
-    pTimeEntry->min = 0xFFFFFFFF;
-    pTimeEntry->max = 0x0;
-    strncpy(pTimeEntry->name, pName, sizeof(pTimeEntry->name)-1);
-    pTimeEntry->name[sizeof(pTimeEntry->name)-1] = '\0';
-}
-
-/* Print out MV_DEBUG_TIMES entry */
-void mvDebugPrintTimeEntry(MV_DEBUG_TIMES* pTimeEntry, MV_BOOL isTitle)
-{
-    int     num;
-
-    if(isTitle == MV_TRUE)
-        mvOsPrintf("Event         NumOfEvents       TotalTime         Average       Min       Max\n");
-
-    num = pTimeEntry->count-pTimeEntry->left;
-    if(num > 0)
-    {
-        mvOsPrintf("%-11s     %6u          0x%08lx        %6lu     %6lu    %6lu\n",
-                pTimeEntry->name, num, pTimeEntry->total, pTimeEntry->total/num,
-                pTimeEntry->min, pTimeEntry->max);
-    }   
-}
-
-/* Update MV_DEBUG_TIMES entry */
-void mvDebugUpdateTimeEntry(MV_DEBUG_TIMES* pTimeEntry)
-{
-    MV_U32  delta;
-
-    if(pTimeEntry->left > 0)                                        
-    {                                                                           
-        if(pTimeEntry->end <= pTimeEntry->begin)       
-        {                                                                       
-            delta = pTimeEntry->begin - pTimeEntry->end;
-        }
-        else
-        {
-            delta = ((MV_U32)0x10000 - pTimeEntry->end) + pTimeEntry->begin;
-        }
-        pTimeEntry->total += delta;             
-
-        if(delta < pTimeEntry->min)    
-            pTimeEntry->min = delta;    
-
-        if(delta > pTimeEntry->max)    
-            pTimeEntry->max = delta;      
-
-        pTimeEntry->left--;                                                                                                                 
-    }
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h
deleted file mode 100644
index e4975bed5c..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDebug.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-
-#ifndef __INCmvDebugh
-#define __INCmvDebugh
-
-/* includes */
-#include "mvTypes.h"
-
-typedef enum 
-{
-    MV_MODULE_INVALID  = -1,
-    MV_MODULE_ETH      = 0,
-    MV_MODULE_IDMA,
-    MV_MODULE_XOR, 
-    MV_MODULE_TWASI,
-    MV_MODULE_MGI,
-    MV_MODULE_USB,
-    MV_MODULE_CESA,
-
-    MV_MODULE_MAX
-}MV_MODULE_ID;
- 
-/* Define generic flags useful for most of modules */
-#define MV_DEBUG_FLAG_ALL   (0)
-#define MV_DEBUG_FLAG_INIT  (1 << 0)
-#define MV_DEBUG_FLAG_RX    (1 << 1)
-#define MV_DEBUG_FLAG_TX    (1 << 2)
-#define MV_DEBUG_FLAG_ERR   (1 << 3)
-#define MV_DEBUG_FLAG_TRACE (1 << 4)
-#define MV_DEBUG_FLAG_DUMP  (1 << 5)
-#define MV_DEBUG_FLAG_CACHE (1 << 6)
-#define MV_DEBUG_FLAG_IOCTL (1 << 7)
-#define MV_DEBUG_FLAG_STATS (1 << 8)
-
-extern MV_U32  mvDebug; 
-extern MV_U32  mvDebugModules[MV_MODULE_MAX];
-
-#ifdef MV_DEBUG
-# define MV_DEBUG_PRINT(module, flags, msg)     mvOsPrintf msg
-# define MV_DEBUG_CODE(module, flags, code)     code 
-#elif defined(MV_RT_DEBUG)
-# define MV_DEBUG_PRINT(module, flags, msg)                    \
-    if( (mvDebug & (1<<(module))) &&                           \
-        ((mvDebugModules[(module)] & (flags)) == (flags)) )    \
-        mvOsPrintf msg
-# define MV_DEBUG_CODE(module, flags, code)                    \
-    if( (mvDebug & (1<<(module))) &&                           \
-        ((mvDebugModules[(module)] & (flags)) == (flags)) )    \
-        code
-#else
-# define MV_DEBUG_PRINT(module, flags, msg)
-# define MV_DEBUG_CODE(module, flags, code)
-#endif
-
-
-
-/* typedefs */
-
-/*  time measurement structure used to check how much time pass between
- *  two points
- */
-typedef struct {
-    char            name[20];   /* name of the entry */
-    unsigned long   begin;      /* time measured on begin point */
-    unsigned long   end;        /* time measured on end point */
-    unsigned long   total;      /* Accumulated time */
-    unsigned long   left;       /* The rest measurement actions */
-    unsigned long   count;      /* Maximum measurement actions */
-    unsigned long   min;        /* Minimum time from begin to end */
-    unsigned long   max;        /* Maximum time from begin to end */
-} MV_DEBUG_TIMES;
-
-
-/* mvDebug.h API list */
-
-/****** Error Recording ******/
-
-/* Dump memory in specific format: 
- * address: X1X1X1X1 X2X2X2X2 ... X8X8X8X8 
- */
-void mvDebugMemDump(void* addr, int size, int access);
-
-void mvDebugPrintBufInfo(BUF_INFO* pBufInfo, int size, int access);
-
-void mvDebugPrintPktInfo(MV_PKT_INFO* pPktInfo, int size, int access);
-
-void    mvDebugPrintIpAddr(MV_U32 ipAddr);
-
-void mvDebugPrintMacAddr(const MV_U8* pMacAddr);
-
-/**** There are three functions deals with MV_DEBUG_TIMES structure ****/
-
-/* Reset MV_DEBUG_TIMES entry */
-void mvDebugResetTimeEntry(MV_DEBUG_TIMES* pTimeEntry, int count, char* name);
-
-/* Update MV_DEBUG_TIMES entry */
-void mvDebugUpdateTimeEntry(MV_DEBUG_TIMES* pTimeEntry);
-
-/* Print out MV_DEBUG_TIMES entry */
-void mvDebugPrintTimeEntry(MV_DEBUG_TIMES* pTimeEntry, MV_BOOL isTitle);
-
-
-/******** General ***********/
-
-/* Change value of mvDebugPrint global variable */
-
-void    mvDebugInit(void);
-void    mvDebugModuleEnable(MV_MODULE_ID module, MV_BOOL isEnable);
-void    mvDebugModuleSetFlags(MV_MODULE_ID module, MV_U32 flags);
-void    mvDebugModuleClearFlags(MV_MODULE_ID module, MV_U32 flags);
-
-
-#endif /* __INCmvDebug.h */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h
deleted file mode 100644
index 478209407e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvDeviceId.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDeviceIdh
-#define __INCmvDeviceIdh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* defines  */
-#define MARVELL_VEN_ID		    0x11ab
-
-/* Disco-3 */
-#define MV64460_DEV_ID          	0x6480
-#define MV64460B_DEV_ID         	0x6485
-#define MV64430_DEV_ID          	0x6420
-
-/* Disco-5 */
-#define MV64560_DEV_ID          	0x6450
-
-/* Disco-6 */
-#define MV64660_DEV_ID          	0x6460
-
-/* Orion */        
-#define MV_1181_DEV_ID          	0x1181
-#define MV_5181_DEV_ID          	0x5181
-#define MV_5281_DEV_ID          	0x5281
-#define MV_5182_DEV_ID          	0x5182
-#define MV_8660_DEV_ID          	0x8660
-#define MV_5180_DEV_ID          	0x5180
-#define MV_5082_DEV_ID          	0x5082
-#define MV_1281_DEV_ID          	0x1281
-#define MV_6082_DEV_ID          	0x6082
-#define MV_6183_DEV_ID          	0x6183
-#define MV_6183L_DEV_ID          	0x6083
-
-#define MV_5281_D0_REV          	0x4
-#define MV_5281_D0_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D0_REV)
-#define MV_5281_D0_NAME         "88F5281 D0"
-
-#define MV_5281_D1_REV          	0x5
-#define MV_5281_D1_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D1_REV)
-#define MV_5281_D1_NAME         "88F5281 D1"
-
-#define MV_5281_D2_REV          	0x6
-#define MV_5281_D2_ID           	((MV_5281_DEV_ID << 16) | MV_5281_D2_REV)
-#define MV_5281_D2_NAME         "88F5281 D2"
-
-
-#define MV_5181L_A0_REV         	0x8 /* need for PCIE Er */
-#define MV_5181_A1_REV          	0x1 /* for USB Er ..*/
-#define MV_5181_B0_REV          	0x2
-#define MV_5181_B1_REV          	0x3
-#define MV_5182_A1_REV          	0x1
-#define MV_5180N_B1_REV         	0x3
-#define MV_5181L_A0_ID          	((MV_5181_DEV_ID << 16) | MV_5181L_A0_REV)
-
-
-
-/* kw */
-#define MV_6281_DEV_ID          	0x6281
-#define MV_6192_DEV_ID          	0x6192
-#define MV_6190_DEV_ID          	0x6190
-#define MV_6180_DEV_ID          	0x6180
-
-#define MV_6281_A0_REV         		0x2
-#define MV_6281_A0_ID          		((MV_6281_DEV_ID << 16) | MV_6281_A0_REV)
-#define MV_6281_A0_NAME         	"88F6281 A0"
-
-#define MV_6192_A0_REV         		0x2
-#define MV_6192_A0_ID          		((MV_6192_DEV_ID << 16) | MV_6192_A0_REV)
-#define MV_6192_A0_NAME         	"88F6192 A0"
-
-#define MV_6190_A0_REV         		0x2
-#define MV_6190_A0_ID          		((MV_6190_DEV_ID << 16) | MV_6190_A0_REV)
-#define MV_6190_A0_NAME         	"88F6190 A0"
-
-#define MV_6180_A0_REV         		0x2
-#define MV_6180_A0_ID          		((MV_6180_DEV_ID << 16) | MV_6180_A0_REV)
-#define MV_6180_A0_NAME         	"88F6180 A0"
-
-#define MV_6281_A1_REV              0x3
-#define MV_6281_A1_ID               ((MV_6281_DEV_ID << 16) | MV_6281_A1_REV)
-#define MV_6281_A1_NAME             "88F6281 A1"
-
-#define MV_6192_A1_REV              0x3
-#define MV_6192_A1_ID               ((MV_6192_DEV_ID << 16) | MV_6192_A1_REV)
-#define MV_6192_A1_NAME             "88F6192 A1"
-
-#define MV_6190_A1_REV              0x3
-#define MV_6190_A1_ID               ((MV_6190_DEV_ID << 16) | MV_6190_A1_REV)
-#define MV_6190_A1_NAME             "88F6190 A1"
-
-#define MV_6180_A1_REV              0x3
-#define MV_6180_A1_ID               ((MV_6180_DEV_ID << 16) | MV_6180_A1_REV)
-#define MV_6180_A1_NAME             "88F6180 A1" 
-
-#define MV_88F6XXX_A0_REV         	0x2
-#define MV_88F6XXX_A1_REV         	0x3
-/* Disco-Duo */
-#define MV_78XX0_ZY_DEV_ID       0x6381
-#define MV_78XX0_ZY_NAME         "MV78X00"
-
-#define MV_78XX0_Z0_REV         0x1
-#define MV_78XX0_Z0_ID          ((MV_78XX0_ZY_DEV_ID << 16) | MV_78XX0_Z0_REV)
-#define MV_78XX0_Z0_NAME        "78X00 Z0"
-
-#define MV_78XX0_Y0_REV         0x2
-#define MV_78XX0_Y0_ID          ((MV_78XX0_ZY_DEV_ID << 16) | MV_78XX0_Y0_REV)
-#define MV_78XX0_Y0_NAME        "78X00 Y0"
-
-#define MV_78XX0_DEV_ID       	0x7800
-#define MV_78XX0_NAME         	"MV78X00"
-
-#define MV_76100_DEV_ID      	0x7610
-#define MV_78200_DEV_ID      	0x7820
-#define MV_78100_DEV_ID      	0x7810
-#define MV_78XX0_A0_REV		0x1
-#define MV_78XX0_A1_REV		0x2
-
-#define MV_76100_NAME		"MV76100"
-#define MV_78100_NAME		"MV78100"
-#define MV_78200_NAME		"MV78200"
-
-#define MV_76100_A0_ID		((MV_76100_DEV_ID << 16) | MV_78XX0_A0_REV)
-#define MV_78100_A0_ID		((MV_78100_DEV_ID << 16) | MV_78XX0_A0_REV)
-#define MV_78200_A0_ID		((MV_78200_DEV_ID << 16) | MV_78XX0_A0_REV)
-
-#define MV_76100_A1_ID		((MV_76100_DEV_ID << 16) | MV_78XX0_A1_REV)
-#define MV_78100_A1_ID		((MV_78100_DEV_ID << 16) | MV_78XX0_A1_REV)
-#define MV_78200_A1_ID		((MV_78200_DEV_ID << 16) | MV_78XX0_A1_REV)
-
-#define MV_76100_A0_NAME	"MV76100 A0"
-#define MV_78100_A0_NAME	"MV78100 A0"
-#define MV_78200_A0_NAME	"MV78200 A0"
-#define MV_78XX0_A0_NAME	"MV78XX0 A0"
-
-#define MV_76100_A1_NAME	"MV76100 A1"
-#define MV_78100_A1_NAME	"MV78100 A1"
-#define MV_78200_A1_NAME	"MV78200 A1"
-#define MV_78XX0_A1_NAME	"MV78XX0 A1"
-
-/*MV88F632X family*/
-#define MV_6321_DEV_ID      	0x6321
-#define MV_6322_DEV_ID      	0x6322
-#define MV_6323_DEV_ID      	0x6323
-
-#define MV_6321_NAME		"88F6321"
-#define MV_6322_NAME		"88F6322"
-#define MV_6323_NAME		"88F6323"
-
-#define MV_632X_A1_REV		0x2
-
-#define MV_6321_A1_ID		((MV_6321_DEV_ID << 16) | MV_632X_A1_REV)
-#define MV_6322_A1_ID		((MV_6322_DEV_ID << 16) | MV_632X_A1_REV)
-#define MV_6323_A1_ID		((MV_6323_DEV_ID << 16) | MV_632X_A1_REV)
-
-#define MV_6321_A1_NAME		"88F6321 A1"
-#define MV_6322_A1_NAME		"88F6322 A1"
-#define MV_6323_A1_NAME		"88F6323 A1"
-
-
-#endif /* __INCmvDeviceIdh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h
deleted file mode 100644
index 1849198569..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvHalVer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvHalVerh
-#define __INCmvHalVerh
-
-/* Defines */
-#define MV_HAL_VERSION			"FEROCEON_HAL_3_1_7"
-#define MV_RELEASE_BASELINE		"SoCandControllers_FEROCEON_RELEASE_7_9_2009_KW_4_3_4_DD_2_1_4_6183_1_1_4"
-
-#endif /* __INCmvHalVerh */
\ No newline at end of file
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c
deleted file mode 100644
index 41ca7cebaa..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/******************************************************************************* 
-*                   Copyright 2003, Marvell Semiconductor Israel LTD.          * 
-* THIS CODE CONTAINS CONFIDENTIAL INFORMATION OF MARVELL.                      * 
-* NO RIGHTS ARE GRANTED HEREIN UNDER ANY PATENT, MASK WORK RIGHT OR COPYRIGHT  * 
-* OF MARVELL OR ANY THIRD PARTY. MARVELL RESERVES THE RIGHT AT ITS SOLE        * 
-* DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL.     * 
-* THIS CODE IS PROVIDED "AS IS". MARVELL MAKES NO WARRANTIES, EXPRESSED,       * 
-* IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, COMPLETENESS OR PERFORMANCE.   * 
-*                                                                              * 
-* MARVELL COMPRISES MARVELL TECHNOLOGY GROUP LTD. (MTGL) AND ITS SUBSIDIARIES, * 
-* MARVELL INTERNATIONAL LTD. (MIL), MARVELL TECHNOLOGY, INC. (MTI), MARVELL    * 
-* SEMICONDUCTOR, INC. (MSI), MARVELL ASIA PTE LTD. (MAPL), MARVELL JAPAN K.K.  * 
-* (MJKK), MARVELL SEMICONDUCTOR ISRAEL LTD (MSIL).                             * 
-********************************************************************************
-* mvQueue.c
-*
-* FILENAME:    $Workfile: mvStack.c $                     
-* REVISION:    $Revision: 1.1 $                              
-* LAST UPDATE: $Modtime:  $                  
-*                                                          
-* DESCRIPTION:                                             
-*     This file implements simple Stack LIFO functionality.
-*******************************************************************************/
-
-/* includes */
-#include "mvOs.h"
-#include "mvTypes.h"
-#include "mvDebug.h"
-#include "mvStack.h"
-
-/* defines  */
-
-
-/* Public functions */
-
-
-/* Purpose: Create new stack
- * Inputs:
- *	- MV_U32	noOfElements	- maximum number of elements in the stack.
- *                              Each element 4 bytes size
- * Return: void* - pointer to created stack.
- */
-void*   mvStackCreate(int numOfElements)
-{
-	MV_STACK*   pStack;
-    MV_U32*     pStackElements;
-
-    pStack = (MV_STACK*)mvOsMalloc(sizeof(MV_STACK));
-    pStackElements = (MV_U32*)mvOsMalloc(numOfElements*sizeof(MV_U32));
-    if( (pStack == NULL) || (pStackElements == NULL) )
-    {
-	    mvOsPrintf("mvStack: Can't create new stack\n");
-        return NULL;
-    }
-    memset(pStackElements, 0, numOfElements*sizeof(MV_U32));
-    pStack->numOfElements = numOfElements;
-    pStack->stackIdx = 0;
-    pStack->stackElements = pStackElements;
-
-	return pStack;
-}
-
-/* Purpose: Delete existing stack
- * Inputs:
- *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function
- *
- * Return: MV_STATUS  	MV_NOT_FOUND - Failure. StackHandle is not valid.
- *						MV_OK        - Success.
- */
-MV_STATUS   mvStackDelete(void* stackHndl)
-{
-	MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-	if( (pStack == NULL) || (pStack->stackElements == NULL) )
-		return MV_NOT_FOUND;
-
-    mvOsFree(pStack->stackElements);
-    mvOsFree(pStack);
-
-    return MV_OK;
-}
-
-
-/* PrintOut status of the stack */
-void    mvStackStatus(void* stackHndl, MV_BOOL isPrintElements)
-{
-	int			i;
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-    mvOsPrintf("StackHandle=%p, pElements=%p, numElements=%d, stackIdx=%d\n",
-                stackHndl, pStack->stackElements, pStack->numOfElements, 
-                pStack->stackIdx);
-    if(isPrintElements == MV_TRUE)
-    {
-        for(i=0; i<pStack->stackIdx; i++)
-        {
-            mvOsPrintf("%3d. Value=0x%x\n", i, pStack->stackElements[i]);
-        }
-    }
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h
deleted file mode 100644
index e247e61c2d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvStack.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/******************************************************************************* 
-*                   Copyright 2003, Marvell Semiconductor Israel LTD.          * 
-* THIS CODE CONTAINS CONFIDENTIAL INFORMATION OF MARVELL.                      * 
-* NO RIGHTS ARE GRANTED HEREIN UNDER ANY PATENT, MASK WORK RIGHT OR COPYRIGHT  * 
-* OF MARVELL OR ANY THIRD PARTY. MARVELL RESERVES THE RIGHT AT ITS SOLE        * 
-* DISCRETION TO REQUEST THAT THIS CODE BE IMMEDIATELY RETURNED TO MARVELL.     * 
-* THIS CODE IS PROVIDED "AS IS". MARVELL MAKES NO WARRANTIES, EXPRESSED,       * 
-* IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, COMPLETENESS OR PERFORMANCE.   * 
-*                                                                              * 
-* MARVELL COMPRISES MARVELL TECHNOLOGY GROUP LTD. (MTGL) AND ITS SUBSIDIARIES, * 
-* MARVELL INTERNATIONAL LTD. (MIL), MARVELL TECHNOLOGY, INC. (MTI), MARVELL    * 
-* SEMICONDUCTOR, INC. (MSI), MARVELL ASIA PTE LTD. (MAPL), MARVELL JAPAN K.K.  * 
-* (MJKK), MARVELL SEMICONDUCTOR ISRAEL LTD (MSIL).                             * 
-********************************************************************************
-* mvStack.h - Header File for :
-*
-* FILENAME:    $Workfile: mvStack.h $
-* REVISION:    $Revision: 1.1 $
-* LAST UPDATE: $Modtime:  $
-*
-* DESCRIPTION:
-*     This file defines simple Stack (LIFO) functionality.
-*
-*******************************************************************************/
-
-#ifndef __mvStack_h__
-#define __mvStack_h__
-
-
-/* includes */
-#include "mvTypes.h"
-
-
-/* defines  */
-
-
-/* typedefs */
-/* Data structure describes general purpose Stack */
-typedef struct 
-{
-    int     stackIdx;
-    int     numOfElements;
-    MV_U32* stackElements;
-} MV_STACK;
-
-static INLINE MV_BOOL mvStackIsFull(void* stackHndl)
-{	
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-    if(pStack->stackIdx == pStack->numOfElements)
-        return MV_TRUE;
-
-    return MV_FALSE;
-}
-
-static INLINE MV_BOOL mvStackIsEmpty(void* stackHndl)
-{	
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-    if(pStack->stackIdx == 0)
-        return MV_TRUE;
-
-    return MV_FALSE;
-}
-/* Purpose: Push new element to stack
- * Inputs:
- *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function.
- *	- MV_U32	value		- New element.
- *
- * Return: MV_STATUS  	MV_FULL - Failure. Stack is full.
- *						MV_OK   - Success. Element is put to stack.
- */
-static INLINE void mvStackPush(void* stackHndl, MV_U32 value)
-{	
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-#ifdef MV_RT_DEBUG
-    if(pStack->stackIdx == pStack->numOfElements)
-    {
-        mvOsPrintf("mvStackPush: Stack is FULL\n");
-        return;
-    }
-#endif /* MV_RT_DEBUG */
-
-    pStack->stackElements[pStack->stackIdx] = value;
-    pStack->stackIdx++;
-}
-
-/* Purpose: Pop element from the top of stack and copy it to "pValue"
- * Inputs:
- *	- void* 	stackHndl 	- Stack handle as returned by "mvStackCreate()" function.
- *	- MV_U32	value		- Element in the top of stack.
- *
- * Return: MV_STATUS  	MV_EMPTY - Failure. Stack is empty.
- *						MV_OK    - Success. Element is removed from the stack and
- *									copied to pValue argument
- */
-static INLINE MV_U32   mvStackPop(void* stackHndl)
-{
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-#ifdef MV_RT_DEBUG
-    if(pStack->stackIdx == 0)
-    {
-        mvOsPrintf("mvStackPop: Stack is EMPTY\n");
-        return 0;
-    }
-#endif /* MV_RT_DEBUG */
-
-    pStack->stackIdx--;
-    return pStack->stackElements[pStack->stackIdx];
-}
-
-static INLINE int       mvStackIndex(void* stackHndl)
-{
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-    return pStack->stackIdx;
-}
-
-static INLINE int       mvStackFreeElements(void* stackHndl)
-{
-    MV_STACK*   pStack = (MV_STACK*)stackHndl;
-
-    return (pStack->numOfElements - pStack->stackIdx);
-}
-
-/* mvStack.h API list */
-
-/* Create new Stack */
-void*       mvStackCreate(int numOfElements);
-
-/* Delete existing stack */
-MV_STATUS   mvStackDelete(void* stackHndl);
-
-/* Print status of the stack */
-void        mvStackStatus(void* stackHndl, MV_BOOL isPrintElements);
-
-#endif /* __mvStack_h__ */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h
deleted file mode 100644
index de212a141d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/common/mvTypes.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvTypesh
-#define __INCmvTypesh
-
-/* Defines */
-
-/* The following is a list of Marvell status    */
-#define MV_ERROR		    (-1)
-#define MV_OK			    (0x00)  /* Operation succeeded                   */
-#define MV_FAIL			    (0x01)	/* Operation failed                      */
-#define MV_BAD_VALUE        (0x02)  /* Illegal value (general)               */
-#define MV_OUT_OF_RANGE     (0x03)  /* The value is out of range             */
-#define MV_BAD_PARAM        (0x04)  /* Illegal parameter in function called  */
-#define MV_BAD_PTR          (0x05)  /* Illegal pointer value                 */
-#define MV_BAD_SIZE         (0x06)  /* Illegal size                          */
-#define MV_BAD_STATE        (0x07)  /* Illegal state of state machine        */
-#define MV_SET_ERROR        (0x08)  /* Set operation failed                  */
-#define MV_GET_ERROR        (0x09)  /* Get operation failed                  */
-#define MV_CREATE_ERROR     (0x0A)  /* Fail while creating an item           */
-#define MV_NOT_FOUND        (0x0B)  /* Item not found                        */
-#define MV_NO_MORE          (0x0C)  /* No more items found                   */
-#define MV_NO_SUCH          (0x0D)  /* No such item                          */
-#define MV_TIMEOUT          (0x0E)  /* Time Out                              */
-#define MV_NO_CHANGE        (0x0F)  /* Parameter(s) is already in this value */
-#define MV_NOT_SUPPORTED    (0x10)  /* This request is not support           */
-#define MV_NOT_IMPLEMENTED  (0x11)  /* Request supported but not implemented */
-#define MV_NOT_INITIALIZED  (0x12)  /* The item is not initialized           */
-#define MV_NO_RESOURCE      (0x13)  /* Resource not available (memory ...)   */
-#define MV_FULL             (0x14)  /* Item is full (Queue or table etc...)  */
-#define MV_EMPTY            (0x15)  /* Item is empty (Queue or table etc...) */
-#define MV_INIT_ERROR       (0x16)  /* Error occured while INIT process      */
-#define MV_HW_ERROR         (0x17)  /* Hardware error                        */
-#define MV_TX_ERROR         (0x18)  /* Transmit operation not succeeded      */
-#define MV_RX_ERROR         (0x19)  /* Recieve operation not succeeded       */
-#define MV_NOT_READY	    (0x1A)	/* The other side is not ready yet       */
-#define MV_ALREADY_EXIST    (0x1B)  /* Tried to create existing item         */
-#define MV_OUT_OF_CPU_MEM   (0x1C)  /* Cpu memory allocation failed.         */
-#define MV_NOT_STARTED      (0x1D)  /* Not started yet         */
-#define MV_BUSY             (0x1E)  /* Item is busy.                         */
-#define MV_TERMINATE        (0x1F)  /* Item terminates it's work.            */
-#define MV_NOT_ALIGNED      (0x20)  /* Wrong alignment                       */
-#define MV_NOT_ALLOWED      (0x21)  /* Operation NOT allowed                 */
-#define MV_WRITE_PROTECT    (0x22)  /* Write protected                       */
-
-
-#define MV_INVALID  (int)(-1)
-
-#define MV_FALSE	0
-#define MV_TRUE     (!(MV_FALSE))
-
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-
-#ifndef MV_ASMLANGUAGE
-/* typedefs */
-
-typedef char  MV_8;
-typedef unsigned char	MV_U8;
-
-typedef int		MV_32;
-typedef unsigned int	MV_U32;
-
-typedef short		MV_16;
-typedef unsigned short	MV_U16;
-
-#ifdef MV_PPC64
-typedef long		MV_64;
-typedef unsigned long	MV_U64;
-#else
-typedef long long		MV_64;
-typedef unsigned long long	MV_U64;
-#endif
-
-typedef long		MV_LONG;	/* 32/64 */
-typedef unsigned long	MV_ULONG;	/* 32/64 */
-
-typedef int     MV_STATUS;
-typedef int     MV_BOOL;
-typedef void    MV_VOID;
-typedef float   MV_FLOAT;
-
-typedef int 	(*MV_FUNCPTR) (void);	  /* ptr to function returning int   */
-typedef void 	(*MV_VOIDFUNCPTR) (void); /* ptr to function returning void  */
-typedef double 	(*MV_DBLFUNCPTR) (void);  /* ptr to function returning double*/
-typedef float 	(*MV_FLTFUNCPTR) (void);  /* ptr to function returning float */
-
-typedef MV_U32 MV_KHZ;
-typedef MV_U32 MV_MHZ;
-typedef MV_U32 MV_HZ;
-
-
-/* This enumerator describes the set of commands that can be applied on   	*/
-/* an engine (e.g. IDMA, XOR). Appling a comman depends on the current   	*/
-/* status (see MV_STATE enumerator)                      					*/
-/* Start can be applied only when status is IDLE                         */
-/* Stop can be applied only when status is IDLE, ACTIVE or PAUSED        */
-/* Pause can be applied only when status is ACTIVE                          */
-/* Restart can be applied only when status is PAUSED                        */
-typedef enum _mvCommand
-{
-    MV_START,              /* Start	*/
-    MV_STOP,               /* Stop     */
-    MV_PAUSE,              /* Pause    */
-    MV_RESTART             /* Restart  */
-} MV_COMMAND;
-
-/* This enumerator describes the set of state conditions.					*/
-/* Moving from one state to other is stricted.   							*/
-typedef enum _mvState
-{
-    MV_IDLE,
-    MV_ACTIVE,
-    MV_PAUSED,
-    MV_UNDEFINED_STATE
-} MV_STATE;
-
-
-/* This structure describes address space window. Window base can be        */
-/* 64 bit, window size up to 4GB                                            */
-typedef struct _mvAddrWin
-{
-    MV_U32      baseLow;    /* 32bit base low       */
-    MV_U32      baseHigh;   /* 32bit base high      */
-    MV_U32      size;       /* 32bit size           */
-}MV_ADDR_WIN;
-
-/* This binary enumerator describes protection attribute status             */
-typedef enum _mvProtRight
-{
-    ALLOWED,        /* Protection attribute allowed                         */
-    FORBIDDEN       /* Protection attribute forbidden                       */
-}MV_PROT_RIGHT;
-
-/* Unified struct for Rx and Tx packet operations. The user is required to 	*/
-/* be familier only with Tx/Rx descriptor command status.               	*/
-typedef struct _bufInfo
-{
-    MV_U32   cmdSts;        /* Tx/Rx command status                                     */
-        MV_U16   byteCnt;       /* Size of valid data in the buffer     */
-    MV_U16   bufSize;       /* Total size of the buffer             */
-    MV_U8    *pBuff;            /* Pointer to Buffer                    */
-    MV_U8    *pData;            /* Pointer to data in the Buffer        */
-    MV_U32   userInfo1;         /* Tx/Rx attached user information 1    */
-    MV_U32   userInfo2;         /* Tx/Rx attached user information 2    */
-    struct _bufInfo *pNextBufInfo;  /* Next buffer in packet            */
-} BUF_INFO;
-
-/* This structure contains information describing one of buffers
- * (fragments) they are built Ethernet packet.
- */
-typedef struct
-{
-     MV_U8*	    bufVirtPtr;
-     MV_ULONG	bufPhysAddr;
-     MV_U32   	bufSize;
-     MV_U32     dataSize;
-     MV_U32		memHandle;
-	 MV_32      bufAddrShift;
-} MV_BUF_INFO;
-
-/* This structure contains information describing Ethernet packet.
- * The packet can be divided for few buffers (fragments)
- */
-typedef struct
-{
-    MV_ULONG   	osInfo;
-    MV_BUF_INFO *pFrags;
-    MV_U32      status;
-    MV_U16      pktSize;
-    MV_U16      numFrags;
-    MV_U32      ownerId;
-    MV_U32      fragIP;
-} MV_PKT_INFO;
-
-#endif /* MV_ASMLANGUAGE */
-
-#endif /* __INCmvTypesh */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c
deleted file mode 100644
index 644fd02dac..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/time.h>
-#include "dbg-trace.h"
-
-#define TRACE_ARR_LEN   800
-#define STR_LEN         128
-struct trace {
-    struct timeval tv;
-        char str[STR_LEN];
-    unsigned int callback_val1;
-    unsigned int callback_val2;
-        char valid;
-};
-static unsigned int (*trc_callback1) (unsigned char) = NULL;
-static unsigned int (*trc_callback2) (unsigned char) = NULL;
-static unsigned char trc_param1 = 0;
-static unsigned char trc_param2 = 0;
-struct trace *trc_arr;
-static int trc_index;
-static int trc_active = 0;
-
-void TRC_START()
-{
-    trc_active = 1;
-}
-
-void TRC_STOP()
-{
-    trc_active = 0;
-}
-
-void TRC_INIT(void *callback1, void *callback2, unsigned char callback1_param, unsigned char callback2_param)
-{
-    printk("Marvell debug tracing is on\n");
-        trc_arr = (struct trace *)kmalloc(TRACE_ARR_LEN*sizeof(struct trace),GFP_KERNEL);
-    if(trc_arr == NULL)
-    {
-        printk("Can't allocate Debug Trace buffer\n");
-        return;
-    }
-        memset(trc_arr,0,TRACE_ARR_LEN*sizeof(struct trace));
-        trc_index = 0;
-    trc_callback1 = callback1;
-    trc_callback2 = callback2;
-    trc_param1 = callback1_param;
-    trc_param2 = callback2_param;
-}
-void TRC_REC(char *fmt,...)
-{
-    va_list args;
-        struct trace *trc = &trc_arr[trc_index];
-
-    if(trc_active == 0)
-        return;
-
-    do_gettimeofday(&trc->tv);
-    if(trc_callback1)
-        trc->callback_val1 = trc_callback1(trc_param1);
-    if(trc_callback2)
-        trc->callback_val2 = trc_callback2(trc_param2);
-    va_start(args, fmt);
-    vsprintf(trc->str,fmt,args);
-    va_end(args);
-        trc->valid = 1;
-        if((++trc_index) == TRACE_ARR_LEN) {
-                trc_index = 0;
-    }
-}
-void TRC_OUTPUT(void)
-{
-        int i,j;
-        struct trace *p;
-        printk("\n\nTrace %d items\n",TRACE_ARR_LEN);
-        for(i=0,j=trc_index; i<TRACE_ARR_LEN; i++,j++) {
-                if(j == TRACE_ARR_LEN)
-                        j = 0;
-                p = &trc_arr[j];
-                if(p->valid) {
-            unsigned long uoffs;
-            struct trace *plast;
-            if(p == &trc_arr[0])
-                plast = &trc_arr[TRACE_ARR_LEN-1];
-            else
-                plast = p-1;
-            if(p->tv.tv_sec == ((plast)->tv.tv_sec))
-                uoffs = (p->tv.tv_usec - ((plast)->tv.tv_usec));
-            else
-                uoffs = (1000000 - ((plast)->tv.tv_usec)) +
-                    ((p->tv.tv_sec - ((plast)->tv.tv_sec) - 1) * 1000000) + 
-                    p->tv.tv_usec;
-                        printk("%03d: [+%ld usec]", j, (unsigned long)uoffs);
-            if(trc_callback1)
-                printk("[%u]",p->callback_val1);
-            if(trc_callback2)
-                printk("[%u]",p->callback_val2);
-            printk(": %s",p->str);
-        }
-                p->valid = 0;
-        }
-        memset(trc_arr,0,TRACE_ARR_LEN*sizeof(struct trace));
-        trc_index = 0;
-}
-void TRC_RELEASE(void)
-{
-        kfree(trc_arr);
-        trc_index = 0;
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h
deleted file mode 100644
index a5aac26736..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/dbg-trace.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#ifndef _MV_DBG_TRCE_H_
-#define _MV_DBG_TRCE_H_
-
-#ifdef CONFIG_MV_DBG_TRACE
-void TRC_INIT(void *callback1, void *callback2, 
-    unsigned char callback1_param, unsigned char callback2_param);
-void TRC_REC(char *fmt,...);
-void TRC_OUTPUT(void);
-void TRC_RELEASE(void);
-void TRC_START(void);
-void TRC_STOP(void);
-
-#else
-#define TRC_INIT(x1,x2,x3,x4)
-#define TRC_REC(X...)
-#define TRC_OUTPUT()
-#define TRC_RELEASE()
-#define TRC_START()
-#define TRC_STOP()
-#endif
-
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c
deleted file mode 100644
index 5f62784473..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.c
+++ /dev/null
@@ -1,2513 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "boardEnv/mvBoardEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "cpu/mvCpu.h"
-#include "cntmr/mvCntmr.h"
-#include "gpp/mvGpp.h"
-#include "twsi/mvTwsi.h"
-#include "pex/mvPex.h"
-#include "device/mvDevice.h"
-#include "eth/gbe/mvEthRegs.h"
-
-/* defines  */
-/* #define MV_DEBUG */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif
-
-extern MV_CPU_ARM_CLK _cpuARMDDRCLK[];
-
-#define CODE_IN_ROM		MV_FALSE
-#define CODE_IN_RAM		MV_TRUE
-
-extern	MV_BOARD_INFO*	boardInfoTbl[];
-#define BOARD_INFO(boardId)	boardInfoTbl[boardId - BOARD_ID_BASE]
-
-/* Locals */
-static MV_DEV_CS_INFO*  boardGetDevEntry(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-
-MV_U32 tClkRate   = -1;
-
-
-/*******************************************************************************
-* mvBoardEnvInit - Init board
-*
-* DESCRIPTION:
-*		In this function the board environment take care of device bank
-*		initialization.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvBoardEnvInit(MV_VOID)
-{
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardEnvInit:Board unknown.\n");
-		return;
-
-	}
-
-	/* Set GPP Out value */
-	MV_REG_WRITE(GPP_DATA_OUT_REG(0), BOARD_INFO(boardId)->gppOutValLow);
-	MV_REG_WRITE(GPP_DATA_OUT_REG(1), BOARD_INFO(boardId)->gppOutValHigh);
-
-	/* set GPP polarity */
-	mvGppPolaritySet(0, 0xFFFFFFFF, BOARD_INFO(boardId)->gppPolarityValLow);
-	mvGppPolaritySet(1, 0xFFFFFFFF, BOARD_INFO(boardId)->gppPolarityValHigh);
-
-    /* Workaround for Erratum FE-MISC-70*/
-    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV)
-    {
-        BOARD_INFO(boardId)->gppOutEnValLow &= 0xfffffffd;
-        BOARD_INFO(boardId)->gppOutEnValLow |= (BOARD_INFO(boardId)->gppOutEnValHigh) & 0x00000002;
-    } /*End of WA*/
-
-	/* Set GPP Out Enable*/
-	mvGppTypeSet(0, 0xFFFFFFFF, BOARD_INFO(boardId)->gppOutEnValLow);
-	mvGppTypeSet(1, 0xFFFFFFFF, BOARD_INFO(boardId)->gppOutEnValHigh);
-
-	/* Nand CE */
-	MV_REG_BIT_SET(NAND_CTRL_REG, NAND_ACTCEBOOT_BIT);
-}
-
-/*******************************************************************************
-* mvBoardModelGet - Get Board model
-*
-* DESCRIPTION:
-*       This function returns 16bit describing board model.
-*       Board model is constructed of one byte major and minor numbers in the
-*       following manner:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       String describing board model.
-*
-*******************************************************************************/
-MV_U16 mvBoardModelGet(MV_VOID)
-{
-	return (mvBoardIdGet() >> 16);
-}
-
-/*******************************************************************************
-* mbBoardRevlGet - Get Board revision
-*
-* DESCRIPTION:
-*       This function returns a 32bit describing the board revision.
-*       Board revision is constructed of 4bytes. 2bytes describes major number
-*       and the other 2bytes describes minor munber.
-*       For example for board revision 3.4 the function will return
-*       0x00030004.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       String describing board model.
-*
-*******************************************************************************/
-MV_U16 mvBoardRevGet(MV_VOID)
-{
-	return (mvBoardIdGet() & 0xFFFF);
-}
-
-/*******************************************************************************
-* mvBoardNameGet - Get Board name
-*
-* DESCRIPTION:
-*       This function returns a string describing the board model and revision.
-*       String is extracted from board I2C EEPROM.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       pNameBuff - Buffer to contain board name string. Minimum size 32 chars.
-*
-* RETURN:
-*
-*       MV_ERROR if informantion can not be read.
-*******************************************************************************/
-MV_STATUS mvBoardNameGet(char *pNameBuff)
-{
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsSPrintf (pNameBuff, "Board unknown.\n");
-		return MV_ERROR;
-
-	}
-
-	mvOsSPrintf (pNameBuff, "%s",BOARD_INFO(boardId)->boardName);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvBoardIsPortInSgmii -
-*
-* DESCRIPTION:
-*       This routine returns MV_TRUE for port number works in SGMII or MV_FALSE
-*	For all other options.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE - port in SGMII.
-*       MV_FALSE - other.
-*
-*******************************************************************************/
-MV_BOOL mvBoardIsPortInSgmii(MV_U32 ethPortNum)
-{
-    MV_BOOL ethPortSgmiiSupport[BOARD_ETH_PORT_NUM] = MV_ETH_PORT_SGMII;
-
-    if(ethPortNum >= BOARD_ETH_PORT_NUM)
-    {
-	    mvOsPrintf ("Invalid portNo=%d\n", ethPortNum);
-		return MV_FALSE;
-    }
-    return ethPortSgmiiSupport[ethPortNum];
-}
-
-/*******************************************************************************
-* mvBoardIsPortInGmii -
-*
-* DESCRIPTION:
-*       This routine returns MV_TRUE for port number works in GMII or MV_FALSE
-*	For all other options.
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE - port in GMII.
-*       MV_FALSE - other.
-*
-*******************************************************************************/
-MV_BOOL mvBoardIsPortInGmii(MV_VOID)
-{
-	MV_U32 devClassId, devClass = 0;
-	if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_AUTO)
-	{
-		/* Get MPP module ID */
-		devClassId = mvBoarModuleTypeGet(devClass);
-		if (MV_BOARD_MODULE_GMII_ID == devClassId)
-			return MV_TRUE;
-	}
-	else if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_GMII)
-		return MV_TRUE;
-
-    return MV_FALSE;
-}
-/*******************************************************************************
-* mvBoardPhyAddrGet - Get the phy address
-*
-* DESCRIPTION:
-*       This routine returns the Phy address of a given ethernet port.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit describing Phy address, -1 if the port number is wrong.
-*
-*******************************************************************************/
-MV_32 mvBoardPhyAddrGet(MV_U32 ethPortNum)
-{
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardPhyAddrGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pBoardMacInfo[ethPortNum].boardEthSmiAddr;
-}
-
-/*******************************************************************************
-* mvBoardMacSpeedGet - Get the Mac speed
-*
-* DESCRIPTION:
-*       This routine returns the Mac speed if pre define of a given ethernet port.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BOARD_MAC_SPEED, -1 if the port number is wrong.
-*
-*******************************************************************************/
-MV_BOARD_MAC_SPEED      mvBoardMacSpeedGet(MV_U32 ethPortNum)
-{
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardMacSpeedGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pBoardMacInfo[ethPortNum].boardMacSpeed;
-}
-
-/*******************************************************************************
-* mvBoardLinkStatusIrqGet - Get the IRQ number for the link status indication
-*
-* DESCRIPTION:
-*       This routine returns the IRQ number for the link status indication.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       the number of the IRQ for the link status indication, -1 if the port 
-*	number is wrong or if not relevant.
-*
-*******************************************************************************/
-MV_32	mvBoardLinkStatusIrqGet(MV_U32 ethPortNum)
-{
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardLinkStatusIrqGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].linkStatusIrq;
-}
-
-/*******************************************************************************
-* mvBoardSwitchPortGet - Get the mapping between the board connector and the 
-* Ethernet Switch port
-*
-* DESCRIPTION:
-*       This routine returns the matching Switch port.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*	boardPortNum - logical number of the connector on the board
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       the matching Switch port, -1 if the port number is wrong or if not relevant.
-*
-*******************************************************************************/
-MV_32	mvBoardSwitchPortGet(MV_U32 ethPortNum, MV_U8 boardPortNum)
-{
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardSwitchPortGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-	if (boardPortNum >= BOARD_ETH_SWITCH_PORT_NUM)
-	{
-		mvOsPrintf("mvBoardSwitchPortGet: Illegal board port number.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].qdPort[boardPortNum];
-}
-
-/*******************************************************************************
-* mvBoardSwitchCpuPortGet - Get the the Ethernet Switch CPU port
-*
-* DESCRIPTION:
-*       This routine returns the Switch CPU port.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       the Switch CPU port, -1 if the port number is wrong or if not relevant.
-*
-*******************************************************************************/
-MV_32	mvBoardSwitchCpuPortGet(MV_U32 ethPortNum)
-{
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardSwitchCpuPortGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].qdCpuPort;
-}
-
-/*******************************************************************************
-* mvBoardIsSwitchConnected - Get switch connection status 
-* DESCRIPTION:
-*       This routine returns port's connection status
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       1 - if ethPortNum is connected to switch, 0 otherwise
-*
-*******************************************************************************/
-MV_32	mvBoardIsSwitchConnected(MV_U32 ethPortNum)
-{
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardIsSwitchConnected: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	if(ethPortNum >= BOARD_INFO(boardId)->numBoardMacInfo)
-	{
-		mvOsPrintf("mvBoardIsSwitchConnected: Illegal port number(%u)\n", ethPortNum);
-		return MV_ERROR;
-	}
-	
-	if((MV_32)(BOARD_INFO(boardId)->pSwitchInfo))	
-	return (MV_32)(BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].switchOnPort == ethPortNum);
-	else
-		return 0;
-}
-/*******************************************************************************
-* mvBoardSmiScanModeGet - Get Switch SMI scan mode
-*
-* DESCRIPTION:
-*       This routine returns Switch SMI scan mode.
-*
-* INPUT:
-*       ethPortNum - Ethernet port number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       1 for SMI_MANUAL_MODE, -1 if the port number is wrong or if not relevant.
-*
-*******************************************************************************/
-MV_32	mvBoardSmiScanModeGet(MV_U32 ethPortNum)
-{
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardSmiScanModeGet: Board unknown.\n");
-		return MV_ERROR;
-	}
-
-	return BOARD_INFO(boardId)->pSwitchInfo[ethPortNum].smiScanMode;
-}
-/*******************************************************************************
-* mvBoardSpecInitGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN: Return MV_TRUE and parameters in case board need spesific phy init, 
-* 	  otherwise return MV_FALSE. 
-*
-*
-*******************************************************************************/
-
-MV_BOOL mvBoardSpecInitGet(MV_U32* regOff, MV_U32* data)
-{
-	return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvBoardTclkGet - Get the board Tclk (Controller clock)
-*
-* DESCRIPTION:
-*       This routine extract the controller core clock.
-*       This function uses the controller counters to make identification.
-*		Note: In order to avoid interference, make sure task context switch
-*		and interrupts will not occure during this function operation
-*
-* INPUT:
-*       countNum - Counter number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit clock cycles in Hertz.
-*
-*******************************************************************************/
-MV_U32 mvBoardTclkGet(MV_VOID)
-{
-    if(mvCtrlModelGet()==MV_6281_DEV_ID)
-    {
-#if defined(TCLK_AUTO_DETECT)
-	MV_U32 tmpTClkRate = MV_BOARD_TCLK_166MHZ;
-
-    tmpTClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-    tmpTClkRate &= MSAR_TCLCK_MASK;
-
-    switch (tmpTClkRate)
-    {
-    case MSAR_TCLCK_166:
-            return MV_BOARD_TCLK_166MHZ;
-            break;
-    case MSAR_TCLCK_200:
-            return MV_BOARD_TCLK_200MHZ;
-            break;
-    }
-#else
-    return MV_BOARD_TCLK_200MHZ;
-#endif
-    }
-
-        return MV_BOARD_TCLK_166MHZ;
-
-}
-/*******************************************************************************
-* mvBoardSysClkGet - Get the board SysClk (CPU bus clock)
-*
-* DESCRIPTION:
-*       This routine extract the CPU bus clock.
-*
-* INPUT:
-*       countNum - Counter number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit clock cycles in Hertz.
-*
-*******************************************************************************/
-static MV_U32  mvBoard6180SysClkGet(MV_VOID)
-{
-	MV_U32 	sysClkRate=0;
-	MV_CPU_ARM_CLK _cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
-
-	sysClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	sysClkRate = sysClkRate & MSAR_CPUCLCK_MASK_6180;
-	sysClkRate = sysClkRate >> MSAR_CPUCLCK_OFFS_6180;
-			
-	sysClkRate = _cpu6180_ddr_l2_CLK[sysClkRate].ddrClk;
-
-	return sysClkRate;
-
-}
-
-MV_U32  mvBoardSysClkGet(MV_VOID)
-{
-#ifdef SYSCLK_AUTO_DETECT
-	MV_U32 sysClkRate, tmp, pClkRate, indexDdrRtio;
-	MV_U32 cpuCLK[] = MV_CPU_CLCK_TBL;
-	MV_U32 ddrRtio[][2] = MV_DDR_CLCK_RTIO_TBL;
-
-	if(mvCtrlModelGet() == MV_6180_DEV_ID)
-		return mvBoard6180SysClkGet();
-
-	tmp = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	pClkRate = MSAR_CPUCLCK_EXTRACT(tmp);
-	pClkRate = cpuCLK[pClkRate];
-
-	indexDdrRtio = tmp & MSAR_DDRCLCK_RTIO_MASK;
-	indexDdrRtio = indexDdrRtio >> MSAR_DDRCLCK_RTIO_OFFS;
-    if(ddrRtio[indexDdrRtio][0] != 0)
-        sysClkRate = ((pClkRate * ddrRtio[indexDdrRtio][1]) / ddrRtio[indexDdrRtio][0]);
-    else
-        sysClkRate = 0;
-	return sysClkRate;
-#else
-	return MV_BOARD_DEFAULT_SYSCLK;
-#endif
-}
-
-
-/*******************************************************************************
-* mvBoardPexBridgeIntPinGet - Get PEX to PCI bridge interrupt pin number
-*
-* DESCRIPTION:
-*		Multi-ported PCI Express bridges that is implemented on the board
-*		collapse interrupts across multiple conventional PCI/PCI-X buses.
-*		A dual-headed PCI Express bridge would map (or "swizzle") the
-*		interrupts per the following table (in accordance with the respective
-*		logical PCI/PCI-X bridge's Device Number), collapse the INTA#-INTD#
-*		signals from its two logical PCI/PCI-X bridges, collapse the
-*		INTA#-INTD# signals from any internal sources, and convert the
-*		signals to in-band PCI Express messages. 10
-*		This function returns the upstream interrupt as it was converted by
-*		the bridge, according to board configuration and the following table:
-*					  		PCI dev num
-*			Interrupt pin 	7, 	8, 	9
-*		   			A  ->	A	D	C
-*		   			B  -> 	B	A	D
-*		   			C  -> 	C	B	A
-*		  			D  ->	D	C	B
-*
-*
-* INPUT:
-*       devNum - PCI/PCIX device number.
-*       intPin - PCI Int pin
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Int pin connected to the Interrupt controller
-*
-*******************************************************************************/
-MV_U32 mvBoardPexBridgeIntPinGet(MV_U32 devNum, MV_U32 intPin)
-{
-	MV_U32 realIntPin = ((intPin + (3 - (devNum % 4))) %4 );
-
-	if (realIntPin == 0) return 4;
-		else return realIntPin;
-
-}
-
-/*******************************************************************************
-* mvBoardDebugLedNumGet - Get number of debug Leds
-*
-* DESCRIPTION:
-* INPUT:
-*       boardId
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_U32 mvBoardDebugLedNumGet(MV_U32 boardId)
-{
-	return BOARD_INFO(boardId)->activeLedsNumber;
-}
-
-/*******************************************************************************
-* mvBoardDebugLeg - Set the board debug Leds
-*
-* DESCRIPTION: turn on/off status leds.
-* 	       Note: assume MPP leds are part of group 0 only.
-*
-* INPUT:
-*       hexNum - Number to be displied in hex by Leds.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvBoardDebugLed(MV_U32 hexNum)
-{
-    MV_U32 val = 0,totalMask, currentBitMask = 1,i;
-    MV_U32 boardId= mvBoardIdGet();
-
-    if (BOARD_INFO(boardId)->pLedGppPin == NULL)
-	return;
-
-    totalMask = (1 << BOARD_INFO(boardId)->activeLedsNumber) -1;
-    hexNum &= totalMask;
-    totalMask = 0;
-
-    for (i = 0 ; i < BOARD_INFO(boardId)->activeLedsNumber ; i++)
-    {
-	if (hexNum & currentBitMask)
-	{
-	    val |= (1 << BOARD_INFO(boardId)->pLedGppPin[i]);
-	}
-
-	totalMask |= (1 << BOARD_INFO(boardId)->pLedGppPin[i]);
-
-	currentBitMask = (currentBitMask << 1);
-    }
-
-    if (BOARD_INFO(boardId)->ledsPolarity)
-    {
-	mvGppValueSet(0, totalMask, val);
-    }
-    else
-    {
-	mvGppValueSet(0, totalMask, ~val);
-    }
-}
-
-
-/*******************************************************************************
-* mvBoarGpioPinGet - mvBoarGpioPinGet
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		class - MV_BOARD_GPP_CLASS enum.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32 mvBoarGpioPinNumGet(MV_BOARD_GPP_CLASS class, MV_U32 index)
-{
-	MV_U32 boardId, i;
-	MV_U32 indexFound = 0;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardRTCGpioPinGet:Board unknown.\n");
-		return MV_ERROR;
-
-	}
-
-        for (i = 0; i < BOARD_INFO(boardId)->numBoardGppInfo; i++)
-		if (BOARD_INFO(boardId)->pBoardGppInfo[i].devClass == class) {
-			if (indexFound == index)
-        			return (MV_U32)BOARD_INFO(boardId)->pBoardGppInfo[i].gppPinNum;
-			else
-				indexFound++;
-
-		}
-
-	return MV_ERROR;
-}
-
-
-/*******************************************************************************
-* mvBoardRTCGpioPinGet - mvBoardRTCGpioPinGet
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32 mvBoardRTCGpioPinGet(MV_VOID)
-{
-	return mvBoarGpioPinNumGet(BOARD_GPP_RTC, 0);
-}
-
-
-/*******************************************************************************
-* mvBoardReset - mvBoardReset
-*
-* DESCRIPTION:
-*			Reset the board
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       None
-*
-*******************************************************************************/
-MV_VOID	mvBoardReset(MV_VOID)
-{
-	MV_32 resetPin;
-
-	/* Get gpp reset pin if define */
-	resetPin = mvBoardResetGpioPinGet();
-	if (resetPin != MV_ERROR)
-	{
-        	MV_REG_BIT_RESET( GPP_DATA_OUT_REG(0) ,(1 << resetPin));
-		MV_REG_BIT_RESET( GPP_DATA_OUT_EN_REG(0) ,(1 << resetPin));
-
-	}
-	else
-	{
-	    /* No gpp reset pin was found, try to reset ussing
-	    system reset out */
-	    MV_REG_BIT_SET( CPU_RSTOUTN_MASK_REG , BIT2);
-	    MV_REG_BIT_SET( CPU_SYS_SOFT_RST_REG , BIT0);
-	}
-}
-
-/*******************************************************************************
-* mvBoardResetGpioPinGet - mvBoardResetGpioPinGet
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32 mvBoardResetGpioPinGet(MV_VOID)
-{
-	return mvBoarGpioPinNumGet(BOARD_GPP_RESET, 0);
-}
-/*******************************************************************************
-* mvBoardSDIOGpioPinGet - mvBoardSDIOGpioPinGet
-*
-* DESCRIPTION:
-*	used for hotswap detection
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32  mvBoardSDIOGpioPinGet(MV_VOID)
-{
-	return mvBoarGpioPinNumGet(BOARD_GPP_SDIO_DETECT, 0);
-}
-
-/*******************************************************************************
-* mvBoardUSBVbusGpioPinGet - return Vbus input GPP
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		int  devNo.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32 mvBoardUSBVbusGpioPinGet(MV_32 devId)
-{
-	return mvBoarGpioPinNumGet(BOARD_GPP_USB_VBUS, devId);
-}
-
-/*******************************************************************************
-* mvBoardUSBVbusEnGpioPinGet - return Vbus Enable output GPP
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		int  devNo.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       GPIO pin number. The function return -1 for bad parameters.
-*
-*******************************************************************************/
-MV_32 mvBoardUSBVbusEnGpioPinGet(MV_32 devId)
-{
-	return mvBoarGpioPinNumGet(BOARD_GPP_USB_VBUS_EN, devId);
-}
-
-
-/*******************************************************************************
-* mvBoardGpioIntMaskGet - Get GPIO mask for interrupt pins
-*
-* DESCRIPTION:
-*		This function returns a 32-bit mask of GPP pins that connected to
-*		interrupt generating sources on board.
-*		For example if UART channel A is hardwired to GPP pin 8 and
-*		UART channel B is hardwired to GPP pin 4 the fuinction will return
-*		the value 0x000000110
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		See description. The function return -1 if board is not identified.
-*
-*******************************************************************************/
-MV_32 mvBoardGpioIntMaskLowGet(MV_VOID)
-{
-	MV_U32 boardId;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardGpioIntMaskGet:Board unknown.\n");
-		return MV_ERROR;
-
-	}
-
-	return BOARD_INFO(boardId)->intsGppMaskLow;
-}
-MV_32 mvBoardGpioIntMaskHighGet(MV_VOID)
-{
-	MV_U32 boardId;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardGpioIntMaskGet:Board unknown.\n");
-		return MV_ERROR;
-
-	}
-
-	return BOARD_INFO(boardId)->intsGppMaskHigh;
-}
-
-
-/*******************************************************************************
-* mvBoardMppGet - Get board dependent MPP register value
-*
-* DESCRIPTION:
-*		MPP settings are derived from board design.
-*		MPP group consist of 8 MPPs. An MPP group represent MPP
-*		control register.
-*       This function retrieves board dependend MPP register value.
-*
-* INPUT:
-*       mppGroupNum - MPP group number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit value describing MPP control register value.
-*
-*******************************************************************************/
-MV_32 mvBoardMppGet(MV_U32 mppGroupNum)
-{
-	MV_U32 boardId;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
-		return MV_ERROR;
-
-	}
-
-	return BOARD_INFO(boardId)->pBoardMppConfigValue[0].mppGroup[mppGroupNum];
-}
-
-
-/*******************************************************************************
-* mvBoardMppGroupId - If MPP group type is AUTO then identify it using twsi
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_VOID mvBoardMppGroupIdUpdate(MV_VOID)
-{
-
-	MV_BOARD_MPP_GROUP_CLASS devClass;
-	MV_BOARD_MODULE_ID_CLASS devClassId;
-	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
-	MV_U32 devId;
-	MV_U32 maxMppGrp = 1;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			maxMppGrp = MV_6281_MPP_MAX_MODULE;
-			break;
-		case MV_6192_DEV_ID:
-			maxMppGrp = MV_6192_MPP_MAX_MODULE;
-			break;
-        case MV_6190_DEV_ID:
-            maxMppGrp = MV_6190_MPP_MAX_MODULE;
-            break;
-		case MV_6180_DEV_ID:
-			maxMppGrp = MV_6180_MPP_MAX_MODULE;
-			break;		
-	}
-
-	for (devClass = 0; devClass < maxMppGrp; devClass++)
-	{
-		/* If MPP group can be defined by the module connected to it */
-		if (mvBoardMppGroupTypeGet(devClass) == MV_BOARD_AUTO)
-		{
-			/* Get MPP module ID */
-			devClassId = mvBoarModuleTypeGet(devClass);
-			if (MV_ERROR != devClassId)
-			{
-				switch(devClassId)
-				{
-				case MV_BOARD_MODULE_TDM_ID:
-				case MV_BOARD_MODULE_TDM_5CHAN_ID:
-					mppGroupType = MV_BOARD_TDM;
-					break;
-				case MV_BOARD_MODULE_AUDIO_ID:
-					mppGroupType = MV_BOARD_AUDIO;
-					break;
-				case MV_BOARD_MODULE_RGMII_ID:
-					mppGroupType = MV_BOARD_RGMII;
-					break;
-				case MV_BOARD_MODULE_GMII_ID:
-					mppGroupType = MV_BOARD_GMII;
-					break;
-				case MV_BOARD_MODULE_TS_ID:
-					mppGroupType = MV_BOARD_TS;
-					break;
-				case MV_BOARD_MODULE_MII_ID:
-					mppGroupType = MV_BOARD_MII;
-					break;
-				default:
-					mppGroupType = MV_BOARD_OTHER;
-					break;
-				}
-			}
-			else
-				/* The module bay is empty */
-				mppGroupType = MV_BOARD_OTHER;
-			
-			/* Update MPP group type */
-			mvBoardMppGroupTypeSet(devClass, mppGroupType);
-		}
-
-		/* Update MPP output voltage for RGMII 1.8V. Set port to GMII for GMII module */
-		if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_RGMII))
-			MV_REG_BIT_SET(MPP_OUTPUT_DRIVE_REG,MPP_1_8_RGMII1_OUTPUT_DRIVE | MPP_1_8_RGMII0_OUTPUT_DRIVE);
-        	else 
-		{
-			if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_GMII))
-        		{
-				MV_REG_BIT_RESET(MPP_OUTPUT_DRIVE_REG, BIT7 | BIT15);
-            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(0),BIT3);
-            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(1),BIT3);
-        		}
-        		else if ((mvBoardMppGroupTypeGet(devClass) == MV_BOARD_MII))
-        		{
-				/* Assumption that the MDC & MDIO should be 3.3V */
-				MV_REG_BIT_RESET(MPP_OUTPUT_DRIVE_REG, BIT7 | BIT15);
-				/* Assumption that only ETH1 can be MII when using modules on DB */
-            			MV_REG_BIT_RESET(ETH_PORT_SERIAL_CTRL_1_REG(1),BIT3);
-        		}
-		}
-	}
-}
-
-/*******************************************************************************
-* mvBoardMppGroupTypeGet 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       mppGroupClass - MPP group number 0  for MPP[35:20] or 1 for MPP[49:36].
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_BOARD_MPP_TYPE_CLASS mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass)
-{
-	MV_U32 boardId;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
-		return MV_ERROR;
-
-	}
-	
-	if (mppGroupClass == MV_BOARD_MPP_GROUP_1)
-		return BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup1;
-	else
-		return BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup2;
-}
-
-/*******************************************************************************
-* mvBoardMppGroupTypeSet 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       mppGroupClass - MPP group number 0  for MPP[35:20] or 1 for MPP[49:36].
-*       mppGroupType - MPP group type for MPP[35:20] or for MPP[49:36].
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_VOID mvBoardMppGroupTypeSet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass,
-						MV_BOARD_MPP_TYPE_CLASS mppGroupType)
-{
-	MV_U32 boardId;
-
-	boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardMppGet:Board unknown.\n");
-	}
-
-	if (mppGroupClass == MV_BOARD_MPP_GROUP_1)
-		BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup1 = mppGroupType;
-	else
-		BOARD_INFO(boardId)->pBoardMppTypeValue[0].boardMppGroup2 = mppGroupType;
-
-}
-
-/*******************************************************************************
-* mvBoardMppMuxSet - Update MPP mux
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_VOID mvBoardMppMuxSet(MV_VOID)
-{
-
-	MV_BOARD_MPP_GROUP_CLASS devClass;
-	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
-	MV_U32 devId;
-	MV_U8 muxVal = 0xf;
-	MV_U32 maxMppGrp = 1;
-    MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			maxMppGrp = MV_6281_MPP_MAX_MODULE;
-			break;
-		case MV_6192_DEV_ID:
-			maxMppGrp = MV_6192_MPP_MAX_MODULE;
-			break;
-        case MV_6190_DEV_ID:
-            maxMppGrp = MV_6190_MPP_MAX_MODULE;
-            break;
-		case MV_6180_DEV_ID:
-			maxMppGrp = MV_6180_MPP_MAX_MODULE;
-			break;		
-	}
-
-	for (devClass = 0; devClass < maxMppGrp; devClass++)
-	{
-		mppGroupType = mvBoardMppGroupTypeGet(devClass);
-
-		switch(mppGroupType)
-		{
-			case MV_BOARD_TDM:
-				muxVal &= ~(devClass ? (0x2 << (devClass * 2)):0x0);
-				break;
-			case MV_BOARD_AUDIO:
-				 muxVal &= ~(devClass ? 0x7 : 0x0); /*old Z0 value 0xd:0x0*/
-				break;
-			case MV_BOARD_TS:
-				 muxVal &= ~(devClass ? (0x2 << (devClass * 2)):0x0);
-				break;
-			default:
-				muxVal |= (devClass ? 0xf : 0);
-				break;
-		}
-	}
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: twsi exp set\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(MV_BOARD_MUX_I2C_ADDR_ENTRY);
-    	twsiSlave.slaveAddr.type = mvBoardTwsiExpAddrTypeGet(MV_BOARD_MUX_I2C_ADDR_ENTRY);
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 2;
-    	twsiSlave.moreThen256 = MV_FALSE;
-
-
-
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
-        	return;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-    	
-	/* Change twsi exp to output */
-    	twsiSlave.offset = 6;
-	muxVal = 0;
-	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
-        	return;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
-	
-}
-
-/*******************************************************************************
-* mvBoardTdmMppSet - set MPPs in TDM module
-*
-* DESCRIPTION:
-*
-* INPUT: type of second telephony device
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_VOID mvBoardTdmMppSet(MV_32 chType)
-{
-
-	MV_BOARD_MPP_GROUP_CLASS devClass;
-	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
-	MV_U32 devId;
-	MV_U8 muxVal = 1;
-	MV_U8 muxValMask = 1;
-	MV_U8 twsiVal;
-	MV_U32 maxMppGrp = 1;
-    	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			maxMppGrp = MV_6281_MPP_MAX_MODULE;
-			break;
-		case MV_6192_DEV_ID:
-			maxMppGrp = MV_6192_MPP_MAX_MODULE;
-			break;
-        case MV_6190_DEV_ID:
-            maxMppGrp = MV_6190_MPP_MAX_MODULE;
-            break;
-		case MV_6180_DEV_ID:
-			maxMppGrp = MV_6180_MPP_MAX_MODULE;
-			break;		
-	}
-
-	for (devClass = 0; devClass < maxMppGrp; devClass++)
-	{
-		mppGroupType = mvBoardMppGroupTypeGet(devClass);
-		if(mppGroupType == MV_BOARD_TDM)
-			break;
-	}
-
-	if(devClass == maxMppGrp)
-		return;		/* TDM module not found */
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: twsi exp set\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(devClass);
-    	twsiSlave.slaveAddr.type = ADDR7_BIT;
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 3;
-    	twsiSlave.moreThen256 = MV_FALSE;
-
-	if(mvBoardIdGet() == RD_88F6281A_ID)
-	{
-		muxVal = 0xc;
-		muxValMask = 0xf3;
-	}
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        muxVal = (twsiVal & muxValMask) | muxVal;
-
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp out val fail\n");
-        	return;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-    	
-	/* Change twsi exp to output */
-    	twsiSlave.offset = 7;
-	muxVal = 0xfe;
-	if(mvBoardIdGet() == RD_88F6281A_ID)
-		muxVal = 0xf3;
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-	muxVal = (twsiVal & muxVal);
-
-	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp change to out fail\n");
-        	return;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
-	/* reset the line to 0 */
-    	twsiSlave.offset = 3;
-	muxVal = 0;
-	muxValMask = 1;
-
-	if(mvBoardIdGet() == RD_88F6281A_ID) {
-		muxVal = 0x0;
-		muxValMask = 0xf3;
-	}
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        muxVal = (twsiVal & muxValMask) | muxVal;
-
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp out val fail\n");
-        	return;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-
-	mvOsDelay(20);
-
-	/* set the line to 1 */
-    	twsiSlave.offset = 3;
-	muxVal = 1;
-	muxValMask = 1;
-
-	if(mvBoardIdGet() == RD_88F6281A_ID)
-	{
-		muxVal = 0xc;
-		muxValMask = 0xf3;
-		if(chType) /* FXS - issue reset properly */
-		{
-			MV_REG_BIT_SET(GPP_DATA_OUT_REG(1), MV_GPP12);
-			mvOsDelay(50);
-			MV_REG_BIT_RESET(GPP_DATA_OUT_REG(1), MV_GPP12);
-		}
-		else /* FXO - issue reset via TDM_CODEC_RST*/
-		{
-		   /* change MPP44 type to TDM_CODEC_RST(0x2) */
-		   MV_REG_WRITE(MPP_CONTROL_REG5, ((MV_REG_READ(MPP_CONTROL_REG5) & 0xFFF0FFFF)  | BIT17));	
-		}	
-	}
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        muxVal = (twsiVal & muxValMask) | muxVal;
-
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp out val fail\n");
-        	return;
-    	}
-
-	/* TBD - 5 channels */
-#if defined(MV_TDM_5CHANNELS)
-	/* change MPP38 type to GPIO(0x0) & polarity for TDM_STROBE */
-	MV_REG_WRITE(MPP_CONTROL_REG4, (MV_REG_READ(MPP_CONTROL_REG4) & 0xF0FFFFFF));
-	mvGppPolaritySet(1, MV_GPP6, 0);
-	
-	twsiSlave.offset = 6;
-	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(2);
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-	muxVal = (twsiVal & ~BIT2);
-
-	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp change to out fail\n");
-        	return;
-    	}
-
-
-	twsiSlave.offset = 2;
-
-	mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-	muxVal = (twsiVal & ~BIT2);
-
-	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &muxVal, 1) )
-    	{
-    		mvOsPrintf("Board: twsi exp change to out fail\n");
-        	return;
-    	}
-#endif
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-
-	
-}
-/*******************************************************************************
-* mvBoardVoiceConnModeGet - return SLIC/DAA connection & interrupt modes  
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-
-MV_VOID mvBoardVoiceConnModeGet(MV_32* connMode, MV_32* irqMode)
-{
-	switch(mvBoardIdGet())
-	{
-		case RD_88F6281A_ID:
-			*connMode = DAISY_CHAIN_MODE;
-			*irqMode = INTERRUPT_TO_TDM;
-			break;
-		case DB_88F6281A_BP_ID:
-			 *connMode = DUAL_CHIP_SELECT_MODE;
-			 *irqMode = INTERRUPT_TO_TDM;
-			break;
-		case RD_88F6192A_ID:
-			*connMode = DUAL_CHIP_SELECT_MODE;
-			*irqMode = INTERRUPT_TO_TDM;
-			break;
-		case DB_88F6192A_BP_ID:
-			 *connMode = DUAL_CHIP_SELECT_MODE;
-			 *irqMode = INTERRUPT_TO_TDM;
-			break;
-		default:
-			*connMode = *irqMode = -1;
-			mvOsPrintf("mvBoardVoiceAssembleModeGet: TDM not supported(boardId=0x%x)\n",mvBoardIdGet());
-	}
-		return;
-	
-}
-
-/*******************************************************************************
-* mvBoardMppModuleTypePrint - print module detect
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_VOID mvBoardMppModuleTypePrint(MV_VOID)
-{
-
-	MV_BOARD_MPP_GROUP_CLASS devClass;
-	MV_BOARD_MPP_TYPE_CLASS mppGroupType;
-	MV_U32 devId;
-	MV_U32 maxMppGrp = 1;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			maxMppGrp = MV_6281_MPP_MAX_MODULE;
-			break;
-		case MV_6192_DEV_ID:
-			maxMppGrp = MV_6192_MPP_MAX_MODULE;
-			break;
-        case MV_6190_DEV_ID:
-            maxMppGrp = MV_6190_MPP_MAX_MODULE;
-            break;
-		case MV_6180_DEV_ID:
-			maxMppGrp = MV_6180_MPP_MAX_MODULE;
-			break;		
-	}
-
-	for (devClass = 0; devClass < maxMppGrp; devClass++)
-	{
-		mppGroupType = mvBoardMppGroupTypeGet(devClass);
-
-		switch(mppGroupType)
-		{
-			case MV_BOARD_TDM:
-                if(devId != MV_6190_DEV_ID)
-                    mvOsPrintf("Module %d is TDM\n", devClass);
-				break;
-			case MV_BOARD_AUDIO:
-                if(devId != MV_6190_DEV_ID)
-                    mvOsPrintf("Module %d is AUDIO\n", devClass);
-				break;
-            case MV_BOARD_RGMII:
-                if(devId != MV_6190_DEV_ID)
-                    mvOsPrintf("Module %d is RGMII\n", devClass);
-				break;
-			case MV_BOARD_GMII:
-                if(devId != MV_6190_DEV_ID)
-                    mvOsPrintf("Module %d is GMII\n", devClass);
-				break;
-			case MV_BOARD_TS:
-                if(devId != MV_6190_DEV_ID)
-                    mvOsPrintf("Module %d is TS\n", devClass);
-				break;
-			default:
-				break;
-		}
-	}
-}
-
-/* Board devices API managments */
-
-/*******************************************************************************
-* mvBoardGetDeviceNumber - Get number of device of some type on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		number of those devices else the function returns 0
-*
-*
-*******************************************************************************/
-MV_32 mvBoardGetDevicesNumber(MV_BOARD_DEV_CLASS devClass)
-{
-	MV_U32	foundIndex=0,devNum;
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("mvBoardGetDeviceNumber:Board unknown.\n");
-		return 0xFFFFFFFF;
-
-	}
-
-	for (devNum = START_DEV_CS; devNum < BOARD_INFO(boardId)->numBoardDeviceIf; devNum++)
-	{
-		if (BOARD_INFO(boardId)->pDevCsInfo[devNum].devClass == devClass)
-		{
-			foundIndex++;
-		}
-	}
-
-    return foundIndex;
-
-}
-
-/*******************************************************************************
-* mvBoardGetDeviceBaseAddr - Get base address of a device existing on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       devIndex - The device sequential number on the board
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		Base address else the function returns 0xffffffff
-*
-*
-*******************************************************************************/
-MV_32 mvBoardGetDeviceBaseAddr(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_DEV_CS_INFO* devEntry;
-	devEntry = boardGetDevEntry(devNum,devClass);
-	if (devEntry != NULL)
-	{
-		return mvCpuIfTargetWinBaseLowGet(DEV_TO_TARGET(devEntry->deviceCS));
-
-	}
-
-	return 0xFFFFFFFF;
-}
-
-/*******************************************************************************
-* mvBoardGetDeviceBusWidth - Get Bus width of a device existing on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       devIndex - The device sequential number on the board
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		Bus width else the function returns 0xffffffff
-*
-*
-*******************************************************************************/
-MV_32 mvBoardGetDeviceBusWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_DEV_CS_INFO* devEntry;
-
-	devEntry = boardGetDevEntry(devNum,devClass);
-	if (devEntry != NULL)
-	{
-		return 8; 
-	}
-
-	return 0xFFFFFFFF;
-
-}
-
-/*******************************************************************************
-* mvBoardGetDeviceWidth - Get dev width of a device existing on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       devIndex - The device sequential number on the board
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		dev width else the function returns 0xffffffff
-*
-*
-*******************************************************************************/
-MV_32 mvBoardGetDeviceWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_DEV_CS_INFO* devEntry;
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("Board unknown.\n");
-		return 0xFFFFFFFF;
-	}
-
-	devEntry = boardGetDevEntry(devNum,devClass);
-	if (devEntry != NULL)
-		return devEntry->devWidth;
-
-	return MV_ERROR;
-
-}
-
-/*******************************************************************************
-* mvBoardGetDeviceWinSize - Get the window size of a device existing on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       devIndex - The device sequential number on the board
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		window size else the function returns 0xffffffff
-*
-*
-*******************************************************************************/
-MV_32 mvBoardGetDeviceWinSize(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_DEV_CS_INFO* devEntry;
-	MV_U32 boardId = mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("Board unknown.\n");
-		return 0xFFFFFFFF;
-	}
-
-	devEntry = boardGetDevEntry(devNum,devClass);
-	if (devEntry != NULL)
-	{
-		return mvCpuIfTargetWinSizeGet(DEV_TO_TARGET(devEntry->deviceCS));
-	}
-
-	return 0xFFFFFFFF;
-}
-
-
-/*******************************************************************************
-* boardGetDevEntry - returns the entry pointer of a device on the board
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       devIndex - The device sequential number on the board
-*		devType - The device type ( Flash,RTC , etc .. )
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       If the device is found on the board the then the functions returns the
-*		dev number else the function returns 0x0
-*
-*
-*******************************************************************************/
-static MV_DEV_CS_INFO*  boardGetDevEntry(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_U32	foundIndex=0,devIndex;
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("boardGetDevEntry: Board unknown.\n");
-		return NULL;
-
-	}
-
-	for (devIndex = START_DEV_CS; devIndex < BOARD_INFO(boardId)->numBoardDeviceIf; devIndex++)
-	{
-		/* TBR */
-		/*if (BOARD_INFO(boardId)->pDevCsInfo[devIndex].deviceCS == MV_BOOTDEVICE_INDEX)
-		     continue;*/
-
-		if (BOARD_INFO(boardId)->pDevCsInfo[devIndex].devClass == devClass)
-		{
-            		if (foundIndex == devNum)
-			{
-				return &(BOARD_INFO(boardId)->pDevCsInfo[devIndex]);
-			}
-			foundIndex++;
-		}
-	}
-
-	/* device not found */
-	return NULL;
-}
-
-/* Get device CS number */
-
-MV_U32 boardGetDevCSNum(MV_32 devNum, MV_BOARD_DEV_CLASS devClass)
-{
-	MV_DEV_CS_INFO* devEntry;
-	MV_U32 boardId= mvBoardIdGet();
-
-	if (!((boardId >= BOARD_ID_BASE)&&(boardId < MV_MAX_BOARD_ID)))
-	{
-		mvOsPrintf("Board unknown.\n");
-		return 0xFFFFFFFF;
-
-	}
-
-
-	devEntry = boardGetDevEntry(devNum,devClass);
-	if (devEntry != NULL)
-		return devEntry->deviceCS;
-
-	return 0xFFFFFFFF;
-
-}
-
-/*******************************************************************************
-* mvBoardRtcTwsiAddrTypeGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardRtcTwsiAddrTypeGet()
-{
-	int i;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_RTC)
-			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
-	return (MV_ERROR);
-}
-
-/*******************************************************************************
-* mvBoardRtcTwsiAddrGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardRtcTwsiAddrGet()
-{
-	int i;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_RTC)
-			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
-	return (0xFF);
-}
-
-/*******************************************************************************
-* mvBoardA2DTwsiAddrTypeGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardA2DTwsiAddrTypeGet()
-{
-	int i;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_AUDIO_DEC)
-			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
-	return (MV_ERROR);
-}
-
-/*******************************************************************************
-* mvBoardA2DTwsiAddrGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardA2DTwsiAddrGet()
-{
-	int i;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_TWSI_AUDIO_DEC)
-			return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
-	return (0xFF);
-}
-
-/*******************************************************************************
-* mvBoardTwsiExpAddrTypeGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardTwsiExpAddrTypeGet(MV_U32 index)
-{
-	int i;
-	MV_U32 indexFound = 0;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_EXP)
-		{
-			if (indexFound == index)
-				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
-			else
-				indexFound++;
-		}
-
-	return (MV_ERROR);
-}
-
-/*******************************************************************************
-* mvBoardTwsiExpAddrGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardTwsiExpAddrGet(MV_U32 index)
-{
-	int i;
-	MV_U32 indexFound = 0;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_EXP)
-		{
-			if (indexFound == index)
-				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
-			else
-				indexFound++;
-		}
-
-	return (0xFF);
-}
-
-
-/*******************************************************************************
-* mvBoardTwsiSatRAddrTypeGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardTwsiSatRAddrTypeGet(MV_U32 index)
-{
-	int i;
-	MV_U32 indexFound = 0;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_SATR)
-		{
-			if (indexFound == index)
-				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddrType;
-			else
-				indexFound++;
-		}
-
-	return (MV_ERROR);
-}
-
-/*******************************************************************************
-* mvBoardTwsiSatRAddrGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_U8 mvBoardTwsiSatRAddrGet(MV_U32 index)
-{
-	int i;
-	MV_U32 indexFound = 0;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (i = 0; i < BOARD_INFO(boardId)->numBoardTwsiDev; i++)
-		if (BOARD_INFO(boardId)->pBoardTwsiDev[i].devClass == BOARD_DEV_TWSI_SATR)
-		{
-			if (indexFound == index)
-				return BOARD_INFO(boardId)->pBoardTwsiDev[i].twsiDevAddr;
-			else
-				indexFound++;
-		}
-
-	return (0xFF);
-}
-
-/*******************************************************************************
-* mvBoardNandWidthGet -
-*
-* DESCRIPTION: Get the width of the first NAND device in byte.
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN: 1, 2, 4 or MV_ERROR
-*
-*
-*******************************************************************************/
-/*  */
-MV_32 mvBoardNandWidthGet(void)
-{
-	MV_U32 devNum;
-	MV_U32 devWidth;
-	MV_U32 boardId= mvBoardIdGet();
-
-	for (devNum = START_DEV_CS; devNum < BOARD_INFO(boardId)->numBoardDeviceIf; devNum++)
-	{
-		devWidth = mvBoardGetDeviceWidth(devNum, BOARD_DEV_NAND_FLASH);
-		if (devWidth != MV_ERROR)
-			return (devWidth / 8);
-	}
-		
-	/* NAND wasn't found */
-	return MV_ERROR;
-}
-
-MV_U32 gBoardId = -1;
-
-/*******************************************************************************
-* mvBoardIdGet - Get Board model
-*
-* DESCRIPTION:
-*       This function returns board ID.
-*       Board ID is 32bit word constructed of board model (16bit) and
-*       board revision (16bit) in the following way: 0xMMMMRRRR.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit board ID number, '-1' if board is undefined.
-*
-*******************************************************************************/
-MV_U32 mvBoardIdGet(MV_VOID)
-{
-	MV_U32 tmpBoardId = -1;
-
-	if(gBoardId == -1)
-        {
-		#if defined(DB_88F6281A)
-		tmpBoardId = DB_88F6281A_BP_ID;
-		#elif defined(RD_88F6281A)
-		tmpBoardId = RD_88F6281A_ID;
-		#elif defined(DB_88F6192A)
-		tmpBoardId = DB_88F6192A_BP_ID;
-		#elif defined(DB_88F6190A)
-		tmpBoardId = DB_88F6190A_BP_ID;
-		#elif defined(RD_88F6192A)
-		tmpBoardId = RD_88F6192A_ID;
-		#elif defined(RD_88F6190A)
-		tmpBoardId = RD_88F6190A_ID;
-		#elif defined(DB_88F6180A)
-		tmpBoardId = DB_88F6180A_BP_ID;
-		#elif defined(RD_88F6281A_PCAC)
-		tmpBoardId = RD_88F6281A_PCAC_ID;
-		#elif defined(RD_88F6281A_SHEEVA_PLUG)
-		tmpBoardId = SHEEVA_PLUG_ID;
-		#elif defined(DB_CUSTOMER)
-		tmpBoardId = DB_CUSTOMER_ID;
-		#endif
-		gBoardId = tmpBoardId;
-	}
-
-	return gBoardId;
-}
-
-
-/*******************************************************************************
-* mvBoarModuleTypeGet - mvBoarModuleTypeGet
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		group num - MV_BOARD_MPP_GROUP_CLASS enum
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		module num - MV_BOARD_MODULE_CLASS enum
-*
-*******************************************************************************/
-MV_BOARD_MODULE_ID_CLASS mvBoarModuleTypeGet(MV_BOARD_MPP_GROUP_CLASS devClass)
-{
-    	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-    	MV_U8 data;
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-    	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: Read MPP module ID\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(devClass);
-    	twsiSlave.slaveAddr.type = mvBoardTwsiExpAddrTypeGet(devClass);
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 0;
-    	twsiSlave.moreThen256 = MV_FALSE;
-
-
-
-    	if( MV_OK != mvTwsiRead (0, &twsiSlave, &data, 1) )
-    	{
-    		DB(mvOsPrintf("Board: Read MPP module ID fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: Read MPP module ID succeded\n"));
-	
-	return data;
-}
-
-/*******************************************************************************
-* mvBoarTwsiSatRGet - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		device num - one of three devices
-*		reg num - 0 or 1
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		reg value
-*
-*******************************************************************************/
-MV_U8 mvBoarTwsiSatRGet(MV_U8 devNum, MV_U8 regNum)
-{
-    	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-    	MV_U8 data;
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-    	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: Read S@R device read\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiSatRAddrGet(devNum);
-    	twsiSlave.slaveAddr.type = mvBoardTwsiSatRAddrTypeGet(devNum);
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Use offset as command */
-    	twsiSlave.offset = regNum;
-    	twsiSlave.moreThen256 = MV_FALSE;
-
-    	if( MV_OK != mvTwsiRead (0, &twsiSlave, &data, 1) )
-    	{
-    		DB(mvOsPrintf("Board: Read S@R fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: Read S@R succeded\n"));
-	
-	return data;
-}
-
-/*******************************************************************************
-* mvBoarTwsiSatRSet - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*		devNum - one of three devices
-*		regNum - 0 or 1
-*		regVal - value
-*
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		reg value
-*
-*******************************************************************************/
-MV_STATUS mvBoarTwsiSatRSet(MV_U8 devNum, MV_U8 regNum, MV_U8 regVal)
-{
-    	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-    	/* Read MPP module ID */
-    	twsiSlave.slaveAddr.address = mvBoardTwsiSatRAddrGet(devNum);
-    	twsiSlave.slaveAddr.type = mvBoardTwsiSatRAddrTypeGet(devNum);
-    	twsiSlave.validOffset = MV_TRUE;
-    	DB(mvOsPrintf("Board: Write S@R device addr %x, type %x, data %x\n", twsiSlave.slaveAddr.address,\
-								twsiSlave.slaveAddr.type, regVal));
-	/* Use offset as command */
-    	twsiSlave.offset = regNum;
-    	twsiSlave.moreThen256 = MV_FALSE;
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &regVal, 1) )
-    	{
-    		DB(mvOsPrintf("Board: Write S@R fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: Write S@R succeded\n"));
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvBoardSlicGpioPinGet -
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*
-*******************************************************************************/
-MV_32 mvBoardSlicGpioPinGet(MV_U32 slicNum)
-{
-	MV_U32 boardId;
-	boardId = mvBoardIdGet();
-
-	switch (boardId)
-	{
-	case DB_88F6281A_BP_ID:
-	case RD_88F6281A_ID:
-	default:
-		return MV_ERROR;
-		break;
-
-	}
-}
-
-/*******************************************************************************
-* mvBoardFanPowerControl - Turn on/off the fan power control on the RD-6281A
-*
-* DESCRIPTION:
-*
-* INPUT:
-*        mode - MV_TRUE = on ; MV_FALSE = off
-*
-* OUTPUT:
-*       MV_STATUS - MV_OK , MV_ERROR.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_STATUS mvBoardFanPowerControl(MV_BOOL mode)
-{
-
-	MV_U8 val = 1, twsiVal;
-   	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	if(mvBoardIdGet() != RD_88F6281A_ID)
-        return MV_ERROR;
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: twsi exp set\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(1);
-    	twsiSlave.slaveAddr.type = ADDR7_BIT;
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 3;
-    	twsiSlave.moreThen256 = MV_FALSE;
-        if(mode == MV_TRUE)
-            val = 0x1;
-        else
-            val = 0;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xfe) | val;
-
-        if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-    	
-	/* Change twsi exp to output */
-    	twsiSlave.offset = 7;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xfe);
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
-        return MV_OK;
-}
-
-/*******************************************************************************
-* mvBoardHDDPowerControl - Turn on/off the HDD power control on the RD-6281A
-*
-* DESCRIPTION:
-*
-* INPUT:
-*        mode - MV_TRUE = on ; MV_FALSE = off
-*
-* OUTPUT:
-*       MV_STATUS - MV_OK , MV_ERROR.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_STATUS mvBoardHDDPowerControl(MV_BOOL mode)
-{
-
-	MV_U8 val = 1, twsiVal;
-   	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	if(mvBoardIdGet() != RD_88F6281A_ID)
-        return MV_ERROR;
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: twsi exp set\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(1);
-    	twsiSlave.slaveAddr.type = ADDR7_BIT;
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 3;
-    	twsiSlave.moreThen256 = MV_FALSE;
-        if(mode == MV_TRUE)
-            val = 0x2;
-        else
-            val = 0;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xfd) | val;
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-    	
-	/* Change twsi exp to output */
-    	twsiSlave.offset = 7;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xfd);
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
-        return MV_OK;
-}
-
-/*******************************************************************************
-* mvBoardSDioWPControl - Turn on/off the SDIO WP on the RD-6281A
-*
-* DESCRIPTION:
-*
-* INPUT:
-*        mode - MV_TRUE = on ; MV_FALSE = off
-*
-* OUTPUT:
-*       MV_STATUS - MV_OK , MV_ERROR.
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_STATUS mvBoardSDioWPControl(MV_BOOL mode)
-{
-
-	MV_U8 val = 1, twsiVal;
-   	MV_TWSI_SLAVE twsiSlave;
-	MV_TWSI_ADDR slave;
-	
-	if(mvBoardIdGet() != RD_88F6281A_ID)
-        return MV_ERROR;
-
-	/* TWSI init */    	
-	slave.type = ADDR7_BIT;
-	slave.address = 0;
-	mvTwsiInit(0, TWSI_SPEED, mvBoardTclkGet(), &slave, 0);
-
-	/* Read MPP module ID */
-    	DB(mvOsPrintf("Board: twsi exp set\n"));
-    	twsiSlave.slaveAddr.address = mvBoardTwsiExpAddrGet(0);
-    	twsiSlave.slaveAddr.type = ADDR7_BIT;
-    	twsiSlave.validOffset = MV_TRUE;
-	/* Offset is the first command after the address which indicate the register number to be read 
-	   in next operation */
-    	twsiSlave.offset = 3;
-    	twsiSlave.moreThen256 = MV_FALSE;
-        if(mode == MV_TRUE)
-            val = 0x10;
-        else
-            val = 0;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xef) | val;
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp out val fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp out val succeded\n"));
-    	
-	/* Change twsi exp to output */
-    	twsiSlave.offset = 7;
-        mvTwsiRead(0, &twsiSlave, &twsiVal, 1);
-        val = (twsiVal & 0xef);
-    	if( MV_OK != mvTwsiWrite (0, &twsiSlave, &val, 1) )
-    	{
-    		DB(mvOsPrintf("Board: twsi exp change to out fail\n"));
-        	return MV_ERROR;
-    	}
-    	DB(mvOsPrintf("Board: twsi exp change to out succeded\n"));
-        return MV_OK;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h
deleted file mode 100644
index dead633695..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvLib.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __INCmvBoardEnvLibh
-#define __INCmvBoardEnvLibh
-
-/* defines */
-/* The below constant macros defines the board I2C EEPROM data offsets */
-
-
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "mvSysHwConfig.h"
-#include "boardEnv/mvBoardEnvSpec.h"
-
-
-/* DUART stuff for Tclk detection only */
-#define DUART_BAUD_RATE			115200
-#define MAX_CLOCK_MARGINE		5000000	/* Maximum detected clock margine */
-
-/* Voice devices assembly modes */
-#define DAISY_CHAIN_MODE	1
-#define DUAL_CHIP_SELECT_MODE   0
-#define INTERRUPT_TO_MPP        1
-#define INTERRUPT_TO_TDM	0
-
-
-#define BOARD_ETH_PORT_NUM  MV_ETH_MAX_PORTS
-#define BOARD_ETH_SWITCH_PORT_NUM	5
-
-#define	MV_BOARD_MAX_USB_IF		1
-#define MV_BOARD_MAX_MPP		7
-#define MV_BOARD_NAME_LEN  		0x20
-
-typedef struct _boardData
-{
-   MV_U32 magic;
-   MV_U16 boardId;
-   MV_U8 boardVer;
-   MV_U8 boardRev;
-   MV_U32 reserved1;
-   MV_U32 reserved2;
-
-}BOARD_DATA;
-
-typedef enum _devBoardMppGroupClass
-{
-	MV_BOARD_MPP_GROUP_1,
-	MV_BOARD_MPP_GROUP_2,
-	MV_BOARD_MAX_MPP_GROUP
-}MV_BOARD_MPP_GROUP_CLASS;
-
-typedef enum _devBoardMppTypeClass
-{
-	MV_BOARD_AUTO,
-	MV_BOARD_TDM,
-	MV_BOARD_AUDIO,
-	MV_BOARD_RGMII,
-	MV_BOARD_GMII,
-	MV_BOARD_TS,
-	MV_BOARD_MII,
-	MV_BOARD_OTHER
-}MV_BOARD_MPP_TYPE_CLASS;
-
-typedef enum _devBoardModuleIdClass
-{
-	MV_BOARD_MODULE_TDM_ID = 1,
-	MV_BOARD_MODULE_AUDIO_ID,
-	MV_BOARD_MODULE_RGMII_ID,
-	MV_BOARD_MODULE_GMII_ID,
-	MV_BOARD_MODULE_TS_ID,
-	MV_BOARD_MODULE_MII_ID,
-	MV_BOARD_MODULE_TDM_5CHAN_ID,
-	MV_BOARD_MODULE_OTHER_ID
-}MV_BOARD_MODULE_ID_CLASS;
-
-typedef struct _boardMppTypeInfo
-{
-	MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1;
-	MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2;
-
-}MV_BOARD_MPP_TYPE_INFO;
-
-
-typedef enum _devBoardClass
-{
-	BOARD_DEV_NOR_FLASH,
-	BOARD_DEV_NAND_FLASH,
-	BOARD_DEV_SEVEN_SEG,
-	BOARD_DEV_FPGA,
-	BOARD_DEV_SRAM,
-	BOARD_DEV_SPI_FLASH,
-	BOARD_DEV_OTHER,
-}MV_BOARD_DEV_CLASS;
-
-typedef enum _devTwsiBoardClass
-{
-	BOARD_TWSI_RTC,
-	BOARD_DEV_TWSI_EXP,
-	BOARD_DEV_TWSI_SATR,
-	BOARD_TWSI_AUDIO_DEC,
-	BOARD_TWSI_OTHER
-}MV_BOARD_TWSI_CLASS;
-	
-typedef enum _devGppBoardClass
-{
-	BOARD_GPP_RTC,
-	BOARD_GPP_MV_SWITCH,
-	BOARD_GPP_USB_VBUS,
-	BOARD_GPP_USB_VBUS_EN,
-	BOARD_GPP_USB_OC,
-	BOARD_GPP_USB_HOST_DEVICE,
-	BOARD_GPP_REF_CLCK,
-	BOARD_GPP_VOIP_SLIC,
-	BOARD_GPP_LIFELINE,
-	BOARD_GPP_BUTTON,
-	BOARD_GPP_TS_BUTTON_C,
-	BOARD_GPP_TS_BUTTON_U,
-	BOARD_GPP_TS_BUTTON_D,
-	BOARD_GPP_TS_BUTTON_L,
-	BOARD_GPP_TS_BUTTON_R,
-	BOARD_GPP_POWER_BUTTON,
-	BOARD_GPP_RESTOR_BUTTON,
-	BOARD_GPP_WPS_BUTTON,
-	BOARD_GPP_HDD0_POWER,
-	BOARD_GPP_HDD1_POWER,
-	BOARD_GPP_FAN_POWER,
-	BOARD_GPP_RESET,
-	BOARD_GPP_POWER_ON_LED,
-	BOARD_GPP_HDD_POWER,
-    BOARD_GPP_SDIO_POWER,
-    BOARD_GPP_SDIO_DETECT,
-    BOARD_GPP_SDIO_WP,
-	BOARD_GPP_SWITCH_PHY_INT,
-	BOARD_GPP_TSU_DIRCTION,
-	BOARD_GPP_OTHER
-}MV_BOARD_GPP_CLASS;
-
-
-typedef struct _devCsInfo
-{
-    MV_U8		deviceCS;
-    MV_U32		params;
-    MV_U32		devClass;	/* MV_BOARD_DEV_CLASS */
-    MV_U8		devWidth;
-
-}MV_DEV_CS_INFO;
-
-
-#define MV_BOARD_PHY_FORCE_10MB		0x0
-#define MV_BOARD_PHY_FORCE_100MB	0x1
-#define MV_BOARD_PHY_FORCE_1000MB	0x2
-#define MV_BOARD_PHY_SPEED_AUTO		0x3
-
-typedef struct _boardSwitchInfo
-{
-	MV_32	linkStatusIrq;
-	MV_32	qdPort[BOARD_ETH_SWITCH_PORT_NUM];
-	MV_32	qdCpuPort;
-	MV_32	smiScanMode; /* 1 for SMI_MANUAL_MODE, 0 otherwise */
-	MV_32	switchOnPort;
-
-}MV_BOARD_SWITCH_INFO;
-
-typedef struct _boardLedInfo
-{
-	MV_U8	activeLedsNumber;
-	MV_U8	ledsPolarity;	/* '0' or '1' to turn on led */
-	MV_U8*	gppPinNum; 	/* Pointer to GPP values */
-
-}MV_BOARD_LED_INFO;
-
-typedef struct _boardGppInfo
-{
-	MV_BOARD_GPP_CLASS	devClass;
-	MV_U8	gppPinNum;
-
-}MV_BOARD_GPP_INFO;
-
-
-typedef struct _boardTwsiInfo
-{
-	MV_BOARD_TWSI_CLASS	devClass;
-	MV_U8	twsiDevAddr;
-	MV_U8	twsiDevAddrType;
-
-}MV_BOARD_TWSI_INFO;
-
-
-typedef enum _boardMacSpeed
-{
-	BOARD_MAC_SPEED_10M,
-	BOARD_MAC_SPEED_100M,
-	BOARD_MAC_SPEED_1000M,
-	BOARD_MAC_SPEED_AUTO,
-
-}MV_BOARD_MAC_SPEED;
-
-typedef struct _boardMacInfo
-{
-	MV_BOARD_MAC_SPEED	boardMacSpeed;
-	MV_U8	boardEthSmiAddr;
-
-}MV_BOARD_MAC_INFO;
-
-typedef struct _boardMppInfo
-{
-	MV_U32		mppGroup[MV_BOARD_MAX_MPP];
-
-}MV_BOARD_MPP_INFO;
-
-typedef struct _boardInfo
-{
-	char 			   	boardName[MV_BOARD_NAME_LEN];
-	MV_U8				numBoardMppTypeValue;
-	MV_BOARD_MPP_TYPE_INFO*		pBoardMppTypeValue;
-	MV_U8				numBoardMppConfigValue;
-	MV_BOARD_MPP_INFO*		pBoardMppConfigValue;
-    	MV_U32				intsGppMaskLow;
-	MV_U32				intsGppMaskHigh;
-	MV_U8				numBoardDeviceIf;
-    	MV_DEV_CS_INFO*			pDevCsInfo;
-	MV_U8				numBoardTwsiDev;
-	MV_BOARD_TWSI_INFO*		pBoardTwsiDev;
-	MV_U8				numBoardMacInfo;
-	MV_BOARD_MAC_INFO*		pBoardMacInfo;
-	MV_U8				numBoardGppInfo;
-	MV_BOARD_GPP_INFO*		pBoardGppInfo;
-    	MV_U8				activeLedsNumber;
-	MV_U8*				pLedGppPin;
-	MV_U8				ledsPolarity;	/* '0' or '1' to turn on led */
-	/* GPP values */
-	MV_U32				gppOutEnValLow;
-	MV_U32				gppOutEnValHigh;
-	MV_U32				gppOutValLow;
-	MV_U32				gppOutValHigh;
-	MV_U32				gppPolarityValLow;
-	MV_U32				gppPolarityValHigh;
-
-	/* Switch Configuration */
-	MV_BOARD_SWITCH_INFO*		pSwitchInfo;
-}MV_BOARD_INFO;
-
-
-
-MV_VOID 	mvBoardEnvInit(MV_VOID);
-MV_U32      	mvBoardIdGet(MV_VOID);
-MV_U16      	mvBoardModelGet(MV_VOID);
-MV_U16      	mvBoardRevGet(MV_VOID);
-MV_STATUS	mvBoardNameGet(char *pNameBuff);
-MV_32      	mvBoardPhyAddrGet(MV_U32 ethPortNum);
-MV_BOARD_MAC_SPEED      mvBoardMacSpeedGet(MV_U32 ethPortNum);
-MV_32		mvBoardLinkStatusIrqGet(MV_U32 ethPortNum);
-MV_32		mvBoardSwitchPortGet(MV_U32 ethPortNum, MV_U8 boardPortNum);
-MV_32		mvBoardSwitchCpuPortGet(MV_U32 ethPortNum);
-MV_32		mvBoardIsSwitchConnected(MV_U32 ethPortNum);
-MV_32		mvBoardSmiScanModeGet(MV_U32 ethPortNum);
-MV_BOOL     	mvBoardIsPortInSgmii(MV_U32 ethPortNum);
-MV_BOOL 	mvBoardIsPortInGmii(MV_VOID);
-MV_U32 		mvBoardTclkGet(MV_VOID);
-MV_U32      	mvBoardSysClkGet(MV_VOID);
-MV_U32 		mvBoardDebugLedNumGet(MV_U32 boardId);
-MV_VOID     	mvBoardDebugLed(MV_U32 hexNum);
-MV_32      	mvBoardMppGet(MV_U32 mppGroupNum);
-
-MV_U8		mvBoardRtcTwsiAddrTypeGet(MV_VOID);
-MV_U8		mvBoardRtcTwsiAddrGet(MV_VOID);
-
-MV_U8		mvBoardA2DTwsiAddrTypeGet(MV_VOID);
-MV_U8		mvBoardA2DTwsiAddrGet(MV_VOID);
-
-MV_U8 		mvBoardTwsiExpAddrGet(MV_U32 index);
-MV_U8 		mvBoardTwsiSatRAddrTypeGet(MV_U32 index);
-MV_U8 		mvBoardTwsiSatRAddrGet(MV_U32 index);
-MV_U8 		mvBoardTwsiExpAddrTypeGet(MV_U32 index);
-MV_BOARD_MODULE_ID_CLASS 	mvBoarModuleTypeGet(MV_BOARD_MPP_GROUP_CLASS devClass);
-MV_BOARD_MPP_TYPE_CLASS 	mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass);
-MV_VOID 	mvBoardMppGroupTypeSet(MV_BOARD_MPP_GROUP_CLASS mppGroupClass,
-						MV_BOARD_MPP_TYPE_CLASS mppGroupType);
-MV_VOID 	mvBoardMppGroupIdUpdate(MV_VOID);
-MV_VOID 	mvBoardMppMuxSet(MV_VOID);
-MV_VOID 	mvBoardTdmMppSet(MV_32 chType);
-MV_VOID 	mvBoardVoiceConnModeGet(MV_32* connMode, MV_32* irqMode);
-
-MV_VOID 	mvBoardMppModuleTypePrint(MV_VOID);
-MV_VOID	    	mvBoardReset(MV_VOID);
-MV_U8 		mvBoarTwsiSatRGet(MV_U8 devNum, MV_U8 regNum);
-MV_STATUS 		mvBoarTwsiSatRSet(MV_U8 devNum, MV_U8 regNum, MV_U8 regVal);
-MV_BOOL 	mvBoardSpecInitGet(MV_U32* regOff, MV_U32* data);
-/* Board devices API managments */
-MV_32  	    mvBoardGetDevicesNumber(MV_BOARD_DEV_CLASS devClass);
-MV_32  	    mvBoardGetDeviceBaseAddr(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-MV_32	    mvBoardGetDeviceBusWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-MV_32  	    mvBoardGetDeviceWidth(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-MV_32  	    mvBoardGetDeviceWinSize(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-MV_U32 	    boardGetDevCSNum(MV_32 devNum, MV_BOARD_DEV_CLASS devClass);
-
-/* Gpio Pin Connections API */
-MV_32 	    mvBoardUSBVbusGpioPinGet(int devId);
-MV_32 	    mvBoardUSBVbusEnGpioPinGet(int devId);
-MV_U32      mvBoardPexBridgeIntPinGet(MV_U32 devNum, MV_U32 intPin);
-
-MV_32	    mvBoardResetGpioPinGet(MV_VOID);
-MV_32 	    mvBoardRTCGpioPinGet(MV_VOID);
-MV_32 	    mvBoardGpioIntMaskLowGet(MV_VOID);
-MV_32 	    mvBoardGpioIntMaskHighGet(MV_VOID);
-MV_32 	    mvBoardSlicGpioPinGet(MV_U32 slicNum);
-
-MV_32	    mvBoardSDIOGpioPinGet(MV_VOID);
-MV_STATUS   mvBoardSDioWPControl(MV_BOOL mode);
-MV_32	    mvBoarGpioPinNumGet(MV_BOARD_GPP_CLASS class, MV_U32 index);
-
-MV_32 	    mvBoardNandWidthGet(void);
-MV_STATUS   mvBoardFanPowerControl(MV_BOOL mode);
-MV_STATUS   mvBoardHDDPowerControl(MV_BOOL mode);
-#endif /* __INCmvBoardEnvLibh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c
deleted file mode 100644
index e256c4f709..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.c
+++ /dev/null
@@ -1,848 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#include "mvCommon.h"
-#include "mvBoardEnvLib.h"
-#include "mvBoardEnvSpec.h"
-#include "twsi/mvTwsi.h"
-
-#define DB_88F6281A_BOARD_PCI_IF_NUM            0x0
-#define DB_88F6281A_BOARD_TWSI_DEF_NUM		    0x7
-#define DB_88F6281A_BOARD_MAC_INFO_NUM		    0x2
-#define DB_88F6281A_BOARD_GPP_INFO_NUM		    0x3
-#define DB_88F6281A_BOARD_MPP_CONFIG_NUM		0x1
-#define DB_88F6281A_BOARD_MPP_GROUP_TYPE_NUM	0x1
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x2
-#else
-    #define DB_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#endif
-#define DB_88F6281A_BOARD_DEBUG_LED_NUM		    0x0
-
-
-MV_BOARD_TWSI_INFO	db88f6281AInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{
-	{BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
-	{BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
-	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4D, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4E, ADDR7_BIT},
-	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
-	};
-
-MV_BOARD_MAC_INFO db88f6281AInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{
-	{BOARD_MAC_SPEED_AUTO, 0x8},
-	{BOARD_MAC_SPEED_AUTO, 0x9}
-	}; 
-
-MV_BOARD_MPP_TYPE_INFO db88f6281AInfoBoardMppTypeInfo[] = 
-	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
- 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
-	{{MV_BOARD_AUTO, MV_BOARD_AUTO}
-	}; 
-
-MV_BOARD_GPP_INFO db88f6281AInfoBoardGppInfo[] = 
-	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
-	{
-	{BOARD_GPP_TSU_DIRCTION, 33}
-	/*muxed with TDM/Audio module via IOexpender
-	{BOARD_GPP_SDIO_DETECT, 38},
-	{BOARD_GPP_USB_VBUS, 49}*/
-	};
-
-MV_DEV_CS_INFO db88f6281AInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */         
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-		 {
-         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
-         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
-         };
-#else
-	 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_MPP_INFO	db88f6281AInfoBoardMppConfigValue[] = 
-	{{{
-	DB_88F6281A_MPP0_7,		
-	DB_88F6281A_MPP8_15,		
-	DB_88F6281A_MPP16_23,		
-	DB_88F6281A_MPP24_31,		
-	DB_88F6281A_MPP32_39,		
-	DB_88F6281A_MPP40_47,		
-	DB_88F6281A_MPP48_55		
-	}}};
-
-
-MV_BOARD_INFO db88f6281AInfo = {
-	"DB-88F6281A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
-	DB_88F6281A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	db88f6281AInfoBoardMppTypeInfo,
-	DB_88F6281A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	db88f6281AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	0,						/* intsGppMaskHigh */
-	DB_88F6281A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	db88f6281AInfoBoardDeCsInfo,
-	DB_88F6281A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	db88f6281AInfoBoardTwsiDev,					
-	DB_88F6281A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	db88f6281AInfoBoardMacInfo,
-	DB_88F6281A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	db88f6281AInfoBoardGppInfo,
-	DB_88F6281A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,						/* ledsPolarity */		
-	DB_88F6281A_OE_LOW,				/* gppOutEnLow */
-	DB_88F6281A_OE_HIGH,				/* gppOutEnHigh */
-	DB_88F6281A_OE_VAL_LOW,				/* gppOutValLow */
-	DB_88F6281A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	BIT6, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-
-#define RD_88F6281A_BOARD_PCI_IF_NUM		0x0
-#define RD_88F6281A_BOARD_TWSI_DEF_NUM		0x2
-#define RD_88F6281A_BOARD_MAC_INFO_NUM		0x2
-#define RD_88F6281A_BOARD_GPP_INFO_NUM		0x5
-#define RD_88F6281A_BOARD_MPP_GROUP_TYPE_NUM	0x1
-#define RD_88F6281A_BOARD_MPP_CONFIG_NUM		0x1
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x2
-#else
-    #define RD_88F6281A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#endif
-#define RD_88F6281A_BOARD_DEBUG_LED_NUM		0x0
-
-MV_BOARD_MAC_INFO rd88f6281AInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_1000M, 0xa},
-    {BOARD_MAC_SPEED_AUTO, 0xb}
-	}; 
-
-MV_BOARD_SWITCH_INFO rd88f6281AInfoBoardSwitchInfo[] = 
-	/* MV_32 linkStatusIrq, {MV_32 qdPort0, MV_32 qdPort1, MV_32 qdPort2, MV_32 qdPort3, MV_32 qdPort4}, 
-		MV_32 qdCpuPort, MV_32 smiScanMode, MV_32 switchOnPort} */
-	{{38, {0, 1, 2, 3, -1}, 5, 2, 0},
-	 {-1, {-1}, -1, -1, -1}};
-
-MV_BOARD_TWSI_INFO	rd88f6281AInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{
-	{BOARD_DEV_TWSI_EXP, 0xFF, ADDR7_BIT}, /* dummy entry to align with modules indexes */
-	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT}
-	};
-
-MV_BOARD_MPP_TYPE_INFO rd88f6281AInfoBoardMppTypeInfo[] = 
-	{{MV_BOARD_RGMII, MV_BOARD_TDM}
-	}; 
-
-MV_DEV_CS_INFO rd88f6281AInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-		 {
-         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
-         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
-         };
-#else
-		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_GPP_INFO rd88f6281AInfoBoardGppInfo[] = 
-	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
-	{{BOARD_GPP_SDIO_DETECT, 28},
-    {BOARD_GPP_USB_OC, 29},
-    {BOARD_GPP_WPS_BUTTON, 35},
-    {BOARD_GPP_MV_SWITCH, 38},
-    {BOARD_GPP_USB_VBUS, 49}
-	};
-
-MV_BOARD_MPP_INFO	rd88f6281AInfoBoardMppConfigValue[] = 
-	{{{
-	RD_88F6281A_MPP0_7,		
-	RD_88F6281A_MPP8_15,		
-	RD_88F6281A_MPP16_23,		
-	RD_88F6281A_MPP24_31,		
-	RD_88F6281A_MPP32_39,		
-	RD_88F6281A_MPP40_47,		
-	RD_88F6281A_MPP48_55		
-	}}};
-
-MV_BOARD_INFO rd88f6281AInfo = {
-	"RD-88F6281A",				/* boardName[MAX_BOARD_NAME_LEN] */
-	RD_88F6281A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	rd88f6281AInfoBoardMppTypeInfo,
-	RD_88F6281A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	rd88f6281AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	RD_88F6281A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	rd88f6281AInfoBoardDeCsInfo,
-	RD_88F6281A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	rd88f6281AInfoBoardTwsiDev,					
-	RD_88F6281A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	rd88f6281AInfoBoardMacInfo,
-	RD_88F6281A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	rd88f6281AInfoBoardGppInfo,
-	RD_88F6281A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	RD_88F6281A_OE_LOW,				/* gppOutEnLow */
-	RD_88F6281A_OE_HIGH,				/* gppOutEnHigh */
-	RD_88F6281A_OE_VAL_LOW,				/* gppOutValLow */
-	RD_88F6281A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	BIT6, 						/* gppPolarityValHigh */
-	rd88f6281AInfoBoardSwitchInfo			/* pSwitchInfo */
-};
-
-
-#define DB_88F6192A_BOARD_PCI_IF_NUM            0x0
-#define DB_88F6192A_BOARD_TWSI_DEF_NUM		    0x7
-#define DB_88F6192A_BOARD_MAC_INFO_NUM		    0x2
-#define DB_88F6192A_BOARD_GPP_INFO_NUM		    0x3
-#define DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM	0x1
-#define DB_88F6192A_BOARD_MPP_CONFIG_NUM		0x1
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x2
-#else
-    #define DB_88F6192A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#endif
-#define DB_88F6192A_BOARD_DEBUG_LED_NUM		    0x0
-
-MV_BOARD_TWSI_INFO	db88f6192AInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{
-	{BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
-	{BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
-	{BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4D, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4E, ADDR7_BIT},
-	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
-	};
-
-MV_BOARD_MAC_INFO db88f6192AInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{
-	{BOARD_MAC_SPEED_AUTO, 0x8},
-	{BOARD_MAC_SPEED_AUTO, 0x9}
-	}; 
-
-MV_BOARD_MPP_TYPE_INFO db88f6192AInfoBoardMppTypeInfo[] = 
-	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
- 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
-	{{MV_BOARD_AUTO, MV_BOARD_OTHER}
-	}; 
-
-MV_DEV_CS_INFO db88f6192AInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-		 {
-         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
-         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
-         };
-#else
-		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_GPP_INFO db88f6192AInfoBoardGppInfo[] = 
-	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
-	{
-    {BOARD_GPP_SDIO_WP, 20},
-	{BOARD_GPP_USB_VBUS, 22},
-	{BOARD_GPP_SDIO_DETECT, 23},
-	};
-
-MV_BOARD_MPP_INFO	db88f6192AInfoBoardMppConfigValue[] = 
-	{{{
-	DB_88F6192A_MPP0_7,		
-	DB_88F6192A_MPP8_15,		
-	DB_88F6192A_MPP16_23,		
-	DB_88F6192A_MPP24_31,		
-	DB_88F6192A_MPP32_35
-	}}};
-
-MV_BOARD_INFO db88f6192AInfo = {
-	"DB-88F6192A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
-	DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	db88f6192AInfoBoardMppTypeInfo,
-	DB_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	db88f6192AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	DB_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	db88f6192AInfoBoardDeCsInfo,
-	DB_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	db88f6192AInfoBoardTwsiDev,					
-	DB_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	db88f6192AInfoBoardMacInfo,
-	DB_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	db88f6192AInfoBoardGppInfo,
-	DB_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	DB_88F6192A_OE_LOW,				/* gppOutEnLow */
-	DB_88F6192A_OE_HIGH,				/* gppOutEnHigh */
-	DB_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
-	DB_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-#define DB_88F6190A_BOARD_MAC_INFO_NUM		0x1
-
-MV_BOARD_INFO db88f6190AInfo = {
-	"DB-88F6190A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
-	DB_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	db88f6192AInfoBoardMppTypeInfo,
-	DB_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	db88f6192AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	DB_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	db88f6192AInfoBoardDeCsInfo,
-	DB_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	db88f6192AInfoBoardTwsiDev,					
-	DB_88F6190A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	db88f6192AInfoBoardMacInfo,
-	DB_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	db88f6192AInfoBoardGppInfo,
-	DB_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	DB_88F6192A_OE_LOW,				/* gppOutEnLow */
-	DB_88F6192A_OE_HIGH,				/* gppOutEnHigh */
-	DB_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
-	DB_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-#define RD_88F6192A_BOARD_PCI_IF_NUM		0x0
-#define RD_88F6192A_BOARD_TWSI_DEF_NUM		0x0
-#define RD_88F6192A_BOARD_MAC_INFO_NUM		0x1
-#define RD_88F6192A_BOARD_GPP_INFO_NUM		0xE
-#define RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM	0x1
-#define RD_88F6192A_BOARD_MPP_CONFIG_NUM		0x1
-#define RD_88F6192A_BOARD_DEVICE_CONFIG_NUM	0x1
-#define RD_88F6192A_BOARD_DEBUG_LED_NUM		0x3
-
-MV_U8	rd88f6192AInfoBoardDebugLedIf[] =
-	{17, 28, 29};
-
-MV_BOARD_MAC_INFO rd88f6192AInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_AUTO, 0x8}
-	}; 
-
-MV_BOARD_MPP_TYPE_INFO rd88f6192AInfoBoardMppTypeInfo[] = 
-	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
- 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
-	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
-	}; 
-
-MV_DEV_CS_INFO rd88f6192AInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */
-
-MV_BOARD_GPP_INFO rd88f6192AInfoBoardGppInfo[] = 
-	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
-	{
-	{BOARD_GPP_USB_VBUS_EN, 10},
-	{BOARD_GPP_USB_HOST_DEVICE, 11},
-	{BOARD_GPP_RESET, 14},
-	{BOARD_GPP_POWER_ON_LED, 15},
-	{BOARD_GPP_HDD_POWER, 16},
-	{BOARD_GPP_WPS_BUTTON, 24},
-	{BOARD_GPP_TS_BUTTON_C, 25},
-	{BOARD_GPP_USB_VBUS, 26},
-	{BOARD_GPP_USB_OC, 27},
-	{BOARD_GPP_TS_BUTTON_U, 30},
-	{BOARD_GPP_TS_BUTTON_R, 31},
-	{BOARD_GPP_TS_BUTTON_L, 32},
-	{BOARD_GPP_TS_BUTTON_D, 34},
-	{BOARD_GPP_FAN_POWER, 35}
-	};
-
-MV_BOARD_MPP_INFO	rd88f6192AInfoBoardMppConfigValue[] = 
-	{{{
-	RD_88F6192A_MPP0_7,		
-	RD_88F6192A_MPP8_15,		
-	RD_88F6192A_MPP16_23,		
-	RD_88F6192A_MPP24_31,		
-	RD_88F6192A_MPP32_35
-	}}};
-
-MV_BOARD_INFO rd88f6192AInfo = {
-	"RD-88F6192A-NAS",				/* boardName[MAX_BOARD_NAME_LEN] */
-	RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	rd88f6192AInfoBoardMppTypeInfo,
-	RD_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	rd88f6192AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	RD_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	rd88f6192AInfoBoardDeCsInfo,
-	RD_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	NULL,					
-	RD_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	rd88f6192AInfoBoardMacInfo,
-	RD_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	rd88f6192AInfoBoardGppInfo,
-	RD_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	rd88f6192AInfoBoardDebugLedIf,
-	0,										/* ledsPolarity */		
-	RD_88F6192A_OE_LOW,				/* gppOutEnLow */
-	RD_88F6192A_OE_HIGH,				/* gppOutEnHigh */
-	RD_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
-	RD_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-MV_BOARD_INFO rd88f6190AInfo = {
-	"RD-88F6190A-NAS",				/* boardName[MAX_BOARD_NAME_LEN] */
-	RD_88F6192A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	rd88f6192AInfoBoardMppTypeInfo,
-	RD_88F6192A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	rd88f6192AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	RD_88F6192A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	rd88f6192AInfoBoardDeCsInfo,
-	RD_88F6192A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	NULL,					
-	RD_88F6192A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	rd88f6192AInfoBoardMacInfo,
-	RD_88F6192A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	rd88f6192AInfoBoardGppInfo,
-	RD_88F6192A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	rd88f6192AInfoBoardDebugLedIf,
-	0,										/* ledsPolarity */		
-	RD_88F6192A_OE_LOW,				/* gppOutEnLow */
-	RD_88F6192A_OE_HIGH,				/* gppOutEnHigh */
-	RD_88F6192A_OE_VAL_LOW,				/* gppOutValLow */
-	RD_88F6192A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-#define DB_88F6180A_BOARD_PCI_IF_NUM		0x0
-#define DB_88F6180A_BOARD_TWSI_DEF_NUM		0x5
-#define DB_88F6180A_BOARD_MAC_INFO_NUM		0x1
-#define DB_88F6180A_BOARD_GPP_INFO_NUM		0x0
-#define DB_88F6180A_BOARD_MPP_GROUP_TYPE_NUM	0x2
-#define DB_88F6180A_BOARD_MPP_CONFIG_NUM		0x1
-#define DB_88F6180A_BOARD_DEVICE_CONFIG_NUM	    0x1
-#define DB_88F6180A_BOARD_DEBUG_LED_NUM		0x0
-
-MV_BOARD_TWSI_INFO	db88f6180AInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{
-    {BOARD_DEV_TWSI_EXP, 0x20, ADDR7_BIT},
-    {BOARD_DEV_TWSI_EXP, 0x21, ADDR7_BIT},
-    {BOARD_DEV_TWSI_EXP, 0x27, ADDR7_BIT},
-	{BOARD_DEV_TWSI_SATR, 0x4C, ADDR7_BIT},
-	{BOARD_TWSI_AUDIO_DEC, 0x4A, ADDR7_BIT}
-	};
-
-MV_BOARD_MAC_INFO db88f6180AInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_AUTO, 0x8}
-	}; 
-
-MV_BOARD_GPP_INFO db88f6180AInfoBoardGppInfo[] = 
-	/* {{MV_BOARD_GPP_CLASS	devClass, MV_U8	gppPinNum}} */
-	{
-	/* Muxed with TDM/Audio module via IOexpender
-	{BOARD_GPP_USB_VBUS, 6} */
-	};
-
-MV_BOARD_MPP_TYPE_INFO db88f6180AInfoBoardMppTypeInfo[] = 
-	/* {{MV_BOARD_MPP_TYPE_CLASS	boardMppGroup1,
- 		MV_BOARD_MPP_TYPE_CLASS	boardMppGroup2}} */
-	{{MV_BOARD_OTHER, MV_BOARD_AUTO}
-	}; 
-
-MV_DEV_CS_INFO db88f6180AInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */         
-#else
-		 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_MPP_INFO	db88f6180AInfoBoardMppConfigValue[] = 
-	{{{
-	DB_88F6180A_MPP0_7,		
-	DB_88F6180A_MPP8_15,
-    DB_88F6180A_MPP16_23,
-    DB_88F6180A_MPP24_31,		
-    DB_88F6180A_MPP32_39,
-    DB_88F6180A_MPP40_44
-	}}};
-
-MV_BOARD_INFO db88f6180AInfo = {
-	"DB-88F6180A-BP",				/* boardName[MAX_BOARD_NAME_LEN] */
-	DB_88F6180A_BOARD_MPP_GROUP_TYPE_NUM,		/* numBoardMppGroupType */
-	db88f6180AInfoBoardMppTypeInfo,
-	DB_88F6180A_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	db88f6180AInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	0,					/* intsGppMaskHigh */
-	DB_88F6180A_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	db88f6180AInfoBoardDeCsInfo,
-	DB_88F6180A_BOARD_TWSI_DEF_NUM,			/* numBoardTwsiDev */
-	db88f6180AInfoBoardTwsiDev,					
-	DB_88F6180A_BOARD_MAC_INFO_NUM,			/* numBoardMacInfo */
-	db88f6180AInfoBoardMacInfo,
-	DB_88F6180A_BOARD_GPP_INFO_NUM,			/* numBoardGppInfo */
-	NULL,
-	DB_88F6180A_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	DB_88F6180A_OE_LOW,				/* gppOutEnLow */
-	DB_88F6180A_OE_HIGH,				/* gppOutEnHigh */
-	DB_88F6180A_OE_VAL_LOW,				/* gppOutValLow */
-	DB_88F6180A_OE_VAL_HIGH,				/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 						/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-
-#define RD_88F6281A_PCAC_BOARD_PCI_IF_NUM		0x0
-#define RD_88F6281A_PCAC_BOARD_TWSI_DEF_NUM		0x1
-#define RD_88F6281A_PCAC_BOARD_MAC_INFO_NUM		0x1
-#define RD_88F6281A_PCAC_BOARD_GPP_INFO_NUM		0x0
-#define RD_88F6281A_PCAC_BOARD_MPP_GROUP_TYPE_NUM	0x1
-#define RD_88F6281A_PCAC_BOARD_MPP_CONFIG_NUM		0x1
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x1
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x2
-#else
-    #define RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM	    0x1
-#endif
-#define RD_88F6281A_PCAC_BOARD_DEBUG_LED_NUM		0x4
-
-MV_U8	rd88f6281APcacInfoBoardDebugLedIf[] =
-	{38, 39, 40, 41};
-
-MV_BOARD_MAC_INFO rd88f6281APcacInfoBoardMacInfo[] = 
-	/* {{MV_BOARD_MAC_SPEED	boardMacSpeed, MV_U8 boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_AUTO, 0x8}
-	}; 
-
-MV_BOARD_TWSI_INFO	rd88f6281APcacInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{
-	{BOARD_TWSI_OTHER, 0xa7, ADDR7_BIT}
-	};
-
-MV_BOARD_MPP_TYPE_INFO rd88f6281APcacInfoBoardMppTypeInfo[] = 
-	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
-	}; 
-
-MV_DEV_CS_INFO rd88f6281APcacInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-		 {
-         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
-         {1, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
-         };
-#else
-	 {{1, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_MPP_INFO	rd88f6281APcacInfoBoardMppConfigValue[] = 
-	{{{
-	RD_88F6281A_PCAC_MPP0_7,		
-	RD_88F6281A_PCAC_MPP8_15,		
-	RD_88F6281A_PCAC_MPP16_23,		
-	RD_88F6281A_PCAC_MPP24_31,		
-	RD_88F6281A_PCAC_MPP32_39,		
-	RD_88F6281A_PCAC_MPP40_47,		
-	RD_88F6281A_PCAC_MPP48_55		
-	}}};
-
-MV_BOARD_INFO rd88f6281APcacInfo = {
-	"RD-88F6281A-PCAC",				/* boardName[MAX_BOARD_NAME_LEN] */
-	RD_88F6281A_PCAC_BOARD_MPP_GROUP_TYPE_NUM,	/* numBoardMppGroupType */
-	rd88f6281APcacInfoBoardMppTypeInfo,
-	RD_88F6281A_PCAC_BOARD_MPP_CONFIG_NUM,		/* numBoardMppConfig */
-	rd88f6281APcacInfoBoardMppConfigValue,
-	0,						/* intsGppMaskLow */
-	(1 << 3),					/* intsGppMaskHigh */
-	RD_88F6281A_PCAC_BOARD_DEVICE_CONFIG_NUM,	/* numBoardDevIf */
-	rd88f6281APcacInfoBoardDeCsInfo,
-	RD_88F6281A_PCAC_BOARD_TWSI_DEF_NUM,		/* numBoardTwsiDev */
-	rd88f6281APcacInfoBoardTwsiDev,					
-	RD_88F6281A_PCAC_BOARD_MAC_INFO_NUM,		/* numBoardMacInfo */
-	rd88f6281APcacInfoBoardMacInfo,
-	RD_88F6281A_PCAC_BOARD_GPP_INFO_NUM,		/* numBoardGppInfo */
-	0,
-	RD_88F6281A_PCAC_BOARD_DEBUG_LED_NUM,		/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	RD_88F6281A_PCAC_OE_LOW,			/* gppOutEnLow */
-	RD_88F6281A_PCAC_OE_HIGH,			/* gppOutEnHigh */
-	RD_88F6281A_PCAC_OE_VAL_LOW,			/* gppOutValLow */
-	RD_88F6281A_PCAC_OE_VAL_HIGH,			/* gppOutValHigh */
-	0,						/* gppPolarityValLow */
-	0, 	 					/* gppPolarityValHigh */
-	NULL						/* pSwitchInfo */
-};
-
-
-/* 6281 Sheeva Plug*/
-
-#define SHEEVA_PLUG_BOARD_PCI_IF_NUM		        0x0
-#define SHEEVA_PLUG_BOARD_TWSI_DEF_NUM		        0x0
-#define SHEEVA_PLUG_BOARD_MAC_INFO_NUM		        0x1
-#define SHEEVA_PLUG_BOARD_GPP_INFO_NUM		        0x0
-#define SHEEVA_PLUG_BOARD_MPP_GROUP_TYPE_NUN        0x1
-#define SHEEVA_PLUG_BOARD_MPP_CONFIG_NUM		    0x1
-#define SHEEVA_PLUG_BOARD_DEVICE_CONFIG_NUM	        0x1
-#define SHEEVA_PLUG_BOARD_DEBUG_LED_NUM		        0x1
-
-MV_U8	sheevaPlugInfoBoardDebugLedIf[] =
-	{49};
-
-MV_BOARD_MAC_INFO sheevaPlugInfoBoardMacInfo[] = 
-    /* {{MV_BOARD_MAC_SPEED	boardMacSpeed,	MV_U8	boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_AUTO, 0x0}}; 
-
-MV_BOARD_TWSI_INFO	sheevaPlugInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{{BOARD_TWSI_OTHER, 0x0, ADDR7_BIT}};
-
-MV_BOARD_MPP_TYPE_INFO sheevaPlugInfoBoardMppTypeInfo[] = 
-	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
-	}; 
-
-MV_DEV_CS_INFO sheevaPlugInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
-
-MV_BOARD_MPP_INFO	sheevaPlugInfoBoardMppConfigValue[] = 
-	{{{
-	RD_SHEEVA_PLUG_MPP0_7,		
-	RD_SHEEVA_PLUG_MPP8_15,		
-	RD_SHEEVA_PLUG_MPP16_23,		
-	RD_SHEEVA_PLUG_MPP24_31,		
-	RD_SHEEVA_PLUG_MPP32_39,		
-	RD_SHEEVA_PLUG_MPP40_47,		
-	RD_SHEEVA_PLUG_MPP48_55		
-	}}};
-
-MV_BOARD_INFO sheevaPlugInfo = {
-	"SHEEVA PLUG",				                /* boardName[MAX_BOARD_NAME_LEN] */
-	SHEEVA_PLUG_BOARD_MPP_GROUP_TYPE_NUN,		/* numBoardMppGroupType */
-	sheevaPlugInfoBoardMppTypeInfo,
-	SHEEVA_PLUG_BOARD_MPP_CONFIG_NUM,		    /* numBoardMppConfig */
-	sheevaPlugInfoBoardMppConfigValue,
-	0,						                    /* intsGppMaskLow */
-	0,					                        /* intsGppMaskHigh */
-	SHEEVA_PLUG_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	sheevaPlugInfoBoardDeCsInfo,
-	SHEEVA_PLUG_BOARD_TWSI_DEF_NUM,			    /* numBoardTwsiDev */
-	sheevaPlugInfoBoardTwsiDev,					
-	SHEEVA_PLUG_BOARD_MAC_INFO_NUM,			    /* numBoardMacInfo */
-	sheevaPlugInfoBoardMacInfo,
-	SHEEVA_PLUG_BOARD_GPP_INFO_NUM,			    /* numBoardGppInfo */
-	0,
-	SHEEVA_PLUG_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	sheevaPlugInfoBoardDebugLedIf,
-	0,										/* ledsPolarity */		
-	RD_SHEEVA_PLUG_OE_LOW,				            /* gppOutEnLow */
-	RD_SHEEVA_PLUG_OE_HIGH,				        /* gppOutEnHigh */
-	RD_SHEEVA_PLUG_OE_VAL_LOW,				        /* gppOutValLow */
-	RD_SHEEVA_PLUG_OE_VAL_HIGH,				    /* gppOutValHigh */
-	0,						                    /* gppPolarityValLow */
-	0, 						                    /* gppPolarityValHigh */
-    NULL										/* pSwitchInfo */
-};
-
-/* Customer specific board place holder*/
-
-#define DB_CUSTOMER_BOARD_PCI_IF_NUM		        0x0
-#define DB_CUSTOMER_BOARD_TWSI_DEF_NUM		        0x0
-#define DB_CUSTOMER_BOARD_MAC_INFO_NUM		        0x0
-#define DB_CUSTOMER_BOARD_GPP_INFO_NUM		        0x0
-#define DB_CUSTOMER_BOARD_MPP_GROUP_TYPE_NUN        0x0
-#define DB_CUSTOMER_BOARD_MPP_CONFIG_NUM		    0x0
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
-#else
-    #define DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM	    0x0
-#endif
-#define DB_CUSTOMER_BOARD_DEBUG_LED_NUM		0x0
-
-MV_U8	dbCustomerInfoBoardDebugLedIf[] =
-	{0};
-
-MV_BOARD_MAC_INFO dbCustomerInfoBoardMacInfo[] = 
-    /* {{MV_BOARD_MAC_SPEED	boardMacSpeed,	MV_U8	boardEthSmiAddr}} */
-	{{BOARD_MAC_SPEED_AUTO, 0x0}}; 
-
-MV_BOARD_TWSI_INFO	dbCustomerInfoBoardTwsiDev[] =
-	/* {{MV_BOARD_DEV_CLASS	devClass, MV_U8	twsiDevAddr, MV_U8 twsiDevAddrType}} */
-	{{BOARD_TWSI_OTHER, 0x0, ADDR7_BIT}};
-
-MV_BOARD_MPP_TYPE_INFO dbCustomerInfoBoardMppTypeInfo[] = 
-	{{MV_BOARD_OTHER, MV_BOARD_OTHER}
-	}; 
-
-MV_DEV_CS_INFO dbCustomerInfoBoardDeCsInfo[] = 
-		/*{deviceCS, params, devType, devWidth}*/			   
-#if defined(MV_NAND) && defined(MV_NAND_BOOT)
-		 {{0, N_A, BOARD_DEV_NAND_FLASH, 8}};	   /* NAND DEV */
-#elif defined(MV_NAND) && defined(MV_SPI_BOOT)
-		 {
-         {0, N_A, BOARD_DEV_NAND_FLASH, 8},	   /* NAND DEV */
-         {2, N_A, BOARD_DEV_SPI_FLASH, 8},	   /* SPI DEV */
-         };
-#else
-		 {{2, N_A, BOARD_DEV_SPI_FLASH, 8}};	   /* SPI DEV */         
-#endif
-
-MV_BOARD_MPP_INFO	dbCustomerInfoBoardMppConfigValue[] = 
-	{{{
-	DB_CUSTOMER_MPP0_7,		
-	DB_CUSTOMER_MPP8_15,		
-	DB_CUSTOMER_MPP16_23,		
-	DB_CUSTOMER_MPP24_31,		
-	DB_CUSTOMER_MPP32_39,		
-	DB_CUSTOMER_MPP40_47,		
-	DB_CUSTOMER_MPP48_55		
-	}}};
-
-MV_BOARD_INFO dbCustomerInfo = {
-	"DB-CUSTOMER",				                /* boardName[MAX_BOARD_NAME_LEN] */
-	DB_CUSTOMER_BOARD_MPP_GROUP_TYPE_NUN,		/* numBoardMppGroupType */
-	dbCustomerInfoBoardMppTypeInfo,
-	DB_CUSTOMER_BOARD_MPP_CONFIG_NUM,		    /* numBoardMppConfig */
-	dbCustomerInfoBoardMppConfigValue,
-	0,						                    /* intsGppMaskLow */
-	0,					                        /* intsGppMaskHigh */
-	DB_CUSTOMER_BOARD_DEVICE_CONFIG_NUM,		/* numBoardDevIf */
-	dbCustomerInfoBoardDeCsInfo,
-	DB_CUSTOMER_BOARD_TWSI_DEF_NUM,			    /* numBoardTwsiDev */
-	dbCustomerInfoBoardTwsiDev,					
-	DB_CUSTOMER_BOARD_MAC_INFO_NUM,			    /* numBoardMacInfo */
-	dbCustomerInfoBoardMacInfo,
-	DB_CUSTOMER_BOARD_GPP_INFO_NUM,			    /* numBoardGppInfo */
-	0,
-	DB_CUSTOMER_BOARD_DEBUG_LED_NUM,			/* activeLedsNumber */              
-	NULL,
-	0,										/* ledsPolarity */		
-	DB_CUSTOMER_OE_LOW,				            /* gppOutEnLow */
-	DB_CUSTOMER_OE_HIGH,				        /* gppOutEnHigh */
-	DB_CUSTOMER_OE_VAL_LOW,				        /* gppOutValLow */
-	DB_CUSTOMER_OE_VAL_HIGH,				    /* gppOutValHigh */
-	0,						                    /* gppPolarityValLow */
-	0, 						                    /* gppPolarityValHigh */
-    NULL										/* pSwitchInfo */
-};
-
-MV_BOARD_INFO*	boardInfoTbl[] = 	{
-                    &db88f6281AInfo,
-                    &rd88f6281AInfo,
-                    &db88f6192AInfo,
-                    &rd88f6192AInfo,
-                    &db88f6180AInfo,
-                    &db88f6190AInfo,
-                    &rd88f6190AInfo,
-                    &rd88f6281APcacInfo,
-                    &dbCustomerInfo,
-                    &sheevaPlugInfo
-					};
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h
deleted file mode 100644
index 0372eee5dc..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/boardEnv/mvBoardEnvSpec.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvBoardEnvSpech
-#define __INCmvBoardEnvSpech
-
-#include "mvSysHwConfig.h"
-
-
-/* For future use */
-#define BD_ID_DATA_START_OFFS		0x0
-#define BD_DETECT_SEQ_OFFS		0x0
-#define BD_SYS_NUM_OFFS			0x4
-#define BD_NAME_OFFS			0x8
-
-/* I2C bus addresses */
-#define MV_BOARD_CTRL_I2C_ADDR			0x0     /* Controller slave addr */
-#define MV_BOARD_CTRL_I2C_ADDR_TYPE 		ADDR7_BIT
-#define MV_BOARD_DIMM0_I2C_ADDR			0x56
-#define MV_BOARD_DIMM0_I2C_ADDR_TYPE 		ADDR7_BIT
-#define MV_BOARD_DIMM1_I2C_ADDR			0x54
-#define MV_BOARD_DIMM1_I2C_ADDR_TYPE 		ADDR7_BIT
-#define MV_BOARD_EEPROM_I2C_ADDR	    	0x51
-#define MV_BOARD_EEPROM_I2C_ADDR_TYPE 		ADDR7_BIT
-#define MV_BOARD_MAIN_EEPROM_I2C_ADDR	   	0x50
-#define MV_BOARD_MAIN_EEPROM_I2C_ADDR_TYPE 	ADDR7_BIT
-#define MV_BOARD_MUX_I2C_ADDR_ENTRY		0x2
-#define MV_BOARD_DIMM_I2C_CHANNEL		0x0
-
-#define BOOT_FLASH_INDEX			0
-#define MAIN_FLASH_INDEX			1
-
-#define BOARD_ETH_START_PORT_NUM	0
-
-/* Supported clocks */
-#define MV_BOARD_TCLK_100MHZ	100000000
-#define MV_BOARD_TCLK_125MHZ	125000000
-#define MV_BOARD_TCLK_133MHZ	133333333
-#define MV_BOARD_TCLK_150MHZ	150000000
-#define MV_BOARD_TCLK_166MHZ	166666667
-#define MV_BOARD_TCLK_200MHZ	200000000
-
-#define MV_BOARD_SYSCLK_100MHZ	100000000
-#define MV_BOARD_SYSCLK_125MHZ	125000000
-#define MV_BOARD_SYSCLK_133MHZ	133333333
-#define MV_BOARD_SYSCLK_150MHZ	150000000
-#define MV_BOARD_SYSCLK_166MHZ	166666667
-#define MV_BOARD_SYSCLK_200MHZ	200000000
-#define MV_BOARD_SYSCLK_233MHZ	233333333
-#define MV_BOARD_SYSCLK_250MHZ	250000000
-#define MV_BOARD_SYSCLK_267MHZ	266666667
-#define MV_BOARD_SYSCLK_300MHZ	300000000
-#define MV_BOARD_SYSCLK_333MHZ	333333334
-#define MV_BOARD_SYSCLK_400MHZ	400000000
-
-#define MV_BOARD_REFCLK_25MHZ	 25000000
-
-/* Board specific */
-/* =============================== */
-
-/* boards ID numbers */
-
-#define BOARD_ID_BASE           		0x0
-
-/* New board ID numbers */
-#define DB_88F6281A_BP_ID			(BOARD_ID_BASE)
-#define DB_88F6281_BP_MLL_ID        1680
-#define RD_88F6281A_ID				(BOARD_ID_BASE+0x1)
-#define RD_88F6281_MLL_ID			1682
-#define DB_88F6192A_BP_ID			(BOARD_ID_BASE+0x2)
-#define RD_88F6192A_ID				(BOARD_ID_BASE+0x3)
-#define RD_88F6192_MLL_ID			1681
-#define DB_88F6180A_BP_ID			(BOARD_ID_BASE+0x4)
-#define DB_88F6190A_BP_ID			(BOARD_ID_BASE+0x5)
-#define RD_88F6190A_ID				(BOARD_ID_BASE+0x6)
-#define RD_88F6281A_PCAC_ID			(BOARD_ID_BASE+0x7)
-#define DB_CUSTOMER_ID			    (BOARD_ID_BASE+0x8)
-#define SHEEVA_PLUG_ID			    (BOARD_ID_BASE+0x9)
-#define MV_MAX_BOARD_ID 			(SHEEVA_PLUG_ID + 1)
-
-/* DB-88F6281A-BP */
-#if defined(MV_NAND)
-    #define DB_88F6281A_MPP0_7                   	0x21111111
-#else
-    #define DB_88F6281A_MPP0_7                   	0x21112220
-#endif
-#define DB_88F6281A_MPP8_15                   	0x11113311
-#define DB_88F6281A_MPP16_23                   	0x00551111
-#define DB_88F6281A_MPP24_31                   	0x00000000
-#define DB_88F6281A_MPP32_39                   	0x00000000
-#define DB_88F6281A_MPP40_47                   	0x00000000
-#define DB_88F6281A_MPP48_55                   	0x00000000
-#define DB_88F6281A_OE_LOW                       0x0
-#if defined(MV_TDM_5CHANNELS)
-	#define DB_88F6281A_OE_HIGH		(BIT6)
-#else
-#define DB_88F6281A_OE_HIGH                      0x0
-#endif
-#define DB_88F6281A_OE_VAL_LOW                   0x0
-#define DB_88F6281A_OE_VAL_HIGH                  0x0
-
-/* RD-88F6281A */
-#if defined(MV_NAND)
-    #define RD_88F6281A_MPP0_7                   	0x21111111
-#else
-    #define RD_88F6281A_MPP0_7                   	0x21112220
-#endif
-#define RD_88F6281A_MPP8_15                   	0x11113311
-#define RD_88F6281A_MPP16_23                   	0x33331111
-#define RD_88F6281A_MPP24_31                   	0x33003333
-#define RD_88F6281A_MPP32_39                   	0x20440533
-#define RD_88F6281A_MPP40_47                   	0x22202222
-#define RD_88F6281A_MPP48_55                   	0x00000002
-#define RD_88F6281A_OE_LOW                      (BIT28 | BIT29)
-#define RD_88F6281A_OE_HIGH                     (BIT3 | BIT6 | BIT17)
-#define RD_88F6281A_OE_VAL_LOW                   0x0
-#define RD_88F6281A_OE_VAL_HIGH                  0x0
-
-/* DB-88F6192A-BP */
-#if defined(MV_NAND)
-    #define DB_88F6192A_MPP0_7                   	0x21111111
-#else
-    #define DB_88F6192A_MPP0_7                   	0x21112220
-#endif
-#define DB_88F6192A_MPP8_15                   	0x11113311
-#define DB_88F6192A_MPP16_23                   	0x00501111
-#define DB_88F6192A_MPP24_31                   	0x00000000
-#define DB_88F6192A_MPP32_35                   	0x00000000
-#define DB_88F6192A_OE_LOW                       (BIT22 | BIT23)
-#define DB_88F6192A_OE_HIGH                      0x0
-#define DB_88F6192A_OE_VAL_LOW                   0x0
-#define DB_88F6192A_OE_VAL_HIGH                  0x0
-
-/* RD-88F6192A */
-#define RD_88F6192A_MPP0_7                   	0x01222222
-#define RD_88F6192A_MPP8_15                   	0x00000011
-#define RD_88F6192A_MPP16_23                   	0x05550000
-#define RD_88F6192A_MPP24_31                   	0x0
-#define RD_88F6192A_MPP32_35                   	0x0
-#define RD_88F6192A_OE_LOW                      (BIT11 | BIT14 | BIT24 | BIT25 | BIT26 | BIT27 | BIT30 | BIT31)
-#define RD_88F6192A_OE_HIGH                     (BIT0 | BIT2)
-#define RD_88F6192A_OE_VAL_LOW                  0x18400
-#define RD_88F6192A_OE_VAL_HIGH                 0x8
-
-/* DB-88F6180A-BP */
-#if defined(MV_NAND)
-    #define DB_88F6180A_MPP0_7                   	0x21111111
-#else
-    #define DB_88F6180A_MPP0_7                   	0x01112222
-#endif
-#define DB_88F6180A_MPP8_15                   	0x11113311
-#define DB_88F6180A_MPP16_23                   	0x00001111
-#define DB_88F6180A_MPP24_31                   	0x0
-#define DB_88F6180A_MPP32_39                   	0x4444c000
-#define DB_88F6180A_MPP40_44                   	0x00044444
-#define DB_88F6180A_OE_LOW                       0x0
-#define DB_88F6180A_OE_HIGH                      0x0
-#define DB_88F6180A_OE_VAL_LOW                   0x0
-#define DB_88F6180A_OE_VAL_HIGH                  0x0
-
-/* RD-88F6281A_PCAC */
-#define RD_88F6281A_PCAC_MPP0_7                	0x21111111
-#define RD_88F6281A_PCAC_MPP8_15               	0x00003311
-#define RD_88F6281A_PCAC_MPP16_23              	0x00001100
-#define RD_88F6281A_PCAC_MPP24_31              	0x00000000
-#define RD_88F6281A_PCAC_MPP32_39              	0x00000000
-#define RD_88F6281A_PCAC_MPP40_47              	0x00000000
-#define RD_88F6281A_PCAC_MPP48_55              	0x00000000
-#define RD_88F6281A_PCAC_OE_LOW                 0x0
-#define RD_88F6281A_PCAC_OE_HIGH                0x0
-#define RD_88F6281A_PCAC_OE_VAL_LOW             0x0
-#define RD_88F6281A_PCAC_OE_VAL_HIGH            0x0
-
-/* SHEEVA PLUG */
-#define RD_SHEEVA_PLUG_MPP0_7                   0x01111111
-#define RD_SHEEVA_PLUG_MPP8_15                  0x11113322
-#define RD_SHEEVA_PLUG_MPP16_23                 0x00001111
-#define RD_SHEEVA_PLUG_MPP24_31                 0x00100000
-#define RD_SHEEVA_PLUG_MPP32_39                 0x00000000
-#define RD_SHEEVA_PLUG_MPP40_47                 0x00000000
-#define RD_SHEEVA_PLUG_MPP48_55                 0x00000000
-#define RD_SHEEVA_PLUG_OE_LOW                   0x0
-#define RD_SHEEVA_PLUG_OE_HIGH                  0x0
-#define RD_SHEEVA_PLUG_OE_VAL_LOW               (BIT29)
-#define RD_SHEEVA_PLUG_OE_VAL_HIGH              ((~(BIT17 | BIT16 | BIT15)) | BIT14) 
-
-/* DB-CUSTOMER */
-#define DB_CUSTOMER_MPP0_7                	    0x21111111
-#define DB_CUSTOMER_MPP8_15               	    0x00003311
-#define DB_CUSTOMER_MPP16_23              	    0x00001100
-#define DB_CUSTOMER_MPP24_31              	    0x00000000
-#define DB_CUSTOMER_MPP32_39              	    0x00000000
-#define DB_CUSTOMER_MPP40_47              	    0x00000000
-#define DB_CUSTOMER_MPP48_55              	    0x00000000
-#define DB_CUSTOMER_OE_LOW                      0x0
-#define DB_CUSTOMER_OE_HIGH                     (~((BIT6) | (BIT7) | (BIT8) | (BIT9)))
-#define DB_CUSTOMER_OE_VAL_LOW                  0x0
-#define DB_CUSTOMER_OE_VAL_HIGH                 0x0
-
-#endif /* __INCmvBoardEnvSpech */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c
deleted file mode 100644
index fed0fa114e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "cpu/mvCpu.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvRegs.h"
-#include "ctrlEnv/sys/mvCpuIfRegs.h"
-
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif	
-
-/* locals */
-
-/*******************************************************************************
-* mvCpuPclkGet - Get the CPU pClk (pipe clock)
-*
-* DESCRIPTION:
-*       This routine extract the CPU core clock.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit clock cycles in MHertz.
-*
-*******************************************************************************/
-/* 6180 have different clk reset sampling */
-
-static MV_U32 mvCpu6180PclkGet(MV_VOID)
-{
-	MV_U32 	tmpPClkRate=0;
-	MV_CPU_ARM_CLK cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
-
-	tmpPClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	tmpPClkRate = tmpPClkRate & MSAR_CPUCLCK_MASK_6180;
-	tmpPClkRate = tmpPClkRate >> MSAR_CPUCLCK_OFFS_6180;
-			
-	tmpPClkRate = cpu6180_ddr_l2_CLK[tmpPClkRate].cpuClk;
-
-	return tmpPClkRate;
-}
-
-
-MV_U32 mvCpuPclkGet(MV_VOID)
-{
-#if defined(PCLCK_AUTO_DETECT)
-	MV_U32 	tmpPClkRate=0;
-	MV_U32 cpuCLK[] = MV_CPU_CLCK_TBL;
-
-	if(mvCtrlModelGet() == MV_6180_DEV_ID)
-		return mvCpu6180PclkGet();
-
-	tmpPClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	tmpPClkRate = MSAR_CPUCLCK_EXTRACT(tmpPClkRate);
-	tmpPClkRate = cpuCLK[tmpPClkRate];
-
-	return tmpPClkRate;
-#else
-	return MV_DEFAULT_PCLK
-#endif
-}
-
-/*******************************************************************************
-* mvCpuL2ClkGet - Get the CPU L2 (CPU bus clock)
-*
-* DESCRIPTION:
-*       This routine extract the CPU L2 clock.
-*
-* RETURN:
-*       32bit clock cycles in Hertz.
-*
-*******************************************************************************/
-static MV_U32  mvCpu6180L2ClkGet(MV_VOID)
-{
-	MV_U32 	L2ClkRate=0;
-	MV_CPU_ARM_CLK _cpu6180_ddr_l2_CLK[] = MV_CPU6180_DDR_L2_CLCK_TBL;
-
-	L2ClkRate = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	L2ClkRate = L2ClkRate & MSAR_CPUCLCK_MASK_6180;
-	L2ClkRate = L2ClkRate >> MSAR_CPUCLCK_OFFS_6180;
-			
-	L2ClkRate = _cpu6180_ddr_l2_CLK[L2ClkRate].l2Clk;
-
-	return L2ClkRate;
-
-}
-
-MV_U32  mvCpuL2ClkGet(MV_VOID)
-{
-#ifdef L2CLK_AUTO_DETECT
-	MV_U32 L2ClkRate, tmp, pClkRate, indexL2Rtio;
-	MV_U32 L2Rtio[][2] = MV_L2_CLCK_RTIO_TBL;
-
-	if(mvCtrlModelGet() == MV_6180_DEV_ID)
-		return mvCpu6180L2ClkGet();
-
-	pClkRate = mvCpuPclkGet();
-
-	tmp = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-	indexL2Rtio = MSAR_L2CLCK_EXTRACT(tmp);
-
-	L2ClkRate = ((pClkRate * L2Rtio[indexL2Rtio][1]) / L2Rtio[indexL2Rtio][0]);
-
-	return L2ClkRate;
-#else
-	return MV_BOARD_DEFAULT_L2CLK;
-#endif
-}
-
-
-/*******************************************************************************
-* mvCpuNameGet - Get CPU name
-*
-* DESCRIPTION:
-*       This function returns a string describing the CPU model and revision.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       pNameBuff - Buffer to contain board name string. Minimum size 32 chars.
-*
-* RETURN:
-*       None.
-*******************************************************************************/
-MV_VOID mvCpuNameGet(char *pNameBuff)
-{
-    MV_U32 cpuModel;
-    
-    cpuModel = mvOsCpuPartGet();
-
-    /* The CPU module is indicated in the Processor Version Register (PVR) */
-    switch(cpuModel)
-    {
-        case CPU_PART_MRVL131:
-            mvOsSPrintf(pNameBuff, "%s (Rev %d)", "Marvell Feroceon",mvOsCpuRevGet());
-            break;
-        case CPU_PART_ARM926:
-            mvOsSPrintf(pNameBuff, "%s (Rev %d)", "ARM926",mvOsCpuRevGet());
-            break;
-	case CPU_PART_ARM946:
-		mvOsSPrintf(pNameBuff, "%s (Rev %d)", "ARM946",mvOsCpuRevGet());
-		break;
-        default:
-            mvOsSPrintf(pNameBuff,"??? (0x%04x) (Rev %d)",cpuModel,mvOsCpuRevGet());
-            break;
-    }  /* switch  */
-
-    return;
-}
-
-
-#define MV_PROC_STR_SIZE 50
-
-static void mvCpuIfGetL2EccMode(MV_8 *buf)
-{
-    MV_U32 regVal = MV_REG_READ(CPU_L2_CONFIG_REG);
-    if (regVal & BIT2)
-	mvOsSPrintf(buf, "L2 ECC Enabled");
-    else
-	mvOsSPrintf(buf, "L2 ECC Disabled");
-}
-
-static void mvCpuIfGetL2Mode(MV_8 *buf)
-{
-    MV_U32 regVal = 0;
-    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
-    if (regVal & BIT22)
-	mvOsSPrintf(buf, "L2 Enabled");
-    else
-	mvOsSPrintf(buf, "L2 Disabled");
-}
-
-static void mvCpuIfGetL2PrefetchMode(MV_8 *buf)
-{
-    MV_U32 regVal = 0;
-    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
-    if (regVal & BIT24)
-	mvOsSPrintf(buf, "L2 Prefetch Disabled");
-    else
-	mvOsSPrintf(buf, "L2 Prefetch Enabled");
-}
-
-static void mvCpuIfGetWriteAllocMode(MV_8 *buf)
-{
-    MV_U32 regVal = 0;
-    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
-    if (regVal & BIT28)
-	mvOsSPrintf(buf, "Write Allocate Enabled");
-    else
-	mvOsSPrintf(buf, "Write Allocate Disabled");
-}
-
-static void mvCpuIfGetCpuStreamMode(MV_8 *buf)
-{
-    MV_U32 regVal = 0;
-    __asm volatile ("mrc	p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
-    if (regVal & BIT29)
-	mvOsSPrintf(buf, "CPU Streaming Enabled");
-    else
-	mvOsSPrintf(buf, "CPU Streaming Disabled");
-}
-
-static void mvCpuIfPrintCpuRegs(void)
-{
-    MV_U32 regVal = 0;
-
-    __asm volatile ("mrc p15, 1, %0, c15, c1, 0" : "=r" (regVal)); /* Read Marvell extra features register */
-    mvOsPrintf("Extra Feature Reg = 0x%x\n",regVal);
-
-   __asm volatile ("mrc	p15, 0, %0, c1, c0, 0" : "=r" (regVal)); /* Read Control register */
-   mvOsPrintf("Control Reg = 0x%x\n",regVal);
-
-   __asm volatile ("mrc	p15, 0, %0, c0, c0, 0" : "=r" (regVal)); /* Read ID Code register */
-    mvOsPrintf("ID Code Reg = 0x%x\n",regVal);
-
-   __asm volatile ("mrc	p15, 0, %0, c0, c0, 1" : "=r" (regVal)); /* Read Cache Type register */
-   mvOsPrintf("Cache Type Reg = 0x%x\n",regVal);
-
-}
-
-MV_U32 mvCpuIfPrintSystemConfig(MV_8 *buffer, MV_U32 index)
-{
-  MV_U32 count = 0;
-  
-  MV_8 L2_ECC_str[MV_PROC_STR_SIZE];
-  MV_8 L2_En_str[MV_PROC_STR_SIZE];
-  MV_8 L2_Prefetch_str[MV_PROC_STR_SIZE];
-  MV_8 Write_Alloc_str[MV_PROC_STR_SIZE];
-  MV_8 Cpu_Stream_str[MV_PROC_STR_SIZE];
-  
-  mvCpuIfGetL2Mode(L2_En_str);
-  mvCpuIfGetL2EccMode(L2_ECC_str); 
-  mvCpuIfGetL2PrefetchMode(L2_Prefetch_str);
-  mvCpuIfGetWriteAllocMode(Write_Alloc_str);
-  mvCpuIfGetCpuStreamMode(Cpu_Stream_str);
-  mvCpuIfPrintCpuRegs();
-  
-  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_En_str);
-  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_ECC_str);
-  count += mvOsSPrintf(buffer + count + index, "%s\n", L2_Prefetch_str);
-  count += mvOsSPrintf(buffer + count + index, "%s\n", Write_Alloc_str);
-  count += mvOsSPrintf(buffer + count + index, "%s\n", Cpu_Stream_str);
-  return count;
-}
-
-MV_U32 whoAmI(MV_VOID)
-{
-	return 0;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h
deleted file mode 100644
index 7f58b03f1f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/cpu/mvCpu.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCpuh
-#define __INCmvCpuh
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-/* defines */
-#define CPU_PART_MRVL131      0x131
-#define CPU_PART_ARM926       0x926
-#define CPU_PART_ARM946       0x946
-#define MV_CPU_ARM_CLK_ELM_SIZE	    12
-#define MV_CPU_ARM_CLK_RATIO_OFF    8
-#define MV_CPU_ARM_CLK_DDR_OFF	    4
-
-#ifndef MV_ASMLANGUAGE
-typedef struct _mvCpuArmClk 
-{
-	MV_U32	      cpuClk;	  /* CPU clock in MHz */
-	MV_U32	      ddrClk;	  /* DDR clock in MHz */
-	MV_U32	      l2Clk;	  /* CPU DDR clock ratio */
-
-}MV_CPU_ARM_CLK;
-
-MV_U32    mvCpuPclkGet(MV_VOID);
-MV_VOID   mvCpuNameGet(char *pNameBuff);
-MV_U32  mvCpuL2ClkGet(MV_VOID);
-MV_U32 mvCpuIfPrintSystemConfig(MV_8 *buffer, MV_U32 index);
-MV_U32 whoAmI(MV_VOID);
-
-#endif /* MV_ASMLANGUAGE */
-
-
-#endif /* __INCmvCpuh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
deleted file mode 100644
index 2d148e0fc9..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvCtrlEnvAddrDec.h - Marvell controller address decode library
-*
-* DESCRIPTION:
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-/* includes */
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
-#include "ddr2/mvDramIfRegs.h"
-#include "pex/mvPexRegs.h"
-
-#define MV_DEBUG
-
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif
-	
-/* Default Attributes array */
-MV_TARGET_ATTRIB	mvTargetDefaultsArray[] = TARGETS_DEF_ARRAY;
-extern MV_TARGET 	*sampleAtResetTargetArray;
-/* Dram\AHBToMbus\PEX share regsiter */
-
-#define CTRL_DEC_BASE_OFFS		16
-#define CTRL_DEC_BASE_MASK		(0xffff << CTRL_DEC_BASE_OFFS)
-#define CTRL_DEC_BASE_ALIGNMENT	0x10000
-
-#define CTRL_DEC_SIZE_OFFS		16
-#define CTRL_DEC_SIZE_MASK		(0xffff << CTRL_DEC_SIZE_OFFS)
-#define CTRL_DEC_SIZE_ALIGNMENT	0x10000
-
-#define CTRL_DEC_WIN_EN			BIT0
-
-
-
-/*******************************************************************************
-* mvCtrlAddrDecToReg - Get address decode register format values
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_STATUS mvCtrlAddrDecToReg(MV_ADDR_WIN *pAddrDecWin, MV_DEC_REGS *pAddrDecRegs)
-{
-
-	MV_U32 baseToReg=0 , sizeToReg=0;
-    
-	/* BaseLow[31:16] => base register [31:16]		*/
-	baseToReg = pAddrDecWin->baseLow & CTRL_DEC_BASE_MASK;
-
-	/* Write to address decode Base Address Register                  */
-	pAddrDecRegs->baseReg &= ~CTRL_DEC_BASE_MASK;
-	pAddrDecRegs->baseReg |= baseToReg;
-
-	/* Get size register value according to window size						*/
-	sizeToReg = ctrlSizeToReg(pAddrDecWin->size, CTRL_DEC_SIZE_ALIGNMENT);
-	
-	/* Size parameter validity check.                                   */
-	if (-1 == sizeToReg)
-	{
-		return MV_BAD_PARAM;
-	}
-
-	/* set size */
-	pAddrDecRegs->sizeReg &= ~CTRL_DEC_SIZE_MASK;
-	pAddrDecRegs->sizeReg |= (sizeToReg << CTRL_DEC_SIZE_OFFS);
-	
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvCtrlRegToAddrDec - Extract address decode struct from registers.
-*
-* DESCRIPTION:
-*       This function extract address decode struct from address decode 
-*       registers given as parameters.
-*
-* INPUT:
-*       pAddrDecRegs - Address decode register struct.
-*
-* OUTPUT:
-*       pAddrDecWin - Target window data structure.
-*
-* RETURN:
-*		MV_BAD_PARAM if address decode registers data is invalid.
-*
-*******************************************************************************/
-MV_STATUS mvCtrlRegToAddrDec(MV_DEC_REGS *pAddrDecRegs, MV_ADDR_WIN *pAddrDecWin)
-{
-	MV_U32 sizeRegVal;
-	
-	sizeRegVal = (pAddrDecRegs->sizeReg & CTRL_DEC_SIZE_MASK) >> 
-					CTRL_DEC_SIZE_OFFS;
-
-	pAddrDecWin->size = ctrlRegToSize(sizeRegVal, CTRL_DEC_SIZE_ALIGNMENT);
-
-
-	/* Extract base address						*/
-	/* Base register [31:16] ==> baseLow[31:16] 		*/
-	pAddrDecWin->baseLow = pAddrDecRegs->baseReg & CTRL_DEC_BASE_MASK;
-
-	pAddrDecWin->baseHigh =  0;
-
-	return MV_OK;
-    
-}
-
-/*******************************************************************************
-* mvCtrlAttribGet - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*
-*******************************************************************************/
-
-MV_STATUS mvCtrlAttribGet(MV_TARGET target,
-						  MV_TARGET_ATTRIB *targetAttrib)
-{
-
-	targetAttrib->attrib = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].attrib;
-	targetAttrib->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].targetId;
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvCtrlGetAttrib - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_TARGET mvCtrlTargetGet(MV_TARGET_ATTRIB *targetAttrib)
-{
-	MV_TARGET target;
-	MV_TARGET x;
-	for (target = SDRAM_CS0; target < MAX_TARGETS ; target ++)
-	{
-		x = MV_CHANGE_BOOT_CS(target);
-		if ((mvTargetDefaultsArray[x].attrib == targetAttrib->attrib) &&
-			(mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(target)].targetId == targetAttrib->targetId))
-		{
-			/* found it */
-			break;
-		}
-	}
-
-	return target;
-}
-
-MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, 
-                                MV_DEC_WIN_PARAMS *pWinParam)
-{
-	MV_U32 baseToReg=0, sizeToReg=0;
-    
-	/* BaseLow[31:16] => base register [31:16]		*/
-	baseToReg = pAddrDecWin->addrWin.baseLow & CTRL_DEC_BASE_MASK;
-
-	/* Write to address decode Base Address Register                  */
-	pWinParam->baseAddr &= ~CTRL_DEC_BASE_MASK;
-	pWinParam->baseAddr |= baseToReg;
-
-	/* Get size register value according to window size						*/
-	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, CTRL_DEC_SIZE_ALIGNMENT);
-	
-	/* Size parameter validity check.                                   */
-	if (-1 == sizeToReg)
-	{
-        mvOsPrintf("mvCtrlAddrDecToParams: ERR. ctrlSizeToReg failed.\n");
-		return MV_BAD_PARAM;
-	}
-    pWinParam->size = sizeToReg;
-
-    pWinParam->attrib   = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].attrib;
-    pWinParam->targetId = mvTargetDefaultsArray[MV_CHANGE_BOOT_CS(pAddrDecWin->target)].targetId;
-
-    return MV_OK;
-}
-
-MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, 
-                                MV_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttrib;
-
-    pAddrDecWin->addrWin.baseLow = pWinParam->baseAddr;
-	
-	/* Upper 32bit address base is supported under PCI High Address remap */
-	pAddrDecWin->addrWin.baseHigh = 0;	
-
-	/* Prepare sizeReg to ctrlRegToSize function */
-    pAddrDecWin->addrWin.size = ctrlRegToSize(pWinParam->size, CTRL_DEC_SIZE_ALIGNMENT);
-
-	if (-1 == pAddrDecWin->addrWin.size)
-	{
-		DB(mvOsPrintf("mvCtrlParamsToAddrDec: ERR. ctrlRegToSize failed.\n"));
-		return MV_BAD_PARAM;
-	}
-    targetAttrib.targetId = pWinParam->targetId;
-    targetAttrib.attrib = pWinParam->attrib;
-
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-    return MV_OK;
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h
deleted file mode 100644
index 30efe98ce9..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAddrDec.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCtrlEnvAddrDech
-#define __INCmvCtrlEnvAddrDech
-
-/* includes */
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvRegs.h"
-
-
-/* defines  */
-/* DUnit attributes */
-#define ATMWCR_WIN_DUNIT_CS0_OFFS			0
-#define ATMWCR_WIN_DUNIT_CS0_MASK			BIT0
-#define ATMWCR_WIN_DUNIT_CS0_REQ			(0 << ATMWCR_WIN_DUNIT_CS0_OFFS)
-
-#define ATMWCR_WIN_DUNIT_CS1_OFFS			1
-#define ATMWCR_WIN_DUNIT_CS1_MASK			BIT1
-#define ATMWCR_WIN_DUNIT_CS1_REQ 			(0 << ATMWCR_WIN_DUNIT_CS1_OFFS)
-
-#define ATMWCR_WIN_DUNIT_CS2_OFFS			2
-#define ATMWCR_WIN_DUNIT_CS2_MASK			BIT2
-#define ATMWCR_WIN_DUNIT_CS2_REQ 			(0 << ATMWCR_WIN_DUNIT_CS2_OFFS)
-
-#define ATMWCR_WIN_DUNIT_CS3_OFFS			3
-#define ATMWCR_WIN_DUNIT_CS3_MASK			BIT3
-#define ATMWCR_WIN_DUNIT_CS3_REQ 			(0 << ATMWCR_WIN_DUNIT_CS3_OFFS)
-
-/* RUnit (Device)  attributes */
-#define ATMWCR_WIN_RUNIT_DEVCS0_OFFS		0
-#define ATMWCR_WIN_RUNIT_DEVCS0_MASK		BIT0
-#define ATMWCR_WIN_RUNIT_DEVCS0_REQ			(0 << ATMWCR_WIN_RUNIT_DEVCS0_OFFS)
-
-#define ATMWCR_WIN_RUNIT_DEVCS1_OFFS		1
-#define ATMWCR_WIN_RUNIT_DEVCS1_MASK		BIT1
-#define ATMWCR_WIN_RUNIT_DEVCS1_REQ 		(0 << ATMWCR_WIN_RUNIT_DEVCS1_OFFS)
-
-#define ATMWCR_WIN_RUNIT_DEVCS2_OFFS		2
-#define ATMWCR_WIN_RUNIT_DEVCS2_MASK		BIT2
-#define ATMWCR_WIN_RUNIT_DEVCS2_REQ 		(0 << ATMWCR_WIN_RUNIT_DEVCS2_OFFS)
-
-#define ATMWCR_WIN_RUNIT_BOOTCS_OFFS		4
-#define ATMWCR_WIN_RUNIT_BOOTCS_MASK		BIT4
-#define ATMWCR_WIN_RUNIT_BOOTCS_REQ 		(0 << ATMWCR_WIN_RUNIT_BOOTCS_OFFS)
-
-/* LMaster (PCI)  attributes */
-#define ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS		0
-#define ATMWCR_WIN_LUNIT_BYTE_SWP_MASK		BIT0
-#define ATMWCR_WIN_LUNIT_BYTE_SWP			(0 << ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS)
-#define ATMWCR_WIN_LUNIT_BYTE_NO_SWP		(1 << ATMWCR_WIN_LUNIT_BYTE_SWP_OFFS)
-
-
-#define ATMWCR_WIN_LUNIT_WORD_SWP_OFFS		1
-#define ATMWCR_WIN_LUNIT_WORD_SWP_MASK		BIT1
-#define ATMWCR_WIN_LUNIT_WORD_SWP			(0 << ATMWCR_WIN_LUNIT_WORD_SWP_OFFS)
-#define ATMWCR_WIN_LUNIT_WORD_NO_SWP		(1 << ATMWCR_WIN_LUNIT_WORD_SWP_OFFS)
-
-#define ATMWCR_WIN_LUNIT_NO_SNOOP			BIT2
-
-#define ATMWCR_WIN_LUNIT_TYPE_OFFS			3
-#define ATMWCR_WIN_LUNIT_TYPE_MASK			BIT3
-#define ATMWCR_WIN_LUNIT_TYPE_IO			(0 << ATMWCR_WIN_LUNIT_TYPE_OFFS)
-#define ATMWCR_WIN_LUNIT_TYPE_MEM			(1 << ATMWCR_WIN_LUNIT_TYPE_OFFS)
-
-#define ATMWCR_WIN_LUNIT_FORCE64_OFFS		4
-#define ATMWCR_WIN_LUNIT_FORCE64_MASK		BIT4
-#define ATMWCR_WIN_LUNIT_FORCE64			(0 << ATMWCR_WIN_LUNIT_FORCE64_OFFS)
-
-#define ATMWCR_WIN_LUNIT_ORDERING_OFFS		6
-#define ATMWCR_WIN_LUNIT_ORDERING_MASK		BIT6
-#define ATMWCR_WIN_LUNIT_ORDERING			(1 << ATMWCR_WIN_LUNIT_FORCE64_OFFS)
-
-/* PEX Attributes */
-#define ATMWCR_WIN_PEX_TYPE_OFFS			3
-#define ATMWCR_WIN_PEX_TYPE_MASK			BIT3
-#define ATMWCR_WIN_PEX_TYPE_IO				(0 << ATMWCR_WIN_PEX_TYPE_OFFS)
-#define ATMWCR_WIN_PEX_TYPE_MEM				(1 << ATMWCR_WIN_PEX_TYPE_OFFS)
-
-/* typedefs */
-
-/* Unsupported attributes for address decode:                               */
-/* 2) PCI0/1_REQ64n control                                                 */
-
-typedef struct _mvDecRegs
-{
-	MV_U32 baseReg;
-    MV_U32 baseRegHigh;
-    MV_U32 sizeReg;
-
-}MV_DEC_REGS;
-
-typedef struct _mvTargetAttrib
-{
-	MV_U8			attrib;			/* chip select attributes */
-	MV_TARGET_ID 		targetId; 		/* Target Id of this MV_TARGET */
-
-}MV_TARGET_ATTRIB;
-
-
-/* This structure describes address decode window                           */
-typedef struct _mvDecWin 
-{
-    MV_TARGET       target;         /* Target for addr decode window        */
-    MV_ADDR_WIN     addrWin;        /* Address window of target             */
-    MV_BOOL     	enable;         /* Window enable/disable                */
-}MV_DEC_WIN;
-
-typedef struct _mvDecWinParams
-{
-    MV_TARGET_ID    targetId;   /* Target ID field */
-    MV_U8           attrib;     /* Attribute field */
-    MV_U32          baseAddr;   /* Base address in register format */
-    MV_U32          size;       /* Size in register format */
-}MV_DEC_WIN_PARAMS;
-
-
-/* mvCtrlEnvAddrDec API list */
-
-MV_STATUS mvCtrlAddrDecToReg(MV_ADDR_WIN *pAddrDecWin,
-							 MV_DEC_REGS *pAddrDecRegs);
-
-MV_STATUS mvCtrlRegToAddrDec(MV_DEC_REGS *pAddrDecRegs,
-							 MV_ADDR_WIN *pAddrDecWin);
-
-MV_STATUS mvCtrlAttribGet(MV_TARGET target,
-						  MV_TARGET_ATTRIB *targetAttrib);
-
-MV_TARGET mvCtrlTargetGet(MV_TARGET_ATTRIB *targetAttrib);
-
-
-MV_STATUS mvCtrlAddrDecToParams(MV_DEC_WIN *pAddrDecWin, 
-                                MV_DEC_WIN_PARAMS *pWinParam);
-
-MV_STATUS mvCtrlParamsToAddrDec(MV_DEC_WIN_PARAMS *pWinParam, 
-                                MV_DEC_WIN *pAddrDecWin);
-
-
-
-
-#endif /* __INCmvCtrlEnvAddrDech */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h
deleted file mode 100644
index 6f6367a2fb..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvAsm.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCtrlEnvAsmh
-#define __INCmvCtrlEnvAsmh
-#include "pex/mvPexRegs.h"
-
-#define CHIP_BOND_REG					0x10034
-#define PCKG_OPT_MASK_AS 		#3
-#define PXCCARI_REVID_MASK_AS           #PXCCARI_REVID_MASK
-
-/* Read device ID into toReg bits 15:0 from 0xd0000000 */
-/* defines  */
-#define MV_DV_CTRL_MODEL_GET_ASM(toReg, tmpReg) \
-        MV_DV_REG_READ_ASM(toReg, tmpReg, CHIP_BOND_REG);\
-        and     toReg, toReg, PCKG_OPT_MASK_AS                 /* Mask for package ID */
-
-/* Read device ID into toReg bits 15:0 from 0xf1000000*/
-#define MV_CTRL_MODEL_GET_ASM(toReg, tmpReg) \
-        MV_REG_READ_ASM(toReg, tmpReg, CHIP_BOND_REG);\
-        and     toReg, toReg, PCKG_OPT_MASK_AS                  /* Mask for package ID */
-
-/* Read Revision into toReg bits 7:0 0xd0000000*/
-#define MV_DV_CTRL_REV_GET_ASM(toReg, tmpReg)	\
-        /* Read device revision */			\
-        MV_DV_REG_READ_ASM(toReg, tmpReg, PEX_CFG_DIRECT_ACCESS(0,PEX_CLASS_CODE_AND_REVISION_ID));\
-        and     toReg, toReg, PXCCARI_REVID_MASK_AS                  /* Mask for calss ID */
-
-/* Read Revision into toReg bits 7:0 0xf1000000*/
-#define MV_CTRL_REV_GET_ASM(toReg, tmpReg)	\
-        /* Read device revision */			\
-        MV_REG_READ_ASM(toReg, tmpReg, PEX_CFG_DIRECT_ACCESS(0,PEX_CLASS_CODE_AND_REVISION_ID));\
-        and     toReg, toReg, PXCCARI_REVID_MASK_AS                  /* Mask for calss ID */
-
-
-#endif /* __INCmvCtrlEnvAsmh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c
deleted file mode 100644
index adf451d3e0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.c
+++ /dev/null
@@ -1,1825 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-#include "mvCommon.h"
-#include "mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-#if defined(MV_INCLUDE_PEX)
-#include "pex/mvPex.h"
-#include "ctrlEnv/sys/mvSysPex.h"
-#endif
-
-#if defined(MV_INCLUDE_GIG_ETH)
-#include "ctrlEnv/sys/mvSysGbe.h"
-#endif
-
-#if defined(MV_INCLUDE_XOR)
-#include "ctrlEnv/sys/mvSysXor.h"
-#endif
-
-#if defined(MV_INCLUDE_SATA)
-#include "ctrlEnv/sys/mvSysSata.h"
-#endif
-
-#if defined(MV_INCLUDE_USB)
-#include "ctrlEnv/sys/mvSysUsb.h"
-#endif
-
-#if defined(MV_INCLUDE_AUDIO)
-#include "ctrlEnv/sys/mvSysAudio.h"
-#endif
-
-#if defined(MV_INCLUDE_CESA)
-#include "ctrlEnv/sys/mvSysCesa.h"
-#endif
-
-#if defined(MV_INCLUDE_TS)
-#include "ctrlEnv/sys/mvSysTs.h"
-#endif
-
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif	
-
-/*******************************************************************************
-* mvCtrlEnvInit - Initialize Marvell controller environment.
-*
-* DESCRIPTION:
-*       This function get environment information and initialize controller
-*       internal/external environment. For example
-*       1) MPP settings according to board MPP macros.
-*		NOTE: It is the user responsibility to shut down all DMA channels
-*		in device and disable controller sub units interrupts during 
-*		boot process.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvCtrlEnvInit(MV_VOID)
-{
-    	MV_U32 mppGroup;
-	MV_U32 devId;
-	MV_U32 boardId;
-	MV_U32 i;
-	MV_U32 maxMppGrp = 1;
-	MV_U32 mppVal = 0;
-	MV_U32 bootVal = 0;
-	MV_U32 mppGroupType = 0;
-	MV_U32 mppGroup1[][3] = MPP_GROUP_1_TYPE;
-	MV_U32 mppGroup2[][3] = MPP_GROUP_2_TYPE;
-
-	devId = mvCtrlModelGet();
-	boardId= mvBoardIdGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			maxMppGrp = MV_6281_MPP_MAX_GROUP;
-			break;
-		case MV_6192_DEV_ID:
-			maxMppGrp = MV_6192_MPP_MAX_GROUP;
-			break;
-        case MV_6190_DEV_ID:
-            maxMppGrp = MV_6190_MPP_MAX_GROUP;
-            break;
-		case MV_6180_DEV_ID:
-			maxMppGrp = MV_6180_MPP_MAX_GROUP;
-			break;		
-	}
-	
-	/* MPP Init */
-	/* We split mpp init to 3 phases:
-	 * 1. We init mpp[19:0] from the board info. mpp[23:20] will be over write 
-	 * in phase 2.
-	 * 2. We detect the mpp group type and according the mpp values [35:20].
-	 * 3. We detect the mpp group type and according the mpp values [49:36].
-	 */
-	/* Mpp phase 1 mpp[19:0] */
-	/* Read MPP group from board level and assign to MPP register */
-	for (mppGroup = 0; mppGroup < 3; mppGroup++)
-	{
-		mppVal = mvBoardMppGet(mppGroup);
-		if (mppGroup == 0)
-		{
-		    bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
-		    if (mvCtrlIsBootFromSPI())
-		    {
-			mppVal &= ~0xffff;
-			bootVal &= 0xffff;
-			mppVal |= bootVal;
-		    }
-		    else if (mvCtrlIsBootFromSPIUseNAND())
-		    {
-			mppVal &= ~0xf0000000;
-			bootVal &= 0xf0000000;
-			mppVal |= bootVal;
-		    }
-		    else if (mvCtrlIsBootFromNAND())
-		    {
-			mppVal &= ~0xffffff;
-			bootVal &= 0xffffff;
-			mppVal |= bootVal;
-		    }
-		}
-		
-		if (mppGroup == 2)
-		{
-		    bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
-		    if (mvCtrlIsBootFromNAND())
-		    {
-			mppVal &= ~0xff00;
-			bootVal &= 0xff00;
-			mppVal |= bootVal;
-		    }
-		}
-
-		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
-	}
-
-	/* Identify MPPs group */
-	mvBoardMppGroupIdUpdate();
-
-	/* Update MPPs mux relevent only on Marvell DB */
-	if ((boardId == DB_88F6281A_BP_ID) ||
-		(boardId == DB_88F6180A_BP_ID))
-		mvBoardMppMuxSet();
-
-	mppGroupType = mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_1);
-
-	/* Mpp phase 2 */
-	/* Read MPP group from board level and assign to MPP register */
-    if (devId != MV_6180_DEV_ID)
-    {
-        i = 0;
-    	for (mppGroup = 2; mppGroup < 5; mppGroup++)
-    	{
-    		if ((mppGroupType == MV_BOARD_OTHER) ||
-    			(boardId == RD_88F6281A_ID) ||
-    			(boardId == RD_88F6192A_ID) ||
-                (boardId == RD_88F6190A_ID) ||
-                (boardId == RD_88F6281A_PCAC_ID) ||
-                (boardId == SHEEVA_PLUG_ID))
-    			mppVal = mvBoardMppGet(mppGroup);
-    		else
-    		{
-    			mppVal = mppGroup1[mppGroupType][i];
-    			i++;
-    		}
-    
-    		/* Group 2 is shared mpp[23:16] */
-    		if (mppGroup == 2)
-    		{
-                bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
-    			mppVal &= ~0xffff;
-    			bootVal &= 0xffff;
-    			mppVal |= bootVal;
-    		}
-    
-    		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
-    	}
-    }
-
-	if ((devId == MV_6192_DEV_ID) || (devId == MV_6190_DEV_ID))
-		return MV_OK;
- 	
-	/* Mpp phase 3 */
-	mppGroupType = mvBoardMppGroupTypeGet(MV_BOARD_MPP_GROUP_2);
-	/* Read MPP group from board level and assign to MPP register */
-	i = 0;
-	for (mppGroup = 4; mppGroup < 7; mppGroup++)
-	{
-		if ((mppGroupType == MV_BOARD_OTHER) ||
-			(boardId == RD_88F6281A_ID) ||
-            (boardId == RD_88F6281A_PCAC_ID) ||
-            (boardId == SHEEVA_PLUG_ID))
-			mppVal = mvBoardMppGet(mppGroup);
-		else
-		{
-			mppVal = mppGroup2[mppGroupType][i];
-			i++;
-		}
-
-		/* Group 4 is shared mpp[35:32] */
-		if (mppGroup == 4)
-		{
-            bootVal = MV_REG_READ(mvCtrlMppRegGet(mppGroup));
-			mppVal &= ~0xffff;
-			bootVal &= 0xffff;
-			mppVal |= bootVal;
-		}
-
-		MV_REG_WRITE(mvCtrlMppRegGet(mppGroup), mppVal);
-	}
-    /* Update SSCG configuration register*/
-    if(mvBoardIdGet() == DB_88F6281A_BP_ID || mvBoardIdGet() == DB_88F6192A_BP_ID ||
-       mvBoardIdGet() == DB_88F6190A_BP_ID || mvBoardIdGet() == DB_88F6180A_BP_ID)
-        MV_REG_WRITE(0x100d8, 0x53);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCtrlMppRegGet - return reg address of mpp group
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       mppGroup - MPP group.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_U32 - Register address.
-*
-*******************************************************************************/
-MV_U32 mvCtrlMppRegGet(MV_U32 mppGroup)
-{
-        MV_U32 ret;
-
-        switch(mppGroup){
-                case (0):       ret = MPP_CONTROL_REG0;
-                                break;
-                case (1):       ret = MPP_CONTROL_REG1;
-                                break;
-                case (2):       ret = MPP_CONTROL_REG2;
-                                break;
-                case (3):       ret = MPP_CONTROL_REG3;
-                                break;
-                case (4):       ret = MPP_CONTROL_REG4;
-                                break;
-                case (5):       ret = MPP_CONTROL_REG5;
-                                break;
-                case (6):       ret = MPP_CONTROL_REG6;
-                                break;
-                default:        ret = MPP_CONTROL_REG0;
-                                break;
-        }
-        return ret;
-}
-#if defined(MV_INCLUDE_PEX) 
-/*******************************************************************************
-* mvCtrlPexMaxIfGet - Get Marvell controller number of PEX interfaces.
-*
-* DESCRIPTION:
-*       This function returns Marvell controller number of PEX interfaces.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Marvell controller number of PEX interfaces. If controller 
-*		ID is undefined the function returns '0'.
-*
-*******************************************************************************/
-MV_U32 mvCtrlPexMaxIfGet(MV_VOID)
-{
-
-	return MV_PEX_MAX_IF;
-}
-#endif
-
-#if defined(MV_INCLUDE_GIG_ETH)
-/*******************************************************************************
-* mvCtrlEthMaxPortGet - Get Marvell controller number of etherent ports.
-*
-* DESCRIPTION:
-*       This function returns Marvell controller number of etherent port.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Marvell controller number of etherent port.
-*
-*******************************************************************************/
-MV_U32 mvCtrlEthMaxPortGet(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_ETH_MAX_PORTS;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_ETH_MAX_PORTS;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_ETH_MAX_PORTS;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_ETH_MAX_PORTS;
-			break;		
-	}
-	return 0;
-
-}
-#endif
-
-#if defined(MV_INCLUDE_XOR)
-/*******************************************************************************
-* mvCtrlXorMaxChanGet - Get Marvell controller number of XOR channels.
-*
-* DESCRIPTION:
-*       This function returns Marvell controller number of XOR channels.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Marvell controller number of XOR channels.
-*
-*******************************************************************************/
-MV_U32 mvCtrlXorMaxChanGet(MV_VOID)
-{
-	return MV_XOR_MAX_CHAN; 
-}
-#endif
-
-#if defined(MV_INCLUDE_USB)
-/*******************************************************************************
-* mvCtrlUsbHostMaxGet - Get number of Marvell Usb  controllers
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       returns number of Marvell USB  controllers.
-*
-*******************************************************************************/
-MV_U32 mvCtrlUsbMaxGet(void)
-{
-	return MV_USB_MAX_PORTS;
-}
-#endif
-
-
-#if defined(MV_INCLUDE_NAND)
-/*******************************************************************************
-* mvCtrlNandSupport - Return if this controller has integrated NAND flash support
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if NAND is supported and MV_FALSE otherwise
-*
-*******************************************************************************/
-MV_U32	  mvCtrlNandSupport(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_NAND;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_NAND;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_NAND;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_NAND;
-			break;		
-	}
-	return 0;
-
-}
-#endif
-
-#if defined(MV_INCLUDE_SDIO)
-/*******************************************************************************
-* mvCtrlSdioSupport - Return if this controller has integrated SDIO flash support
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if SDIO is supported and MV_FALSE otherwise
-*
-*******************************************************************************/
-MV_U32	  mvCtrlSdioSupport(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_SDIO;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_SDIO;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_SDIO;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_SDIO;
-			break;		
-	}
-	return 0;
-
-}
-#endif
-
-#if defined(MV_INCLUDE_TS)
-/*******************************************************************************
-* mvCtrlTsSupport - Return if this controller has integrated TS flash support
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if TS is supported and MV_FALSE otherwise
-*
-*******************************************************************************/
-MV_U32	  mvCtrlTsSupport(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_TS;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_TS;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_TS;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_TS;
-			break;		
-	}
-	return 0;
-}
-#endif
-
-#if defined(MV_INCLUDE_AUDIO)
-/*******************************************************************************
-* mvCtrlAudioSupport - Return if this controller has integrated AUDIO flash support
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if AUDIO is supported and MV_FALSE otherwise
-*
-*******************************************************************************/
-MV_U32	  mvCtrlAudioSupport(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_AUDIO;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_AUDIO;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_AUDIO;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_AUDIO;
-			break;		
-	}
-	return 0;
-
-}
-#endif
-
-#if defined(MV_INCLUDE_TDM)
-/*******************************************************************************
-* mvCtrlTdmSupport - Return if this controller has integrated TDM flash support
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if TDM is supported and MV_FALSE otherwise
-*
-*******************************************************************************/
-MV_U32	  mvCtrlTdmSupport(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = mvCtrlModelGet();
-
-	switch(devId){
-		case MV_6281_DEV_ID:
-			return MV_6281_TDM;
-			break;
-		case MV_6192_DEV_ID:
-			return MV_6192_TDM;
-			break;
-        case MV_6190_DEV_ID:
-            return MV_6190_TDM;
-            break;
-		case MV_6180_DEV_ID:
-			return MV_6180_TDM;
-			break;		
-	}
-	return 0;
-
-}
-#endif
-
-/*******************************************************************************
-* mvCtrlModelGet - Get Marvell controller device model (Id)
-*
-* DESCRIPTION:
-*       This function returns 16bit describing the device model (ID) as defined
-*       in PCI Device and Vendor ID configuration register offset 0x0.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       16bit desscribing Marvell controller ID 
-*
-*******************************************************************************/
-MV_U16 mvCtrlModelGet(MV_VOID)
-{
-	MV_U32 devId;
-	
-	devId = MV_REG_READ(CHIP_BOND_REG);
-	devId &= PCKG_OPT_MASK;
-
-	switch(devId){
-		case 2:
-			return	MV_6281_DEV_ID;
-			break;
-    case 1:
-            if (((MV_REG_READ(PEX_CFG_DIRECT_ACCESS(0,PEX_DEVICE_AND_VENDOR_ID))& 0xffff0000) >> 16)
-                 == MV_6190_DEV_ID)
-                return	MV_6190_DEV_ID;
-            else
-                return	MV_6192_DEV_ID;
-			break;
-		case 0:
-			return	MV_6180_DEV_ID;
-			break;
-	}
-
-	return 0;
-}
-/*******************************************************************************
-* mvCtrlRevGet - Get Marvell controller device revision number
-*
-* DESCRIPTION:
-*       This function returns 8bit describing the device revision as defined
-*       in PCI Express Class Code and Revision ID Register.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       8bit desscribing Marvell controller revision number 
-*
-*******************************************************************************/
-MV_U8 mvCtrlRevGet(MV_VOID)
-{
-	MV_U8 revNum;
-#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
-	/* Check pex power state */
-	MV_U32 pexPower;
-	pexPower = mvCtrlPwrClckGet(PEX_UNIT_ID,0);
-	if (pexPower == MV_FALSE)
-		mvCtrlPwrClckSet(PEX_UNIT_ID, 0, MV_TRUE);
-#endif
-	revNum = (MV_U8)MV_REG_READ(PEX_CFG_DIRECT_ACCESS(0,PCI_CLASS_CODE_AND_REVISION_ID));
-#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
-	/* Return to power off state */
-	if (pexPower == MV_FALSE)
-		mvCtrlPwrClckSet(PEX_UNIT_ID, 0, MV_FALSE);
-#endif
-	return ((revNum & PCCRIR_REVID_MASK) >> PCCRIR_REVID_OFFS);
-}
-
-/*******************************************************************************
-* mvCtrlNameGet - Get Marvell controller name
-*
-* DESCRIPTION:
-*       This function returns a string describing the device model and revision.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       pNameBuff - Buffer to contain device name string. Minimum size 30 chars.
-*
-* RETURN:
-*       
-*       MV_ERROR if informantion can not be read.
-*******************************************************************************/
-MV_STATUS mvCtrlNameGet(char *pNameBuff)
-{
-	mvOsSPrintf (pNameBuff, "%s%x Rev %d", SOC_NAME_PREFIX, 
-				mvCtrlModelGet(), mvCtrlRevGet()); 
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCtrlModelRevGet - Get Controller Model (Device ID) and Revision
-*
-* DESCRIPTION:
-*       This function returns 32bit value describing both Device ID and Revision
-*       as defined in PCI Express Device and Vendor ID Register and device revision
-*	    as defined in PCI Express Class Code and Revision ID Register.
-     
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit describing both controller device ID and revision number
-*
-*******************************************************************************/
-MV_U32	mvCtrlModelRevGet(MV_VOID)
-{
-	return ((mvCtrlModelGet() << 16) | mvCtrlRevGet());
-}
-
-/*******************************************************************************
-* mvCtrlModelRevNameGet - Get Marvell controller name
-*
-* DESCRIPTION:
-*       This function returns a string describing the device model and revision.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       pNameBuff - Buffer to contain device name string. Minimum size 30 chars.
-*
-* RETURN:
-*       
-*       MV_ERROR if informantion can not be read.
-*******************************************************************************/
-
-MV_STATUS mvCtrlModelRevNameGet(char *pNameBuff)
-{
-
-        switch (mvCtrlModelRevGet())
-        {
-        case MV_6281_A0_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6281_A0_NAME); 
-                break;
-        case MV_6192_A0_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6192_A0_NAME); 
-                break;
-        case MV_6180_A0_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6180_A0_NAME); 
-                break;
-        case MV_6190_A0_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6190_A0_NAME); 
-                break;
-        case MV_6281_A1_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6281_A1_NAME);
-                break;
-        case MV_6192_A1_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6192_A1_NAME);
-                break;
-        case MV_6180_A1_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6180_A1_NAME);
-                break;
-        case MV_6190_A1_ID:
-                mvOsSPrintf (pNameBuff, "%s",MV_6190_A1_NAME);
-                break;
-        default:
-                mvCtrlNameGet(pNameBuff);
-                break;
-        }
-
-        return MV_OK;
-}
-
-
-/*******************************************************************************
-* ctrlWinOverlapTest - Test address windows for overlaping.
-*
-* DESCRIPTION:
-*       This function checks the given two address windows for overlaping.
-*
-* INPUT:
-*       pAddrWin1 - Address window 1.
-*       pAddrWin2 - Address window 2.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       
-*       MV_TRUE if address window overlaps, MV_FALSE otherwise.
-*******************************************************************************/
-MV_STATUS ctrlWinOverlapTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2)
-{
-    MV_U32 winBase1, winBase2;
-    MV_U32 winTop1, winTop2;
-    
-	/* check if we have overflow than 4G*/
-	if (((0xffffffff - pAddrWin1->baseLow) < pAddrWin1->size-1)||
-	   ((0xffffffff - pAddrWin2->baseLow) < pAddrWin2->size-1))
-	{
-		return MV_TRUE;
-	}
-
-    winBase1 = pAddrWin1->baseLow;
-    winBase2 = pAddrWin2->baseLow;
-    winTop1  = winBase1 + pAddrWin1->size-1;
-    winTop2  = winBase2 + pAddrWin2->size-1;
-
-    
-    if (((winBase1 <= winTop2 ) && ( winTop2 <= winTop1)) ||
-        ((winBase1 <= winBase2) && (winBase2 <= winTop1)))
-    {
-        return MV_TRUE;
-    }
-    else
-    {
-        return MV_FALSE;
-    }
-}
-
-/*******************************************************************************
-* ctrlWinWithinWinTest - Test address windows for overlaping.
-*
-* DESCRIPTION:
-*       This function checks the given win1 boundries is within
-*		win2 boundries.
-*
-* INPUT:
-*       pAddrWin1 - Address window 1.
-*       pAddrWin2 - Address window 2.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       
-*       MV_TRUE if found win1 inside win2, MV_FALSE otherwise.
-*******************************************************************************/
-MV_STATUS ctrlWinWithinWinTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2)
-{
-    MV_U32 winBase1, winBase2;
-    MV_U32 winTop1, winTop2;
-    
-    winBase1 = pAddrWin1->baseLow;
-    winBase2 = pAddrWin2->baseLow;
-    winTop1  = winBase1 + pAddrWin1->size -1;
-    winTop2  = winBase2 + pAddrWin2->size -1;
-    
-    if (((winBase1 >= winBase2 ) && ( winBase1 <= winTop2)) ||
-        ((winTop1  >= winBase2) && (winTop1 <= winTop2)))
-    {
-        return MV_TRUE;
-    }
-    else
-    {
-        return MV_FALSE;
-    }
-}
-
-static const char* cntrlName[] = TARGETS_NAME_ARRAY;
-
-/*******************************************************************************
-* mvCtrlTargetNameGet - Get Marvell controller target name
-*
-* DESCRIPTION:
-*       This function convert the trget enumeration to string.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Target name (const MV_8 *)
-*******************************************************************************/
-const MV_8* mvCtrlTargetNameGet( MV_TARGET target )
-{
-
-	if (target >= MAX_TARGETS)
-	{
-		return "target unknown";
-	}
-
-	return cntrlName[target];
-}
-
-/*******************************************************************************
-* mvCtrlAddrDecShow - Print the Controller units address decode map.
-*
-* DESCRIPTION:
-*		This function the Controller units address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvCtrlAddrDecShow(MV_VOID)
-{
-    mvCpuIfAddDecShow();
-    mvAhbToMbusAddDecShow();
-#if defined(MV_INCLUDE_PEX)
-	mvPexAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_USB)
-    	mvUsbAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_GIG_ETH)
-	mvEthAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_XOR)
-	mvXorAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_SATA)
-    mvSataAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-    mvAudioAddrDecShow();
-#endif
-#if defined(MV_INCLUDE_TS)
-    mvTsuAddrDecShow();
-#endif
-}
-
-/*******************************************************************************
-* ctrlSizeToReg - Extract size value for register assignment.
-*
-* DESCRIPTION:		
-*       Address decode size parameter must be programed from LSB to MSB as
-*       sequence of 1's followed by sequence of 0's. The number of 1's 
-*       specifies the size of the window in 64 KB granularity (e.g. a 
-*       value of 0x00ff specifies 256x64k = 16 MB).
-*       This function extract the size value from the size parameter according 
-*		to given aligment paramter. For example for size 0x1000000 (16MB) and 
-*		aligment 0x10000 (64KB) the function will return 0x00FF.
-*
-* INPUT:
-*       size - Size.
-*		alignment - Size alignment.	Note that alignment must be power of 2!
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit describing size register value correspond to size parameter. 
-*		If value is '-1' size parameter or aligment are invalid.
-*******************************************************************************/
-MV_U32	ctrlSizeToReg(MV_U32 size, MV_U32 alignment)
-{
-	MV_U32 retVal;
-
-	/* Check size parameter alignment		*/
-	if ((0 == size) || (MV_IS_NOT_ALIGN(size, alignment)))
-	{
-		DB(mvOsPrintf("ctrlSizeToReg: ERR. Size is zero or not aligned.\n"));
-		return -1;
-	}
-	
-	/* Take out the "alignment" portion out of the size parameter */
-	alignment--;	/* Now the alignmet is a sequance of '1' (e.g. 0xffff) 		*/
-					/* and size is 0x1000000 (16MB) for example	*/
-	while(alignment & 1)	/* Check that alignmet LSB is set	*/
-	{
-		size = (size >> 1); /* If LSB is set, move 'size' one bit to right	*/	
-		alignment = (alignment >> 1);
-	}
-	
-	/* If after the alignment first '0' was met we still have '1' in 		*/
-	/* it then aligment is invalid (not power of 2) 				*/
-	if (alignment)
-	{
-		DB(mvOsPrintf("ctrlSizeToReg: ERR. Alignment parameter 0x%x invalid.\n", 
-			(MV_U32)alignment));
-		return -1;
-	}
-
-	/* Now the size is shifted right according to aligment: 0x0100			*/
-	size--;         /* Now the size is a sequance of '1': 0x00ff 			*/
-    
-	retVal = size ;
-	
-	/* Check that LSB to MSB is sequence of 1's followed by sequence of 0's		*/
-	while(size & 1)	/* Check that LSB is set	*/
-	{
-		size = (size >> 1); /* If LSB is set, move one bit to the right		*/	
-	}
-
-    if (size) /* Sequance of 1's is over. Check that we have no other 1's		*/
-	{
-		DB(mvOsPrintf("ctrlSizeToReg: ERR. Size parameter 0x%x invalid.\n", 
-                                                                        size));
-		return -1;
-	}
-	
-    return retVal;
-	
-}
-
-/*******************************************************************************
-* ctrlRegToSize - Extract size value from register value.
-*
-* DESCRIPTION:		
-*       This function extract a size value from the register size parameter 
-*		according to given aligment paramter. For example for register size 
-*		value 0xff and aligment 0x10000 the function will return 0x01000000.
-*
-* INPUT:
-*       regSize   - Size as in register format.	See ctrlSizeToReg.
-*		alignment - Size alignment.	Note that alignment must be power of 2!
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit describing size. 
-*		If value is '-1' size parameter or aligment are invalid.
-*******************************************************************************/
-MV_U32	ctrlRegToSize(MV_U32 regSize, MV_U32 alignment)
-{
-   	MV_U32 temp;
-
-	/* Check that LSB to MSB is sequence of 1's followed by sequence of 0's		*/ 
-	temp = regSize;		/* Now the size is a sequance of '1': 0x00ff		*/
-	
-	while(temp & 1)	/* Check that LSB is set					*/
-	{
-		temp = (temp >> 1); /* If LSB is set, move one bit to the right		*/	
-	}
-
-    if (temp) /* Sequance of 1's is over. Check that we have no other 1's		*/
-	{
-		DB(mvOsPrintf("ctrlRegToSize: ERR. Size parameter 0x%x invalid.\n", 
-					regSize));
-	   	return -1;
-	}
-	
-
-	/* Check that aligment is a power of two					*/
-	temp = alignment - 1;/* Now the alignmet is a sequance of '1' (0xffff) 		*/
-					
-	while(temp & 1)	/* Check that alignmet LSB is set				*/
-	{
-		temp = (temp >> 1); /* If LSB is set, move 'size' one bit to right	*/	
-	}
-	
-	/* If after the 'temp' first '0' was met we still have '1' in 'temp'		*/
-	/* then 'temp' is invalid (not power of 2) 					*/
-	if (temp)
-	{
-		DB(mvOsPrintf("ctrlSizeToReg: ERR. Alignment parameter 0x%x invalid.\n", 
-					alignment));
-		return -1;
-	}
-
-	regSize++;      /* Now the size is 0x0100					*/
-
-	/* Add in the "alignment" portion to the register size parameter 		*/
-	alignment--;	/* Now the alignmet is a sequance of '1' (e.g. 0xffff) 		*/
-
-	while(alignment & 1)	/* Check that alignmet LSB is set			*/
-	{
-		regSize   = (regSize << 1); /* LSB is set, move 'size' one bit left	*/	
-		alignment = (alignment >> 1);
-	}
-		
-    return regSize;	
-}
-
-
-/*******************************************************************************
-* ctrlSizeRegRoundUp - Round up given size 
-*
-* DESCRIPTION:		
-*       This function round up a given size to a size that fits the 
-*       restrictions of size format given an aligment parameter.
-*		to given aligment paramter. For example for size parameter 0xa1000 and 
-*		aligment 0x1000 the function will return 0xFF000.
-*
-* INPUT:
-*       size - Size.
-*		alignment - Size alignment.	Note that alignment must be power of 2!
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit describing size value correspond to size in register.  
-*******************************************************************************/
-MV_U32	ctrlSizeRegRoundUp(MV_U32 size, MV_U32 alignment)
-{
-	MV_U32 msbBit = 0;
-    MV_U32 retSize;
-	
-    /* Check if size parameter is already comply with restriction		*/
-	if (!(-1 == ctrlSizeToReg(size, alignment)))
-	{
-		return size;
-	}
-    
-    while(size)
-	{
-		size = (size >> 1);
-        msbBit++;
-	}
-
-    retSize = (1 << msbBit);
-    
-    if (retSize < alignment)
-    {
-        return alignment;
-    }
-    else
-    {
-        return retSize;
-    }
-}
-/*******************************************************************************
-* mvCtrlSysRstLengthCounterGet - Return number of milliseconds the reset button 
-* 				 was pressed and clear counter
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN: number of milliseconds the reset button was pressed 
-*******************************************************************************/
-MV_U32	mvCtrlSysRstLengthCounterGet(MV_VOID)
-{
-	static volatile MV_U32 Count = 0;
-
-	if(!Count) {
-		Count = (MV_REG_READ(SYSRST_LENGTH_COUNTER_REG) & SLCR_COUNT_MASK);
-		Count = (Count / (MV_BOARD_REFCLK_25MHZ / 1000));
-		/* clear counter for next boot */
-		MV_REG_BIT_SET(SYSRST_LENGTH_COUNTER_REG, SLCR_CLR_MASK);	
-	}
-
-	DB(mvOsPrintf("mvCtrlSysRstLengthCounterGet: Reset button was pressed for %u milliseconds\n", Count));
-
-	return Count;		
-}
-
-MV_BOOL	  mvCtrlIsBootFromSPI(MV_VOID)
-{
-    MV_U32 satr = 0;
-    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-    if(mvCtrlModelGet() == MV_6180_DEV_ID)
-    {
-        if (MSAR_BOOT_MODE_6180(satr) == MSAR_BOOT_SPI_WITH_BOOTROM_6180)
-            return MV_TRUE;
-        else
-            return MV_FALSE;
-    }
-    satr = satr & MSAR_BOOT_MODE_MASK;    
-    if (satr == MSAR_BOOT_SPI_WITH_BOOTROM)
-        return MV_TRUE;
-    else
-        return MV_FALSE;
-}
-
-MV_BOOL	  mvCtrlIsBootFromSPIUseNAND(MV_VOID)
-{
-    MV_U32 satr = 0;
-    if(mvCtrlModelGet() == MV_6180_DEV_ID)
-        return MV_FALSE;
-    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-    satr = satr & MSAR_BOOT_MODE_MASK;
-    
-    if (satr == MSAR_BOOT_SPI_USE_NAND_WITH_BOOTROM)
-        return MV_TRUE;
-    else
-        return MV_FALSE;
-}
-
-MV_BOOL	  mvCtrlIsBootFromNAND(MV_VOID)
-{
-    MV_U32 satr = 0;
-    satr = MV_REG_READ(MPP_SAMPLE_AT_RESET);
-    if(mvCtrlModelGet() == MV_6180_DEV_ID)
-    {
-        if (MSAR_BOOT_MODE_6180(satr) == MSAR_BOOT_NAND_WITH_BOOTROM_6180)
-            return MV_TRUE;
-        else
-            return MV_FALSE;
-    }
-    satr = satr & MSAR_BOOT_MODE_MASK;    
-    if ((satr == MSAR_BOOT_NAND_WITH_BOOTROM))
-        return MV_TRUE;
-    else
-        return MV_FALSE;
-}
-
-#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
-/*******************************************************************************
-* mvCtrlPwrSaveOn - Set Power save mode
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*******************************************************************************/
-MV_VOID   mvCtrlPwrSaveOn(MV_VOID)
-{
-	unsigned long old,temp;
-	/* Disable int */
-	__asm__ __volatile__("mrs %0, cpsr\n"
-			     "orr %1, %0, #0xc0\n"
-			     "msr cpsr_c, %1"
-			     : "=r" (old), "=r" (temp)
-			     :
-			     : "memory");
-
-	/* Set SoC in power save */
-	MV_REG_BIT_SET(POWER_MNG_CTRL_REG, BIT11);
-	/* Wait for int */
-	__asm__ __volatile__("mcr    p15, 0, r0, c7, c0, 4");
-
-	/* Enabled int */
-	__asm__ __volatile__("msr cpsr_c, %0"
-			     :
-			     : "r" (old)
-			     : "memory");
-}
-
-
-
-/*******************************************************************************
-* mvCtrlPwrSaveOff - Go out of power save mode
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*******************************************************************************/
-MV_VOID   mvCtrlPwrSaveOff(MV_VOID)
-{
-	unsigned long old,temp;
-	/* Disable int */
-	__asm__ __volatile__("mrs %0, cpsr\n"
-			     "orr %1, %0, #0xc0\n"
-			     "msr cpsr_c, %1"
-			     : "=r" (old), "=r" (temp)
-			     :
-			     : "memory");
-
-	/* Set SoC in power save */
-	MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, BIT11);
-	/* Wait for int */
-	__asm__ __volatile__("mcr    p15, 0, r0, c7, c0, 4");
-
-	/* Enabled int */
-	__asm__ __volatile__("msr cpsr_c, %0"
-			     :
-			     : "r" (old)
-			     : "memory");
-}
-
-/*******************************************************************************
-* mvCtrlPwrClckSet - Set Power State for specific Unit
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*******************************************************************************/
-MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable)
-{
-	switch (unitId)
-    {
-#if defined(MV_INCLUDE_PEX)
-	case PEX_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_PEXSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_PEXSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_GIG_ETH)
-	case ETH_GIG_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_GESTOPCLOCK_MASK(index));
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_GESTOPCLOCK_MASK(index));
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_INTEG_SATA)
-	case SATA_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SATASTOPCLOCK_MASK(index));
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SATASTOPCLOCK_MASK(index));
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_CESA)
-	case CESA_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SESTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SESTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_USB)
-	case USB_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_USBSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_USBSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-	case AUDIO_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_AUDIOSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_AUDIOSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_TS)
-	case TS_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_TSSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_TSSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_SDIO)
-	case SDIO_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_SDIOSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_SDIOSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_TDM)
-	case TDM_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_RESET(POWER_MNG_CTRL_REG, PMC_TDMSTOPCLOCK_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_SET(POWER_MNG_CTRL_REG, PMC_TDMSTOPCLOCK_MASK);
-		}
-		break;
-#endif
-
-	default:
-
-		break;
-
-	}
-}
-
-/*******************************************************************************
-* mvCtrlPwrClckGet - Get Power State of specific Unit
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-******************************************************************************/
-MV_BOOL		mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index)
-{
-	MV_U32 reg = MV_REG_READ(POWER_MNG_CTRL_REG);
-	MV_BOOL state = MV_TRUE;
-
-	switch (unitId)
-    {
-#if defined(MV_INCLUDE_PEX)
-	case PEX_UNIT_ID:
-		if ((reg & PMC_PEXSTOPCLOCK_MASK) == PMC_PEXSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-
-		break;
-#endif
-#if defined(MV_INCLUDE_GIG_ETH)
-	case ETH_GIG_UNIT_ID:
-		if ((reg & PMC_GESTOPCLOCK_MASK(index)) == PMC_GESTOPCLOCK_STOP(index))
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_SATA)
-	case SATA_UNIT_ID:
-		if ((reg & PMC_SATASTOPCLOCK_MASK(index)) == PMC_SATASTOPCLOCK_STOP(index))
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_CESA)
-	case CESA_UNIT_ID:
-		if ((reg & PMC_SESTOPCLOCK_MASK) == PMC_SESTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_USB)
-	case USB_UNIT_ID:
-		if ((reg & PMC_USBSTOPCLOCK_MASK) == PMC_USBSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-	case AUDIO_UNIT_ID:
-		if ((reg & PMC_AUDIOSTOPCLOCK_MASK) == PMC_AUDIOSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_TS)
-	case TS_UNIT_ID:
-		if ((reg & PMC_TSSTOPCLOCK_MASK) == PMC_TSSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_SDIO)
-	case SDIO_UNIT_ID:
-		if ((reg & PMC_SDIOSTOPCLOCK_MASK)== PMC_SDIOSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_TDM)
-	case TDM_UNIT_ID:
-		if ((reg & PMC_TDMSTOPCLOCK_MASK) == PMC_TDMSTOPCLOCK_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-
-	default:
-		state = MV_TRUE;
-		break;
-	}
-
-
-	return state;	
-}
-/*******************************************************************************
-* mvCtrlPwrMemSet - Set Power State for memory on specific Unit
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*******************************************************************************/
-MV_VOID   mvCtrlPwrMemSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable)
-{
-	switch (unitId)
-    {
-#if defined(MV_INCLUDE_PEX)
-	case PEX_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_PEXSTOPMEM_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_PEXSTOPMEM_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_GIG_ETH)
-	case ETH_GIG_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_GESTOPMEM_MASK(index));
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_GESTOPMEM_MASK(index));
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_INTEG_SATA)
-	case SATA_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_SATASTOPMEM_MASK(index));
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_SATASTOPMEM_MASK(index));
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_CESA)
-	case CESA_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_SESTOPMEM_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_SESTOPMEM_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_USB)
-	case USB_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_USBSTOPMEM_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_USBSTOPMEM_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-	case AUDIO_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_AUDIOSTOPMEM_MASK);
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_AUDIOSTOPMEM_MASK);
-		}
-		break;
-#endif
-#if defined(MV_INCLUDE_XOR)
-	case XOR_UNIT_ID:
-		if (enable == MV_FALSE)
-		{
-			MV_REG_BIT_SET(POWER_MNG_MEM_CTRL_REG, PMC_XORSTOPMEM_MASK(index));
-		}
-		else
-		{
-			MV_REG_BIT_RESET(POWER_MNG_MEM_CTRL_REG, PMC_XORSTOPMEM_MASK(index));
-		}
-		break;
-#endif
-	default:
-
-		break;
-
-	}
-}
-
-/*******************************************************************************
-* mvCtrlPwrMemGet - Get Power State of memory on specific Unit
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-******************************************************************************/
-MV_BOOL		mvCtrlPwrMemGet(MV_UNIT_ID unitId, MV_U32 index)
-{
-	MV_U32 reg = MV_REG_READ(POWER_MNG_MEM_CTRL_REG);
-	MV_BOOL state = MV_TRUE;
-
-	switch (unitId)
-    {
-#if defined(MV_INCLUDE_PEX)
-	case PEX_UNIT_ID:
-		if ((reg & PMC_PEXSTOPMEM_MASK) == PMC_PEXSTOPMEM_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-
-		break;
-#endif
-#if defined(MV_INCLUDE_GIG_ETH)
-	case ETH_GIG_UNIT_ID:
-		if ((reg & PMC_GESTOPMEM_MASK(index)) == PMC_GESTOPMEM_STOP(index))
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_SATA)
-	case SATA_UNIT_ID:
-		if ((reg & PMC_SATASTOPMEM_MASK(index)) == PMC_SATASTOPMEM_STOP(index))
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_CESA)
-	case CESA_UNIT_ID:
-		if ((reg & PMC_SESTOPMEM_MASK) == PMC_SESTOPMEM_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_USB)
-	case USB_UNIT_ID:
-		if ((reg & PMC_USBSTOPMEM_MASK) == PMC_USBSTOPMEM_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-	case AUDIO_UNIT_ID:
-		if ((reg & PMC_AUDIOSTOPMEM_MASK) == PMC_AUDIOSTOPMEM_STOP)
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-#if defined(MV_INCLUDE_XOR)
-	case XOR_UNIT_ID:
-		if ((reg & PMC_XORSTOPMEM_MASK(index)) == PMC_XORSTOPMEM_STOP(index))
-		{
-			state = MV_FALSE;
-		}
-		else state = MV_TRUE;
-		break;
-#endif
-
-	default:
-		state = MV_TRUE;
-		break;
-	}
-
-
-	return state;	
-}
-#else
-MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable) {return;}
-MV_BOOL	  mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index) {return MV_TRUE;}
-#endif /* #if defined(MV_INCLUDE_CLK_PWR_CNTRL) */
-
-
-/*******************************************************************************
-* mvMPPConfigToSPI - Change MPP[3:0] configuration to SPI mode
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-******************************************************************************/
-MV_VOID   mvMPPConfigToSPI(MV_VOID)
-{
-	MV_U32 mppVal = 0;
-	MV_U32 bootVal = 0;
-
-    if(!mvCtrlIsBootFromSPIUseNAND())
-        return;
-    mppVal = 0x00002220; /* Set MPP [3:1] to SPI mode */
-    bootVal = MV_REG_READ(mvCtrlMppRegGet(0));
-    bootVal &= 0xffff000f;
-        mppVal |= bootVal;
-    
-    MV_REG_WRITE(mvCtrlMppRegGet(0), mppVal);
-}
-
-
-/*******************************************************************************
-* mvMPPConfigToDefault - Change MPP[7:0] configuration to default configuration
-*
-* DESCRIPTION:		
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-******************************************************************************/
-MV_VOID   mvMPPConfigToDefault(MV_VOID)
-{
-	MV_U32 mppVal = 0;
-	MV_U32 bootVal = 0;
-
-    if(!mvCtrlIsBootFromSPIUseNAND())
-        return;
-    mppVal = mvBoardMppGet(0);
-    bootVal = MV_REG_READ(mvCtrlMppRegGet(0));
-    mppVal &= ~0xffff000f;
-    bootVal &= 0xffff000f;
-        mppVal |= bootVal;
-    
-    MV_REG_WRITE(mvCtrlMppRegGet(0), mppVal);
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h
deleted file mode 100644
index 6e2e8137a7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvLib.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCtrlEnvLibh
-#define __INCmvCtrlEnvLibh
-
-/* includes */
-#include "mvSysHwConfig.h"
-#include "mvCommon.h"
-#include "mvTypes.h"
-#include "mvOs.h"
-#include "boardEnv/mvBoardEnvLib.h"			
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "ctrlEnv/mvCtrlEnvRegs.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-
-/* typedefs */
-
-/* This enumerator describes the possible HW cache coherency policies the   */
-/* controllers supports.                                                    */
-typedef enum _mvCachePolicy
-{
-    NO_COHERENCY,   /* No HW cache coherency support                        */
-    WT_COHERENCY,   /* HW cache coherency supported in Write Through policy */
-    WB_COHERENCY    /* HW cache coherency supported in Write Back policy    */   
-}MV_CACHE_POLICY;
-
-
-/* The swapping is referred to a 64-bit words (as this is the controller    */
-/* internal data path width). This enumerator describes the possible        */
-/* data swap types. Below is an example of the data 0x0011223344556677      */
-typedef enum _mvSwapType
-{
-    MV_BYTE_SWAP,       /* Byte Swap                77 66 55 44 33 22 11 00 */             
-    MV_NO_SWAP,         /* No swapping              00 11 22 33 44 55 66 77 */
-    MV_BYTE_WORD_SWAP,  /* Both byte and word swap  33 22 11 00 77 66 55 44 */
-    MV_WORD_SWAP,       /* Word swap                44 55 66 77 00 11 22 33 */
-    SWAP_TYPE_MAX	/* Delimiter for this enumerator					*/
-}MV_SWAP_TYPE;
-
-/* This structure describes access rights for Access protection windows     */
-/* that can be found in IDMA, XOR, Ethernet and MPSC units.                 */
-/* Note that the permission enumerator coresponds to its register format.   */
-/* For example, Read only premission is presented as "1" in register field. */
-typedef enum _mvAccessRights
-{
-    	NO_ACCESS_ALLOWED = 0,  /* No access allowed            */
-    	READ_ONLY         = 1,  /* Read only permission         */
-	ACC_RESERVED	  = 2,	/* Reserved access right		*/
-    	FULL_ACCESS       = 3,  /* Read and Write permission    */
-	MAX_ACC_RIGHTS
-}MV_ACCESS_RIGHTS;
-
-
-/* mcspLib.h API list */
-
-MV_STATUS mvCtrlEnvInit(MV_VOID);
-MV_U32    mvCtrlMppRegGet(MV_U32 mppGroup);
-
-#if defined(MV_INCLUDE_PEX)
-MV_U32	  mvCtrlPexMaxIfGet(MV_VOID);
-#else
-#define   mvCtrlPexMaxIfGet()	(0)
-#endif
-
-#define   mvCtrlPciIfMaxIfGet()	(0)
-
-#if defined(MV_INCLUDE_GIG_ETH) 
-MV_U32	  mvCtrlEthMaxPortGet(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_XOR)
-MV_U32 mvCtrlXorMaxChanGet(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_USB)
-MV_U32 	  mvCtrlUsbMaxGet(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_NAND)
-MV_U32	  mvCtrlNandSupport(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_SDIO)
-MV_U32	  mvCtrlSdioSupport(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_TS)
-MV_U32	  mvCtrlTsSupport(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_AUDIO)
-MV_U32	  mvCtrlAudioSupport(MV_VOID);
-#endif
-#if defined(MV_INCLUDE_TDM)
-MV_U32	  mvCtrlTdmSupport(MV_VOID);
-#endif
-
-MV_U16    mvCtrlModelGet(MV_VOID);
-MV_U8     mvCtrlRevGet(MV_VOID);
-MV_STATUS mvCtrlNameGet(char *pNameBuff);
-MV_U32    mvCtrlModelRevGet(MV_VOID);
-MV_STATUS mvCtrlModelRevNameGet(char *pNameBuff);
-MV_VOID   mvCtrlAddrDecShow(MV_VOID);
-const MV_8* mvCtrlTargetNameGet(MV_TARGET target);
-MV_U32	  ctrlSizeToReg(MV_U32 size, MV_U32 alignment);
-MV_U32	  ctrlRegToSize(MV_U32 regSize, MV_U32 alignment);
-MV_U32	  ctrlSizeRegRoundUp(MV_U32 size, MV_U32 alignment);
-MV_U32	  mvCtrlSysRstLengthCounterGet(MV_VOID);
-MV_STATUS ctrlWinOverlapTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2);
-MV_STATUS ctrlWinWithinWinTest(MV_ADDR_WIN *pAddrWin1, MV_ADDR_WIN *pAddrWin2);
-
-MV_VOID   mvCtrlPwrClckSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable);
-MV_BOOL	  mvCtrlPwrClckGet(MV_UNIT_ID unitId, MV_U32 index);
-MV_VOID   mvCtrlPwrMemSet(MV_UNIT_ID unitId, MV_U32 index, MV_BOOL enable);
-MV_BOOL	  mvCtrlIsBootFromSPI(MV_VOID);
-MV_BOOL	  mvCtrlIsBootFromSPIUseNAND(MV_VOID);
-MV_BOOL	  mvCtrlIsBootFromNAND(MV_VOID);
-#if defined(MV_INCLUDE_CLK_PWR_CNTRL)
-MV_VOID   mvCtrlPwrSaveOn(MV_VOID);
-MV_VOID   mvCtrlPwrSaveOff(MV_VOID);
-#endif
-MV_BOOL	  mvCtrlPwrMemGet(MV_UNIT_ID unitId, MV_U32 index);
-MV_VOID   mvMPPConfigToSPI(MV_VOID);
-MV_VOID   mvMPPConfigToDefault(MV_VOID);
-
-
-#endif /* __INCmvCtrlEnvLibh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h
deleted file mode 100644
index ae3f141a0d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvRegs.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvCtrlEnvRegsh
-#define __INCmvCtrlEnvRegsh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* CV Support */
-#define PEX0_MEM0 	PEX0_MEM
-#define PCI0_MEM0	PEX0_MEM
-
-/* Controller revision info */
-#define PCI_CLASS_CODE_AND_REVISION_ID			    0x008
-#define PCCRIR_REVID_OFFS				    0		/* Revision ID */
-#define PCCRIR_REVID_MASK				    (0xff << PCCRIR_REVID_OFFS)
-
-/* Controler environment registers offsets */
-
-/* Power Managment Control */
-#define POWER_MNG_MEM_CTRL_REG			0x20118
-
-#define PMC_GESTOPMEM_OFFS(port)		((port)? 13 : 0)
-#define PMC_GESTOPMEM_MASK(port)		(1 << PMC_GESTOPMEM_OFFS(port))
-#define PMC_GESTOPMEM_EN(port)			(0 << PMC_GESTOPMEM_OFFS(port))
-#define PMC_GESTOPMEM_STOP(port)		(1 << PMC_GESTOPMEM_OFFS(port))
-
-#define PMC_PEXSTOPMEM_OFFS			1
-#define PMC_PEXSTOPMEM_MASK			(1 << PMC_PEXSTOPMEM_OFFS)
-#define PMC_PEXSTOPMEM_EN			(0 << PMC_PEXSTOPMEM_OFFS)
-#define PMC_PEXSTOPMEM_STOP			(1 << PMC_PEXSTOPMEM_OFFS)
-
-#define PMC_USBSTOPMEM_OFFS			2
-#define PMC_USBSTOPMEM_MASK			(1 << PMC_USBSTOPMEM_OFFS)
-#define PMC_USBSTOPMEM_EN			(0 << PMC_USBSTOPMEM_OFFS)
-#define PMC_USBSTOPMEM_STOP			(1 << PMC_USBSTOPMEM_OFFS)
-
-#define PMC_DUNITSTOPMEM_OFFS			3
-#define PMC_DUNITSTOPMEM_MASK			(1 << PMC_DUNITSTOPMEM_OFFS)
-#define PMC_DUNITSTOPMEM_EN			(0 << PMC_DUNITSTOPMEM_OFFS)
-#define PMC_DUNITSTOPMEM_STOP			(1 << PMC_DUNITSTOPMEM_OFFS)
-
-#define PMC_RUNITSTOPMEM_OFFS			4
-#define PMC_RUNITSTOPMEM_MASK			(1 << PMC_RUNITSTOPMEM_OFFS)
-#define PMC_RUNITSTOPMEM_EN			(0 << PMC_RUNITSTOPMEM_OFFS)
-#define PMC_RUNITSTOPMEM_STOP			(1 << PMC_RUNITSTOPMEM_OFFS)
-
-#define PMC_XORSTOPMEM_OFFS(port)		(5+(port*2))
-#define PMC_XORSTOPMEM_MASK(port)		(1 << PMC_XORSTOPMEM_OFFS(port))
-#define PMC_XORSTOPMEM_EN(port)			(0 << PMC_XORSTOPMEM_OFFS(port))
-#define PMC_XORSTOPMEM_STOP(port)		(1 << PMC_XORSTOPMEM_OFFS(port))
-
-#define PMC_SATASTOPMEM_OFFS(port)		(6+(port*5))
-#define PMC_SATASTOPMEM_MASK(port)		(1 << PMC_SATASTOPMEM_OFFS(port))
-#define PMC_SATASTOPMEM_EN(port)		(0 << PMC_SATASTOPMEM_OFFS(port))
-#define PMC_SATASTOPMEM_STOP(port)		(1 << PMC_SATASTOPMEM_OFFS(port))
-
-#define PMC_SESTOPMEM_OFFS			8
-#define PMC_SESTOPMEM_MASK			(1 << PMC_SESTOPMEM_OFFS)
-#define PMC_SESTOPMEM_EN			(0 << PMC_SESTOPMEM_OFFS)
-#define PMC_SESTOPMEM_STOP			(1 << PMC_SESTOPMEM_OFFS)
-
-#define PMC_AUDIOSTOPMEM_OFFS			9
-#define PMC_AUDIOSTOPMEM_MASK			(1 << PMC_AUDIOSTOPMEM_OFFS)
-#define PMC_AUDIOSTOPMEM_EN			(0 << PMC_AUDIOSTOPMEM_OFFS)
-#define PMC_AUDIOSTOPMEM_STOP			(1 << PMC_AUDIOSTOPMEM_OFFS)
-
-#define POWER_MNG_CTRL_REG			0x2011C
-
-#define PMC_GESTOPCLOCK_OFFS(port)		((port)? 19 : 0)
-#define PMC_GESTOPCLOCK_MASK(port)		(1 << PMC_GESTOPCLOCK_OFFS(port))
-#define PMC_GESTOPCLOCK_EN(port)		(1 << PMC_GESTOPCLOCK_OFFS(port))
-#define PMC_GESTOPCLOCK_STOP(port)		(0 << PMC_GESTOPCLOCK_OFFS(port))
-
-#define PMC_PEXPHYSTOPCLOCK_OFFS		1
-#define PMC_PEXPHYSTOPCLOCK_MASK		(1 << PMC_PEXPHYSTOPCLOCK_OFFS)
-#define PMC_PEXPHYSTOPCLOCK_EN			(1 << PMC_PEXPHYSTOPCLOCK_OFFS)
-#define PMC_PEXPHYSTOPCLOCK_STOP		(0 << PMC_PEXPHYSTOPCLOCK_OFFS)
-
-#define PMC_PEXSTOPCLOCK_OFFS			2
-#define PMC_PEXSTOPCLOCK_MASK			(1 << PMC_PEXSTOPCLOCK_OFFS)
-#define PMC_PEXSTOPCLOCK_EN			(1 << PMC_PEXSTOPCLOCK_OFFS)
-#define PMC_PEXSTOPCLOCK_STOP			(0 << PMC_PEXSTOPCLOCK_OFFS)
-
-#define PMC_USBSTOPCLOCK_OFFS			3
-#define PMC_USBSTOPCLOCK_MASK			(1 << PMC_USBSTOPCLOCK_OFFS)
-#define PMC_USBSTOPCLOCK_EN			(1 << PMC_USBSTOPCLOCK_OFFS)
-#define PMC_USBSTOPCLOCK_STOP			(0 << PMC_USBSTOPCLOCK_OFFS)
-
-#define PMC_SDIOSTOPCLOCK_OFFS			4
-#define PMC_SDIOSTOPCLOCK_MASK			(1 << PMC_SDIOSTOPCLOCK_OFFS)
-#define PMC_SDIOSTOPCLOCK_EN			(1 << PMC_SDIOSTOPCLOCK_OFFS)
-#define PMC_SDIOSTOPCLOCK_STOP			(0 << PMC_SDIOSTOPCLOCK_OFFS)
-
-#define PMC_TSSTOPCLOCK_OFFS			5
-#define PMC_TSSTOPCLOCK_MASK			(1 << PMC_TSSTOPCLOCK_OFFS)
-#define PMC_TSSTOPCLOCK_EN			(1 << PMC_TSSTOPCLOCK_OFFS)
-#define PMC_TSSTOPCLOCK_STOP			(0 << PMC_TSSTOPCLOCK_OFFS)
-
-#define PMC_AUDIOSTOPCLOCK_OFFS			9
-#define PMC_AUDIOSTOPCLOCK_MASK			(1 << PMC_AUDIOSTOPCLOCK_OFFS)
-#define PMC_AUDIOSTOPCLOCK_EN			(1 << PMC_AUDIOSTOPCLOCK_OFFS)
-#define PMC_AUDIOSTOPCLOCK_STOP			(0 << PMC_AUDIOSTOPCLOCK_OFFS)
-
-#define PMC_POWERSAVE_OFFS			11
-#define PMC_POWERSAVE_MASK			(1 << PMC_POWERSAVE_OFFS)
-#define PMC_POWERSAVE_EN			(1 << PMC_POWERSAVE_OFFS)
-#define PMC_POWERSAVE_STOP			(0 << PMC_POWERSAVE_OFFS)
-
-
-
-
-#define PMC_SATASTOPCLOCK_OFFS(port)		(14+(port))
-#define PMC_SATASTOPCLOCK_MASK(port)		(1 << PMC_SATASTOPCLOCK_OFFS(port))
-#define PMC_SATASTOPCLOCK_EN(port)		(1 << PMC_SATASTOPCLOCK_OFFS(port))
-#define PMC_SATASTOPCLOCK_STOP(port)		(0 << PMC_SATASTOPCLOCK_OFFS(port))
-
-#define PMC_SESTOPCLOCK_OFFS			17
-#define PMC_SESTOPCLOCK_MASK			(1 << PMC_SESTOPCLOCK_OFFS)
-#define PMC_SESTOPCLOCK_EN			(1 << PMC_SESTOPCLOCK_OFFS)
-#define PMC_SESTOPCLOCK_STOP			(0 << PMC_SESTOPCLOCK_OFFS)
-
-#define PMC_TDMSTOPCLOCK_OFFS			20
-#define PMC_TDMSTOPCLOCK_MASK			(1 << PMC_TDMSTOPCLOCK_OFFS)
-#define PMC_TDMSTOPCLOCK_EN			(1 << PMC_TDMSTOPCLOCK_OFFS)
-#define PMC_TDMSTOPCLOCK_STOP			(0 << PMC_TDMSTOPCLOCK_OFFS)
-
-
-/* Controler environment registers offsets */
-#define MPP_CONTROL_REG0			0x10000
-#define MPP_CONTROL_REG1			0x10004
-#define MPP_CONTROL_REG2			0x10008
-#define MPP_CONTROL_REG3			0x1000C
-#define MPP_CONTROL_REG4			0x10010
-#define MPP_CONTROL_REG5			0x10014
-#define MPP_CONTROL_REG6			0x10018
-#define MPP_SAMPLE_AT_RESET			0x10030
-#define CHIP_BOND_REG				0x10034
-#define SYSRST_LENGTH_COUNTER_REG		0x10050
-#define SLCR_COUNT_OFFS				0
-#define SLCR_COUNT_MASK				(0x1FFFFFFF << SLCR_COUNT_OFFS)
-#define SLCR_CLR_OFFS				31
-#define SLCR_CLR_MASK				(1 << SLCR_CLR_OFFS)			
-#define PCKG_OPT_MASK				0x3
-#define MPP_OUTPUT_DRIVE_REG			0x100E0
-#define MPP_RGMII0_OUTPUT_DRIVE_OFFS            7
-#define MPP_3_3_RGMII0_OUTPUT_DRIVE		(0x0 << MPP_RGMII0_OUTPUT_DRIVE_OFFS)
-#define MPP_1_8_RGMII0_OUTPUT_DRIVE		(0x1 << MPP_RGMII0_OUTPUT_DRIVE_OFFS)
-#define MPP_RGMII1_OUTPUT_DRIVE_OFFS            15
-#define MPP_3_3_RGMII1_OUTPUT_DRIVE		(0x0 << MPP_RGMII1_OUTPUT_DRIVE_OFFS)
-#define MPP_1_8_RGMII1_OUTPUT_DRIVE		(0x1 << MPP_RGMII1_OUTPUT_DRIVE_OFFS)
-
-#define MSAR_BOOT_MODE_OFFS                     12
-#define MSAR_BOOT_MODE_MASK                     (0x7 << MSAR_BOOT_MODE_OFFS)
-#define MSAR_BOOT_NAND_WITH_BOOTROM		        (0x5 << MSAR_BOOT_MODE_OFFS)
-#define MSAR_BOOT_SPI_WITH_BOOTROM              (0x4 << MSAR_BOOT_MODE_OFFS)
-#define MSAR_BOOT_SPI_USE_NAND_WITH_BOOTROM		(0x2 << MSAR_BOOT_MODE_OFFS)
-
-#define MSAR_BOOT_MODE_6180(X)                  (((X & 0x3000) >> 12) | \
-                                                ((X & 0x2) << 1))
-#define MSAR_BOOT_SPI_WITH_BOOTROM_6180         0x1
-#define MSAR_BOOT_NAND_WITH_BOOTROM_6180        0x5
-
-#define MSAR_TCLCK_OFFS				21
-#define MSAR_TCLCK_MASK				(0x1 << MSAR_TCLCK_OFFS)
-#define MSAR_TCLCK_166				(0x1 << MSAR_TCLCK_OFFS)
-#define MSAR_TCLCK_200				(0x0 << MSAR_TCLCK_OFFS)
-
-
-#define MSAR_CPUCLCK_EXTRACT(X)     (((X & 0x2) >> 1) | ((X & 0x400000) >> 21) | \
-                                    ((X & 0x18) >> 1))
-
-#define MSAR_CPUCLCK_OFFS_6180		2
-#define MSAR_CPUCLCK_MASK_6180		(0x7 << MSAR_CPUCLCK_OFFS_6180)
-
-#define MSAR_DDRCLCK_RTIO_OFFS		5
-#define MSAR_DDRCLCK_RTIO_MASK		(0xF << MSAR_DDRCLCK_RTIO_OFFS)
-
-#define MSAR_L2CLCK_EXTRACT(X)      (((X & 0x600) >> 9) | ((X & 0x80000) >> 17))
-
-#ifndef MV_ASMLANGUAGE
-/* CPU clock for 6281,6192  0->Resereved */
-#define MV_CPU_CLCK_TBL { 	0,		0, 		0, 		0,	\
-			     	600000000, 	0,		800000000,	1000000000,	\
-			     	0,	 	1200000000,	0,		0,		\
-			     	1500000000,	0,		0,		0}
-
-/* DDR clock RATIO for 6281,6192 {0,0}->Reserved */
-#define MV_DDR_CLCK_RTIO_TBL	{\
-	{0, 0}, {0, 0}, {2, 1}, {0, 0}, \
-	{3, 1}, {0, 0}, {4, 1}, {9, 2}, \
-	{5, 1}, {6, 1}, {0, 0}, {0, 0}, \
-	{0, 0}, {0, 0}, {0, 0}, {0, 0} \
-}
-
-/* L2 clock RATIO for 6281,6192 {1,1}->Reserved */
-#define MV_L2_CLCK_RTIO_TBL	{\
-	{0, 0}, {2, 1}, {0, 0}, {3, 1}, \
-	{0, 0}, {0, 0}, {0, 0}, {0, 0} \
-}
-
-/* 6180 have different clk reset sampling 		*/
-/* ARM CPU, DDR, L2 clock for 6180 {0,0,0}->Reserved 	*/
-#define MV_CPU6180_DDR_L2_CLCK_TBL    { \
-	{0,   		0,   		0		},\
-	{0,   		0,   		0		},\
-	{0,   		0,   		0		},\
-	{0,   		0,   		0		},\
-	{0,   		0,   		0		},\
-	{600000000, 	200000000, 	300000000	},\
-	{800000000, 	200000000, 	400000000	},\
-	{0,   		0,   		0		}\
-}
-
-
-
-/* These macros help units to identify a target Mbus Arbiter group */
-#define MV_TARGET_IS_DRAM(target)   \
-                            ((target >= SDRAM_CS0) && (target <= SDRAM_CS3))
-
-#define MV_TARGET_IS_PEX0(target)   \
-                            ((target >= PEX0_MEM) && (target <= PEX0_IO))
-
-#define MV_TARGET_IS_PEX1(target)   0
-
-#define MV_TARGET_IS_PEX(target) (MV_TARGET_IS_PEX0(target) || MV_TARGET_IS_PEX1(target))
-
-#define MV_TARGET_IS_DEVICE(target) \
-                            ((target >= DEVICE_CS0) && (target <= DEVICE_CS3))
-
-#define MV_PCI_DRAM_BAR_TO_DRAM_TARGET(bar)   0
-
-#define	MV_TARGET_IS_AS_BOOT(target) ((target) == (sampleAtResetTargetArray[ \
-                     (mvCtrlModelGet() == MV_6180_DEV_ID)? MSAR_BOOT_MODE_6180 \
-                     (MV_REG_READ(MPP_SAMPLE_AT_RESET)):((MV_REG_READ(MPP_SAMPLE_AT_RESET)\
-						 & MSAR_BOOT_MODE_MASK) >> MSAR_BOOT_MODE_OFFS)]))
-
-
-#define MV_CHANGE_BOOT_CS(target)	(((target) == DEV_BOOCS)?\
-					sampleAtResetTargetArray[(mvCtrlModelGet() == MV_6180_DEV_ID)? \
-                    MSAR_BOOT_MODE_6180(MV_REG_READ(MPP_SAMPLE_AT_RESET)): \
-                    ((MV_REG_READ(MPP_SAMPLE_AT_RESET) & MSAR_BOOT_MODE_MASK)\
-                     >> MSAR_BOOT_MODE_OFFS)]:(target))
-					
-#define TCLK_TO_COUNTER_RATIO   1   /* counters running in Tclk */
-
-#define BOOT_TARGETS_NAME_ARRAY {       \
-    TBL_TERM,         	\
-    TBL_TERM,         	\
-    BOOT_ROM_CS,          	\
-    TBL_TERM,         	\
-    BOOT_ROM_CS,          	\
-    BOOT_ROM_CS,          \
-    TBL_TERM,         	\
-    TBL_TERM           \
-}
-
-#define BOOT_TARGETS_NAME_ARRAY_6180 {       \
-    TBL_TERM,         	\
-    BOOT_ROM_CS,          	\
-    TBL_TERM,           \
-    TBL_TERM,           \
-    TBL_TERM,           \
-    BOOT_ROM_CS,          \
-    TBL_TERM,           \
-    TBL_TERM           \
-}
-
-
-/* For old competability */
-#define DEVICE_CS0		NFLASH_CS  
-#define DEVICE_CS1  		SPI_CS 
-#define DEVICE_CS2  		BOOT_ROM_CS 
-#define DEVICE_CS3  		DEV_BOOCS
-#define MV_BOOTDEVICE_INDEX   	0
-
-#define START_DEV_CS   		DEV_CS0
-#define DEV_TO_TARGET(dev)	((dev) + DEVICE_CS0)
-
-#define PCI_IF0_MEM0		PEX0_MEM
-#define PCI_IF0_IO		PEX0_IO
-
-
-/* This enumerator defines the Marvell controller target ID      */ 
-typedef enum _mvTargetId
-{
-    DRAM_TARGET_ID  = 0 ,    /* Port 0 -> DRAM interface         */
-    DEV_TARGET_ID   = 1,     /* Port 1 -> Nand/SPI 		*/
-    PEX0_TARGET_ID  = 4 ,    /* Port 4 -> PCI Express0 		*/
-    CRYPT_TARGET_ID = 3 ,    /* Port 3 --> Crypto Engine 	*/
-    SAGE_TARGET_ID = 12 ,    /* Port 12 -> SAGE Unit 	*/
-    MAX_TARGETS_ID
-}MV_TARGET_ID;
-
-
-/* This enumerator described the possible Controller paripheral targets.    */
-/* Controller peripherals are designated memory/IO address spaces that the  */
-/* controller can access. They are also refered as "targets"                */
-typedef enum _mvTarget
-{
-    TBL_TERM = -1, 	/* none valid target, used as targets list terminator*/
-    SDRAM_CS0,      	/* SDRAM chip select 0                          */  
-    SDRAM_CS1,      	/* SDRAM chip select 1                          */  
-    SDRAM_CS2,      	/* SDRAM chip select 2                          */  
-    SDRAM_CS3,      	/* SDRAM chip select 3                          */  
-    PEX0_MEM,		/* PCI Express 0 Memory				*/
-    PEX0_IO,		/* PCI Express 0 IO				*/
-    INTER_REGS,     	/* Internal registers                           */  
-    NFLASH_CS,     	/* NFLASH_CS					*/  
-    SPI_CS,     	/* SPI_CS					*/  
-    BOOT_ROM_CS,        /* BOOT_ROM_CS                                  */  
-    DEV_BOOCS,     	/* DEV_BOOCS					*/  
-    CRYPT_ENG,      	/* Crypto Engine				*/  
-#ifdef MV_INCLUDE_SAGE
-    SAGE_UNIT,      	/* SAGE Unit					*/  
-#endif
-    MAX_TARGETS
-
-}MV_TARGET;
-
-#define TARGETS_DEF_ARRAY	{			\
-    {0x0E, DRAM_TARGET_ID }, /* SDRAM_CS0 */		\
-    {0x0D, DRAM_TARGET_ID }, /* SDRAM_CS1 */		\
-    {0x0B, DRAM_TARGET_ID }, /* SDRAM_CS0 */		\
-    {0x07, DRAM_TARGET_ID }, /* SDRAM_CS1 */		\
-    {0xE8, PEX0_TARGET_ID }, /* PEX0_MEM */			\
-    {0xE0, PEX0_TARGET_ID }, /* PEX0_IO */			\
-    {0xFF, 0xFF           }, /* INTER_REGS */		\
-    {0x2F, DEV_TARGET_ID  },  /* NFLASH_CS */		\
-    {0x1E, DEV_TARGET_ID  },  /* SPI_CS */		 	\
-    {0x1D, DEV_TARGET_ID  },  /* BOOT_ROM_CS */     \
-    {0x1E, DEV_TARGET_ID  },  /* DEV_BOOCS */		\
-    {0x01, CRYPT_TARGET_ID}, /* CRYPT_ENG */        \
-    {0x00, SAGE_TARGET_ID }  						\
-}
-
-
-#define TARGETS_NAME_ARRAY	{	\
-    "SDRAM_CS0",    /* SDRAM_CS0 */	\
-    "SDRAM_CS1",    /* SDRAM_CS1 */	\
-    "SDRAM_CS2",    /* SDRAM_CS2 */	\
-    "SDRAM_CS3",    /* SDRAM_CS3 */	\
-    "PEX0_MEM",	    /* PEX0_MEM */	\
-    "PEX0_IO",	    /* PEX0_IO */	\
-    "INTER_REGS",   /* INTER_REGS */	\
-    "NFLASH_CS",    /* NFLASH_CS */	\
-    "SPI_CS",	    /* SPI_CS */	\
-    "BOOT_ROM_CS",  /* BOOT_ROM_CS */ \
-    "DEV_BOOTCS",   /* DEV_BOOCS */	\
-    "CRYPT_ENG",    /* CRYPT_ENG */  \
-    "SAGE_UNIT"	   /* SAGE_UNIT */	\
-}
-#endif /* MV_ASMLANGUAGE */
-
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h
deleted file mode 100644
index e41d80a426..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/mvCtrlEnvSpec.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvCtrlEnvSpech
-#define __INCmvCtrlEnvSpech
-
-#include "mvDeviceId.h"
-#include "mvSysHwConfig.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define MV_ARM_SOC
-#define SOC_NAME_PREFIX			"MV88F"
-
-
-/* units base and port numbers */
-#ifdef MV_ASMLANGUAGE
-#define XOR_UNIT_BASE(unit)           	0x60800
-#else
-#define MV_XOR_REG_BASE			0x60000
-#define XOR_UNIT_BASE(unit)           	((unit)? 0x60900:0x60800)
-#endif
-
-#define TDM_REG_BASE			0xD0000
-#define USB_REG_BASE(dev)       	0x50000
-#define AUDIO_REG_BASE  		0xA0000
-#define SATA_REG_BASE           	0x80000
-#define MV_CESA_REG_BASE                0x3D000
-#define MV_CESA_TDMA_REG_BASE		0x30000
-#define MV_SDIO_REG_BASE		0x90000
-#define MV_ETH_REG_BASE(port)      	(((port) == 0) ? 0x72000 : 0x76000)
-#define MV_UART_CHAN_BASE(chanNum)	(0x12000 + (chanNum * 0x100))
-#define DRAM_BASE			0x0
-#define CNTMR_BASE                  	0x20300
-#define TWSI_SLAVE_BASE(chanNum)    	0x11000
-#define PEX_IF_BASE(pexIf)      	0x40000
-#define MPP_REG_BASE			0x10000
-#define TSU_GLOBAL_REG_BASE             0xB4000
-#define MAX_AHB_TO_MBUS_REG_BASE	0x20000
-
-#define INTER_REGS_SIZE	 	 	_1M
-/* This define describes the TWSI interrupt bit and location */
-#define TWSI_CPU_MAIN_INT_CAUSE_REG		0x20200
-#define TWSI0_CPU_MAIN_INT_BIT			(1<<29)
-#define TWSI_SPEED				100000
-
-#define MV_GPP_MAX_GROUP    		2
-#define MV_CNTMR_MAX_COUNTER 		2
-#define MV_UART_MAX_CHAN		2
-#define MV_XOR_MAX_UNIT         	2
-#define MV_XOR_MAX_CHAN         	4 /* total channels for all units together*/
-#define MV_XOR_MAX_CHAN_PER_UNIT       	2 /* channels for units */
-#define MV_SATA_MAX_CHAN	 	2
-
-#define MV_6281_MPP_MAX_MODULE    	2
-#define MV_6192_MPP_MAX_MODULE    	1
-#define MV_6190_MPP_MAX_MODULE    	1
-#define MV_6180_MPP_MAX_MODULE    	2
-#define MV_6281_MPP_MAX_GROUP    	7
-#define MV_6192_MPP_MAX_GROUP    	4
-#define MV_6190_MPP_MAX_GROUP    	4
-#define MV_6180_MPP_MAX_GROUP    	3
-
-#define MV_DRAM_MAX_CS      		4
-
-/* This define describes the maximum number of supported PCI\PCIX Interfaces*/
-#define MV_PCI_MAX_IF		0
-#define MV_PCI_START_IF		0
-
-/* This define describes the maximum number of supported PEX Interfaces 	*/
-#define MV_INCLUDE_PEX0
-#define MV_DISABLE_PEX_DEVICE_BAR 
-#define MV_PEX_MAX_IF		1
-#define MV_PEX_START_IF		MV_PCI_MAX_IF
-
-/* This define describes the maximum number of supported PCI Interfaces 	*/
-#define MV_PCI_IF_MAX_IF   	(MV_PEX_MAX_IF+MV_PCI_MAX_IF)
-
-#define MV_ETH_MAX_PORTS		2
-#define MV_6281_ETH_MAX_PORTS	   	2
-#define MV_6192_ETH_MAX_PORTS	   	2
-#define MV_6190_ETH_MAX_PORTS	   	1
-#define MV_6180_ETH_MAX_PORTS	   	1
-
-#define MV_IDMA_MAX_CHAN    		0
-
-#define MV_USB_MAX_PORTS		1
-
-#define MV_USB_VERSION              1
-
-
-#define MV_6281_NAND			1
-#define MV_6192_NAND			1
-#define MV_6190_NAND			1
-#define MV_6180_NAND			0
-
-#define MV_6281_SDIO			1
-#define MV_6192_SDIO			1
-#define MV_6190_SDIO			1
-#define MV_6180_SDIO			1
-
-#define MV_6281_TS			1
-#define MV_6192_TS			1
-#define MV_6190_TS			0
-#define MV_6180_TS			0
-
-#define MV_6281_AUDIO			1
-#define MV_6192_AUDIO			1
-#define MV_6190_AUDIO			0
-#define MV_6180_AUDIO			1
-
-#define MV_6281_TDM			1
-#define MV_6192_TDM			1
-#define MV_6190_TDM			0
-#define MV_6180_TDM			0
-
-#define MV_DEVICE_MAX_CS      		4
-
-/* Others */
-#define PEX_HOST_BUS_NUM(pciIf)		(pciIf)
-#define PEX_HOST_DEV_NUM(pciIf)		0
-
-#define PCI_IO(pciIf)		(PEX0_IO)
-#define PCI_MEM(pciIf, memNum)  (PEX0_MEM0)
-/* CESA version #2: One channel, 2KB SRAM, TDMA */
-#if defined(MV_CESA_CHAIN_MODE_SUPPORT)
-	#define MV_CESA_VERSION		 	3
-#else
-#define MV_CESA_VERSION		 	2
-#endif
-#define MV_CESA_SRAM_SIZE               2*1024
-/* This define describes the maximum number of supported Ethernet ports 	*/
-#define MV_ETH_VERSION 			4
-#define MV_ETH_MAX_RXQ              	8
-#define MV_ETH_MAX_TXQ              	8
-#define MV_ETH_PORT_SGMII          	{ MV_FALSE, MV_FALSE }
-/* This define describes the the support of USB 	*/
-#define MV_USB_VERSION  		1
-
-#define MV_INCLUDE_SDRAM_CS0
-#define MV_INCLUDE_SDRAM_CS1
-#define MV_INCLUDE_SDRAM_CS2
-#define MV_INCLUDE_SDRAM_CS3
-
-#define MV_INCLUDE_DEVICE_CS0
-#define MV_INCLUDE_DEVICE_CS1
-#define MV_INCLUDE_DEVICE_CS2
-#define MV_INCLUDE_DEVICE_CS3
-
-#define MPP_GROUP_1_TYPE {\
-	{0, 0, 0}, /* Reserved for AUTO */ \
-	{0x22220000, 0x22222222, 0x2222}, /* TDM */ \
-	{0x44440000, 0x00044444, 0x0000}, /* AUDIO */ \
-	{0x33330000, 0x33003333, 0x0033}, /* RGMII */ \
-	{0x33330000, 0x03333333, 0x0033}, /* GMII */ \
-	{0x11110000, 0x11111111, 0x0001}, /* TS */ \
-	{0x33330000, 0x33333333, 0x3333}  /* MII */ \
-}
-
-#define MPP_GROUP_2_TYPE {\
-	{0, 0, 0}, /* Reserved for AUTO */ \
-	{0x22220000, 0x22222222, 0x22}, /* TDM */ \
-	{0x44440000, 0x00044444, 0x0}, /* AUDIO */ \
-	{0, 0, 0}, /* N_A */ \
-	{0, 0, 0}, /* N_A */ \
-	{0x11110000, 0x11111111, 0x01}  /* TS */ \
-}
-
-#ifndef MV_ASMLANGUAGE
-
-/* This enumerator defines the Marvell Units ID      */ 
-typedef enum _mvUnitId
-{
-    DRAM_UNIT_ID,
-    PEX_UNIT_ID,
-    ETH_GIG_UNIT_ID,
-    USB_UNIT_ID,
-    IDMA_UNIT_ID,
-    XOR_UNIT_ID,
-    SATA_UNIT_ID,
-    TDM_UNIT_ID,
-    UART_UNIT_ID,
-    CESA_UNIT_ID,
-    SPI_UNIT_ID,
-    AUDIO_UNIT_ID,
-    SDIO_UNIT_ID,
-    TS_UNIT_ID,
-    MAX_UNITS_ID
-
-}MV_UNIT_ID;
-
-#endif
-
-#endif /* __INCmvCtrlEnvSpech */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c
deleted file mode 100644
index d21bb074d2..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.c
+++ /dev/null
@@ -1,1048 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-#include "ctrlEnv/sys/mvAhbToMbus.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-#undef MV_DEBUG
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif
-
-/* typedefs */
-
-
-/* CPU address remap registers offsets are inconsecutive. This struct 		*/
-/* describes address remap register offsets									*/
-typedef struct _ahbToMbusRemapRegOffs
-{
-    MV_U32 lowRegOffs;		/* Low 32-bit remap register offset			*/
-    MV_U32 highRegOffs;		/* High 32 bit remap register offset		*/
-}AHB_TO_MBUS_REMAP_REG_OFFS;
-
-/* locals   */
-static MV_STATUS ahbToMbusRemapRegOffsGet	(MV_U32 winNum,
-										AHB_TO_MBUS_REMAP_REG_OFFS *pRemapRegs);
-
-/*******************************************************************************
-* mvAhbToMbusInit - Initialize Ahb To Mbus Address Map !
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK laways.
-*
-*******************************************************************************/
-MV_STATUS mvAhbToMbusInit(void)
-{
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvAhbToMbusWinSet - Set CPU-to-peripheral winNum address window
-*
-* DESCRIPTION:
-*       This function sets
-*       address window, also known as address decode window.
-*       A new address decode window is set for specified winNum address window.
-*       If address decode window parameter structure enables the window,
-*       the routine will also enable the winNum window, allowing CPU to access
-*       the winNum window.
-*
-* INPUT:
-*       winNum      - Windows number.
-*       pAddrDecWin - CPU winNum window data structure.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_OK if CPU winNum window was set correctly, MV_ERROR in case of
-*       address window overlapps with other active CPU winNum window or
-*		trying to assign 36bit base address while CPU does not support that.
-*       The function returns MV_NOT_SUPPORTED, if the winNum is unsupported.
-*
-*******************************************************************************/
-MV_STATUS mvAhbToMbusWinSet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin)
-{
-	MV_TARGET_ATTRIB targetAttribs;
-	MV_DEC_REGS decRegs;
-
-	/* Parameter checking   */
-	if (winNum >= MAX_AHB_TO_MBUS_WINS)
-	{
-		mvOsPrintf("mvAhbToMbusWinSet: ERR. Invalid winNum %d\n", winNum);
-		return MV_NOT_SUPPORTED;
-	}
-
-
-	/* read base register*/
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
-	}
-	else
-	{
-		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_INTEREG_REG);
-	}
-
-	/* check if address is aligned to the size */
-	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvAhbToMbusWinSet:Error setting AHB to MBUS window %d to "\
-				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-				   winNum,
-				   mvCtrlTargetNameGet(pAddrDecWin->target),
-				   pAddrDecWin->addrWin.baseLow,
-				   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-	/* read control register*/
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		decRegs.sizeReg = MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
-	}
-
-	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-	{
-		mvOsPrintf("mvAhbToMbusWinSet:mvCtrlAddrDecToReg Failed\n");
-		return MV_ERROR;
-	}
-
-	/* enable\Disable */
-	if (MV_TRUE == pAddrDecWin->enable)
-	{
-		decRegs.sizeReg |= ATMWCR_WIN_ENABLE;
-	}
-	else
-	{
-		decRegs.sizeReg &= ~ATMWCR_WIN_ENABLE;
-	}
-
-	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
-
-	/* set attributes */
-	decRegs.sizeReg &= ~ATMWCR_WIN_ATTR_MASK;
-	decRegs.sizeReg |= targetAttribs.attrib << ATMWCR_WIN_ATTR_OFFS;
-	/* set target ID */
-	decRegs.sizeReg &= ~ATMWCR_WIN_TARGET_MASK;
-	decRegs.sizeReg |= targetAttribs.targetId << ATMWCR_WIN_TARGET_OFFS;
-
-#if !defined(MV_RUN_FROM_FLASH)
-    /* To be on the safe side we disable the window before writing the  */
-    /* new values.                                                      */
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		mvAhbToMbusWinEnable(winNum,MV_FALSE);
-	}
-#endif
-
-	/* 3) Write to address decode Base Address Register                   */
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum), decRegs.baseReg);
-	}
-	else
-	{
-		MV_REG_WRITE(AHB_TO_MBUS_WIN_INTEREG_REG, decRegs.baseReg);
-	}
-
-
-	/* Internal register space have no size	*/
-	/* register. Do not perform size register assigment for those targets 	*/
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		/* Write to address decode Size Register                        	*/
-		MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), decRegs.sizeReg);
-	}
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvAhbToMbusWinGet - Get CPU-to-peripheral winNum address window
-*
-* DESCRIPTION:
-*		Get the CPU peripheral winNum address window.
-*
-* INPUT:
-*       winNum - Peripheral winNum enumerator
-*
-* OUTPUT:
-*       pAddrDecWin - CPU winNum window information data structure.
-*
-* RETURN:
-*       MV_OK if winNum exist, MV_ERROR otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvAhbToMbusWinGet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin)
-{
-	MV_DEC_REGS decRegs;
-	MV_TARGET_ATTRIB targetAttrib;
-
-
-	/* Parameter checking   */
-	if (winNum >= MAX_AHB_TO_MBUS_WINS)
-	{
-		mvOsPrintf("mvAhbToMbusWinGet: ERR. Invalid winNum %d\n", winNum);
-		return MV_NOT_SUPPORTED;
-	}
-
-
-	/* Internal register space size have no size register*/
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		decRegs.sizeReg =  MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
-	}
-	else
-	{
-		decRegs.sizeReg = 0;
-	}
-
-
-	/* Read base and size	*/
-	if (winNum != MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
-	}
-	else
-	{
-		decRegs.baseReg = MV_REG_READ(AHB_TO_MBUS_WIN_INTEREG_REG);
-	}
-
-
-
-	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
-	{
-		mvOsPrintf("mvAhbToMbusWinGet: mvCtrlRegToAddrDec Failed \n");
-		return MV_ERROR;
-	}
-
-	if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-        pAddrDecWin->addrWin.size = INTER_REGS_SIZE;
-		pAddrDecWin->target = INTER_REGS;
-		pAddrDecWin->enable = MV_TRUE;
-
-		return MV_OK;
-	}
-
-
-	if (decRegs.sizeReg & ATMWCR_WIN_ENABLE)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;
-
-	}
-
-
-
-	if (-1 == pAddrDecWin->addrWin.size)
-	{
-		return MV_ERROR;
-	}
-
-	/* attrib and targetId */
-	targetAttrib.attrib = (decRegs.sizeReg & ATMWCR_WIN_ATTR_MASK) >>
-													ATMWCR_WIN_ATTR_OFFS;
-	targetAttrib.targetId = (decRegs.sizeReg & ATMWCR_WIN_TARGET_MASK) >>
-													ATMWCR_WIN_TARGET_OFFS;
-
-	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvAhbToMbusWinTargetGet - Get Window number associated with target
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_U32	  mvAhbToMbusWinTargetGet(MV_TARGET target)
-{
-	MV_AHB_TO_MBUS_DEC_WIN decWin;
-	MV_U32 winNum;
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetGet: target %d is Illigal\n", target);
-		return 0xffffffff;
-	}
-
-	if (INTER_REGS == target)
-	{
-		return MV_AHB_TO_MBUS_INTREG_WIN;
-	}
-
-	for (winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS ; winNum++)
-	{
-		if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
-			continue;
-
-		if (mvAhbToMbusWinGet(winNum,&decWin) != MV_OK)
-		{
-			mvOsPrintf("mvAhbToMbusWinTargetGet: mvAhbToMbusWinGet fail\n");
-			return 0xffffffff;
-
-		}
-
-		if (decWin.enable == MV_TRUE)
-		{
-			if (decWin.target == target)
-			{
-				return winNum;
-			}
-
-		}
-
-	}
-
-	return 0xFFFFFFFF;
-
-
-}
-
-/*******************************************************************************
-* mvAhbToMbusWinAvailGet - Get First Available window number.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*
-*******************************************************************************/
-MV_U32    mvAhbToMbusWinAvailGet(MV_VOID)
-{
-        MV_AHB_TO_MBUS_DEC_WIN decWin;
-        MV_U32 winNum;
-
-        for (winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS ; winNum++)
-        {
-                if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
-                        continue;
-
-                if (mvAhbToMbusWinGet(winNum,&decWin) != MV_OK)
-                {
-                        mvOsPrintf("mvAhbToMbusWinTargetGet: mvAhbToMbusWinGet fail\n");
-                        return 0xffffffff;
-
-                }
-
-                if (decWin.enable == MV_FALSE)
-                {
-			return winNum;
-                }
-
-        }
-
-        return 0xFFFFFFFF;
-}
-
-
-/*******************************************************************************
-* mvAhbToMbusWinEnable - Enable/disable a CPU address decode window
-*
-* DESCRIPTION:
-*       This function enable/disable a CPU address decode window.
-*       if parameter 'enable' == MV_TRUE the routine will enable the
-*       window, thus enabling CPU accesses (before enabling the window it is
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       winNum - Peripheral winNum enumerator.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if protection window number was wrong, or the window
-*       overlapps other winNum window.
-*
-*******************************************************************************/
-MV_STATUS mvAhbToMbusWinEnable(MV_U32 winNum, MV_BOOL enable)
-{
-
-	/* Parameter checking   */
-	if (winNum >= MAX_AHB_TO_MBUS_WINS)
-	{
-		mvOsPrintf("mvAhbToMbusWinEnable: ERR. Invalid winNum %d\n", winNum);
-		return MV_NOT_SUPPORTED;
-	}
-
-	/* Internal registers bar can't be disable or enabled */
-	if (winNum == MV_AHB_TO_MBUS_INTREG_WIN)
-	{
-		return (enable ? MV_OK : MV_ERROR);
-	}
-
-    if (enable == MV_TRUE)
-    {
-		/* enable the window */
-		MV_REG_BIT_SET(AHB_TO_MBUS_WIN_CTRL_REG(winNum), ATMWCR_WIN_ENABLE);
-    }
-    else
-    {   /* Disable address decode winNum window                             */
-		MV_REG_BIT_RESET(AHB_TO_MBUS_WIN_CTRL_REG(winNum), ATMWCR_WIN_ENABLE);
-    }
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvAhbToMbusWinRemap - Set CPU remap register for address windows.
-*
-* DESCRIPTION:
-*       After a CPU address hits one of PCI address decode windows there is an
-*       option to remap the address to a different one. For example, CPU
-*       executes a read from PCI winNum window address 0x1200.0000. This
-*       can be modified so the address on the PCI bus would be 0x1400.0000
-*       Using the PCI address remap mechanism.
-*
-* INPUT:
-*       winNum      - Peripheral winNum enumerator. Must be a PCI winNum.
-*       pAddrDecWin - CPU winNum window information data structure.
-*                     Note that caller has to fill in the base field only. The
-*                     size field is ignored.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if winNum is not a PCI one, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_U32 mvAhbToMbusWinRemap(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32 baseAddr;
-	AHB_TO_MBUS_REMAP_REG_OFFS remapRegOffs;
-
-    MV_U32 effectiveBaseAddress=0,
-		   baseAddrValue=0,windowSizeValue=0;
-
-
-	/* Get registers offsets of given winNum 		*/
-	if (MV_NO_SUCH == ahbToMbusRemapRegOffsGet(winNum, &remapRegOffs))
-	{
-		return 0xffffffff;
-	}
-
-	/* 1) Set address remap low */
-    baseAddr = pAddrWin->baseLow;
-
-    /* Check base address aligment 					*/
-	/*
-	if (MV_IS_NOT_ALIGN(baseAddr, ATMWRLR_REMAP_LOW_ALIGNMENT))
-	{
-        mvOsPrintf("mvAhbToMbusPciRemap: Warning. Target base 0x%x unaligned\n",
-																baseAddr);
-        return MV_ERROR;
-	}
-	*/
-
-	/* BaseLow[31:16] => base register [31:16] 		*/
-	baseAddr = baseAddr & ATMWRLR_REMAP_LOW_MASK;
-
-    MV_REG_WRITE(remapRegOffs.lowRegOffs, baseAddr);
-
-	MV_REG_WRITE(remapRegOffs.highRegOffs, pAddrWin->baseHigh);
-
-
-	baseAddrValue = MV_REG_READ(AHB_TO_MBUS_WIN_BASE_REG(winNum));
-	windowSizeValue = MV_REG_READ(AHB_TO_MBUS_WIN_CTRL_REG(winNum));
-
-	baseAddrValue &= ATMWBR_BASE_MASK;
-	windowSizeValue &=ATMWCR_WIN_SIZE_MASK;
-
-   /* Start calculating the effective Base Address */
-   effectiveBaseAddress = baseAddrValue ;
-
-   /* The effective base address will be combined from the chopped (if any)
-	  remap value (according to the size value and remap mechanism) and the
-	  window's base address */
-   effectiveBaseAddress |= (((windowSizeValue) | 0xffff) & pAddrWin->baseLow);
-   /* If the effectiveBaseAddress exceed the window boundaries return an
-	  invalid value. */
-
-   if (effectiveBaseAddress > (baseAddrValue + (windowSizeValue | 0xffff)))
-   {
-		mvOsPrintf("mvAhbToMbusPciRemap: Error\n");
-		return 0xffffffff;
-   }
-
-	return effectiveBaseAddress;
-
-
-}
-/*******************************************************************************
-* mvAhbToMbusWinTargetSwap - Swap AhbToMbus windows between targets
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       target1      - CPU Interface target 1
-*       target2      - CPU Interface target 2
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if targets are illigal, or if one of the targets is not
-*	    associated to a valid window .
-*       MV_OK otherwise.
-*
-*******************************************************************************/
-
-
-MV_STATUS mvAhbToMbusWinTargetSwap(MV_TARGET target1,MV_TARGET target2)
-{
-	MV_U32 winNum1,winNum2;
-	MV_AHB_TO_MBUS_DEC_WIN winDec1,winDec2,winDecTemp;
-	AHB_TO_MBUS_REMAP_REG_OFFS remapRegs1,remapRegs2;
-	MV_U32 remapBaseLow1=0,remapBaseLow2=0;
-	MV_U32 remapBaseHigh1=0,remapBaseHigh2=0;
-
-
-	/* Check parameters */
-	if (target1 >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d is Illigal\n", target1);
-		return MV_ERROR;
-	}
-
-	if (target2 >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d is Illigal\n", target1);
-		return MV_ERROR;
-	}
-
-
-    /* get window associated with this target */
-	winNum1 = mvAhbToMbusWinTargetGet(target1);
-
-	if (winNum1 == 0xffffffff)
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d has illigal win %d\n",
-					target1,winNum1);
-		return MV_ERROR;
-
-	}
-
-    /* get window associated with this target */
-	winNum2 = mvAhbToMbusWinTargetGet(target2);
-
-	if (winNum2 == 0xffffffff)
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: target %d has illigal win %d\n",
-					target2,winNum2);
-		return MV_ERROR;
-
-	}
-
-	/* now Get original values of both Windows */
-	if (MV_OK != mvAhbToMbusWinGet(winNum1,&winDec1))
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: mvAhbToMbusWinGet failed win %d\n",
-					winNum1);
-		return MV_ERROR;
-
-	}
-	if (MV_OK != mvAhbToMbusWinGet(winNum2,&winDec2))
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: mvAhbToMbusWinGet failed win %d\n",
-					winNum2);
-		return MV_ERROR;
-
-	}
-
-
-	/* disable both windows */
-	if (MV_OK != mvAhbToMbusWinEnable(winNum1,MV_FALSE))
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: failed to enable window %d\n",
-					winNum1);
-		return MV_ERROR;
-
-	}
-	if (MV_OK != mvAhbToMbusWinEnable(winNum2,MV_FALSE))
-	{
-		mvOsPrintf("mvAhbToMbusWinTargetSwap: failed to enable windo %d\n",
-					winNum2);
-		return MV_ERROR;
-
-	}
-
-
-	/* now swap targets */
-
-	/* first save winDec2 values */
-	winDecTemp.addrWin.baseHigh = winDec2.addrWin.baseHigh;
-	winDecTemp.addrWin.baseLow = winDec2.addrWin.baseLow;
-	winDecTemp.addrWin.size = winDec2.addrWin.size;
-	winDecTemp.enable = winDec2.enable;
-	winDecTemp.target = winDec2.target;
-
-	/* winDec2 = winDec1 */
-	winDec2.addrWin.baseHigh = winDec1.addrWin.baseHigh;
-	winDec2.addrWin.baseLow = winDec1.addrWin.baseLow;
-	winDec2.addrWin.size = winDec1.addrWin.size;
-	winDec2.enable = winDec1.enable;
-	winDec2.target = winDec1.target;
-
-
-	/* winDec1 = winDecTemp */
-	winDec1.addrWin.baseHigh = winDecTemp.addrWin.baseHigh;
-	winDec1.addrWin.baseLow = winDecTemp.addrWin.baseLow;
-	winDec1.addrWin.size = winDecTemp.addrWin.size;
-	winDec1.enable = winDecTemp.enable;
-	winDec1.target = winDecTemp.target;
-
-
-	/* now set the new values */
-
-
-    mvAhbToMbusWinSet(winNum1,&winDec1);
-	mvAhbToMbusWinSet(winNum2,&winDec2);
-
-
-
-
-
-	/* now we will treat the remap windows if exist */
-
-
-	/* now check if one or both windows has a remap window
-	as well after the swap ! */
-
-	/* if a window had a remap value differnt than the base value
-	before the swap , then after the swap the remap value will be
-	equal to the base value unless both windows has a remap windows*/
-
-	/* first get old values */
-	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum1,&remapRegs1))
-	{
-		remapBaseLow1 = MV_REG_READ(remapRegs1.lowRegOffs);
-	    remapBaseHigh1 = MV_REG_READ(remapRegs1.highRegOffs);
-
-	}
-	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
-	{
-		remapBaseLow2 = MV_REG_READ(remapRegs2.lowRegOffs);
-	    remapBaseHigh2 = MV_REG_READ(remapRegs2.highRegOffs);
-
-
-	}
-
-	/* now do the swap */
-	if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum1,&remapRegs1))
-	{
-		if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
-		{
-			/* Two windows has a remap !!! so swap */
-
-			MV_REG_WRITE(remapRegs2.highRegOffs,remapBaseHigh1);
-			MV_REG_WRITE(remapRegs2.lowRegOffs,remapBaseLow1);
-
-			MV_REG_WRITE(remapRegs1.highRegOffs,remapBaseHigh2);
-			MV_REG_WRITE(remapRegs1.lowRegOffs,remapBaseLow2);
-
-
-
-		}
-		else
-		{
-			/* remap == base */
-			MV_REG_WRITE(remapRegs1.highRegOffs,winDec1.addrWin.baseHigh);
-			MV_REG_WRITE(remapRegs1.lowRegOffs,winDec1.addrWin.baseLow);
-
-		}
-
-	}
-	else if (MV_NO_SUCH != ahbToMbusRemapRegOffsGet(winNum2,&remapRegs2))
-	{
-		/* remap == base */
-		MV_REG_WRITE(remapRegs2.highRegOffs,winDec2.addrWin.baseHigh);
-		MV_REG_WRITE(remapRegs2.lowRegOffs,winDec2.addrWin.baseLow);
-
-	}
-
-
-
-	return MV_OK;
-
-
-}
-
-
-
-#if defined(MV_88F1181)
-
-/*******************************************************************************
-* mvAhbToMbusXbarCtrlSet - Set The CPU master Xbar arbitration.
-*
-* DESCRIPTION:
-*       This function sets CPU Mbus Arbiter
-*
-* INPUT:
-*       pPizzaArbArray - A priority Structure describing 16 "pizza slices". At
-*                    each clock cycle, the crossbar arbiter samples all
-*                    requests and gives the bus to the next agent according
-*                    to the "pizza".
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if paramers to function invalid.
-*
-*******************************************************************************/
-MV_STATUS  mvMbusArbSet(MV_MBUS_ARB_TARGET *pPizzaArbArray)
-{
-	MV_U32 sliceNum;
-	MV_U32 xbarCtrl = 0;
-	MV_MBUS_ARB_TARGET xbarTarget;
-
-	/* 1) Set crossbar control low register */
-	for (sliceNum = 0; sliceNum < MRLR_SLICE_NUM; sliceNum++)
-	{
-		xbarTarget = pPizzaArbArray[sliceNum];
-
-		/* sliceNum parameter check */
-		if (xbarTarget > MAX_MBUS_ARB_TARGETS)
-		{
-			mvOsPrintf("mvAhbToMbusXbarCtrlSet: ERR. Can't set Target %d\n",
-																  xbarTarget);
-			return MV_ERROR;
-		}
-		xbarCtrl |= (xbarTarget << MRLR_LOW_ARB_OFFS(sliceNum));
-	}
-	/* Write to crossbar control low register */
-    MV_REG_WRITE(MBUS_ARBITER_LOW_REG, xbarCtrl);
-
-	xbarCtrl = 0;
-
-	/* 2) Set crossbar control high register */
-	for (sliceNum = MRLR_SLICE_NUM;
-		 sliceNum < MRLR_SLICE_NUM+MRHR_SLICE_NUM;
-		 sliceNum++)
-	{
-
-		xbarTarget = pPizzaArbArray[sliceNum];
-
-		/* sliceNum parameter check */
-		if (xbarTarget > MAX_MBUS_ARB_TARGETS)
-		{
-			mvOsPrintf("mvAhbToMbusXbarCtrlSet: ERR. Can't set Target %d\n",
-																  xbarTarget);
-			return MV_ERROR;
-		}
-		xbarCtrl |= (xbarTarget << MRHR_HIGH_ARB_OFFS(sliceNum));
-	}
-	/* Write to crossbar control high register */
-    MV_REG_WRITE(MBUS_ARBITER_HIGH_REG, xbarCtrl);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvMbusArbCtrlSet - Set MBus Arbiter control register
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if paramers to function invalid.
-*
-*******************************************************************************/
-MV_STATUS mvMbusArbCtrlSet(MV_MBUS_ARB_CTRL *ctrl)
-{
-
-	if (ctrl->highPrio == MV_FALSE)
-	{
-		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_ARM_TOP);
-	}
-	else
-	{
-		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_ARM_TOP);
-	}
-
-	if (ctrl->fixedRoundRobin == MV_FALSE)
-	{
-		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_TARGET_FIXED);
-	}
-	else
-	{
-		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_TARGET_FIXED);
-	}
-
-	if (ctrl->starvEn == MV_FALSE)
-	{
-		MV_REG_BIT_RESET(MBUS_ARBITER_CTRL_REG, MACR_ARB_REQ_CTRL_EN);
-	}
-	else
-	{
-		MV_REG_BIT_SET(MBUS_ARBITER_CTRL_REG, MACR_ARB_REQ_CTRL_EN);
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvMbusArbCtrlGet - Get MBus Arbiter control register
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
-*
-* OUTPUT:
-*       ctrl  - pointer to MV_MBUS_ARB_CTRL register
-*
-* RETURN:
-*       MV_ERROR if paramers to function invalid.
-*
-*******************************************************************************/
-MV_STATUS mvMbusArbCtrlGet(MV_MBUS_ARB_CTRL *ctrl)
-{
-
-	MV_U32 ctrlReg = MV_REG_READ(MBUS_ARBITER_CTRL_REG);
-
-	if (ctrlReg & MACR_ARB_ARM_TOP)
-	{
-		ctrl->highPrio = MV_TRUE;
-	}
-	else
-	{
-		ctrl->highPrio = MV_FALSE;
-	}
-
-	if (ctrlReg & MACR_ARB_TARGET_FIXED)
-	{
-		ctrl->fixedRoundRobin = MV_TRUE;
-	}
-	else
-	{
-		ctrl->fixedRoundRobin = MV_FALSE;
-	}
-
-	if (ctrlReg & MACR_ARB_REQ_CTRL_EN)
-	{
-		ctrl->starvEn = MV_TRUE;
-	}
-	else
-	{
-		ctrl->starvEn = MV_FALSE;
-	}
-
-
-	return MV_OK;
-}
-
-#endif  /* #if defined(MV_88F1181) */
-
-
-
-/*******************************************************************************
-* ahbToMbusRemapRegOffsGet - Get CPU address remap register offsets
-*
-* DESCRIPTION:
-* 		CPU to PCI address remap registers offsets are inconsecutive.
-*		This function returns PCI address remap registers offsets.
-*
-* INPUT:
-*       winNum - Address decode window number. See MV_U32 enumerator.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*		MV_ERROR if winNum is not a PCI one.
-*
-*******************************************************************************/
-static MV_STATUS ahbToMbusRemapRegOffsGet(MV_U32 winNum,
-									AHB_TO_MBUS_REMAP_REG_OFFS *pRemapRegs)
-{
-	switch (winNum)
-	{
-		case 0:
-        case 1:
-			pRemapRegs->lowRegOffs  = AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum);
-			pRemapRegs->highRegOffs = AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum);
-			break;
-		case 2:
-		case 3:
-			if((mvCtrlModelGet() == MV_5281_DEV_ID) ||
-				(mvCtrlModelGet() == MV_1281_DEV_ID) ||
-				(mvCtrlModelGet() == MV_6183_DEV_ID) ||
-               (mvCtrlModelGet() == MV_6183L_DEV_ID))
-			{
-				pRemapRegs->lowRegOffs  = AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum);
-				pRemapRegs->highRegOffs = AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum);
-				break;
-			}
-			else
-			{
-				pRemapRegs->lowRegOffs  = 0;
-				pRemapRegs->highRegOffs = 0;
-
-				DB(mvOsPrintf("ahbToMbusRemapRegOffsGet: ERR. Invalid winNum %d\n",
-							winNum));
-				return MV_NO_SUCH;
-			}
-		default:
-		{
-			pRemapRegs->lowRegOffs  = 0;
-			pRemapRegs->highRegOffs = 0;
-
-			DB(mvOsPrintf("ahbToMbusRemapRegOffsGet: ERR. Invalid winNum %d\n",
-						winNum));
-		   	return MV_NO_SUCH;
-		}
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvAhbToMbusAddDecShow - Print the AHB to MBus bridge address decode map.
-*
-* DESCRIPTION:
-*		This function print the CPU address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvAhbToMbusAddDecShow(MV_VOID)
-{
-	MV_AHB_TO_MBUS_DEC_WIN win;
-	MV_U32 winNum;
-	mvOsOutput( "\n" );
-	mvOsOutput( "AHB To MBUS Bridge:\n" );
-	mvOsOutput( "-------------------\n" );
-
-	for( winNum = 0; winNum < MAX_AHB_TO_MBUS_WINS; winNum++ )
-	{
-		memset( &win, 0, sizeof(MV_AHB_TO_MBUS_DEC_WIN) );
-
-		mvOsOutput( "win%d - ", winNum );
-
-		if( mvAhbToMbusWinGet( winNum, &win ) == MV_OK )
-		{
-			if( win.enable )
-			{
-				mvOsOutput( "%s base %08x, ",
-				mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-                		mvOsOutput( "...." );
-				mvSizePrint( win.addrWin.size );
-
-				mvOsOutput( "\n" );
-
-            }
-			else
-				mvOsOutput( "disable\n" );
-		}
-	}
-
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h
deleted file mode 100644
index 1b352a1f6b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbus.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvAhbToMbush
-#define __INCmvAhbToMbush
-
-/* includes */
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-/* defines  */
-
-#if defined(MV_88F1181)
-/* This enumerator defines the Marvell controller possible MBUS arbiter     */
-/* target ports. It is used to define crossbar priority scheame (pizza)     */ 
-typedef enum _mvMBusArbTargetId
-{
-    DRAM_MBUS_ARB_TARGET = 0,    /* Port 0 -> DRAM interface         */
-    TWSI_MBUS_ARB_TARGET  = 1,     /* Port 1 -> TWSI 		    */
-    ARM_MBUS_ARB_TARGET   = 2,     /* Port 2 -> ARM		    */
-	PEX1_MBUS_ARB_TARGET  = 3,    /* Port 3 -> PCI Express 1		    */
-    PEX0_MBUS_ARB_TARGET  = 4,    /* Port 4 -> PCI Express0 		    */
-	MAX_MBUS_ARB_TARGETS
-}MV_MBUS_ARB_TARGET;
-
-typedef struct _mvMBusArbCtrl
-{
-	MV_BOOL starvEn;
-	MV_BOOL highPrio;
-	MV_BOOL fixedRoundRobin;
-
-}MV_MBUS_ARB_CTRL;
-
-#endif /* #if defined(MV_88F1181) */
-
-typedef struct _mvAhbtoMbusDecWin
-{
-	MV_TARGET	  target;
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-
-}MV_AHB_TO_MBUS_DEC_WIN;
-
-/* mvAhbToMbus.h API list */
-
-MV_STATUS mvAhbToMbusInit(MV_VOID);
-MV_STATUS mvAhbToMbusWinSet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin);
-MV_STATUS mvAhbToMbusWinGet(MV_U32 winNum, MV_AHB_TO_MBUS_DEC_WIN *pAddrDecWin);
-MV_STATUS mvAhbToMbusWinEnable(MV_U32 winNum,MV_BOOL enable);
-MV_U32    mvAhbToMbusWinRemap(MV_U32 winNum, MV_ADDR_WIN *pAddrDecWin);
-MV_U32	  mvAhbToMbusWinTargetGet(MV_TARGET target);
-MV_U32    mvAhbToMbusWinAvailGet(MV_VOID);
-MV_STATUS mvAhbToMbusWinTargetSwap(MV_TARGET target1,MV_TARGET target2);
-
-#if defined(MV_88F1181)
-
-MV_STATUS mvMbusArbSet(MV_MBUS_ARB_TARGET *pPizzaArbArray);
-MV_STATUS mvMbusArbCtrlSet(MV_MBUS_ARB_CTRL *ctrl);
-MV_STATUS mvMbusArbCtrlGet(MV_MBUS_ARB_CTRL *ctrl);
-
-#endif /* #if defined(MV_88F1181) */
-
-
-MV_VOID   mvAhbToMbusAddDecShow(MV_VOID);
-
-
-#endif /* __INCmvAhbToMbush */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h
deleted file mode 100644
index 97dc631890..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvAhbToMbusRegs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvAhbToMbusRegsh
-#define __INCmvAhbToMbusRegsh
-
-/******************************/
-/* ARM Address Map Registers  */
-/******************************/
-
-#define MAX_AHB_TO_MBUS_WINS	9
-#define MV_AHB_TO_MBUS_INTREG_WIN	8
-
-
-#define AHB_TO_MBUS_WIN_CTRL_REG(winNum)		(0x20000 + (winNum)*0x10)
-#define AHB_TO_MBUS_WIN_BASE_REG(winNum)		(0x20004 + (winNum)*0x10)
-#define AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum)	(0x20008 + (winNum)*0x10)
-#define AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum)	(0x2000C + (winNum)*0x10)
-#define AHB_TO_MBUS_WIN_INTEREG_REG				 0x20080
-
-/* Window Control Register      */
-/* AHB_TO_MBUS_WIN_CTRL_REG (ATMWCR)*/
-#define ATMWCR_WIN_ENABLE					BIT0	/* Window Enable */
-
-#define ATMWCR_WIN_TARGET_OFFS			4 /* The target interface associated 
-											 with this window*/
-#define ATMWCR_WIN_TARGET_MASK			(0xf << ATMWCR_WIN_TARGET_OFFS)
-
-#define ATMWCR_WIN_ATTR_OFFS				8 /* The target interface attributes
-											 Associated with this window */
-#define ATMWCR_WIN_ATTR_MASK				(0xff << ATMWCR_WIN_ATTR_OFFS)
-
-											 
-/*
-Used with the Base register to set the address window size and location
-Must be programed from LSB to MSB as sequence of 1’s followed
-by sequence of 0’s. The number of 1’s specifies the size of the window
-in 64 KB granularity (e.g. a value of 0x00FF specifies 256 = 16 MB).
-
-NOTE: A value of 0x0 specifies 64KB size.
-*/
-#define ATMWCR_WIN_SIZE_OFFS				16 /* Window Size */
-#define ATMWCR_WIN_SIZE_MASK				(0xffff << ATMWCR_WIN_SIZE_OFFS)
-#define ATMWCR_WIN_SIZE_ALIGNMENT			0x10000
-
-/*  Window Base Register     */
-/* AHB_TO_MBUS_WIN_BASE_REG (ATMWBR) */
-
-/*
-Used with the size field to set the address window size and location.
-Corresponds to transaction address[31:16]
-*/
-#define ATMWBR_BASE_OFFS					16 /* Base Address */
-#define ATMWBR_BASE_MASK					(0xffff << 	ATMWBR_BASE_OFFS)
-#define ATMWBR_BASE_ALIGNMENT				0x10000
-
-/*  Window Remap Low Register   */
-/* AHB_TO_MBUS_WIN_REMAP_LOW_REG (ATMWRLR) */
-
-/*
-Used with the size field to specifies address bits[31:0] to be driven to
-the target interface.:
-target_addr[31:16] = (addr[31:16] & size[15:0]) | (remap[31:16] & ~size[15:0])
-*/
-#define ATMWRLR_REMAP_LOW_OFFS			16 /* Remap Address */
-#define ATMWRLR_REMAP_LOW_MASK			(0xffff << ATMWRLR_REMAP_LOW_OFFS)
-#define ATMWRLR_REMAP_LOW_ALIGNMENT		0x10000
-
-/* Window Remap High Register   */
-/* AHB_TO_MBUS_WIN_REMAP_HIGH_REG (ATMWRHR) */
-
-/*
-Specifies address bits[63:32] to be driven to the target interface.
-target_addr[63:32] = (RemapHigh[31:0]
-*/
-#define ATMWRHR_REMAP_HIGH_OFFS			0 /* Remap Address */
-#define ATMWRHR_REMAP_HIGH_MASK			(0xffffffff << ATMWRHR_REMAP_HIGH_OFFS)
-
-
-#endif /* __INCmvAhbToMbusRegsh */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c
deleted file mode 100644
index 872dc6e9d8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.c
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/sys/mvAhbToMbusRegs.h"
-#include "cpu/mvCpu.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "mvSysHwConfig.h"
-#include "mvSysDram.h"
-
-/*#define MV_DEBUG*/
-/* defines  */
-
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif
-
-/* locals   */
-/* static functions */
-static MV_BOOL cpuTargetWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
-
-MV_TARGET * sampleAtResetTargetArray;
-MV_TARGET sampleAtResetTargetArrayP[] = BOOT_TARGETS_NAME_ARRAY;
-MV_TARGET sampleAtResetTargetArray6180P[] = BOOT_TARGETS_NAME_ARRAY_6180;
-/*******************************************************************************
-* mvCpuIfInit - Initialize Controller CPU interface
-*
-* DESCRIPTION:
-*       This function initialize Controller CPU interface:
-*       1. Set CPU interface configuration registers.
-*       2. Set CPU master Pizza arbiter control according to static
-*          configuration described in configuration file.
-*       3. Opens CPU address decode windows. DRAM windows are assumed to be
-*		   already set (auto detection).
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvCpuIfInit(MV_CPU_DEC_WIN *cpuAddrWinMap)
-{
-	MV_U32 regVal;
-	MV_TARGET target;
-	MV_ADDR_WIN addrWin;
-
-	if (cpuAddrWinMap == NULL)
-	{
-		DB(mvOsPrintf("mvCpuIfInit:ERR. cpuAddrWinMap == NULL\n"));
-		return MV_ERROR;
-	}
-
-    /*Initialize the boot target array according to device type*/
-    if(mvCtrlModelGet() == MV_6180_DEV_ID)
-        sampleAtResetTargetArray = sampleAtResetTargetArray6180P;
-    else
-        sampleAtResetTargetArray = sampleAtResetTargetArrayP;
-
-	/* Set ARM Configuration register */
-	regVal  = MV_REG_READ(CPU_CONFIG_REG);
-	regVal &= ~CPU_CONFIG_DEFAULT_MASK;
-	regVal |= CPU_CONFIG_DEFAULT;
-	MV_REG_WRITE(CPU_CONFIG_REG,regVal);
-
-	/* First disable all CPU target windows  */
-	for (target = 0; cpuAddrWinMap[target].enable != TBL_TERM; target++)
-    	{
-		if ((MV_TARGET_IS_DRAM(target))||(target == INTER_REGS))
-		{
-			continue;
-		}
-
-#if defined(MV_MEM_OVER_PCI_WA) || defined(MV_UART_OVER_PCI_WA)
-		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
-		if (MV_TARGET_IS_PCI(target))
-		{
-			continue;
-		}
-#endif
-
-#if defined(MV_MEM_OVER_PEX_WA) || defined(MV_UART_OVER_PEX_WA)
-		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
-		if (MV_TARGET_IS_PEX(target))
-		{
-			continue;
-		}
-#endif
-#if defined(MV_RUN_FROM_FLASH)
-        	/* Don't disable the boot device.                               */
-		if (target == DEV_BOOCS)
-		{
-			continue;
-		}
-#endif /* MV_RUN_FROM_FLASH */
-		mvCpuIfTargetWinEnable(MV_CHANGE_BOOT_CS(target),MV_FALSE);
-	}
-
-#if defined(MV_RUN_FROM_FLASH)
-    	/* Resize the bootcs windows before other windows, because this     */
-    	/* window is enabled and will cause an overlap if not resized.      */
-	target = DEV_BOOCS;
-
-	if (MV_OK != mvCpuIfTargetWinSet(target, &cpuAddrWinMap[target]))
-	{
-		DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinSet fail\n"));
-		return MV_ERROR;
-	}
-
-	addrWin.baseLow = cpuAddrWinMap[target].addrWin.baseLow;
-	addrWin.baseHigh = cpuAddrWinMap[target].addrWin.baseHigh;
-	if (0xffffffff == mvAhbToMbusWinRemap(cpuAddrWinMap[target].winNum ,&addrWin))
-	{
-		DB(mvOsPrintf("mvCpuIfInit:WARN. mvAhbToMbusWinRemap can't remap winNum=%d\n",
-					  cpuAddrWinMap[target].winNum));
-	}
-
-#endif /* MV_RUN_FROM_FLASH */
-
-	/* Go through all targets in user table until table terminator			*/
-	for (target = 0; cpuAddrWinMap[target].enable != TBL_TERM; target++)
-    	{
-
-#if defined(MV_RUN_FROM_FLASH)
-	if (target == DEV_BOOCS)
-	{
-		continue;
-	}
-#endif /* MV_RUN_FROM_FLASH */
-
-	/* if DRAM auto sizing is used do not initialized DRAM target windows, 	*/
-	/* assuming this already has been done earlier.							*/
-#ifdef	MV_DRAM_AUTO_SIZE
-		if (MV_TARGET_IS_DRAM(target))
-		{
-			continue;
-		}
-#endif
-
-#if defined(MV_MEM_OVER_PCI_WA) || defined(MV_UART_OVER_PCI_WA)
-		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
-		if (MV_TARGET_IS_PCI(target))
-		{
-			continue;
-		}
-#endif
-
-#if defined(MV_MEM_OVER_PEX_WA) || defined(MV_UART_OVER_PEX_WA)
-		/* If the target PEX or PCI and memory is over PEX or PCI we don't touch this CPU windows */
-		if (MV_TARGET_IS_PEX(target))
-		{
-			continue;
-		}
-#endif
-	/* If the target attribute is the same as the boot device attribute */
-	/* then it's stays disable */
-		if (MV_TARGET_IS_AS_BOOT(target))
-		{
-			continue;
-		}
-
-		if((0 == cpuAddrWinMap[target].addrWin.size) ||
-		   (DIS == cpuAddrWinMap[target].enable))
-
-		{
-			if (MV_OK != mvCpuIfTargetWinEnable(target, MV_FALSE))
-			{
-				DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinEnable fail\n"));
-				return MV_ERROR;
-			}
-
-		}
-		else
-		{
-			if (MV_OK != mvCpuIfTargetWinSet(target, &cpuAddrWinMap[target]))
-			{
-				DB(mvOsPrintf("mvCpuIfInit:ERR. mvCpuIfTargetWinSet fail\n"));
-				return MV_ERROR;
-			}
-
-			addrWin.baseLow = cpuAddrWinMap[target].addrWin.baseLow;
-			addrWin.baseHigh = cpuAddrWinMap[target].addrWin.baseHigh;
-			if (0xffffffff == mvAhbToMbusWinRemap(cpuAddrWinMap[target].winNum ,&addrWin))
-			{
-				DB(mvOsPrintf("mvCpuIfInit:WARN. mvAhbToMbusWinRemap can't remap winNum=%d\n",
-							  cpuAddrWinMap[target].winNum));
-			}
-
-
-		}
-    }
-
-	return MV_OK;
-
-
-}
-
-
-/*******************************************************************************
-* mvCpuIfTargetWinSet - Set CPU-to-peripheral target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI0_MEM0)
-*       address window, also known as address decode window.
-*       A new address decode window is set for specified target address window.
-*       If address decode window parameter structure enables the window,
-*       the routine will also enable the target window, allowing CPU to access
-*       the target window.
-*
-* INPUT:
-*       target      - Peripheral target enumerator.
-*       pAddrDecWin - CPU target window data structure.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_OK if CPU target window was set correctly, MV_ERROR in case of
-*       address window overlapps with other active CPU target window or
-*		trying to assign 36bit base address while CPU does not support that.
-*       The function returns MV_NOT_SUPPORTED, if the target is unsupported.
-*
-*******************************************************************************/
-MV_STATUS mvCpuIfTargetWinSet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin)
-{
-	MV_AHB_TO_MBUS_DEC_WIN decWin;
-	MV_U32 existingWinNum;
-	MV_DRAM_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinSet: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-    	/* 2) Check if the requested window overlaps with current windows		*/
-    	if (MV_TRUE == cpuTargetWinOverlap(target, &pAddrDecWin->addrWin))
-	{
-        	mvOsPrintf("mvCpuIfTargetWinSet: ERR. Target %d overlap\n", target);
-		return MV_BAD_PARAM;
-	}
-
-	if (MV_TARGET_IS_DRAM(target))
-	{
-		/* copy relevant data to MV_DRAM_DEC_WIN structure */
-		addrDecWin.addrWin.baseHigh = pAddrDecWin->addrWin.baseHigh;
-		addrDecWin.addrWin.baseLow = pAddrDecWin->addrWin.baseLow;
-		addrDecWin.addrWin.size = pAddrDecWin->addrWin.size;
-		addrDecWin.enable = pAddrDecWin->enable;
-
-
-		if (mvDramIfWinSet(target,&addrDecWin) != MV_OK);
-		{
-			mvOsPrintf("mvCpuIfTargetWinSet: mvDramIfWinSet Failed\n");
-			return MV_ERROR;
-		}
-
-	}
-	else
-	{
-		/* copy relevant data to MV_AHB_TO_MBUS_DEC_WIN structure */
-		decWin.addrWin.baseLow = pAddrDecWin->addrWin.baseLow;
-		decWin.addrWin.baseHigh = pAddrDecWin->addrWin.baseHigh;
-		decWin.addrWin.size = pAddrDecWin->addrWin.size;
-		decWin.enable = pAddrDecWin->enable;
-		decWin.target = target;
-
-		existingWinNum = mvAhbToMbusWinTargetGet(target);
-
-		/* check if there is already another Window configured
-		for this target */
-		if ((existingWinNum < MAX_AHB_TO_MBUS_WINS )&&
-			(existingWinNum != pAddrDecWin->winNum))
-		{
-			/* if we want to enable the new winow number
-			passed by the user , then the old one should
-			be disabled */
-			if (MV_TRUE == pAddrDecWin->enable)
-			{
-				/* be sure it is disabled */
-				mvAhbToMbusWinEnable(existingWinNum , MV_FALSE);
-			}
-		}
-
-        if (mvAhbToMbusWinSet(pAddrDecWin->winNum,&decWin) != MV_OK)
-		{
-			mvOsPrintf("mvCpuIfTargetWinSet: mvAhbToMbusWinSet Failed\n");
-			return MV_ERROR;
-		}
-
-	}
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvCpuIfTargetWinGet - Get CPU-to-peripheral target address window
-*
-* DESCRIPTION:
-*		Get the CPU peripheral target address window.
-*
-* INPUT:
-*       target - Peripheral target enumerator
-*
-* OUTPUT:
-*       pAddrDecWin - CPU target window information data structure.
-*
-* RETURN:
-*       MV_OK if target exist, MV_ERROR otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvCpuIfTargetWinGet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin)
-{
-
-	MV_U32 winNum=0xffffffff;
-	MV_AHB_TO_MBUS_DEC_WIN decWin;
-	MV_DRAM_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinGet: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	if (MV_TARGET_IS_DRAM(target))
-	{
-		if (mvDramIfWinGet(target,&addrDecWin) != MV_OK)
-		{
-			mvOsPrintf("mvCpuIfTargetWinGet: Failed to get window target %d\n",
-					   target);
-			return MV_ERROR;
-		}
-
-		/* copy relevant data to MV_CPU_DEC_WIN structure */
-		pAddrDecWin->addrWin.baseLow = addrDecWin.addrWin.baseLow;
-		pAddrDecWin->addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
-		pAddrDecWin->addrWin.size = addrDecWin.addrWin.size;
-		pAddrDecWin->enable = addrDecWin.enable;
-		pAddrDecWin->winNum = 0xffffffff;
-
-	}
-	else
-	{
-		/* get the Window number associated with this target */
-
-		winNum = mvAhbToMbusWinTargetGet(target);
-		if (winNum >= MAX_AHB_TO_MBUS_WINS)
-		{
-			return MV_NO_SUCH;
-
-		}
-
-		if (mvAhbToMbusWinGet(winNum , &decWin) != MV_OK)
-		{
-			mvOsPrintf("%s: mvAhbToMbusWinGet Failed at winNum = %d\n",
-					   __FUNCTION__, winNum);
-			return MV_ERROR;
-
-		}
-
-		/* copy relevant data to MV_CPU_DEC_WIN structure */
-		pAddrDecWin->addrWin.baseLow = decWin.addrWin.baseLow;
-		pAddrDecWin->addrWin.baseHigh = decWin.addrWin.baseHigh;
-		pAddrDecWin->addrWin.size = decWin.addrWin.size;
-		pAddrDecWin->enable = decWin.enable;
-		pAddrDecWin->winNum = winNum;
-
-	}
-
-
-
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvCpuIfTargetWinEnable - Enable/disable a CPU address decode window
-*
-* DESCRIPTION:
-*       This function enable/disable a CPU address decode window.
-*       if parameter 'enable' == MV_TRUE the routine will enable the
-*       window, thus enabling CPU accesses (before enabling the window it is
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       target - Peripheral target enumerator.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if protection window number was wrong, or the window
-*       overlapps other target window.
-*
-*******************************************************************************/
-MV_STATUS mvCpuIfTargetWinEnable(MV_TARGET target,MV_BOOL enable)
-{
-	MV_U32 winNum, temp;
-	MV_CPU_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-	
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinEnable: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	/* get the window and check if it exist */
-	temp = mvCpuIfTargetWinGet(target, &addrDecWin);
-	if (MV_NO_SUCH == temp)
-	{
-		return (enable? MV_ERROR: MV_OK);
-	}
-	else if( MV_OK != temp)
-	{
-		mvOsPrintf("%s: ERR. Getting target %d failed.\n",__FUNCTION__, target);
-		return MV_ERROR;
-	}
-
-
-	/* check overlap */
-
-	if (MV_TRUE == enable)
-	{
-		if (MV_TRUE == cpuTargetWinOverlap(target, &addrDecWin.addrWin))
-		{
-			DB(mvOsPrintf("%s: ERR. Target %d overlap\n",__FUNCTION__, target));
-			return MV_ERROR;
-		}
-
-	}
-
-
-	if (MV_TARGET_IS_DRAM(target))
-	{
-		if (mvDramIfWinEnable(target , enable) != MV_OK)
-		{
-			mvOsPrintf("mvCpuIfTargetWinGet: mvDramIfWinEnable Failed at \n");
-			return MV_ERROR;
-
-		}
-
-	}
-	else
-	{
-		/* get the Window number associated with this target */
-
-		winNum = mvAhbToMbusWinTargetGet(target);
-
-		if (winNum >= MAX_AHB_TO_MBUS_WINS)
-		{
-			return (enable? MV_ERROR: MV_OK);
-		}
-
-		if (mvAhbToMbusWinEnable(winNum , enable) != MV_OK)
-		{
-			mvOsPrintf("mvCpuIfTargetWinGet: Failed to enable window = %d\n",
-					   winNum);
-			return MV_ERROR;
-
-		}
-
-	}
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvCpuIfTargetWinSizeGet - Get CPU target address window size
-*
-* DESCRIPTION:
-*		Get the size of CPU-to-peripheral target window.
-*
-* INPUT:
-*       target - Peripheral target enumerator
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit size. Function also returns '0' if window is closed.
-*		Function returns 0xFFFFFFFF in case of an error.
-*
-*******************************************************************************/
-MV_U32    mvCpuIfTargetWinSizeGet(MV_TARGET target)
-{
-	MV_CPU_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinSizeGet: target %d is Illigal\n", target);
-		return 0;
-	}
-
-    /* Get the winNum window */
-	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
-	{
-		mvOsPrintf("mvCpuIfTargetWinSizeGet:ERR. Getting target %d failed.\n",
-                                                                        target);
-		return 0;
-	}
-
-	/* Check if window is enabled   */
-	if (addrDecWin.enable == MV_TRUE)
-    {
-		return (addrDecWin.addrWin.size);
-    }
-    else
-    {
-        return 0;		/* Window disabled. return 0 */
-    }
-}
-
-/*******************************************************************************
-* mvCpuIfTargetWinBaseLowGet - Get CPU target address window base low
-*
-* DESCRIPTION:
-*       CPU-to-peripheral target address window base is constructed of
-*       two parts: Low and high.
-*		This function gets the CPU peripheral target low base address.
-*
-* INPUT:
-*       target - Peripheral target enumerator
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit low base address.
-*
-*******************************************************************************/
-MV_U32   mvCpuIfTargetWinBaseLowGet(MV_TARGET target)
-{
-	MV_CPU_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinBaseLowGet: target %d is Illigal\n", target);
-		return 0xffffffff;
-	}
-
-    /* Get the target window */
-	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
-	{
-		mvOsPrintf("mvCpuIfTargetWinBaseLowGet:ERR. Getting target %d failed.\n",
-                                                                        target);
-		return 0xffffffff;
-	}
-
-	if (MV_FALSE == addrDecWin.enable)
-	{
-		return 0xffffffff;
-	}
-	return (addrDecWin.addrWin.baseLow);
-}
-
-/*******************************************************************************
-* mvCpuIfTargetWinBaseHighGet - Get CPU target address window base high
-*
-* DESCRIPTION:
-*       CPU-to-peripheral target address window base is constructed of
-*       two parts: Low and high.
-*		This function gets the CPU peripheral target high base address.
-*
-* INPUT:
-*       target - Peripheral target enumerator
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit high base address.
-*
-*******************************************************************************/
-MV_U32    mvCpuIfTargetWinBaseHighGet(MV_TARGET target)
-{
-	MV_CPU_DEC_WIN addrDecWin;
-
-	target = MV_CHANGE_BOOT_CS(target);
-
-	/* Check parameters */
-	if (target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvCpuIfTargetWinBaseLowGet: target %d is Illigal\n", target);
-		return 0xffffffff;
-	}
-
-    /* Get the target window */
-	if (MV_OK != mvCpuIfTargetWinGet(target, &addrDecWin))
-	{
-		mvOsPrintf("mvCpuIfTargetWinBaseHighGet:ERR. Getting target %d failed.\n",
-                                                                        target);
-		return 0xffffffff;
-	}
-
-	if (MV_FALSE == addrDecWin.enable)
-	{
-		return 0;
-	}
-
-	return (addrDecWin.addrWin.baseHigh);
-}
-
-#if defined(MV_INCLUDE_PEX)
-/*******************************************************************************
-* mvCpuIfPexRemap - Set CPU remap register for address windows.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       pexTarget   - Peripheral target enumerator. Must be a PEX target.
-*       pAddrDecWin - CPU target window information data structure.
-*                     Note that caller has to fill in the base field only. The
-*                     size field is ignored.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if target is not a PEX one, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_U32 mvCpuIfPexRemap(MV_TARGET pexTarget, MV_ADDR_WIN *pAddrDecWin)
-{
-	MV_U32 winNum;
-
-	/* Check parameters */
-
-	if (mvCtrlPexMaxIfGet() > 1)
-	{
-		if ((!MV_TARGET_IS_PEX1(pexTarget))&&(!MV_TARGET_IS_PEX0(pexTarget)))
-		{
-			mvOsPrintf("mvCpuIfPexRemap: target %d is Illigal\n",pexTarget);
-			return 0xffffffff;
-		}
-
-	}
-	else
-	{
-		if (!MV_TARGET_IS_PEX0(pexTarget))
-		{
-			mvOsPrintf("mvCpuIfPexRemap: target %d is Illigal\n",pexTarget);
-			return 0xffffffff;
-		}
-
-	}
-
-	/* get the Window number associated with this target */
-	winNum = mvAhbToMbusWinTargetGet(pexTarget);
-
-	if (winNum >= MAX_AHB_TO_MBUS_WINS)
-	{
-		mvOsPrintf("mvCpuIfPexRemap: mvAhbToMbusWinTargetGet Failed\n");
-		return 0xffffffff;
-
-	}
-
-	return mvAhbToMbusWinRemap(winNum , pAddrDecWin);
-}
-
-#endif
-
-#if defined(MV_INCLUDE_PCI)
-/*******************************************************************************
-* mvCpuIfPciRemap - Set CPU remap register for address windows.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       pciTarget   - Peripheral target enumerator. Must be a PCI target.
-*       pAddrDecWin - CPU target window information data structure.
-*                     Note that caller has to fill in the base field only. The
-*                     size field is ignored.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if target is not a PCI one, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_U32 mvCpuIfPciRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin)
-{
-	MV_U32 winNum;
-
-	/* Check parameters */
-	if (!MV_TARGET_IS_PCI(pciTarget))
-	{
-		mvOsPrintf("mvCpuIfPciRemap: target %d is Illigal\n",pciTarget);
-		return 0xffffffff;
-	}
-
-	/* get the Window number associated with this target */
-	winNum = mvAhbToMbusWinTargetGet(pciTarget);
-
-	if (winNum >= MAX_AHB_TO_MBUS_WINS)
-	{
-		mvOsPrintf("mvCpuIfPciRemap: mvAhbToMbusWinTargetGet Failed\n");
-		return 0xffffffff;
-
-	}
-
-	return mvAhbToMbusWinRemap(winNum , pAddrDecWin);
-}
-#endif /* MV_INCLUDE_PCI */
-
-
-/*******************************************************************************
-* mvCpuIfPciIfRemap - Set CPU remap register for address windows.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       pciTarget   - Peripheral target enumerator. Must be a PCI target.
-*       pAddrDecWin - CPU target window information data structure.
-*                     Note that caller has to fill in the base field only. The
-*                     size field is ignored.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if target is not a PCI one, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_U32 mvCpuIfPciIfRemap(MV_TARGET pciIfTarget, MV_ADDR_WIN *pAddrDecWin)
-{
-#if defined(MV_INCLUDE_PEX)
-	if (MV_TARGET_IS_PEX(pciIfTarget))
-	{
-		return mvCpuIfPexRemap(pciIfTarget,pAddrDecWin);
-	}
-#endif
-#if defined(MV_INCLUDE_PCI)
-
-	if (MV_TARGET_IS_PCI(pciIfTarget))
-	{
-		return mvCpuIfPciRemap(pciIfTarget,pAddrDecWin);
-	}
-#endif
-	return 0;
-}
-
-
-
-/*******************************************************************************
-* mvCpuIfTargetOfBaseAddressGet - Get the target according to base address
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       baseAddress -  base address to be checked
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       the target number that baseAddress belongs to or MAX_TARGETS is not
-*       found
-*
-*******************************************************************************/
-
-MV_TARGET mvCpuIfTargetOfBaseAddressGet(MV_U32 baseAddress)
-{
-	MV_CPU_DEC_WIN win;
-	MV_U32 target;
-
-	for( target = 0; target < MAX_TARGETS; target++ )
-	{
-		if( mvCpuIfTargetWinGet( target, &win ) == MV_OK )
-		{
-			if( win.enable )
-			{
-				if ((baseAddress >= win.addrWin.baseLow) &&
-					(baseAddress < win.addrWin.baseLow + win.addrWin.size)) break;
-            }
-		}
-		else return MAX_TARGETS;
-
-	}
-
-	return target;
-}
-/*******************************************************************************
-* cpuTargetWinOverlap - Detect CPU address decode windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case CPU address decode
-*       windows overlapps.
-*       This function detects CPU address decode windows overlapping of a
-*       specified target. The function does not check the target itself for
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       target      - Peripheral target enumerator.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlaps current address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL cpuTargetWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32 			targetNum;
-    MV_CPU_DEC_WIN 	addrDecWin;
-	MV_STATUS		status;
-
-
-	for(targetNum = 0; targetNum < MAX_TARGETS; targetNum++)
-    {
-#if defined(MV_RUN_FROM_FLASH)
-		if(MV_TARGET_IS_AS_BOOT(target))
-		{
-			if (MV_CHANGE_BOOT_CS(targetNum) == target)
-				continue;
-		}
-#endif /* MV_RUN_FROM_FLASH */
-
-		/* don't check our target or illegal targets */
-        if (targetNum == target)
-        {
-            continue;
-        }
-
-		/* Get window parameters 	*/
-		status = mvCpuIfTargetWinGet(targetNum, &addrDecWin);
-        if(MV_NO_SUCH == status)
-        {
-            continue;
-        }
-		if(MV_OK != status)
-		{
-			DB(mvOsPrintf("cpuTargetWinOverlap: ERR. TargetWinGet failed\n"));
-            return MV_TRUE;
-		}
-
-		/* Do not check disabled windows	*/
-		if (MV_FALSE == addrDecWin.enable)
-		{
-			continue;
-		}
-
-        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
-		{
-			DB(mvOsPrintf(
-			"cpuTargetWinOverlap: Required target %d overlap current %d\n",
-								target, targetNum));
-			return MV_TRUE;
-		}
-    }
-
-	return MV_FALSE;
-
-}
-
-/*******************************************************************************
-* mvCpuIfAddDecShow - Print the CPU address decode map.
-*
-* DESCRIPTION:
-*		This function print the CPU address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvCpuIfAddDecShow(MV_VOID)
-{
-	MV_CPU_DEC_WIN win;
-	MV_U32 target;
-	mvOsOutput( "\n" );
-	mvOsOutput( "CPU Interface\n" );
-	mvOsOutput( "-------------\n" );
-
-	for( target = 0; target < MAX_TARGETS; target++ )
-	{
-
-		memset( &win, 0, sizeof(MV_CPU_DEC_WIN) );
-
-		mvOsOutput( "%s ",mvCtrlTargetNameGet(target));
-		mvOsOutput( "...." );
-
-		if( mvCpuIfTargetWinGet( target, &win ) == MV_OK )
-		{
-			if( win.enable )
-			{
-				mvOsOutput( "base %08x, ", win.addrWin.baseLow );
-				mvSizePrint( win.addrWin.size );
-				mvOsOutput( "\n" );
-
-            }
-			else
-				mvOsOutput( "disable\n" );
-		}
-		else if( mvCpuIfTargetWinGet( target, &win ) == MV_NO_SUCH )
-		{
-				mvOsOutput( "no such\n" );
-		}
-	}
-}
-
-/*******************************************************************************
-* mvCpuIfEnablePex - Enable PCI Express.
-*
-* DESCRIPTION:
-*		This function Enable PCI Express.
-*
-* INPUT:
-*       pexIf   -  PEX interface number.
-*       pexType -  MV_PEX_ROOT_COMPLEX - root complex device
-*		   MV_PEX_END_POINT - end point device
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-#if defined(MV_INCLUDE_PEX)
-MV_VOID mvCpuIfEnablePex(MV_U32 pexIf, MV_PEX_TYPE pexType)
-{
-	/* Set pex mode incase S@R not exist */
-	if( pexType == MV_PEX_END_POINT)
-	{
-		MV_REG_BIT_RESET(PEX_CTRL_REG(pexIf),PXCR_DEV_TYPE_CTRL_MASK);
-		/* Change pex mode in capability reg */
-		MV_REG_BIT_RESET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_CAPABILITY_REG), BIT22);
-		MV_REG_BIT_SET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_CAPABILITY_REG), BIT20);
-
-	}
-	else
-	{	
-		MV_REG_BIT_SET(PEX_CTRL_REG(pexIf),PXCR_DEV_TYPE_CTRL_MASK);
-	}
-
-	/* CPU config register Pex enable */
-	MV_REG_BIT_SET(CPU_CTRL_STAT_REG,CCSR_PCI_ACCESS_MASK);
-}
-#endif
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h
deleted file mode 100644
index 224ed07f59..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIf.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCpuIfh
-#define __INCmvCpuIfh
-
-/* includes */
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIfRegs.h"
-#include "ctrlEnv/sys/mvAhbToMbus.h"
-#include "ddr2/mvDramIf.h"
-#include "ctrlEnv/sys/mvSysDram.h"
-#if defined(MV_INCLUDE_PEX)
-#include "pex/mvPex.h"
-#endif
-
-/* defines  */
-
-/* typedefs */
-/* This structure describes CPU interface address decode window               */
-typedef struct _mvCpuIfDecWin 
-{
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_U32		  winNum;	  /* Window Number in the AHB To Mbus bridge */
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-
-}MV_CPU_DEC_WIN;
-
-
-
-/* mvCpuIfLib.h API list */
-
-/* mvCpuIfLib.h API list */
-
-MV_STATUS mvCpuIfInit(MV_CPU_DEC_WIN *cpuAddrWinMap);
-MV_STATUS mvCpuIfTargetWinSet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin);
-MV_STATUS mvCpuIfTargetWinGet(MV_TARGET target, MV_CPU_DEC_WIN *pAddrDecWin);
-MV_STATUS mvCpuIfTargetWinEnable(MV_TARGET target,MV_BOOL enable);
-MV_U32    mvCpuIfTargetWinSizeGet(MV_TARGET target);
-MV_U32    mvCpuIfTargetWinBaseLowGet(MV_TARGET target);
-MV_U32    mvCpuIfTargetWinBaseHighGet(MV_TARGET target);
-MV_TARGET mvCpuIfTargetOfBaseAddressGet(MV_U32 baseAddress);
-#if defined(MV_INCLUDE_PEX)
-MV_U32    mvCpuIfPexRemap(MV_TARGET pexTarget, MV_ADDR_WIN *pAddrDecWin);
-MV_VOID   mvCpuIfEnablePex(MV_U32 pexIf, MV_PEX_TYPE pexType);
-#endif
-#if defined(MV_INCLUDE_PCI)
-MV_U32    mvCpuIfPciRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin);
-#endif                                               
-MV_U32 	  mvCpuIfPciIfRemap(MV_TARGET pciTarget, MV_ADDR_WIN *pAddrDecWin);
-
-MV_VOID   mvCpuIfAddDecShow(MV_VOID);
-
-#if defined(MV88F6281)
-MV_STATUS mvCpuIfBridgeReorderWAInit(void);
-#endif
-
-#endif /* __INCmvCpuIfh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h
deleted file mode 100644
index 8cfeee2db0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvCpuIfRegs.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvCpuIfRegsh
-#define __INCmvCpuIfRegsh
-
-/****************************************/
-/* ARM Control and Status Registers Map */
-/****************************************/
-
-#define CPU_CONFIG_REG				0x20100
-#define CPU_CTRL_STAT_REG			0x20104
-#define CPU_RSTOUTN_MASK_REG			0x20108
-#define CPU_SYS_SOFT_RST_REG			0x2010C
-#define CPU_AHB_MBUS_CAUSE_INT_REG		0x20110
-#define CPU_AHB_MBUS_MASK_INT_REG		0x20114
-#define CPU_FTDLL_CONFIG_REG			0x20120
-#define CPU_L2_CONFIG_REG			0x20128
-
-
-
-/* ARM Configuration register */
-/* CPU_CONFIG_REG (CCR) */
-
-
-/* Reset vector location */
-#define CCR_VEC_INIT_LOC_OFFS			1
-#define CCR_VEC_INIT_LOC_MASK			BIT1
-/* reset at 0x00000000 */
-#define CCR_VEC_INIT_LOC_0000			(0 << CCR_VEC_INIT_LOC_OFFS)
-/* reset at 0xFFFF0000 */
-#define CCR_VEC_INIT_LOC_FF00			(1 << CCR_VEC_INIT_LOC_OFFS)
-
-
-#define CCR_AHB_ERROR_PROP_OFFS			2
-#define CCR_AHB_ERROR_PROP_MASK			BIT2
-/* Erros are not propogated to AHB */
-#define CCR_AHB_ERROR_PROP_NO_INDICATE		(0 << CCR_AHB_ERROR_PROP_OFFS)
-/* Erros are propogated to AHB */
-#define CCR_AHB_ERROR_PROP_INDICATE		(1 << CCR_AHB_ERROR_PROP_OFFS)
-
-
-#define CCR_ENDIAN_INIT_OFFS			3
-#define CCR_ENDIAN_INIT_MASK			BIT3
-#define CCR_ENDIAN_INIT_LITTLE			(0 << CCR_ENDIAN_INIT_OFFS)
-#define CCR_ENDIAN_INIT_BIG			(1 << CCR_ENDIAN_INIT_OFFS)
-
-
-#define CCR_INCR_EN_OFFS			4
-#define CCR_INCR_EN_MASK			BIT4
-#define CCR_INCR_EN				BIT4
-
-
-#define CCR_NCB_BLOCKING_OFFS			5			
-#define CCR_NCB_BLOCKING_MASK			(1 << CCR_NCB_BLOCKING_OFFS)
-#define CCR_NCB_BLOCKING_NON			(0 << CCR_NCB_BLOCKING_OFFS)
-#define CCR_NCB_BLOCKING_EN			(1 << CCR_NCB_BLOCKING_OFFS)
-
-#define CCR_CPU_2_MBUSL_TICK_DRV_OFFS		8
-#define CCR_CPU_2_MBUSL_TICK_DRV_MASK		(0xF << CCR_CPU_2_MBUSL_TICK_DRV_OFFS)
-#define CCR_CPU_2_MBUSL_TICK_SMPL_OFFS		12
-#define CCR_CPU_2_MBUSL_TICK_SMPL_MASK		(0xF << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS)
-#define CCR_ICACH_PREF_BUF_ENABLE		BIT16
-#define CCR_DCACH_PREF_BUF_ENABLE		BIT17
-
-/* Ratio options for CPU to DDR for 6281/6192/6190 */
-#define CPU_2_DDR_CLK_1x3	    4
-#define CPU_2_DDR_CLK_1x4	    6
-
-/* Ratio options for CPU to DDR for 6281 only */
-#define CPU_2_DDR_CLK_2x9	    7
-#define CPU_2_DDR_CLK_1x5	    8
-#define CPU_2_DDR_CLK_1x6	    9
-
-/* Ratio options for CPU to DDR for 6180 only */
-#define CPU_2_DDR_CLK_1x3_1	    0x5
-#define CPU_2_DDR_CLK_1x4_1	    0x6
-
-/* Default values for CPU to Mbus-L DDR Interface Tick Driver and 	*/
-/* CPU to Mbus-L Tick Sample fields in CPU config register		*/
-
-#define TICK_DRV_1x1	0
-#define TICK_DRV_1x2	0
-#define TICK_DRV_1x3	1
-#define TICK_DRV_1x4	2
-#define TICK_SMPL_1x1	0
-#define TICK_SMPL_1x2	1
-#define TICK_SMPL_1x3	0
-#define TICK_SMPL_1x4	0
-
-#define CPU_2_MBUSL_DDR_CLK_1x2						\
-		 ((TICK_DRV_1x2  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
-		  (TICK_SMPL_1x2 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
-#define CPU_2_MBUSL_DDR_CLK_1x3						\
-		 ((TICK_DRV_1x3  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
-		  (TICK_SMPL_1x3 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
-#define CPU_2_MBUSL_DDR_CLK_1x4						\
-		 ((TICK_DRV_1x4  << CCR_CPU_2_MBUSL_TICK_DRV_OFFS) | 	\
-		  (TICK_SMPL_1x4 << CCR_CPU_2_MBUSL_TICK_SMPL_OFFS))
-
-/* ARM Control and Status register */
-/* CPU_CTRL_STAT_REG (CCSR) */
-
-
-/*
-This is used to block PCI express\PCI from access Socrates/Feroceon GP
-while ARM boot is still in progress
-*/
-
-#define CCSR_PCI_ACCESS_OFFS			0
-#define CCSR_PCI_ACCESS_MASK			BIT0
-#define CCSR_PCI_ACCESS_ENABLE			(0 << CCSR_PCI_ACCESS_OFFS)
-#define CCSR_PCI_ACCESS_DISBALE			(1 << CCSR_PCI_ACCESS_OFFS)
-
-#define CCSR_ARM_RESET				BIT1
-#define CCSR_SELF_INT				BIT2
-#define CCSR_BIG_ENDIAN				BIT15
-
-
-/* RSTOUTn Mask Register */
-/* CPU_RSTOUTN_MASK_REG (CRMR) */
-
-#define CRMR_PEX_RST_OUT_OFFS			0
-#define CRMR_PEX_RST_OUT_MASK			BIT0
-#define CRMR_PEX_RST_OUT_ENABLE			(1 << CRMR_PEX_RST_OUT_OFFS)
-#define CRMR_PEX_RST_OUT_DISABLE		(0 << CRMR_PEX_RST_OUT_OFFS)
-
-#define CRMR_WD_RST_OUT_OFFS			1
-#define CRMR_WD_RST_OUT_MASK			BIT1
-#define CRMR_WD_RST_OUT_ENABLE			(1 << CRMR_WD_RST_OUT_OFFS)
-#define CRMR_WD_RST_OUT_DISBALE			(0 << CRMR_WD_RST_OUT_OFFS)			
-
-#define CRMR_SOFT_RST_OUT_OFFS			2
-#define CRMR_SOFT_RST_OUT_MASK			BIT2
-#define CRMR_SOFT_RST_OUT_ENABLE		(1 << CRMR_SOFT_RST_OUT_OFFS)
-#define CRMR_SOFT_RST_OUT_DISBALE		(0 << CRMR_SOFT_RST_OUT_OFFS)
-
-/* System Software Reset Register */
-/* CPU_SYS_SOFT_RST_REG (CSSRR) */
-
-#define CSSRR_SYSTEM_SOFT_RST			BIT0
-
-/* AHB to Mbus Bridge Interrupt Cause Register*/
-/* CPU_AHB_MBUS_CAUSE_INT_REG (CAMCIR) */
-
-#define CAMCIR_ARM_SELF_INT			BIT0
-#define CAMCIR_ARM_TIMER0_INT_REQ		BIT1
-#define CAMCIR_ARM_TIMER1_INT_REQ		BIT2
-#define CAMCIR_ARM_WD_TIMER_INT_REQ		BIT3
-
-
-/* AHB to Mbus Bridge Interrupt Mask Register*/
-/* CPU_AHB_MBUS_MASK_INT_REG (CAMMIR) */
-
-#define CAMCIR_ARM_SELF_INT_OFFS		0
-#define CAMCIR_ARM_SELF_INT_MASK		BIT0
-#define CAMCIR_ARM_SELF_INT_EN			(1 << CAMCIR_ARM_SELF_INT_OFFS)
-#define CAMCIR_ARM_SELF_INT_DIS			(0 << CAMCIR_ARM_SELF_INT_OFFS)
-
-
-#define CAMCIR_ARM_TIMER0_INT_REQ_OFFS		1
-#define CAMCIR_ARM_TIMER0_INT_REQ_MASK		BIT1
-#define CAMCIR_ARM_TIMER0_INT_REQ_EN		(1 << CAMCIR_ARM_TIMER0_INT_REQ_OFFS) 
-#define CAMCIR_ARM_TIMER0_INT_REQ_DIS		(0 << CAMCIR_ARM_TIMER0_INT_REQ_OFFS)
-
-#define CAMCIR_ARM_TIMER1_INT_REQ_OFFS		2
-#define CAMCIR_ARM_TIMER1_INT_REQ_MASK		BIT2
-#define CAMCIR_ARM_TIMER1_INT_REQ_EN		(1 << CAMCIR_ARM_TIMER1_INT_REQ_OFFS) 
-#define CAMCIR_ARM_TIMER1_INT_REQ_DIS		(0 << CAMCIR_ARM_TIMER1_INT_REQ_OFFS) 
-
-#define CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS 	3
-#define CAMCIR_ARM_WD_TIMER_INT_REQ_MASK 	BIT3
-#define CAMCIR_ARM_WD_TIMER_INT_REQ_EN	 	(1 << CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS) 
-#define CAMCIR_ARM_WD_TIMER_INT_REQ_DIS	 	(0 << CAMCIR_ARM_WD_TIMER_INT_REQ_OFFS) 
-
-/* CPU FTDLL Config register (CFCR) fields */
-#define CFCR_FTDLL_ICACHE_TAG_OFFS		0
-#define CFCR_FTDLL_ICACHE_TAG_MASK		(0x7F << CFCR_FTDLL_ICACHE_TAG_OFFS)
-#define CFCR_FTDLL_DCACHE_TAG_OFFS		8
-#define CFCR_FTDLL_DCACHE_TAG_MASK		(0x7F << CFCR_FTDLL_DCACHE_TAG_OFFS)
-#define CFCR_FTDLL_OVERWRITE_ENABLE		(1 << 15)
-/* For Orion 2 D2 only */
-#define CFCR_MRVL_CPU_ID_OFFS			16
-#define CFCR_MRVL_CPU_ID_MASK			(0x1 << CFCR_MRVL_CPU_ID_OFFS)
-#define CFCR_ARM_CPU_ID				(0x0 << CFCR_MRVL_CPU_ID_OFFS)
-#define CFCR_MRVL_CPU_ID			(0x1 << CFCR_MRVL_CPU_ID_OFFS)
-#define CFCR_VFP_SUB_ARC_NUM_OFFS		7
-#define CFCR_VFP_SUB_ARC_NUM_MASK		(0x1 << CFCR_VFP_SUB_ARC_NUM_OFFS)
-#define CFCR_VFP_SUB_ARC_NUM_1			(0x0 << CFCR_VFP_SUB_ARC_NUM_OFFS)
-#define CFCR_VFP_SUB_ARC_NUM_2			(0x1 << CFCR_VFP_SUB_ARC_NUM_OFFS)
-
-/* CPU_L2_CONFIG_REG fields */
-#ifdef MV_CPU_LE
-#define CL2CR_L2_ECC_EN_OFFS			2
-#define CL2CR_L2_WT_MODE_OFFS			4
-#else
-#define CL2CR_L2_ECC_EN_OFFS			26
-#define CL2CR_L2_WT_MODE_OFFS			28
-#endif
-
-#define CL2CR_L2_ECC_EN_MASK			(1 << CL2CR_L2_ECC_EN_OFFS)
-#define CL2CR_L2_WT_MODE_MASK			(1 << CL2CR_L2_WT_MODE_OFFS)
-
-/*******************************************/
-/* Main Interrupt Controller Registers Map */
-/*******************************************/
-
-#define CPU_MAIN_INT_CAUSE_REG			0x20200
-#define CPU_MAIN_IRQ_MASK_REG			0x20204
-#define CPU_MAIN_FIQ_MASK_REG			0x20208
-#define CPU_ENPOINT_MASK_REG			0x2020C
-#define CPU_MAIN_INT_CAUSE_HIGH_REG		0x20210
-#define CPU_MAIN_IRQ_MASK_HIGH_REG		0x20214
-#define CPU_MAIN_FIQ_MASK_HIGH_REG		0x20218
-#define CPU_ENPOINT_MASK_HIGH_REG		0x2021C
-
-
-/*******************************************/
-/* ARM Doorbell Registers Map		   */
-/*******************************************/
-
-#define CPU_HOST_TO_ARM_DRBL_REG		0x20400
-#define CPU_HOST_TO_ARM_MASK_REG		0x20404
-#define CPU_ARM_TO_HOST_DRBL_REG		0x20408
-#define CPU_ARM_TO_HOST_MASK_REG		0x2040C
-
-
-
-/* CPU control register map */
-/* Set bits means value is about to change according to new value */
-#define CPU_CONFIG_DEFAULT_MASK         	(CCR_VEC_INIT_LOC_MASK  | CCR_AHB_ERROR_PROP_MASK)      
-
-#define CPU_CONFIG_DEFAULT                      (CCR_VEC_INIT_LOC_FF00)
-                 
-/* CPU Control and status defaults */
-#define CPU_CTRL_STAT_DEFAULT_MASK              (CCSR_PCI_ACCESS_MASK)
-                                                                        
-
-#define CPU_CTRL_STAT_DEFAULT                   (CCSR_PCI_ACCESS_ENABLE)
-
-#endif /* __INCmvCpuIfRegsh */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c
deleted file mode 100644
index 769475f8f4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#include "mvSysAudio.h"
-
-/*******************************************************************************
-* mvAudioWinSet - Set AUDIO target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
-*       address window, also known as address decode window. 
-*       After setting this target window, the AUDIO will be able to access the 
-*       target within the address window. 
-*
-* INPUT:
-*       winNum      - AUDIO target address decode window number.
-*       pAddrDecWin - AUDIO target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is 
-*       unknown.
-*
-*******************************************************************************/
-MV_STATUS mvAudioWinSet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttribs;
-    MV_DEC_REGS         decRegs;
-
-    /* Parameter checking   */
-    if (winNum >= MV_AUDIO_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
-        return MV_BAD_PARAM;
-    }
-    
-    /* check if address is aligned to the size */
-    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-    {
-		mvOsPrintf("mvAudioWinSet:Error setting AUDIO window %d to "\
-			   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-			   winNum,
-			   mvCtrlTargetNameGet(pAddrDecWin->target), 
-			   pAddrDecWin->addrWin.baseLow,
-			   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-    }
-
-    decRegs.baseReg = 0;
-    decRegs.sizeReg = 0;
-
-    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-    {
-        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
-        return MV_ERROR;
-    }
-
-    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
-                                                                                                                         
-    /* set attributes */
-    decRegs.sizeReg &= ~MV_AUDIO_WIN_ATTR_MASK;
-    decRegs.sizeReg |= (targetAttribs.attrib << MV_AUDIO_WIN_ATTR_OFFSET);
-
-    /* set target ID */
-    decRegs.sizeReg &= ~MV_AUDIO_WIN_TARGET_MASK;
-    decRegs.sizeReg |= (targetAttribs.targetId << MV_AUDIO_WIN_TARGET_OFFSET);
-
-    if (pAddrDecWin->enable == MV_TRUE)
-    {
-        decRegs.sizeReg |= MV_AUDIO_WIN_ENABLE_MASK;
-    }
-    else
-    {
-        decRegs.sizeReg &= ~MV_AUDIO_WIN_ENABLE_MASK;
-    }
-
-    MV_REG_WRITE( MV_AUDIO_WIN_CTRL_REG(winNum), decRegs.sizeReg);
-    MV_REG_WRITE( MV_AUDIO_WIN_BASE_REG(winNum), decRegs.baseReg);
-    
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvAudioWinGet - Get AUDIO peripheral target address window.
-*
-* DESCRIPTION:
-*       Get AUDIO peripheral target address window.
-*
-* INPUT:
-*       winNum - AUDIO target address decode window number.
-*
-* OUTPUT:
-*       pAddrDecWin - AUDIO target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvAudioWinGet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS         decRegs;
-    MV_TARGET_ATTRIB    targetAttrib;
-                                                                                                                         
-    /* Parameter checking   */
-    if (winNum >= MV_AUDIO_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s : ERR. Invalid winNum %d\n", 
-                    __FUNCTION__,  winNum);
-        return MV_NOT_SUPPORTED;
-    }
-
-    decRegs.baseReg = MV_REG_READ( MV_AUDIO_WIN_BASE_REG(winNum) );
-    decRegs.sizeReg = MV_REG_READ( MV_AUDIO_WIN_CTRL_REG(winNum) );
- 
-    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
-    {
-        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
-        return MV_ERROR; 
-    }
-       
-    /* attrib and targetId */
-    targetAttrib.attrib = (decRegs.sizeReg & MV_AUDIO_WIN_ATTR_MASK) >> 
-		MV_AUDIO_WIN_ATTR_OFFSET;
-    targetAttrib.targetId = (decRegs.sizeReg & MV_AUDIO_WIN_TARGET_MASK) >> 
-		MV_AUDIO_WIN_TARGET_OFFSET;
- 
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-    /* Check if window is enabled   */
-    if(decRegs.sizeReg & MV_AUDIO_WIN_ENABLE_MASK) 
-    {
-        pAddrDecWin->enable = MV_TRUE;
-    }
-    else
-    {
-        pAddrDecWin->enable = MV_FALSE;
-    }
-    return MV_OK;
-}
-/*******************************************************************************
-* mvAudioAddrDecShow - Print the AUDIO address decode map.
-*
-* DESCRIPTION:
-*		This function print the AUDIO address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvAudioAddrDecShow(MV_VOID)
-{
-
-	MV_AUDIO_DEC_WIN win;
-	int i;
-
-	if (MV_FALSE == mvCtrlPwrClckGet(AUDIO_UNIT_ID, 0)) 
-		return;
-
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "AUDIO:\n" );
-	mvOsOutput( "----\n" );
-
-	for( i = 0; i < MV_AUDIO_MAX_ADDR_DECODE_WIN; i++ )
-	{
-            memset( &win, 0, sizeof(MV_AUDIO_DEC_WIN) );
-
-	    mvOsOutput( "win%d - ", i );
-
-	    if( mvAudioWinGet( i, &win ) == MV_OK )
-	    {
-	        if( win.enable )
-	        {
-                    mvOsOutput( "%s base %08x, ",
-                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-                    mvOsOutput( "...." );
-
-                    mvSizePrint( win.addrWin.size );
-    
-		    mvOsOutput( "\n" );
-                }
-		else
-		mvOsOutput( "disable\n" );
-	    }
-	}
-}
-
-
-/*******************************************************************************
-* mvAudioWinInit - Initialize the integrated AUDIO target address window.
-*
-* DESCRIPTION:
-*       Initialize the AUDIO peripheral target address window.
-*
-* INPUT:
-*
-*
-* OUTPUT:
-*     
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvAudioInit(MV_VOID)
-{
-    int             winNum;
-    MV_AUDIO_DEC_WIN  audioWin;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    MV_U32          status;
-
-    mvAudioHalInit();
-
-    /* Initiate Audio address decode */
-
-    /* First disable all address decode windows */
-    for(winNum = 0; winNum < MV_AUDIO_MAX_ADDR_DECODE_WIN; winNum++)
-    {
-        MV_U32  regVal = MV_REG_READ(MV_AUDIO_WIN_CTRL_REG(winNum));
-        regVal &= ~MV_AUDIO_WIN_ENABLE_MASK;
-        MV_REG_WRITE(MV_AUDIO_WIN_CTRL_REG(winNum), regVal);
-    }
-
-    for(winNum = 0; winNum < MV_AUDIO_MAX_ADDR_DECODE_WIN; winNum++)
-    {
-
-		/* We will set the Window to DRAM_CS0 in default */
-		/* first get attributes from CPU If */
-		status = mvCpuIfTargetWinGet(SDRAM_CS0,
-									 &cpuAddrDecWin);
-	
-		if (MV_OK != status)
-		{
-				mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
-			return MV_ERROR;
-		}
-	
-		if (cpuAddrDecWin.enable == MV_TRUE)
-		{
-			audioWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-			audioWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
-			audioWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
-			audioWin.enable           = MV_TRUE;
-			audioWin.target           = SDRAM_CS0;
-	
-			if(MV_OK != mvAudioWinSet(winNum, &audioWin))
-			{
-				return MV_ERROR;
-			}
-		}
-	}
-
-    return MV_OK;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h
deleted file mode 100644
index f59eb9a904..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysAudio.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __INCMVSysAudioH
-#define __INCMVSysAudioH
-
-#include "mvCommon.h"
-#include "audio/mvAudio.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-/***********************************/
-/* Audio Address Decoding registers*/
-/***********************************/
-
-#define MV_AUDIO_MAX_ADDR_DECODE_WIN 		2
-#define MV_AUDIO_RECORD_WIN_NUM			0
-#define MV_AUDIO_PLAYBACK_WIN_NUM		1
-
-#define MV_AUDIO_WIN_CTRL_REG(win)        (AUDIO_REG_BASE + 0xA04 + ((win)<<3))
-#define MV_AUDIO_WIN_BASE_REG(win)        (AUDIO_REG_BASE + 0xA00 + ((win)<<3))
-
-#define MV_AUDIO_RECORD_WIN_CTRL_REG		MV_AUDIO_WIN_CTRL_REG(MV_AUDIO_RECORD_WIN_NUM)
-#define MV_AUDIO_RECORD_WIN_BASE_REG		MV_AUDIO_WIN_BASE_REG(MV_AUDIO_RECORD_WIN_NUM)
-#define MV_AUDIO_PLAYBACK_WIN_CTRL_REG		MV_AUDIO_WIN_CTRL_REG(MV_AUDIO_PLAYBACK_WIN_NUM)
-#define MV_AUDIO_PLAYBACK_WIN_BASE_REG		MV_AUDIO_WIN_BASE_REG(MV_AUDIO_PLAYBACK_WIN_NUM)
-
-
-/* BITs in Windows 0-3 Control and Base Registers */
-#define MV_AUDIO_WIN_ENABLE_BIT               0
-#define MV_AUDIO_WIN_ENABLE_MASK              (1<<MV_AUDIO_WIN_ENABLE_BIT)
-
-#define MV_AUDIO_WIN_TARGET_OFFSET            4
-#define MV_AUDIO_WIN_TARGET_MASK              (0xF<<MV_AUDIO_WIN_TARGET_OFFSET)
-
-#define MV_AUDIO_WIN_ATTR_OFFSET              8
-#define MV_AUDIO_WIN_ATTR_MASK                (0xFF<<MV_AUDIO_WIN_ATTR_OFFSET)
-
-#define MV_AUDIO_WIN_SIZE_OFFSET              16
-#define MV_AUDIO_WIN_SIZE_MASK                (0xFFFF<<MV_AUDIO_WIN_SIZE_OFFSET)
-
-#define MV_AUDIO_WIN_BASE_OFFSET              16
-#define MV_AUDIO_WIN_BASE_MASK                (0xFFFF<<MV_AUDIO_WIN_BASE_OFFSET)
-
-
-typedef struct _mvAudioDecWin
-{
-    MV_TARGET     target;
-    MV_ADDR_WIN   addrWin;    /* An address window*/
-    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
- 
-} MV_AUDIO_DEC_WIN;
-
-
-MV_STATUS mvAudioInit(MV_VOID);
-MV_STATUS mvAudioWinGet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin);
-MV_STATUS mvAudioWinSet(MV_U32 winNum, MV_AUDIO_DEC_WIN *pAddrDecWin);
-MV_STATUS mvAudioWinInit(MV_VOID);
-MV_VOID   mvAudioAddrDecShow(MV_VOID);
-
-
-#endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c
deleted file mode 100644
index 84d0cd0bd7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvSysCesa.h"
-
-#if (MV_CESA_VERSION >= 2)
-MV_TARGET tdmaAddrDecPrioTable[] =
-{
-#if defined(MV_INCLUDE_SDRAM_CS0)
-    SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-    SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-    SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-    SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_PEX)
-    PEX0_MEM,
-#endif
-
-    TBL_TERM
-};
-
-/*******************************************************************************
-* mvCesaWinGet - Get TDMA target address window.
-*
-* DESCRIPTION:
-*       Get TDMA target address window.
-*
-* INPUT:
-*       winNum - TDMA target address decode window number.
-*
-* OUTPUT:
-*       pDecWin - TDMA target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-static MV_STATUS mvCesaWinGet(MV_U32 winNum, MV_DEC_WIN *pDecWin)
-{                                                                                                                         
-    MV_DEC_WIN_PARAMS   winParam;
-    MV_U32              sizeReg, baseReg;
-
-    /* Parameter checking   */
-    if (winNum >= MV_CESA_TDMA_ADDR_DEC_WIN)
-    {
-        mvOsPrintf("%s : ERR. Invalid winNum %d\n", 
-                    __FUNCTION__, winNum);
-        return MV_NOT_SUPPORTED;
-    }
-
-    baseReg = MV_REG_READ( MV_CESA_TDMA_BASE_ADDR_REG(winNum) );
-    sizeReg = MV_REG_READ( MV_CESA_TDMA_WIN_CTRL_REG(winNum) );
- 
-   /* Check if window is enabled   */
-    if(sizeReg & MV_CESA_TDMA_WIN_ENABLE_MASK) 
-    {
-        pDecWin->enable = MV_TRUE;
-
-        /* Extract window parameters from registers */
-        winParam.targetId = (sizeReg & MV_CESA_TDMA_WIN_TARGET_MASK) >> MV_CESA_TDMA_WIN_TARGET_OFFSET; 
-        winParam.attrib   = (sizeReg & MV_CESA_TDMA_WIN_ATTR_MASK) >> MV_CESA_TDMA_WIN_ATTR_OFFSET;
-        winParam.size     = (sizeReg & MV_CESA_TDMA_WIN_SIZE_MASK) >> MV_CESA_TDMA_WIN_SIZE_OFFSET;
-        winParam.baseAddr = (baseReg & MV_CESA_TDMA_WIN_BASE_MASK);
-
-        /* Translate the decode window parameters to address decode struct */
-        if (MV_OK != mvCtrlParamsToAddrDec(&winParam, pDecWin))
-        {
-            mvOsPrintf("Failed to translate register parameters to CESA address" \
-                       " decode window structure\n");
-            return MV_ERROR;        
-        }
-    }
-    else
-    {
-        pDecWin->enable = MV_FALSE;
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* cesaWinOverlapDetect - Detect CESA TDMA address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case TDMA address decode 
-*       windows overlapps.
-*       This function detects TDMA address decode windows overlapping of a 
-*       specified window. The function does not check the window itself for 
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE     - if the given address window overlap current address
-*                   decode map, 
-*       MV_FALSE    - otherwise, MV_ERROR if reading invalid data 
-*                   from registers.
-*
-*******************************************************************************/
-static MV_STATUS cesaWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32          winNumIndex;
-    MV_DEC_WIN      addrDecWin;
-    
-    for(winNumIndex=0; winNumIndex<MV_CESA_TDMA_ADDR_DEC_WIN; winNumIndex++)
-    {
-        /* Do not check window itself       */
-        if (winNumIndex == winNum)
-        {
-            continue;
-        }
-
-        /* Get window parameters    */
-        if (MV_OK != mvCesaWinGet(winNumIndex, &addrDecWin))
-        {
-            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
-            return MV_ERROR;
-        }
-
-        /* Do not check disabled windows    */
-        if(addrDecWin.enable == MV_FALSE)
-        {
-            continue;
-        }
-
-        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-        {
-            return MV_TRUE;
-        }        
-    }
-    return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvCesaTdmaWinSet - Set CESA TDMA target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
-*       address window, also known as address decode window. 
-*       After setting this target window, the CESA TDMA will be able to access the 
-*       target within the address window. 
-*
-* INPUT:
-*       winNum      - CESA TDMA target address decode window number.
-*       pAddrDecWin - CESA TDMA target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR        - if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM    - if base address is invalid parameter or target is 
-*                       unknown.
-*
-*******************************************************************************/
-static MV_STATUS mvCesaTdmaWinSet(MV_U32 winNum, MV_DEC_WIN *pDecWin)
-{
-    MV_DEC_WIN_PARAMS   winParams;
-    MV_U32              sizeReg, baseReg;
-    
-    /* Parameter checking   */
-    if (winNum >= MV_CESA_TDMA_ADDR_DEC_WIN)
-    {
-        mvOsPrintf("mvCesaTdmaWinSet: ERR. Invalid win num %d\n",winNum);
-        return MV_BAD_PARAM;
-    }
-
-    /* Check if the requested window overlapps with current windows     */
-    if (MV_TRUE == cesaWinOverlapDetect(winNum, &pDecWin->addrWin))
-    {
-        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
-        return MV_ERROR;
-    }
-
-    /* check if address is aligned to the size */
-    if(MV_IS_NOT_ALIGN(pDecWin->addrWin.baseLow, pDecWin->addrWin.size))
-    {
-        mvOsPrintf("mvCesaTdmaWinSet: Error setting CESA TDMA window %d to "\
-                   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-                   winNum,
-                   mvCtrlTargetNameGet(pDecWin->target), 
-                   pDecWin->addrWin.baseLow,
-                   pDecWin->addrWin.size);
-        return MV_ERROR;
-    }
-
-    if(MV_OK != mvCtrlAddrDecToParams(pDecWin, &winParams))
-    {
-        mvOsPrintf("%s: mvCtrlAddrDecToParams Failed\n", __FUNCTION__);
-        return MV_ERROR;
-    }
-
-    /* set Size, Attributes and TargetID */
-    sizeReg = (((winParams.targetId << MV_CESA_TDMA_WIN_TARGET_OFFSET) & MV_CESA_TDMA_WIN_TARGET_MASK) |
-               ((winParams.attrib   << MV_CESA_TDMA_WIN_ATTR_OFFSET)   & MV_CESA_TDMA_WIN_ATTR_MASK)   |
-               ((winParams.size << MV_CESA_TDMA_WIN_SIZE_OFFSET) & MV_CESA_TDMA_WIN_SIZE_MASK));
-
-    if (pDecWin->enable == MV_TRUE)
-    {
-        sizeReg |= MV_CESA_TDMA_WIN_ENABLE_MASK;
-    }
-    else
-    {
-        sizeReg &= ~MV_CESA_TDMA_WIN_ENABLE_MASK;
-    }
-
-    /* Update Base value  */
-    baseReg = (winParams.baseAddr & MV_CESA_TDMA_WIN_BASE_MASK);     
-
-    MV_REG_WRITE( MV_CESA_TDMA_WIN_CTRL_REG(winNum), sizeReg);
-    MV_REG_WRITE( MV_CESA_TDMA_BASE_ADDR_REG(winNum), baseReg);
-        
-    return MV_OK;
-}
-
-
-static MV_STATUS   mvCesaTdmaAddrDecInit (void)
-{
-    MV_U32          winNum;
-    MV_STATUS       status;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    MV_DEC_WIN      cesaWin;
-    MV_U32          winPrioIndex = 0;
-
-    /* First disable all address decode windows */
-    for(winNum=0; winNum<MV_CESA_TDMA_ADDR_DEC_WIN; winNum++)
-    {
-        MV_REG_BIT_RESET(MV_CESA_TDMA_WIN_CTRL_REG(winNum), MV_CESA_TDMA_WIN_ENABLE_MASK);
-    }
-
-    /* Go through all windows in user table until table terminator      */
-    winNum = 0;
-    while( (tdmaAddrDecPrioTable[winPrioIndex] != TBL_TERM) && 
-           (winNum < MV_CESA_TDMA_ADDR_DEC_WIN) )    {
-
-        /* first get attributes from CPU If */
-        status = mvCpuIfTargetWinGet(tdmaAddrDecPrioTable[winPrioIndex], 
-                                     &cpuAddrDecWin);
-        if(MV_NO_SUCH == status){
-	    winPrioIndex++;
-            continue;
-	}
-
-        if (MV_OK != status)
-        {
-            mvOsPrintf("cesaInit: TargetWinGet failed. winNum=%d, winIdx=%d, target=%d, status=0x%x\n",
-                        winNum, winPrioIndex, tdmaAddrDecPrioTable[winPrioIndex], status);
-            return MV_ERROR;
-        }
-        if (cpuAddrDecWin.enable == MV_TRUE)
-        {
-            cesaWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-            cesaWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
-            cesaWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
-            cesaWin.enable           = MV_TRUE;
-            cesaWin.target           = tdmaAddrDecPrioTable[winPrioIndex];
-
-#if defined(MV646xx) 
-            /* Get the default attributes for that target window */
-            mvCtrlDefAttribGet(cesaWin.target, &cesaWin.addrWinAttr);
-#endif /* MV646xx */ 
-
-            if(MV_OK != mvCesaTdmaWinSet(winNum, &cesaWin))
-            {
-                mvOsPrintf("mvCesaTdmaWinSet FAILED: winNum=%d\n",
-                           winNum);
-                return MV_ERROR;
-            }
-            winNum++;
-        }
-        winPrioIndex++;
-    }
-    return MV_OK;
-}
-#endif /* MV_CESA_VERSION >= 2 */
-
-
-
-
-MV_STATUS mvCesaInit (int numOfSession, int queueDepth, char* pSramBase, void *osHandle)
-{
-    MV_U32 cesaCryptEngBase;
-    MV_CPU_DEC_WIN addrDecWin;
-
-    if(sizeof(MV_CESA_SRAM_MAP) > MV_CESA_SRAM_SIZE)
-    {
-        mvOsPrintf("mvCesaInit: Wrong SRAM map - %ld > %d\n",
-                sizeof(MV_CESA_SRAM_MAP), MV_CESA_SRAM_SIZE);
-        return MV_FAIL;
-    }
-#if 0
-    if (mvCpuIfTargetWinGet(CRYPT_ENG, &addrDecWin) == MV_OK)
-        cesaCryptEngBase = addrDecWin.addrWin.baseLow;
-    else
-    {
-        mvOsPrintf("mvCesaInit: ERR. mvCpuIfTargetWinGet failed\n");
-        return MV_ERROR;
-    }
-#else
-        cesaCryptEngBase = (MV_U32)pSramBase;
-#endif     
-
-#if 0 /* Already done in the platform init */
-#if (MV_CESA_VERSION >= 2)
-    mvCesaTdmaAddrDecInit();
-#endif /* MV_CESA_VERSION >= 2 */
-#endif
-	return mvCesaHalInit(numOfSession, queueDepth, pSramBase, cesaCryptEngBase, 
-			     osHandle);
-
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h
deleted file mode 100644
index 73bcdc5832..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysCesa.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __mvSysCesa_h__
-#define __mvSysCesa_h__
-
-
-#include "mvCommon.h"
-#include "cesa/mvCesa.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-/***************************** TDMA Registers *************************************/
-
-#define MV_CESA_TDMA_ADDR_DEC_WIN           4
-
-#define MV_CESA_TDMA_BASE_ADDR_REG(win)     (MV_CESA_TDMA_REG_BASE + 0xa00 + (win<<3))
-
-#define MV_CESA_TDMA_WIN_CTRL_REG(win)      (MV_CESA_TDMA_REG_BASE + 0xa04 + (win<<3))
-
-#define MV_CESA_TDMA_WIN_ENABLE_BIT         0
-#define MV_CESA_TDMA_WIN_ENABLE_MASK        (1 << MV_CESA_TDMA_WIN_ENABLE_BIT)
-
-#define MV_CESA_TDMA_WIN_TARGET_OFFSET      4 
-#define MV_CESA_TDMA_WIN_TARGET_MASK        (0xf << MV_CESA_TDMA_WIN_TARGET_OFFSET)
-
-#define MV_CESA_TDMA_WIN_ATTR_OFFSET        8 
-#define MV_CESA_TDMA_WIN_ATTR_MASK          (0xff << MV_CESA_TDMA_WIN_ATTR_OFFSET)
-
-#define MV_CESA_TDMA_WIN_SIZE_OFFSET        16
-#define MV_CESA_TDMA_WIN_SIZE_MASK          (0xFFFF << MV_CESA_TDMA_WIN_SIZE_OFFSET)
-
-#define MV_CESA_TDMA_WIN_BASE_OFFSET        16
-#define MV_CESA_TDMA_WIN_BASE_MASK          (0xFFFF << MV_CESA_TDMA_WIN_BASE_OFFSET)
-
-
-MV_STATUS   mvCesaInit (int numOfSession, int queueDepth, char* pSramBase, void *osHandle);
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c
deleted file mode 100644
index 6f76c2caa9..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-
-#include "ddr2/mvDramIf.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/sys/mvSysDram.h"
-
-/* #define MV_DEBUG */
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
-
-/*******************************************************************************
-* mvDramIfWinSet - Set DRAM interface address decode window
-*
-* DESCRIPTION: 
-*       This function sets DRAM interface address decode window.
-*
-* INPUT:
-*	    target      - System target. Use only SDRAM targets.
-*       pAddrDecWin - SDRAM address window structure.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
-*       otherwise.
-*******************************************************************************/
-MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
-{
-	MV_U32 baseReg=0,sizeReg=0;
-	MV_U32 baseToReg=0 , sizeToReg=0;
-
-    /* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinSet: target %d is not SDRAM\n", target);
-		return MV_BAD_PARAM;
-	}
-
-    /* Check if the requested window overlaps with current enabled windows	*/
-    if (MV_TRUE == sdramIfWinOverlap(target, &pAddrDecWin->addrWin))
-	{
-        mvOsPrintf("mvDramIfWinSet: ERR. Target %d overlaps\n", target);
-		return MV_BAD_PARAM;
-	}
-
-	/* check if address is aligned to the size */
-	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvDramIfWinSet:Error setting DRAM interface window %d."\
-				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
-                   target, 
-				   pAddrDecWin->addrWin.baseLow,
-				   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-	/* read base register*/
-	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(0,target));
-
-	/* read size register */
-	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(0,target));
-
-	/* BaseLow[31:16] => base register [31:16]		*/
-	baseToReg = pAddrDecWin->addrWin.baseLow & SCBAR_BASE_MASK;
-
-	/* Write to address decode Base Address Register                  */
-	baseReg &= ~SCBAR_BASE_MASK;
-	baseReg |= baseToReg;
-
-	/* Translate the given window size to register format			*/
-	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, SCSR_SIZE_ALIGNMENT);
-
-	/* Size parameter validity check.                                   */
-	if (-1 == sizeToReg)
-	{
-		mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n",target);
-		return MV_BAD_PARAM;
-	}
-
-	/* set size */
-	sizeReg &= ~SCSR_SIZE_MASK;
-	/* Size is located at upper 16 bits */
-	sizeReg |= (sizeToReg << SCSR_SIZE_OFFS);
-
-	/* enable/Disable */
-	if (MV_TRUE == pAddrDecWin->enable)
-	{
-		sizeReg |= SCSR_WIN_EN;
-	}
-	else
-	{
-		sizeReg &= ~SCSR_WIN_EN;
-	}
-
-	/* 3) Write to address decode Base Address Register                   */
-	MV_REG_WRITE(SDRAM_BASE_ADDR_REG(0,target), baseReg);
-
-	/* Write to address decode Size Register                        	*/
-	MV_REG_WRITE(SDRAM_SIZE_REG(0,target), sizeReg);
-	
-	return MV_OK;
-}
-/*******************************************************************************
-* mvDramIfWinGet - Get DRAM interface address decode window
-*
-* DESCRIPTION: 
-*       This function gets DRAM interface address decode window.
-*
-* INPUT:
-*	    target - System target. Use only SDRAM targets.
-*
-* OUTPUT:
-*       pAddrDecWin - SDRAM address window structure.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
-*       otherwise.
-*******************************************************************************/
-MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
-{
-	MV_U32 baseReg,sizeReg;
-	MV_U32 sizeRegVal;
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinGet: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	/* Read base and size registers */
-	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(0,target));
-	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(0,target));
-
-	sizeRegVal = (sizeReg & SCSR_SIZE_MASK) >> SCSR_SIZE_OFFS;
-
-	pAddrDecWin->addrWin.size = ctrlRegToSize(sizeRegVal,
-							SCSR_SIZE_ALIGNMENT);
-
-    	/* Check if ctrlRegToSize returned OK */
-	if (-1 == pAddrDecWin->addrWin.size)
-	{
-		mvOsPrintf("mvDramIfWinGet: size of target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	/* Extract base address						*/
-	/* Base register [31:16] ==> baseLow[31:16] 		*/
-	pAddrDecWin->addrWin.baseLow = baseReg & SCBAR_BASE_MASK;
-
-	pAddrDecWin->addrWin.baseHigh =  0;
-
-
-	if (sizeReg & SCSR_WIN_EN)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;			
-	}
-
-	return MV_OK;
-}
-/*******************************************************************************
-* mvDramIfWinEnable - Enable/Disable SDRAM address decode window
-*
-* DESCRIPTION: 
-*		This function enable/Disable SDRAM address decode window.
-*
-* INPUT:
-*	    target - System target. Use only SDRAM targets.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		MV_ERROR in case function parameter are invalid, MV_OK otherewise.
-*
-*******************************************************************************/
-MV_STATUS mvDramIfWinEnable(MV_TARGET target, MV_BOOL enable)
-{
-	MV_DRAM_DEC_WIN 	addrDecWin;
-
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinEnable: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	if (enable == MV_TRUE) 
-	{   /* First check for overlap with other enabled windows				*/
-		if (MV_OK != mvDramIfWinGet(target, &addrDecWin))
-		{
-			mvOsPrintf("mvDramIfWinEnable:ERR. Getting target %d failed.\n", 
-                                                                        target);
-			return MV_ERROR;
-		}
-		/* Check for overlapping */
-		if (MV_FALSE == sdramIfWinOverlap(target, &(addrDecWin.addrWin)))
-		{
-			/* No Overlap. Enable address decode winNum window              */
-			MV_REG_BIT_SET(SDRAM_SIZE_REG(0,target), SCSR_WIN_EN);
-		}
-		else
-		{   /* Overlap detected	*/
-			mvOsPrintf("mvDramIfWinEnable: ERR. Target %d overlap detect\n",
-                                                                        target);
-			return MV_ERROR;
-		}
-	}
-	else
-	{   /* Disable address decode winNum window                             */
-		MV_REG_BIT_RESET(SDRAM_SIZE_REG(0, target), SCSR_WIN_EN);
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* sdramIfWinOverlap - Check if an address window overlap an SDRAM address window
-*
-* DESCRIPTION:
-*		This function scan each SDRAM address decode window to test if it 
-*		overlapps the given address windoow 
-*
-* INPUT:
-*       target      - SDRAM target where the function skips checking.
-*       pAddrDecWin - The tested address window for overlapping with 
-*					  SDRAM windows.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlaps any enabled address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
-{
-	MV_TARGET	targetNum;
-	MV_DRAM_DEC_WIN 	addrDecWin;
-	
-	for(targetNum = SDRAM_CS0; targetNum < MV_DRAM_MAX_CS ; targetNum++)
-	{
-		/* don't check our winNum or illegal targets */
-		if (targetNum == target)
-		{
-			continue;
-		}
-		
-		/* Get window parameters 	*/
-		if (MV_OK != mvDramIfWinGet(targetNum, &addrDecWin))
-		{
-			mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
-			return MV_ERROR;
-		}
-	
-		/* Do not check disabled windows	*/
-		if (MV_FALSE == addrDecWin.enable)
-		{
-			continue;
-		}
-	
-		if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
-		{                    
-			mvOsPrintf(
-			"sdramIfWinOverlap: Required target %d overlap winNum %d\n", 
-			target, targetNum);
-			return MV_TRUE;           
-		}
-	}
-	
-	return MV_FALSE;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h
deleted file mode 100644
index 7bd9c9de27..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysDram.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __sysDram
-#define __sysDram
-
-/* This structure describes CPU interface address decode window               */
-typedef struct _mvDramIfDecWin 
-{
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-}MV_DRAM_DEC_WIN;
-
-MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvDramIfWinEnable(MV_TARGET target, MV_BOOL enable);
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c
deleted file mode 100644
index 7f6e4a59dd..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "ctrlEnv/sys/mvSysGbe.h"
-
-
-
-typedef struct _mvEthDecWin
-{
-    MV_TARGET     target;
-    MV_ADDR_WIN   addrWin;  /* An address window*/
-    MV_BOOL       enable;   /* Address decode window is enabled/disabled */
-  
-}MV_ETH_DEC_WIN;
-
-MV_TARGET ethAddrDecPrioTap[] =
-{
-#if defined(MV_INCLUDE_SDRAM_CS0)
-        SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-        SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-        SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-        SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS0)
-        DEVICE_CS0,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS1)
-        DEVICE_CS1,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS2)
-        DEVICE_CS2,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS3)
-        DEVICE_CS3,
-#endif
-#if defined(MV_INCLUDE_PEX)
-        PEX0_IO,
-#endif
-        TBL_TERM
-};
-
-static MV_STATUS   ethWinOverlapDetect(int port, MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
-static MV_STATUS   mvEthWinSet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin);
-static MV_STATUS   mvEthWinGet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin);
-
-                                                                                                                             
-/*******************************************************************************
-* mvEthWinInit - Initialize ETH address decode windows 
-*
-* DESCRIPTION:
-*               This function initialize ETH window decode unit. It set the 
-*               default address decode windows of the unit.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if setting fail.
-*******************************************************************************/
-/* Configure EthDrv memory map registes. */
-MV_STATUS 	mvEthWinInit (int port)
-{
-    MV_U32          winNum, status, winPrioIndex=0, i, regVal=0;
-    MV_ETH_DEC_WIN  ethWin;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    static MV_U32   accessProtReg = 0;
-
-#if (MV_ETH_VERSION <= 1)
-    static MV_BOOL  isFirst = MV_TRUE;
-
-    if(isFirst == MV_FALSE)
-    {
-        MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(port), accessProtReg);
-        return MV_OK;
-    }
-    isFirst = MV_FALSE;
-#endif /* MV_GIGA_ETH_VERSION */
-
-    /* Initiate Ethernet address decode */
-
-    /* First disable all address decode windows */
-    for(winNum=0; winNum<ETH_MAX_DECODE_WIN; winNum++)
-    {
-        regVal |= MV_BIT_MASK(winNum);
-    }
-    MV_REG_WRITE(ETH_BASE_ADDR_ENABLE_REG(port), regVal);
-
-   /* Go through all windows in user table until table terminator      */
-    for (winNum=0; ((ethAddrDecPrioTap[winPrioIndex] != TBL_TERM) && 
-                    (winNum < ETH_MAX_DECODE_WIN)); )
-    {
-        /* first get attributes from CPU If */
-        status = mvCpuIfTargetWinGet(ethAddrDecPrioTap[winPrioIndex], 
-                                     &cpuAddrDecWin);
-
-        if(MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-		if (MV_OK != status)
-		{
-			mvOsPrintf("mvEthWinInit: ERR. mvCpuIfTargetWinGet failed\n");
-			return MV_ERROR;
-		}
-
-        if (cpuAddrDecWin.enable == MV_TRUE)
-        {
-            ethWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-            ethWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
-            ethWin.addrWin.size = cpuAddrDecWin.addrWin.size;
-            ethWin.enable = MV_TRUE;
-            ethWin.target = ethAddrDecPrioTap[winPrioIndex];
-
-            if(MV_OK != mvEthWinSet(port, winNum, &ethWin))
-            {
-                mvOsPrintf("mvEthWinInit: ERR. mvEthWinSet failed winNum=%d\n",
-                           winNum);
-                return MV_ERROR;
-            }
-            winNum++;
-        }
-        winPrioIndex ++;
-    }
-
-    /* set full access to all windows. */
-    for(i=0; i<winNum; i++)
-    {
-        accessProtReg |= (FULL_ACCESS << (i*2));
-    }
-    MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(port), accessProtReg);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthWinSet - Set ETH target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
-*       address window, also known as address decode window.
-*       After setting this target window, the ETH will be able to access the
-*       target within the address window.
-*
-* INPUT:
-*       winNum      - ETH to target address decode window number.
-*       pAddrDecWin - ETH target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is
-*       unknown.
-*
-*******************************************************************************/
-MV_STATUS mvEthWinSet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttribs;
-    MV_DEC_REGS         decRegs;
-    
-    /* Parameter checking   */
-    if (winNum >= ETH_MAX_DECODE_WIN)
-    {
-        mvOsPrintf("mvEthWinSet: ERR. Invalid win num %d\n",winNum);
-        return MV_BAD_PARAM;
-    }    
-    
-    /* Check if the requested window overlapps with current windows     */
-    if (MV_TRUE == ethWinOverlapDetect(port, winNum, &pAddrDecWin->addrWin))
-    {
-        mvOsPrintf("mvEthWinSet: ERR. Window %d overlap\n", winNum);
-        return MV_ERROR;
-    }
-
-	/* check if address is aligned to the size */
-	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvEthWinSet: Error setting Ethernet window %d to "\
-				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-				   winNum,
-				   mvCtrlTargetNameGet(pAddrDecWin->target), 
-				   pAddrDecWin->addrWin.baseLow,
-				   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-    
-    decRegs.baseReg = MV_REG_READ(ETH_WIN_BASE_REG(port, winNum));
-    decRegs.sizeReg = MV_REG_READ(ETH_WIN_SIZE_REG(port, winNum));
-    
-    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-    {
-        mvOsPrintf("mvEthWinSet:mvCtrlAddrDecToReg Failed\n");
-        return MV_ERROR;
-    }
-    
-    mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
-    
-    /* set attributes */
-    decRegs.baseReg &= ~ETH_WIN_ATTR_MASK;
-    decRegs.baseReg |= targetAttribs.attrib << ETH_WIN_ATTR_OFFS;
-    /* set target ID */
-    decRegs.baseReg &= ~ETH_WIN_TARGET_MASK;
-    decRegs.baseReg |= targetAttribs.targetId << ETH_WIN_TARGET_OFFS;
-    
-    /* for the safe side we disable the window before writing the new
-    values */
-    mvEthWinEnable(port, winNum, MV_FALSE);
-    MV_REG_WRITE(ETH_WIN_BASE_REG(port, winNum), decRegs.baseReg);
-    
-    /* Write to address decode Size Register                            */
-    MV_REG_WRITE(ETH_WIN_SIZE_REG(port, winNum), decRegs.sizeReg);
-    
-    /* Enable address decode target window                              */
-    if (pAddrDecWin->enable == MV_TRUE)
-    {
-            mvEthWinEnable(port, winNum, MV_TRUE);
-    }
-    
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvETHWinGet - Get dma peripheral target address window.
-*
-* DESCRIPTION:
-*               Get ETH peripheral target address window.
-*
-* INPUT:
-*       winNum - ETH to target address decode window number.
-*
-* OUTPUT:
-*       pAddrDecWin - ETH target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvEthWinGet(int port, MV_U32 winNum, MV_ETH_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS decRegs;
-    MV_TARGET_ATTRIB targetAttrib;
-    
-    /* Parameter checking   */
-    if (winNum >= ETH_MAX_DECODE_WIN)
-    {
-        mvOsPrintf("mvEthWinGet: ERR. Invalid winNum %d\n", winNum);
-        return MV_NOT_SUPPORTED;
-    }
-    
-    decRegs.baseReg =  MV_REG_READ(ETH_WIN_BASE_REG(port, winNum));
-    decRegs.sizeReg = MV_REG_READ(ETH_WIN_SIZE_REG(port, winNum));
-    
-    if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
-    {
-        mvOsPrintf("mvAhbToMbusWinGet: mvCtrlRegToAddrDec Failed \n");
-        return MV_ERROR;
-    }
-    
-    /* attrib and targetId */
-    targetAttrib.attrib = 
-     (decRegs.baseReg & ETH_WIN_ATTR_MASK) >> ETH_WIN_ATTR_OFFS;
-    targetAttrib.targetId = 
-     (decRegs.baseReg & ETH_WIN_TARGET_MASK) >> ETH_WIN_TARGET_OFFS;
-    
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-    
-    /* Check if window is enabled   */
-    if (~(MV_REG_READ(ETH_BASE_ADDR_ENABLE_REG(port))) & (1 << winNum) )
-    {
-        pAddrDecWin->enable = MV_TRUE;
-    }
-    else
-    {
-        pAddrDecWin->enable = MV_FALSE;
-    }
-    
-        return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthWinEnable - Enable/disable a ETH to target address window
-*
-* DESCRIPTION:
-*       This function enable/disable a ETH to target address window.
-*       According to parameter 'enable' the routine will enable the
-*       window, thus enabling ETH accesses (before enabling the window it is
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       winNum - ETH to target address decode window number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if decode window number was wrong or enabled window overlapps.
-*
-*******************************************************************************/
-MV_STATUS mvEthWinEnable(int port, MV_U32 winNum,MV_BOOL enable)
-{
-    MV_ETH_DEC_WIN addrDecWin;
-
-    /* Parameter checking   */
-    if (winNum >= ETH_MAX_DECODE_WIN)
-    {
-        mvOsPrintf("mvEthTargetWinEnable:ERR. Invalid winNum%d\n",winNum);
-        return MV_ERROR;
-    }
-
-    if (enable == MV_TRUE)
-    {   /* First check for overlap with other enabled windows               */
-        /* Get current window */
-        if (MV_OK != mvEthWinGet(port, winNum, &addrDecWin))
-        {
-            mvOsPrintf("mvEthTargetWinEnable:ERR. targetWinGet fail\n");
-            return MV_ERROR;
-        }
-        /* Check for overlapping */
-        if (MV_FALSE == ethWinOverlapDetect(port, winNum, &(addrDecWin.addrWin)))
-        {
-            /* No Overlap. Enable address decode target window              */
-            MV_REG_BIT_RESET(ETH_BASE_ADDR_ENABLE_REG(port), (1 << winNum));
-        }
-        else
-        {   /* Overlap detected */
-            mvOsPrintf("mvEthTargetWinEnable:ERR. Overlap detected\n");
-            return MV_ERROR;
-        }
-    }
-    else
-    {   /* Disable address decode target window                             */
-        MV_REG_BIT_SET(ETH_BASE_ADDR_ENABLE_REG(port), (1 << winNum));
-    }
-    return MV_OK;
-}
- 
-/*******************************************************************************
-* mvEthWinTargetGet - Get Window number associated with target
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*       window number
-*
-*******************************************************************************/
-MV_U32  mvEthWinTargetGet(int port, MV_TARGET target)
-{
-    MV_ETH_DEC_WIN decWin;
-    MV_U32 winNum;
-
-    /* Check parameters */
-    if (target >= MAX_TARGETS)
-    {
-        mvOsPrintf("mvAhbToMbusWinTargetGet: target %d is Illigal\n", target);
-        return 0xffffffff;
-    }
-
-    for (winNum=0; winNum<ETH_MAX_DECODE_WIN; winNum++)
-    {
-        if (mvEthWinGet(port, winNum,&decWin) != MV_OK)
-        {
-            mvOsPrintf("mvAhbToMbusWinTargetGet: window returned error\n");
-            return 0xffffffff;
-        }
-
-        if (decWin.enable == MV_TRUE)
-        {
-            if (decWin.target == target)
-            {
-                return winNum;
-            }  
-        }
-    }
-    return 0xFFFFFFFF;
-}
- 
-/*******************************************************************************
-* mvEthProtWinSet - Set access protection of Ethernet to target window.
-*
-* DESCRIPTION:
-*       Each Ethernet port can be configured with access attributes for each 
-*       of the Ethenret to target windows (address decode windows). This
-*       function sets access attributes to a given window for the given channel.
-*
-* INPUTS:
-*       ethPort   - ETH channel number. See MV_ETH_CHANNEL enumerator.
-*       winNum - IETH to target address decode window number.
-*       access - IETH access rights. See MV_ACCESS_RIGHTS enumerator.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR in case window number is invalid or access right reserved.
-*
-*******************************************************************************/
-MV_STATUS mvEthProtWinSet(MV_U32 portNo, MV_U32 winNum, MV_ACCESS_RIGHTS access)
-{    
-    MV_U32 protReg;
-
-    /* Parameter checking   */
-    if(portNo >= mvCtrlEthMaxPortGet())
-    {
-        mvOsPrintf("mvEthProtWinSet:ERR. Invalid port number %d\n", portNo);
-        return MV_ERROR;
-    }
-    
-    if (winNum >= ETH_MAX_DECODE_WIN)
-    {
-            mvOsPrintf("mvEthProtWinSet:ERR. Invalid winNum%d\n",winNum);
-            return MV_ERROR;
-    }
-
-    if((access == ACC_RESERVED) || (access >= MAX_ACC_RIGHTS))
-    {
-        mvOsPrintf("mvEthProtWinSet:ERR. Inv access param %d\n", access);
-        return MV_ERROR;
-    }
-    /* Read current protection register */
-    protReg = MV_REG_READ(ETH_ACCESS_PROTECT_REG(portNo));
-                          
-    /* Clear protection window field */
-    protReg &= ~(ETH_PROT_WIN_MASK(winNum));
-
-    /* Set new protection field value */
-    protReg |= (access << (ETH_PROT_WIN_OFFS(winNum)));
-    
-    /* Write protection register back   */
-    MV_REG_WRITE(ETH_ACCESS_PROTECT_REG(portNo), protReg);
-
-    return MV_OK;
-}               
-
-/*******************************************************************************
-* ethWinOverlapDetect - Detect ETH address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case ETH address decode
-*       windows overlapps.
-*       This function detects ETH address decode windows overlapping of a
-*       specified window. The function does not check the window itself for
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS ethWinOverlapDetect(int port, MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32              baseAddrEnableReg;
-    MV_U32              winNumIndex;
-    MV_ETH_DEC_WIN      addrDecWin;
-                                                                                                                             
-    /* Read base address enable register. Do not check disabled windows     */
-    baseAddrEnableReg = MV_REG_READ(ETH_BASE_ADDR_ENABLE_REG(port));
-                                                                                                                             
-    for (winNumIndex=0; winNumIndex<ETH_MAX_DECODE_WIN; winNumIndex++)
-    {
-        /* Do not check window itself           */
-        if (winNumIndex == winNum)
-        {
-            continue;
-        }
-    
-        /* Do not check disabled windows        */
-        if (baseAddrEnableReg & (1 << winNumIndex))
-        {
-            continue;
-        }
-    
-        /* Get window parameters        */
-        if (MV_OK != mvEthWinGet(port, winNumIndex, &addrDecWin))
-        {
-            mvOsPrintf("ethWinOverlapDetect: ERR. TargetWinGet failed\n");
-            return MV_ERROR;
-        }
-/*    
-        mvOsPrintf("ethWinOverlapDetect:\n
-            winNumIndex =%d baseHigh =0x%x baseLow=0x%x size=0x%x enable=0x%x\n",
-            winNumIndex,
-            addrDecWin.addrWin.baseHigh,
-            addrDecWin.addrWin.baseLow,
-            addrDecWin.addrWin.size,
-            addrDecWin.enable);
-*/
-        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-        {
-            return MV_TRUE;
-        }
-    }
-    return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvEthAddrDecShow - Print the Etherent address decode map.
-*
-* DESCRIPTION:
-*       This function print the Etherent address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-void    mvEthPortAddrDecShow(int port)
-{
-    MV_ETH_DEC_WIN  win;
-    int             i;
-
-    mvOsOutput( "\n" );
-    mvOsOutput( "ETH %d:\n", port );
-    mvOsOutput( "----\n" );
-
-    for( i = 0; i < ETH_MAX_DECODE_WIN; i++ )
-    {
-        memset( &win, 0, sizeof(ETH_MAX_DECODE_WIN) );
-
-        mvOsOutput( "win%d - ", i );
-
-        if( mvEthWinGet(port, i, &win ) == MV_OK )
-        {
-            if( win.enable )
-            {
-                mvOsOutput( "%s base %08x, ",
-                mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-                mvOsOutput( "...." );
-                mvSizePrint( win.addrWin.size );
-
-                mvOsOutput( "\n" );
-            }
-            else
-                mvOsOutput( "disable\n" );
-        }
-    }
-    return;
-}
-
-void    mvEthAddrDecShow(void)
-{
-    int port;
-
-    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
-    {
-	if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) continue;
-    
-        mvEthPortAddrDecShow(port);
-    }
-}
-
-
-void    mvEthInit(void)
-{
-    MV_U32 port;
-
-    /* Power down all existing ports */
-    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
-    {
-	    if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) 
-            continue;
-
-        mvEthPortPowerUp(port);
-	    mvEthWinInit(port);
-    }
-    mvEthHalInit();
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h
deleted file mode 100644
index 615af512d3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysGbe.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSysGbeh
-#define __INCmvSysGbeh
-
-#include "mvCommon.h"
-#include "eth/mvEth.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-#define ETH_WIN_BASE_REG(port, win)         (MV_ETH_REG_BASE(port) + 0x200 + ((win)<<3))
-#define ETH_WIN_SIZE_REG(port, win)         (MV_ETH_REG_BASE(port) + 0x204 + ((win)<<3))
-#define ETH_WIN_REMAP_REG(port, win)        (MV_ETH_REG_BASE(port) + 0x280 + ((win)<<2))
-#define ETH_BASE_ADDR_ENABLE_REG(port)      (MV_ETH_REG_BASE(port) + 0x290)
-#define ETH_ACCESS_PROTECT_REG(port)        (MV_ETH_REG_BASE(port) + 0x294)
-
-/**** Address decode parameters ****/
-
-/* Ethernet Base Address Register bits */
-#define ETH_MAX_DECODE_WIN              6
-#define ETH_MAX_HIGH_ADDR_REMAP_WIN     4
-
-/* Ethernet Port Access Protect (EPAP) register */
-
-/* The target associated with this window*/
-#define ETH_WIN_TARGET_OFFS             0 
-#define ETH_WIN_TARGET_MASK             (0xf << ETH_WIN_TARGET_OFFS)
-/* The target attributes Associated with window */
-#define ETH_WIN_ATTR_OFFS               8 
-#define ETH_WIN_ATTR_MASK               (0xff << ETH_WIN_ATTR_OFFS)
-
-/* Ethernet Port Access Protect Register (EPAPR) */
-#define ETH_PROT_NO_ACCESS              NO_ACCESS_ALLOWED
-#define ETH_PROT_READ_ONLY              READ_ONLY
-#define ETH_PROT_FULL_ACCESS            FULL_ACCESS
-#define ETH_PROT_WIN_OFFS(winNum)       (2 * (winNum))
-#define ETH_PROT_WIN_MASK(winNum)       (0x3 << ETH_PROT_WIN_OFFS(winNum))
-
-MV_STATUS   mvEthWinInit (int port);
-MV_STATUS   mvEthWinEnable(int port, MV_U32 winNum, MV_BOOL enable);
-MV_U32      mvEthWinTargetGet(int port, MV_TARGET target);
-MV_STATUS mvEthProtWinSet(MV_U32 portNo, MV_U32 winNum, MV_ACCESS_RIGHTS
-		access);
-
-void        mvEthPortAddrDecShow(int port);
-
-MV_VOID     mvEthAddrDecShow(MV_VOID);
-
-void        mvEthInit(void);
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c
deleted file mode 100644
index b0cb466ab3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.c
+++ /dev/null
@@ -1,1697 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "ctrlEnv/sys/mvSysPex.h"
-
-/* this structure describes the mapping between a Pex Window and a CPU target*/
-typedef struct _pexWinToTarget
-{
-	MV_TARGET target;
-	MV_BOOL	  enable;
-
-}PEX_WIN_TO_TARGET;
-
-/* this array is a priority array that define How Pex windows should be 
-configured , We have only 6 Pex Windows that can be configured , but we
-have maximum of 9 CPU target windows ! the following array is a priority
-array where the lowest index has the highest priotiy and the highest 
-index has the lowest priority of being cnfigured */
-
-MV_U32	pexDevBarPrioTable[] =
-{
-#if defined(MV_INCLUDE_DEVICE_CS0)
-    DEVICE_CS0,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS1)
-    DEVICE_CS1,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS2)
-    DEVICE_CS2,
-#endif                                               
-#if defined(MV_INCLUDE_DEVICE_CS3)
-    DEVICE_CS3,
-#endif
-/*
-#if defined(MV_INCLUDE_DEVICE_CS4)
-    DEVICE_CS4,
-#endif
-*/
-    TBL_TERM
-};
-
-
-/* PEX Wins registers offsets are inconsecutive. This struct describes WIN	*/
-/* register offsets	and its function where its is located.					*/
-/* Also, PEX address remap registers offsets are inconsecutive. This struct	*/
-/* describes address remap register offsets									*/
-typedef struct _pexWinRegInfo
-{
-    MV_U32 baseLowRegOffs;
-	MV_U32 baseHighRegOffs;
-	MV_U32 sizeRegOffs;
-	MV_U32 remapLowRegOffs;
-	MV_U32 remapHighRegOffs;
-
-}PEX_WIN_REG_INFO;
-
-static MV_STATUS pexWinOverlapDetect(MV_U32 pexIf, MV_U32 winNum,
-									 MV_ADDR_WIN *pAddrWin);
-static MV_STATUS pexWinRegInfoGet(MV_U32 pexIf, MV_U32 winNum,
-								  PEX_WIN_REG_INFO *pWinRegInfo);
-
-static MV_STATUS pexBarIsValid(MV_U32 baseLow, MV_U32 size);
-
-static MV_BOOL pexIsWinWithinBar(MV_U32 pexIf,MV_ADDR_WIN *pAddrWin);
-static MV_BOOL pexBarOverlapDetect(MV_U32 pexIf,MV_U32 barNum,
-								   MV_ADDR_WIN *pAddrWin);
-const MV_8* pexBarNameGet( MV_U32 bar );
-
-
-/*******************************************************************************
-* mvPexInit - Initialize PEX interfaces
-*
-* DESCRIPTION:
-*
-* This function is responsible of intialization of the Pex Interface , It 
-* configure the Pex Bars and Windows in the following manner:
-*
-*  Assumptions : 
-*				Bar0 is always internal registers bar
-*			    Bar1 is always the DRAM bar
-*				Bar2 is always the Device bar
-*
-*  1) Sets the Internal registers bar base by obtaining the base from
-*	  the CPU Interface
-*  2) Sets the DRAM bar base and size by getting the base and size from
-*     the CPU Interface when the size is the sum of all enabled DRAM 
-*	  chip selects and the base is the base of CS0 .
-*  3) Sets the Device bar base and size by getting these values from the 
-*     CPU Interface when the base is the base of the lowest base of the
-*     Device chip selects, and the 
-*
-*
-* INPUT:
-*
-*       pexIf   -  PEX interface number.
-*
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
-*
-*******************************************************************************/
-MV_STATUS mvPexInit(MV_U32 pexIf, MV_PEX_TYPE pexType)
-{
-	MV_U32 	       		bar;
-	MV_U32		   	winNum;
-	MV_PEX_BAR	  	pexBar;
-	MV_PEX_DEC_WIN 		pexWin;
-	MV_CPU_DEC_WIN 		addrDecWin;
-	MV_TARGET 		target;
-	MV_U32			pexCurrWin=0;
-	MV_U32			status;
-	/* default and exapntion rom 
-	are always configured */
-
-#ifndef MV_DISABLE_PEX_DEVICE_BAR
-	MV_U32		   	winIndex;
-	MV_U32 		    	maxBase=0, sizeOfMaxBase=0;
-	MV_U32			pexStartWindow;
-#endif
-
-	/* Parameter checking   */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexInit: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-	
-	/* Enabled CPU access to PCI-Express */
-	mvCpuIfEnablePex(pexIf, pexType);
-
-    /* Start with bars */
-	/* First disable all PEX bars*/
-	for (bar = 0; bar < PEX_MAX_BARS; bar++)
-    {
-		if (PEX_INTER_REGS_BAR != bar)
-		{
-			if (MV_OK != mvPexBarEnable(pexIf, bar, MV_FALSE))
-			{
-				mvOsPrintf("mvPexInit:mvPexBarEnable bar =%d failed \n",bar);
-				return MV_ERROR;
-			}
-			
-		}
-
-	}
-
-	/* and disable all PEX target windows  */
-	for (winNum = 0; winNum < PEX_MAX_TARGET_WIN - 2; winNum++)
-    {
-		if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_FALSE))
-		{
-			mvOsPrintf("mvPexInit:mvPexTargetWinEnable winNum =%d failed \n",
-					   winNum);
-			return MV_ERROR;
-
-		}
-	}
-
-	/* Now, go through all bars*/
-
-
-
-/******************************************************************************/
-/*                       Internal registers bar                               */
-/******************************************************************************/
-	bar = PEX_INTER_REGS_BAR;
-
-	/* we only open the bar , no need to open windows for this bar */
-
-	/* first get the CS attribute from the CPU Interface */
-	if (MV_OK !=mvCpuIfTargetWinGet(INTER_REGS,&addrDecWin))
-	{
-		mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",INTER_REGS);
-		return MV_ERROR;
-	}
-
-	pexBar.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
-	pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
-	pexBar.addrWin.size = addrDecWin.addrWin.size;
-	pexBar.enable = MV_TRUE;
-
-	if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
-	{
-		mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
-		return MV_ERROR;
-	}
-	
-/******************************************************************************/
-/*                                DRAM bar                                    */
-/******************************************************************************/
-
-	bar = PEX_DRAM_BAR;
-
-	pexBar.addrWin.size = 0;
-	
-	for (target = SDRAM_CS0;target < MV_DRAM_MAX_CS; target++ )
-	{
-
-		status = mvCpuIfTargetWinGet(target,&addrDecWin);
-
-		if((MV_NO_SUCH == status)&&(target != SDRAM_CS0))
-		{
-			continue;
-		}
-
-		/* first get attributes from CPU If */
-		if (MV_OK != status)
-		{
-			mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",target);
-			return MV_ERROR;
-		}
-		if (addrDecWin.enable == MV_TRUE)
-		{				
-			/* the base is the base of DRAM CS0 always */
-			if (SDRAM_CS0 == target )
-			{
-				pexBar.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
-				pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
-
-			}
-
-			/* increment the bar size to be the sum of the size of all
-			DRAM chips selecs */
-			pexBar.addrWin.size += addrDecWin.addrWin.size;
-
-			/* set a Pex window for this target ! 
-			DRAM CS always will have a Pex Window , and is not a 
-			part of the priority table */
-			pexWin.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
-			pexWin.addrWin.baseLow = addrDecWin.addrWin.baseLow;
-			pexWin.addrWin.size = addrDecWin.addrWin.size;
-			
-			/* we disable the windows at first because we are not
-			sure that it is witihin bar boundries */
-			pexWin.enable =MV_FALSE;
-			pexWin.target = target;
-			pexWin.targetBar = bar;
-
-			if (MV_OK != mvPexTargetWinSet(pexIf,pexCurrWin++,&pexWin))
-			{
-				mvOsPrintf("mvPexInit: ERR. mvPexTargetWinSet failed\n");
-				return MV_ERROR;
-			}
-		}
-	}
-
-	/* check if the size of the bar is illeggal */
-	if (-1 == ctrlSizeToReg(pexBar.addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT))
-	{
-		/* try to get a good size */
-		pexBar.addrWin.size = ctrlSizeRegRoundUp(pexBar.addrWin.size,
-												 PXBCR_BAR_SIZE_ALIGNMENT);
-	}
-    
-	/* check if the size and base are valid */
-	if (MV_TRUE == pexBarOverlapDetect(pexIf,bar,&pexBar.addrWin))
-	{
-		mvOsPrintf("mvPexInit:Warning :Bar %d size is illigal\n",bar);
-		mvOsPrintf("it will be disabled\n");
-		mvOsPrintf("please check Pex and CPU windows configuration\n");
-	}
-	else
-	{
-		pexBar.enable = MV_TRUE;
-        
-		/* configure the bar */
-		if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
-		{
-			mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
-			return MV_ERROR;
-		}
-	
-		/* after the bar was configured then we enable the Pex windows*/
-		for (winNum = 0;winNum < pexCurrWin ;winNum++)
-		{
-			if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_TRUE))
-			{
-				mvOsPrintf("mvPexInit: Can't enable window =%d\n",winNum);
-				return MV_ERROR;
-			}
-	
-		}
-	}
-
-/******************************************************************************/
-/*                              DEVICE bar                                    */
-/******************************************************************************/
-
-/* Open the Device BAR for non linux only */
-#ifndef MV_DISABLE_PEX_DEVICE_BAR 
-
-	/* then device  bar*/
-	bar = PEX_DEVICE_BAR;
-
-	/* save the starting window */
-	pexStartWindow = pexCurrWin;
-	pexBar.addrWin.size = 0;
-	pexBar.addrWin.baseLow = 0xffffffff;
-	pexBar.addrWin.baseHigh = 0;
-	maxBase = 0;
-
-	for (target = DEV_TO_TARGET(START_DEV_CS);target < DEV_TO_TARGET(MV_DEV_MAX_CS); target++ )
-	{
-		status = mvCpuIfTargetWinGet(target,&addrDecWin);
-
-		if (MV_NO_SUCH == status)
-		{
-			continue;
-		}
-
-		if (MV_OK != status)
-		{
-			mvOsPrintf("mvPexInit: ERR. mvCpuIfTargetWinGet failed target =%d\n",target);
-			return MV_ERROR;
-		}
-
-		if (addrDecWin.enable == MV_TRUE)
-		{				
-			/* get the minimum base */
-			if (addrDecWin.addrWin.baseLow < pexBar.addrWin.baseLow)
-			{
-				pexBar.addrWin.baseLow = addrDecWin.addrWin.baseLow;
-			}
-
-			/* get the maximum base */
-			if (addrDecWin.addrWin.baseLow > maxBase)
-			{
-				maxBase = addrDecWin.addrWin.baseLow;
-				sizeOfMaxBase = addrDecWin.addrWin.size;
-			}
-
-			/* search in the priority table for this target */
-			for (winIndex = 0; pexDevBarPrioTable[winIndex] != TBL_TERM;
-				 winIndex++)
-			{
-				if (pexDevBarPrioTable[winIndex] != target)
-				{
-					continue;
-				}
-				else if (pexDevBarPrioTable[winIndex] == target)
-				{
-					/*found it */
-
-					/* if the index of this target in the prio table is valid 
-					then we set the Pex window for this target, a valid index is 
-					an index that is lower than the number of the windows that
-					was not configured yet */
-
-					/* we subtract 2 always because the default and expantion
-					rom windows are always configured */
-					if ( pexCurrWin  < PEX_MAX_TARGET_WIN - 2)
-					{
-						/* set a Pex window for this target !  */
-						pexWin.addrWin.baseHigh = addrDecWin.addrWin.baseHigh;
-						pexWin.addrWin.baseLow = addrDecWin.addrWin.baseLow;
-						pexWin.addrWin.size = addrDecWin.addrWin.size;
-						
-						/* we disable the windows at first because we are not
-						sure that it is witihin bar boundries */
-						pexWin.enable = MV_FALSE;
-						pexWin.target = target;
-						pexWin.targetBar = bar;
-
-						if (MV_OK != mvPexTargetWinSet(pexIf,pexCurrWin++,
-													   &pexWin))
-						{
-							mvOsPrintf("mvPexInit: ERR. Window Set failed\n");
-							return MV_ERROR;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	pexBar.addrWin.size = maxBase - pexBar.addrWin.baseLow + sizeOfMaxBase;
-	pexBar.enable = MV_TRUE;
-
-	/* check if the size of the bar is illegal */
-	if (-1 == ctrlSizeToReg(pexBar.addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT))
-	{
-		/* try to get a good size */
-		pexBar.addrWin.size = ctrlSizeRegRoundUp(pexBar.addrWin.size,
-												 PXBCR_BAR_SIZE_ALIGNMENT);
-	}
-
-	/* check if the size and base are valid */
-	if (MV_TRUE == pexBarOverlapDetect(pexIf,bar,&pexBar.addrWin))
-	{
-		mvOsPrintf("mvPexInit:Warning :Bar %d size is illigal\n",bar);
-		mvOsPrintf("it will be disabled\n");
-		mvOsPrintf("please check Pex and CPU windows configuration\n");
-	}
-	else
-	{
-		if (MV_OK != mvPexBarSet(pexIf, bar, &pexBar))
-		{
-			mvOsPrintf("mvPexInit: ERR. mvPexBarSet %d failed\n", bar);
-			return MV_ERROR;
-		}
-
-		/* now enable the windows */
-		for (winNum = pexStartWindow; winNum < pexCurrWin ; winNum++)
-		{
-			if (MV_OK != mvPexTargetWinEnable(pexIf, winNum, MV_TRUE))
-			{
-				mvOsPrintf("mvPexInit:mvPexTargetWinEnable winNum =%d failed \n",
-						   winNum);
-				return MV_ERROR;
-			}
-		}
-	}
-
-#endif
-
-	return mvPexHalInit(pexIf, pexType);
-
-}
-
-/*******************************************************************************
-* mvPexTargetWinSet - Set PEX to peripheral target address window BAR
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_OK if PEX BAR target window was set correctly, 
-*		MV_BAD_PARAM on bad params 
-*       MV_ERROR otherwise 
-*       (e.g. address window overlapps with other active PEX target window).
-*
-*******************************************************************************/
-MV_STATUS mvPexTargetWinSet(MV_U32 pexIf, MV_U32 winNum, 
-                            MV_PEX_DEC_WIN *pAddrDecWin)
-{
-
-	MV_DEC_REGS decRegs;
-	PEX_WIN_REG_INFO winRegInfo;
-	MV_TARGET_ATTRIB targetAttribs;
-
-	/* Parameter checking   */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexTargetWinSet: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	if (winNum >= PEX_MAX_TARGET_WIN)
-	{
-		mvOsPrintf("mvPexTargetWinSet: ERR. Invalid PEX winNum %d\n", winNum);
-		return MV_BAD_PARAM;
-
-	}
-
-	/* get the pex Window registers offsets */
-	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
-
-
-	if (MV_TRUE == pAddrDecWin->enable)
-	{
-
-		/* 2) Check if the requested window overlaps with current windows  */
-		if (MV_TRUE == pexWinOverlapDetect(pexIf,winNum, &pAddrDecWin->addrWin))
-		{
-			mvOsPrintf("mvPexTargetWinSet: ERR. Target %d overlap\n", winNum);
-			return MV_BAD_PARAM;
-		}
-	
-		/* 2) Check if the requested window overlaps with current windows  */
-		if (MV_FALSE == pexIsWinWithinBar(pexIf,&pAddrDecWin->addrWin))
-		{
-			mvOsPrintf("mvPexTargetWinSet: Win %d should be in bar boundries\n",
-					   winNum);
-			return MV_BAD_PARAM;
-		}
-
-	}
-
-
-
-	/* read base register*/
-	
-	if (winRegInfo.baseLowRegOffs)
-	{
-		decRegs.baseReg = MV_REG_READ(winRegInfo.baseLowRegOffs);
-	}
-	else
-	{
-		decRegs.baseReg = 0;
-	}
-
-	if (winRegInfo.sizeRegOffs)
-	{
-		decRegs.sizeReg = MV_REG_READ(winRegInfo.sizeRegOffs);
-	}
-	else
-	{
-		decRegs.sizeReg =0;
-	}
-	
-	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-	{
-		mvOsPrintf("mvPexTargetWinSet:mvCtrlAddrDecToReg Failed\n");
-		return MV_ERROR;		
-	}
-
-	/* enable\Disable */
-	if (MV_TRUE == pAddrDecWin->enable)
-	{
-		decRegs.sizeReg |= PXWCR_WIN_EN;
-	}
-	else
-	{
-		decRegs.sizeReg &= ~PXWCR_WIN_EN;
-	}
-
-
-	/* clear bit location */
-	decRegs.sizeReg &= ~PXWCR_WIN_BAR_MAP_MASK;
-
-	/* set bar Mapping */
-	if (pAddrDecWin->targetBar == 1)
-	{
-		decRegs.sizeReg |= PXWCR_WIN_BAR_MAP_BAR1;
-	}
-	else if (pAddrDecWin->targetBar == 2)
-	{
-		decRegs.sizeReg |= PXWCR_WIN_BAR_MAP_BAR2;
-	}
-
-	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
-
-	/* set attributes */
-	decRegs.sizeReg &= ~PXWCR_ATTRIB_MASK;
-	decRegs.sizeReg |= targetAttribs.attrib << PXWCR_ATTRIB_OFFS;
-	/* set target ID */
-	decRegs.sizeReg &= ~PXWCR_TARGET_MASK;
-	decRegs.sizeReg |= targetAttribs.targetId << PXWCR_TARGET_OFFS;
-
-
-	/* 3) Write to address decode Base Address Register                   */
-
-	if (winRegInfo.baseLowRegOffs)
-	{
-		MV_REG_WRITE(winRegInfo.baseLowRegOffs, decRegs.baseReg);
-	}
-
-	/* write size reg */
-	if (winRegInfo.sizeRegOffs)
-	{
-		if ((MV_PEX_WIN_DEFAULT == winNum)||
-			(MV_PEX_WIN_EXP_ROM == winNum))
-		{
-			/* clear size because there is no size field*/
-			decRegs.sizeReg &= ~PXWCR_SIZE_MASK;
-
-			/* clear enable because there is no enable field*/
-			decRegs.sizeReg &= ~PXWCR_WIN_EN;
-
-		}
-
-		MV_REG_WRITE(winRegInfo.sizeRegOffs, decRegs.sizeReg);
-	}
-
-
-    return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvPexTargetWinGet - Get PEX to peripheral target address window
-*
-* DESCRIPTION:
-*		Get the PEX to peripheral target address window BAR.
-*
-* INPUT:
-*       pexIf - PEX interface number.
-*       bar   - BAR to be accessed by slave.
-*
-* OUTPUT:
-*       pAddrBarWin - PEX target window information data structure.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexTargetWinGet(MV_U32 pexIf, MV_U32 winNum, 
-                            MV_PEX_DEC_WIN *pAddrDecWin)
-{
-	MV_TARGET_ATTRIB targetAttrib;
-	MV_DEC_REGS decRegs;
-
-	PEX_WIN_REG_INFO winRegInfo;
-
-	/* Parameter checking   */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexTargetWinGet: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	if (winNum >= PEX_MAX_TARGET_WIN)
-	{
-		mvOsPrintf("mvPexTargetWinGet: ERR. Invalid PEX winNum %d\n", winNum);
-		return MV_BAD_PARAM;
-
-	}
-
-	/* get the pex Window registers offsets */
-	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
-
-	/* read base register*/
-	if (winRegInfo.baseLowRegOffs)
-	{
-		decRegs.baseReg = MV_REG_READ(winRegInfo.baseLowRegOffs);
-	}
-	else
-	{
-		decRegs.baseReg = 0;
-	}
-
-	/* read size reg */
-	if (winRegInfo.sizeRegOffs)
-	{
-		decRegs.sizeReg = MV_REG_READ(winRegInfo.sizeRegOffs);
-	}
-	else
-	{
-		decRegs.sizeReg =0;
-	}
-
-	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
-	{
-		mvOsPrintf("mvPexTargetWinGet: mvCtrlRegToAddrDec Failed \n");
-		return MV_ERROR;
-
-	}
-
-	if (decRegs.sizeReg & PXWCR_WIN_EN)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;	  
-
-	}
-
-
-	#if 0
-    if (-1 == pAddrDecWin->addrWin.size)
-	{
-		return MV_ERROR;
-	}
-	#endif
-
-
-	/* get target bar */
-	if ((decRegs.sizeReg & PXWCR_WIN_BAR_MAP_MASK) == PXWCR_WIN_BAR_MAP_BAR1 )
-	{
-		pAddrDecWin->targetBar = 1;
-	} 
-	else if ((decRegs.sizeReg & PXWCR_WIN_BAR_MAP_MASK) == 
-			 PXWCR_WIN_BAR_MAP_BAR2 )
-	{
-		pAddrDecWin->targetBar = 2;
-	}
-
-	/* attrib and targetId */
-	pAddrDecWin->attrib = (decRegs.sizeReg & PXWCR_ATTRIB_MASK) >> 
-													PXWCR_ATTRIB_OFFS;
-	pAddrDecWin->targetId = (decRegs.sizeReg & PXWCR_TARGET_MASK) >> 
-													PXWCR_TARGET_OFFS;
-
-	targetAttrib.attrib = pAddrDecWin->attrib;
-	targetAttrib.targetId = pAddrDecWin->targetId;
-
-	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-	return MV_OK;
-
-}
-
-
-/*******************************************************************************
-* mvPexTargetWinEnable - Enable/disable a PEX BAR window
-*
-* DESCRIPTION:
-*       This function enable/disable a PEX BAR window.
-*       if parameter 'enable' == MV_TRUE the routine will enable the 
-*       window, thus enabling PEX accesses for that BAR (before enabling the 
-*       window it is tested for overlapping). Otherwise, the window will 
-*       be disabled.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*       bar    - BAR to be accessed by slave.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexTargetWinEnable(MV_U32 pexIf,MV_U32 winNum, MV_BOOL enable)
-{
-	PEX_WIN_REG_INFO winRegInfo;
-	MV_PEX_DEC_WIN addrDecWin;
-
-	/* Parameter checking   */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexTargetWinEnable: ERR. Invalid PEX If %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	if (winNum >= PEX_MAX_TARGET_WIN)
-	{
-		mvOsPrintf("mvPexTargetWinEnable ERR. Invalid PEX winNum %d\n", winNum);
-		return MV_BAD_PARAM;
-
-	}
-
-
-	/* get the pex Window registers offsets */
-	pexWinRegInfoGet(pexIf,winNum,&winRegInfo);
-
-
-	/* if the address windows is disabled , we only disable the appropriare
-	pex window and ignore other settings */
-
-	if (MV_FALSE == enable)
-	{
-
-		/* this is not relevant to default and expantion rom
-		windows */
-		if (winRegInfo.sizeRegOffs)
-		{
-			if ((MV_PEX_WIN_DEFAULT != winNum)&&
-				(MV_PEX_WIN_EXP_ROM != winNum))
-			{
-				MV_REG_BIT_RESET(winRegInfo.sizeRegOffs, PXWCR_WIN_EN);
-			}
-		}
-
-	}
-	else
-	{
-		if (MV_OK != mvPexTargetWinGet(pexIf,winNum, &addrDecWin))
-		{
-			mvOsPrintf("mvPexTargetWinEnable: mvPexTargetWinGet Failed\n");
-			return MV_ERROR;
-		}
-
-		/* Check if the requested window overlaps with current windows	*/
-		if (MV_TRUE == pexWinOverlapDetect(pexIf,winNum, &addrDecWin.addrWin))
-		{
-			mvOsPrintf("mvPexTargetWinEnable: ERR. Target %d overlap\n", winNum);
-			return MV_BAD_PARAM;
-		}
-
-		if (MV_FALSE == pexIsWinWithinBar(pexIf,&addrDecWin.addrWin))
-		{
-			mvOsPrintf("mvPexTargetWinEnable: Win %d should be in bar boundries\n",
-					   winNum);
-			return MV_BAD_PARAM;
-		}
-
-
-		/* this is not relevant to default and expantion rom
-		windows */
-		if (winRegInfo.sizeRegOffs)
-		{
-			if ((MV_PEX_WIN_DEFAULT != winNum)&&
-				(MV_PEX_WIN_EXP_ROM != winNum))
-			{
-				MV_REG_BIT_SET(winRegInfo.sizeRegOffs, PXWCR_WIN_EN);
-			}
-		}
-
-
-	}
-
-	return MV_OK;
-
-}
-
-
-
-/*******************************************************************************
-* mvPexTargetWinRemap - Set PEX to target address window remap.
-*
-* DESCRIPTION:
-*       The PEX interface supports remap of the BAR original address window.
-*       For each BAR it is possible to define a remap address. For example
-*       an address 0x12345678 that hits BAR 0x10 (SDRAM CS[0]) will be modified
-*       according to remap register but will also be targeted to the 
-*       SDRAM CS[0].
-*
-* INPUT:
-*       pexIf    - PEX interface number.
-*       bar      - Peripheral target enumerator accessed by slave.
-*       pAddrWin - Address window to be checked.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexTargetWinRemap(MV_U32 pexIf, MV_U32 winNum, 
-                           MV_PEX_REMAP_WIN *pAddrWin)
-{
-
-	PEX_WIN_REG_INFO winRegInfo;
-	
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX interface num %d\n", 
-																		pexIf);
-		return MV_BAD_PARAM;
-	}
-	if (MV_PEX_WIN_DEFAULT == winNum)
-	{
-		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX win num %d\n", 
-																		winNum);
-		return MV_BAD_PARAM;
-
-	}
-
-	if (MV_IS_NOT_ALIGN(pAddrWin->addrWin.baseLow, PXWRR_REMAP_ALIGNMENT))
-	{
-		mvOsPrintf("mvPexTargetWinRemap: Error remap PEX interface %d win %d."\
-				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
-				   pexIf,
-				   winNum,
-                   pAddrWin->addrWin.baseLow,
-				   pAddrWin->addrWin.size);
-		
-		return MV_ERROR;
-	}
-
-	pexWinRegInfoGet(pexIf, winNum, &winRegInfo);
-
-	/* Set remap low register value */
-	MV_REG_WRITE(winRegInfo.remapLowRegOffs, pAddrWin->addrWin.baseLow);
-	
-	/* Skip base high settings if the BAR has only base low (32-bit)		*/
-	if (0 != winRegInfo.remapHighRegOffs)
-	{
-		MV_REG_WRITE(winRegInfo.remapHighRegOffs, pAddrWin->addrWin.baseHigh);
-	}
-
-
-	if (pAddrWin->enable == MV_TRUE)
-	{
-		MV_REG_BIT_SET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
-	}
-	else
-	{
-		MV_REG_BIT_RESET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPexTargetWinRemapEnable - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-
-MV_STATUS mvPexTargetWinRemapEnable(MV_U32 pexIf, MV_U32 winNum, 
-                           MV_BOOL enable)
-{
-	PEX_WIN_REG_INFO winRegInfo;
-	
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX interface num %d\n", 
-																		pexIf);
-		return MV_BAD_PARAM;
-	}
-	if (MV_PEX_WIN_DEFAULT == winNum)
-	{
-		mvOsPrintf("mvPexTargetWinRemap: ERR. Invalid PEX win num %d\n", 
-																		winNum);
-		return MV_BAD_PARAM;
-
-	}
-
-
-	pexWinRegInfoGet(pexIf, winNum, &winRegInfo);
-
-	if (enable == MV_TRUE)
-	{
-		MV_REG_BIT_SET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
-	}
-	else
-	{
-		MV_REG_BIT_RESET(winRegInfo.remapLowRegOffs,PXWRR_REMAP_EN);
-	}
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-*  mvPexBarSet - Set PEX bar address and size 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexBarSet(MV_U32 pexIf,
-						MV_U32 barNum,
-						MV_PEX_BAR *pAddrWin)
-{
-	MV_U32 regBaseLow;
-	MV_U32 regSize,sizeToReg;
-
-
-	/* check parameters */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexBarSet: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	if(barNum >= PEX_MAX_BARS)
-	{
-		mvOsPrintf("mvPexBarSet: ERR. Invalid bar number %d\n", barNum);
-		return MV_BAD_PARAM;
-	}
-	
-
-	if (pAddrWin->addrWin.size == 0)
-	{
-		mvOsPrintf("mvPexBarSet: Size zero is Illigal\n" );
-		return MV_BAD_PARAM;
-	}
-
-
-	/* Check if the window complies with PEX spec							*/
-	if (MV_TRUE != pexBarIsValid(pAddrWin->addrWin.baseLow,
-								 pAddrWin->addrWin.size))
-	{
-        mvOsPrintf("mvPexBarSet: ERR. Target %d window invalid\n", barNum);
-		return MV_BAD_PARAM;
-	}
-
-    /* 2) Check if the requested bar overlaps with current bars		*/
-    if (MV_TRUE == pexBarOverlapDetect(pexIf,barNum, &pAddrWin->addrWin))
-	{
-        mvOsPrintf("mvPexBarSet: ERR. Target %d overlap\n", barNum);
-		return MV_BAD_PARAM;
-	}
-
-	/* Get size register value according to window size						*/
-	sizeToReg = ctrlSizeToReg(pAddrWin->addrWin.size, PXBCR_BAR_SIZE_ALIGNMENT);
-	
-	/* Read bar size */
-	if (PEX_INTER_REGS_BAR != barNum) /* internal registers have no size */
-	{
-		regSize = MV_REG_READ(PEX_BAR_CTRL_REG(pexIf,barNum));
-
-		/* Size parameter validity check.                                   */
-		if (-1 == sizeToReg)
-		{
-			mvOsPrintf("mvPexBarSet: ERR. Target BAR %d size invalid.\n",barNum);
-			return MV_BAD_PARAM;
-		}
-	
-		regSize &= ~PXBCR_BAR_SIZE_MASK;
-		regSize |= (sizeToReg << PXBCR_BAR_SIZE_OFFS) ;
-	
-		MV_REG_WRITE(PEX_BAR_CTRL_REG(pexIf,barNum),regSize);
-
-	}
-
-	/* set size */
-
-
-
-	/* Read base address low */
-	regBaseLow = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,
-												   PEX_MV_BAR_BASE(barNum)));
-
-	/* clear current base */
-	if (PEX_INTER_REGS_BAR == barNum)
-	{
-		regBaseLow &= ~PXBIR_BASE_MASK;
-        regBaseLow |= (pAddrWin->addrWin.baseLow & PXBIR_BASE_MASK);
-	}
-	else
-	{
-		regBaseLow &= ~PXBR_BASE_MASK;
-		regBaseLow |= (pAddrWin->addrWin.baseLow & PXBR_BASE_MASK);
-	}
-
-	/* if we had a previous value that contain the bar type (MeM\IO), we want to
-	restore it */
-	regBaseLow |= PEX_BAR_DEFAULT_ATTRIB;
-
-
-
-	/* write base low */
-    MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE(barNum)),
-				regBaseLow);
-
-	if (pAddrWin->addrWin.baseHigh != 0)
-	{
-		/* Read base address high */
-		MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE_HIGH(barNum)),
-								 pAddrWin->addrWin.baseHigh);
-
-	}
-
-	/* lastly enable the Bar */
-	if (pAddrWin->enable == MV_TRUE)
-	{
-		if (PEX_INTER_REGS_BAR != barNum) /* internal registers 
-												are enabled always */
-		{
-			MV_REG_BIT_SET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
-		}
-	}
-	else if (MV_FALSE == pAddrWin->enable)
-	{
-		if (PEX_INTER_REGS_BAR != barNum) /* internal registers 
-												are enabled always */
-		{
-			MV_REG_BIT_RESET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
-		}
-
-	}
-
-
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-*  mvPexBarGet - Get PEX bar address and size
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-
-MV_STATUS mvPexBarGet(MV_U32 pexIf,
-								MV_U32 barNum,
-								MV_PEX_BAR *pAddrWin)
-{
-	/* check parameters */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexBarGet: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	if(barNum >= PEX_MAX_BARS)
-	{
-		mvOsPrintf("mvPexBarGet: ERR. Invalid bar number %d\n", barNum);
-		return MV_BAD_PARAM;
-	}
-
-	/* read base low */
-	pAddrWin->addrWin.baseLow = 
-		MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE(barNum)));
-
-
-	if (PEX_INTER_REGS_BAR == barNum)
-	{
-		pAddrWin->addrWin.baseLow &= PXBIR_BASE_MASK;
-	}
-	else
-	{
-		pAddrWin->addrWin.baseLow &= PXBR_BASE_MASK;
-	}
-
-
-	/* read base high */
-	pAddrWin->addrWin.baseHigh = 
-		MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_MV_BAR_BASE_HIGH(barNum)));
-
-
-	/* Read bar size */
-	if (PEX_INTER_REGS_BAR != barNum) /* internal registers have no size */
-	{
-		pAddrWin->addrWin.size = MV_REG_READ(PEX_BAR_CTRL_REG(pexIf,barNum));
-
-		/* check if enable or not */
-		if (pAddrWin->addrWin.size & PXBCR_BAR_EN)
-		{
-			pAddrWin->enable = MV_TRUE;
-		}
-		else
-		{
-			pAddrWin->enable = MV_FALSE;
-		}
-			
-		/* now get the size */
-		pAddrWin->addrWin.size &= PXBCR_BAR_SIZE_MASK;
-		pAddrWin->addrWin.size >>= PXBCR_BAR_SIZE_OFFS;
-
-		pAddrWin->addrWin.size = ctrlRegToSize(pAddrWin->addrWin.size,
-											   PXBCR_BAR_SIZE_ALIGNMENT);
-
-	}
-	else /* PEX_INTER_REGS_BAR */
-	{
-		pAddrWin->addrWin.size = INTER_REGS_SIZE;
-		pAddrWin->enable = MV_TRUE;
-	}
-
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-*  mvPexBarEnable - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-
-
-MV_STATUS mvPexBarEnable(MV_U32 pexIf, MV_U32 barNum, MV_BOOL enable)
-{
-
-	MV_PEX_BAR pexBar;
-
-	/* check parameters */
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexBarEnable: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-
-	if(barNum >= PEX_MAX_BARS)
-	{
-		mvOsPrintf("mvPexBarEnable: ERR. Invalid bar number %d\n", barNum);
-		return MV_BAD_PARAM;
-	}
-
-    if (PEX_INTER_REGS_BAR == barNum)
-	{
-		if (MV_TRUE == enable)
-		{
-			return MV_OK;
-		}
-		else
-		{
-			return MV_ERROR;
-		}
-	}
-
-
-	if (MV_FALSE == enable)
-	{
-			/* disable bar and quit */
-			MV_REG_BIT_RESET(PEX_BAR_CTRL_REG(pexIf,barNum),PXBCR_BAR_EN);
-			return MV_OK;
-	}
-
-	/* else */
-
-	if (mvPexBarGet(pexIf,barNum,&pexBar) != MV_OK)
-	{
-		mvOsPrintf("mvPexBarEnable: mvPexBarGet Failed\n");
-		return MV_ERROR;
-
-	}
-
-	if (MV_TRUE == pexBar.enable)
-	{
-		/* it is already enabled !!! */
-		return MV_OK;
-	}
-
-	/* else enable the bar*/
-
-	pexBar.enable = MV_TRUE;
-
-	if (mvPexBarSet(pexIf,barNum,&pexBar) != MV_OK)
-	{
-		mvOsPrintf("mvPexBarEnable: mvPexBarSet Failed\n");
-		return MV_ERROR;
-
-	}
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* pexWinOverlapDetect - Detect address windows overlapping
-*
-* DESCRIPTION:
-*       This function detects address window overlapping of a given address 
-*       window in PEX BARs.
-*
-* INPUT:
-*       pAddrWin - Address window to be checked.
-*       bar      - BAR to be accessed by slave.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL pexWinOverlapDetect(MV_U32 pexIf,
-									 MV_U32 winNum,
-									 MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32 		   win;
-	MV_PEX_DEC_WIN addrDecWin;
-
-	
-	for(win = 0; win < PEX_MAX_TARGET_WIN -2 ; win++)
-    {
-        /* don't check our target or illegal targets */
-        if (winNum == win)
-        {
-            continue;
-        }
-        
-		/* Get window parameters 	*/
-		if (MV_OK != mvPexTargetWinGet(pexIf, win, &addrDecWin))
-		{
-			mvOsPrintf("pexWinOverlapDetect: ERR. TargetWinGet failed win=%x\n",
-					   win);
-            return MV_ERROR;
-		}
-
-		/* Do not check disabled windows	*/
-		if (MV_FALSE == addrDecWin.enable)
-		{
-			continue;
-		}
-
-        
-        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
-		{                    
-			mvOsPrintf("pexWinOverlapDetect: winNum %d overlap current %d\n", 
-															winNum, win);
-			return MV_TRUE;           
-		}
-    }
-    
-	return MV_FALSE;
-}
-
-/*******************************************************************************
-* pexIsWinWithinBar - Detect if address is within PEX bar boundries
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL pexIsWinWithinBar(MV_U32 pexIf,
-								   MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32 		   bar;
-	MV_PEX_BAR addrDecWin;
-
-	for(bar = 0; bar < PEX_MAX_BARS; bar++)
-    {
-        
-		/* Get window parameters 	*/
-		if (MV_OK != mvPexBarGet(pexIf, bar, &addrDecWin))
-		{
-			mvOsPrintf("pexIsWinWithinBar: ERR. mvPexBarGet failed\n");
-            return MV_ERROR;
-		}
-		
-		/* Do not check disabled bars	*/
-		if (MV_FALSE == addrDecWin.enable)
-		{
-			continue;
-		}
-
-        
-        if(MV_TRUE == ctrlWinWithinWinTest(pAddrWin, &addrDecWin.addrWin))
-		{                    
-			return MV_TRUE;
-		}
-    }
-    
-	return MV_FALSE;
-
-}
-
-/*******************************************************************************
-* pexBarOverlapDetect - Detect address windows overlapping
-*
-* DESCRIPTION:
-*       This function detects address window overlapping of a given address 
-*       window in PEX BARs.
-*
-* INPUT:
-*       pAddrWin - Address window to be checked.
-*       bar      - BAR to be accessed by slave.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL pexBarOverlapDetect(MV_U32 pexIf,
-									 MV_U32 barNum,
-									 MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32 		   bar;
-	MV_PEX_BAR barDecWin;
-
-	
-	for(bar = 0; bar < PEX_MAX_BARS; bar++)
-    {
-        /* don't check our target or illegal targets */
-        if (barNum == bar)
-        {
-            continue;
-        }
-        
-		/* Get window parameters 	*/
-		if (MV_OK != mvPexBarGet(pexIf, bar, &barDecWin))
-		{
-			mvOsPrintf("pexBarOverlapDetect: ERR. TargetWinGet failed\n");
-            return MV_ERROR;
-		}
-
-		/* don'nt check disabled bars */
-        if (barDecWin.enable == MV_FALSE)
-		{
-			continue;
-		}
-
-
-        if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &barDecWin.addrWin))
-		{                    
-			mvOsPrintf("pexBarOverlapDetect: winNum %d overlap current %d\n", 
-															barNum, bar);
-			return MV_TRUE;           
-		}
-    }
-    
-	return MV_FALSE;
-}
-
-/*******************************************************************************
-* pexBarIsValid - Check if the given address window is valid
-*
-* DESCRIPTION:
-*		PEX spec restrict BAR base to be aligned to BAR size.
-*		This function checks if the given address window is valid.
-*
-* INPUT:
-*       baseLow - 32bit low base address.
-*       size    - Window size.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the address window is valid, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_STATUS pexBarIsValid(MV_U32 baseLow, MV_U32 size)
-{
-
-	/* PCI spec restrict BAR base to be aligned to BAR size					*/
-	if(MV_IS_NOT_ALIGN(baseLow, size))
-	{
-		return MV_ERROR;
-	}
-	else
-	{
-		return MV_TRUE;
-	}
-	
-	return MV_TRUE;
-}
-
-/*******************************************************************************
-* pexBarRegInfoGet - Get BAR register information
-*
-* DESCRIPTION:
-* 		PEX BARs registers offsets are inconsecutive. 
-*		This function gets a PEX BAR register information like register offsets
-*		and function location of the BAR.
-*
-* INPUT:
-*       pexIf - PEX interface number.
-*		bar	  - The PEX BAR in question.	
-*
-* OUTPUT:
-*       pBarRegInfo - BAR register info struct.
-*
-* RETURN:
-*		MV_BAD_PARAM when bad parameters ,MV_ERROR on error ,othewise MV_OK
-*
-*******************************************************************************/
-static MV_STATUS pexWinRegInfoGet(MV_U32 pexIf, 
-								  MV_U32 winNum,
-								  PEX_WIN_REG_INFO *pWinRegInfo)
-{
-
-	if ((winNum >= 0)&&(winNum <=3))
-	{
-		pWinRegInfo->baseLowRegOffs   = PEX_WIN0_3_BASE_REG(pexIf,winNum);
-		pWinRegInfo->baseHighRegOffs  = 0;
-		pWinRegInfo->sizeRegOffs      = PEX_WIN0_3_CTRL_REG(pexIf,winNum);
-		pWinRegInfo->remapLowRegOffs  = PEX_WIN0_3_REMAP_REG(pexIf,winNum);
-		pWinRegInfo->remapHighRegOffs = 0;
-	}
-	else if ((winNum >= 4)&&(winNum <=5))
-	{
-		pWinRegInfo->baseLowRegOffs   = PEX_WIN4_5_BASE_REG(pexIf,winNum);
-		pWinRegInfo->baseHighRegOffs  = 0;
-		pWinRegInfo->sizeRegOffs      = PEX_WIN4_5_CTRL_REG(pexIf,winNum);
-		pWinRegInfo->remapLowRegOffs  = PEX_WIN4_5_REMAP_REG(pexIf,winNum);
-		pWinRegInfo->remapHighRegOffs = PEX_WIN4_5_REMAP_HIGH_REG(pexIf,winNum);
-
-	}
-	else if (MV_PEX_WIN_DEFAULT == winNum)
-	{
-		pWinRegInfo->baseLowRegOffs   = 0;
-		pWinRegInfo->baseHighRegOffs  = 0;
-		pWinRegInfo->sizeRegOffs      = PEX_WIN_DEFAULT_CTRL_REG(pexIf);
-		pWinRegInfo->remapLowRegOffs  = 0;
-		pWinRegInfo->remapHighRegOffs = 0;
-	}
-	else if (MV_PEX_WIN_EXP_ROM == winNum)
-	{
-		pWinRegInfo->baseLowRegOffs   = 0;
-		pWinRegInfo->baseHighRegOffs  = 0;
-		pWinRegInfo->sizeRegOffs      = PEX_WIN_EXP_ROM_CTRL_REG(pexIf);
-		pWinRegInfo->remapLowRegOffs  = PEX_WIN_EXP_ROM_REMAP_REG(pexIf);
-		pWinRegInfo->remapHighRegOffs = 0;
-
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* pexBarNameGet - Get the string name of PEX BAR.
-*
-* DESCRIPTION:
-*		This function get the string name of PEX BAR.
-*
-* INPUT:
-*       bar - PEX bar number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       pointer to the string name of PEX BAR.
-*
-*******************************************************************************/
-const MV_8* pexBarNameGet( MV_U32 bar )
-{
-	switch( bar ) 
-	{
-		case PEX_INTER_REGS_BAR: 
-			return "Internal Regs Bar0....";
-		case PEX_DRAM_BAR: 
-			return "DRAM Bar1.............";
-		case PEX_DEVICE_BAR: 
-			return "Devices Bar2..........";
-		default:
-			 return "Bar unknown";
-	}
-}
-/*******************************************************************************
-* mvPexAddrDecShow - Print the PEX address decode map (BARs and windows).
-*
-* DESCRIPTION:
-*		This function print the PEX address decode map (BARs and windows).
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvPexAddrDecShow(MV_VOID)
-{
-	MV_PEX_BAR pexBar;
-	MV_PEX_DEC_WIN win;
-	MV_U32 pexIf;
-	MV_U32 bar,winNum;
-
-	for( pexIf = 0; pexIf < mvCtrlPexMaxIfGet(); pexIf++ )
-	{
-		if (MV_FALSE == mvCtrlPwrClckGet(PEX_UNIT_ID, pexIf)) continue;
-		mvOsOutput( "\n" );
-		mvOsOutput( "PEX%d:\n", pexIf );
-		mvOsOutput( "-----\n" );
-
-		mvOsOutput( "\nPex Bars \n\n");
-
-		for( bar = 0; bar < PEX_MAX_BARS; bar++ ) 
-		{
-			memset( &pexBar, 0, sizeof(MV_PEX_BAR) );
-
-			mvOsOutput( "%s ", pexBarNameGet(bar) );
-
-			if( mvPexBarGet( pexIf, bar, &pexBar ) == MV_OK )
-			{
-				if( pexBar.enable )
-				{
-                    mvOsOutput( "base %08x, ", pexBar.addrWin.baseLow );
-                    mvSizePrint( pexBar.addrWin.size );
-                    mvOsOutput( "\n" );
-				}
-				else
-					mvOsOutput( "disable\n" );
-			}
-		}
-		mvOsOutput( "\nPex Decode Windows\n\n");
-
-		for( winNum = 0; winNum < PEX_MAX_TARGET_WIN - 2; winNum++)
-		{
-			memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
-
-			mvOsOutput( "win%d - ", winNum );
-
-			if ( mvPexTargetWinGet(pexIf,winNum,&win) == MV_OK)
-			{
-				if (win.enable)
-				{
-					mvOsOutput( "%s base %08x, ",
-					mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-					mvOsOutput( "...." );
-					mvSizePrint( win.addrWin.size );
-
-					mvOsOutput( "\n" );
-				}
-				else
-					mvOsOutput( "disable\n" );
-
-
-			}
-		}
-	
-		memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
-
-		mvOsOutput( "default win - " );
-
-		if ( mvPexTargetWinGet(pexIf, MV_PEX_WIN_DEFAULT, &win) == MV_OK)
-		{
-			mvOsOutput( "%s ",
-			mvCtrlTargetNameGet(win.target) );
-			mvOsOutput( "\n" );
-		}
-		memset( &win, 0,sizeof(MV_PEX_DEC_WIN) );
-
-		mvOsOutput( "Expansion ROM - " );
-
-		if ( mvPexTargetWinGet(pexIf, MV_PEX_WIN_EXP_ROM, &win) == MV_OK)
-		{
-			mvOsOutput( "%s ",
-			mvCtrlTargetNameGet(win.target) );
-			mvOsOutput( "\n" );
-		}
-
-	}
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h
deleted file mode 100644
index 3505613b7f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysPex.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCSysPEXH
-#define __INCSysPEXH
-
-#include "mvCommon.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-/* 4KB granularity */
-#define MINIMUM_WINDOW_SIZE     0x1000
-#define MINIMUM_BAR_SIZE        0x1000
-#define MINIMUM_BAR_SIZE_MASK	0xFFFFF000
-#define BAR_SIZE_OFFS			12
-#define BAR_SIZE_MASK			(0xFFFFF << BAR_SIZE_OFFS)
-
-
-
-#define MV_PEX_WIN_DEFAULT		6
-#define MV_PEX_WIN_EXP_ROM		7
-#define PEX_MAX_TARGET_WIN		8
-
-
-#define PEX_MAX_BARS			3
-#define PEX_INTER_REGS_BAR		0
-#define PEX_DRAM_BAR			1
-#define PEX_DEVICE_BAR			2
-
-/*************************************/
-/* PCI Express BAR Control Registers */
-/*************************************/
-#define PEX_BAR_CTRL_REG(pexIf,bar)		(0x41804 + (bar-1)*4- (pexIf)*0x10000)
-#define PEX_EXP_ROM_BAR_CTRL_REG(pexIf)	(0x4180C - (pexIf)*0x10000)
-
-
-/* PCI Express BAR Control Register */
-/* PEX_BAR_CTRL_REG (PXBCR) */
-
-#define PXBCR_BAR_EN				BIT0
-#define PXBCR_BAR_SIZE_OFFS			16
-#define PXBCR_BAR_SIZE_MASK			(0xffff << PXBCR_BAR_SIZE_OFFS)
-#define PXBCR_BAR_SIZE_ALIGNMENT	0x10000
-
-
-
-/* PCI Express Expansion ROM BAR Control Register */
-/* PEX_EXP_ROM_BAR_CTRL_REG (PXERBCR) */
-
-#define PXERBCR_EXPROM_EN			BIT0
-#define PXERBCR_EXPROMSZ_OFFS		19
-#define PXERBCR_EXPROMSZ_MASK		(0xf << PXERBCR_EXPROMSZ_OFFS)
-#define PXERBCR_EXPROMSZ_512KB		(0x0 << PXERBCR_EXPROMSZ_OFFS)
-#define PXERBCR_EXPROMSZ_1024KB		(0x1 << PXERBCR_EXPROMSZ_OFFS)
-#define PXERBCR_EXPROMSZ_2048KB		(0x3 << PXERBCR_EXPROMSZ_OFFS)
-#define PXERBCR_EXPROMSZ_4096KB		(0x7 << PXERBCR_EXPROMSZ_OFFS)
-
-/************************************************/
-/* PCI Express Address Window Control Registers */
-/************************************************/
-#define PEX_WIN0_3_CTRL_REG(pexIf,winNum)       \
-                                (0x41820 + (winNum) * 0x10 - (pexIf) * 0x10000)
-#define PEX_WIN0_3_BASE_REG(pexIf,winNum)       \
-                                (0x41824 + (winNum) * 0x10 - (pexIf) * 0x10000)
-#define PEX_WIN0_3_REMAP_REG(pexIf,winNum)      \
-                                (0x4182C + (winNum) * 0x10 - (pexIf) * 0x10000)
-#define PEX_WIN4_5_CTRL_REG(pexIf,winNum)       \
-                            (0x41860 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
-#define PEX_WIN4_5_BASE_REG(pexIf,winNum)       \
-                            (0x41864 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
-#define PEX_WIN4_5_REMAP_REG(pexIf,winNum)      \
-                            (0x4186C + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
-#define PEX_WIN4_5_REMAP_HIGH_REG(pexIf,winNum) \
-                            (0x41870 + (winNum - 4) * 0x20 - (pexIf) * 0x10000)
-
-#define PEX_WIN_DEFAULT_CTRL_REG(pexIf)         (0x418B0 - (pexIf) * 0x10000)
-#define PEX_WIN_EXP_ROM_CTRL_REG(pexIf)         (0x418C0 - (pexIf) * 0x10000)
-#define PEX_WIN_EXP_ROM_REMAP_REG(pexIf)        (0x418C4 - (pexIf) * 0x10000)
-
-/* PCI Express Window Control Register */
-/* PEX_WIN_CTRL_REG (PXWCR) */
-
-#define	PXWCR_WIN_EN					BIT0 /* Window Enable.*/
-
-#define	PXWCR_WIN_BAR_MAP_OFFS			1    /* Mapping to BAR.*/
-#define	PXWCR_WIN_BAR_MAP_MASK			BIT1
-#define	PXWCR_WIN_BAR_MAP_BAR1			(0 << PXWCR_WIN_BAR_MAP_OFFS)
-#define	PXWCR_WIN_BAR_MAP_BAR2			(1 << PXWCR_WIN_BAR_MAP_OFFS)
-
-#define	PXWCR_TARGET_OFFS				4  /*Unit ID */
-#define	PXWCR_TARGET_MASK				(0xf << PXWCR_TARGET_OFFS)
-
-#define	PXWCR_ATTRIB_OFFS				8  /* target attributes */
-#define	PXWCR_ATTRIB_MASK				(0xff << PXWCR_ATTRIB_OFFS)
-
-#define	PXWCR_SIZE_OFFS					16 /* size */
-#define	PXWCR_SIZE_MASK					(0xffff << PXWCR_SIZE_OFFS)
-#define	PXWCR_SIZE_ALIGNMENT			0x10000
-
-/* PCI Express Window Base Register */
-/* PEX_WIN_BASE_REG (PXWBR)*/
-
-#define PXWBR_BASE_OFFS					16 /* address[31:16] */
-#define PXWBR_BASE_MASK					(0xffff << PXWBR_BASE_OFFS)
-#define PXWBR_BASE_ALIGNMENT			0x10000
-
-/* PCI Express Window Remap Register */
-/* PEX_WIN_REMAP_REG (PXWRR)*/
-
-#define PXWRR_REMAP_EN					BIT0
-#define PXWRR_REMAP_OFFS				16
-#define PXWRR_REMAP_MASK				(0xffff << PXWRR_REMAP_OFFS)
-#define PXWRR_REMAP_ALIGNMENT			0x10000
-
-/* PCI Express Window Remap (High) Register */
-/* PEX_WIN_REMAP_HIGH_REG (PXWRHR)*/
-
-#define PXWRHR_REMAP_HIGH_OFFS			0
-#define PXWRHR_REMAP_HIGH_MASK			(0xffffffff << PXWRHR_REMAP_HIGH_OFFS)
-
-/* PCI Express Default Window Control Register */
-/* PEX_WIN_DEFAULT_CTRL_REG (PXWDCR) */
-
-#define	PXWDCR_TARGET_OFFS				4  /*Unit ID */
-#define	PXWDCR_TARGET_MASK				(0xf << PXWDCR_TARGET_OFFS)
-#define	PXWDCR_ATTRIB_OFFS				8  /* target attributes */
-#define	PXWDCR_ATTRIB_MASK				(0xff << PXWDCR_ATTRIB_OFFS)
-
-/* PCI Express Expansion ROM Window Control Register */
-/* PEX_WIN_EXP_ROM_CTRL_REG (PXWERCR)*/
-
-#define	PXWERCR_TARGET_OFFS				4  /*Unit ID */
-#define	PXWERCR_TARGET_MASK				(0xf << PXWERCR_TARGET_OFFS)
-#define	PXWERCR_ATTRIB_OFFS				8  /* target attributes */
-#define	PXWERCR_ATTRIB_MASK				(0xff << PXWERCR_ATTRIB_OFFS)
-
-/* PCI Express Expansion ROM Window Remap Register */
-/* PEX_WIN_EXP_ROM_REMAP_REG (PXWERRR)*/
-
-#define PXWERRR_REMAP_EN				BIT0
-#define PXWERRR_REMAP_OFFS				16
-#define PXWERRR_REMAP_MASK				(0xffff << PXWERRR_REMAP_OFFS)
-#define PXWERRR_REMAP_ALIGNMENT			0x10000
-
-
-
-/*PEX_MEMORY_BAR_BASE_ADDR(barNum) (PXMBBA)*/ 
-/* PCI Express BAR0 Internal Register*/
-/*PEX BAR0_INTER_REG (PXBIR)*/
-
-#define PXBIR_IOSPACE			BIT0	/* Memory Space Indicator */
-
-#define PXBIR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
-#define PXBIR_TYPE_MASK			(0x3 << PXBIR_TYPE_OFFS)
-#define PXBIR_TYPE_32BIT_ADDR	(0x0 << PXBIR_TYPE_OFFS)
-#define PXBIR_TYPE_64BIT_ADDR	(0x2 << PXBIR_TYPE_OFFS)
-
-#define PXBIR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
-
-#define PXBIR_BASE_OFFS		20		/* Base address. Address bits [31:20] */
-#define PXBIR_BASE_MASK		(0xfff << PXBIR_BASE_OFFS)
-#define PXBIR_BASE_ALIGNMET	(1 << PXBIR_BASE_OFFS)
-
-
-/* PCI Express BAR0 Internal (High) Register*/
-/*PEX BAR0_INTER_REG_HIGH (PXBIRH)*/      
-
-#define PXBIRH_BASE_OFFS			0		/* Base address. Bits [63:32] */
-#define PXBIRH_BASE_MASK			(0xffffffff << PBBHR_BASE_OFFS)
-
-
-#define PEX_BAR_DEFAULT_ATTRIB		0xc /* Memory - Prefetch - 64 bit address */
-#define PEX_BAR0_DEFAULT_ATTRIB	    PEX_BAR_DEFAULT_ATTRIB  
-#define PEX_BAR1_DEFAULT_ATTRIB		PEX_BAR_DEFAULT_ATTRIB
-#define PEX_BAR2_DEFAULT_ATTRIB		PEX_BAR_DEFAULT_ATTRIB
-
-
-/* PCI Express BAR1 Register */
-/*  PCI Express BAR2 Register*/
-/*PEX BAR1_REG (PXBR)*/
-/*PEX BAR2_REG (PXBR)*/
-
-#define PXBR_IOSPACE			BIT0	/* Memory Space Indicator */
-
-#define PXBR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
-#define PXBR_TYPE_MASK			(0x3 << PXBR_TYPE_OFFS)
-#define PXBR_TYPE_32BIT_ADDR	(0x0 << PXBR_TYPE_OFFS)
-#define PXBR_TYPE_64BIT_ADDR	(0x2 << PXBR_TYPE_OFFS)
-
-#define PXBR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
-
-#define PXBR_BASE_OFFS		16		/* Base address. Address bits [31:16] */
-#define PXBR_BASE_MASK		(0xffff << PXBR_BASE_OFFS)
-#define PXBR_BASE_ALIGNMET	(1 << PXBR_BASE_OFFS)
-
-
-/* PCI Express BAR1 (High) Register*/
-/* PCI Express BAR2 (High) Register*/
-/*PEX BAR1_REG_HIGH (PXBRH)*/
-/*PEX BAR2_REG_HIGH (PXBRH)*/
-
-#define PXBRH_BASE_OFFS			0		/* Base address. Address bits [63:32] */
-#define PXBRH_BASE_MASK			(0xffffffff << PXBRH_BASE_OFFS)
-
-/* PCI Express Expansion ROM BAR Register*/
-/*PEX_EXPANSION_ROM_BASE_ADDR_REG (PXERBAR)*/
-
-#define PXERBAR_EXPROMEN		BIT0	/* Expansion ROM Enable */
-
-#define PXERBAR_BASE_512K_OFFS		19		/* Expansion ROM Base Address */
-#define PXERBAR_BASE_512K_MASK		(0x1fff << PXERBAR_BASE_512K_OFFS) 	
-
-#define PXERBAR_BASE_1MB_OFFS		20		/* Expansion ROM Base Address */
-#define PXERBAR_BASE_1MB_MASK		(0xfff << PXERBAR_BASE_1MB_OFFS) 	
-
-#define PXERBAR_BASE_2MB_OFFS		21		/* Expansion ROM Base Address */
-#define PXERBAR_BASE_2MB_MASK		(0x7ff << PXERBAR_BASE_2MB_OFFS) 	
-
-#define PXERBAR_BASE_4MB_OFFS		22		/* Expansion ROM Base Address */
-#define PXERBAR_BASE_4MB_MASK		(0x3ff << PXERBAR_BASE_4MB_OFFS) 	
-
-/* PEX Bar attributes */
-typedef struct _mvPexBar
-{
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-
-}MV_PEX_BAR;
-
-/* PEX Remap Window attributes */
-typedef struct _mvPexRemapWin
-{
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-
-}MV_PEX_REMAP_WIN;
-
-/* PEX Remap Window attributes */
-typedef struct _mvPexDecWin
-{
-	MV_TARGET	  target;
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_U32		  targetBar;
-	MV_U8			attrib;			/* chip select attributes */
-	MV_TARGET_ID 	targetId; 		/* Target Id of this MV_TARGET */
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-
-}MV_PEX_DEC_WIN;
-
-/* Global Functions prototypes */
-/* mvPexHalInit - Initialize PEX interfaces*/
-MV_STATUS mvPexInit(MV_U32 pexIf, MV_PEX_TYPE pexType);
-
-
-/* mvPexTargetWinSet - Set PEX to peripheral target address window BAR*/
-MV_STATUS mvPexTargetWinSet(MV_U32 pexIf, MV_U32 winNum, 
-                            MV_PEX_DEC_WIN *pAddrDecWin);
-
-/* mvPexTargetWinGet - Get PEX to peripheral target address window*/
-MV_STATUS mvPexTargetWinGet(MV_U32 pexIf, MV_U32 winNum, 
-                            MV_PEX_DEC_WIN *pAddrDecWin);
-
-/* mvPexTargetWinEnable - Enable/disable a PEX BAR window*/
-MV_STATUS mvPexTargetWinEnable(MV_U32 pexIf,MV_U32 winNum, MV_BOOL enable);
-
-/* mvPexTargetWinRemap - Set PEX to target address window remap.*/
-MV_STATUS mvPexTargetWinRemap(MV_U32 pexIf, MV_U32 winNum, 
-                           MV_PEX_REMAP_WIN *pAddrWin);
-
-/* mvPexTargetWinRemapEnable -enable\disable a PEX Window remap.*/
-MV_STATUS mvPexTargetWinRemapEnable(MV_U32 pexIf, MV_U32 winNum, 
-                           MV_BOOL enable);
-
-/* mvPexBarSet - Set PEX bar address and size */
-MV_STATUS mvPexBarSet(MV_U32 pexIf, MV_U32 barNum, MV_PEX_BAR *addrWin);
-
-/* mvPexBarGet - Get PEX bar address and size */
-MV_STATUS mvPexBarGet(MV_U32 pexIf, MV_U32 barNum, MV_PEX_BAR *addrWin);
-
-/* mvPexBarEnable - enable\disable a PEX bar*/
-MV_STATUS mvPexBarEnable(MV_U32 pexIf, MV_U32 barNum, MV_BOOL enable);
-
-/* mvPexAddrDecShow - Display address decode windows attributes */
-MV_VOID mvPexAddrDecShow(MV_VOID);
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c
deleted file mode 100644
index f100a12d10..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "mvTypes.h"
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "cpu/mvCpu.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "sata/CoreDriver/mvRegs.h"
-#include "ctrlEnv/sys/mvSysSata.h"
-
-MV_TARGET sataAddrDecPrioTab[] =
-{
-#if defined(MV_INCLUDE_SDRAM_CS0)
-    SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-    SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-    SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-    SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_PEX)
-	PEX0_MEM,
-#endif
-	TBL_TERM
-};
-
-
-/*******************************************************************************
-* sataWinOverlapDetect - Detect SATA address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case SATA address decode 
-*       windows overlapps.
-*       This function detects SATA address decode windows overlapping of a 
-*       specified window. The function does not check the window itself for 
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS sataWinOverlapDetect(int dev, MV_U32 winNum, 
-				      MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32          winNumIndex;
-    MV_SATA_DEC_WIN  addrDecWin;
-
-    for(winNumIndex=0; winNumIndex<MV_SATA_MAX_ADDR_DECODE_WIN; winNumIndex++)
-    {
-        /* Do not check window itself       */
-        if (winNumIndex == winNum)
-        {
-            continue;
-        }
-
-        /* Get window parameters    */
-        if (MV_OK != mvSataWinGet(dev, winNumIndex, &addrDecWin))
-        {
-            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
-            return MV_ERROR;
-        }
-
-        /* Do not check disabled windows    */
-        if(addrDecWin.enable == MV_FALSE)
-        {
-            continue;
-        }
-
-        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-        {
-            return MV_TRUE;
-        }        
-    }
-    return MV_FALSE;
-}
-
-
-/*******************************************************************************
-* mvSataWinSet - Set SATA target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
-*       address window, also known as address decode window. 
-*       After setting this target window, the SATA will be able to access the 
-*       target within the address window. 
-*
-* INPUT:
-*       winNum      - SATA target address decode window number.
-*       pAddrDecWin - SATA target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is 
-*       unknown.
-*
-*******************************************************************************/
-MV_STATUS mvSataWinSet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttribs;
-    MV_DEC_REGS         decRegs;
-
-    /* Parameter checking   */
-    if (winNum >= MV_SATA_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
-        return MV_BAD_PARAM;
-    }
-    
-    /* Check if the requested window overlapps with current windows         */
-    if (MV_TRUE == sataWinOverlapDetect(dev, winNum, &pAddrDecWin->addrWin))
-    {
-        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
-        return MV_ERROR;
-    }
-
-    /* check if address is aligned to the size */
-    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-    {
-	mvOsPrintf("mvSataWinSet:Error setting SATA window %d to "\
-		   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-		   winNum,
-		   mvCtrlTargetNameGet(pAddrDecWin->target), 
-		   pAddrDecWin->addrWin.baseLow,
-		   pAddrDecWin->addrWin.size);
-	return MV_ERROR;
-    }
-
-    decRegs.baseReg = 0;
-    decRegs.sizeReg = 0;
-
-    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-    {
-        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
-        return MV_ERROR;
-    }
-
-    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
-                                                                                                                         
-    /* set attributes */
-    decRegs.sizeReg &= ~MV_SATA_WIN_ATTR_MASK;
-    decRegs.sizeReg |= (targetAttribs.attrib << MV_SATA_WIN_ATTR_OFFSET);
-
-    /* set target ID */
-    decRegs.sizeReg &= ~MV_SATA_WIN_TARGET_MASK;
-    decRegs.sizeReg |= (targetAttribs.targetId << MV_SATA_WIN_TARGET_OFFSET);
-
-    if (pAddrDecWin->enable == MV_TRUE)
-    {
-        decRegs.sizeReg |= MV_SATA_WIN_ENABLE_MASK;
-    }
-    else
-    {
-        decRegs.sizeReg &= ~MV_SATA_WIN_ENABLE_MASK;
-    }
-
-    MV_REG_WRITE( MV_SATA_WIN_CTRL_REG(dev, winNum), decRegs.sizeReg);
-    MV_REG_WRITE( MV_SATA_WIN_BASE_REG(dev, winNum), decRegs.baseReg);
-    
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSataWinGet - Get SATA peripheral target address window.
-*
-* DESCRIPTION:
-*       Get SATA peripheral target address window.
-*
-* INPUT:
-*       winNum - SATA target address decode window number.
-*
-* OUTPUT:
-*       pAddrDecWin - SATA target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvSataWinGet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS         decRegs;
-    MV_TARGET_ATTRIB    targetAttrib;
-                                                                                                                         
-    /* Parameter checking   */
-    if (winNum >= MV_SATA_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n", 
-                    __FUNCTION__, dev, winNum);
-        return MV_NOT_SUPPORTED;
-    }
-
-    decRegs.baseReg = MV_REG_READ( MV_SATA_WIN_BASE_REG(dev, winNum) );
-    decRegs.sizeReg = MV_REG_READ( MV_SATA_WIN_CTRL_REG(dev, winNum) );
- 
-    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
-    {
-        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
-        return MV_ERROR; 
-    }
-       
-    /* attrib and targetId */
-    targetAttrib.attrib = (decRegs.sizeReg & MV_SATA_WIN_ATTR_MASK) >> 
-		MV_SATA_WIN_ATTR_OFFSET;
-    targetAttrib.targetId = (decRegs.sizeReg & MV_SATA_WIN_TARGET_MASK) >> 
-		MV_SATA_WIN_TARGET_OFFSET;
- 
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-    /* Check if window is enabled   */
-    if(decRegs.sizeReg & MV_SATA_WIN_ENABLE_MASK) 
-    {
-        pAddrDecWin->enable = MV_TRUE;
-    }
-    else
-    {
-        pAddrDecWin->enable = MV_FALSE;
-    }
-    return MV_OK;
-}
-/*******************************************************************************
-* mvSataAddrDecShow - Print the SATA address decode map.
-*
-* DESCRIPTION:
-*		This function print the SATA address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvSataAddrDecShow(MV_VOID)
-{
-
-	MV_SATA_DEC_WIN win;
-	int i,j;
-
-
-
-    for( j = 0; j < MV_SATA_MAX_CHAN; j++ )
-    {
-	if (MV_FALSE == mvCtrlPwrClckGet(SATA_UNIT_ID, j)) 
-		return;
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "SATA %d:\n", j );
-	mvOsOutput( "----\n" );
-
-	for( i = 0; i < MV_SATA_MAX_ADDR_DECODE_WIN; i++ )
-	{
-            memset( &win, 0, sizeof(MV_SATA_DEC_WIN) );
-
-	    mvOsOutput( "win%d - ", i );
-
-	    if( mvSataWinGet(j, i, &win ) == MV_OK )
-	    {
-	        if( win.enable )
-	        {
-                    mvOsOutput( "%s base %08x, ",
-                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-                    mvOsOutput( "...." );
-
-                    mvSizePrint( win.addrWin.size );
-    
-		    mvOsOutput( "\n" );
-                }
-		else
-		mvOsOutput( "disable\n" );
-	    }
-	}
-    }
-}
-
-
-/*******************************************************************************
-* mvSataWinInit - Initialize the integrated SATA target address window.
-*
-* DESCRIPTION:
-*       Initialize the SATA peripheral target address window.
-*
-* INPUT:
-*
-*
-* OUTPUT:
-*     
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvSataWinInit(MV_VOID)
-{
-    int             winNum;
-    MV_SATA_DEC_WIN  sataWin;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    MV_U32          status, winPrioIndex = 0;
-
-    /* Initiate Sata address decode */
-
-    /* First disable all address decode windows */
-    for(winNum = 0; winNum < MV_SATA_MAX_ADDR_DECODE_WIN; winNum++)
-    {
-        MV_U32  regVal = MV_REG_READ(MV_SATA_WIN_CTRL_REG(0, winNum));
-        regVal &= ~MV_SATA_WIN_ENABLE_MASK;
-        MV_REG_WRITE(MV_SATA_WIN_CTRL_REG(0, winNum), regVal);
-    }
-    
-    winNum = 0;
-    while( (sataAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
-           (winNum < MV_SATA_MAX_ADDR_DECODE_WIN) )
-    {
-        /* first get attributes from CPU If */
-        status = mvCpuIfTargetWinGet(sataAddrDecPrioTab[winPrioIndex],
-                                     &cpuAddrDecWin);
-
-        if(MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-	if (MV_OK != status)
-	{
-            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
-	    return MV_ERROR;
-	}
-
-        if (cpuAddrDecWin.enable == MV_TRUE)
-        {
-            sataWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-            sataWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
-            sataWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
-            sataWin.enable           = MV_TRUE;
-            sataWin.target           = sataAddrDecPrioTab[winPrioIndex];
-            
-            if(MV_OK != mvSataWinSet(0/*dev*/, winNum, &sataWin))
-            {
-                return MV_ERROR;
-            }
-            winNum++;
-        }
-        winPrioIndex++;
-    }
-    return MV_OK;
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h
deleted file mode 100644
index 611f5776b7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSata.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __INCMVSysSataAddrDech
-#define __INCMVSysSataAddrDech
-
-#include "mvCommon.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _mvSataDecWin
-{
-    MV_TARGET     target;
-    MV_ADDR_WIN   addrWin;    /* An address window*/
-    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
- 
-} MV_SATA_DEC_WIN;
-
-
-#define MV_SATA_MAX_ADDR_DECODE_WIN 4
-
-#define MV_SATA_WIN_CTRL_REG(dev, win)        (SATA_REG_BASE + 0x30 + ((win)<<4))
-#define MV_SATA_WIN_BASE_REG(dev, win)        (SATA_REG_BASE + 0x34 + ((win)<<4))
-
-/* BITs in Bridge Interrupt Cause and Mask registers */
-#define MV_SATA_ADDR_DECODE_ERROR_BIT        0
-#define MV_SATA_ADDR_DECODE_ERROR_MASK       (1<<MV_SATA_ADDR_DECODE_ERROR_BIT)
-
-/* BITs in Windows 0-3 Control and Base Registers */
-#define MV_SATA_WIN_ENABLE_BIT               0
-#define MV_SATA_WIN_ENABLE_MASK              (1<<MV_SATA_WIN_ENABLE_BIT)
-
-#define MV_SATA_WIN_TARGET_OFFSET            4
-#define MV_SATA_WIN_TARGET_MASK              (0xF<<MV_SATA_WIN_TARGET_OFFSET)
-
-#define MV_SATA_WIN_ATTR_OFFSET              8
-#define MV_SATA_WIN_ATTR_MASK                (0xFF<<MV_SATA_WIN_ATTR_OFFSET)
-
-#define MV_SATA_WIN_SIZE_OFFSET              16
-#define MV_SATA_WIN_SIZE_MASK                (0xFFFF<<MV_SATA_WIN_SIZE_OFFSET)
-
-#define MV_SATA_WIN_BASE_OFFSET              16
-#define MV_SATA_WIN_BASE_MASK                (0xFFFF<<MV_SATA_WIN_BASE_OFFSET)
-
-MV_STATUS mvSataWinGet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSataWinSet(int dev, MV_U32 winNum, MV_SATA_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSataWinByTargetGet(MV_TARGET target, MV_SATA_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSataWinInit(MV_VOID);
-MV_VOID   mvSataAddrDecShow(MV_VOID);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-
-
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c
deleted file mode 100644
index 6d2a919242..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "mvTypes.h"
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "cpu/mvCpu.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "mvRegs.h"
-#include "ctrlEnv/sys/mvSysSdmmc.h"
-
-MV_TARGET sdmmcAddrDecPrioTab[] =
-{
-#if defined(MV_INCLUDE_SDRAM_CS0)
-    SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-    SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-    SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-    SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_PEX)
-	PEX0_MEM,
-#endif
-	TBL_TERM
-};
-
-
-/*******************************************************************************
-* sdmmcWinOverlapDetect - Detect SDMMC address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case SDMMC address decode 
-*       windows overlapps.
-*       This function detects SDMMC address decode windows overlapping of a 
-*       specified window. The function does not check the window itself for 
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS sdmmcWinOverlapDetect(int dev, MV_U32 winNum, 
-				      MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32          winNumIndex;
-    MV_SDMMC_DEC_WIN  addrDecWin;
-
-    for(winNumIndex=0; winNumIndex<MV_SDMMC_MAX_ADDR_DECODE_WIN; winNumIndex++)
-    {
-        /* Do not check window itself       */
-        if (winNumIndex == winNum)
-        {
-            continue;
-        }
-
-        /* Get window parameters    */
-        if (MV_OK != mvSdmmcWinGet(dev, winNumIndex, &addrDecWin))
-        {
-            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
-            return MV_ERROR;
-        }
-
-        /* Do not check disabled windows    */
-        if(addrDecWin.enable == MV_FALSE)
-        {
-            continue;
-        }
-
-        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-        {
-            return MV_TRUE;
-        }        
-    }
-    return MV_FALSE;
-}
-
-
-/*******************************************************************************
-* mvSdmmcWinSet - Set SDMMC target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
-*       address window, also known as address decode window. 
-*       After setting this target window, the SDMMC will be able to access the 
-*       target within the address window. 
-*
-* INPUT:
-*       winNum      - SDMMC target address decode window number.
-*       pAddrDecWin - SDMMC target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is 
-*       unknown.
-*
-*******************************************************************************/
-MV_STATUS mvSdmmcWinSet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin)
-{
-    MV_TARGET_ATTRIB    targetAttribs;
-    MV_DEC_REGS         decRegs;
-
-    /* Parameter checking   */
-    if (winNum >= MV_SDMMC_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
-        return MV_BAD_PARAM;
-    }
-    
-    /* Check if the requested window overlapps with current windows         */
-    if (MV_TRUE == sdmmcWinOverlapDetect(dev, winNum, &pAddrDecWin->addrWin))
-    {
-        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
-        return MV_ERROR;
-    }
-
-    /* check if address is aligned to the size */
-    if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-    {
-	mvOsPrintf("mvSdmmcWinSet:Error setting SDMMC window %d to "\
-		   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-		   winNum,
-		   mvCtrlTargetNameGet(pAddrDecWin->target), 
-		   pAddrDecWin->addrWin.baseLow,
-		   pAddrDecWin->addrWin.size);
-	return MV_ERROR;
-    }
-
-    decRegs.baseReg = 0;
-    decRegs.sizeReg = 0;
-
-    if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-    {
-        mvOsPrintf("%s: mvCtrlAddrDecToReg Failed\n", __FUNCTION__);
-        return MV_ERROR;
-    }
-
-    mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
-                                                                                                                         
-    /* set attributes */
-    decRegs.sizeReg &= ~MV_SDMMC_WIN_ATTR_MASK;
-    decRegs.sizeReg |= (targetAttribs.attrib << MV_SDMMC_WIN_ATTR_OFFSET);
-
-    /* set target ID */
-    decRegs.sizeReg &= ~MV_SDMMC_WIN_TARGET_MASK;
-    decRegs.sizeReg |= (targetAttribs.targetId << MV_SDMMC_WIN_TARGET_OFFSET);
-
-    if (pAddrDecWin->enable == MV_TRUE)
-    {
-        decRegs.sizeReg |= MV_SDMMC_WIN_ENABLE_MASK;
-    }
-    else
-    {
-        decRegs.sizeReg &= ~MV_SDMMC_WIN_ENABLE_MASK;
-    }
-
-    MV_REG_WRITE( MV_SDMMC_WIN_CTRL_REG(dev, winNum), decRegs.sizeReg);
-    MV_REG_WRITE( MV_SDMMC_WIN_BASE_REG(dev, winNum), decRegs.baseReg);
-    
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSdmmcWinGet - Get SDMMC peripheral target address window.
-*
-* DESCRIPTION:
-*       Get SDMMC peripheral target address window.
-*
-* INPUT:
-*       winNum - SDMMC target address decode window number.
-*d
-* OUTPUT:
-*       pAddrDecWin - SDMMC target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvSdmmcWinGet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS         decRegs;
-    MV_TARGET_ATTRIB    targetAttrib;
-                                                                                                                         
-    /* Parameter checking   */
-    if (winNum >= MV_SDMMC_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n", 
-                    __FUNCTION__, dev, winNum);
-        return MV_NOT_SUPPORTED;
-    }
-
-    decRegs.baseReg = MV_REG_READ( MV_SDMMC_WIN_BASE_REG(dev, winNum) );
-    decRegs.sizeReg = MV_REG_READ( MV_SDMMC_WIN_CTRL_REG(dev, winNum) );
- 
-    if (MV_OK != mvCtrlRegToAddrDec(&decRegs, &pAddrDecWin->addrWin) )
-    {
-        mvOsPrintf("%s: mvCtrlRegToAddrDec Failed\n", __FUNCTION__);
-        return MV_ERROR; 
-    }
-       
-    /* attrib and targetId */
-    targetAttrib.attrib = (decRegs.sizeReg & MV_SDMMC_WIN_ATTR_MASK) >> 
-		MV_SDMMC_WIN_ATTR_OFFSET;
-    targetAttrib.targetId = (decRegs.sizeReg & MV_SDMMC_WIN_TARGET_MASK) >> 
-		MV_SDMMC_WIN_TARGET_OFFSET;
- 
-    pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-    /* Check if window is enabled   */
-    if(decRegs.sizeReg & MV_SDMMC_WIN_ENABLE_MASK) 
-    {
-        pAddrDecWin->enable = MV_TRUE;
-    }
-    else
-    {
-        pAddrDecWin->enable = MV_FALSE;
-    }
-    return MV_OK;
-}
-/*******************************************************************************
-* mvSdmmcAddrDecShow - Print the SDMMC address decode map.
-*
-* DESCRIPTION:
-*		This function print the SDMMC address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvSdmmcAddrDecShow(MV_VOID)
-{
-
-	MV_SDMMC_DEC_WIN win;
-	int i,j=0;
-
-
-
-	if (MV_FALSE == mvCtrlPwrClckGet(SDIO_UNIT_ID, 0)) 
-		return;
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "SDMMC %d:\n", j );
-	mvOsOutput( "----\n" );
-
-	for( i = 0; i < MV_SDMMC_MAX_ADDR_DECODE_WIN; i++ )
-	{
-            memset( &win, 0, sizeof(MV_SDMMC_DEC_WIN) );
-
-	    mvOsOutput( "win%d - ", i );
-
-	    if( mvSdmmcWinGet(j, i, &win ) == MV_OK )
-	    {
-	        if( win.enable )
-	        {
-                    mvOsOutput( "%s base %08x, ",
-                    mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-                    mvOsOutput( "...." );
-
-                    mvSizePrint( win.addrWin.size );
-    
-		    mvOsOutput( "\n" );
-                }
-		else
-		mvOsOutput( "disable\n" );
-	    }
-	}
-}
-
-
-/*******************************************************************************
-* mvSdmmcWinInit - Initialize the integrated SDMMC target address window.
-*
-* DESCRIPTION:
-*       Initialize the SDMMC peripheral target address window.
-*
-* INPUT:
-*
-*
-* OUTPUT:
-*     
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvSdmmcWinInit(MV_VOID)
-{
-    int             winNum;
-    MV_SDMMC_DEC_WIN  sdmmcWin;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    MV_U32          status, winPrioIndex = 0;
-
-    /* Initiate Sdmmc address decode */
-
-    /* First disable all address decode windows */
-    for(winNum = 0; winNum < MV_SDMMC_MAX_ADDR_DECODE_WIN; winNum++)
-    {
-        MV_U32  regVal = MV_REG_READ(MV_SDMMC_WIN_CTRL_REG(0, winNum));
-        regVal &= ~MV_SDMMC_WIN_ENABLE_MASK;
-        MV_REG_WRITE(MV_SDMMC_WIN_CTRL_REG(0, winNum), regVal);
-    }
-    
-    winNum = 0;
-    while( (sdmmcAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
-           (winNum < MV_SDMMC_MAX_ADDR_DECODE_WIN) )
-    {
-        /* first get attributes from CPU If */
-        status = mvCpuIfTargetWinGet(sdmmcAddrDecPrioTab[winPrioIndex],
-                                     &cpuAddrDecWin);
-
-        if(MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-	if (MV_OK != status)
-	{
-            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
-	    return MV_ERROR;
-	}
-
-        if (cpuAddrDecWin.enable == MV_TRUE)
-        {
-            sdmmcWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-            sdmmcWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
-            sdmmcWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
-            sdmmcWin.enable           = MV_TRUE;
-            sdmmcWin.target           = sdmmcAddrDecPrioTab[winPrioIndex];
-            
-            if(MV_OK != mvSdmmcWinSet(0/*dev*/, winNum, &sdmmcWin))
-            {
-                return MV_ERROR;
-            }
-            winNum++;
-        }
-        winPrioIndex++;
-    }
-    return MV_OK;
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h
deleted file mode 100644
index c2f9f79446..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysSdmmc.h
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __INCMVSysSdmmcAddrDech
-#define __INCMVSysSdmmcAddrDech
-
-#include "mvCommon.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _mvSdmmcDecWin
-{
-    MV_TARGET     target;
-    MV_ADDR_WIN   addrWin;    /* An address window*/
-    MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
- 
-} MV_SDMMC_DEC_WIN;
-
-
-#define MV_SDMMC_MAX_ADDR_DECODE_WIN 4
-
-#define MV_SDMMC_WIN_CTRL_REG(dev, win)        (MV_SDIO_REG_BASE + 0x108 + ((win)<<3))
-#define MV_SDMMC_WIN_BASE_REG(dev, win)        (MV_SDIO_REG_BASE + 0x10c + ((win)<<3))
-
-
-/* BITs in Windows 0-3 Control and Base Registers */
-#define MV_SDMMC_WIN_ENABLE_BIT               0
-#define MV_SDMMC_WIN_ENABLE_MASK              (1<<MV_SDMMC_WIN_ENABLE_BIT)
-
-#define MV_SDMMC_WIN_TARGET_OFFSET            4
-#define MV_SDMMC_WIN_TARGET_MASK              (0xF<<MV_SDMMC_WIN_TARGET_OFFSET)
-
-#define MV_SDMMC_WIN_ATTR_OFFSET              8
-#define MV_SDMMC_WIN_ATTR_MASK                (0xFF<<MV_SDMMC_WIN_ATTR_OFFSET)
-
-#define MV_SDMMC_WIN_SIZE_OFFSET              16
-#define MV_SDMMC_WIN_SIZE_MASK                (0xFFFF<<MV_SDMMC_WIN_SIZE_OFFSET)
-
-#define MV_SDMMC_WIN_BASE_OFFSET              16
-#define MV_SDMMC_WIN_BASE_MASK                (0xFFFF<<MV_SDMMC_WIN_BASE_OFFSET)
-
-MV_STATUS mvSdmmcWinGet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSdmmcWinSet(int dev, MV_U32 winNum, MV_SDMMC_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSdmmcWinByTargetGet(MV_TARGET target, MV_SDMMC_DEC_WIN *pAddrDecWin);
-MV_STATUS mvSdmmcWinInit(MV_VOID);
-MV_VOID   mvSdmmcAddrDecShow(MV_VOID);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-
-
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c
deleted file mode 100644
index 6ac7f12bfc..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvSysTdm.h"
-
-
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif	
-
-static MV_TARGET tdmAddrDecPrioTap[] =
-{
-        PEX0_MEM,
-        SDRAM_CS0,
-        SDRAM_CS1,
-        SDRAM_CS2,
-        SDRAM_CS3,
-        DEVICE_CS0,
-        DEVICE_CS1,
-        DEVICE_CS2,
-        DEV_BOOCS,
-        PEX0_IO,
-        TBL_TERM
-};

-
-static MV_STATUS tdmWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
-
-/*******************************************************************************
-* mvTdmWinInit - Initialize TDM address decode windows 
-*
-* DESCRIPTION:
-*               This function initialize TDM window decode unit. It set the 
-*               default address decode
-*               windows of the unit.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if setting fail.
-*******************************************************************************/
-
-MV_STATUS mvTdmWinInit(void)
-{
-	MV_U32 		winNum;
-	MV_U32		winPrioIndex = 0;
-	MV_CPU_DEC_WIN cpuAddrDecWin;
-	MV_TDM_DEC_WIN tdmWin;
-	MV_STATUS status;
-
-	/*Disable all windows*/	
-	for (winNum = 0; winNum < TDM_MBUS_MAX_WIN; winNum++)
-	{
-		mvTdmWinEnable(winNum, MV_FALSE);
-	}
-
-	for (winNum = 0; ((tdmAddrDecPrioTap[winPrioIndex] != TBL_TERM) && 
-					  (winNum < TDM_MBUS_MAX_WIN)); )
-	{	
-		status = mvCpuIfTargetWinGet(tdmAddrDecPrioTap[winPrioIndex], 
-									 &cpuAddrDecWin);
-        if (MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-		if (MV_OK != status)
-		{
-			mvOsPrintf("mvTdmInit: ERR. mvCpuIfTargetWinGet failed\n");
-			return MV_ERROR;
-		}
-
-        if (cpuAddrDecWin.enable == MV_TRUE)
-		{
-			tdmWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-			tdmWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
-			tdmWin.addrWin.size = cpuAddrDecWin.addrWin.size;
-			tdmWin.enable = MV_TRUE;
-		    tdmWin.target = tdmAddrDecPrioTap[winPrioIndex];
-		    if (MV_OK != mvTdmWinSet(winNum, &tdmWin))
-		    {
-			    return MV_ERROR;
-		    }
-		    winNum++;
-		}
-		winPrioIndex++;			
-    }
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvTdmWinSet - Set TDM target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
-*       address window, also known as address decode window.
-*       After setting this target window, the TDM will be able to access the
-*       target within the address window.
-*
-* INPUT:
-*       winNum      - TDM to target address decode window number.
-*       pAddrDecWin - TDM target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is
-*       unknown.
-*
-*******************************************************************************/
-
-MV_STATUS mvTdmWinSet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin)
-{
-	MV_TARGET_ATTRIB targetAttribs;
-	MV_DEC_REGS decRegs;
-	MV_U32 ctrlReg = 0;
-
-    /* Parameter checking   */
-    if (winNum >= TDM_MBUS_MAX_WIN)
-    {
-		mvOsPrintf("mvTdmWinSet: ERR. Invalid win num %d\n",winNum);
-        return MV_BAD_PARAM;
-    }
-    
-    /* Check if the requested window overlapps with current windows         */
-    if (MV_TRUE == tdmWinOverlapDetect(winNum, &pAddrDecWin->addrWin))
-   	{
-       	mvOsPrintf("mvTdmWinSet: ERR. Window %d overlap\n", winNum);
-		return MV_ERROR;
-	}
-
-	/* check if address is aligned to the size */
-	if (MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvTdmWinSet: Error setting TDM window %d to "\
-				   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-				   winNum,
-				   mvCtrlTargetNameGet(pAddrDecWin->target), 
-				   pAddrDecWin->addrWin.baseLow,
-				   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-	decRegs.baseReg = MV_REG_READ(TDM_WIN_BASE_REG(winNum));
-	decRegs.sizeReg = (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_SIZE_MASK) >>  TDM_WIN_SIZE_OFFS;
-
-	if (MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-	{
-			mvOsPrintf("mvTdmWinSet: mvCtrlAddrDecToReg Failed\n");
-			return MV_ERROR;
-	}
-	
-	mvCtrlAttribGet(pAddrDecWin->target, &targetAttribs);
-	
-	/* for the safe side we disable the window before writing the new
-	values */
-	mvTdmWinEnable(winNum, MV_FALSE);
-
-	ctrlReg |= (targetAttribs.attrib << TDM_WIN_ATTRIB_OFFS);
-	ctrlReg |= (targetAttribs.targetId << TDM_WIN_TARGET_OFFS);
-	ctrlReg |= (decRegs.sizeReg & TDM_WIN_SIZE_MASK);
-
-	/* Write to address base and control registers  */
-	MV_REG_WRITE(TDM_WIN_BASE_REG(winNum), decRegs.baseReg);
-	MV_REG_WRITE(TDM_WIN_CTRL_REG(winNum), ctrlReg);  
-	/* Enable address decode target window  */
-	if (pAddrDecWin->enable == MV_TRUE)
-	{
-		mvTdmWinEnable(winNum, MV_TRUE);
-	}    
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvTdmWinGet - Get peripheral target address window.
-*
-* DESCRIPTION:
-*               Get TDM peripheral target address window.
-*
-* INPUT:
-*       winNum - TDM to target address decode window number.
-*
-* OUTPUT:
-*       pAddrDecWin - TDM target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-
-MV_STATUS mvTdmWinGet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin)
-{
-
-	MV_DEC_REGS decRegs;
-	MV_TARGET_ATTRIB targetAttrib;
-
-	/* Parameter checking   */
-	if (winNum >= TDM_MBUS_MAX_WIN)
-	{
-		mvOsPrintf("mvTdmWinGet: ERR. Invalid winNum %d\n", winNum);
-		return MV_NOT_SUPPORTED;
-	}
-	
-	decRegs.baseReg =  MV_REG_READ(TDM_WIN_BASE_REG(winNum));                                                                           
-	decRegs.sizeReg = (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_SIZE_MASK) >>  TDM_WIN_SIZE_OFFS;
- 
-	if (MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
-	{
-		mvOsPrintf("mvTdmWinGet: mvCtrlRegToAddrDec Failed \n");
-		return MV_ERROR;
-	}
-	 
-	/* attrib and targetId */
-	targetAttrib.attrib = 
-		(MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ATTRIB_MASK) >>  TDM_WIN_ATTRIB_OFFS;
-	targetAttrib.targetId = 
-		(MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_TARGET_MASK) >>  TDM_WIN_TARGET_OFFS;
-	 
-	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-	/* Check if window is enabled   */
-	if (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ENABLE_MASK)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;
-	}
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvTdmWinEnable - Enable/disable a TDM to target address window
-*
-* DESCRIPTION:
-*       This function enable/disable a TDM to target address window.
-*       According to parameter 'enable' the routine will enable the
-*       window, thus enabling TDM accesses (before enabling the window it is
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       winNum - TDM to target address decode window number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if decode window number was wrong or enabled window overlapps.
-*
-*******************************************************************************/
-MV_STATUS mvTdmWinEnable(int winNum, MV_BOOL enable)
-{
-	MV_TDM_DEC_WIN addrDecWin;
-
-	if (MV_TRUE == enable)
-	{
-		if (winNum >= TDM_MBUS_MAX_WIN)
-		{
-			mvOsPrintf("mvTdmWinEnable:ERR. Invalid winNum%d\n",winNum);
-			return MV_ERROR;
-		}	
-		
-		/* First check for overlap with other enabled windows				*/
-		/* Get current window */
-		if (MV_OK != mvTdmWinGet(winNum, &addrDecWin))
-		{
-			mvOsPrintf("mvTdmWinEnable:ERR. targetWinGet fail\n");
-			return MV_ERROR;
-		}
-		/* Check for overlapping */
-		if (MV_FALSE == tdmWinOverlapDetect(winNum, &(addrDecWin.addrWin)))
-		{
-			/* No Overlap. Enable address decode target window */
-			MV_REG_BIT_SET(TDM_WIN_CTRL_REG(winNum), TDM_WIN_ENABLE_MASK);
-		}
-		else
-		{   /* Overlap detected	*/
-			mvOsPrintf("mvTdmWinEnable:ERR. Overlap detected\n");
-			return MV_ERROR;
-		}
-	}
-	else
-	{
-		MV_REG_BIT_RESET(TDM_WIN_CTRL_REG(winNum), TDM_WIN_ENABLE_MASK);	
-	}
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* tdmWinOverlapDetect - Detect TDM address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviour is expected in case TDM address decode 
-*       windows overlapps.
-*       This function detects TDM address decode windows overlapping of a 
-*       specified window. The function does not check the window itself for 
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS tdmWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32      	winNumIndex;
-    MV_TDM_DEC_WIN  	addrDecWin;
-
-    for (winNumIndex = 0; winNumIndex < TDM_MBUS_MAX_WIN; winNumIndex++)
-    {
-		/* Do not check window itself		*/
-        if (winNumIndex == winNum)
-		{
-			continue;
-		}
-		/* Do not check disabled windows	*/
-		if (MV_REG_READ(TDM_WIN_CTRL_REG(winNum)) & TDM_WIN_ENABLE_MASK)
-		{
-			/* Get window parameters 	*/
-			if (MV_OK != mvTdmWinGet(winNumIndex, &addrDecWin))
-			{
-				DB(mvOsPrintf("dmaWinOverlapDetect: ERR. TargetWinGet failed\n"));
-            		return MV_ERROR;
-			}
-
-			if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-			{
-				return MV_TRUE;
-			}        
-		}
-    }
-	return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvTdmAddrDecShow - Print the TDM address decode map.
-*
-* DESCRIPTION:
-*       This function print the TDM address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvTdmAddrDecShow(MV_VOID)
-{
-	MV_TDM_DEC_WIN win;
-	int i;
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "TDM:\n" );
-	mvOsOutput( "----\n" );
-
-	for( i = 0; i < TDM_MBUS_MAX_WIN; i++ )
-	{
-		memset( &win, 0, sizeof(MV_TDM_DEC_WIN) );
-
-		mvOsOutput( "win%d - ", i );
-
-		if (mvTdmWinGet(i, &win ) == MV_OK )
-		{
-			if( win.enable )
-			{
-                mvOsOutput( "%s base %08x, ",
-                mvCtrlTargetNameGet(win.target), win.addrWin.baseLow);
-                mvOsOutput( "...." );
-                mvSizePrint( win.addrWin.size );
-				mvOsOutput( "\n" );
-			}
-			else
-				mvOsOutput( "disable\n" );
-		}
-	}
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h
deleted file mode 100644
index 0d3140f5e4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTdm.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSysTdmh
-#define __INCmvSysTdmh
-
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-typedef struct _mvTdmDecWin
-{
-        MV_TARGET     target;
-        MV_ADDR_WIN   addrWin; /* An address window*/
-        MV_BOOL       enable;  /* Address decode window is enabled/disabled */ 
-} MV_TDM_DEC_WIN;
-
-MV_STATUS mvTdmWinInit(MV_VOID);
-MV_STATUS mvTdmWinSet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvTdmWinGet(MV_U32 winNum, MV_TDM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvTdmWinEnable(int winNum, MV_BOOL enable);
-MV_VOID mvTdmAddrDecShow(MV_VOID);
-
-
-#define TDM_MBUS_MAX_WIN	4
-#define TDM_WIN_CTRL_REG(win)	((TDM_REG_BASE + 0x4030) + (win<<4))
-#define TDM_WIN_BASE_REG(win)	((TDM_REG_BASE +0x4034) + (win<<4))
-
-/* TDM_WIN_CTRL_REG bits */
-#define TDM_WIN_ENABLE_OFFS	0
-#define TDM_WIN_ENABLE_MASK	(1<<TDM_WIN_ENABLE_OFFS)
-#define TDM_WIN_ENABLE		1
-#define TDM_WIN_TARGET_OFFS	4
-#define TDM_WIN_TARGET_MASK	(0xf<<TDM_WIN_TARGET_OFFS)
-#define TDM_WIN_ATTRIB_OFFS	8
-#define TDM_WIN_ATTRIB_MASK	(0xff<<TDM_WIN_ATTRIB_OFFS)
-#define TDM_WIN_SIZE_OFFS	16
-#define TDM_WIN_SIZE_MASK	(0xffff<<TDM_WIN_SIZE_OFFS)
-
-/* TDM_WIN_BASE_REG bits */
-#define TDM_BASE_OFFS		16
-#define TDM_BASE_MASK		(0xffff<<TDM_BASE_OFFS)
-
-#endif /*__INCmvSysTdmh*/
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c
deleted file mode 100644
index 4415c7c265..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.c
+++ /dev/null
@@ -1,591 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-	used to endorse or promote products derived from this software without
-	specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "ctrlEnv/sys/mvSysTs.h"
-
-
-typedef struct _mvTsuDecWin
-{
-        MV_TARGET     target;
-        MV_ADDR_WIN   addrWin; /* An address window*/
-        MV_BOOL       enable;  /* Address decode window is enabled/disabled */
- 
-}MV_TSU_DEC_WIN;
-
-
-MV_TARGET tsuAddrDecPrioTap[] =
-{
-#if defined(MV_INCLUDE_PEX)
-        PEX0_MEM,
-#endif
-#if defined(MV_INCLUDE_PCI)
-        PCI0_MEM,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS0)
-        SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-        SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-        SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-        SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS0)
-        DEVICE_CS0,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS1)
-        DEVICE_CS1,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS2)
-        DEVICE_CS2,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS3)
-        DEVICE_CS3,
-#endif
-#if defined(MV_INCLUDE_PEX)
-        PEX0_IO,
-#endif
-#if defined(MV_INCLUDE_PCI)
-        PCI0_IO,
-#endif
-        TBL_TERM
-};
-
-static MV_STATUS tsuWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
-static MV_STATUS mvTsuWinSet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin);
-static MV_STATUS mvTsuWinGet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin);
-MV_STATUS mvTsuWinEnable(MV_U32 winNum,MV_BOOL enable);
-
-/*******************************************************************************
-* mvTsuWinInit
-*
-* DESCRIPTION:
-* 	Initialize the TSU unit address decode windows.
-*
-* INPUT:
-*       None.
-* OUTPUT:
-*	None.
-* RETURN:
-*       MV_OK	- on success,
-*
-*******************************************************************************/
-MV_STATUS mvTsuWinInit(void)
-{
-	MV_U32          winNum, status, winPrioIndex=0;
-	MV_TSU_DEC_WIN  tsuWin;
-	MV_CPU_DEC_WIN  cpuAddrDecWin;
-
-	/* First disable all address decode windows */
-	for(winNum = 0; winNum < TSU_MAX_DECODE_WIN; winNum++)
-	{
-		MV_REG_BIT_RESET(MV_TSU_WIN_CTRL_REG(winNum),
-				 TSU_WIN_CTRL_EN_MASK);
-	}
-
-	/* Go through all windows in user table until table terminator      */
-	for(winNum = 0; ((tsuAddrDecPrioTap[winPrioIndex] != TBL_TERM) &&
-			 (winNum < TSU_MAX_DECODE_WIN));)
-	{
-		/* first get attributes from CPU If */
-		status = mvCpuIfTargetWinGet(tsuAddrDecPrioTap[winPrioIndex],
-					     &cpuAddrDecWin);
-
-		if(MV_NO_SUCH == status)
-		{
-			winPrioIndex++;
-			continue;
-		}
-		if(MV_OK != status)
-		{
-			mvOsPrintf("mvTsuWinInit: ERR. mvCpuIfTargetWinGet failed\n");
-			return MV_ERROR;
-		}
-
-		if (cpuAddrDecWin.enable == MV_TRUE)
-		{
-			tsuWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-			tsuWin.addrWin.baseLow = cpuAddrDecWin.addrWin.baseLow;
-			tsuWin.addrWin.size = cpuAddrDecWin.addrWin.size;
-			tsuWin.enable = MV_TRUE;
-			tsuWin.target = tsuAddrDecPrioTap[winPrioIndex];
-
-			if(MV_OK != mvTsuWinSet(winNum, &tsuWin))
-			{
-				mvOsPrintf("mvTsuWinInit: ERR. mvTsuWinSet failed winNum=%d\n",
-					   winNum);
-				return MV_ERROR;
-			}
-			winNum++;
-		}
-		winPrioIndex ++;
-	}
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvTsuWinSet
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
-*       address window, also known as address decode window.
-*       After setting this target window, the TSU will be able to access the
-*       target within the address window.
-*
-* INPUT:
-*       winNum      - TSU to target address decode window number.
-*       pAddrDecWin - TSU target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR	- if address window overlapps with other address decode 
-*			windows.
-*       MV_BAD_PARAM	- if base address is invalid parameter or target is
-*       		unknown.
-*
-*******************************************************************************/
-MV_STATUS mvTsuWinSet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin)
-{
-	MV_TARGET_ATTRIB    targetAttribs;
-	MV_DEC_REGS         decRegs;
-
-	/* Parameter checking   */
-	if(winNum >= TSU_MAX_DECODE_WIN)
-	{
-		mvOsPrintf("mvTsuWinSet: ERR. Invalid win num %d\n",winNum);
-		return MV_BAD_PARAM;
-	}    
-
-	/* Check if the requested window overlapps with current windows     */
-	if(MV_TRUE == tsuWinOverlapDetect(winNum, &pAddrDecWin->addrWin))
-	{
-		mvOsPrintf("mvTsuWinSet: ERR. Window %d overlap\n", winNum);
-		return MV_ERROR;
-	}
-
-	/* check if address is aligned to the size */
-	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow,pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvTsuWinSet: Error setting TSU window %d to target "
-			   "%s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-			   winNum, mvCtrlTargetNameGet(pAddrDecWin->target),
-			   pAddrDecWin->addrWin.baseLow,
-			   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-	decRegs.baseReg = MV_REG_READ(MV_TSU_WIN_BASE_REG(winNum));
-	decRegs.sizeReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum));
-    
-	if(MV_OK != mvCtrlAddrDecToReg(&(pAddrDecWin->addrWin),&decRegs))
-	{
-		mvOsPrintf("mvTsuWinSet: mvCtrlAddrDecToReg Failed\n");
-		return MV_ERROR;
-	}
-    
-	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
-    
-	/* set attributes */
-	decRegs.sizeReg &= ~TSU_WIN_CTRL_ATTR_MASK;
-	decRegs.sizeReg |= targetAttribs.attrib << TSU_WIN_CTRL_ATTR_OFFS;
-	/* set target ID */
-	decRegs.sizeReg &= ~TSU_WIN_CTRL_TARGET_MASK;
-	decRegs.sizeReg |= targetAttribs.targetId << TSU_WIN_CTRL_TARGET_OFFS;
-
-	/* for the safe side we disable the window before writing the new */
-	/* values */
-	mvTsuWinEnable(winNum, MV_FALSE);
-	MV_REG_WRITE(MV_TSU_WIN_CTRL_REG(winNum),decRegs.sizeReg);
-
-	/* Write to address decode Size Register                            */
-	MV_REG_WRITE(MV_TSU_WIN_BASE_REG(winNum), decRegs.baseReg);
-
-	/* Enable address decode target window                              */
-	if(pAddrDecWin->enable == MV_TRUE)
-	{
-		mvTsuWinEnable(winNum,MV_TRUE);
-	}
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvTsuWinGet
-*
-* DESCRIPTION:
-*	Get TSU peripheral target address window.
-*
-* INPUT:
-*	winNum - TSU to target address decode window number.
-*
-* OUTPUT:
-*       pAddrDecWin - TSU target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvTsuWinGet(MV_U32 winNum, MV_TSU_DEC_WIN *pAddrDecWin)
-{
-	MV_DEC_REGS decRegs;
-	MV_TARGET_ATTRIB targetAttrib;
-
-	/* Parameter checking   */
-	if(winNum >= TSU_MAX_DECODE_WIN)
-	{
-		mvOsPrintf("mvTsuWinGet: ERR. Invalid winNum %d\n", winNum);
-		return MV_NOT_SUPPORTED;
-	}
-
-	decRegs.baseReg = MV_REG_READ(MV_TSU_WIN_BASE_REG(winNum));                                                                           
-	decRegs.sizeReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum));
- 
-	if(MV_OK != mvCtrlRegToAddrDec(&decRegs,&(pAddrDecWin->addrWin)))
-	{
-		mvOsPrintf("mvTsuWinGet: mvCtrlRegToAddrDec Failed \n");
-		return MV_ERROR;
-	}
-
-	/* attrib and targetId */
-	targetAttrib.attrib = 
-		(decRegs.sizeReg & TSU_WIN_CTRL_ATTR_MASK) >> TSU_WIN_CTRL_ATTR_OFFS;
-	targetAttrib.targetId = 
-		(decRegs.sizeReg & TSU_WIN_CTRL_TARGET_MASK) >> TSU_WIN_CTRL_TARGET_OFFS;
-
-	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-	/* Check if window is enabled   */
-	if((MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNum)) & TSU_WIN_CTRL_EN_MASK))
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;
-	}
-	
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvTsuWinEnable
-*
-* DESCRIPTION:
-*       This function enable/disable a TSU to target address window.
-*       According to parameter 'enable' the routine will enable the
-*       window, thus enabling TSU accesses (before enabling the window it is
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       winNum - TSU to target address decode window number.
-*       enable - Enable / disable parameter.
-*
-* OUTPUT:
-*       N/A
-*
-* RETURN:
-*       MV_ERROR if decode window number was wrong or enabled window overlapps.
-*
-*******************************************************************************/
-MV_STATUS mvTsuWinEnable(MV_U32 winNum,MV_BOOL enable)
-{
-	MV_TSU_DEC_WIN addrDecWin;
-
-	/* Parameter checking   */
-	if(winNum >= TSU_MAX_DECODE_WIN)
-	{
-		mvOsPrintf("mvTsuWinEnable: ERR. Invalid winNum%d\n",winNum);
-		return MV_ERROR;
-	}
-
-	if(enable == MV_TRUE)
-	{
-		/* First check for overlap with other enabled windows   */
-		/* Get current window.					*/
-		if(MV_OK != mvTsuWinGet(winNum,&addrDecWin))
-		{
-			mvOsPrintf("mvTsuWinEnable: ERR. targetWinGet fail\n");
-			return MV_ERROR;
-		}
-		/* Check for overlapping.	*/
-		if(MV_FALSE == tsuWinOverlapDetect(winNum,&(addrDecWin.addrWin)))
-		{
-			/* No Overlap. Enable address decode target window   */
-			MV_REG_BIT_SET(MV_TSU_WIN_CTRL_REG(winNum),
-				       TSU_WIN_CTRL_EN_MASK);
-		}
-		else
-		{
-			/* Overlap detected */
-			mvOsPrintf("mvTsuWinEnable: ERR. Overlap detected\n");
-			return MV_ERROR;
-		}
-	}
-	else
-	{
-		/* Disable address decode target window */
-		MV_REG_BIT_RESET(MV_TSU_WIN_CTRL_REG(winNum),
-				 TSU_WIN_CTRL_EN_MASK);
-	}
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvTsuWinTargetGet
-*
-* DESCRIPTION:
-*	Get Window number associated with target
-*
-* INPUT:
-*	target	- Target ID to get the window number for.
-* OUTPUT:
-*
-* RETURN:
-*       window number or 0xFFFFFFFF on error.
-*
-*******************************************************************************/
-MV_U32  mvTsuWinTargetGet(MV_TARGET target)
-{
-	MV_TSU_DEC_WIN decWin;
-	MV_U32 winNum;
-
-	/* Check parameters */
-	if(target >= MAX_TARGETS)
-	{
-		mvOsPrintf("mvTsuWinTargetGet: target %d is Illigal\n", target);
-		return 0xffffffff;
-	}
-
-	for(winNum = 0; winNum < TSU_MAX_DECODE_WIN; winNum++)
-	{
-		if(mvTsuWinGet(winNum,&decWin) != MV_OK)
-		{
-			mvOsPrintf("mvTsuWinGet: window returned error\n");
-			return 0xffffffff;
-		}
-
-		if (decWin.enable == MV_TRUE)
-		{
-			if(decWin.target == target)
-			{
-				return winNum;
-			}
-		}
-	}
-	return 0xFFFFFFFF;
-}
-
-
-/*******************************************************************************
-* tsuWinOverlapDetect
-*
-* DESCRIPTION:
-*	Detect TSU address windows overlapping
-*	An unpredicted behaviur is expected in case TSU address decode
-*	windows overlapps.
-*	This function detects TSU address decode windows overlapping of a
-*	specified window. The function does not check the window itself for
-*	overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS tsuWinOverlapDetect(MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-	MV_U32              ctrlReg;
-	MV_U32              winNumIndex;
-	MV_TSU_DEC_WIN      addrDecWin;
-
-	for(winNumIndex = 0; winNumIndex < TSU_MAX_DECODE_WIN; winNumIndex++)
-	{
-		/* Do not check window itself           */
-		if(winNumIndex == winNum)
-		{
-			continue;
-		}
-
-		/* Do not check disabled windows        */
-		ctrlReg = MV_REG_READ(MV_TSU_WIN_CTRL_REG(winNumIndex));
-		if((ctrlReg & TSU_WIN_CTRL_EN_MASK) == 0)
-		{
-			continue;
-		}
-
-		/* Get window parameters        */
-		if (MV_OK != mvTsuWinGet(winNumIndex, &addrDecWin))
-		{
-			mvOsPrintf("tsuWinOverlapDetect: ERR. mvTsuWinGet failed\n");
-			return MV_ERROR;
-		}
-
-		if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-		{
-			return MV_TRUE;
-		}
-	}
-	return MV_FALSE;
-}
-
-
-/*******************************************************************************
-* mvTsuAddrDecShow
-*
-* DESCRIPTION:
-*	Print the TSU address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-void mvTsuAddrDecShow(void)
-{
-	MV_TSU_DEC_WIN  win;
-	int             i;
-
-	if (MV_FALSE == mvCtrlPwrClckGet(TS_UNIT_ID, 0)) 
-		return;
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "TSU:\n");
-	mvOsOutput( "----\n" );
-
-	for(i = 0; i < TSU_MAX_DECODE_WIN; i++)
-	{
-		memset(&win, 0, sizeof(TSU_MAX_DECODE_WIN));
-		mvOsOutput( "win%d - ", i );
-
-		if(mvTsuWinGet(i, &win ) == MV_OK )
-		{
-			if(win.enable == MV_TRUE)
-			{
-				mvOsOutput("%s base %08x, ",
-					   mvCtrlTargetNameGet(win.target),
-					   win.addrWin.baseLow);
-				mvOsOutput( "...." );
-				mvSizePrint(win.addrWin.size );
-				mvOsOutput( "\n" );
-			}
-			else
-			{
-				mvOsOutput( "disable\n" );
-			}
-		}
-	}
-	return;
-}
-
-
-/*******************************************************************************
-* mvTsuInit
-*
-* DESCRIPTION:
-* 	Initialize the TSU unit, and get unit out of reset.
-*
-* INPUT:
-*       coreClock	- The core clock at which the TSU should operate.
-*       mode		- The mode on configure the unit into (serial/parallel).
-* 	memHandle	- Memory handle used for memory allocations.
-* OUTPUT:
-*	None.
-* RETURN:
-*       MV_OK	- on success,
-*
-*******************************************************************************/
-MV_STATUS mvTsuInit(MV_TSU_CORE_CLOCK coreClock, MV_TSU_PORTS_MODE mode,
-	            void *osHandle)
-{
-	MV_STATUS status;
-
-	status = mvTsuWinInit();
-	if(status == MV_OK)
-		status = mvTsuHalInit(coreClock,mode,osHandle);
-
-	return status;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h
deleted file mode 100644
index 42825893cd..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysTs.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSysTsh
-#define __INCmvSysTsh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* includes */
-#include "ts/mvTsu.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-#define TSU_MAX_DECODE_WIN	4
-
-
-/*******************************************/
-/* TSU Windows Registers                   */
-/*******************************************/
-#define MV_TSU_WIN_CTRL_REG(win)	(TSU_GLOBAL_REG_BASE +0x30 + 0x10 * win)
-#define MV_TSU_WIN_BASE_REG(win)	(TSU_GLOBAL_REG_BASE +0x34 + 0x10 * win)
-
-/* TSU windows control register.		*/
-#define TSU_WIN_CTRL_EN_MASK		(0x1 << 0)
-#define TSU_WIN_CTRL_TARGET_OFFS	4
-#define TSU_WIN_CTRL_TARGET_MASK	(0xF << TSU_WIN_CTRL_TARGET_OFFS)
-#define TSU_WIN_CTRL_ATTR_OFFS		8
-#define TSU_WIN_CTRL_ATTR_MASK		(0xFF << TSU_WIN_CTRL_ATTR_OFFS)
-#define TSU_WIN_CTRL_SIZE_OFFS		16
-#define TSU_WIN_CTRL_SIZE_MASK		(0xFFFF << TSU_WIN_CTRL_SIZE_OFFS)
-
-/* TSU windows base register.			*/
-#define TSU_WIN_BASE_OFFS		16
-#define TSU_WIN_BASE_MASK		(0xFFFF << TSU_WIN_BASE_OFFS)
-
-MV_STATUS mvTsuWinInit(void);
-
-void mvTsuAddrDecShow(void);
-MV_STATUS mvTsuInit(MV_TSU_CORE_CLOCK coreClock, MV_TSU_PORTS_MODE mode,
-	            void *osHandle);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvTsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c
deleted file mode 100644
index 195b5e13e3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "ctrlEnv/sys/mvSysUsb.h"
-
-MV_TARGET usbAddrDecPrioTab[] =
-{
-#if defined(MV_INCLUDE_SDRAM_CS0)
-    SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-    SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-    SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-    SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_CESA) && defined(USB_UNDERRUN_WA)
-    CRYPT_ENG,
-#endif
-#if defined(MV_INCLUDE_PEX)
-    PEX0_MEM,
-#endif
-    TBL_TERM
-};
-
-
-
-MV_STATUS   mvUsbInit(int dev, MV_BOOL isHost)
-{
-    MV_STATUS       status;
-
-    status = mvUsbWinInit(dev);
-    if(status != MV_OK)
-        return status;
-
-    return mvUsbHalInit(dev, isHost);
-}
-
-
-/*******************************************************************************
-* usbWinOverlapDetect - Detect USB address windows overlapping
-*
-* DESCRIPTION:
-*       An unpredicted behaviur is expected in case USB address decode
-*       windows overlapps.
-*       This function detects USB address decode windows overlapping of a
-*       specified window. The function does not check the window itself for
-*       overlapping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS usbWinOverlapDetect(int dev, MV_U32 winNum,
-                                     MV_ADDR_WIN *pAddrWin)
-{
-    MV_U32          winNumIndex;
-    MV_DEC_WIN      addrDecWin;
-
-    for(winNumIndex=0; winNumIndex<MV_USB_MAX_ADDR_DECODE_WIN; winNumIndex++)
-    {
-        /* Do not check window itself       */
-        if (winNumIndex == winNum)
-        {
-            continue;
-        }
-
-        /* Get window parameters    */
-        if (MV_OK != mvUsbWinGet(dev, winNumIndex, &addrDecWin))
-        {
-            mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__);
-            return MV_ERROR;
-        }
-
-        /* Do not check disabled windows    */
-        if(addrDecWin.enable == MV_FALSE)
-        {
-            continue;
-        }
-
-        if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-        {
-            return MV_TRUE;
-        }
-    }
-    return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvUsbWinSet - Set USB target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0)
-*       address window, also known as address decode window.
-*       After setting this target window, the USB will be able to access the
-*       target within the address window.
-*
-* INPUT:
-*       winNum      - USB target address decode window number.
-*       pAddrDecWin - USB target window data structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_ERROR if address window overlapps with other address decode windows.
-*       MV_BAD_PARAM if base address is invalid parameter or target is
-*       unknown.
-*
-*******************************************************************************/
-MV_STATUS mvUsbWinSet(int dev, MV_U32 winNum, MV_DEC_WIN *pDecWin)
-{
-    MV_DEC_WIN_PARAMS   winParams;
-    MV_U32              sizeReg, baseReg;
-
-    /* Parameter checking   */
-    if (winNum >= MV_USB_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum);
-        return MV_BAD_PARAM;
-    }
-
-    /* Check if the requested window overlapps with current windows         */
-    if (MV_TRUE == usbWinOverlapDetect(dev, winNum, &pDecWin->addrWin))
-    {
-        mvOsPrintf("%s: ERR. Window %d overlap\n", __FUNCTION__, winNum);
-        return MV_ERROR;
-    }
-
-    /* check if address is aligned to the size */
-    if(MV_IS_NOT_ALIGN(pDecWin->addrWin.baseLow, pDecWin->addrWin.size))
-    {
-        mvOsPrintf("mvUsbWinSet:Error setting USB window %d to "\
-                   "target %s.\nAddress 0x%08x is unaligned to size 0x%x.\n",
-                   winNum,
-                   mvCtrlTargetNameGet(pDecWin->target),
-                   pDecWin->addrWin.baseLow,
-                   pDecWin->addrWin.size);
-        return MV_ERROR;
-    }
-
-    if(MV_OK != mvCtrlAddrDecToParams(pDecWin, &winParams))
-    {
-        mvOsPrintf("%s: mvCtrlAddrDecToParams Failed\n", __FUNCTION__);
-        return MV_ERROR;
-    }
-
-    /* set Size, Attributes and TargetID */
-    sizeReg = (((winParams.targetId << MV_USB_WIN_TARGET_OFFSET) & MV_USB_WIN_TARGET_MASK) |
-               ((winParams.attrib   << MV_USB_WIN_ATTR_OFFSET)   & MV_USB_WIN_ATTR_MASK)   |
-               ((winParams.size << MV_USB_WIN_SIZE_OFFSET) & MV_USB_WIN_SIZE_MASK));
-
-#if defined(MV645xx) || defined(MV646xx)
-    /* If window is DRAM with HW cache coherency, make sure bit2 is set */
-    sizeReg &= ~MV_USB_WIN_BURST_WR_LIMIT_MASK;
-
-    if((MV_TARGET_IS_DRAM(pDecWin->target)) &&
-       (pDecWin->addrWinAttr.cachePolicy != NO_COHERENCY))
-    {
-        sizeReg |= MV_USB_WIN_BURST_WR_32BIT_LIMIT;
-    }
-    else
-    {
-        sizeReg |= MV_USB_WIN_BURST_WR_NO_LIMIT;
-    }
-#endif /* MV645xx || MV646xx */
-
-    if (pDecWin->enable == MV_TRUE)
-    {
-        sizeReg |= MV_USB_WIN_ENABLE_MASK;
-    }
-    else
-    {
-        sizeReg &= ~MV_USB_WIN_ENABLE_MASK;
-    }
-
-    /* Update Base value  */
-    baseReg = (winParams.baseAddr & MV_USB_WIN_BASE_MASK);
-
-    MV_REG_WRITE( MV_USB_WIN_CTRL_REG(dev, winNum), sizeReg);
-    MV_REG_WRITE( MV_USB_WIN_BASE_REG(dev, winNum), baseReg);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvUsbWinGet - Get USB peripheral target address window.
-*
-* DESCRIPTION:
-*       Get USB peripheral target address window.
-*
-* INPUT:
-*       winNum - USB target address decode window number.
-*
-* OUTPUT:
-*       pDecWin - USB target window data structure.
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS mvUsbWinGet(int dev, MV_U32 winNum, MV_DEC_WIN *pDecWin)
-{
-    MV_DEC_WIN_PARAMS   winParam;
-    MV_U32              sizeReg, baseReg;
-
-    /* Parameter checking   */
-    if (winNum >= MV_USB_MAX_ADDR_DECODE_WIN)
-    {
-        mvOsPrintf("%s (dev=%d): ERR. Invalid winNum %d\n",
-                    __FUNCTION__, dev, winNum);
-        return MV_NOT_SUPPORTED;
-    }
-
-    baseReg = MV_REG_READ( MV_USB_WIN_BASE_REG(dev, winNum) );
-    sizeReg = MV_REG_READ( MV_USB_WIN_CTRL_REG(dev, winNum) );
-
-   /* Check if window is enabled   */
-    if(sizeReg & MV_USB_WIN_ENABLE_MASK)
-    {
-        pDecWin->enable = MV_TRUE;
-
-        /* Extract window parameters from registers */
-        winParam.targetId = (sizeReg & MV_USB_WIN_TARGET_MASK) >> MV_USB_WIN_TARGET_OFFSET;
-        winParam.attrib   = (sizeReg & MV_USB_WIN_ATTR_MASK) >> MV_USB_WIN_ATTR_OFFSET;
-        winParam.size     = (sizeReg & MV_USB_WIN_SIZE_MASK) >> MV_USB_WIN_SIZE_OFFSET;
-        winParam.baseAddr = (baseReg & MV_USB_WIN_BASE_MASK);
-
-        /* Translate the decode window parameters to address decode struct */
-        if (MV_OK != mvCtrlParamsToAddrDec(&winParam, pDecWin))
-        {
-            mvOsPrintf("Failed to translate register parameters to USB address" \
-                       " decode window structure\n");
-            return MV_ERROR;
-        }
-    }
-    else
-    {
-        pDecWin->enable = MV_FALSE;
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvUsbWinInit -
-*
-* INPUT:
-*
-* OUTPUT:
-*
-* RETURN:
-*       MV_ERROR if register parameters are invalid.
-*
-*******************************************************************************/
-MV_STATUS   mvUsbWinInit(int dev)
-{
-    MV_STATUS       status;
-    MV_DEC_WIN      usbWin;
-    MV_CPU_DEC_WIN  cpuAddrDecWin;
-    int             winNum;
-    MV_U32          winPrioIndex = 0;
-
-    /* First disable all address decode windows */
-    for(winNum = 0; winNum < MV_USB_MAX_ADDR_DECODE_WIN; winNum++)
-    {
-        MV_REG_BIT_RESET(MV_USB_WIN_CTRL_REG(dev, winNum), MV_USB_WIN_ENABLE_MASK);
-    }
-
-    /* Go through all windows in user table until table terminator          */
-    winNum = 0;
-    while( (usbAddrDecPrioTab[winPrioIndex] != TBL_TERM) &&
-           (winNum < MV_USB_MAX_ADDR_DECODE_WIN) )
-    {
-        /* first get attributes from CPU If */
-        status = mvCpuIfTargetWinGet(usbAddrDecPrioTab[winPrioIndex],
-                                     &cpuAddrDecWin);
-
-        if(MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-        if (MV_OK != status)
-        {
-            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
-            return MV_ERROR;
-        }
-
-        if (cpuAddrDecWin.enable == MV_TRUE)
-        {
-            usbWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh;
-            usbWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow;
-            usbWin.addrWin.size     = cpuAddrDecWin.addrWin.size;
-            usbWin.enable           = MV_TRUE;
-            usbWin.target           = usbAddrDecPrioTab[winPrioIndex];
-
-#if defined(MV645xx) || defined(MV646xx)
-            /* Get the default attributes for that target window */
-            mvCtrlDefAttribGet(usbWin.target, &usbWin.addrWinAttr);
-#endif /* MV645xx || MV646xx */
-
-            if(MV_OK != mvUsbWinSet(dev, winNum, &usbWin))
-            {
-                return MV_ERROR;
-            }
-            winNum++;
-        }
-        winPrioIndex++;
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvUsbAddrDecShow - Print the USB address decode map.
-*
-* DESCRIPTION:
-*       This function print the USB address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvUsbAddrDecShow(MV_VOID)
-{
-    MV_DEC_WIN  addrDecWin;
-    int         i, winNum;
-
-    mvOsOutput( "\n" );
-    mvOsOutput( "USB:\n" );
-    mvOsOutput( "----\n" );
-
-    for(i=0; i<mvCtrlUsbMaxGet(); i++)
-    {
-        mvOsOutput( "Device %d:\n", i);
-
-        for(winNum = 0; winNum < MV_USB_MAX_ADDR_DECODE_WIN; winNum++)
-        {
-            memset(&addrDecWin, 0, sizeof(MV_DEC_WIN) );
-
-            mvOsOutput( "win%d - ", winNum );
-
-            if( mvUsbWinGet(i, winNum, &addrDecWin ) == MV_OK )
-            {
-                if( addrDecWin.enable )
-                {
-                    mvOsOutput( "%s base %08x, ",
-                        mvCtrlTargetNameGet(addrDecWin.target), addrDecWin.addrWin.baseLow );
-
-                    mvSizePrint( addrDecWin.addrWin.size );
-
-#if defined(MV645xx) || defined(MV646xx)
-                    switch( addrDecWin.addrWinAttr.swapType)
-                    {
-                        case MV_BYTE_SWAP:
-                            mvOsOutput( "BYTE_SWAP, " );
-                            break;
-                        case MV_NO_SWAP:
-                            mvOsOutput( "NO_SWAP  , " );
-                            break;
-                        case MV_BYTE_WORD_SWAP:
-                            mvOsOutput( "BYTE_WORD_SWAP, " );
-                            break;
-                        case MV_WORD_SWAP:
-                            mvOsOutput( "WORD_SWAP, " );
-                            break;
-                        default:
-                            mvOsOutput( "SWAP N/A , " );
-                    }
-
-                    switch( addrDecWin.addrWinAttr.cachePolicy )
-                    {
-                        case NO_COHERENCY:
-                            mvOsOutput( "NO_COHERENCY , " );
-                            break;
-                        case WT_COHERENCY:
-                            mvOsOutput( "WT_COHERENCY , " );
-                            break;
-                        case WB_COHERENCY:
-                            mvOsOutput( "WB_COHERENCY , " );
-                            break;
-                        default:
-                            mvOsOutput( "COHERENCY N/A, " );
-                    }
-
-                    switch( addrDecWin.addrWinAttr.pcixNoSnoop )
-                    {
-                        case 0:
-                            mvOsOutput( "PCI-X NS inactive, " );
-                            break;
-                        case 1:
-                            mvOsOutput( "PCI-X NS active  , " );
-                            break;
-                        default:
-                            mvOsOutput( "PCI-X NS N/A     , " );
-                    }
-
-                    switch( addrDecWin.addrWinAttr.p2pReq64 )
-                    {
-                        case 0:
-                            mvOsOutput( "REQ64 force" );
-                            break;
-                        case 1:
-                            mvOsOutput( "REQ64 detect" );
-                            break;
-                        default:
-                            mvOsOutput( "REQ64 N/A" );
-                    }
-#endif /* MV645xx || MV646xx */
-                    mvOsOutput( "\n" );
-                }
-                else
-                    mvOsOutput( "disable\n" );
-            }
-        }
-    }
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h
deleted file mode 100644
index 07f98de9c9..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysUsb.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSysUsbh
-#define __INCmvSysUsbh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* includes */
-#include "usb/mvUsb.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-#define MV_USB_MAX_ADDR_DECODE_WIN  4
-
-/*******************************************/
-/* USB Bridge Registers                    */
-/*******************************************/
-#define MV_USB_BRIDGE_CTRL_REG(dev)              (USB_REG_BASE(dev) + 0x300)
-
-#define MV_USB_WIN_CTRL_REG(dev, win)        (USB_REG_BASE(dev) + 0x320 + ((win)<<4)) 
-#define MV_USB_WIN_BASE_REG(dev, win)        (USB_REG_BASE(dev) + 0x324 + ((win)<<4))
-
-/* BITs in Windows 0-3 Control and Base Registers */
-#define MV_USB_WIN_ENABLE_BIT               0
-#define MV_USB_WIN_ENABLE_MASK              (1 << MV_USB_WIN_ENABLE_BIT)
-
-#define MV_USB_WIN_BURST_WR_LIMIT_BIT       1
-#define MV_USB_WIN_BURST_WR_LIMIT_MASK      (1 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
-#define MV_USB_WIN_BURST_WR_NO_LIMIT        (0 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
-#define MV_USB_WIN_BURST_WR_32BIT_LIMIT     (1 << MV_USB_WIN_BURST_WR_LIMIT_BIT)
-
-#define MV_USB_WIN_TARGET_OFFSET            4
-#define MV_USB_WIN_TARGET_MASK              (0xF << MV_USB_WIN_TARGET_OFFSET)
-
-#define MV_USB_WIN_ATTR_OFFSET              8
-#define MV_USB_WIN_ATTR_MASK                (0xFF << MV_USB_WIN_ATTR_OFFSET)
-
-#define MV_USB_WIN_SIZE_OFFSET              16
-#define MV_USB_WIN_SIZE_MASK                (0xFFFF << MV_USB_WIN_SIZE_OFFSET)
-
-#define MV_USB_WIN_BASE_OFFSET              16
-#define MV_USB_WIN_BASE_MASK                (0xFFFF << MV_USB_WIN_BASE_OFFSET)
-
-
-#define MV_USB_BRIDGE_IPG_REG(dev)          (USB_REG_BASE(dev) + 0x360)
-
-
-MV_STATUS   mvUsbInit(int dev, MV_BOOL isHost);
-
-MV_STATUS   mvUsbWinInit(int dev);
-MV_STATUS   mvUsbWinSet(int dev, MV_U32 winNum, MV_DEC_WIN *pAddrWin);
-MV_STATUS   mvUsbWinGet(int dev, MV_U32 winNum, MV_DEC_WIN *pAddrWin);
-
-void        mvUsbAddrDecShow(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvUsbh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c
deleted file mode 100644
index f9d0ab37d4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.c
+++ /dev/null
@@ -1,662 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "xor/mvXor.h"
-#include "mvSysXor.h"
-
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-#else
-	#define DB(x)
-#endif	
-
-
-static MV_STATUS xorWinOverlapDetect(MV_U32 unit,MV_U32 winNum, MV_ADDR_WIN *pAddrWin);
-
-MV_TARGET xorAddrDecPrioTap[] = 
-{
-#if defined(MV_INCLUDE_DEVICE_CS0)
-    DEVICE_CS0,
-#endif
-#if defined(MV_INCLUDE_PEX)
-	PEX0_MEM,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS0)
-    SDRAM_CS0,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS1)
-    SDRAM_CS1,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS2)
-    SDRAM_CS2,
-#endif
-#if defined(MV_INCLUDE_SDRAM_CS3)
-    SDRAM_CS3,
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS1)
-    DEVICE_CS1,
-#endif
-#if defined(MV_INCLUDE_CESA)
-   CRYPT_ENG,
-#endif 
-	TBL_TERM
-};
-static MV_STATUS mvXorInitWinsUnit (MV_U32 unit)
-{
-	MV_U32         winNum;
-	MV_XOR_DEC_WIN addrDecWin;
-	MV_CPU_DEC_WIN cpuAddrDecWin;
-	MV_U32          status;
-	MV_U32			winPrioIndex=0;
-
-	/* Initiate XOR address decode */
-
-	/* First disable all address decode windows */
-	for(winNum = 0; winNum < XOR_MAX_ADDR_DEC_WIN; winNum++)
-	{
-	    mvXorTargetWinEnable(unit,winNum, MV_FALSE);
-	}
-	
-	/* Go through all windows in user table until table terminator			*/
-	for (winNum = 0; ((xorAddrDecPrioTap[winPrioIndex] != TBL_TERM) &&
-					(winNum < XOR_MAX_ADDR_DEC_WIN));)
-	{
-		/* first get attributes from CPU If */
-		status = mvCpuIfTargetWinGet(xorAddrDecPrioTap[winPrioIndex], 
-									 &cpuAddrDecWin);
-
-        if(MV_NO_SUCH == status)
-        {
-            winPrioIndex++;
-            continue;
-        }
-		if (MV_OK != status)
-		{
-            mvOsPrintf("%s: ERR. mvCpuIfTargetWinGet failed\n", __FUNCTION__);
-			return MV_ERROR;
-		}
-
-	
-        if (cpuAddrDecWin.enable == MV_TRUE)
-		{
-
-			addrDecWin.target           = xorAddrDecPrioTap[winPrioIndex];
-			addrDecWin.addrWin.baseLow  = cpuAddrDecWin.addrWin.baseLow; 
-			addrDecWin.addrWin.baseHigh = cpuAddrDecWin.addrWin.baseHigh; 
-			addrDecWin.addrWin.size     = cpuAddrDecWin.addrWin.size;    
-			addrDecWin.enable           = MV_TRUE;
-	
-			if (MV_OK != mvXorTargetWinSet(unit,winNum, &addrDecWin))
-			{
-				DB(mvOsPrintf("mvXorInit: ERR. mvDmaTargetWinSet failed\n"));
-				return MV_ERROR;
-			}
-			winNum++;
-		}
-		winPrioIndex++;	
-        
-	}
-    
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvXorInit - Initialize XOR engine
-*
-* DESCRIPTION:
-*		This function initialize XOR unit. It set the default address decode
-*		windows of the unit.
-*		Note that if the address window is disabled in xorAddrDecMap, the
-*		window parameters will be set but the window will remain disabled.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*******************************************************************************/
-MV_STATUS mvXorInit (MV_VOID)
-{
-	MV_U32         i;
-
-	/* Initiate XOR address decode */
-	for(i = 0; i < MV_XOR_MAX_UNIT; i++)
-	    mvXorInitWinsUnit(i);
-
-	mvXorHalInit(MV_XOR_MAX_CHAN);	
-    
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvXorTargetWinSet - Set XOR target address window
-*
-* DESCRIPTION:
-*       This function sets a peripheral target (e.g. SDRAM bank0, PCI_MEM0) 
-*       address window. After setting this target window, the XOR will be 
-*       able to access the target within the address window. 
-*
-* INPUT:
-*	    winNum - One of the possible XOR memory decode windows.
-*       target - Peripheral target enumerator.
-*       base   - Window base address.
-*       size   - Window size.
-*       enable - Window enable/disable.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvXorTargetWinSet(MV_U32 unit, MV_U32 winNum, MV_XOR_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS xorDecRegs;
-	MV_TARGET_ATTRIB targetAttribs;
-    MV_U32      chan;
-    
-    /* Parameter checking */
-    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__, winNum));
-        return MV_BAD_PARAM;
-    }
-    if (pAddrDecWin == NULL)
-    {
-        DB(mvOsPrintf("%s: ERR. pAddrDecWin is NULL pointer\n", __FUNCTION__ ));
-        return MV_BAD_PTR;
-    }                                         
-    /* Check if the requested window overlaps with current windows */
-    if (MV_TRUE == xorWinOverlapDetect(unit, winNum, &pAddrDecWin->addrWin))
-    {
-	DB(mvOsPrintf("%s: ERR. Window %d overlap\n",__FUNCTION__,winNum));
-	return MV_ERROR;
-    }                              
-
-    xorDecRegs.baseReg = MV_REG_READ(XOR_BASE_ADDR_REG(unit,winNum));
-    xorDecRegs.sizeReg = MV_REG_READ(XOR_SIZE_MASK_REG(unit,winNum));
-
-    /* Get Base Address and size registers values */
-    if(MV_OK != mvCtrlAddrDecToReg(&pAddrDecWin->addrWin, &xorDecRegs))
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid addr dec window\n",__FUNCTION__));
-        return MV_BAD_PARAM;
-	}
-    
-
-	mvCtrlAttribGet(pAddrDecWin->target,&targetAttribs);
-
-	/* set attributes */
-	xorDecRegs.baseReg &= ~XEBARX_ATTR_MASK;
-	xorDecRegs.baseReg |= targetAttribs.attrib << XEBARX_ATTR_OFFS;
-	/* set target ID */
-	xorDecRegs.baseReg &= ~XEBARX_TARGET_MASK;
-	xorDecRegs.baseReg |= targetAttribs.targetId << XEBARX_TARGET_OFFS;
-
-
-    /* Write to address decode Base Address Register */
-	MV_REG_WRITE(XOR_BASE_ADDR_REG(unit,winNum), xorDecRegs.baseReg);
-    
-    /* Write to Size Register */
-	MV_REG_WRITE(XOR_SIZE_MASK_REG(unit,winNum), xorDecRegs.sizeReg);
-    
-    for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
-    {
-        if (pAddrDecWin->enable)
-        {
-            MV_REG_BIT_SET(XOR_WINDOW_CTRL_REG(unit,chan),
-                           XEXWCR_WIN_EN_MASK(winNum));
-        }
-        else
-        {
-            MV_REG_BIT_RESET(XOR_WINDOW_CTRL_REG(unit,chan),
-                             XEXWCR_WIN_EN_MASK(winNum));
-        }
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvXorTargetWinGet - Get xor peripheral target address window.
-*
-* DESCRIPTION:
-*		Get xor peripheral target address window.
-*
-* INPUT:
-*	  winNum - One of the possible XOR memory decode windows.
-*
-* OUTPUT:
-*       base   - Window base address.
-*       size   - Window size.
-*       enable - window enable/disable.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvXorTargetWinGet(MV_U32 unit,MV_U32 winNum, MV_XOR_DEC_WIN *pAddrDecWin)
-{
-    MV_DEC_REGS xorDecRegs;
-	MV_TARGET_ATTRIB targetAttrib;
-    MV_U32      chan=0,chanWinEn;
-    
-    /* Parameter checking */
-    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n",__FUNCTION__ , winNum));
-        return MV_ERROR;
-    }
-
-    if (NULL == pAddrDecWin)
-    {
-        DB(mvOsPrintf("%s: ERR. pAddrDecWin is NULL pointer\n", __FUNCTION__ ));
-        return MV_BAD_PTR;
-    }
-
-    chanWinEn = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,0)) & XEXWCR_WIN_EN_MASK(winNum);
-    
-    for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++) /* we should scan here all channels per unit */
-    {
-    	/* Check if enable bit is equal for all channels */
-        if ((MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan)) & 
-             XEXWCR_WIN_EN_MASK(winNum)) != chanWinEn)
-        {
-            mvOsPrintf("%s: ERR. Window enable field must be equal in "
-                              "all channels(chan=%d)\n",__FUNCTION__, chan);
-            return MV_ERROR;
-        }
-    }
-
-
-
-	xorDecRegs.baseReg  = MV_REG_READ(XOR_BASE_ADDR_REG(unit,winNum));
-	xorDecRegs.sizeReg  = MV_REG_READ(XOR_SIZE_MASK_REG(unit,winNum));
-
-	if (MV_OK != mvCtrlRegToAddrDec(&xorDecRegs, &pAddrDecWin->addrWin))
-	{
-		mvOsPrintf("%s: ERR. mvCtrlRegToAddrDec failed\n", __FUNCTION__);
-		return MV_ERROR;
-	}
-
-	/* attrib and targetId */
-	targetAttrib.attrib = 
-		(xorDecRegs.baseReg & XEBARX_ATTR_MASK) >> XEBARX_ATTR_OFFS;
-	targetAttrib.targetId = 
-		(xorDecRegs.baseReg & XEBARX_TARGET_MASK) >> XEBARX_TARGET_OFFS;
-
-
-	pAddrDecWin->target = mvCtrlTargetGet(&targetAttrib);
-
-	if(chanWinEn)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else pAddrDecWin->enable = MV_FALSE;
-	
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvXorTargetWinEnable - Enable/disable a Xor address decode window
-*
-* DESCRIPTION:
-*       This function enable/disable a XOR address decode window.
-*       if parameter 'enable' == MV_TRUE the routine will enable the 
-*       window, thus enabling XOR accesses (before enabling the window it is 
-*       tested for overlapping). Otherwise, the window will be disabled.
-*
-* INPUT:
-*       winNum - Decode window number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvXorTargetWinEnable(MV_U32 unit,MV_U32 winNum, MV_BOOL enable)
-{
-	MV_XOR_DEC_WIN  addrDecWin;
-    MV_U32          chan;
-    
-	/* Parameter checking   */               
-    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
-    {
-        DB(mvOsPrintf("%s: ERR. Invalid winNum%d\n", __FUNCTION__, winNum));
-        return MV_ERROR;
-    }
-
-	if (enable == MV_TRUE) 
-	{
-		/* Get current window */
-	    if (MV_OK != mvXorTargetWinGet(unit,winNum, &addrDecWin))
-		{
-			DB(mvOsPrintf("%s: ERR. targetWinGet fail\n", __FUNCTION__));
-			return MV_ERROR;
-		}
-
-		/* Check for overlapping */
-	    if (MV_TRUE == xorWinOverlapDetect(unit,winNum, &(addrDecWin.addrWin)))
-		{
-			/* Overlap detected	*/
-			DB(mvOsPrintf("%s: ERR. Overlap detected\n", __FUNCTION__));
-			return MV_ERROR;
-		}
-
-		/* No Overlap. Enable address decode target window */
-		for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
-		{
-		    MV_REG_BIT_SET(XOR_WINDOW_CTRL_REG(unit,chan),
-						   XEXWCR_WIN_EN_MASK(winNum));
-		}
-
-	}
-	else
-	{
-		/* Disable address decode target window */
-
-		for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
-		{
-		    MV_REG_BIT_RESET(XOR_WINDOW_CTRL_REG(unit,chan),
-							 XEXWCR_WIN_EN_MASK(winNum));
-		}
-
-	}
-
-	return MV_OK;                  
-}
-
-/*******************************************************************************
-* mvXorSetProtWinSet - Configure access attributes of a XOR engine
-*                               to one of the XOR memory windows.
-*
-* DESCRIPTION:
-*       Each engine can be configured with access attributes for each of the
-*       memory spaces. This function sets access attributes 
-*       to a given window for the given engine
-*
-* INPUTS:
-*       chan    - One of the possible engines.
-*       winNum  - One of the possible XOR memory spaces.
-*       access  - Protection access rights.
-*       write   - Write rights.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvXorProtWinSet (MV_U32 unit,MV_U32 chan, MV_U32 winNum, MV_BOOL access, 
-                           MV_BOOL write)
-{
-    MV_U32 temp;
-    
-    /* Parameter checking   */
-    if (chan >= MV_XOR_MAX_CHAN_PER_UNIT)
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid chan num %d\n", __FUNCTION__ , chan));
-        return MV_BAD_PARAM;
-    }
-    if (winNum >= XOR_MAX_ADDR_DEC_WIN)
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n", __FUNCTION__, winNum));
-        return MV_BAD_PARAM;
-    }
-
-    temp = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan)) & 
-        (~XEXWCR_WIN_ACC_MASK(winNum));
-
-    /* if access is disable */
-    if (!access)
-    {
-        /* disable access */
-        temp |= XEXWCR_WIN_ACC_NO_ACC(winNum);
-    }
-    /* if access is enable */
-    else
-    {
-        /* if write is enable */
-        if (write)
-        {
-            /* enable write */
-            temp |= XEXWCR_WIN_ACC_RW(winNum);
-        }
-        /* if write is disable */
-        else
-        {
-            /* disable write */
-            temp |= XEXWCR_WIN_ACC_RO(winNum);
-        }
-    }
-    MV_REG_WRITE(XOR_WINDOW_CTRL_REG(unit,chan),temp);
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvXorPciRemap - Set XOR remap register for PCI address windows.
-*
-* DESCRIPTION:
-*       only Windows 0-3 can be remapped.
-*
-* INPUT:
-*       winNum      - window number
-*       pAddrDecWin  - pointer to address space window structure
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters to function invalid, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvXorPciRemap(MV_U32 unit,MV_U32 winNum, MV_U32 addrHigh)
-{
-    /* Parameter checking   */
-    if (winNum >= XOR_MAX_REMAP_WIN)
-    {
-		DB(mvOsPrintf("%s: ERR. Invalid win num %d\n", __FUNCTION__, winNum));
-        return MV_BAD_PARAM;
-    }
-
-    MV_REG_WRITE(XOR_HIGH_ADDR_REMAP_REG(unit,winNum), addrHigh);
-    
-	return MV_OK;
-}
-
-/*******************************************************************************
-* xorWinOverlapDetect - Detect XOR address windows overlaping
-*
-* DESCRIPTION:
-*       An unpredicted behaviour is expected in case XOR address decode 
-*       windows overlaps.
-*       This function detects XOR address decode windows overlaping of a 
-*       specified window. The function does not check the window itself for 
-*       overlaping. The function also skipps disabled address decode windows.
-*
-* INPUT:
-*       winNum      - address decode window number.
-*       pAddrDecWin - An address decode window struct.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlap current address
-*       decode map, MV_FALSE otherwise, MV_ERROR if reading invalid data 
-*       from registers.
-*
-*******************************************************************************/
-static MV_STATUS xorWinOverlapDetect(MV_U32 unit,MV_U32 winNum, MV_ADDR_WIN *pAddrWin)
-{
-	MV_U32 	        baseAddrEnableReg;
-	MV_U32          winNumIndex,chan;
-	MV_XOR_DEC_WIN  addrDecWin;
-
-	if (pAddrWin == NULL)
-	{
-		DB(mvOsPrintf("%s: ERR. pAddrWin is NULL pointer\n", __FUNCTION__ ));
-		return MV_BAD_PTR;
-	}
-    
-	for (chan = 0; chan < MV_XOR_MAX_CHAN_PER_UNIT; chan++)
-	{
-		/* Read base address enable register. Do not check disabled windows	*/
-	    baseAddrEnableReg = MV_REG_READ(XOR_WINDOW_CTRL_REG(unit,chan));
-
-		for (winNumIndex = 0; winNumIndex < XOR_MAX_ADDR_DEC_WIN; winNumIndex++)
-		{
-			/* Do not check window itself */
-			if (winNumIndex == winNum)
-			{
-				continue;
-			}
-    
-			/* Do not check disabled windows */
-			if ((baseAddrEnableReg & XEXWCR_WIN_EN_MASK(winNumIndex)) == 0)
-			{
-				continue;
-			}
-    
-			/* Get window parameters */
-			if (MV_OK != mvXorTargetWinGet(unit,winNumIndex, &addrDecWin))
-			{
-				DB(mvOsPrintf("%s: ERR. TargetWinGet failed\n", __FUNCTION__ ));
-				return MV_ERROR;
-			}
-            
-			if (MV_TRUE == ctrlWinOverlapTest(pAddrWin, &(addrDecWin.addrWin)))
-			{
-				return MV_TRUE;
-			}
-		}
-	}
-	
-	return MV_FALSE;
-}
-
-static MV_VOID mvXorAddrDecShowUnit(MV_U32 unit)
-{
-	MV_XOR_DEC_WIN win;
-	int            i;
-
-	mvOsOutput( "\n" );
-	mvOsOutput( "XOR %d:\n", unit );
-	mvOsOutput( "----\n" );
-
-	for( i = 0; i < XOR_MAX_ADDR_DEC_WIN; i++ )
-	{
-		memset( &win, 0, sizeof(MV_XOR_DEC_WIN) );
-
-		mvOsOutput( "win%d - ", i );
-
-		if( mvXorTargetWinGet(unit, i, &win ) == MV_OK )
-		{
-			if( win.enable )
-			{
-				mvOsOutput( "%s base %x, ",
-				mvCtrlTargetNameGet(win.target), win.addrWin.baseLow );
-
-				mvSizePrint( win.addrWin.size );
-				
-                mvOsOutput( "\n" );
-			}
-			else
-				mvOsOutput( "disable\n" );
-		}
-	}
-}
-
-/*******************************************************************************
-* mvXorAddrDecShow - Print the XOR address decode map.
-*
-* DESCRIPTION:
-*		This function print the XOR address decode map.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID mvXorAddrDecShow(MV_VOID)
-{
-	int            i;
-
-	for( i = 0; i < MV_XOR_MAX_UNIT; i++ )
-	    mvXorAddrDecShowUnit(i);
-	
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h
deleted file mode 100644
index 73b2d9e6a4..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/ctrlEnv/sys/mvSysXor.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCMVSysXorh
-#define __INCMVSysXorh
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-#define XOR_MAX_ADDR_DEC_WIN	8	/* Maximum address decode windows		*/
-#define XOR_MAX_REMAP_WIN       4	/* Maximum address arbiter windows		*/
-
-/* XOR Engine Address Decoding Register Map */                  
-#define XOR_WINDOW_CTRL_REG(unit,chan)     (XOR_UNIT_BASE(unit)+(0x240 + ((chan) * 4)))
-#define XOR_BASE_ADDR_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x250 + ((winNum) * 4)))
-#define XOR_SIZE_MASK_REG(unit,winNum)     (XOR_UNIT_BASE(unit)+(0x270 + ((winNum) * 4)))
-#define XOR_HIGH_ADDR_REMAP_REG(unit,winNum) (XOR_UNIT_BASE(unit)+(0x290 + ((winNum) * 4)))
-
-/* XOR Engine [0..1] Window Control Registers (XExWCR) */
-#define XEXWCR_WIN_EN_OFFS(winNum)          (winNum)
-#define XEXWCR_WIN_EN_MASK(winNum)          (1 << (XEXWCR_WIN_EN_OFFS(winNum)))
-#define XEXWCR_WIN_EN_ENABLE(winNum)        (1 << (XEXWCR_WIN_EN_OFFS(winNum)))
-#define XEXWCR_WIN_EN_DISABLE(winNum)       (0 << (XEXWCR_WIN_EN_OFFS(winNum)))
-
-#define XEXWCR_WIN_ACC_OFFS(winNum)         ((2 * winNum) + 16)
-#define XEXWCR_WIN_ACC_MASK(winNum)         (3 << (XEXWCR_WIN_ACC_OFFS(winNum)))
-#define XEXWCR_WIN_ACC_NO_ACC(winNum)       (0 << (XEXWCR_WIN_ACC_OFFS(winNum)))
-#define XEXWCR_WIN_ACC_RO(winNum)           (1 << (XEXWCR_WIN_ACC_OFFS(winNum)))
-#define XEXWCR_WIN_ACC_RW(winNum)           (3 << (XEXWCR_WIN_ACC_OFFS(winNum)))
-
-/* XOR Engine Base Address Registers (XEBARx) */
-#define XEBARX_TARGET_OFFS                  (0)
-#define XEBARX_TARGET_MASK                  (0xF << XEBARX_TARGET_OFFS)
-#define XEBARX_ATTR_OFFS                    (8)
-#define XEBARX_ATTR_MASK                    (0xFF << XEBARX_ATTR_OFFS)
-#define XEBARX_BASE_OFFS                    (16)
-#define XEBARX_BASE_MASK                    (0xFFFF << XEBARX_BASE_OFFS)
-
-/* XOR Engine Size Mask Registers (XESMRx) */
-#define XESMRX_SIZE_MASK_OFFS               (16)
-#define XESMRX_SIZE_MASK_MASK               (0xFFFF << XESMRX_SIZE_MASK_OFFS)
-
-/* XOR Engine High Address Remap Register (XEHARRx1) */
-#define XEHARRX_REMAP_OFFS                  (0)
-#define XEHARRX_REMAP_MASK                  (0xFFFFFFFF << XEHARRX_REMAP_OFFS)
-
-typedef struct _mvXorDecWin
-{
-    MV_TARGET     target;
-    MV_ADDR_WIN   addrWin; /* An address window*/
-    MV_BOOL       enable;  /* Address decode window is enabled/disabled */
- 
-}MV_XOR_DEC_WIN;
-
-MV_STATUS   mvXorInit (MV_VOID);
-MV_STATUS   mvXorTargetWinSet(MV_U32 unit, MV_U32 winNum,
-			      MV_XOR_DEC_WIN *pAddrDecWin);
-MV_STATUS   mvXorTargetWinGet(MV_U32 unit, MV_U32 winNum,
-			      MV_XOR_DEC_WIN *pAddrDecWin);
-MV_STATUS   mvXorTargetWinEnable(MV_U32 unit, 
-			      MV_U32 winNum, MV_BOOL enable);
-MV_STATUS   mvXorProtWinSet (MV_U32 unit,MV_U32 chan, MV_U32 winNum, MV_BOOL access, 
-                             MV_BOOL write);
-MV_STATUS   mvXorPciRemap(MV_U32 unit, MV_U32 winNum, MV_U32 addrHigh);
-
-MV_VOID     mvXorAddrDecShow(MV_VOID);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c
deleted file mode 100644
index 80325fc12d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "device/mvDevice.h"
-
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h
deleted file mode 100644
index 9350779668..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDevice.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDeviceH
-#define __INCmvDeviceH
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "device/mvDeviceRegs.h"
-
-
-#endif /* #ifndef __INCmvDeviceH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h
deleted file mode 100644
index 80778ad935..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/kw_family/device/mvDeviceRegs.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDeviceRegsH
-#define __INCmvDeviceRegsH
-
-#ifndef MV_ASMLANGUAGE
-#include "ctrlEnv/mvCtrlEnvLib.h"
-/* This enumerator describes the Marvell controller possible devices that   */
-/* can be connected to its device interface.                                */
-typedef enum _mvDevice
-{
-#if defined(MV_INCLUDE_DEVICE_CS0)
-	DEV_CS0 = 0,    /* Device connected to dev CS[0]    */
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS1)
-	DEV_CS1 = 1,        /* Device connected to dev CS[1]    */
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS2)
-	DEV_CS2 = 2,        /* Device connected to dev CS[2]    */
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS3)
-	DEV_CS3 = 3,        /* Device connected to dev CS[2]    */
-#endif
-#if defined(MV_INCLUDE_DEVICE_CS4)
-	DEV_CS4 = 4,        /* Device connected to BOOT dev    */
-#endif
-	MV_DEV_MAX_CS = MV_DEVICE_MAX_CS
-}MV_DEVICE;
-
- 
-#endif /* MV_ASMLANGUAGE */
-
-
-#define NAND_CTRL_REG		0x10470
-
-#define NAND_ACTCEBOOT_BIT	BIT1
-
-
-#endif /* #ifndef __INCmvDeviceRegsH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c
deleted file mode 100644
index 75f7e88cf6..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-*******************************************************************************/
-/*******************************************************************************
-* mvOsCpuArchLib.c - Marvell CPU architecture library
-*
-* DESCRIPTION:
-*       This library introduce Marvell API for OS dependent CPU architecture 
-*       APIs. This library introduce single CPU architecture services APKI 
-*       cross OS.
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-/* includes */
-#include <asm/processor.h>
-#include "mvOs.h"
-
-static MV_U32 read_p15_c0 (void);
-
-/* defines  */
-#define ARM_ID_REVISION_OFFS	0
-#define ARM_ID_REVISION_MASK	(0xf << ARM_ID_REVISION_OFFS)
-
-#define ARM_ID_PART_NUM_OFFS	4
-#define ARM_ID_PART_NUM_MASK	(0xfff << ARM_ID_PART_NUM_OFFS)
-
-#define ARM_ID_ARCH_OFFS	16
-#define ARM_ID_ARCH_MASK	(0xf << ARM_ID_ARCH_OFFS)
-
-#define ARM_ID_VAR_OFFS		20
-#define ARM_ID_VAR_MASK		(0xf << ARM_ID_VAR_OFFS)
-
-#define ARM_ID_ASCII_OFFS	24
-#define ARM_ID_ASCII_MASK	(0xff << ARM_ID_ASCII_OFFS)
-
-
-
-void* mvOsIoCachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr,
-			  MV_U32 *memHandle)
-{
-    void *p = kmalloc( size, GFP_KERNEL );
-    *pPhyAddr = pci_map_single( osHandle, p, 0, PCI_DMA_BIDIRECTIONAL );
-    return p;
-}
-void* mvOsIoUncachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr,
-			    MV_U32 *memHandle)
-{
-    return pci_alloc_consistent( osHandle, size, (dma_addr_t *)pPhyAddr );
-}
- 
-void mvOsIoUncachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr,
-			 MV_U32 memHandle)
-{
-    return pci_free_consistent( osHandle, size, pVirtAddr, (dma_addr_t)phyAddr );
-} 
-                                                                                                                                               
-void mvOsIoCachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr,
-		       MV_U32 memHandle )
-{
-    return kfree( pVirtAddr );
-}
- 
-int mvOsRand(void)
-{
-    int rand;
-    get_random_bytes(&rand, sizeof(rand) );
-    return rand;
-}
-
-/*******************************************************************************
-* mvOsCpuVerGet() - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit CPU Revision
-*
-*******************************************************************************/
-MV_U32 mvOsCpuRevGet( MV_VOID )
-{
-	return ((read_p15_c0() & ARM_ID_REVISION_MASK ) >> ARM_ID_REVISION_OFFS);
-}
-/*******************************************************************************
-* mvOsCpuPartGet() - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit CPU Part number
-*
-*******************************************************************************/
-MV_U32 mvOsCpuPartGet( MV_VOID )
-{
-	return ((read_p15_c0() & ARM_ID_PART_NUM_MASK ) >> ARM_ID_PART_NUM_OFFS);
-}
-/*******************************************************************************
-* mvOsCpuArchGet() - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit CPU Architicture number
-*
-*******************************************************************************/
-MV_U32 mvOsCpuArchGet( MV_VOID )
-{
-    return ((read_p15_c0() & ARM_ID_ARCH_MASK ) >> ARM_ID_ARCH_OFFS);
-}
-/*******************************************************************************
-* mvOsCpuVarGet() - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit CPU Variant number
-*
-*******************************************************************************/
-MV_U32 mvOsCpuVarGet( MV_VOID )
-{
-    return ((read_p15_c0() & ARM_ID_VAR_MASK ) >> ARM_ID_VAR_OFFS);
-}
-/*******************************************************************************
-* mvOsCpuAsciiGet() - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit CPU Variant number
-*
-*******************************************************************************/
-MV_U32 mvOsCpuAsciiGet( MV_VOID )
-{
-    return ((read_p15_c0() & ARM_ID_ASCII_MASK ) >> ARM_ID_ASCII_OFFS);
-}
-
-
-
-/*
-static unsigned long read_p15_c0 (void)
-*/
-/* read co-processor 15, register #0 (ID register) */
-static MV_U32 read_p15_c0 (void)
-{
-	MV_U32 value;
-
-	__asm__ __volatile__(
-		"mrc	p15, 0, %0, c0, c0, 0   @ read control reg\n"
-		: "=r" (value)
-		:
-		: "memory");
-
-	return value;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h
deleted file mode 100644
index 8da562a405..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOs.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-*******************************************************************************/
-#ifndef _MV_OS_LNX_H_
-#define _MV_OS_LNX_H_
-                                                                                                                                               
-                                                                                                                                               
-#ifdef __KERNEL__
-/* for kernel space */
-#include <linux/autoconf.h>
-#include <linux/interrupt.h>
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/reboot.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/blkdev.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-  
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/hardirq.h>
-#include <asm/dma.h>
-#include <asm/io.h>
- 
-#include <linux/random.h>
-
-#include "dbg-trace.h"
-
-extern void mv_early_printk(char *fmt,...);
-
-#define MV_ASM              __asm__ __volatile__  
-#define INLINE              inline
-#define MV_TRC_REC	        TRC_REC
-#define mvOsPrintf          printk
-#define mvOsEarlyPrintf	    mv_early_printk
-#define mvOsOutput          printk
-#define mvOsSPrintf         sprintf
-#define mvOsMalloc(_size_)  kmalloc(_size_,GFP_ATOMIC)
-#define mvOsFree            kfree
-#define mvOsMemcpy          memcpy
-#define mvOsSleep(_mils_)   mdelay(_mils_)
-#define mvOsTaskLock()
-#define mvOsTaskUnlock()
-#define strtol              simple_strtoul
-#define mvOsDelay(x)        mdelay(x)
-#define mvOsUDelay(x)       udelay(x)
-#define mvCopyFromOs        copy_from_user
-#define mvCopyToOs          copy_to_user
-
- 
-#include "mvTypes.h"
-#include "mvCommon.h"
-  
-#ifdef MV_NDEBUG
-#define mvOsAssert(cond)
-#else
-#define mvOsAssert(cond) { do { if(!(cond)) { BUG(); } }while(0); }
-#endif /* MV_NDEBUG */
- 
-#else /* __KERNEL__ */
- 
-/* for user space applications */
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
- 
-#define INLINE inline
-#define mvOsPrintf printf
-#define mvOsOutput printf
-#define mvOsMalloc(_size_) malloc(_size_)
-#define mvOsFree free
-#define mvOsAssert(cond) assert(cond)
- 
-#endif /* __KERNEL__ */                                                                                                                                               
-#define mvOsIoVirtToPhy(pDev, pVirtAddr)                            \
-    pci_map_single( (pDev), (pVirtAddr), 0, PCI_DMA_BIDIRECTIONAL )
-
-#define mvOsCacheClear(pDev, p, size )                              \
-    pci_map_single( (pDev), (p), (size), PCI_DMA_BIDIRECTIONAL)
- 
-#define mvOsCacheFlush(pDev, p, size )                              \
-    pci_map_single( (pDev), (p), (size), PCI_DMA_TODEVICE)
- 
-#define mvOsCacheInvalidate(pDev, p, size)                          \
-    pci_map_single( (pDev), (p), (size), PCI_DMA_FROMDEVICE )
-
-#define mvOsCacheUnmap(pDev, phys, size)                          \
-    pci_unmap_single( (pDev), (dma_addr_t)(phys), (size), PCI_DMA_FROMDEVICE )
-
-
-#define CPU_PHY_MEM(x)              (MV_U32)x
-#define CPU_MEMIO_CACHED_ADDR(x)    (void*)x
-#define CPU_MEMIO_UNCACHED_ADDR(x)  (void*)x
-
-
-/* CPU architecture dependent 32, 16, 8 bit read/write IO addresses */
-#define MV_MEMIO32_WRITE(addr, data)    \
-    ((*((volatile unsigned int*)(addr))) = ((unsigned int)(data)))
-
-#define MV_MEMIO32_READ(addr)           \
-    ((*((volatile unsigned int*)(addr))))
-
-#define MV_MEMIO16_WRITE(addr, data)    \
-    ((*((volatile unsigned short*)(addr))) = ((unsigned short)(data)))
-
-#define MV_MEMIO16_READ(addr)           \
-    ((*((volatile unsigned short*)(addr))))
-
-#define MV_MEMIO8_WRITE(addr, data)     \
-    ((*((volatile unsigned char*)(addr))) = ((unsigned char)(data)))
-
-#define MV_MEMIO8_READ(addr)            \
-    ((*((volatile unsigned char*)(addr))))
-
-
-/* No Fast Swap implementation (in assembler) for ARM */
-#define MV_32BIT_LE_FAST(val)            MV_32BIT_LE(val)
-#define MV_16BIT_LE_FAST(val)            MV_16BIT_LE(val)
-#define MV_32BIT_BE_FAST(val)            MV_32BIT_BE(val)
-#define MV_16BIT_BE_FAST(val)            MV_16BIT_BE(val)
-    
-/* 32 and 16 bit read/write in big/little endian mode */
-
-/* 16bit write in little endian mode */
-#define MV_MEMIO_LE16_WRITE(addr, data) \
-        MV_MEMIO16_WRITE(addr, MV_16BIT_LE_FAST(data))
-
-/* 16bit read in little endian mode */
-static __inline MV_U16 MV_MEMIO_LE16_READ(MV_U32 addr)
-{
-    MV_U16 data;
-
-    data= (MV_U16)MV_MEMIO16_READ(addr);
-
-    return (MV_U16)MV_16BIT_LE_FAST(data);
-}
-
-/* 32bit write in little endian mode */
-#define MV_MEMIO_LE32_WRITE(addr, data) \
-        MV_MEMIO32_WRITE(addr, MV_32BIT_LE_FAST(data))
-
-/* 32bit read in little endian mode */
-static __inline MV_U32 MV_MEMIO_LE32_READ(MV_U32 addr)
-{
-    MV_U32 data;
-
-    data= (MV_U32)MV_MEMIO32_READ(addr);
-
-    return (MV_U32)MV_32BIT_LE_FAST(data);
-}
-
-static __inline void mvOsBCopy(char* srcAddr, char* dstAddr, int byteCount)
-{
-    while(byteCount != 0)
-    {
-        *dstAddr = *srcAddr;
-        dstAddr++;
-        srcAddr++;
-        byteCount--;
-    }
-}
-
-static INLINE MV_U64 mvOsDivMod64(MV_U64 divided, MV_U64 divisor, MV_U64* modulu)
-{
-    MV_U64  division = 0;
-
-    if(divisor == 1)
-	return divided;
-
-    while(divided >= divisor)
-    {
-	    division++;
-	    divided -= divisor;
-    }
-    if (modulu != NULL)
-        *modulu = divided;
-
-    return division;
-}
-
-#if defined(MV_BRIDGE_SYNC_REORDER)
-extern MV_U32 *mvUncachedParam;
-
-static __inline void mvOsBridgeReorderWA(void)
-{
-	volatile MV_U32 val = 0;
-
-	val = mvUncachedParam[0];
-}
-#endif
-
-
-/* Flash APIs */
-#define MV_FL_8_READ            MV_MEMIO8_READ
-#define MV_FL_16_READ           MV_MEMIO_LE16_READ
-#define MV_FL_32_READ           MV_MEMIO_LE32_READ
-#define MV_FL_8_DATA_READ       MV_MEMIO8_READ
-#define MV_FL_16_DATA_READ      MV_MEMIO16_READ
-#define MV_FL_32_DATA_READ      MV_MEMIO32_READ
-#define MV_FL_8_WRITE           MV_MEMIO8_WRITE
-#define MV_FL_16_WRITE          MV_MEMIO_LE16_WRITE
-#define MV_FL_32_WRITE          MV_MEMIO_LE32_WRITE
-#define MV_FL_8_DATA_WRITE      MV_MEMIO8_WRITE
-#define MV_FL_16_DATA_WRITE     MV_MEMIO16_WRITE
-#define MV_FL_32_DATA_WRITE     MV_MEMIO32_WRITE
-
-
-/* CPU cache information */
-#define CPU_I_CACHE_LINE_SIZE   32    /* 2do: replace 32 with linux core macro */
-#define CPU_D_CACHE_LINE_SIZE   32    /* 2do: replace 32 with linux core macro */
-
-#ifdef CONFIG_L2_CACHE_ENABLE
-/* Data cache flush one line */
-#define mvOsCacheLineFlushInv(handle, addr)                     \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c14, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 1, %0, c15, c10, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 0, r0, c7, c10, 4");		\
-}
-
-#else
-
-/* Data cache flush one line */
-#define mvOsCacheLineFlushInv(handle, addr)                     \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c14, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (addr)); \
-}
-#endif
- 
-#ifdef CONFIG_L2_CACHE_ENABLE
-#define mvOsCacheLineInv(handle,addr)                           \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c6, 1" : : "r" (addr)); \
- __asm__ __volatile__ ("mcr p15, 1, %0, c15, c11, 1" : : "r" (addr)); \
-}
-#else
-#define mvOsCacheLineInv(handle,addr)                           \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c6, 1" : : "r" (addr)); \
-}
-#endif
-
-#ifdef CONFIG_L2_CACHE_ENABLE
-/* Data cache flush one line */
-#define mvOsCacheLineFlush(handle, addr)                     \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 1, %0, c15, c9, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 0, r0, c7, c10, 4");          \
-}
-
-#else
-/* Data cache flush one line */
-#define mvOsCacheLineFlush(handle, addr)                     \
-{                                                               \
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 1" : : "r" (addr));\
-  __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" : : "r" (addr)); \
-}
-#endif 
-
-static __inline void mvOsPrefetch(const void *ptr)
-{
-#ifdef CONFIG_USE_DSP
-        __asm__ __volatile__(
-                "pld\t%0"
-                :
-                : "o" (*(char *)ptr)
-                : "cc");
-#else
-	return;
-#endif
-}
-
-
-/* Flush CPU pipe */
-#define CPU_PIPE_FLUSH
-
-
-
-
-
-/* register manipulations  */
-
-/******************************************************************************
-* This debug function enable the write of each register that u-boot access to 
-* to an array in the DRAM, the function record only MV_REG_WRITE access.
-* The function could not be operate when booting from flash.
-* In order to print the array we use the printreg command.
-******************************************************************************/
-/* #define REG_DEBUG */
-#if defined(REG_DEBUG)
-extern int reg_arry[2048][2];
-extern int reg_arry_index;
-#endif
-
-/* Marvell controller register read/write macros */
-#define MV_REG_VALUE(offset)          \
-                (MV_MEMIO32_READ((INTER_REGS_BASE | (offset))))
-
-#define MV_REG_READ(offset)             \
-        (MV_MEMIO_LE32_READ(INTER_REGS_BASE | (offset)))
-
-#if defined(REG_DEBUG)
-#define MV_REG_WRITE(offset, val)    \
-        MV_MEMIO_LE32_WRITE((INTER_REGS_BASE | (offset)), (val)); \
-        { \
-                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
-                reg_arry[reg_arry_index][1] = (val);\
-                reg_arry_index++;\
-        }
-#else
-#define MV_REG_WRITE(offset, val)    \
-        MV_MEMIO_LE32_WRITE((INTER_REGS_BASE | (offset)), (val));
-#endif
-                                                
-#define MV_REG_BYTE_READ(offset)        \
-        (MV_MEMIO8_READ((INTER_REGS_BASE | (offset))))
-
-#if defined(REG_DEBUG)
-#define MV_REG_BYTE_WRITE(offset, val)  \
-        MV_MEMIO8_WRITE((INTER_REGS_BASE | (offset)), (val)); \
-        { \
-                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
-                reg_arry[reg_arry_index][1] = (val);\
-                reg_arry_index++;\
-        }
-#else
-#define MV_REG_BYTE_WRITE(offset, val)  \
-        MV_MEMIO8_WRITE((INTER_REGS_BASE | (offset)), (val))
-#endif
-
-#if defined(REG_DEBUG)
-#define MV_REG_BIT_SET(offset, bitMask)                 \
-        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
-         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) | \
-          MV_32BIT_LE_FAST(bitMask)))); \
-        { \
-                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
-                reg_arry[reg_arry_index][1] = (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)));\
-                reg_arry_index++;\
-        }
-#else
-#define MV_REG_BIT_SET(offset, bitMask)                 \
-        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
-         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) | \
-          MV_32BIT_LE_FAST(bitMask))))
-#endif
-        
-#if defined(REG_DEBUG)
-#define MV_REG_BIT_RESET(offset,bitMask)                \
-        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
-         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) & \
-          MV_32BIT_LE_FAST(~bitMask)))); \
-        { \
-                reg_arry[reg_arry_index][0] = (INTER_REGS_BASE | (offset));\
-                reg_arry[reg_arry_index][1] = (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)));\
-                reg_arry_index++;\
-        }
-#else
-#define MV_REG_BIT_RESET(offset,bitMask)                \
-        (MV_MEMIO32_WRITE((INTER_REGS_BASE | (offset)), \
-         (MV_MEMIO32_READ(INTER_REGS_BASE | (offset)) & \
-          MV_32BIT_LE_FAST(~bitMask))))
-#endif
-
-
-
-/* ARM architecture APIs */
-MV_U32  mvOsCpuRevGet (MV_VOID);
-MV_U32  mvOsCpuPartGet (MV_VOID);
-MV_U32  mvOsCpuArchGet (MV_VOID);
-MV_U32  mvOsCpuVarGet (MV_VOID);
-MV_U32  mvOsCpuAsciiGet (MV_VOID);
-
-/*  Other APIs  */
-void* mvOsIoCachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr, MV_U32 *memHandle);
-void* mvOsIoUncachedMalloc( void* osHandle, MV_U32 size, MV_ULONG* pPhyAddr, MV_U32 *memHandle );
-void mvOsIoUncachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr, MV_U32 memHandle );
-void mvOsIoCachedFree( void* osHandle, MV_U32 size, MV_ULONG phyAddr, void* pVirtAddr, MV_U32 memHandle );
-int mvOsRand(void);
-
-#endif /* _MV_OS_LNX_H_ */
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h
deleted file mode 100644
index c925a9e9a0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/linux_oss/mvOsSata.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-*******************************************************************************/
-/*******************************************************************************
-* mvOsLinux.h - O.S. interface header file for Linux  
-*
-* DESCRIPTION:
-*       This header file contains OS dependent definition under Linux
-*
-* DEPENDENCIES:
-*       Linux kernel header files.
-*
-* FILE REVISION NUMBER:
-*       $Revision: 1.1 $
-*******************************************************************************/
-
-#ifndef __INCmvOsLinuxh
-#define __INCmvOsLinuxh
-
-/* Includes */
-#include <linux/autoconf.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/genhd.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/ide.h>
-#include <linux/pci.h>
-
-#include <asm/byteorder.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include "mvOs.h"
-
-
-/* Definitions */
-#define MV_DEFAULT_QUEUE_DEPTH 2
-#define MV_SATA_SUPPORT_EDMA_SINGLE_DATA_REGION
-#define MV_SATA_SUPPORT_GEN2E_128_QUEUE_LEN
-
-#ifdef CONFIG_MV88F6082
- #define MV_SATA_OVERRIDE_SW_QUEUE_SIZE
- #define MV_SATA_REQUESTED_SW_QUEUE_SIZE 2
- #undef MV_SATA_SUPPORT_GEN2E_128_QUEUE_LEN
-#endif
-
-/* System dependent macro for flushing CPU write cache */
-#if defined (MV_BRIDGE_SYNC_REORDER)
-#define MV_CPU_WRITE_BUFFER_FLUSH()	do {	\
-						wmb();	\
-						mvOsBridgeReorderWA();	\
-					} while (0)
-#else
-#define MV_CPU_WRITE_BUFFER_FLUSH()     wmb()
-#endif /* CONFIG_MV78XX0 */
-
-/* System dependent little endian from / to CPU conversions */
-#define MV_CPU_TO_LE16(x)   cpu_to_le16(x)
-#define MV_CPU_TO_LE32(x)   cpu_to_le32(x)
-
-#define MV_LE16_TO_CPU(x)   le16_to_cpu(x)
-#define MV_LE32_TO_CPU(x)   le32_to_cpu(x)
-
-#ifdef __BIG_ENDIAN_BITFIELD
-#define MV_BIG_ENDIAN_BITFIELD
-#endif
-
-/* System dependent register read / write in byte/word/dword variants */
-#define MV_REG_WRITE_BYTE(base, offset, val)    writeb(val, base + offset)
-#define MV_REG_WRITE_WORD(base, offset, val)    writew(val, base + offset)
-#define MV_REG_WRITE_DWORD(base, offset, val)   writel(val, base + offset)
-#define MV_REG_READ_BYTE(base, offset)          readb(base + offset)
-#define MV_REG_READ_WORD(base, offset)          readw(base + offset)
-#define MV_REG_READ_DWORD(base, offset)         readl(base + offset)
-
-
-/* Typedefs    */
-
-/* System dependant typedefs */
-typedef void            *MV_VOID_PTR;
-typedef u32             *MV_U32_PTR;
-typedef u16             *MV_U16_PTR;
-typedef u8              *MV_U8_PTR;
-typedef char            *MV_CHAR_PTR;
-typedef void            *MV_BUS_ADDR_T;
-typedef unsigned long   MV_CPU_FLAGS;
-
-
-/* Structures  */
-/* System dependent structure */
-typedef struct mvOsSemaphore
-{
-  int notUsed;
-} MV_OS_SEMAPHORE;
-
-
-/* Functions (User implemented)*/
-
-/* Semaphore init, take and release */
-#define mvOsSemInit(x) MV_TRUE
-#define mvOsSemTake(x)
-#define mvOsSemRelease(x)
-
-/* Interrupt masking and unmasking functions */
-MV_CPU_FLAGS mvOsSaveFlagsAndMaskCPUInterrupts(MV_VOID);
-MV_VOID      mvOsRestoreFlags(MV_CPU_FLAGS);
-
-/* Delay function in micro seconds resolution */
-void mvMicroSecondsDelay(MV_VOID_PTR, MV_U32);
-
-/* Typedefs    */
-typedef enum mvBoolean
-{
-    MV_SFALSE, MV_STRUE
-} MV_BOOLEAN;
-
-/* System logging function */
-#include "mvLog.h"
-/* Enable READ/WRITE Long SCSI command only when driver is compiled for debugging */
-#ifdef MV_LOGGER
-#define MV_SATA_SUPPORT_READ_WRITE_LONG
-#endif
-
-#define MV_IAL_LOG_ID       3
-
-#endif /* __INCmvOsLinuxh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h
deleted file mode 100644
index d761060c94..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mvSysHwConfig.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-
-*******************************************************************************/
-/*******************************************************************************
-* mvSysHwCfg.h - Marvell system HW configuration file
-*
-* DESCRIPTION:
-*       None.
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-#ifndef __INCmvSysHwConfigh
-#define __INCmvSysHwConfigh
-
-#include "../../../../include/linux/autoconf.h"
-
-#define CONFIG_MARVELL	1
-
-/* includes */
-#define _1K         0x00000400
-#define _4K         0x00001000
-#define _8K         0x00002000
-#define _16K        0x00004000
-#define _32K        0x00008000
-#define _64K        0x00010000
-#define _128K       0x00020000
-#define _256K       0x00040000
-#define _512K       0x00080000
-
-#define _1M         0x00100000
-#define _2M         0x00200000
-#define _4M         0x00400000
-#define _8M         0x00800000
-#define _16M        0x01000000
-#define _32M        0x02000000
-#define _64M        0x04000000
-#define _128M       0x08000000
-#define _256M       0x10000000
-#define _512M       0x20000000
-
-#define _1G         0x40000000
-#define _2G         0x80000000
-
-/****************************************/
-/* Soc supporeted Units definitions	*/
-/****************************************/
-
-#ifdef CONFIG_MV_INCLUDE_PEX
-#define MV_INCLUDE_PEX
-#endif
-#ifdef CONFIG_MV_INCLUDE_TWSI
-#define MV_INCLUDE_TWSI
-#endif
-#ifdef CONFIG_MV_INCLUDE_CESA
-#define MV_INCLUDE_CESA
-#endif
-#ifdef CONFIG_MV_INCLUDE_GIG_ETH
-#define MV_INCLUDE_GIG_ETH
-#endif
-#ifdef CONFIG_MV_INCLUDE_INTEG_SATA
-#define MV_INCLUDE_INTEG_SATA
-#define MV_INCLUDE_SATA
-#endif
-#ifdef CONFIG_MV_INCLUDE_USB
-#define MV_INCLUDE_USB
-#define MV_USB_VOLTAGE_FIX
-#endif
-#ifdef CONFIG_MV_INCLUDE_NAND
-#define MV_INCLUDE_NAND
-#endif
-#ifdef CONFIG_MV_INCLUDE_TDM
-#define MV_INCLUDE_TDM
-#endif
-#ifdef CONFIG_MV_INCLUDE_XOR
-#define MV_INCLUDE_XOR
-#endif
-#ifdef CONFIG_MV_INCLUDE_TWSI
-#define MV_INCLUDE_TWSI
-#endif
-#ifdef CONFIG_MV_INCLUDE_UART
-#define MV_INCLUDE_UART
-#endif
-#ifdef CONFIG_MV_INCLUDE_SPI
-#define MV_INCLUDE_SPI
-#endif
-#ifdef CONFIG_MV_INCLUDE_SFLASH_MTD
-#define MV_INCLUDE_SFLASH_MTD
-#endif
-#ifdef CONFIG_MV_INCLUDE_AUDIO
-#define MV_INCLUDE_AUDIO
-#endif
-#ifdef CONFIG_MV_INCLUDE_TS
-#define MV_INCLUDE_TS
-#endif
-#ifdef CONFIG_MV_INCLUDE_SDIO
-#define MV_INCLUDE_SDIO
-#endif
-
-
-/* NAND flash stuff */
-#ifdef CONFIG_MV_NAND_BOOT
-#define MV_NAND_BOOT
-#endif
-#ifdef CONFIG_MV_NAND
-#define MV_NAND
-#endif
-
-/* SPI flash stuff */
-#ifdef CONFIG_MV_SPI_BOOT
-#define MV_SPI_BOOT
-#endif
-
-
-/****************************************************************/
-/************* General    configuration ********************/
-/****************************************************************/
-
-/* Enable Clock Power Control */
-#define MV_INCLUDE_CLK_PWR_CNTRL
-
-/* Disable the DEVICE BAR in the PEX */
-#define MV_DISABLE_PEX_DEVICE_BAR
-
-/* Allow the usage of early printings during initialization */
-#define MV_INCLUDE_EARLY_PRINTK
-
-/****************************************************************/
-/************* NFP configuration ********************************/
-/****************************************************************/
-#define MV_NFP_SEC_Q_SIZE		64
-#define MV_NFP_SEC_REQ_Q_SIZE		1000
-
-
-
-/****************************************************************/
-/************* CESA configuration ********************/
-/****************************************************************/
-
-#ifdef MV_INCLUDE_CESA
-
-#define MV_CESA_MAX_CHAN               4
-
-/* Use 2K of SRAM */
-#define MV_CESA_MAX_BUF_SIZE           1600
-
-#endif /* MV_INCLUDE_CESA */
-
-#if defined(CONFIG_MV_INCLUDE_GIG_ETH)
-
-#ifdef CONFIG_MV_NFP_STATS
-#define MV_FP_STATISTICS
-#else
-#undef MV_FP_STATISTICS
-#endif
-/* Default configuration for SKB_REUSE: 0 - Disabled, 1 - Enabled */
-#define MV_ETH_SKB_REUSE_DEFAULT    1
-/* Default configuration for TX_EN workaround: 0 - Disabled, 1 - Enabled */
-#define MV_ETH_TX_EN_DEFAULT        0
-
-/* un-comment if you want to perform tx_done from within the poll function */
-/* #define ETH_TX_DONE_ISR */
-
-/* put descriptors in uncached memory */
-/* #define ETH_DESCR_UNCACHED */
-
-/* Descriptors location: DRAM/internal-SRAM */
-#define ETH_DESCR_IN_SDRAM
-#undef  ETH_DESCR_IN_SRAM    /* No integrated SRAM in 88Fxx81 devices */
-
-#if defined(ETH_DESCR_IN_SRAM)
-#if defined(ETH_DESCR_UNCACHED)
- #define ETH_DESCR_CONFIG_STR    "Uncached descriptors in integrated SRAM"
-#else
- #define ETH_DESCR_CONFIG_STR    "Cached descriptors in integrated SRAM"
-#endif
-#elif defined(ETH_DESCR_IN_SDRAM)
-#if defined(ETH_DESCR_UNCACHED)
- #define ETH_DESCR_CONFIG_STR    "Uncached descriptors in DRAM"
-#else
- #define ETH_DESCR_CONFIG_STR    "Cached descriptors in DRAM"
-#endif
-#else 
- #error "Ethernet descriptors location undefined"
-#endif /* ETH_DESCR_IN_SRAM or ETH_DESCR_IN_SDRAM*/
-
-/* SW Sync-Barrier: not relevant for 88fxx81*/
-/* Reasnable to define this macro when descriptors in SRAM and buffers in DRAM */
-/* In RX the CPU theoretically might see himself as the descriptor owner,      */
-/* although the buffer hadn't been written to DRAM yet. Performance cost.      */
-/* #define INCLUDE_SYNC_BARR */
-
-/* Buffers cache coherency method (buffers in DRAM) */
-#ifndef MV_CACHE_COHER_SW
-/* Taken from mvCommon.h */
-/* Memory uncached, HW or SW cache coherency is not needed */
-#define MV_UNCACHED             0   
-/* Memory cached, HW cache coherency supported in WriteThrough mode */
-#define MV_CACHE_COHER_HW_WT    1
-/* Memory cached, HW cache coherency supported in WriteBack mode */
-#define MV_CACHE_COHER_HW_WB    2
-/* Memory cached, No HW cache coherency, Cache coherency must be in SW */
-#define MV_CACHE_COHER_SW       3
-
-#endif
-
-/* DRAM cache coherency configuration */
-#define MV_CACHE_COHERENCY  MV_CACHE_COHER_SW
-
-
-#define ETHER_DRAM_COHER    MV_CACHE_COHER_SW   /* No HW coherency in 88Fxx81 devices */
-
-#if (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WB)
- #define ETH_SDRAM_CONFIG_STR    "DRAM HW cache coherency (write-back)"
-#elif (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WT)
- #define ETH_SDRAM_CONFIG_STR    "DRAM HW cache coherency (write-through)"
-#elif (ETHER_DRAM_COHER == MV_CACHE_COHER_SW)
- #define ETH_SDRAM_CONFIG_STR    "DRAM SW cache-coherency"
-#elif (ETHER_DRAM_COHER == MV_UNCACHED)
-#   define ETH_SDRAM_CONFIG_STR  "DRAM uncached"
-#else
- #error "Ethernet-DRAM undefined"
-#endif /* ETHER_DRAM_COHER */
-
-
-/****************************************************************/
-/************* Ethernet driver configuration ********************/
-/****************************************************************/
-
-/* port's default queueus */
-#define ETH_DEF_TXQ         0
-#define ETH_DEF_RXQ         0 
-
-#define MV_ETH_RX_Q_NUM     CONFIG_MV_ETH_RX_Q_NUM
-#define MV_ETH_TX_Q_NUM     CONFIG_MV_ETH_TX_Q_NUM
-
-/* interrupt coalescing setting */
-#define ETH_TX_COAL    		    200
-#define ETH_RX_COAL    		    200
-
-/* Checksum offloading */
-#define TX_CSUM_OFFLOAD
-#define RX_CSUM_OFFLOAD
-
-#endif /* CONFIG_MV_INCLUDE_GIG_ETH */
-
-/****************************************************************/
-/*************** Telephony configuration ************************/
-/****************************************************************/
-#if defined(CONFIG_MV_TDM_LINEAR_MODE)
- #define MV_TDM_LINEAR_MODE
-#elif defined(CONFIG_MV_TDM_ULAW_MODE)
- #define MV_TDM_ULAW_MODE
-#endif
-
-#if defined(CONFIG_MV_TDM_5CHANNELS)
- #define MV_TDM_5CHANNELS 
-#endif
-
-#if defined(CONFIG_MV_TDM_USE_EXTERNAL_PCLK_SOURCE)
- #define MV_TDM_USE_EXTERNAL_PCLK_SOURCE
-#endif
-
-/* We use the following registers to store DRAM interface pre configuration   */
-/* auto-detection results													  */
-/* IMPORTANT: We are using mask register for that purpose. Before writing     */
-/* to units mask register, make sure main maks register is set to disable     */
-/* all interrupts.                                                            */
-#define DRAM_BUF_REG0   0x30810 /* sdram bank 0 size            */  
-#define DRAM_BUF_REG1   0x30820 /* sdram config                 */
-#define DRAM_BUF_REG2   0x30830 /* sdram mode                   */
-#define DRAM_BUF_REG3   0x308c4 /* dunit control low            */          
-#define DRAM_BUF_REG4   0x60a90 /* sdram address control        */
-#define DRAM_BUF_REG5   0x60a94 /* sdram timing control low     */
-#define DRAM_BUF_REG6   0x60a98 /* sdram timing control high    */
-#define DRAM_BUF_REG7   0x60a9c /* sdram ODT control low        */
-#define DRAM_BUF_REG8   0x60b90 /* sdram ODT control high       */
-#define DRAM_BUF_REG9   0x60b94 /* sdram Dunit ODT control      */
-#define DRAM_BUF_REG10  0x60b98 /* sdram Extended Mode          */
-#define DRAM_BUF_REG11  0x60b9c /* sdram Ddr2 Time Low Reg      */
-#define DRAM_BUF_REG12  0x60a00 /* sdram Ddr2 Time High Reg     */
-#define DRAM_BUF_REG13  0x60a04 /* dunit Ctrl High              */
-#define DRAM_BUF_REG14  0x60b00 /* sdram second DIMM exist      */
-
-/* Following the pre-configuration registers default values restored after    */
-/* auto-detection is done                                                     */
-#define DRAM_BUF_REG_DV 0
-
-/* System Mapping */
-#define SDRAM_CS0_BASE  0x00000000
-#define SDRAM_CS0_SIZE  _256M
-
-#define SDRAM_CS1_BASE  0x10000000
-#define SDRAM_CS1_SIZE  _256M
-
-#define SDRAM_CS2_BASE  0x20000000
-#define SDRAM_CS2_SIZE  _256M
-
-#define SDRAM_CS3_BASE  0x30000000
-#define SDRAM_CS3_SIZE  _256M
-
-/* PEX */
-#define PEX0_MEM_BASE 0xe8000000
-#define PEX0_MEM_SIZE _128M
-
-#define PEX0_IO_BASE 0xf2000000
-#define PEX0_IO_SIZE _1M
-
-/* Device Chip Selects */
-#define NFLASH_CS_BASE 0xfa000000
-#define NFLASH_CS_SIZE _2M
-
-#define SPI_CS_BASE 0xf4000000
-#define SPI_CS_SIZE _16M
-
-#define CRYPT_ENG_BASE	0xf0000000
-#define CRYPT_ENG_SIZE	_2M
-
-#define BOOTDEV_CS_BASE	0xff800000
-#define BOOTDEV_CS_SIZE _8M
-
-/* CS2 - BOOTROM */
-#define DEVICE_CS2_BASE 0xff900000
-#define DEVICE_CS2_SIZE _1M
-
-/* PEX Work arround */
-/* the target we will use for the workarround */
-#define PEX_CONFIG_RW_WA_TARGET PEX0_MEM
-/*a flag that indicates if we are going to use the 
-size and base of the target we using for the workarround
-window */
-#define PEX_CONFIG_RW_WA_USE_ORIGINAL_WIN_VALUES 1
-/* if the above flag is 0 then the following values
-will be used for the workarround window base and size,
-otherwise the following defines will be ignored */
-#define PEX_CONFIG_RW_WA_BASE 0xF3000000
-#define PEX_CONFIG_RW_WA_SIZE _16M
-
-/* Internal registers: size is defined in Controllerenvironment */
-#define INTER_REGS_BASE	0xFEE00000
-
-/* DRAM detection stuff */
-#define MV_DRAM_AUTO_SIZE
-
-/* Board clock detection */
-#define TCLK_AUTO_DETECT    	/* Use Tclk auto detection   */
-#define SYSCLK_AUTO_DETECT	/* Use SysClk auto detection */
-#define PCLCK_AUTO_DETECT  	/* Use PClk auto detection   */
-#define L2CLK_AUTO_DETECT 	/* Use L2Clk auto detection   */
-
-/* PEX-PCI\PCI-PCI Bridge*/
-#define PCI0_IF_PTP		0		/* Bridge exist on pciIf0*/
-
- 
-
-#endif /* __INCmvSysHwConfigh */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c
deleted file mode 100644
index 717c1507cf..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvCntmr.h"
-#include "cpu/mvCpu.h"
-
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-
-extern unsigned int whoAmI(void);
-
-/*******************************************************************************
-* mvCntmrLoad - 
-*
-* DESCRIPTION:
-*       Load an init Value to a given counter/timer 
-*
-* INPUT:
-*       countNum - counter number
-*       value - value to be loaded
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
-*******************************************************************************/
-MV_STATUS mvCntmrLoad(MV_U32 countNum, MV_U32 value)
-{
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-
-		mvOsPrintf(("mvCntmrLoad: Err. Illigal counter number \n"));
-		return MV_BAD_PARAM;;
-
-	}
-
-	MV_REG_WRITE(CNTMR_RELOAD_REG(countNum),value);
-	MV_REG_WRITE(CNTMR_VAL_REG(countNum),value);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCntmrRead - 
-*
-* DESCRIPTION:
-*  	Returns the value of the given Counter/Timer     
-*
-* INPUT:
-*       countNum - counter number
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_U32 counter value
-*******************************************************************************/
-MV_U32 mvCntmrRead(MV_U32 countNum)
-{
-	return MV_REG_READ(CNTMR_VAL_REG(countNum));
-}
-
-/*******************************************************************************
-* mvCntmrWrite - 
-*
-* DESCRIPTION:
-*  	Returns the value of the given Counter/Timer     
-*
-* INPUT:
-*       countNum - counter number
-*		countVal - value to write
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None
-*******************************************************************************/
-void mvCntmrWrite(MV_U32 countNum,MV_U32 countVal)
-{
-	MV_REG_WRITE(CNTMR_VAL_REG(countNum),countVal);
-}
-
-/*******************************************************************************
-* mvCntmrCtrlSet - 
-*
-* DESCRIPTION:
-*  	Set the Control to a given counter/timer     
-*
-* INPUT:
-*       countNum - counter number
-*		pCtrl - pointer to MV_CNTMR_CTRL structure 
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
-*******************************************************************************/
-MV_STATUS mvCntmrCtrlSet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl)
-{
-	MV_U32 cntmrCtrl;
-
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-
-		DB(mvOsPrintf(("mvCntmrCtrlSet: Err. Illigal counter number \n")));
-		return MV_BAD_PARAM;;
-
-	}
-
-	/* read control register */
-	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
-
-	
-	if (pCtrl->enable)	/* enable counter\timer */
-	{
-		cntmrCtrl |= CTCR_ARM_TIMER_EN(countNum);
-	}
-	else	/* disable counter\timer */
-	{
-		cntmrCtrl &= ~CTCR_ARM_TIMER_EN(countNum);
-	}
-
-	if ( pCtrl->autoEnable ) /* Auto mode */
-	{
-		cntmrCtrl |= CTCR_ARM_TIMER_AUTO_EN(countNum);		
-
-	}
-	else 	/* no auto mode */
-	{
-		cntmrCtrl &= ~CTCR_ARM_TIMER_AUTO_EN(countNum);
-	}
-
-	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvCntmrCtrlGet - 
-*
-* DESCRIPTION:
-*  	Get the Control value of a given counter/timer     
-*
-* INPUT:
-*       countNum - counter number
-*		pCtrl - pointer to MV_CNTMR_CTRL structure 
-*
-* OUTPUT:
-*       Counter\Timer control value
-*
-* RETURN:
-*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
-*******************************************************************************/
-MV_STATUS mvCntmrCtrlGet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl)
-{
-	MV_U32 cntmrCtrl;
-
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-		DB(mvOsPrintf(("mvCntmrCtrlGet: Err. Illigal counter number \n")));
-		return MV_BAD_PARAM;;
-	}
-
-	/* read control register */
-	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
-
-	/* enable counter\timer */
-	if (cntmrCtrl & CTCR_ARM_TIMER_EN(countNum))
-	{
-		pCtrl->enable = MV_TRUE;
-	}
-	else
-	{
-		pCtrl->enable = MV_FALSE;
-	}
-
-	/* counter mode */
-	if (cntmrCtrl & CTCR_ARM_TIMER_AUTO_EN(countNum))
-	{
-		pCtrl->autoEnable = MV_TRUE;
-	}
-	else
-	{
-		pCtrl->autoEnable = MV_FALSE;
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCntmrEnable - 
-*
-* DESCRIPTION:
-*  	Set the Enable-Bit to logic '1' ==> starting the counter     
-*
-* INPUT:
-*       countNum - counter number
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
-*******************************************************************************/
-MV_STATUS mvCntmrEnable(MV_U32 countNum)
-{
-	MV_U32 cntmrCtrl;
-
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-
-		DB(mvOsPrintf(("mvCntmrEnable: Err. Illigal counter number \n")));
-		return MV_BAD_PARAM;;
-
-	}
-
-	/* read control register */
-	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
-
-	/* enable counter\timer */
-	cntmrCtrl |= CTCR_ARM_TIMER_EN(countNum);
-
-
-	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCntmrDisable - 
-*
-* DESCRIPTION:
-*  	Stop the counter/timer running, and returns its Value     
-*
-* INPUT:
-*       countNum - counter number
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_U32 counter\timer value
-*******************************************************************************/
-MV_STATUS mvCntmrDisable(MV_U32 countNum)
-{
-	MV_U32 cntmrCtrl;
-
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-
-		DB(mvOsPrintf(("mvCntmrDisable: Err. Illigal counter number \n")));
-		return MV_BAD_PARAM;;
-
-	}
-
-	/* read control register */
-	cntmrCtrl = MV_REG_READ(CNTMR_CTRL_REG);
-
-	/* disable counter\timer */
-	cntmrCtrl &= ~CTCR_ARM_TIMER_EN(countNum);
-
-	MV_REG_WRITE(CNTMR_CTRL_REG,cntmrCtrl);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvCntmrStart - 
-*
-* DESCRIPTION:
-*  	Combined all the sub-operations above to one function: Load,setMode,Enable     
-*
-* INPUT:
-*       countNum - counter number
-*		value - value of the counter\timer to be set
-*		pCtrl - pointer to MV_CNTMR_CTRL structure 
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM on bad parameters , MV_ERROR on error ,MV_OK on sucess
-*******************************************************************************/
-MV_STATUS mvCntmrStart(MV_U32 countNum, MV_U32 value,
-                       MV_CNTMR_CTRL *pCtrl)
-{
-
-	if (countNum >= MV_CNTMR_MAX_COUNTER )
-	{
-
-		mvOsPrintf(("mvCntmrDisable: Err. Illigal counter number \n"));
-		return MV_BAD_PARAM;;
-
-	}
-
-	/* load value onto counter\timer */
-	mvCntmrLoad(countNum,value);
-
-	/* set the counter to load in the first time */
-	mvCntmrWrite(countNum,value);
-
-	/* set control for timer \ cunter and enable */
-	mvCntmrCtrlSet(countNum,pCtrl);
-
-	return MV_OK;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h
deleted file mode 100644
index b911d0f040..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmr.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvTmrWtdgh
-#define __INCmvTmrWtdgh
-
-/* includes */
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "cntmr/mvCntmrRegs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-
-/* This enumerator describe counters\watchdog numbers       */
-typedef enum _mvCntmrID
-{
-	TIMER0 = 0,               
-	TIMER1,
-	WATCHDOG,
-	TIMER2,               
-	TIMER3,
-}MV_CNTMR_ID;
-
-
-/* Counter / Timer control structure */
-typedef struct _mvCntmrCtrl
-{
-	MV_BOOL 				enable;		/* enable */
-	MV_BOOL					autoEnable;	/* counter/Timer                    */
-}MV_CNTMR_CTRL;
-
-
-/* Functions */
-
-/* Load an init Value to a given counter/timer */
-MV_STATUS mvCntmrLoad(MV_U32 countNum, MV_U32 value);
-
-/* Returns the value of the given Counter/Timer */
-MV_U32 mvCntmrRead(MV_U32 countNum);
-
-/* Write a value of the given Counter/Timer */
-void mvCntmrWrite(MV_U32 countNum,MV_U32 countVal);
-
-/* Set the Control to a given counter/timer */
-MV_STATUS mvCntmrCtrlSet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl);
-
-/* Get the value of a given counter/timer */
-MV_STATUS mvCntmrCtrlGet(MV_U32 countNum, MV_CNTMR_CTRL *pCtrl);
-
-/* Set the Enable-Bit to logic '1' ==> starting the counter. */
-MV_STATUS mvCntmrEnable(MV_U32 countNum);
-
-/* Stop the counter/timer running, and returns its Value. */
-MV_STATUS mvCntmrDisable(MV_U32 countNum);
-
-/* Combined all the sub-operations above to one function: Load,setMode,Enable */
-MV_STATUS mvCntmrStart(MV_U32 countNum, MV_U32 value,
-                       MV_CNTMR_CTRL *pCtrl);
-
-#endif /* __INCmvTmrWtdgh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h
deleted file mode 100644
index b69bc66ad2..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cntmr/mvCntmrRegs.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvTmrwtdgRegsh
-#define __INCmvTmrwtdgRegsh
-
-/*******************************************/
-/* ARM Timers Registers Map                */
-/*******************************************/
-
-#define CNTMR_RELOAD_REG(tmrNum)	(CNTMR_BASE + 0x10 + (tmrNum)*8 + \
-						(((tmrNum) <= 3)?0:8))
-#define CNTMR_VAL_REG(tmrNum)		(CNTMR_BASE + 0x14 + (tmrNum)*8 + \
-						(((tmrNum) <= 3)?0:8))
-#define CNTMR_CTRL_REG			(CNTMR_BASE)
-
-/*For MV78XX0*/
-#define CNTMR_CAUSE_REG		(CPU_AHB_MBUS_CAUSE_INT_REG(whoAmI()))
-#define CNTMR_MASK_REG		(CPU_AHB_MBUS_MASK_INT_REG(whoAmI()))
-
-/* ARM Timers Registers Map                */
-/*******************************************/
-
-
-/* ARM Timers Control Register */
-/* CPU_TIMERS_CTRL_REG (CTCR) */
-
-#define TIMER0_NUM				0
-#define TIMER1_NUM				1
-#define WATCHDOG_NUM			2
-#define TIMER2_NUM				3
-#define TIMER3_NUM				4
-	
-#define CTCR_ARM_TIMER_EN_OFFS(cntr)	(cntr * 2)
-#define CTCR_ARM_TIMER_EN_MASK(cntr)	(1 << CTCR_ARM_TIMER_EN_OFFS)
-#define CTCR_ARM_TIMER_EN(cntr)			(1 << CTCR_ARM_TIMER_EN_OFFS(cntr))
-#define CTCR_ARM_TIMER_DIS(cntr)		(0 << CTCR_ARM_TIMER_EN_OFFS(cntr))
-	
-#define CTCR_ARM_TIMER_AUTO_OFFS(cntr)	((cntr * 2) + 1)
-#define CTCR_ARM_TIMER_AUTO_MASK(cntr)	BIT1
-#define CTCR_ARM_TIMER_AUTO_EN(cntr)	(1 << CTCR_ARM_TIMER_AUTO_OFFS(cntr))
-#define CTCR_ARM_TIMER_AUTO_DIS(cntr)	(0 << CTCR_ARM_TIMER_AUTO_OFFS(cntr))
-
-
-/* ARM Timer\Watchdog Reload Register */
-/* CNTMR_RELOAD_REG (TRR) */
-
-#define TRG_ARM_TIMER_REL_OFFS			0
-#define TRG_ARM_TIMER_REL_MASK			0xffffffff
-
-/* ARM Timer\Watchdog Register */
-/* CNTMR_VAL_REG (TVRG) */
-
-#define TVR_ARM_TIMER_OFFS			0
-#define TVR_ARM_TIMER_MASK			0xffffffff
-#define TVR_ARM_TIMER_MAX			0xffffffff
-
-
-
-#endif /* __INCmvTmrwtdgRegsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c
deleted file mode 100644
index 609e674e3a..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "mvOs.h"
-#include "mvCpuCntrs.h"
-
-
-const static MV_CPU_CNTRS_OPS  mvCpuCntrsOpsTbl[MV_CPU_CNTRS_NUM][MV_CPU_CNTRS_OPS_NUM] =
-{   
-    /*0*/
-    {   
-        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_DCACHE_READ_HIT,       MV_CPU_CNTRS_DCACHE_READ_MISS,
-        MV_CPU_CNTRS_DCACHE_WRITE_HIT,  MV_CPU_CNTRS_DCACHE_WRITE_MISS,     MV_CPU_CNTRS_INSTRUCTIONS, 
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_MMU_READ_LATENCY,  MV_CPU_CNTRS_ICACHE_READ_LATENCY,   MV_CPU_CNTRS_WB_WRITE_LATENCY,
-        MV_CPU_CNTRS_LDM_STM_HOLD,      MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_DATA_WRITE_ACCESS, MV_CPU_CNTRS_DATA_READ_ACCESS,      MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_BRANCH_PREDICT_COUNT,
-    },
-    /*1*/
-    {   
-        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_ICACHE_READ_MISS,      MV_CPU_CNTRS_DCACHE_READ_MISS,
-        MV_CPU_CNTRS_DCACHE_WRITE_MISS, MV_CPU_CNTRS_ITLB_MISS,             MV_CPU_CNTRS_SINGLE_ISSUE,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_RETIRED,        MV_CPU_CNTRS_INVALID, 
-        MV_CPU_CNTRS_MMU_READ_BEAT,     MV_CPU_CNTRS_ICACHE_READ_LATENCY,   MV_CPU_CNTRS_WB_WRITE_BEAT,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_IS_HOLD,               MV_CPU_CNTRS_DATA_READ_ACCESS,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_INVALID,
-    },
-    /*2*/   
-    {
-        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_DCACHE_ACCESS, 
-        MV_CPU_CNTRS_DTLB_MISS,         MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_PREDICT_MISS,   MV_CPU_CNTRS_WB_WRITE_BEAT,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_DCACHE_READ_LATENCY,   MV_CPU_CNTRS_DCACHE_WRITE_LATENCY,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_BIU_SIMULT_ACCESS,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID,
-        MV_CPU_CNTRS_INVALID,
-    },
-    /*3*/   
-    {
-        MV_CPU_CNTRS_CYCLES,            MV_CPU_CNTRS_DCACHE_READ_MISS,      MV_CPU_CNTRS_DCACHE_WRITE_MISS,
-        MV_CPU_CNTRS_TLB_MISS,          MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_INVALID, 
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_BRANCH_TAKEN,          MV_CPU_CNTRS_WB_FULL_CYCLES,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_DCACHE_READ_BEAT,      MV_CPU_CNTRS_DCACHE_WRITE_BEAT,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_BIU_ANY_ACCESS,
-        MV_CPU_CNTRS_INVALID,           MV_CPU_CNTRS_INVALID,               MV_CPU_CNTRS_DATA_WRITE_ACCESS,
-        MV_CPU_CNTRS_INVALID,
-    }
-};
-
-MV_CPU_CNTRS_ENTRY  mvCpuCntrsTbl[MV_CPU_CNTRS_NUM];
-
-MV_CPU_CNTRS_EVENT*   mvCpuCntrsEventTbl[128];
-
-void mvCpuCntrsReset(void)
-{
-    MV_U32 reg = 0;
-   
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 0" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 1" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 2" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 3" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 4" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 5" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 6" : : "r" (reg));
-    MV_ASM ("mcr p15, 0, %0, c15, c13, 7" : : "r" (reg));
-}
-               
-void program_counter(int counter, int op)
-{
-    MV_U32 reg =  (1 << op) | 0x1; /*enable*/
-
-    switch(counter)
-    {
-        case 0:
-         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 0" : : "r" (reg));
-         return;
-
-        case 1:
-         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 1" : : "r" (reg));
-         return;
-
-        case 2:
-         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 2" : : "r" (reg));
-         return;
-
-        case 3:
-         __asm__ __volatile__ ("mcr p15, 0, %0, c15, c12, 3" : : "r" (reg));
-         return;
-
-        default:
-            mvOsPrintf("error in program_counter: bad counter number (%d)\n", counter);
-    }
-    return;
-}
-
-void mvCpuCntrsEventClear(MV_CPU_CNTRS_EVENT* pEvent)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-    {
-        pEvent->counters_sum[i] = 0;
-    }
-    pEvent->num_of_measurements = 0;
-}
-
-                                                                                                              
-MV_CPU_CNTRS_EVENT* mvCpuCntrsEventCreate(char* name, MV_U32 print_threshold)
-{
-    int                     i;
-    MV_CPU_CNTRS_EVENT*     event = mvOsMalloc(sizeof(MV_CPU_CNTRS_EVENT));
-
-    if(event)
-    {
-        strncpy(event->name, name, sizeof(event->name));
-        event->num_of_measurements = 0;
-        event->avg_sample_count = print_threshold;
-        for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-        {
-            event->counters_before[i] = 0;
-            event->counters_after[i] = 0;
-            event->counters_sum[i] = 0;
-        }
-    }
-    return event;
-}
-
-void    mvCpuCntrsEventDelete(MV_CPU_CNTRS_EVENT* event)
-{
-    if(event != NULL)
-        mvOsFree(event);
-}
-
-                                                                                     
-MV_STATUS   mvCpuCntrsProgram(int counter, MV_CPU_CNTRS_OPS op, 
-                                 char* name, MV_U32 overhead)
-{
-    int     i;
-
-    /* Find required operations */
-    for(i=0; i<MV_CPU_CNTRS_OPS_NUM; i++)
-    {
-        if( mvCpuCntrsOpsTbl[counter][i] == op)
-        {
-            strncpy(mvCpuCntrsTbl[counter].name, name, sizeof(mvCpuCntrsTbl[counter].name));
-            mvCpuCntrsTbl[counter].operation = op;
-            mvCpuCntrsTbl[counter].opIdx = i+1;
-            mvCpuCntrsTbl[counter].overhead = overhead;
-            program_counter(counter, mvCpuCntrsTbl[counter].opIdx);
-            mvOsPrintf("Counter=%d, opIdx=%d, overhead=%d\n",
-                        counter, mvCpuCntrsTbl[counter].opIdx, mvCpuCntrsTbl[counter].overhead);
-            return MV_OK;
-        }
-    }
-    return MV_NOT_FOUND;
-}
-
-void    mvCpuCntrsShow(MV_CPU_CNTRS_EVENT* pEvent)
-{
-    int     i;
-    MV_U64  counters_avg;
-
-    if(pEvent->num_of_measurements < pEvent->avg_sample_count) 
-        return;
-
-    mvOsPrintf("%16s: ", pEvent->name);
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-    {
-        counters_avg = mvOsDivMod64(pEvent->counters_sum[i], 
-                                  pEvent->num_of_measurements, NULL);
-        if(counters_avg >= mvCpuCntrsTbl[i].overhead)
-            counters_avg -= mvCpuCntrsTbl[i].overhead;
-        else
-            counters_avg = 0;
-
-        mvOsPrintf("%s=%5llu, ", mvCpuCntrsTbl[i].name, counters_avg);
-    }
-    mvOsPrintf("\n");
-    mvCpuCntrsEventClear(pEvent);
-    mvCpuCntrsReset();
-}
-
-void    mvCpuCntrsStatus(void)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-    {
-        mvOsPrintf("#%d: %s, overhead=%d\n", 
-            i, mvCpuCntrsTbl[i].name, mvCpuCntrsTbl[i].overhead);
-    }
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h
deleted file mode 100644
index 8d49af0095..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuCntrs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-*******************************************************************************/
-#ifndef __mvCpuCntrs_h__
-#define __mvCpuCntrs_h__
-
-#include "mvTypes.h"
-#include "mvOs.h"
-
-
-#define MV_CPU_CNTRS_NUM            4
-#define MV_CPU_CNTRS_OPS_NUM        32
-
-typedef enum
-{
-    MV_CPU_CNTRS_INVALID = 0,
-    MV_CPU_CNTRS_CYCLES,
-    MV_CPU_CNTRS_ICACHE_READ_MISS,
-    MV_CPU_CNTRS_DCACHE_ACCESS,
-    MV_CPU_CNTRS_DCACHE_READ_MISS,
-    MV_CPU_CNTRS_DCACHE_READ_HIT,
-    MV_CPU_CNTRS_DCACHE_WRITE_MISS,
-    MV_CPU_CNTRS_DCACHE_WRITE_HIT,
-    MV_CPU_CNTRS_DTLB_MISS,
-    MV_CPU_CNTRS_TLB_MISS,
-    MV_CPU_CNTRS_ITLB_MISS,
-    MV_CPU_CNTRS_INSTRUCTIONS,
-    MV_CPU_CNTRS_SINGLE_ISSUE,
-    MV_CPU_CNTRS_MMU_READ_LATENCY,
-    MV_CPU_CNTRS_MMU_READ_BEAT,
-    MV_CPU_CNTRS_BRANCH_RETIRED,
-    MV_CPU_CNTRS_BRANCH_TAKEN,
-    MV_CPU_CNTRS_BRANCH_PREDICT_MISS,
-    MV_CPU_CNTRS_BRANCH_PREDICT_COUNT,
-    MV_CPU_CNTRS_WB_FULL_CYCLES,
-    MV_CPU_CNTRS_WB_WRITE_LATENCY,
-    MV_CPU_CNTRS_WB_WRITE_BEAT,
-    MV_CPU_CNTRS_ICACHE_READ_LATENCY,
-    MV_CPU_CNTRS_ICACHE_READ_BEAT,
-    MV_CPU_CNTRS_DCACHE_READ_LATENCY,
-    MV_CPU_CNTRS_DCACHE_READ_BEAT,
-    MV_CPU_CNTRS_DCACHE_WRITE_LATENCY,
-    MV_CPU_CNTRS_DCACHE_WRITE_BEAT,
-    MV_CPU_CNTRS_LDM_STM_HOLD,
-    MV_CPU_CNTRS_IS_HOLD,
-    MV_CPU_CNTRS_DATA_WRITE_ACCESS,
-    MV_CPU_CNTRS_DATA_READ_ACCESS,
-    MV_CPU_CNTRS_BIU_SIMULT_ACCESS,
-    MV_CPU_CNTRS_BIU_ANY_ACCESS,
-
-} MV_CPU_CNTRS_OPS;
-
-typedef struct
-{
-    char                name[16];
-    MV_CPU_CNTRS_OPS    operation;
-    int                 opIdx;
-    MV_U32              overhead;
-    
-} MV_CPU_CNTRS_ENTRY;
-
-
-typedef struct
-{
-    char   name[16];
-    MV_U32 num_of_measurements;
-    MV_U32 avg_sample_count;
-    MV_U64 counters_before[MV_CPU_CNTRS_NUM];
-    MV_U64 counters_after[MV_CPU_CNTRS_NUM];
-    MV_U64 counters_sum[MV_CPU_CNTRS_NUM];
-
-} MV_CPU_CNTRS_EVENT;
-
-extern MV_CPU_CNTRS_ENTRY  mvCpuCntrsTbl[MV_CPU_CNTRS_NUM];
-
-
-MV_STATUS           mvCpuCntrsProgram(int counter, MV_CPU_CNTRS_OPS op, 
-                                      char* name, MV_U32 overhead);
-void                mvCpuCntrsInit(void);
-MV_CPU_CNTRS_EVENT* mvCpuCntrsEventCreate(char* name, MV_U32 print_threshold);
-void                mvCpuCntrsEventDelete(MV_CPU_CNTRS_EVENT* event);
-void                mvCpuCntrsReset(void);
-void                mvCpuCntrsShow(MV_CPU_CNTRS_EVENT* pEvent);
-void 		    mvCpuCntrsEventClear(MV_CPU_CNTRS_EVENT* pEvent);
-
-/* internal */
-void 		    program_counter(int counter, int op);
-
-static INLINE MV_U64 mvCpuCntrsRead(const int counter)
-{
-    MV_U32 low = 0, high = 0;
-    MV_U32 ll = 0;
-    
-    switch(counter)
-    {
-        case 0:
-            MV_ASM  ("mcr p15, 0, %0, c15, c12, 0" : : "r" (ll));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 0" : "=r" (low));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 1" : "=r" (high));
-         break;
-
-        case 1:
-            MV_ASM  ("mcr p15, 0, %0, c15, c12, 1" : : "r" (ll));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 2" : "=r" (low));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 3" : "=r" (high));
-         break;
-
-        case 2:
-            MV_ASM  ("mcr p15, 0, %0, c15, c12, 2" : : "r" (ll));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 4" : "=r" (low));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 5" : "=r" (high));
-         break;
-
-        case 3:
-            MV_ASM  ("mcr p15, 0, %0, c15, c12, 3" : : "r" (ll));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 6" : "=r" (low));
-            MV_ASM  ("mrc p15, 0, %0, c15, c13, 7" : "=r" (high));
-         break;
-
-        default:
-            mvOsPrintf("mv_cpu_cntrs_read: bad counter number (%d)\n", counter);
-    }
-    program_counter(counter, mvCpuCntrsTbl[counter].opIdx);
-    return (((MV_U64)high << 32 ) | low);
-
-}
-
-
-static INLINE void mvCpuCntrsReadBefore(MV_CPU_CNTRS_EVENT* pEvent)
-{
-#if 0
-    int i;
-
-    /* order is important - we want to measure the cycle count last here! */
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-        pEvent->counters_before[i] = mvCpuCntrsRead(i);
-#else
-    pEvent->counters_before[1] = mvCpuCntrsRead(1);
-    pEvent->counters_before[3] = mvCpuCntrsRead(3);
-    pEvent->counters_before[0] = mvCpuCntrsRead(0);
-    pEvent->counters_before[2] = mvCpuCntrsRead(2);
-#endif
-}
-
-static INLINE void mvCpuCntrsReadAfter(MV_CPU_CNTRS_EVENT* pEvent)
-{
-    int i;
-
-#if 0
-    /* order is important - we want to measure the cycle count first here! */
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-        pEvent->counters_after[i] = mvCpuCntrsRead(i);
-#else
-    pEvent->counters_after[2] = mvCpuCntrsRead(2);
-    pEvent->counters_after[0] = mvCpuCntrsRead(0);
-    pEvent->counters_after[3] = mvCpuCntrsRead(3);
-    pEvent->counters_after[1] = mvCpuCntrsRead(1);
-#endif 
-
-    for(i=0; i<MV_CPU_CNTRS_NUM; i++)
-    {
-        pEvent->counters_sum[i] += (pEvent->counters_after[i] - pEvent->counters_before[i]);	
-    }
-    pEvent->num_of_measurements++;
-}
-
-
-#ifdef CONFIG_MV_CPU_PERF_CNTRS
-
-#define MV_CPU_CNTRS_READ(counter)  mvCpuCntrsRead(counter)
-
-#define MV_CPU_CNTRS_START(event)	mvCpuCntrsReadBefore(event)
-
-#define MV_CPU_CNTRS_STOP(event)	mvCpuCntrsReadAfter(event)
-			
-#define MV_CPU_CNTRS_SHOW(event)	mvCpuCntrsShow(event)
-
-#else
-
-#define MV_CPU_CNTRS_READ(counter)
-#define MV_CPU_CNTRS_START(event)
-#define MV_CPU_CNTRS_STOP(event)
-#define MV_CPU_CNTRS_SHOW(event)
-
-#endif /* CONFIG_MV_CPU_PERF_CNTRS */
-
-
-#endif /* __mvCpuCntrs_h__ */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c
deleted file mode 100644
index 033386224f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "mvOs.h"
-#include "mvCpuL2Cntrs.h"
-
-
-
-MV_CPU_L2_CNTRS_ENTRY   mvCpuL2CntrsTbl[MV_CPU_L2_CNTRS_NUM];
-
-MV_CPU_L2_CNTRS_EVENT*  mvCpuL2CntrsEventTbl[128];
-
-void mvCpuL2CntrsReset(void)
-{
-    MV_U32 reg = 0;
-   
-    MV_ASM ("mcr p15, 6, %0, c15, c13, 0" : : "r" (reg));
-    MV_ASM ("mcr p15, 6, %0, c15, c13, 1" : : "r" (reg));
-    MV_ASM ("mcr p15, 6, %0, c15, c13, 2" : : "r" (reg));
-    MV_ASM ("mcr p15, 6, %0, c15, c13, 3" : : "r" (reg));
-}
-               
-static void mvCpuL2CntrConfig(int counter, int op)
-{
-    MV_U32 reg =  (1 << op) | 0x1; /*enable*/
-
-    switch(counter)
-    {
-        case 0:
-         MV_ASM ("mcr p15, 6, %0, c15, c12, 0" : : "r" (reg));
-         return;
-
-        case 1:
-         MV_ASM ("mcr p15, 6, %0, c15, c12, 1" : : "r" (reg));
-         return;
-
-        default:
-            mvOsPrintf("mvCpuL2CntrConfig: bad counter number (%d)\n", counter);
-    }
-    return;
-}
-
-void mvCpuL2CntrsEventClear(MV_CPU_L2_CNTRS_EVENT* pEvent)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
-    {
-        pEvent->counters_sum[i] = 0;
-    }
-    pEvent->num_of_measurements = 0;
-}
-
-                                                                                                              
-MV_CPU_L2_CNTRS_EVENT* mvCpuL2CntrsEventCreate(char* name, MV_U32 print_threshold)
-{
-    int                     i;
-    MV_CPU_L2_CNTRS_EVENT*  event = mvOsMalloc(sizeof(MV_CPU_L2_CNTRS_EVENT));
-
-    if(event)
-    {
-        strncpy(event->name, name, sizeof(event->name));
-        event->num_of_measurements = 0;
-        event->avg_sample_count = print_threshold;
-        for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
-        {
-            event->counters_before[i] = 0;
-            event->counters_after[i] = 0;
-            event->counters_sum[i] = 0;
-        }
-    }
-    return event;
-}
-
-void    mvCpuL2CntrsEventDelete(MV_CPU_L2_CNTRS_EVENT* event)
-{
-    if(event != NULL)
-        mvOsFree(event);
-}
-
-                                                                                     
-MV_STATUS   mvCpuL2CntrsProgram(int counter, MV_CPU_L2_CNTRS_OPS op, 
-                                 char* name, MV_U32 overhead)
-{
-    strncpy(mvCpuL2CntrsTbl[counter].name, name, sizeof(mvCpuL2CntrsTbl[counter].name));
-    mvCpuL2CntrsTbl[counter].operation = op;
-    mvCpuL2CntrsTbl[counter].opIdx = op;
-    mvCpuL2CntrsTbl[counter].overhead = overhead;
-    mvCpuL2CntrConfig(counter, op);
-    mvOsPrintf("CPU L2 Counter %d: operation=%d, overhead=%d\n",
-                        counter, op, overhead);
-    return MV_OK;
-}
-
-void    mvCpuL2CntrsShow(MV_CPU_L2_CNTRS_EVENT* pEvent)
-{
-    int     i;
-    MV_U64  counters_avg;
-
-    if(pEvent->num_of_measurements < pEvent->avg_sample_count) 
-        return;
-
-    mvOsPrintf("%16s: ", pEvent->name);
-    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
-    {
-        counters_avg = mvOsDivMod64(pEvent->counters_sum[i], 
-                                    pEvent->num_of_measurements, NULL);
-
-        if(counters_avg >= mvCpuL2CntrsTbl[i].overhead)
-            counters_avg -= mvCpuL2CntrsTbl[i].overhead;
-        else
-            counters_avg = 0;
-
-        mvOsPrintf("%s=%5llu, ", mvCpuL2CntrsTbl[i].name, counters_avg);
-    }
-    mvOsPrintf("\n");
-    mvCpuL2CntrsEventClear(pEvent);
-    mvCpuL2CntrsReset();
-}
-
-void    mvCpuL2CntrsStatus(void)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
-    {
-        mvOsPrintf("#%d: %s, overhead=%d\n", 
-            i, mvCpuL2CntrsTbl[i].name, mvCpuL2CntrsTbl[i].overhead);
-    }
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h
deleted file mode 100644
index 570d701958..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/cpu/mvCpuL2Cntrs.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-*******************************************************************************/
-#ifndef __mvCpuL2Cntrs_h__
-#define __mvCpuL2Cntrs_h__
-
-#include "mvTypes.h"
-#include "mvOs.h"
-
-
-#define MV_CPU_L2_CNTRS_NUM         2
-
-typedef enum
-{
-    MV_CPU_L2_CNTRS_ENABLE = 0,
-    MV_CPU_L2_CNTRS_DATA_REQ,
-    MV_CPU_L2_CNTRS_DATA_MISS_REQ,
-    MV_CPU_L2_CNTRS_INST_REQ,
-    MV_CPU_L2_CNTRS_INST_MISS_REQ,
-    MV_CPU_L2_CNTRS_DATA_READ_REQ,
-    MV_CPU_L2_CNTRS_DATA_READ_MISS_REQ,
-    MV_CPU_L2_CNTRS_DATA_WRITE_REQ,
-    MV_CPU_L2_CNTRS_DATA_WRITE_MISS_REQ,
-    MV_CPU_L2_CNTRS_RESERVED,
-    MV_CPU_L2_CNTRS_DIRTY_EVICT_REQ,
-    MV_CPU_L2_CNTRS_EVICT_BUFF_STALL,
-    MV_CPU_L2_CNTRS_ACTIVE_CYCLES,
-
-} MV_CPU_L2_CNTRS_OPS;
-
-typedef struct
-{
-    char                name[16];
-    MV_CPU_L2_CNTRS_OPS operation;
-    int                 opIdx;
-    MV_U32              overhead;
-    
-} MV_CPU_L2_CNTRS_ENTRY;
-
-
-typedef struct
-{
-    char   name[16];
-    MV_U32 num_of_measurements;
-    MV_U32 avg_sample_count;
-    MV_U64 counters_before[MV_CPU_L2_CNTRS_NUM];
-    MV_U64 counters_after[MV_CPU_L2_CNTRS_NUM];
-    MV_U64 counters_sum[MV_CPU_L2_CNTRS_NUM];
-
-} MV_CPU_L2_CNTRS_EVENT;
-
-
-MV_STATUS               mvCpuL2CntrsProgram(int counter, MV_CPU_L2_CNTRS_OPS op, 
-                                        char* name, MV_U32 overhead);
-void                    mvCpuL2CntrsInit(void);
-MV_CPU_L2_CNTRS_EVENT*  mvCpuL2CntrsEventCreate(char* name, MV_U32 print_threshold);
-void                    mvCpuL2CntrsEventDelete(MV_CPU_L2_CNTRS_EVENT* event);
-void                    mvCpuL2CntrsReset(void);
-void                    mvCpuL2CntrsShow(MV_CPU_L2_CNTRS_EVENT* pEvent);
-void 			mvCpuL2CntrsEventClear(MV_CPU_L2_CNTRS_EVENT* pEvent);
-
-static INLINE MV_U64 mvCpuL2CntrsRead(const int counter)
-{
-    MV_U32 low = 0, high = 0;
-    
-    switch(counter)
-    {
-        case 0:
-            MV_ASM  ("mrc p15, 6, %0, c15, c13, 0" : "=r" (low));
-            MV_ASM  ("mrc p15, 6, %0, c15, c13, 1" : "=r" (high));
-         break;
-
-        case 1:
-            MV_ASM  ("mrc p15, 6, %0, c15, c13, 2" : "=r" (low));
-            MV_ASM  ("mrc p15, 6, %0, c15, c13, 3" : "=r" (high));
-         break;
-
-        default:
-            mvOsPrintf("mvCpuL2CntrsRead: bad counter number (%d)\n", counter);
-    }
-    return (((MV_U64)high << 32 ) | low);
-
-}
-
-static INLINE void mvCpuL2CntrsReadBefore(MV_CPU_L2_CNTRS_EVENT* pEvent)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++)
-        pEvent->counters_before[i] = mvCpuL2CntrsRead(i);
-}
-
-static INLINE void mvCpuL2CntrsReadAfter(MV_CPU_L2_CNTRS_EVENT* pEvent)
-{
-    int i;
-
-    for(i=0; i<MV_CPU_L2_CNTRS_NUM; i++) 
-    {
-        pEvent->counters_after[i] = mvCpuL2CntrsRead(i);
-        pEvent->counters_sum[i] += (pEvent->counters_after[i] - pEvent->counters_before[i]);	
-    }
-    pEvent->num_of_measurements++;
-}
-
-
-#ifdef CONFIG_MV_CPU_L2_PERF_CNTRS
-
-#define MV_CPU_L2_CNTRS_READ(counter)   mvCpuL2CntrsRead(counter)
-
-#define MV_CPU_L2_CNTRS_START(event)	mvCpuL2CntrsReadBefore(event)
-
-#define MV_CPU_L2_CNTRS_STOP(event)	    mvCpuL2CntrsReadAfter(event)
-			
-#define MV_CPU_L2_CNTRS_SHOW(event)	    mvCpuL2CntrsShow(event)
-
-#else
-
-#define MV_CPU_L2_CNTRS_READ(counter)
-#define MV_CPU_L2_CNTRS_START(event)
-#define MV_CPU_L2_CNTRS_STOP(event)
-#define MV_CPU_L2_CNTRS_SHOW(event)
-
-#endif /* CONFIG_MV_CPU_L2_PERF_CNTRS */
-
-
-#endif /* __mvCpuL2Cntrs_h__ */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c
deleted file mode 100644
index d1b8a3d378..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.c
+++ /dev/null
@@ -1,1479 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "ddr1_2/mvDram.h"
-#include "boardEnv/mvBoardEnvLib.h"
-
-#undef MV_DEBUG
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
-                                            MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32  cas2ps(MV_U8 spd_byte);
-/*******************************************************************************
-* mvDramBankGet - Get the DRAM bank paramters.
-*
-* DESCRIPTION:
-*       This function retrieves DRAM bank parameters as described in 
-*       DRAM_BANK_INFO struct to the controller DRAM unit. In case the board 
-*       has its DRAM on DIMMs it will use its EEPROM to extract SPD data
-*       from it. Otherwise, if the DRAM is soldered on board, the function 
-*       should insert its bank information into MV_DRAM_BANK_INFO struct.
-*
-* INPUT:
-*       bankNum  - Board DRAM bank number.
-*
-* OUTPUT:
-*       pBankInfo  - DRAM bank information struct.
-*
-* RETURN:
-*       MV_FAIL - Bank parameters could not be read.
-*
-*******************************************************************************/
-MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo)
-{
-    MV_DIMM_INFO dimmInfo;
-
-    DB(mvOsPrintf("Dram: mvDramBankInfoGet bank %d\n", bankNum)); 
-    /* zero pBankInfo structure */
-    memset(pBankInfo, 0, sizeof(*pBankInfo));
-
-    if((NULL == pBankInfo) || (bankNum >= MV_DRAM_MAX_CS ))
-    {
-        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
-        return MV_BAD_PARAM;
-    }
-    if( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
-    {
-    DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
-    return MV_FAIL;
-    }
-    if((dimmInfo.numOfModuleBanks == 1) && ((bankNum % 2) == 1))
-    {
-    DB(mvOsPrintf("Dram: ERR dimmSpdGet. Can't find DIMM bank 2 \n"));
-    return MV_FAIL;
-    }
-
-    /* convert Dimm info to Bank info */
-    cpyDimm2BankInfo(&dimmInfo, pBankInfo);
-    
-    return MV_OK;
-}
-
-/*******************************************************************************
-* cpyDimm2BankInfo - Convert a Dimm info struct into a bank info struct.
-*
-* DESCRIPTION:
-*       Convert a Dimm info struct into a bank info struct.
-*
-* INPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* OUTPUT:
-*       pBankInfo  - DRAM bank information struct.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
-                                                MV_DRAM_BANK_INFO *pBankInfo)
-{
-    pBankInfo->memoryType = pDimmInfo->memoryType;        
-
-    /* DIMM dimensions */
-    pBankInfo->numOfRowAddr = pDimmInfo->numOfRowAddr;
-    pBankInfo->numOfColAddr = pDimmInfo->numOfColAddr;
-    pBankInfo->dataWidth = pDimmInfo->dataWidth;
-    pBankInfo->errorCheckType = pDimmInfo->errorCheckType;             
-    pBankInfo->sdramWidth = pDimmInfo->sdramWidth;
-    pBankInfo->errorCheckDataWidth = pDimmInfo->errorCheckDataWidth;   
-    pBankInfo->numOfBanksOnEachDevice = pDimmInfo->numOfBanksOnEachDevice;
-    pBankInfo->suportedCasLatencies = pDimmInfo->suportedCasLatencies;
-    pBankInfo->refreshInterval = pDimmInfo->refreshInterval;
- 
-    /* DIMM timing parameters */
-    pBankInfo->minCycleTimeAtMaxCasLatPs = pDimmInfo->minCycleTimeAtMaxCasLatPs;
-    pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
-                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps;
-    pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
-                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps;
-
-    pBankInfo->minRowPrechargeTime     = pDimmInfo->minRowPrechargeTime;     
-    pBankInfo->minRowActiveToRowActive = pDimmInfo->minRowActiveToRowActive;
-    pBankInfo->minRasToCasDelay        = pDimmInfo->minRasToCasDelay;       
-    pBankInfo->minRasPulseWidth        = pDimmInfo->minRasPulseWidth;       
-    pBankInfo->minWriteRecoveryTime    = pDimmInfo->minWriteRecoveryTime;
-    pBankInfo->minWriteToReadCmdDelay  = pDimmInfo->minWriteToReadCmdDelay;
-    pBankInfo->minReadToPrechCmdDelay  = pDimmInfo->minReadToPrechCmdDelay;
-    pBankInfo->minRefreshToActiveCmd   = pDimmInfo->minRefreshToActiveCmd;
-               
-    /* Parameters calculated from the extracted DIMM information */
-    pBankInfo->size = pDimmInfo->size/pDimmInfo->numOfModuleBanks;
-    pBankInfo->deviceDensity = pDimmInfo->deviceDensity;              
-    pBankInfo->numberOfDevices = pDimmInfo->numberOfDevices /
-                                 pDimmInfo->numOfModuleBanks;
- 
-    /* DIMM attributes (MV_TRUE for yes) */
-
-    if ((pDimmInfo->memoryType == MEM_TYPE_SDRAM) ||
-        (pDimmInfo->memoryType == MEM_TYPE_DDR1)   )
-    {   
-        if (pDimmInfo->dimmAttributes & BIT1)
-            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
-        else
-            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
-    }
-    else /* pDimmInfo->memoryType == MEM_TYPE_DDR2 */
-    {
-        if (pDimmInfo->dimmTypeInfo & (BIT0 | BIT4))
-            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
-        else
-            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
-    }
-
-    return;
-}
-
-/*******************************************************************************
-* dimmSpdCpy - Cpy SPD parameters from dimm 0 to dimm 1.
-*
-* DESCRIPTION:
-*       Read the DIMM SPD parameters from dimm 0 into dimm 1 SPD.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
-*
-*******************************************************************************/
-MV_STATUS dimmSpdCpy(MV_VOID)
-{
-    MV_U32 i;
-    MV_U32 spdChecksum;
-     
-    MV_TWSI_SLAVE twsiSlave;
-    MV_U8 data[SPD_SIZE];
-
-    /* zero dimmInfo structure */
-    memset(data, 0, SPD_SIZE);
-
-    /* read the dimm eeprom */
-    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
-    twsiSlave.slaveAddr.address = MV_BOARD_DIMM0_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL,
-			&twsiSlave, data, SPD_SIZE) )
-    {
-        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 0\n"));
-        return MV_FAIL;
-    }
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    
-    /* calculate SPD checksum */
-    spdChecksum = 0;
-    
-    for(i = 0 ; i <= 62 ; i++)
-    {
-        spdChecksum += data[i];
-    }
-    
-    if ((spdChecksum & 0xff) != data[63])
-    {
-        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
-                            (MV_U32)(spdChecksum & 0xff), data[63]));
-    }
-    else
-    {
-        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
-    }
-
-    /* copy the SPD content 1:1 into the DIMM 1 SPD */
-    twsiSlave.slaveAddr.address = MV_BOARD_DIMM1_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    for(i = 0 ; i < SPD_SIZE ; i++)
-    {
-	twsiSlave.offset = i;
-	if( MV_OK != mvTwsiWrite (MV_BOARD_DIMM_I2C_CHANNEL,
-	    			&twsiSlave, &data[i], 1) )
-	{
-	    mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 1 byte %d \n",i);
-	    return MV_FAIL;
-	}
-	mvOsDelay(5);
-    }
-    
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    return MV_OK;
-}
-
-/*******************************************************************************
-* dimmSpdGet - Get the SPD parameters.
-*
-* DESCRIPTION:
-*       Read the DIMM SPD parameters into given struct parameter.
-*
-* INPUT:
-*       dimmNum - DIMM number. See MV_BOARD_DIMM_NUM enumerator.
-*
-* OUTPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* RETURN:
-*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
-*
-*******************************************************************************/
-MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo)
-{
-    MV_U32 i;
-    MV_U32 density = 1;
-    MV_U32 spdChecksum;
-     
-    MV_TWSI_SLAVE twsiSlave;
-    MV_U8 data[SPD_SIZE];
-
-    if((NULL == pDimmInfo)|| (dimmNum >= MAX_DIMM_NUM))
-    {
-        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
-        return MV_BAD_PARAM;
-    }
-
-    /* zero dimmInfo structure */
-    memset(data, 0, SPD_SIZE);
-
-    /* read the dimm eeprom */
-    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
-    twsiSlave.slaveAddr.address = (dimmNum == 0) ?
-                            MV_BOARD_DIMM0_I2C_ADDR : MV_BOARD_DIMM1_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL,
-			&twsiSlave, data, SPD_SIZE) )
-    {
-        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum %d \n", dimmNum));
-        return MV_FAIL;
-    }
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    
-    /* calculate SPD checksum */
-    spdChecksum = 0;
-    
-        for(i = 0 ; i <= 62 ; i++)
-        {
-        spdChecksum += data[i];
-    }
-    
-    if ((spdChecksum & 0xff) != data[63])
-    {
-        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
-                            (MV_U32)(spdChecksum & 0xff), data[63]));
-    }
-    else
-    {
-        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
-    }
-
-    /* copy the SPD content 1:1 into the dimmInfo structure*/
-    for(i = 0 ; i < SPD_SIZE ; i++)
-    {
-        pDimmInfo->spdRawData[i] = data[i];
-        DB(mvOsPrintf("SPD-EEPROM Byte %3d = %3x (%3d)\n",i, data[i], data[i]));
-    }
-
-    DB(mvOsPrintf("DRAM SPD Information:\n"));
-
-    /* Memory type (DDR / SDRAM) */
-    switch (data[DIMM_MEM_TYPE])
-    {
-        case (DIMM_MEM_TYPE_SDRAM):
-            pDimmInfo->memoryType = MEM_TYPE_SDRAM;
-            DB(mvOsPrintf("DRAM Memeory type SDRAM\n"));
-            break;
-        case (DIMM_MEM_TYPE_DDR1):
-            pDimmInfo->memoryType = MEM_TYPE_DDR1;
-            DB(mvOsPrintf("DRAM Memeory type DDR1\n"));
-            break;
-        case (DIMM_MEM_TYPE_DDR2):
-            pDimmInfo->memoryType = MEM_TYPE_DDR2;
-            DB(mvOsPrintf("DRAM Memeory type DDR2\n"));
-            break;
-        default:
-            mvOsPrintf("ERROR: Undefined memory type!\n");
-            return MV_ERROR;
-    }
-
-    
-    /* Number Of Row Addresses */
-    pDimmInfo->numOfRowAddr = data[DIMM_ROW_NUM];
-    DB(mvOsPrintf("DRAM numOfRowAddr[3]         %d\n",pDimmInfo->numOfRowAddr));
-        
-    /* Number Of Column Addresses */
-    pDimmInfo->numOfColAddr = data[DIMM_COL_NUM];
-    DB(mvOsPrintf("DRAM numOfColAddr[4]         %d\n",pDimmInfo->numOfColAddr));
-        
-    /* Number Of Module Banks */
-    pDimmInfo->numOfModuleBanks = data[DIMM_MODULE_BANK_NUM];
-    DB(mvOsPrintf("DRAM numOfModuleBanks[5]     0x%x\n", 
-                                                  pDimmInfo->numOfModuleBanks));
-        
-    /* Number of module banks encoded differently for DDR2 */
-    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
-        pDimmInfo->numOfModuleBanks = (pDimmInfo->numOfModuleBanks & 0x7)+1;
-
-    /* Data Width */
-    pDimmInfo->dataWidth = data[DIMM_DATA_WIDTH];
-    DB(mvOsPrintf("DRAM dataWidth[6]            0x%x\n", pDimmInfo->dataWidth));
-        
-    /* Minimum Cycle Time At Max CasLatancy */
-    pDimmInfo->minCycleTimeAtMaxCasLatPs = cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS]);
-
-    /* Error Check Type */
-    pDimmInfo->errorCheckType = data[DIMM_ERR_CHECK_TYPE];
-    DB(mvOsPrintf("DRAM errorCheckType[11]      0x%x\n", 
-                                                    pDimmInfo->errorCheckType));
-
-    /* Refresh Interval */
-    pDimmInfo->refreshInterval = data[DIMM_REFRESH_INTERVAL];
-    DB(mvOsPrintf("DRAM refreshInterval[12]     0x%x\n", 
-                                                   pDimmInfo->refreshInterval));
-    
-    /* Sdram Width */
-    pDimmInfo->sdramWidth = data[DIMM_SDRAM_WIDTH];
-    DB(mvOsPrintf("DRAM sdramWidth[13]          0x%x\n",pDimmInfo->sdramWidth));
-        
-    /* Error Check Data Width */
-    pDimmInfo->errorCheckDataWidth = data[DIMM_ERR_CHECK_DATA_WIDTH];
-    DB(mvOsPrintf("DRAM errorCheckDataWidth[14] 0x%x\n", 
-                                               pDimmInfo->errorCheckDataWidth));
-    
-    /* Burst Length Supported */
-    /*     SDRAM/DDR1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
-                    *********************************************************/ 
-    /*     DDR2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
-                    *********************************************************/ 
-
-    pDimmInfo->burstLengthSupported = data[DIMM_BURST_LEN_SUP];
-    DB(mvOsPrintf("DRAM burstLengthSupported[16] 0x%x\n", 
-                                              pDimmInfo->burstLengthSupported));
-    
-    /* Number Of Banks On Each Device */
-    pDimmInfo->numOfBanksOnEachDevice = data[DIMM_DEV_BANK_NUM];
-    DB(mvOsPrintf("DRAM numOfBanksOnEachDevice[17] 0x%x\n", 
-                                            pDimmInfo->numOfBanksOnEachDevice));
-    
-    /* Suported Cas Latencies */
-                   
-    /*      SDRAM:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
-            ********************************************************/ 
-
-    /*     DDR 1:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
-            *********************************************************/
-
-    /*     DDR 2:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-            *********************************************************/
-    
-    pDimmInfo->suportedCasLatencies = data[DIMM_SUP_CAL];
-    DB(mvOsPrintf("DRAM suportedCasLatencies[18]    0x%x\n", 
-                                              pDimmInfo->suportedCasLatencies));
-
-    /* For DDR2 only, get the DIMM type information */
-    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
-    {   
-        pDimmInfo->dimmTypeInfo = data[DIMM_DDR2_TYPE_INFORMATION];
-        DB(mvOsPrintf("DRAM dimmTypeInfo[20] (DDR2) 0x%x\n", 
-                                                      pDimmInfo->dimmTypeInfo));
-    }
-
-    /* SDRAM Modules Attributes */
-    pDimmInfo->dimmAttributes = data[DIMM_BUF_ADDR_CONT_IN];
-    DB(mvOsPrintf("DRAM dimmAttributes[21]          0x%x\n",    
-                                                    pDimmInfo->dimmAttributes));
-    
-    /* Minimum Cycle Time At Max CasLatancy Minus 1*/
-    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
-                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS1]);
-
-    /* Minimum Cycle Time At Max CasLatancy Minus 2*/
-    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
-                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS2]);
-
-    pDimmInfo->minRowPrechargeTime = data[DIMM_MIN_ROW_PRECHARGE_TIME];
-    DB(mvOsPrintf("DRAM minRowPrechargeTime[27]     0x%x\n", 
-                                               pDimmInfo->minRowPrechargeTime));
-    pDimmInfo->minRowActiveToRowActive = data[DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE];
-    DB(mvOsPrintf("DRAM minRowActiveToRowActive[28] 0x%x\n", 
-                                           pDimmInfo->minRowActiveToRowActive));
-    pDimmInfo->minRasToCasDelay = data[DIMM_MIN_RAS_TO_CAS_DELAY];
-    DB(mvOsPrintf("DRAM minRasToCasDelay[29]        0x%x\n", 
-                                                  pDimmInfo->minRasToCasDelay));
-    pDimmInfo->minRasPulseWidth = data[DIMM_MIN_RAS_PULSE_WIDTH];
-    DB(mvOsPrintf("DRAM minRasPulseWidth[30]        0x%x\n", 
-                                                  pDimmInfo->minRasPulseWidth));
-        
-    /* DIMM Bank Density */
-    pDimmInfo->dimmBankDensity = data[DIMM_BANK_DENSITY];
-    DB(mvOsPrintf("DRAM dimmBankDensity[31]         0x%x\n", 
-                                                   pDimmInfo->dimmBankDensity));
-
-    /* Only DDR2 includes Write Recovery Time field. Other SDRAM ignore     */
-    pDimmInfo->minWriteRecoveryTime = data[DIMM_MIN_WRITE_RECOVERY_TIME];
-    DB(mvOsPrintf("DRAM minWriteRecoveryTime[36]    0x%x\n", 
-                                              pDimmInfo->minWriteRecoveryTime));
-    
-    /* Only DDR2 includes Internal Write To Read Command Delay field.       */
-    pDimmInfo->minWriteToReadCmdDelay = data[DIMM_MIN_WRITE_TO_READ_CMD_DELAY];
-    DB(mvOsPrintf("DRAM minWriteToReadCmdDelay[37]  0x%x\n", 
-                                            pDimmInfo->minWriteToReadCmdDelay));
-    
-    /* Only DDR2 includes Internal Read To Precharge Command Delay field.   */
-    pDimmInfo->minReadToPrechCmdDelay = data[DIMM_MIN_READ_TO_PRECH_CMD_DELAY];
-    DB(mvOsPrintf("DRAM minReadToPrechCmdDelay[38]  0x%x\n",    
-                                            pDimmInfo->minReadToPrechCmdDelay));
-    
-    /* Only DDR2 includes Minimum Refresh to Activate/Refresh Command field */
-    pDimmInfo->minRefreshToActiveCmd = data[DIMM_MIN_REFRESH_TO_ACTIVATE_CMD];
-    DB(mvOsPrintf("DRAM minRefreshToActiveCmd[42]   0x%x\n", 
-                                             pDimmInfo->minRefreshToActiveCmd));
-                 
-    /* calculating the sdram density. Representing device density from      */
-    /* bit 20 to allow representation of 4GB and above.                     */
-    /* For example, if density is 512Mbit 0x20000000, will be represent in  */
-    /* deviceDensity by 0x20000000 >> 16 --> 0x00000200. Another example    */
-    /* is density 8GB 0x200000000 >> 16 --> 0x00002000.                     */
-    density = (1 << ((pDimmInfo->numOfRowAddr + pDimmInfo->numOfColAddr) - 20));
-    pDimmInfo->deviceDensity = density * 
-                                pDimmInfo->numOfBanksOnEachDevice * 
-                                pDimmInfo->sdramWidth;
-    DB(mvOsPrintf("DRAM deviceDensity           %d\n",pDimmInfo->deviceDensity));
-    
-    /* Number of devices includeing Error correction */
-    pDimmInfo->numberOfDevices = (pDimmInfo->dataWidth/pDimmInfo->sdramWidth) * 
-                                  pDimmInfo->numOfModuleBanks;
-    DB(mvOsPrintf("DRAM numberOfDevices         %d\n",  
-                                                   pDimmInfo->numberOfDevices));
-
-    pDimmInfo->size = 0; 
-
-    /* Note that pDimmInfo->size is in MB units */
-    if (pDimmInfo->memoryType == MEM_TYPE_SDRAM)
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 8;                   /* Equal to 8MB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 16;                  /* Equal to 16MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 32;                  /* Equal to 32MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 64;                  /* Equal to 64MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    else if (pDimmInfo->memoryType == MEM_TYPE_DDR1)
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 2048;                /* Equal to 2GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 16;                  /* Equal to 16MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 32;                  /* Equal to 32MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 64;                  /* Equal to 64MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 2048;                /* Equal to 2GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 4096;                /* Equal to 4GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 8192;                /* Equal to 8GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 16384;               /* Equal to 16GB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    
-    pDimmInfo->size *= pDimmInfo->numOfModuleBanks;
-
-    DB(mvOsPrintf("Dram: dimm size    %dMB \n",pDimmInfo->size));
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* dimmSpdPrint - Print the SPD parameters.
-*
-* DESCRIPTION:
-*       Print the Dimm SPD parameters.
-*
-* INPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID dimmSpdPrint(MV_U32 dimmNum)
-{
-    MV_DIMM_INFO dimmInfo;
-    MV_U32  i, temp = 0;
-    MV_U32  k, maskLeftOfPoint = 0, maskRightOfPoint = 0;
-    MV_U32  rightOfPoint = 0,leftOfPoint = 0, div, time_tmp, shift;
-    MV_U32  busClkPs;
-    MV_U8   trp_clocks=0, trcd_clocks, tras_clocks, trrd_clocks,
-            temp_buf[40], *spdRawData;
-
-    busClkPs = 1000000000 / (mvBoardSysClkGet() / 100);  /* in 10 ps units */
-
-    spdRawData = dimmInfo.spdRawData;
-    
-    if(MV_OK != dimmSpdGet(dimmNum, &dimmInfo))
-    {
-        mvOsOutput("ERROR: Could not read SPD information!\n");
-        return;
-    }
-
-    /* find Manufactura of Dimm Module */
-    mvOsOutput("\nManufacturer's JEDEC ID Code:   ");
-    for(i = 0 ; i < DIMM_MODULE_MANU_SIZE ; i++)
-    {
-        mvOsOutput("%x",spdRawData[DIMM_MODULE_MANU_OFFS + i]);
-    }
-    mvOsOutput("\n");
-
-    /* Manufacturer's Specific Data */
-    for(i = 0 ; i < DIMM_MODULE_ID_SIZE ; i++)
-    {
-        temp_buf[i] = spdRawData[DIMM_MODULE_ID_OFFS + i];
-    }
-    mvOsOutput("Manufacturer's Specific Data:   %s\n", temp_buf);
-
-    /* Module Part Number */
-    for(i = 0 ; i < DIMM_MODULE_VEN_SIZE ; i++)
-    {
-        temp_buf[i] = spdRawData[DIMM_MODULE_VEN_OFFS + i];
-    }
-    mvOsOutput("Module Part Number:             %s\n", temp_buf);
-
-    /* Module Serial Number */
-    for(i = 0; i < sizeof(MV_U32); i++)
-    {
-    	temp |= spdRawData[95+i] << 8*i;
-    }
-    mvOsOutput("DIMM Serial No.                 %ld (%lx)\n", (long)temp, 
-                                    (long)temp);
-
-    /* find Manufac-Data of Dimm Module */
-    mvOsOutput("Manufactoring Date:             Year 20%d%d/ ww %d%d\n", 
-                        ((spdRawData[93] & 0xf0) >> 4), (spdRawData[93] & 0xf), 
-                        ((spdRawData[94] & 0xf0) >> 4), (spdRawData[94] & 0xf)); 
-    /* find modul_revision of Dimm Module */
-    mvOsOutput("Module Revision:                %d.%d\n", 
-                                                spdRawData[91], spdRawData[92]); 
-
-    /* find manufac_place of Dimm Module */
-    mvOsOutput("manufac_place:                  %d\n", spdRawData[72]);
-    
-    /* go over the first 35 I2C data bytes */
-    for(i = 2 ; i <= 35 ; i++)
-       switch(i)
-        {
-            case 2:  /* Memory type (DDR1/2 / SDRAM) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                    mvOsOutput("Dram Type is:                   SDRAM\n");
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                    mvOsOutput("Dram Type is:                   SDRAM DDR1\n");
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                    mvOsOutput("Dram Type is:                   SDRAM DDR2\n");
-                else
-                    mvOsOutput("Dram Type unknown\n");
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 3:  /* Number Of Row Addresses */
-                mvOsOutput("Module Number of row addresses: %d\n", 
-                                                        dimmInfo.numOfRowAddr);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 4:  /* Number Of Column Addresses */
-                mvOsOutput("Module Number of col addresses: %d\n", 
-                                                        dimmInfo.numOfColAddr);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 5:  /* Number Of Module Banks */
-                mvOsOutput("Number of Banks on Mod.:        %d\n",  
-                                                    dimmInfo.numOfModuleBanks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 6:  /* Data Width */
-                mvOsOutput("Module Data Width:              %d bit\n",  
-                                                           dimmInfo.dataWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 8:  /* Voltage Interface */
-                switch(spdRawData[i])
-                {
-                    case 0x0:
-                        mvOsOutput("Module is               TTL_5V_TOLERANT\n");
-                        break;
-                    case 0x1:
-                        mvOsOutput("Module is               LVTTL\n");
-                        break;
-                    case 0x2:
-                        mvOsOutput("Module is               HSTL_1_5V\n");
-                        break;
-                    case 0x3:
-                        mvOsOutput("Module is               SSTL_3_3V\n");
-                        break;
-                    case 0x4:
-                        mvOsOutput("Module is               SSTL_2_5V\n");
-                        break;
-                    case 0x5:
-                        if (dimmInfo.memoryType != MEM_TYPE_SDRAM)
-                        {
-                            mvOsOutput("Module is                 SSTL_1_8V\n");
-                            break;
-                        }
-                    default:
-                        mvOsOutput("Module is               VOLTAGE_UNKNOWN\n");
-                        break;
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 9:  /* Minimum Cycle Time At Max CasLatancy */
-                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                
-                /* DDR2 addition of right of point */
-                if ((spdRawData[i] & 0x0f) == 0xA)
-                {
-                    rightOfPoint = 25;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xB)
-                {
-                    rightOfPoint = 33;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xC)
-                {
-                    rightOfPoint = 66;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xD)
-                {
-                    rightOfPoint = 75;
-                }
-                mvOsOutput("Minimum Cycle Time At Max CL:   %d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 10: /* Clock To Data Out */
-                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 10:100;
-                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                leftOfPoint     = time_tmp / div;
-                rightOfPoint    = time_tmp % div;
-                mvOsOutput("Clock To Data Out:              %d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 11: /* Error Check Type */
-                mvOsOutput("Error Check Type (0=NONE):      %d\n", 
-                                                      dimmInfo.errorCheckType);
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 12: /* Refresh Interval */
-                mvOsOutput("Refresh Rate:                   %x\n", 
-                                                     dimmInfo.refreshInterval);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 13: /* Sdram Width */
-                mvOsOutput("Sdram Width:                    %d bits\n",     
-                                                          dimmInfo.sdramWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 14: /* Error Check Data Width */
-                mvOsOutput("Error Check Data Width:         %d bits\n", 
-                                                 dimmInfo.errorCheckDataWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-
-           case 15: /* Minimum Clock Delay is unsupported */
-                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
-                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
-                {
-                    mvOsOutput("Minimum Clk Delay back to back: %d\n", 
-                                                                spdRawData[i]);
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 16: /* Burst Length Supported */
-    /*     SDRAM/DDR1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
-                    *********************************************************/ 
-    /*     DDR2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
-                    *********************************************************/ 
-                mvOsOutput("Burst Length Supported: ");
-                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
-                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
-                {
-                    if (dimmInfo.burstLengthSupported & BIT0)
-                        mvOsOutput("1, ");
-                    if (dimmInfo.burstLengthSupported & BIT1)
-                        mvOsOutput("2, ");
-                }
-                if (dimmInfo.burstLengthSupported & BIT2)
-                    mvOsOutput("4, ");
-                if (dimmInfo.burstLengthSupported & BIT3) 
-                    mvOsOutput("8, ");
-                
-                mvOsOutput(" Bit \n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 17: /* Number Of Banks On Each Device */
-                mvOsOutput("Number Of Banks On Each Chip:   %d\n",  
-                                              dimmInfo.numOfBanksOnEachDevice);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 18: /* Suported Cas Latencies */
-                   
-            /*      SDRAM:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
-                    ********************************************************/ 
-
-            /*     DDR 1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
-                    *********************************************************/
-
-            /*     DDR 2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-                    *********************************************************/
-
-                mvOsOutput("Suported Cas Latencies: (CL) 			");
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    for (k = 0; k <=7; k++)
-                    {
-                        if (dimmInfo.suportedCasLatencies & (1 << k))
-                            mvOsOutput("%d,             ", k+1);
-                    }
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.suportedCasLatencies & BIT0)
-                        mvOsOutput("1, ");
-                    if (dimmInfo.suportedCasLatencies & BIT1)
-                        mvOsOutput("1.5, ");
-                    if (dimmInfo.suportedCasLatencies & BIT2)
-                        mvOsOutput("2, ");
-                    if (dimmInfo.suportedCasLatencies & BIT3)
-                        mvOsOutput("2.5, ");
-                    if (dimmInfo.suportedCasLatencies & BIT4)
-                        mvOsOutput("3, ");
-                    if (dimmInfo.suportedCasLatencies & BIT5)
-                        mvOsOutput("3.5, ");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if (dimmInfo.suportedCasLatencies & BIT2)
-                        mvOsOutput("2, ");
-                    if (dimmInfo.suportedCasLatencies & BIT3)
-                        mvOsOutput("3, ");
-                    if (dimmInfo.suportedCasLatencies & BIT4)
-                        mvOsOutput("4, ");
-                    if (dimmInfo.suportedCasLatencies & BIT5)
-                        mvOsOutput("5, ");		
-                }
-                else
-                    mvOsOutput("?.?, ");		
-                mvOsOutput("\n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 20:   /* DDR2 DIMM type info */
-                if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if (dimmInfo.dimmTypeInfo & (BIT0 | BIT4))
-                        mvOsOutput("Registered DIMM (RDIMM)\n");
-                    else if (dimmInfo.dimmTypeInfo & (BIT1 | BIT5))
-                        mvOsOutput("Unbuffered DIMM (UDIMM)\n");
-                    else 
-                        mvOsOutput("Unknown DIMM type.\n");
-                }
-
-                break;
-/*----------------------------------------------------------------------------*/
-   
-            case 21: /* SDRAM Modules Attributes */
-                mvOsOutput("\nModule Attributes (SPD Byte 21): \n");
-                
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if (dimmInfo.dimmAttributes & BIT0)
-                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
-                    else
-                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
-
-                    if (dimmInfo.dimmAttributes & BIT1)
-                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
-                    else
-                        mvOsOutput(" Registered Addr/Control Input: No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT2)
-                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
-                    else
-                        mvOsOutput(" On-Card PLL (clock):           No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT3)
-                        mvOsOutput(" Bufferd DQMB Input:            Yes \n");
-                    else
-                        mvOsOutput(" Bufferd DQMB Inputs:           No \n");
-   
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" Registered DQMB Inputs:        Yes \n");
-                    else
-                        mvOsOutput(" Registered DQMB Inputs:        No \n");
- 
-                    if (dimmInfo.dimmAttributes & BIT5)
-                        mvOsOutput(" Differential Clock Input:      Yes \n");
-                    else
-                        mvOsOutput(" Differential Clock Input:      No \n");
-   
-                    if (dimmInfo.dimmAttributes & BIT6)
-                        mvOsOutput(" redundant Row Addressing:      Yes \n");
-                    else
-                        mvOsOutput(" redundant Row Addressing:      No \n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.dimmAttributes & BIT0)
-                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
-                    else 
-                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT1)
-                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
-                    else
-                        mvOsOutput(" Registered Addr/Control Input: No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT2)
-                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
-                    else
-                        mvOsOutput(" On-Card PLL (clock):           No \n");
-            
-                    if (dimmInfo.dimmAttributes & BIT3)
-                        mvOsOutput(" FET Switch On-Card Enabled:    Yes \n");
-                    else
-                        mvOsOutput(" FET Switch On-Card Enabled:    No \n");
-                    
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
-                    else
-                        mvOsOutput(" FET Switch External Enabled:   No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT5)
-                        mvOsOutput(" Differential Clock Input:      Yes \n");
-                    else
-                        mvOsOutput(" Differential Clock Input:      No \n");
-                }
-                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-                {
-                    mvOsOutput(" Number of Active Registers on the DIMM: %d\n", 
-                                        (dimmInfo.dimmAttributes & 0x3) + 1);
-            
-                    mvOsOutput(" Number of PLLs on the DIMM: %d\n", 
-                                      ((dimmInfo.dimmAttributes) >> 2) & 0x3);
-               
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
-                    else
-                        mvOsOutput(" FET Switch External Enabled:   No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT6)
-                        mvOsOutput(" Analysis probe installed:      Yes \n");
-                    else
-                        mvOsOutput(" Analysis probe installed:      No \n");
-                }
-                
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 22: /* Suported AutoPreCharge */
-                mvOsOutput("\nModul Attributes (SPD Byte 22): \n");
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Early Ras Precharge:           Yes \n");
-                    else
-                        mvOsOutput(" Early Ras Precharge:           No \n");
-                                                        
-                    if ( spdRawData[i] & BIT1 )                 
-                        mvOsOutput(" AutoPreCharge:                 Yes \n");
-                    else
-                        mvOsOutput(" AutoPreCharge:                 No \n");
-                                                            
-                    if ( spdRawData[i] & BIT2 )                 
-                        mvOsOutput(" Precharge All:                 Yes \n");
-                    else
-                        mvOsOutput(" Precharge All:                 No \n");
-                                                        
-                    if ( spdRawData[i] & BIT3 )                 
-                        mvOsOutput(" Write 1/ReadBurst:             Yes \n");
-                    else
-                        mvOsOutput(" Write 1/ReadBurst:             No \n");
-                                                        
-                    if ( spdRawData[i] & BIT4 )                 
-                        mvOsOutput(" lower VCC tolerance:           5%%\n");
-                    else
-                        mvOsOutput(" lower VCC tolerance:           10%%\n");
-                                                        
-                    if ( spdRawData[i] & BIT5 )                 
-                        mvOsOutput(" upper VCC tolerance:           5%%\n");
-                    else
-                        mvOsOutput(" upper VCC tolerance:           10%%\n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Supports Weak Driver:          Yes \n");
-                    else
-                        mvOsOutput(" Supports Weak Driver:          No \n");
-
-                    if ( !(spdRawData[i] & BIT4) )
-                        mvOsOutput(" lower VCC tolerance:           0.2V\n");
-   
-                    if ( !(spdRawData[i] & BIT5) )
-                        mvOsOutput(" upper VCC tolerance:           0.2V\n");
-
-                    if ( spdRawData[i] & BIT6 )
-                        mvOsOutput(" Concurrent Auto Preharge:      Yes \n");
-                    else
-                        mvOsOutput(" Concurrent Auto Preharge:      No \n");
-
-                    if ( spdRawData[i] & BIT7 )
-                        mvOsOutput(" Supports Fast AP:              Yes \n");
-                    else
-                        mvOsOutput(" Supports Fast AP:              No \n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Supports Weak Driver:          Yes \n");
-                    else
-                        mvOsOutput(" Supports Weak Driver:          No \n");
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 23:
-            /* Minimum Cycle Time At Maximum Cas Latancy Minus 1 (2nd highest CL) */
-                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                
-                /* DDR2 addition of right of point */
-                if ((spdRawData[i] & 0x0f) == 0xA)
-                {
-                    rightOfPoint = 25;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xB)
-                {
-                    rightOfPoint = 33;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xC)
-                {
-                    rightOfPoint = 66;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xD)
-                {
-                    rightOfPoint = 75;
-                }
-
-                mvOsOutput("Minimum Cycle Time At 2nd highest CasLatancy"
-                           "(0 = Not supported): %d.%d [ns]\n",
-                           leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 24: /* Clock To Data Out 2nd highest Cas Latency Value*/
-                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 10:100;
-                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                    ((spdRawData[i] & 0x0f));
-                leftOfPoint     = time_tmp / div;
-                rightOfPoint    = time_tmp % div;
-                mvOsOutput("Clock To Data Out (2nd CL value): 		%d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 25: 
-            /* Minimum Cycle Time At Maximum Cas Latancy Minus 2 (3rd highest CL) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
-                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
-                }
-                else    /* DDR1 or DDR2 */ 
-                {
-                    leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                    rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                    
-                    /* DDR2 addition of right of point */
-                    if ((spdRawData[i] & 0x0f) == 0xA)
-                    {
-                        rightOfPoint = 25;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xB)
-                    {
-                        rightOfPoint = 33;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xC)
-                    {
-                        rightOfPoint = 66;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xD)
-                    {
-                        rightOfPoint = 75;
-                    }
-                }
-                mvOsOutput("Minimum Cycle Time At 3rd highest CasLatancy" 
-                           "(0 = Not supported): %d.%d [ns]\n",
-                           leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 26: /* Clock To Data Out 3rd highest Cas Latency Value*/
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
-                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
-                }
-                else    /* DDR1 or DDR2 */ 
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint     = 0;
-                    rightOfPoint    = time_tmp;
-                }
-                mvOsOutput("Clock To Data Out (3rd CL value): 		%d.%2d[ns]\n",
-                                                  leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 27: /* Minimum Row Precharge Time */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 10ps Intervals*/
-                trp_clocks = (temp + (busClkPs-1)) /  busClkPs;    
-                mvOsOutput("Minimum Row Precharge Time [ns]: 		%d.%d = " 
-                           "in Clk cycles %d\n", 
-                           leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 28: /* Minimum Row Active to Row Active Time */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
-                trrd_clocks = (temp + (busClkPs-1)) / busClkPs;
-                mvOsOutput("Minimum Row Active -To- Row Active Delay [ns]: " 
-                           "%d.%d = in Clk cycles %d\n",
-                            leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 29: /* Minimum Ras-To-Cas Delay */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;  
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
-                trcd_clocks = (temp + (busClkPs-1) )/ busClkPs;
-                mvOsOutput("Minimum Ras-To-Cas Delay [ns]: 			%d.%d = "
-                           "in Clk cycles %d\n", 
-                           leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-   
-            case 30: /* Minimum Ras Pulse Width */
-                tras_clocks = (cas2ps(spdRawData[i])+(busClkPs-1)) / busClkPs;
-                mvOsOutput("Minimum Ras Pulse Width [ns]: 			%d = "
-                           "in Clk cycles %d\n", spdRawData[i], tras_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 31: /* Module Bank Density */
-                mvOsOutput("Module Bank Density (more than 1= Multisize-Module):");
-
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("8MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("16MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("32MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("64MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                        mvOsOutput("128MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT6) 
-                        mvOsOutput("256MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT7) 
-                        mvOsOutput("512MB, ");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("2GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("16MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("32MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("64MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                        mvOsOutput("128MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT6) 
-                        mvOsOutput("256MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT7) 
-                        mvOsOutput("512MB, ");
-                }
-                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("2GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("4GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("8GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("16GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                    mvOsOutput("128MB, ");
-                        if (dimmInfo.dimmBankDensity & BIT6) 
-                    mvOsOutput("256MB, ");
-                        if (dimmInfo.dimmBankDensity & BIT7) 
-                    mvOsOutput("512MB, ");
-                }
-                mvOsOutput("\n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 32: /* Address And Command Setup Time (measured in ns/1000) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                    leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100; 
-                }
-                mvOsOutput("Address And Command Setup Time [ns]: 		%d.%d\n",
-                                                     leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 33: /* Address And Command Hold Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                    leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Address And Command Hold Time [ns]: 		%d.%d\n",
-                                                   leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 34: /* Data Input Setup Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                        leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Data Input Setup Time [ns]: 			%d.%d\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 35: /* Data Input Hold Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                        leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Data Input Hold Time [ns]: 			%d.%d\n\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 36: /* Relevant for DDR2 only: Write Recovery Time */
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> 2);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint) * 25;  
-                mvOsOutput("Write Recovery Time [ns]: 			%d.%d\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-        }
-    
-}
-
-
-/*
- * translate ns.ns/10 coding of SPD timing values
- * into ps unit values
- */
-/*******************************************************************************
-*  cas2ps - Translate x.y ns parameter to pico-seconds values
-*
-* DESCRIPTION:
-*       This function translates x.y nano seconds to its value in pico seconds.
-*       For example 3.75ns will return 3750.
-*
-* INPUT:
-*       spd_byte - DIMM SPD byte.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       value in pico seconds.
-*
-*******************************************************************************/
-static MV_U32  cas2ps(MV_U8 spd_byte)
-{
-    MV_U32 ns, ns10;
-    
-    /* isolate upper nibble */
-    ns = (spd_byte >> 4) & 0x0F;
-    /* isolate lower nibble */
-    ns10 = (spd_byte & 0x0F);
-    
-    if( ns10 < 10 ) {
-        ns10 *= 10;
-    }
-    else if( ns10 == 10 )
-        ns10 = 25;
-    else if( ns10 == 11 )
-        ns10 = 33;
-    else if( ns10 == 12 )
-        ns10 = 66;
-    else if( ns10 == 13 )
-        ns10 = 75;
-    else 
-    {
-        mvOsOutput("cas2ps Err. unsupported cycle time.\n");
-    }
-    
-    return (ns*1000 + ns10*10);
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h
deleted file mode 100644
index 678e22456d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDram.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDram
-#define __INCmvDram
-
-#include "ddr1_2/mvDramIf.h"
-#include "twsi/mvTwsi.h"
-
-#define MAX_DIMM_NUM 			2
-#define SPD_SIZE			128
-
-/* Dimm spd offsets */
-#define DIMM_MEM_TYPE 						2
-#define DIMM_ROW_NUM 						3
-#define DIMM_COL_NUM 						4
-#define DIMM_MODULE_BANK_NUM 				5
-#define DIMM_DATA_WIDTH 					6
-#define DIMM_VOLT_IF 						8
-#define DIMM_MIN_CC_AT_MAX_CAS 				9
-#define DIMM_ERR_CHECK_TYPE 				11
-#define DIMM_REFRESH_INTERVAL 				12
-#define DIMM_SDRAM_WIDTH 					13
-#define DIMM_ERR_CHECK_DATA_WIDTH 			14
-#define DIMM_MIN_CLK_DEL 					15
-#define DIMM_BURST_LEN_SUP 					16
-#define DIMM_DEV_BANK_NUM 					17
-#define DIMM_SUP_CAL 						18
-#define DIMM_DDR2_TYPE_INFORMATION          20      /* DDR2 only */
-#define DIMM_BUF_ADDR_CONT_IN 				21
-#define DIMM_MIN_CC_AT_MAX_CAS_MINUS1		23
-#define DIMM_MIN_CC_AT_MAX_CAS_MINUS2		25
-#define DIMM_MIN_ROW_PRECHARGE_TIME			27
-#define DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE	28
-#define DIMM_MIN_RAS_TO_CAS_DELAY			29
-#define DIMM_MIN_RAS_PULSE_WIDTH			30
-#define DIMM_BANK_DENSITY					31
-#define DIMM_MIN_WRITE_RECOVERY_TIME        36
-#define DIMM_MIN_WRITE_TO_READ_CMD_DELAY    37
-#define DIMM_MIN_READ_TO_PRECH_CMD_DELAY    38
-#define DIMM_MIN_REFRESH_TO_ACTIVATE_CMD    42
-
-/* Dimm Memory Type values */
-#define DIMM_MEM_TYPE_SDRAM					0x4
-#define DIMM_MEM_TYPE_DDR1 					0x7
-#define DIMM_MEM_TYPE_DDR2 					0x8
-        
-#define DIMM_MODULE_MANU_OFFS 		64
-#define DIMM_MODULE_MANU_SIZE 		8
-#define DIMM_MODULE_VEN_OFFS 		73 
-#define DIMM_MODULE_VEN_SIZE 		25
-#define DIMM_MODULE_ID_OFFS 		99
-#define DIMM_MODULE_ID_SIZE 		18
-
-/* enumeration for voltage levels. */
-typedef enum _mvDimmVoltageIf
-{
-    TTL_5V_TOLERANT, 
-    LVTTL, 
-    HSTL_1_5V, 
-    SSTL_3_3V, 
-    SSTL_2_5V, 
-    VOLTAGE_UNKNOWN, 
-} MV_DIMM_VOLTAGE_IF;
-
-
-/* enumaration for SDRAM CAS Latencies. */
-typedef enum _mvDimmSdramCas
-{
-    SD_CL_1 =1,  
-    SD_CL_2,  
-    SD_CL_3, 
-    SD_CL_4, 
-    SD_CL_5, 
-    SD_CL_6, 
-    SD_CL_7, 
-    SD_FAULT
-}MV_DIMM_SDRAM_CAS;
-
-
-/* DIMM information structure */                                                    
-typedef struct _mvDimmInfo
-{
-    MV_MEMORY_TYPE  memoryType; 	/* DDR or SDRAM */
-
-    MV_U8       spdRawData[SPD_SIZE];  	/* Content of SPD-EEPROM copied 1:1  */
-
-    /* DIMM dimensions */
-    MV_U32  numOfRowAddr;
-    MV_U32  numOfColAddr;
-    MV_U32  numOfModuleBanks;
-    MV_U32  dataWidth;
-    MV_U32  errorCheckType;             /* ECC , PARITY..*/
-    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
-    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
-    MV_U32  burstLengthSupported;
-    MV_U32  numOfBanksOnEachDevice;
-    MV_U32  suportedCasLatencies;
-    MV_U32  refreshInterval;
-    MV_U32  dimmBankDensity;
-    MV_U32  dimmTypeInfo;           /* DDR2 only */
-    MV_U32  dimmAttributes;
-
-    /* DIMM timing parameters */
-    MV_U32  minCycleTimeAtMaxCasLatPs;	
-    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
-    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
-	MV_U32  minRowPrechargeTime;
-	MV_U32  minRowActiveToRowActive;
-	MV_U32  minRasToCasDelay;
-	MV_U32  minRasPulseWidth;
-    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
-    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
-    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
-    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
-
-    /* Parameters calculated from the extracted DIMM information */
-    MV_U32  size;               /* 16,64,128,256 or 512 MByte in MB units */
-    MV_U32  deviceDensity;      /* 16,64,128,256 or 512 Mbit in MB units  */
-    MV_U32  numberOfDevices;
-
-} MV_DIMM_INFO;
-
-
-MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo);
-MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo);
-MV_VOID dimmSpdPrint(MV_U32 dimmNum);
-MV_STATUS dimmSpdCpy(MV_VOID);
-
-#endif /* __INCmvDram */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c
deleted file mode 100644
index 12fb26ad0e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.c
+++ /dev/null
@@ -1,1599 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-#include "ddr1_2/mvDramIf.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-
-
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-/* DRAM bank presence encoding */
-#define BANK_PRESENT_CS0				0x1
-#define BANK_PRESENT_CS0_CS1			0x3
-#define BANK_PRESENT_CS0_CS2			0x5
-#define BANK_PRESENT_CS0_CS1_CS2		0x7
-#define BANK_PRESENT_CS0_CS2_CS3		0xd
-#define BANK_PRESENT_CS0_CS2_CS3_CS4	0xf
-
-/* locals   */
-static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin);
-#if defined(MV_INC_BOARD_DDIM)
-static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas);
-static MV_U32 sdramModeRegCalc(MV_U32 minCas);
-static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
-static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk, 
-						 MV_U32 forcedCl);
-static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
-									  MV_U32 minCas, MV_U32 busClk);
-static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
-									   MV_U32 busClk);
-
-/*******************************************************************************
-* mvDramIfDetect - Prepare DRAM interface configuration values.
-*
-* DESCRIPTION:
-*       This function implements the full DRAM detection and timing 
-*       configuration for best system performance.
-*       Since this routine runs from a ROM device (Boot Flash), its stack 
-*       resides on RAM, that might be the system DRAM. Changing DRAM 
-*       configuration values while keeping vital data in DRAM is risky. That
-*       is why the function does not preform the configuration setting but 
-*       prepare those in predefined 32bit registers (in this case IDMA 
-*       registers are used) for other routine to perform the settings.
-*       The function will call for board DRAM SPD information for each DRAM 
-*       chip select. The function will then analyze those SPD parameters of 
-*       all DRAM banks in order to decide on DRAM configuration compatible 
-*       for all DRAM banks.
-*       The function will set the CPU DRAM address decode registers.
-*       Note: This routine prepares values that will overide configuration of
-*       mvDramBasicAsmInit().
-*       
-* INPUT:
-*       forcedCl - Forced CAL Latency. If equal to zero, do not force.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvDramIfDetect(MV_U32 forcedCl)
-{
-	MV_U32 retVal = MV_OK;	/* return value */
-	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
-	MV_U32  busClk, size, base = 0, i, temp, deviceW, dimmW;
-	MV_U8	minCas;
-	MV_DRAM_DEC_WIN dramDecWin;
-
-	dramDecWin.addrWin.baseHigh = 0;
-
-	busClk = mvBoardSysClkGet();
-	
-	if (0 == busClk)
-	{
-		mvOsPrintf("Dram: ERR. Can't detect system clock! \n");
-		return MV_ERROR;
-	}
-	
-	/* Close DRAM banks except bank 0 (in case code is excecuting from it...) */
-#if defined(MV_INCLUDE_SDRAM_CS1)
-	for(i= SDRAM_CS1; i < MV_DRAM_MAX_CS; i++)
-		mvCpuIfTargetWinEnable(i, MV_FALSE);
-#endif
-
-	/* we will use bank 0 as the representative of the all the DRAM banks,  */
-	/* since bank 0 must exist.                                             */	
-	for(i = 0; i < MV_DRAM_MAX_CS; i++)
-	{ 
-		/* if Bank exist */
-		if(MV_OK == mvDramBankInfoGet(i, &bankInfo[i]))
-		{
-			/* check it isn't SDRAM */
-			if(bankInfo[i].memoryType == MEM_TYPE_SDRAM)
-			{
-				mvOsPrintf("Dram: ERR. SDRAM type not supported !!!\n");
-				return MV_ERROR;
-			}
-			/* All banks must support registry in order to activate it */
-			if(bankInfo[i].registeredAddrAndControlInputs != 
-			   bankInfo[0].registeredAddrAndControlInputs)
-			{
-				mvOsPrintf("Dram: ERR. different Registered settings !!!\n");
-				return MV_ERROR;
-			}
-
-			/* Init the CPU window decode */
-			/* Note that the size in Bank info is in MB units 			*/
-			/* Note that the Dimm width might be different then the device DRAM width */
-			temp = MV_REG_READ(SDRAM_CONFIG_REG);
-			
-			deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_16BIT )? 16 : 32;
-			dimmW = bankInfo[0].dataWidth - (bankInfo[0].dataWidth % 16);
-			size = ((bankInfo[i].size << 20) / (dimmW/deviceW)); 
-
-			/* We can not change DRAM window settings while excecuting  	*/
-			/* code from it. That is why we skip the DRAM CS[0], saving     */
-			/* it to the ROM configuration routine	*/
-			if(i == SDRAM_CS0)
-			{
-				MV_U32 sizeToReg;
-				
-				/* Translate the given window size to register format */
-				sizeToReg = ctrlSizeToReg(size, SCSR_SIZE_ALIGNMENT);
-
-				/* Size parameter validity check. */
-				if (-1 == sizeToReg)
-				{
-					mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n"
-							   ,i);
-					return MV_BAD_PARAM;
-				}
-                
-				/* Size is located at upper 16 bits */
-				sizeToReg <<= SCSR_SIZE_OFFS;
-
-				/* enable it */
-				sizeToReg |= SCSR_WIN_EN;
-
-				MV_REG_WRITE(DRAM_BUF_REG0, sizeToReg);
-			}
-			else
-			{
-				dramDecWin.addrWin.baseLow = base;
-				dramDecWin.addrWin.size = size;
-				dramDecWin.enable = MV_TRUE;
-				
-				if (MV_OK != mvDramIfWinSet(SDRAM_CS0 + i, &dramDecWin))
-				{
-					mvOsPrintf("Dram: ERR. Fail to set bank %d!!!\n", 
-							   SDRAM_CS0 + i);
-					return MV_ERROR;
-				}
-			}
-			
-			base += size;
-
-			/* update the suportedCasLatencies mask */
-			bankInfo[0].suportedCasLatencies &= bankInfo[i].suportedCasLatencies;
-
-		}
-		else
-		{
-			if( i == 0 ) /* bank 0 doesn't exist */
-			{
-				mvOsPrintf("Dram: ERR. Fail to detect bank 0 !!!\n");
-				return MV_ERROR;
-			}
-			else
-			{
-				DB(mvOsPrintf("Dram: Could not find bank %d\n", i));
-				bankInfo[i].size = 0;     /* Mark this bank as non exist */
-			}
-		}
-	}
-
-	/* calculate minimum CAS */
-	minCas = minCasCalc(&bankInfo[0], busClk, forcedCl);
-	if (0 == minCas) 
-	{
-		mvOsOutput("Dram: Warn: Could not find CAS compatible to SysClk %dMhz\n",
-				   (busClk / 1000000));
-
-		if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-		{
-			minCas = DDR2_CL_4; /* Continue with this CAS */
-			mvOsPrintf("Set default CAS latency 4\n");
-		}
-		else
-		{
-			minCas = DDR1_CL_3; /* Continue with this CAS */
-			mvOsPrintf("Set default CAS latency 3\n");
-		}
-	}
-
-	/* calc SDRAM_CONFIG_REG  and save it to temp register */
-	temp = sdramConfigRegCalc(&bankInfo[0], busClk);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramConfigRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG1, temp);
-
-	/* calc SDRAM_MODE_REG  and save it to temp register */ 
-	temp = sdramModeRegCalc(minCas);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramModeRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG2, temp);
-
-	/* calc SDRAM_EXTENDED_MODE_REG  and save it to temp register */ 
-	temp = sdramExtModeRegCalc(&bankInfo[0]);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramModeRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG10, temp);
-
-	/* calc D_UNIT_CONTROL_LOW  and save it to temp register */
-	temp = dunitCtrlLowRegCalc(&bankInfo[0], minCas); 
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. dunitCtrlLowRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG3, temp); 
-
-	/* calc SDRAM_ADDR_CTRL_REG  and save it to temp register */
-	temp = sdramAddrCtrlRegCalc(&bankInfo[0]);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramAddrCtrlRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG4, temp);
-
-	/* calc SDRAM_TIMING_CTRL_LOW_REG  and save it to temp register */
-	temp = sdramTimeCtrlLowRegCalc(&bankInfo[0], minCas, busClk);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramTimeCtrlLowRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG5, temp);
-
-	/* calc SDRAM_TIMING_CTRL_HIGH_REG  and save it to temp register */
-	temp = sdramTimeCtrlHighRegCalc(&bankInfo[0], busClk);
-	if(-1 == temp)
-	{
-		mvOsPrintf("Dram: ERR. sdramTimeCtrlHighRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	MV_REG_WRITE(DRAM_BUF_REG6, temp);
-
-	/* Config DDR2 On Die Termination (ODT) registers */
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-		sdramDDr2OdtConfig(bankInfo);
-	}
-	
-	/* Note that DDR SDRAM Address/Control and Data pad calibration     */
-	/* settings is done in mvSdramIfConfig.s                            */
-
-	return retVal;
-}
-
-/*******************************************************************************
-* minCasCalc - Calculate the Minimum CAS latency which can be used.
-*
-* DESCRIPTION:
-*	Calculate the minimum CAS latency that can be used, base on the DRAM
-*	parameters and the SDRAM bus Clock freq.
-*
-* INPUT:
-*	busClk    - the DRAM bus Clock.
-*	pBankInfo - bank info parameters.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       The minimum CAS Latency. The function returns 0 if max CAS latency
-*		supported by banks is incompatible with system bus clock frequancy.
-*
-*******************************************************************************/
-static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk, 
-						 MV_U32 forcedCl)
-{
-	MV_U32 count = 1, j;
-	MV_U32 busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
-	MV_U32 startBit, stopBit;
-	
-	/*     DDR 1:
-			*******-******-******-******-******-******-******-******* 
-			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-			*******-******-******-******-******-******-******-******* 
-	CAS	=	* TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
-			*********************************************************/
-	
-	/*     DDR 2:
-			*******-******-******-******-******-******-******-******* 
-			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-			*******-******-******-******-******-******-******-******* 
-	CAS	=	* TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-			*********************************************************/
-	
-	
-	/* If we are asked to use the forced CAL */
-	if (forcedCl)
-	{
-		mvOsPrintf("DRAM: Using forced CL %d.%d\n", (forcedCl / 10), 
-													(forcedCl % 10));
-	
-		if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-		{
-			if (forcedCl == 30)
-				pBankInfo->suportedCasLatencies = 0x08;
-			else if (forcedCl == 40)
-				pBankInfo->suportedCasLatencies = 0x10;
-			else
-			{
-				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 4\n", 
-						   (forcedCl / 10), (forcedCl % 10));
-				pBankInfo->suportedCasLatencies = 0x10;
-			}
-		}
-		else
-		{
-			if (forcedCl == 15)
-				pBankInfo->suportedCasLatencies = 0x02;
-			else if (forcedCl == 20)
-				pBankInfo->suportedCasLatencies = 0x04;
-			else if (forcedCl == 25)
-				pBankInfo->suportedCasLatencies = 0x08;
-			else if (forcedCl == 30)
-				pBankInfo->suportedCasLatencies = 0x10;
-			else if (forcedCl == 40)
-				pBankInfo->suportedCasLatencies = 0x40;
-			else
-			{
-				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 3\n", 
-						   (forcedCl / 10), (forcedCl % 10));
-				pBankInfo->suportedCasLatencies = 0x10;
-			}
-		}
-	
-		return pBankInfo->suportedCasLatencies;        
-	}   
-	
-	/* go over the supported cas mask from Max Cas down and check if the 	*/
-	/* SysClk stands in its time requirments.								*/
-	
-	
-	DB(mvOsPrintf("Dram: minCasCalc supported mask = %x busClkPs = %x \n",
-								pBankInfo->suportedCasLatencies,busClkPs ));
-	for(j = 7; j > 0; j--)
-	{
-		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
-		{
-			/* Reset the bits for CL incompatible for the sysClk            */
-			switch (count)
-			{
-				case 1: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatPs > busClkPs) 
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 2: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 3: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				default: 
-					pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					break;
-			}
-		}
-	}
-	
-	DB(mvOsPrintf("Dram: minCasCalc support = %x (after SysCC calc)\n",
-				  pBankInfo->suportedCasLatencies ));
-	
-	/* SDRAM DDR1 controller supports CL 1.5 to 3.5 */
-	/* SDRAM DDR2 controller supports CL 3 to 5     */
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-		startBit = 3;   /* DDR2 support CL start with CL3 (bit 3) */
-		stopBit  = 5;   /* DDR2 support CL stops with CL5 (bit 5) */
-	}
-	else
-	{
-		startBit = 1;   /* DDR1 support CL start with CL1.5 (bit 3) */
-		stopBit  = 4;   /* DDR1 support CL stops with CL3 (bit 4)   */
-	}
-	
-	for(j = startBit; j <= stopBit ; j++)
-	{
-		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
-		{
-			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
-			return (BIT0 << j);
-		}
-	}
-	
-	return 0; 
-}
-
-/*******************************************************************************
-* sdramConfigRegCalc - Calculate sdram config register
-*
-* DESCRIPTION: Calculate sdram config register optimized value based
-*			on the bank info parameters.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram config reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
-{
-	MV_U32 sdramConfig = 0;
-	MV_U32 refreshPeriod;
-	
-	busClk /= 1000000; /* we work with busClk in MHz */
-	
-	sdramConfig = MV_REG_READ(SDRAM_CONFIG_REG);
-	
-	/* figure out the memory refresh internal */
-	switch (pBankInfo->refreshInterval & 0xf)
-	{
-		case 0x0: /* refresh period is 15.625 usec */
-			refreshPeriod = 15625;
-			break;
-		case 0x1: /* refresh period is 3.9 usec  	*/
-			refreshPeriod = 3900;
-			break;
-		case 0x2: /* refresh period is 7.8 usec 	*/
-			refreshPeriod = 7800;
-			break;
-		case 0x3: /* refresh period is 31.3 usec	*/
-			refreshPeriod = 31300;
-			break;
-		case 0x4: /* refresh period is 62.5 usec	*/
-			refreshPeriod = 62500;
-			break;
-		case 0x5: /* refresh period is 125 usec 	*/
-			refreshPeriod = 125000;
-			break;
-		default:  /* refresh period undefined 					*/
-			mvOsPrintf("Dram: ERR. DRAM refresh period is unknown!\n");
-			return -1;
-	}
-	
-	/* Now the refreshPeriod is in register format value */
-	refreshPeriod = (busClk * refreshPeriod) / 1000;
-	
-	DB(mvOsPrintf("Dram: sdramConfigRegCalc calculated refresh interval %0x\n", 
-				  refreshPeriod));
-
-	/* make sure the refresh value is only 14 bits */
-	if(refreshPeriod > SDRAM_REFRESH_MAX)
-	{
-		refreshPeriod = SDRAM_REFRESH_MAX;
-		DB(mvOsPrintf("Dram: sdramConfigRegCalc adjusted refresh interval %0x\n", 
-					  refreshPeriod));
-	}
-	
-	/* Clear the refresh field */
-	sdramConfig &= ~SDRAM_REFRESH_MASK;
-	
-	/* Set new value to refresh field */
-	sdramConfig |= (refreshPeriod & SDRAM_REFRESH_MASK);
-	
-	/*  registered DRAM ? */
-	if ( pBankInfo->registeredAddrAndControlInputs )
-	{
-		/* it's registered DRAM, so set the reg. DRAM bit */
-		sdramConfig |= SDRAM_REGISTERED;
-		mvOsPrintf("DRAM Attribute: Registered address and control inputs.\n");
-	}
-	
-	/* set DDR SDRAM devices configuration */
-	sdramConfig &= ~SDRAM_DCFG_MASK;    /* Clear Dcfg field */
-	
-	switch (pBankInfo->sdramWidth)
-	{
-		case 8:  /* memory is x8 */
-			sdramConfig |= SDRAM_DCFG_X8_DEV;
-			DB(mvOsPrintf("Dram: sdramConfigRegCalc SDRAM device width x8\n"));
-			break;
-		case 16:
-			sdramConfig |= SDRAM_DCFG_X16_DEV;
-			DB(mvOsPrintf("Dram: sdramConfigRegCalc SDRAM device width x16\n"));
-			break;
-		default: /* memory width unsupported */
-			mvOsPrintf("Dram: ERR. DRAM chip width is unknown!\n");
-			return -1;
-	}
-
-	/* Set static default settings */
-	sdramConfig |= SDRAM_CONFIG_DV;
-	
-	DB(mvOsPrintf("Dram: sdramConfigRegCalc set sdramConfig to 0x%x\n",
-				  sdramConfig));
-	
-	return sdramConfig;  
-}
-
-/*******************************************************************************
-* sdramModeRegCalc - Calculate sdram mode register
-*
-* DESCRIPTION: Calculate sdram mode register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram mode reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramModeRegCalc(MV_U32 minCas)
-{
-	MV_U32 sdramMode;
-		
-	sdramMode = MV_REG_READ(SDRAM_MODE_REG);
-	
-	/* Clear CAS Latency field */
-	sdramMode &= ~SDRAM_CL_MASK;
-	
-	mvOsPrintf("DRAM CAS Latency ");
-	
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{            	
-		switch (minCas)
-		{
-			case DDR2_CL_3: 
-				sdramMode |= SDRAM_DDR2_CL_3;
-				mvOsPrintf("3.\n");
-				break;
-			case DDR2_CL_4: 
-				sdramMode |= SDRAM_DDR2_CL_4;
-				mvOsPrintf("4.\n");
-				break;
-			case DDR2_CL_5: 
-				sdramMode |= SDRAM_DDR2_CL_5;
-				mvOsPrintf("5.\n");
-				break;
-			default:
-				mvOsPrintf("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
-				return -1;
-		}
-	sdramMode |= DDR2_MODE_REG_DV;
-	}
-	else	/* DDR1 */
-	{
-		switch (minCas)
-		{			
-			case DDR1_CL_1_5: 
-				sdramMode |= SDRAM_DDR1_CL_1_5;
-				mvOsPrintf("1.5\n");
-				break;
-			case DDR1_CL_2: 
-				sdramMode |= SDRAM_DDR1_CL_2;
-				mvOsPrintf("2\n");
-				break;            
-			case DDR1_CL_2_5: 
-				sdramMode |= SDRAM_DDR1_CL_2_5;
-				mvOsPrintf("2.5\n");
-				break;
-			case DDR1_CL_3: 
-				sdramMode |= SDRAM_DDR1_CL_3;
-				mvOsPrintf("3\n");
-				break;
-			case DDR1_CL_4: 
-				sdramMode |= SDRAM_DDR1_CL_4;
-				mvOsPrintf("4\n");
-				break;
-			default:
-				mvOsPrintf("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
-				return -1;	
-		}
-		sdramMode |= DDR1_MODE_REG_DV;		
-	}
-	
-	DB(mvOsPrintf("nsdramModeRegCalc register 0x%x\n", sdramMode ));
-
-	return sdramMode;
-}
-
-/*******************************************************************************
-* sdramExtModeRegCalc - Calculate sdram Extended mode register
-*
-* DESCRIPTION: 
-*		Return sdram Extended mode register value based
-*		on the bank info parameters and bank presence.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram Extended mode reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo)
-{
-	MV_U32 populateBanks = 0;
-	int bankNum;
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-	/* Represent the populate banks in binary form */
-	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		if (0 != pBankInfo[bankNum].size)
-		{
-				populateBanks |= (1 << bankNum);
-			}
-		}
-	
-		switch(populateBanks)
-		{
-			case(BANK_PRESENT_CS0):
-				return DDR_SDRAM_EXT_MODE_CS0_DV;
-		
-			case(BANK_PRESENT_CS0_CS1):
-				return DDR_SDRAM_EXT_MODE_CS0_DV;
-		
-			case(BANK_PRESENT_CS0_CS2):
-				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
-		
-			case(BANK_PRESENT_CS0_CS1_CS2):
-				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
-		
-			case(BANK_PRESENT_CS0_CS2_CS3):
-				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
-		
-			case(BANK_PRESENT_CS0_CS2_CS3_CS4):
-				return DDR_SDRAM_EXT_MODE_CS0_CS2_DV;
-		
-			default:
-				mvOsPrintf("sdramExtModeRegCalc: Invalid DRAM bank presence\n");
-				return -1;
-		} 
-	}
-	return 0;
-}
-
-/*******************************************************************************
-* dunitCtrlLowRegCalc - Calculate sdram dunit control low register
-*
-* DESCRIPTION: Calculate sdram dunit control low register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram dunit control low reg value.
-*
-*******************************************************************************/
-static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas)
-{
-	MV_U32 dunitCtrlLow;
-	
-	dunitCtrlLow = MV_REG_READ(SDRAM_DUNIT_CTRL_REG);
-	
-	/* Clear StBurstDel field */
-	dunitCtrlLow &= ~SDRAM_ST_BURST_DEL_MASK;
-	
-#ifdef MV_88W8660
-	/* Clear address/control output timing field */
-	dunitCtrlLow &= ~SDRAM_CTRL_POS_RISE;
-#endif /* MV_88W8660 */
-
-	DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc\n"));
-	
-	/* For proper sample of read data set the Dunit Control register's      */
-	/* stBurstDel bits [27:24]                                              */
-			/********-********-********-********-********-*********
-			* CL=1.5 |  CL=2  | CL=2.5 |  CL=3  |  CL=4  |  CL=5  *
-			*********-********-********-********-********-*********
-Not Reg.	*  0011  |  0011  |  0100  |  0100  |  0101  |  TBD   *
-			*********-********-********-********-********-*********
-Registered	*  0100  |  0100  |  0101  |  0101  |  0110  |  TBD   *
-			*********-********-********-********-********-*********/
-    
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-		switch (minCas)
-		{
-			case DDR2_CL_3: 
-					/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE) 		
-					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
-				break;
-			case DDR2_CL_4: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE) 		
-					dunitCtrlLow |= 0x6 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;	
-				break;
-			default:
-				mvOsPrintf("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", 
-						   minCas);
-				return -1;
-		}
-	}
-	else    /* DDR1 */
-	{
-		switch (minCas)
-		{
-			case DDR1_CL_1_5: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x3 << SDRAM_ST_BURST_DEL_OFFS;
-				break;
-			case DDR1_CL_2: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x3 << SDRAM_ST_BURST_DEL_OFFS;
-				break;
-			case DDR1_CL_2_5: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;	
-				break;
-			case DDR1_CL_3: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x4 << SDRAM_ST_BURST_DEL_OFFS;	
-				break;
-			case DDR1_CL_4: 
-				/* registerd DDR SDRAM? */
-				if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-					dunitCtrlLow |= 0x6 << SDRAM_ST_BURST_DEL_OFFS;
-				else
-					dunitCtrlLow |= 0x5 << SDRAM_ST_BURST_DEL_OFFS;	
-				break;
-			default:
-				mvOsPrintf("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", 
-						   minCas);
-				return -1;
-	}
-	
-	}
-	DB(mvOsPrintf("Dram: Reg dunit control low = %x\n", dunitCtrlLow ));
-
-	return dunitCtrlLow;
-}  
-                                                                    
-/*******************************************************************************
-* sdramAddrCtrlRegCalc - Calculate sdram address control register
-*
-* DESCRIPTION: Calculate sdram address control register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram address control reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo)
-{
-	MV_U32 addrCtrl = 0;
-	
-	/* Set Address Control register static configuration bits */
-	addrCtrl = MV_REG_READ(SDRAM_ADDR_CTRL_REG);
-	
-	/* Set address control default value */
-	addrCtrl |= SDRAM_ADDR_CTRL_DV;  
-	
-	/* Clear DSize field */
-	addrCtrl &= ~SDRAM_DSIZE_MASK;
-	
-	/* Note that density is in MB units */
-	switch (pBankInfo->deviceDensity) 
-	{
-		case 128:                 /* 128 Mbit */
-			DB(mvOsPrintf("DRAM Device Density 128Mbit\n"));
-			addrCtrl |= SDRAM_DSIZE_128Mb;
-			break;
-		case 256:                 /* 256 Mbit */
-			DB(mvOsPrintf("DRAM Device Density 256Mbit\n"));
-			addrCtrl |= SDRAM_DSIZE_256Mb;
-			break;
-		case 512:                /* 512 Mbit */
-			DB(mvOsPrintf("DRAM Device Density 512Mbit\n"));
-			addrCtrl |= SDRAM_DSIZE_512Mb;
-			break;
-		default:
-			mvOsPrintf("Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
-                       pBankInfo->deviceDensity);
-			return -1;
-	}
-     
-	/* SDRAM address control */
-	DB(mvOsPrintf("Dram: setting sdram address control with: %x \n", addrCtrl));
-
-	return addrCtrl;
-}
-
-/*******************************************************************************
-* sdramTimeCtrlLowRegCalc - Calculate sdram timing control low register
-*
-* DESCRIPTION: 
-*       This function calculates sdram timing control low register 
-*       optimized value based on the bank info parameters and the minCas.
-*
-* INPUT:
-*	    pBankInfo - sdram bank parameters
-*       busClk    - Bus clock
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram timinf control low reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
-                                                MV_U32 minCas, MV_U32 busClk)
-{
-	MV_U32 tRp  = 0;
-	MV_U32 tRrd = 0;
-	MV_U32 tRcd = 0;
-	MV_U32 tRas = 0;
-	MV_U32 tWr  = 0;
-	MV_U32 tWtr = 0;
-	MV_U32 tRtp = 0;
-	
-	MV_U32 bankNum;
-	
-	busClk = busClk / 1000000;    /* In MHz */
-	
-	/* Scan all DRAM banks to find maximum timing values */
-	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		tRp  = MV_MAX(tRp,  pBankInfo[bankNum].minRowPrechargeTime);
-		tRrd = MV_MAX(tRrd, pBankInfo[bankNum].minRowActiveToRowActive);
-		tRcd = MV_MAX(tRcd, pBankInfo[bankNum].minRasToCasDelay);
-		tRas = MV_MAX(tRas, pBankInfo[bankNum].minRasPulseWidth);
-	}
-	
-	/* Extract timing (in ns) from SPD value. We ignore the tenth ns part.  */
-	/* by shifting the data two bits right.                                 */
-	tRp  = tRp  >> 2;    /* For example 0x50 -> 20ns                        */
-	tRrd = tRrd >> 2;
-	tRcd = tRcd >> 2;
-	
-	/* Extract clock cycles from time parameter. We need to round up        */
-	tRp  = ((busClk * tRp)  / 1000) + (((busClk * tRp)  % 1000) ? 1 : 0);
-	/* Micron work around for 133MHz */
-	if (busClk == 133)
-		tRp += 1;
-	DB(mvOsPrintf("Dram  Timing Low: tRp = %d ", tRp));
-	tRrd = ((busClk * tRrd) / 1000) + (((busClk * tRrd) % 1000) ? 1 : 0);
-	/* JEDEC min reqeirments tRrd = 2 */
-	if (tRrd < 2)
-		tRrd = 2;
-	DB(mvOsPrintf("tRrd = %d ", tRrd));
-	tRcd = ((busClk * tRcd) / 1000) + (((busClk * tRcd) % 1000) ? 1 : 0);
-	DB(mvOsPrintf("tRcd = %d ", tRcd));
-	tRas = ((busClk * tRas) / 1000) + (((busClk * tRas) % 1000) ? 1 : 0);
-	DB(mvOsPrintf("tRas = %d ", tRas));
-	
-	/* tWr and tWtr is different for DDR1 and DDR2. tRtp is only for DDR2   */
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-		/* Scan all DRAM banks to find maximum timing values */
-		for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-		{
-			tWr  = MV_MAX(tWr,  pBankInfo[bankNum].minWriteRecoveryTime);
-			tWtr = MV_MAX(tWtr, pBankInfo[bankNum].minWriteToReadCmdDelay);
-			tRtp = MV_MAX(tRtp, pBankInfo[bankNum].minReadToPrechCmdDelay);
-		}
-		
-		/* Extract timing (in ns) from SPD value. We ignore the tenth ns    */
-		/* part by shifting the data two bits right.                        */
-		tWr  = tWr  >> 2;    /* For example 0x50 -> 20ns                    */
-		tWtr = tWtr >> 2;
-		tRtp = tRtp >> 2;
-	
-		/* Extract clock cycles from time parameter. We need to round up    */
-		tWr  = ((busClk * tWr)  / 1000) + (((busClk * tWr)  % 1000) ? 1 : 0);
-		DB(mvOsPrintf("tWr = %d ", tWr));
-		tWtr = ((busClk * tWtr) / 1000) + (((busClk * tWtr) % 1000) ? 1 : 0);
-		/* JEDEC min reqeirments tWtr = 2 */
-		if (tWtr < 2)
-			tWtr = 2;
-		DB(mvOsPrintf("tWtr = %d ", tWtr));
-		tRtp = ((busClk * tRtp) / 1000) + (((busClk * tRtp) % 1000) ? 1 : 0);
-		/* JEDEC min reqeirments tRtp = 2 */
-		if (tRtp < 2)
-			tRtp = 2;
-		DB(mvOsPrintf("tRtp = %d ", tRtp));
-	}
-	else
-	{    
-		tWr  = ((busClk*SDRAM_TWR) / 1000) + (((busClk*SDRAM_TWR) % 1000)?1:0);
-		
-		if ((200 == busClk) || ((100 == busClk) && (DDR1_CL_1_5 == minCas)))
-		{
-			tWtr = 2;
-		}
-		else
-		{
-			tWtr = 1;
-		}
-		
-		tRtp = 2; /* Must be set to 0x1 (two cycles) when using DDR1 */
-	}
-	
-	DB(mvOsPrintf("tWtr = %d\n", tWtr));
-	
-	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
-	return (((tRp  - 1) << SDRAM_TRP_OFFS)	|
-			((tRrd - 1) << SDRAM_TRRD_OFFS)	|
-			((tRcd - 1) << SDRAM_TRCD_OFFS)	|
-			((tRas - 1) << SDRAM_TRAS_OFFS)	|
-			((tWr  - 1) << SDRAM_TWR_OFFS)	|
-			((tWtr - 1) << SDRAM_TWTR_OFFS)	|
-			((tRtp - 1) << SDRAM_TRTP_OFFS));
-}
-
-/*******************************************************************************
-* sdramTimeCtrlHighRegCalc - Calculate sdram timing control high register
-*
-* DESCRIPTION: 
-*       This function calculates sdram timing control high register 
-*       optimized value based on the bank info parameters and the bus clock.
-*
-* INPUT:
-*	    pBankInfo - sdram bank parameters
-*       busClk    - Bus clock
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram timinf control high reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, 
-                                                                MV_U32 busClk)
-{
-	MV_U32 tRfc;
-	MV_U32 timeNs = 0;
-	int bankNum;
-	MV_U32 sdramTw2wCyc = 0;
-	
-	busClk = busClk / 1000000;    /* In MHz */
-	
-	/* tRfc is different for DDR1 and DDR2. */
-	if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_DTYPE_DDR2)
-	{
-		MV_U32 bankNum;
-	
-		/* Scan all DRAM banks to find maximum timing values */
-		for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-			timeNs = MV_MAX(timeNs,  pBankInfo[bankNum].minRefreshToActiveCmd);
-	}
-	else
-	{
-		if (pBankInfo[0].deviceDensity == _1G)
-		{
-			timeNs = SDRAM_TRFC_1G;
-		}
-		else
-		{
-			if (200 == busClk)
-			{
-				timeNs = SDRAM_TRFC_64_512M_AT_200MHZ;
-			}
-			else
-			{
-				timeNs = SDRAM_TRFC_64_512M;
-			}
-		}
-	}
-	
-	tRfc = ((busClk * timeNs)  / 1000) + (((busClk * timeNs)  % 1000) ? 1 : 0);
-	
-	DB(mvOsPrintf("Dram  Timing High: tRfc = %d\n", tRfc));
-
-	
-	/* Represent the populate banks in binary form */
-	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		if (0 != pBankInfo[bankNum].size)
-			sdramTw2wCyc++;
-	}
-
-	/* If we have more the 1 bank then we need the TW2W in 1 for ODT switch */	
-	if (sdramTw2wCyc > 1)
-		sdramTw2wCyc = 1;
-	else
-		sdramTw2wCyc = 0;
-
-	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
-	return ((((tRfc - 1) & SDRAM_TRFC_MASK)	<< SDRAM_TRFC_OFFS)		|
-			((SDRAM_TR2R_CYC - 1)			<< SDRAM_TR2R_OFFS)		|
-			((SDRAM_TR2WW2R_CYC - 1)		<< SDRAM_TR2W_W2R_OFFS)	|
-			(((tRfc - 1) >> 4)				<< SDRAM_TRFC_EXT_OFFS)	|
-			(sdramTw2wCyc					<< SDRAM_TW2W_OFFS));
-	
-}
-
-/*******************************************************************************
-* sdramDDr2OdtConfig - Set DRAM DDR2 On Die Termination registers.
-*
-* DESCRIPTION: 
-*       This function config DDR2 On Die Termination (ODT) registers.
-*	ODT configuration is done according to DIMM presence:
-*	
-*       Presence	  Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode  
-*	CS0	         0x84210000  0x00000000  0x0000780F  0x00000440 
-*	CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440 
-*	CS0+CS2	    	 0x030C030C  0x00000000  0x0000740F  0x00000404 
-*	CS0+CS1+CS2	 0x030C030C  0x00000000  0x0000740F  0x00000404 
-*	CS0+CS2+CS3	 0x030C030C  0x00000000  0x0000740F  0x00000404 
-*	CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404 
-*		
-* INPUT:
-*		pBankInfo - bank info parameters.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       None
-*******************************************************************************/
-static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo)
-{
-	MV_U32 populateBanks = 0;
-	MV_U32 odtCtrlLow, odtCtrlHigh, dunitOdtCtrl;
-	int bankNum;
-	
-	/* Represent the populate banks in binary form */
-	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		if (0 != pBankInfo[bankNum].size)
-		{
-				populateBanks |= (1 << bankNum);
-			}
-		}
-	
-	switch(populateBanks)
-	{
-		case(BANK_PRESENT_CS0):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS1):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS2):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS1_CS2):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS2_CS3):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS2_CS3_CS4):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS2_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS2_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV;
-			break;
-		default:
-			mvOsPrintf("sdramDDr2OdtConfig: Invalid DRAM bank presence\n");
-			return;
-	} 
-	MV_REG_WRITE(DRAM_BUF_REG7, odtCtrlLow);
-	MV_REG_WRITE(DRAM_BUF_REG8, odtCtrlHigh);
-	MV_REG_WRITE(DRAM_BUF_REG9, dunitOdtCtrl);
-	return;
-}
-#endif /* defined(MV_INC_BOARD_DDIM) */
-
-/*******************************************************************************
-* mvDramIfWinSet - Set DRAM interface address decode window
-*
-* DESCRIPTION: 
-*       This function sets DRAM interface address decode window.
-*
-* INPUT:
-*	    target      - System target. Use only SDRAM targets.
-*       pAddrDecWin - SDRAM address window structure.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
-*       otherwise.
-*******************************************************************************/
-MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
-{
-	MV_U32 baseReg=0,sizeReg=0;
-	MV_U32 baseToReg=0 , sizeToReg=0;
-
-    /* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinSet: target %d is not SDRAM\n", target);
-		return MV_BAD_PARAM;
-	}
-
-    /* Check if the requested window overlaps with current enabled windows	*/
-    if (MV_TRUE == sdramIfWinOverlap(target, &pAddrDecWin->addrWin))
-	{
-        mvOsPrintf("mvDramIfWinSet: ERR. Target %d overlaps\n", target);
-		return MV_BAD_PARAM;
-	}
-
-	/* check if address is aligned to the size */
-	if(MV_IS_NOT_ALIGN(pAddrDecWin->addrWin.baseLow, pAddrDecWin->addrWin.size))
-	{
-		mvOsPrintf("mvDramIfWinSet:Error setting DRAM interface window %d."\
-				   "\nAddress 0x%08x is unaligned to size 0x%x.\n",
-                   target, 
-				   pAddrDecWin->addrWin.baseLow,
-				   pAddrDecWin->addrWin.size);
-		return MV_ERROR;
-	}
-
-	/* read base register*/
-	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(target));
-
-	/* read size register */
-	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(target));
-
-	/* BaseLow[31:16] => base register [31:16]		*/
-	baseToReg = pAddrDecWin->addrWin.baseLow & SCBAR_BASE_MASK;
-
-	/* Write to address decode Base Address Register                  */
-	baseReg &= ~SCBAR_BASE_MASK;
-	baseReg |= baseToReg;
-
-	/* Translate the given window size to register format			*/
-	sizeToReg = ctrlSizeToReg(pAddrDecWin->addrWin.size, SCSR_SIZE_ALIGNMENT);
-
-	/* Size parameter validity check.                                   */
-	if (-1 == sizeToReg)
-	{
-		mvOsPrintf("mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n",target);
-		return MV_BAD_PARAM;
-	}
-
-	/* set size */
-	sizeReg &= ~SCSR_SIZE_MASK;
-	/* Size is located at upper 16 bits */
-	sizeReg |= (sizeToReg << SCSR_SIZE_OFFS);
-
-	/* enable/Disable */
-	if (MV_TRUE == pAddrDecWin->enable)
-	{
-		sizeReg |= SCSR_WIN_EN;
-	}
-	else
-	{
-		sizeReg &= ~SCSR_WIN_EN;
-	}
-
-	/* 3) Write to address decode Base Address Register                   */
-	MV_REG_WRITE(SDRAM_BASE_ADDR_REG(target), baseReg);
-
-	/* Write to address decode Size Register                        	*/
-	MV_REG_WRITE(SDRAM_SIZE_REG(target), sizeReg);
-	
-	return MV_OK;
-}
-/*******************************************************************************
-* mvDramIfWinGet - Get DRAM interface address decode window
-*
-* DESCRIPTION: 
-*       This function gets DRAM interface address decode window.
-*
-* INPUT:
-*	    target - System target. Use only SDRAM targets.
-*
-* OUTPUT:
-*       pAddrDecWin - SDRAM address window structure.
-*
-* RETURN:
-*       MV_BAD_PARAM if parameters are invalid or window is invalid, MV_OK
-*       otherwise.
-*******************************************************************************/
-MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin)
-{
-	MV_U32 baseReg,sizeReg;
-	MV_U32 sizeRegVal;
-
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinGet: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	/* Read base and size registers */
-	sizeReg = MV_REG_READ(SDRAM_SIZE_REG(target));
-	baseReg = MV_REG_READ(SDRAM_BASE_ADDR_REG(target));
-
-	sizeRegVal = (sizeReg & SCSR_SIZE_MASK) >> SCSR_SIZE_OFFS;
-
-	pAddrDecWin->addrWin.size = ctrlRegToSize(sizeRegVal,
-											 SCSR_SIZE_ALIGNMENT);
-
-    /* Check if ctrlRegToSize returned OK */
-	if (-1 == pAddrDecWin->addrWin.size)
-	{
-		mvOsPrintf("mvDramIfWinGet: size of target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	/* Extract base address						*/
-	/* Base register [31:16] ==> baseLow[31:16] 		*/
-	pAddrDecWin->addrWin.baseLow = baseReg & SCBAR_BASE_MASK;
-
-	pAddrDecWin->addrWin.baseHigh =  0;
-
-
-	if (sizeReg & SCSR_WIN_EN)
-	{
-		pAddrDecWin->enable = MV_TRUE;
-	}
-	else
-	{
-		pAddrDecWin->enable = MV_FALSE;			
-	}
-
-	return MV_OK;
-}
-/*******************************************************************************
-* mvDramIfWinEnable - Enable/Disable SDRAM address decode window
-*
-* DESCRIPTION: 
-*		This function enable/Disable SDRAM address decode window.
-*
-* INPUT:
-*	    target - System target. Use only SDRAM targets.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		MV_ERROR in case function parameter are invalid, MV_OK otherewise.
-*
-*******************************************************************************/
-MV_STATUS mvDramIfWinEnable(MV_TARGET target,MV_BOOL enable)
-{
-	MV_DRAM_DEC_WIN 	addrDecWin;
-
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(target))
-	{
-		mvOsPrintf("mvDramIfWinEnable: target %d is Illigal\n", target);
-		return MV_ERROR;
-	}
-
-	if (enable == MV_TRUE) 
-	{   /* First check for overlap with other enabled windows				*/
-		if (MV_OK != mvDramIfWinGet(target, &addrDecWin))
-		{
-			mvOsPrintf("mvDramIfWinEnable:ERR. Getting target %d failed.\n", 
-                                                                        target);
-			return MV_ERROR;
-		}
-		/* Check for overlapping */
-		if (MV_FALSE == sdramIfWinOverlap(target, &(addrDecWin.addrWin)))
-		{
-			/* No Overlap. Enable address decode winNum window              */
-			MV_REG_BIT_SET(SDRAM_SIZE_REG(target), SCSR_WIN_EN);
-		}
-		else
-		{   /* Overlap detected	*/
-			mvOsPrintf("mvDramIfWinEnable: ERR. Target %d overlap detect\n",
-                                                                        target);
-			return MV_ERROR;
-		}
-	}
-	else
-	{   /* Disable address decode winNum window                             */
-		MV_REG_BIT_RESET(SDRAM_SIZE_REG(target), SCSR_WIN_EN);
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* sdramIfWinOverlap - Check if an address window overlap an SDRAM address window
-*
-* DESCRIPTION:
-*		This function scan each SDRAM address decode window to test if it 
-*		overlapps the given address windoow 
-*
-* INPUT:
-*       target      - SDRAM target where the function skips checking.
-*       pAddrDecWin - The tested address window for overlapping with 
-*					  SDRAM windows.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if the given address window overlaps any enabled address
-*       decode map, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL sdramIfWinOverlap(MV_TARGET target, MV_ADDR_WIN *pAddrWin)
-{
-	MV_TARGET	targetNum;
-	MV_DRAM_DEC_WIN 	addrDecWin;
-	
-	for(targetNum = SDRAM_CS0; targetNum < MV_DRAM_MAX_CS ; targetNum++)
-	{
-		/* don't check our winNum or illegal targets */
-		if (targetNum == target)
-		{
-			continue;
-		}
-		
-		/* Get window parameters 	*/
-		if (MV_OK != mvDramIfWinGet(targetNum, &addrDecWin))
-		{
-			mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
-			return MV_ERROR;
-		}
-	
-		/* Do not check disabled windows	*/
-		if (MV_FALSE == addrDecWin.enable)
-		{
-			continue;
-		}
-	
-		if(MV_TRUE == ctrlWinOverlapTest(pAddrWin, &addrDecWin.addrWin))
-		{                    
-			mvOsPrintf(
-			"sdramIfWinOverlap: Required target %d overlap winNum %d\n", 
-			target, targetNum);
-			return MV_TRUE;           
-		}
-	}
-	
-	return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvDramIfBankSizeGet - Get DRAM interface bank size.
-*
-* DESCRIPTION:
-*       This function returns the size of a given DRAM bank.
-*
-* INPUT:
-*       bankNum - Bank number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM bank size. If bank is disabled the function return '0'. In case 
-*		or paramter is invalid, the function returns -1.
-*
-*******************************************************************************/
-MV_32 mvDramIfBankSizeGet(MV_U32 bankNum)
-{
-    MV_DRAM_DEC_WIN 	addrDecWin;
-	
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(bankNum))
-	{
-		mvOsPrintf("mvDramIfBankBaseGet: bankNum %d is invalid\n", bankNum);
-		return -1;
-	}
-	/* Get window parameters 	*/
-	if (MV_OK != mvDramIfWinGet(bankNum, &addrDecWin))
-	{
-		mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
-		return -1;
-	}
-	
-	if (MV_TRUE == addrDecWin.enable)
-	{
-		return addrDecWin.addrWin.size;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-
-/*******************************************************************************
-* mvDramIfSizeGet - Get DRAM interface total size.
-*
-* DESCRIPTION:
-*       This function get the DRAM total size.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM total size. In case or paramter is invalid, the function 
-*		returns -1.
-*
-*******************************************************************************/
-MV_32 mvDramIfSizeGet(MV_VOID)
-{
-	MV_U32 totalSize = 0, bankSize = 0, bankNum;
-	
-	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		bankSize = mvDramIfBankSizeGet(bankNum);
-
-		if (-1 == bankSize)
-		{
-			mvOsPrintf("Dram: mvDramIfSizeGet error with bank %d \n",bankNum);
-			return -1;
-		}
-		else
-		{
-			totalSize += bankSize;
-		}
-	}
-	
-	DB(mvOsPrintf("Dram: Total DRAM size is 0x%x \n",totalSize));
-	
-	return totalSize;
-}
-
-/*******************************************************************************
-* mvDramIfBankBaseGet - Get DRAM interface bank base.
-*
-* DESCRIPTION:
-*       This function returns the 32 bit base address of a given DRAM bank.
-*
-* INPUT:
-*       bankNum - Bank number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM bank size. If bank is disabled or paramter is invalid, the 
-*		function returns -1.
-*
-*******************************************************************************/
-MV_32 mvDramIfBankBaseGet(MV_U32 bankNum)
-{
-    MV_DRAM_DEC_WIN 	addrDecWin;
-	
-	/* Check parameters */
-	if (!MV_TARGET_IS_DRAM(bankNum))
-	{
-		mvOsPrintf("mvDramIfBankBaseGet: bankNum %d is invalid\n", bankNum);
-		return -1;
-	}
-	/* Get window parameters 	*/
-	if (MV_OK != mvDramIfWinGet(bankNum, &addrDecWin))
-	{
-		mvOsPrintf("sdramIfWinOverlap: ERR. TargetWinGet failed\n");
-		return -1;
-	}
-	
-	if (MV_TRUE == addrDecWin.enable)
-	{
-		return addrDecWin.addrWin.baseLow;
-	}
-	else
-	{
-		return -1;
-	}
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h
deleted file mode 100644
index 8bfa3e8838..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIf.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvDramIfh
-#define __INCmvDramIfh
-
-/* includes */
-#include "ddr1_2/mvDramIfRegs.h"
-#include "ddr1_2/mvDramIfConfig.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* defines  */
-/* DRAM Timing parameters */
-#define SDRAM_TWR                    15  /* ns tWr */
-#define SDRAM_TRFC_64_512M_AT_200MHZ 70  /* ns tRfc for dens 64-512 @ 200MHz */
-#define SDRAM_TRFC_64_512M           75  /* ns tRfc for dens 64-512          */
-#define SDRAM_TRFC_1G                120 /* ns tRfc for dens 1GB             */
-#define SDRAM_TR2R_CYC               1   /* cycle for tR2r                   */
-#define SDRAM_TR2WW2R_CYC            1   /* cycle for tR2wW2r                */
-
-/* typedefs */
-
-/* enumeration for memory types */
-typedef enum _mvMemoryType
-{
-    MEM_TYPE_SDRAM,
-    MEM_TYPE_DDR1,
-    MEM_TYPE_DDR2
-}MV_MEMORY_TYPE;
-
-/* enumeration for DDR1 supported CAS Latencies */
-typedef enum _mvDimmDdr1Cas
-{
-    DDR1_CL_1_5  = 0x02, 
-    DDR1_CL_2    = 0x04, 
-    DDR1_CL_2_5  = 0x08, 
-    DDR1_CL_3    = 0x10, 
-    DDR1_CL_4    = 0x40, 
-    DDR1_CL_FAULT
-} MV_DIMM_DDR1_CAS;
-
-/* enumeration for DDR2 supported CAS Latencies */
-typedef enum _mvDimmDdr2Cas
-{
-    DDR2_CL_3    = 0x08, 
-    DDR2_CL_4    = 0x10, 
-    DDR2_CL_5    = 0x20, 
-    DDR2_CL_FAULT
-} MV_DIMM_DDR2_CAS;
-
-
-typedef struct _mvDramBankInfo
-{
-    MV_MEMORY_TYPE  memoryType; 	/* DDR1, DDR2 or SDRAM */
-
-    /* DIMM dimensions */
-    MV_U32  numOfRowAddr;
-    MV_U32  numOfColAddr;
-    MV_U32  dataWidth;
-    MV_U32  errorCheckType;             /* ECC , PARITY..*/
-    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
-    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
-    MV_U32  burstLengthSupported;
-    MV_U32  numOfBanksOnEachDevice;
-    MV_U32  suportedCasLatencies;
-    MV_U32  refreshInterval;
-
-    /* DIMM timing parameters */
-    MV_U32  minCycleTimeAtMaxCasLatPs;	
-    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
-    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
-	MV_U32  minRowPrechargeTime;
-	MV_U32  minRowActiveToRowActive;
-	MV_U32  minRasToCasDelay;
-	MV_U32  minRasPulseWidth;
-    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
-    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
-    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
-    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
-                      
-    /* Parameters calculated from the extracted DIMM information */
-    MV_U32  size;
-    MV_U32  deviceDensity;           	/* 16,64,128,256 or 512 Mbit */
-    MV_U32  numberOfDevices;
-
-    /* DIMM attributes (MV_TRUE for yes) */
-    MV_BOOL registeredAddrAndControlInputs;
-     
-}MV_DRAM_BANK_INFO;
-
-/* This structure describes CPU interface address decode window               */
-typedef struct _mvDramIfDecWin 
-{
-	MV_ADDR_WIN   addrWin;    /* An address window*/
-	MV_BOOL       enable;     /* Address decode window is enabled/disabled    */
-}MV_DRAM_DEC_WIN;
-
-#include "ddr1_2/mvDram.h"
-
-/* mvDramIf.h API list */
-MV_VOID   mvDramIfBasicAsmInit(MV_VOID);
-MV_STATUS mvDramIfDetect(MV_U32 forcedCl);
-MV_VOID   _mvDramIfConfig(MV_VOID);
-
-MV_STATUS mvDramIfWinSet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvDramIfWinGet(MV_TARGET target, MV_DRAM_DEC_WIN *pAddrDecWin);
-MV_STATUS mvDramIfWinEnable(MV_TARGET target,MV_BOOL enable);
-MV_32 mvDramIfBankSizeGet(MV_U32 bankNum);
-MV_32 mvDramIfBankBaseGet(MV_U32 bankNum);
-MV_32 mvDramIfSizeGet(MV_VOID);
-
-#if 0
-MV_STATUS mvDramIfMbusCtrlSet(MV_XBAR_TARGET *pPizzaArbArray);
-MV_STATUS mvDramIfMbusToutSet(MV_U32 timeout, MV_BOOL enable);
-#endif
-
-#endif /* __INCmvDramIfh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h
deleted file mode 100644
index a7c66444ac..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfConfig.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvDramIfConfigh
-#define __INCmvDramIfConfigh
-
-/* includes */
-
-/* defines  */
-
-/* registers defaults values */
-
-#define SDRAM_CONFIG_DV 				\
-		(SDRAM_PERR_WRITE			|	\
-		 SDRAM_SRMODE				|	\
-		 SDRAM_SRCLK_GATED)
-
-#define SDRAM_DUNIT_CTRL_LOW_DV			\
-		(SDRAM_CTRL_POS_RISE		|	\
-		 SDRAM_CLK1DRV_NORMAL		|	\
-		 SDRAM_LOCKEN_ENABLE)
-
-#define SDRAM_ADDR_CTRL_DV	    0
-		
-#define SDRAM_TIMING_CTRL_LOW_REG_DV 	\
-		((0x2 << SDRAM_TRCD_OFFS)	|	\
-		 (0x2 << SDRAM_TRP_OFFS)	|	\
-		 (0x1 << SDRAM_TWR_OFFS)	|	\
-		 (0x0 << SDRAM_TWTR_OFFS)	|	\
-		 (0x5 << SDRAM_TRAS_OFFS)	|	\
-		 (0x1 << SDRAM_TRRD_OFFS))
-/* TRFC 0x27, TW2W 0x1 */
-#define SDRAM_TIMING_CTRL_HIGH_REG_DV	(( 0x7 << SDRAM_TRFC_OFFS )	|\
-					( 0x2 << SDRAM_TRFC_EXT_OFFS)	|\
-					( 0x1 << SDRAM_TW2W_OFFS))
-
-#define SDRAM_OPEN_PAGES_CTRL_REG_DV	SDRAM_OPEN_PAGE_EN	
-
-/* DDR2 ODT default register values */
-
-/* Presence	     Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode     */
-/*	CS0	         0x84210000  0x00000000  0x0000780F  0x00000440 */
-/*	CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440 */
-/*	CS0+CS2	    	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
-/*	CS0+CS1+CS2	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
-/*	CS0+CS2+CS3	 0x030C030C  0x00000000  0x0000740F  0x00000404 */
-/*	CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404 */
-
-#define DDR2_ODT_CTRL_LOW_CS0_DV	0x84210000
-#define DDR2_ODT_CTRL_HIGH_CS0_DV	0x00000000
-#define DDR2_DUNIT_ODT_CTRL_CS0_DV	0x0000780F
-#define DDR_SDRAM_EXT_MODE_CS0_DV	0x00000440
-
-#define DDR2_ODT_CTRL_LOW_CS0_CS2_DV	0x030C030C
-#define DDR2_ODT_CTRL_HIGH_CS0_CS2_DV	0x00000000
-#define DDR2_DUNIT_ODT_CTRL_CS0_CS2_DV	0x0000740F
-#define DDR_SDRAM_EXT_MODE_CS0_CS2_DV	0x00000404
-
-
-/* DDR SDRAM Adderss/Control and Data Pads Calibration default values */
-#define DDR1_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
-		(1 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-#define DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
-		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-		
-		
-#define DDR1_DATA_PAD_STRENGTH_TYPICAL_DV		\
-		(1 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-#define DDR2_DATA_PAD_STRENGTH_TYPICAL_DV		\
-		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-
-/* DDR SDRAM Mode Register default value */
-#define DDR1_MODE_REG_DV			0x00000000
-#define DDR2_MODE_REG_DV			0x00000400
-
-/* DDR SDRAM Timing parameter default values */
-#define DDR1_TIMING_LOW_DV           0x11602220
-#define DDR1_TIMING_HIGH_DV          0x0000000d
-
-#define DDR2_TIMING_LOW_DV           0x11812220
-#define DDR2_TIMING_HIGH_DV          0x0000030f
-
-/* For Guideline (GL# MEM-4) DQS Reference Delay Tuning */
-#define FTDLL_DDR1_166MHZ           ((0x1 << 0)    | \
-                                     (0x7F<< 12)   | \
-                                     (0x1 << 22))
-
-#define FTDLL_DDR1_133MHZ           FTDLL_DDR1_166MHZ
-
-#define FTDLL_DDR1_200MHZ           ((0x1 << 0)    | \
-                                     (0x1 << 12)   | \
-                                     (0x3 << 14)   | \
-                                     (0x1 << 18)   | \
-                                     (0x1 << 22))
-
-
-#define FTDLL_DDR2_166MHZ           ((0x1 << 0)    | \
-                                     (0x1 << 12)   | \
-                                     (0x1 << 14)   | \
-                                     (0x1 << 16)   | \
-                                     (0x1 << 19)   | \
-                                     (0xF << 20))
-
-#define FTDLL_DDR2_133MHZ           FTDLL_DDR2_166MHZ
-
-#define FTDLL_DDR2_200MHZ           ((0x1 << 0)    | \
-                                     (0x1 << 12)   | \
-                                     (0x1 << 14)   | \
-                                     (0x1 << 16)   | \
-                                     (0x1 << 19)   | \
-                                     (0xF << 20))
-
-#define FTDLL_DDR2_250MHZ            0x445001
-
-/* Orion 1 B1 and above */
-#define FTDLL_DDR1_166MHZ_5181_B1    0x45D001
-
-/* Orion nas */
-#define FTDLL_DDR2_166MHZ_5182       0x597001
-
-/* Orion 2 D0 and above */
-#define FTDLL_DDR1_166MHZ_5281_D0    0x8D0001
-#define FTDLL_DDR1_200MHZ_5281_D0    0x8D0001
-#define FTDLL_DDR2_166MHZ_5281_D0    0x485001
-#define FTDLL_DDR2_200MHZ_5281_D0    0x485001
-#define FTDLL_DDR2_250MHZ_5281_D0    0x445001
-#define FTDLL_DDR2_200MHZ_5281_D1    0x995001
-#define FTDLL_DDR2_250MHZ_5281_D1    0x984801
-
-#endif /* __INCmvDramIfh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h
deleted file mode 100644
index e9cd7c4e5d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr1_2/mvDramIfRegs.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDramIfRegsh
-#define __INCmvDramIfRegsh
-
-
-/* DDR SDRAM Controller Address Decode Registers */
-/* SDRAM CSn Base Address Register (SCBAR) */
-#define SDRAM_BASE_ADDR_REG(csNum)	(0x1500 + (csNum * 8))
-#define SCBAR_BASE_OFFS				16 
-#define SCBAR_BASE_MASK				(0xffff << SCBAR_BASE_OFFS)
-#define SCBAR_BASE_ALIGNMENT		0x10000 
-
-/* SDRAM CSn Size Register (SCSR) */		  
-#define SDRAM_SIZE_REG(csNum)	(0x1504 + (csNum * 8))
-#define SCSR_WIN_EN					BIT0
-#define SCSR_SIZE_OFFS				16
-#define SCSR_SIZE_MASK				(0xffff << SCSR_SIZE_OFFS)
-#define SCSR_SIZE_ALIGNMENT			0x10000
-
-/* configuration register */
-#define SDRAM_CONFIG_REG   		0x1400
-#define SDRAM_REFRESH_OFFS 		0
-#define SDRAM_REFRESH_MAX  		0x3000
-#define SDRAM_REFRESH_MASK 		(SDRAM_REFRESH_MAX << SDRAM_REFRESH_OFFS)
-#define SDRAM_DWIDTH_OFFS       14
-#define SDRAM_DWIDTH_MASK       (3 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_DWIDTH_16BIT      (1 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_DWIDTH_32BIT      (2 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_DTYPE_OFFS        16
-#define SDRAM_DTYPE_MASK        (1 << SDRAM_DTYPE_OFFS)
-#define SDRAM_DTYPE_DDR1        (0 << SDRAM_DTYPE_OFFS)
-#define SDRAM_DTYPE_DDR2        (1 << SDRAM_DTYPE_OFFS)
-#define SDRAM_REGISTERED   		(1 << 17)
-#define SDRAM_PERR_OFFS    		18
-#define SDRAM_PERR_MASK    		(1 << SDRAM_PERR_OFFS)
-#define SDRAM_PERR_NO_WRITE     (0 << SDRAM_PERR_OFFS)
-#define SDRAM_PERR_WRITE        (1 << SDRAM_PERR_OFFS)
-#define SDRAM_DCFG_OFFS     	20
-#define SDRAM_DCFG_MASK     	(0x3 << SDRAM_DCFG_OFFS)
-#define SDRAM_DCFG_X16_DEV   	(1 << SDRAM_DCFG_OFFS)
-#define SDRAM_DCFG_X8_DEV   	(2 << SDRAM_DCFG_OFFS)
-#define SDRAM_SRMODE			(1 << 24)
-#define SDRAM_SRCLK_OFFS		25
-#define SDRAM_SRCLK_MASK		(1 << SDRAM_SRCLK_OFFS)
-#define SDRAM_SRCLK_KEPT		(0 << SDRAM_SRCLK_OFFS)
-#define SDRAM_SRCLK_GATED		(1 << SDRAM_SRCLK_OFFS)
-#define SDRAM_CATTH_OFFS		26
-#define SDRAM_CATTHR_EN			(1 << SDRAM_CATTH_OFFS)
-
-
-/* dunit control register */
-#define SDRAM_DUNIT_CTRL_REG  	0x1404
-#define SDRAM_CTRL_POS_OFFS	   	6
-#define SDRAM_CTRL_POS_FALL	   	(0 << SDRAM_CTRL_POS_OFFS)
-#define SDRAM_CTRL_POS_RISE	   	(1 << SDRAM_CTRL_POS_OFFS)
-#define SDRAM_CLK1DRV_OFFS      12
-#define SDRAM_CLK1DRV_MASK      (1 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_CLK1DRV_HIGH_Z    (0 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_CLK1DRV_NORMAL    (1 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_LOCKEN_OFFS       18
-#define SDRAM_LOCKEN_MASK       (1 << SDRAM_LOCKEN_OFFS)
-#define SDRAM_LOCKEN_DISABLE    (0 << SDRAM_LOCKEN_OFFS)
-#define SDRAM_LOCKEN_ENABLE     (1 << SDRAM_LOCKEN_OFFS)
-#define SDRAM_ST_BURST_DEL_OFFS 	24
-#define SDRAM_ST_BURST_DEL_MAX 	0xf
-#define SDRAM_ST_BURST_DEL_MASK (SDRAM_ST_BURST_DEL_MAX<<SDRAM_ST_BURST_DEL_OFFS)
-
-/* sdram timing control low register */
-#define SDRAM_TIMING_CTRL_LOW_REG	0x1408
-#define SDRAM_TRCD_OFFS 		4
-#define SDRAM_TRCD_MASK 		(0xF << SDRAM_TRCD_OFFS)
-#define SDRAM_TRP_OFFS 			8
-#define SDRAM_TRP_MASK 			(0xF << SDRAM_TRP_OFFS)
-#define SDRAM_TWR_OFFS 			12
-#define SDRAM_TWR_MASK 			(0xF << SDRAM_TWR_OFFS)
-#define SDRAM_TWTR_OFFS 		16
-#define SDRAM_TWTR_MASK 		(0xF << SDRAM_TWTR_OFFS)
-#define SDRAM_TRAS_OFFS 		20
-#define SDRAM_TRAS_MASK 		(0xF << SDRAM_TRAS_OFFS)
-#define SDRAM_TRRD_OFFS 		24
-#define SDRAM_TRRD_MASK 		(0xF << SDRAM_TRRD_OFFS)
-#define SDRAM_TRTP_OFFS 		28
-#define SDRAM_TRTP_MASK 		(0xF << SDRAM_TRTP_OFFS)
-
-/* sdram timing control high register */
-#define SDRAM_TIMING_CTRL_HIGH_REG	0x140c
-#define SDRAM_TRFC_OFFS 		0
-#define SDRAM_TRFC_MASK 		(0xF << SDRAM_TRFC_OFFS)
-#define SDRAM_TR2R_OFFS 		4
-#define SDRAM_TR2R_MASK 		(0x3 << SDRAM_TR2R_OFFS)
-#define SDRAM_TR2W_W2R_OFFS 		6
-#define SDRAM_TR2W_W2R_MASK 		(0x3 << SDRAM_TR2W_W2R_OFFS)
-#define SDRAM_TRFC_EXT_OFFS		8
-#define SDRAM_TRFC_EXT_MASK		(0x1 << SDRAM_TRFC_EXT_OFFS)
-#define SDRAM_TW2W_OFFS		    10
-#define SDRAM_TW2W_MASK		    (0x1 << SDRAM_TW2W_OFFS)
-
-/* address control register */
-#define SDRAM_ADDR_CTRL_REG		0x1410
-#define SDRAM_DSIZE_OFFS   	    4
-#define SDRAM_DSIZE_MASK   	    (0x3 << SDRAM_DSIZE_OFFS)
-#define SDRAM_DSIZE_128Mb 	    (0x0 << SDRAM_DSIZE_OFFS)
-#define SDRAM_DSIZE_256Mb 	    (0x1 << SDRAM_DSIZE_OFFS)
-#define SDRAM_DSIZE_512Mb  	    (0x2 << SDRAM_DSIZE_OFFS)
-
-/* SDRAM Open Pages Control registers */
-#define SDRAM_OPEN_PAGE_CTRL_REG	0x1414
-#define SDRAM_OPEN_PAGE_EN		    (0 << 0)
-#define SDRAM_OPEN_PAGE_DIS		    (1 << 0)
-
-/* sdram opertion register */
-#define SDRAM_OPERATION_REG 	0x1418
-#define SDRAM_CMD_OFFS  		0
-#define SDRAM_CMD_MASK   		(0x7 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_NORMAL 		(0x0 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_PRECHARGE_ALL (0x1 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_REFRESH_ALL 	(0x2 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_REG_SET_CMD 	(0x3 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EXT_MODE_SET 	(0x4 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_NOP 			(0x5 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_SLF_RFRSH 	(0x7 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EMRS2_CMD  	(0x8 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EMRS3_CMD  	(0x9 << SDRAM_CMD_OFFS)
-
-/* sdram mode register */
-#define SDRAM_MODE_REG 			0x141c
-#define SDRAM_BURST_LEN_OFFS 	0
-#define SDRAM_BURST_LEN_MASK 	(0x7 << SDRAM_BURST_LEN_OFFS)
-#define SDRAM_BURST_LEN_4    	(0x2 << SDRAM_BURST_LEN_OFFS)
-#define SDRAM_CL_OFFS   		4
-#define SDRAM_CL_MASK   		(0x7 << SDRAM_CL_OFFS)
-#define SDRAM_DDR1_CL_2	     	(0x2 << SDRAM_CL_OFFS)
-#define SDRAM_DDR1_CL_3      	(0x3 << SDRAM_CL_OFFS)
-#define SDRAM_DDR1_CL_4      	(0x4 << SDRAM_CL_OFFS)
-#define SDRAM_DDR1_CL_1_5    	(0x5 << SDRAM_CL_OFFS)
-#define SDRAM_DDR1_CL_2_5    	(0x6 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_3      	(0x3 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_4      	(0x4 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_5    		(0x5 << SDRAM_CL_OFFS)
-#define SDRAM_TM_OFFS           7
-#define SDRAM_TM_MASK           (1 << SDRAM_TM_OFFS)
-#define SDRAM_TM_NORMAL         (0 << SDRAM_TM_OFFS)
-#define SDRAM_TM_TEST_MODE      (1 << SDRAM_TM_OFFS)
-#define SDRAM_DLL_OFFS          8
-#define SDRAM_DLL_MASK          (1 << SDRAM_DLL_OFFS)
-#define SDRAM_DLL_NORMAL        (0 << SDRAM_DLL_OFFS)
-#define SDRAM_DLL_RESET 	(1 << SDRAM_DLL_OFFS)
-#define SDRAM_WR_OFFS		11
-#define SDRAM_WR_MAX		7
-#define SDRAM_WR_MASK		(SDRAM_WR_MAX << SDRAM_WR_OFFS)
-#define SDRAM_PD_OFFS		12
-#define SDRAM_PD_MASK		(1 << SDRAM_PD_OFFS) 
-#define SDRAM_PD_FAST_EXIT	(0 << SDRAM_PD_OFFS) 
-#define SDRAM_PD_SLOW_EXIT	(1 << SDRAM_PD_OFFS) 
-
-/* DDR SDRAM Extended Mode register (DSEMR) */
-#define SDRAM_EXTENDED_MODE_REG	0x1420
-#define DSEMR_DLL_ENABLE		(1 << 0)
-#define DSEMR_DS_OFFS			1
-#define DSEMR_DS_MASK			(1 << DSEMR_DS_OFFS)
-#define DSEMR_DS_NORMAL			(0 << DSEMR_DS_OFFS)
-#define DSEMR_DS_REDUCED		(1 << DSEMR_DS_OFFS)
-#define DSEMR_RTT0_OFFS			2
-#define DSEMR_RTT1_OFFS			6
-#define DSEMR_RTT_ODT_DISABLE	((0 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
-#define DSEMR_RTT_ODT_75_OHM	((1 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
-#define DSEMR_RTT_ODT_150_OHM	((0 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
-#define DSEMR_OCD_OFFS			7
-#define DSEMR_OCD_MASK			(0x7 << DSEMR_OCD_OFFS)
-#define DSEMR_OCD_EXIT_CALIB	(0 << DSEMR_OCD_OFFS)
-#define DSEMR_OCD_DRIVE1		(1 << DSEMR_OCD_OFFS)
-#define DSEMR_OCD_DRIVE0		(2 << DSEMR_OCD_OFFS)
-#define DSEMR_OCD_ADJUST_MODE	(4 << DSEMR_OCD_OFFS)
-#define DSEMR_OCD_CALIB_DEFAULT	(7 << DSEMR_OCD_OFFS)
-#define DSEMR_DQS_OFFS			10
-#define DSEMR_DQS_MASK			(1 << DSEMR_DQS_OFFS)
-#define DSEMR_DQS_DIFFERENTIAL	(0 << DSEMR_DQS_OFFS)
-#define DSEMR_DQS_SINGLE_ENDED	(0 << DSEMR_DQS_OFFS)
-#define DSEMR_RDQS_ENABLE		(1 << 11)
-#define DSEMR_QOFF_OUTPUT_BUFF_EN	(1 << 12)
-
-/* DDR SDRAM Operation Control Register */
-#define SDRAM_OPERATION_CTRL_REG	0x142c
-
-/* Dunit FTDLL Configuration Register */
-#define SDRAM_FTDLL_CONFIG_REG			0x1484
-  
-/* Pads Calibration register */
-#define SDRAM_ADDR_CTRL_PADS_CAL_REG	0x14c0
-#define SDRAM_DATA_PADS_CAL_REG		0x14c4
-#define SDRAM_DRVN_OFFS 				0
-#define SDRAM_DRVN_MASK 				(0x3F << SDRAM_DRVN_OFFS)
-#define SDRAM_DRVP_OFFS 				6
-#define SDRAM_DRVP_MASK 				(0x3F << SDRAM_DRVP_OFFS)
-#define SDRAM_PRE_DRIVER_STRENGTH_OFFS	12
-#define SDRAM_PRE_DRIVER_STRENGTH_MASK	(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-#define SDRAM_TUNE_EN   		BIT16
-#define SDRAM_LOCK_OFFS 		17
-#define SDRAM_LOCK_MAKS 		(0x1F << SDRAM_LOCK_OFFS)
-#define SDRAM_LOCKN_OFFS 		17
-#define SDRAM_LOCKN_MAKS 		(0x3F << SDRAM_LOCKN_OFFS)
-#define SDRAM_LOCKP_OFFS 		23
-#define SDRAM_LOCKP_MAKS 		(0x3F << SDRAM_LOCKP_OFFS)
-#define SDRAM_WR_EN     		(1 << 31)
-
-/* DDR2 SDRAM ODT Control (Low) Register (DSOCLR) */
-#define DDR2_SDRAM_ODT_CTRL_LOW_REG  0x1494
-#define DSOCLR_ODT_RD_OFFS(odtNum)   (odtNum * 4)
-#define DSOCLR_ODT_RD_MASK(odtNum)   (0xf << DSOCLR_ODT_RD_OFFS(odtNum))
-#define DSOCLR_ODT_RD(odtNum, bank)  ((1 << bank) << DSOCLR_ODT_RD_OFFS(odtNum))
-#define DSOCLR_ODT_WR_OFFS(odtNum)   (16 + (odtNum * 4))
-#define DSOCLR_ODT_WR_MASK(odtNum)   (0xf << DSOCLR_ODT_WR_OFFS(odtNum))
-#define DSOCLR_ODT_WD(odtNum, bank)  ((1 << bank) << DSOCLR_ODT_WR_OFFS(odtNum))
-
-/* DDR2 SDRAM ODT Control (High) Register (DSOCHR) */
-#define DDR2_SDRAM_ODT_CTRL_HIGH_REG    0x1498
-/* Optional control values to DSOCHR_ODT_EN macro */
-#define DDR2_ODT_CTRL_DUNIT         0
-#define DDR2_ODT_CTRL_NEVER         1
-#define DDR2_ODT_CTRL_ALWAYS        3
-#define DSOCHR_ODT_EN_OFFS(odtNum)  (odtNum * 2)
-#define DSOCHR_ODT_EN_MASK(odtNum)  (0x3 << DSOCHR_ODT_EN_OFFS(odtNum))
-#define DSOCHR_ODT_EN(odtNum, ctrl) ((1 << ctrl) << DSOCHR_ODT_RD_OFFS(odtNum))
-
-/* DDR2 Dunit ODT Control Register (DDOCR)*/
-#define DDR2_DUNIT_ODT_CONTROL_REG  0x149c
-#define DDOCR_ODT_RD_OFFS           0
-#define DDOCR_ODT_RD_MASK           (0xf << DDOCR_ODT_RD_OFFS)
-#define DDOCR_ODT_RD(bank)          ((1 << bank) << DDOCR_ODT_RD_OFFS)
-#define DDOCR_ODT_WR_OFFS           4
-#define DDOCR_ODT_WR_MASK           (0xf << DDOCR_ODT_WR_OFFS)
-#define DDOCR_ODT_WR(bank)          ((1 << bank) << DDOCR_ODT_WR_OFFS)
-#define DSOCR_ODT_EN_OFFS           8
-#define DSOCR_ODT_EN_MASK           (0x3 << DSOCR_ODT_EN_OFFS)
-#define DSOCR_ODT_EN(ctrl)          ((1 << ctrl) << DSOCR_ODT_EN_OFFS)
-#define DSOCR_ODT_SEL_OFFS          10
-#define DSOCR_ODT_SEL_MASK          (0x3 << DSOCR_ODT_SEL_OFFS)
-
-/* DDR SDRAM Initialization Control Register (DSICR) */
-#define DDR_SDRAM_INIT_CTRL_REG		0x1480
-#define DSICR_INIT_EN				(1 << 0)
-
-#endif /* __INCmvDramIfRegsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c
deleted file mode 100644
index a214c95cd1..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.c
+++ /dev/null
@@ -1,1855 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-/* includes */
-#include "ddr2/mvDramIf.h"
-#include "ctrlEnv/sys/mvCpuIf.h"
-
-#include "ddr2/mvDramIfStaticInit.h"
-
-/* #define MV_DEBUG */
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-/* DRAM bank presence encoding */
-#define BANK_PRESENT_CS0			    0x1
-#define BANK_PRESENT_CS0_CS1			0x3
-#define BANK_PRESENT_CS0_CS2			0x5
-#define BANK_PRESENT_CS0_CS1_CS2		0x7
-#define BANK_PRESENT_CS0_CS2_CS3		0xd
-#define BANK_PRESENT_CS0_CS2_CS3_CS4	0xf
-
-/* locals   */
-#ifndef MV_STATIC_DRAM_ON_BOARD
-static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32  busClk, MV_STATUS TTmode );
-static MV_U32 dunitCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32  busClk);
-static MV_U32 sdramModeRegCalc(MV_U32 minCas);
-static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
-static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfoDIMM1);
-static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk);
-static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk, MV_U32 forcedCl);
-static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32 busClk);
-static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk);
-static MV_U32 sdramDdr2TimeLoRegCalc(MV_U32 minCas);
-static MV_U32 sdramDdr2TimeHiRegCalc(MV_U32 minCas);
-#endif
-MV_32 DRAM_CS_Order[MV_DRAM_MAX_CS] = {N_A
-
-#ifdef MV_INCLUDE_SDRAM_CS1
-		,N_A
-#endif
-#ifdef MV_INCLUDE_SDRAM_CS2
-		,N_A
-#endif
-#ifdef MV_INCLUDE_SDRAM_CS3
-    ,N_A
-#endif
-	};
-/* Get DRAM size of CS num */
-MV_U32 mvDramCsSizeGet(MV_U32 csNum)
-{
-	MV_DRAM_BANK_INFO bankInfo;
-	MV_U32  size, deviceW, dimmW;
-#ifdef MV78XX0	
-	MV_U32  temp;
-#endif
-
-	if(MV_OK == mvDramBankInfoGet(csNum, &bankInfo))
-	{
-        	if (0 == bankInfo.size)
-			return 0;
-
-		/* Note that the Dimm width might be different then the device DRAM width */
-#ifdef MV78XX0	
-		temp = MV_REG_READ(SDRAM_CONFIG_REG);
-		deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_32BIT )? 32 : 64;
-#else
-		deviceW = 16 /* KW family */;
-#endif
-		dimmW = bankInfo.dataWidth - (bankInfo.dataWidth % 16);
-		size = ((bankInfo.size << 20) / (dimmW/deviceW)); 
-		return size;
-	}
-	else
-		return 0;
-}
-/*******************************************************************************
-* mvDramIfDetect - Prepare DRAM interface configuration values.
-*
-* DESCRIPTION:
-*       This function implements the full DRAM detection and timing 
-*       configuration for best system performance.
-*       Since this routine runs from a ROM device (Boot Flash), its stack 
-*       resides on RAM, that might be the system DRAM. Changing DRAM 
-*       configuration values while keeping vital data in DRAM is risky. That
-*       is why the function does not preform the configuration setting but 
-*       prepare those in predefined 32bit registers (in this case IDMA 
-*       registers are used) for other routine to perform the settings.
-*       The function will call for board DRAM SPD information for each DRAM 
-*       chip select. The function will then analyze those SPD parameters of 
-*       all DRAM banks in order to decide on DRAM configuration compatible 
-*       for all DRAM banks.
-*       The function will set the CPU DRAM address decode registers.
-*       Note: This routine prepares values that will overide configuration of
-*       mvDramBasicAsmInit().
-*       
-* INPUT:
-*       forcedCl - Forced CAL Latency. If equal to zero, do not force.
-*       eccDisable - Force down the ECC.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvDramIfDetect(MV_U32 forcedCl, MV_BOOL eccDisable)
-{
-	MV_32 	MV_DRAM_CS_order[MV_DRAM_MAX_CS] = {
-		SDRAM_CS0
-#ifdef MV_INCLUDE_SDRAM_CS1
-		,SDRAM_CS1
-#endif
-#ifdef MV_INCLUDE_SDRAM_CS2
-		,SDRAM_CS2
-#endif
-#ifdef MV_INCLUDE_SDRAM_CS3
-		,SDRAM_CS3
-#endif
-		};
-	MV_U32  busClk, deviceW, dimmW;
-	MV_U32 numOfAllDevices = 0;
-	MV_STATUS TTMode; 
-#ifndef MV_STATIC_DRAM_ON_BOARD
-	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
-	MV_U32  size, base = 0, i, j, temp, busClkPs;
-	MV_U8	minCas;
-	MV_CPU_DEC_WIN dramDecWin;
-	dramDecWin.addrWin.baseHigh = 0;
-#endif
-
-	busClk = mvBoardSysClkGet();
-
-	if (0 == busClk)
-	{
-		mvOsPrintf("Dram: ERR. Can't detect system clock! \n");
-		return MV_ERROR;
-	}
-	
-#ifndef MV_STATIC_DRAM_ON_BOARD
-
-	busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
-	/* we will use bank 0 as the representative of the all the DRAM banks,  */
-	/* since bank 0 must exist.                                             */	
-	for(i = 0; i < MV_DRAM_MAX_CS; i++)
-	{ 
-		/* if Bank exist */
-		if(MV_OK == mvDramBankInfoGet(i, &bankInfo[i]))
-		{
-			DB(mvOsPrintf("Dram: Find bank %d\n", i));
-			/* check it isn't SDRAM */
-			if(bankInfo[i].memoryType != MEM_TYPE_DDR2)
-			{
-				mvOsOutput("Dram: ERR. SDRAM type not supported !!!\n");
-				return MV_ERROR;
-			}
-
-            		/* All banks must support the Mclk freqency */
-			if(bankInfo[i].minCycleTimeAtMaxCasLatPs > busClkPs)
-			{
-				mvOsOutput("Dram: ERR. Bank %d doesn't support memory clock!!!\n", i);
-				return MV_ERROR;
-			}
-
-			/* All banks must support registry in order to activate it */
-			if(bankInfo[i].registeredAddrAndControlInputs != 
-			   bankInfo[0].registeredAddrAndControlInputs)
-			{
-				mvOsOutput("Dram: ERR. different Registered settings !!!\n");
-				return MV_ERROR;
-			}
-
-			/* All banks must support same ECC mode */
-			if(bankInfo[i].errorCheckType != 
-			   bankInfo[0].errorCheckType)
-			{
-				mvOsOutput("Dram: ERR. different ECC settings !!!\n");
-				return MV_ERROR;
-			}
-
-		}
-		else
-		{
-			if( i == 0 ) /* bank 0 doesn't exist */
-			{
-				mvOsOutput("Dram: ERR. Fail to detect bank 0 !!!\n");
-				return MV_ERROR;
-			}
-			else
-			{
-				DB(mvOsPrintf("Dram: Could not find bank %d\n", i));
-				bankInfo[i].size = 0;     /* Mark this bank as non exist */
-			}
-		}
-	}
-
-#ifdef MV_INCLUDE_SDRAM_CS2
-	if (bankInfo[SDRAM_CS0].size <  bankInfo[SDRAM_CS2].size)
-	{
-		MV_DRAM_CS_order[0] = SDRAM_CS2;
-		MV_DRAM_CS_order[1] = SDRAM_CS3;
-		MV_DRAM_CS_order[2] = SDRAM_CS0;
-		MV_DRAM_CS_order[3] = SDRAM_CS1;
-		DRAM_CS_Order[0] = SDRAM_CS2;
-		DRAM_CS_Order[1] = SDRAM_CS3;
-		DRAM_CS_Order[2] = SDRAM_CS0;
-		DRAM_CS_Order[3] = SDRAM_CS1;
-
-	}
-	else
-#endif
-	{
-		MV_DRAM_CS_order[0] = SDRAM_CS0;
-		MV_DRAM_CS_order[1] = SDRAM_CS1;
-		DRAM_CS_Order[0] = SDRAM_CS0;
-		DRAM_CS_Order[1] = SDRAM_CS1;
-#ifdef MV_INCLUDE_SDRAM_CS2
-		MV_DRAM_CS_order[2] = SDRAM_CS2;
-		MV_DRAM_CS_order[3] = SDRAM_CS3;
-		DRAM_CS_Order[2] = SDRAM_CS2;
-		DRAM_CS_Order[3] = SDRAM_CS3;
-#endif
-	}
-
-	for(j = 0; j < MV_DRAM_MAX_CS; j++)
-	{
-		i = MV_DRAM_CS_order[j];
-		
-        	if (0 == bankInfo[i].size)
-			continue;
-
-			/* Init the CPU window decode */
-			/* Note that the Dimm width might be different then the device DRAM width */
-#ifdef MV78XX0	
-			temp = MV_REG_READ(SDRAM_CONFIG_REG);
-			deviceW = ((temp & SDRAM_DWIDTH_MASK) == SDRAM_DWIDTH_32BIT )? 32 : 64;
-#else
-			deviceW = 16 /* KW family */;
-#endif
-			dimmW = bankInfo[0].dataWidth - (bankInfo[0].dataWidth % 16);
-			size = ((bankInfo[i].size << 20) / (dimmW/deviceW)); 
-		
-			/* We can not change DRAM window settings while excecuting  	*/
-			/* code from it. That is why we skip the DRAM CS[0], saving     */
-			/* it to the ROM configuration routine				*/
-
-			numOfAllDevices += bankInfo[i].numberOfDevices;
-			if (i == MV_DRAM_CS_order[0])
-			{
-				MV_U32 sizeToReg;
-				/* Translate the given window size to register format		*/
-				sizeToReg = ctrlSizeToReg(size, SCSR_SIZE_ALIGNMENT);
-				/* Size parameter validity check.                           */
-				if (-1 == sizeToReg)
-				{
-					mvOsOutput("DRAM: mvCtrlAddrDecToReg: ERR. Win %d size invalid.\n"
-							   ,i);
-					return MV_BAD_PARAM;
-				}
-
-				DB(mvOsPrintf("Dram: Bank 0 Size - %x\n",sizeToReg);)
-				sizeToReg = (sizeToReg << SCSR_SIZE_OFFS);
-				sizeToReg |= SCSR_WIN_EN;
-				MV_REG_WRITE(DRAM_BUF_REG0, sizeToReg);
-			}
-			else
-			{
-				dramDecWin.addrWin.baseLow = base;
-				dramDecWin.addrWin.size = size;
-				dramDecWin.enable = MV_TRUE;
-				DB(mvOsPrintf("Dram: Enable window %d base 0x%x, size=0x%x\n",i, base, size));
-				
-				/* Check if the DRAM size is more then 3GByte */
-				if (base < 0xC0000000)
-				{
-					DB(mvOsPrintf("Dram: Enable window %d base 0x%x, size=0x%x\n",i, base, size));
-           			if (MV_OK != mvCpuIfTargetWinSet(i, &dramDecWin))
-					{
-						mvOsPrintf("Dram: ERR. Fail to set bank %d!!!\n", SDRAM_CS0 + i);
-						return 	MV_ERROR;
-					}
-				}
-			}
-			
-			base += size;
-
-			/* update the suportedCasLatencies mask */
-			bankInfo[0].suportedCasLatencies &= bankInfo[i].suportedCasLatencies;
-	}
-
-	/* calculate minimum CAS */
-	minCas = minCasCalc(&bankInfo[0], &bankInfo[2], busClk, forcedCl);
-	if (0 == minCas) 
-	{
-		mvOsOutput("Dram: Warn: Could not find CAS compatible to SysClk %dMhz\n",
-				   (busClk / 1000000));
-
-		minCas = DDR2_CL_4; /* Continue with this CAS */
-		mvOsOutput("Set default CAS latency 4\n");
-	}
-
-	/* calc SDRAM_CONFIG_REG  and save it to temp register */
-	temp = sdramConfigRegCalc(&bankInfo[0],&bankInfo[2], busClk);
-	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramConfigRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-
-	/* check if ECC is enabled by the user */
-	if(eccDisable)	
-	{	
-		/* turn off ECC*/
-		temp &= ~BIT18;
-	}
-	DB(mvOsPrintf("Dram: sdramConfigRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG1, temp);
-	
-	/* calc SDRAM_MODE_REG  and save it to temp register */ 
-	temp = sdramModeRegCalc(minCas);
-    	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramModeRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramModeRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG2, temp);
-
-	/* calc SDRAM_EXTENDED_MODE_REG  and save it to temp register */ 
-	temp = sdramExtModeRegCalc(&bankInfo[0], busClk);
-	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramExtModeRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramExtModeRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG10, temp);
-
-	/* calc D_UNIT_CONTROL_LOW  and save it to temp register */
-	TTMode = MV_FALSE;
-	DB(mvOsPrintf("Dram: numOfAllDevices = %x\n",numOfAllDevices);)
-	if( (numOfAllDevices > 9) && (bankInfo[0].registeredAddrAndControlInputs == MV_FALSE) )
-	{
-		if ( ( (numOfAllDevices > 9) && (busClk > MV_BOARD_SYSCLK_200MHZ) ) ||
-			(numOfAllDevices > 18) )
-		{
-			mvOsOutput("Enable 2T ");
-			TTMode = MV_TRUE;
-		}
-	}
-
-  	temp = dunitCtrlLowRegCalc(&bankInfo[0], minCas, busClk, TTMode ); 
-   	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. dunitCtrlLowRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc - %x\n",temp);)
-  	MV_REG_WRITE(DRAM_BUF_REG3, temp); 
-
-	/* calc D_UNIT_CONTROL_HIGH  and save it to temp register */
-  	temp = dunitCtrlHighRegCalc(&bankInfo[0], busClk); 
-   	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. dunitCtrlHighRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: dunitCtrlHighRegCalc - %x\n",temp);)
-	/* check if ECC is enabled by the user */
-	if(eccDisable)	
-	{	
-		/* turn off sample stage if no ecc */
-		temp &= ~SDRAM__D2P_EN;;
-	}
-  	MV_REG_WRITE(DRAM_BUF_REG13, temp); 
-
-	/* calc SDRAM_ADDR_CTRL_REG  and save it to temp register */
-	temp = sdramAddrCtrlRegCalc(&bankInfo[0],&bankInfo[2]);
-    	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramAddrCtrlRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramAddrCtrlRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG4, temp);
-
-	/* calc SDRAM_TIMING_CTRL_LOW_REG  and save it to temp register */
-	temp = sdramTimeCtrlLowRegCalc(&bankInfo[0], minCas, busClk);
-    	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramTimeCtrlLowRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramTimeCtrlLowRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG5, temp);
-
-	/* calc SDRAM_TIMING_CTRL_HIGH_REG  and save it to temp register */
-	temp = sdramTimeCtrlHighRegCalc(&bankInfo[0], busClk);
-    	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramTimeCtrlHighRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramTimeCtrlHighRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG6, temp);
-
-	sdramDDr2OdtConfig(bankInfo);
-
-	/* calc DDR2_SDRAM_TIMING_LOW_REG  and save it to temp register */
-	temp = sdramDdr2TimeLoRegCalc(minCas);
-	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramDdr2TimeLoRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramDdr2TimeLoRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG11, temp);
-
-	/* calc DDR2_SDRAM_TIMING_HIGH_REG  and save it to temp register */
-	temp = sdramDdr2TimeHiRegCalc(minCas);
-	if(-1 == temp)
-	{
-		mvOsOutput("Dram: ERR. sdramDdr2TimeHiRegCalc failed !!!\n");
-		return MV_ERROR;
-	}
-	DB(mvOsPrintf("Dram: sdramDdr2TimeHiRegCalc - %x\n",temp);)
-	MV_REG_WRITE(DRAM_BUF_REG12, temp);
-#endif
-	
-	/* Note that DDR SDRAM Address/Control and Data pad calibration     */
-	/* settings is done in mvSdramIfConfig.s                            */
-
- 	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvDramIfBankBaseGet - Get DRAM interface bank base.
-*
-* DESCRIPTION:
-*       This function returns the 32 bit base address of a given DRAM bank.
-*
-* INPUT:
-*       bankNum - Bank number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM bank size. If bank is disabled or paramter is invalid, the 
-*		function returns -1.
-*
-*******************************************************************************/
-MV_U32 mvDramIfBankBaseGet(MV_U32 bankNum)
-{
-	DB(mvOsPrintf("Dram: mvDramIfBankBaseGet Bank %d base addr is %x \n",
-				  bankNum, mvCpuIfTargetWinBaseLowGet(SDRAM_CS0 + bankNum)));
-	return mvCpuIfTargetWinBaseLowGet(SDRAM_CS0 + bankNum);
-}
-
-/*******************************************************************************
-* mvDramIfBankSizeGet - Get DRAM interface bank size.
-*
-* DESCRIPTION:
-*       This function returns the size of a given DRAM bank.
-*
-* INPUT:
-*       bankNum - Bank number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM bank size. If bank is disabled the function return '0'. In case 
-*		or paramter is invalid, the function returns -1.
-*
-*******************************************************************************/
-MV_U32 mvDramIfBankSizeGet(MV_U32 bankNum)
-{
-	DB(mvOsPrintf("Dram: mvDramIfBankSizeGet Bank %d size is %x \n",
-				  bankNum, mvCpuIfTargetWinSizeGet(SDRAM_CS0 + bankNum)));
-	return mvCpuIfTargetWinSizeGet(SDRAM_CS0 + bankNum);
-}
-
-
-/*******************************************************************************
-* mvDramIfSizeGet - Get DRAM interface total size.
-*
-* DESCRIPTION:
-*       This function get the DRAM total size.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       DRAM total size. In case or paramter is invalid, the function 
-*		returns -1.
-*
-*******************************************************************************/
-MV_U32 mvDramIfSizeGet(MV_VOID)
-{
-	MV_U32 size = 0, i;
-	
-	for(i = 0; i < MV_DRAM_MAX_CS; i++)
-		size += mvDramIfBankSizeGet(i);
-	
-	DB(mvOsPrintf("Dram: mvDramIfSizeGet size is %x \n",size));
-	return size;
-}
-
-/*******************************************************************************
-* mvDramIfSingleBitErrThresholdSet - Set single bit ECC threshold.
-*
-* DESCRIPTION:
-*       The ECC single bit error threshold is the number of single bit 
-*       errors to happen before the Dunit generates an interrupt.
-*       This function set single bit ECC threshold.
-*
-* INPUT:
-*       threshold - threshold.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if threshold is to big, MV_OK otherwise.
-*
-*******************************************************************************/
-MV_STATUS mvDramIfSingleBitErrThresholdSet(MV_U32 threshold)
-{
-    MV_U32 regVal; 
-
-    if (threshold > SECR_THRECC_MAX)
-    {
-        return MV_BAD_PARAM;
-    }
-
-    regVal = MV_REG_READ(SDRAM_ECC_CONTROL_REG);
-    regVal &= ~SECR_THRECC_MASK;
-    regVal |= ((SECR_THRECC(threshold) & SECR_THRECC_MASK));
-    MV_REG_WRITE(SDRAM_ECC_CONTROL_REG, regVal);
-
-    return MV_OK;
-}
-
-#ifndef MV_STATIC_DRAM_ON_BOARD
-/*******************************************************************************
-* minCasCalc - Calculate the Minimum CAS latency which can be used.
-*
-* DESCRIPTION:
-*	Calculate the minimum CAS latency that can be used, base on the DRAM
-*	parameters and the SDRAM bus Clock freq.
-*
-* INPUT:
-*	busClk    - the DRAM bus Clock.
-*	pBankInfo - bank info parameters.
-*	forcedCl - Forced CAS Latency multiplied by 10. If equal to zero, do not force.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       The minimum CAS Latency. The function returns 0 if max CAS latency
-*		supported by banks is incompatible with system bus clock frequancy.
-*
-*******************************************************************************/
-
-static MV_U32 minCasCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk, MV_U32 forcedCl)
-{
-	MV_U32 count = 1, j;
-	MV_U32 busClkPs = 1000000000 / (busClk / 1000);  /* in ps units */
-	MV_U32 startBit, stopBit;
-	MV_U32 minCas0 = 0, minCas2 = 0;
-	
-	
-	/*     DDR 2:
-			*******-******-******-******-******-******-******-******* 
-			* bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-			*******-******-******-******-******-******-******-******* 
-	CAS	=	* TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-	Disco VI=	* TBD  | TBD  |  5   |  4   |  3   |  TBD   | TBD | TBD * 
-	Disco Duo=	* TBD  |   6  |  5   |  4   |  3   |  TBD   | TBD | TBD * 
-			*********************************************************/
-	
-	
-	/* If we are asked to use the forced CAL  we change the suported CAL to be forcedCl only */
-	if (forcedCl)
-	{
-		mvOsOutput("DRAM: Using forced CL %d.%d\n", (forcedCl / 10), (forcedCl % 10));
-	
-			if (forcedCl == 30)
-				pBankInfo->suportedCasLatencies = 0x08;
-			else if (forcedCl == 40)
-				pBankInfo->suportedCasLatencies = 0x10;
-			else if (forcedCl == 50)
-				pBankInfo->suportedCasLatencies = 0x20;
-			else if (forcedCl == 60)
-				pBankInfo->suportedCasLatencies = 0x40;
-			else
-			{
-				mvOsPrintf("Forced CL %d.%d not supported. Set default CL 4\n", 
-						   (forcedCl / 10), (forcedCl % 10));
-				pBankInfo->suportedCasLatencies = 0x10;
-			}
-
-		return pBankInfo->suportedCasLatencies;        
-	}   
-	
-	/* go over the supported cas mask from Max Cas down and check if the 	*/
-	/* SysClk stands in its time requirments.				*/
-
-	DB(mvOsPrintf("Dram: minCasCalc supported mask = %x busClkPs = %x \n",
-								pBankInfo->suportedCasLatencies,busClkPs ));
-	count = 1;
-	for(j = 7; j > 0; j--)
-	{
-		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
-		{
-			/* Reset the bits for CL incompatible for the sysClk */
-			switch (count)
-			{
-				case 1: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatPs > busClkPs) 
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 2: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 3: 
-					if (pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
-						pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				default: 
-					pBankInfo->suportedCasLatencies &= ~(BIT0 << j);
-					break;
-			}
-		}
-	}
-	
-	DB(mvOsPrintf("Dram: minCasCalc support = %x (after SysCC calc)\n",
-											pBankInfo->suportedCasLatencies ));
-
-	count = 1;
-	DB(mvOsPrintf("Dram2: minCasCalc supported mask = %x busClkPs = %x \n",
-								pBankInfo2->suportedCasLatencies,busClkPs ));
-	for(j = 7; j > 0; j--)
-	{
-		if((pBankInfo2->suportedCasLatencies >> j) & BIT0 )
-		{
-			/* Reset the bits for CL incompatible for the sysClk */
-			switch (count)
-			{
-				case 1: 
-					if (pBankInfo2->minCycleTimeAtMaxCasLatPs > busClkPs) 
-						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 2: 
-					if (pBankInfo2->minCycleTimeAtMaxCasLatMinus1Ps > busClkPs)
-						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				case 3: 
-					if (pBankInfo2->minCycleTimeAtMaxCasLatMinus2Ps > busClkPs)
-						pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
-					count++;
-					break;
-				default: 
-					pBankInfo2->suportedCasLatencies &= ~(BIT0 << j);
-					break;
-			}
-		}
-	}
-	
-	DB(mvOsPrintf("Dram2: minCasCalc support = %x (after SysCC calc)\n",
-									pBankInfo2->suportedCasLatencies ));
-
-	startBit = 3;   /* DDR2 support CL start with CL3 (bit 3) */
-	stopBit  = 6;   /* DDR2 support CL stops with CL6 (bit 6) */
-
-	for(j = startBit; j <= stopBit ; j++)
-	{
-		if((pBankInfo->suportedCasLatencies >> j) & BIT0 )
-		{
-			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
-			minCas0 = (BIT0 << j);
-			break;
-		}
-	}
-
-	for(j = startBit; j <= stopBit ; j++)
-	{
-		if((pBankInfo2->suportedCasLatencies >> j) & BIT0 )
-		{
-			DB(mvOsPrintf("Dram: minCasCalc choose CAS %x \n",(BIT0 << j)));
-			minCas2 = (BIT0 << j);
-			break;
-		}
-	}
-	
-	if (minCas2 > minCas0)
-		return minCas2;
-	else
-		return minCas0;
-	
-	return 0; 
-}
-
-/*******************************************************************************
-* sdramConfigRegCalc - Calculate sdram config register
-*
-* DESCRIPTION: Calculate sdram config register optimized value based
-*			on the bank info parameters.
-*
-* INPUT:
-*	busClk    - the DRAM bus Clock.
-*	pBankInfo - sdram bank parameters
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram config reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramConfigRegCalc(MV_DRAM_BANK_INFO *pBankInfo,MV_DRAM_BANK_INFO *pBankInfo2, MV_U32 busClk)
-{
-	MV_U32 sdramConfig = 0;
-	MV_U32 refreshPeriod;
-	
-	busClk /= 1000000; /* we work with busClk in MHz */
-	
-	sdramConfig = MV_REG_READ(SDRAM_CONFIG_REG);
-	
-	/* figure out the memory refresh internal */
-	switch (pBankInfo->refreshInterval & 0xf)
-	{
-		case 0x0: /* refresh period is 15.625 usec */
-				refreshPeriod = 15625;
-				break;
-		case 0x1: /* refresh period is 3.9 usec  	*/
-				refreshPeriod = 3900;
-				break;
-		case 0x2: /* refresh period is 7.8 usec 	*/
-				refreshPeriod = 7800;
-				break;
-		case 0x3: /* refresh period is 31.3 usec	*/
-				refreshPeriod = 31300;
-				break;
-		case 0x4: /* refresh period is 62.5 usec	*/
-				refreshPeriod = 62500;
-				break;
-		case 0x5: /* refresh period is 125 usec 	*/
-				refreshPeriod = 125000;
-				break;
-		default:  /* refresh period undefined 					*/
-				mvOsPrintf("Dram: ERR. DRAM refresh period is unknown!\n");
-				return -1;
-    }
-	
-	/* Now the refreshPeriod is in register format value */
-	refreshPeriod = (busClk * refreshPeriod) / 1000;
-	
-	DB(mvOsPrintf("Dram: sdramConfigRegCalc calculated refresh interval %0x\n", 
-				  refreshPeriod));
-
-	/* make sure the refresh value is only 14 bits */
-	if(refreshPeriod > SDRAM_REFRESH_MAX)
-	{
-		refreshPeriod = SDRAM_REFRESH_MAX;
-		DB(mvOsPrintf("Dram: sdramConfigRegCalc adjusted refresh interval %0x\n", 
-					  refreshPeriod));
-	}
-	
-	/* Clear the refresh field */
-	sdramConfig &= ~SDRAM_REFRESH_MASK;
-	
-	/* Set new value to refresh field */
-	sdramConfig |= (refreshPeriod & SDRAM_REFRESH_MASK);
-	
-	/*  registered DRAM ? */
-	if ( pBankInfo->registeredAddrAndControlInputs )
-	{
-		/* it's registered DRAM, so set the reg. DRAM bit */
-		sdramConfig |= SDRAM_REGISTERED;
-		DB(mvOsPrintf("DRAM Attribute: Registered address and control inputs.\n");)
-	}
-
-	/* ECC and IERR support */
-	sdramConfig &= ~SDRAM_ECC_MASK;    /* Clear ECC field */
-	sdramConfig &= ~SDRAM_IERR_MASK;    /* Clear IErr field */
-
-	if ( pBankInfo->errorCheckType ) 
-	{
-		sdramConfig |= SDRAM_ECC_EN;
-		sdramConfig |= SDRAM_IERR_REPORTE; 
-                DB(mvOsPrintf("Dram: mvDramIfDetect Enabling ECC\n"));
-	}
-	else
-	{
-                sdramConfig |= SDRAM_ECC_DIS;
-		sdramConfig |= SDRAM_IERR_IGNORE; 
-                DB(mvOsPrintf("Dram: mvDramIfDetect Disabling ECC!\n"));
-	}
-	/* Set static default settings */
-	sdramConfig |= SDRAM_CONFIG_DV;
-	
-	DB(mvOsPrintf("Dram: sdramConfigRegCalc set sdramConfig to 0x%x\n",
-				  sdramConfig));
-	
- 	return sdramConfig;  
-}
-
-/*******************************************************************************
-* sdramModeRegCalc - Calculate sdram mode register
-*
-* DESCRIPTION: Calculate sdram mode register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram mode reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramModeRegCalc(MV_U32 minCas)
-{
-	MV_U32 sdramMode;
-		
-	sdramMode = MV_REG_READ(SDRAM_MODE_REG);
-	
-	/* Clear CAS Latency field */
-	sdramMode &= ~SDRAM_CL_MASK;
-	
-	DB(mvOsPrintf("DRAM CAS Latency ");)
-	
-		switch (minCas)
-		{
-			case DDR2_CL_3: 
-				sdramMode |= SDRAM_DDR2_CL_3;
-				DB(mvOsPrintf("3.\n");)
-				break;
-			case DDR2_CL_4: 
-				sdramMode |= SDRAM_DDR2_CL_4;
-				DB(mvOsPrintf("4.\n");)
-				break;
-			case DDR2_CL_5: 
-				sdramMode |= SDRAM_DDR2_CL_5;
-				DB(mvOsPrintf("5.\n");)
-				break;
-			case DDR2_CL_6: 
-				sdramMode |= SDRAM_DDR2_CL_6;
-				DB(mvOsPrintf("6.\n");)
-				break;
-			default:
-				mvOsOutput("\nsdramModeRegCalc ERROR: Max. CL out of range\n");
-				return -1;
-        }
-
-	DB(mvOsPrintf("\nsdramModeRegCalc register 0x%x\n", sdramMode ));
-
-	return sdramMode;
-}
-/*******************************************************************************
-* sdramExtModeRegCalc - Calculate sdram Extended mode register
-*
-* DESCRIPTION: 
-*		Return sdram Extended mode register value based
-*		on the bank info parameters and bank presence.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*	busClk - DRAM frequency
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram Extended mode reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramExtModeRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
-{
-	MV_U32 populateBanks = 0;
-	int bankNum;
-
-		/* Represent the populate banks in binary form */
-		for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-		{
-			if (0 != pBankInfo[bankNum].size)
-			{
-				populateBanks |= (1 << bankNum);
-			}
-		}
-	
-		switch(populateBanks)
-		{
-			case(BANK_PRESENT_CS0):
-			case(BANK_PRESENT_CS0_CS1):
-				return DDR_SDRAM_EXT_MODE_CS0_CS1_DV;
-		
-			case(BANK_PRESENT_CS0_CS2):
-			case(BANK_PRESENT_CS0_CS1_CS2):
-			case(BANK_PRESENT_CS0_CS2_CS3):
-			case(BANK_PRESENT_CS0_CS2_CS3_CS4):
-				if (busClk >= MV_BOARD_SYSCLK_267MHZ)
-				    return DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV;
-				else
-				    return DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV;
-		
-			default:
-				mvOsOutput("sdramExtModeRegCalc: Invalid DRAM bank presence\n");
-				return -1;
-		} 
-	return 0;
-}
-
-/*******************************************************************************
-* dunitCtrlLowRegCalc - Calculate sdram dunit control low register
-*
-* DESCRIPTION: Calculate sdram dunit control low register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram dunit control low reg value.
-*
-*******************************************************************************/
-static MV_U32 dunitCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32  busClk, MV_STATUS TTMode)
-{
-	MV_U32 dunitCtrlLow, cl;
-	MV_U32 sbOutR[4]={3,5,7,9} ;
-	MV_U32 sbOutU[4]={1,3,5,7} ;
-	
-    	dunitCtrlLow = MV_REG_READ(SDRAM_DUNIT_CTRL_REG);
-
-        DB(mvOsPrintf("Dram: dunitCtrlLowRegCalc\n"));
-
-	/* Clear StBurstOutDel field */
-	dunitCtrlLow &= ~SDRAM_SB_OUT_MASK;
-	
-	/* Clear StBurstInDel field */
-	dunitCtrlLow &= ~SDRAM_SB_IN_MASK;
-
-	/* Clear CtrlPos field */
-	dunitCtrlLow &= ~SDRAM_CTRL_POS_MASK;
-
-	/* Clear 2T field */
-	dunitCtrlLow &= ~SDRAM_2T_MASK;
-	if (TTMode == MV_TRUE)
-	{
-		dunitCtrlLow |= SDRAM_2T_MODE;
-	}
-	
-	/* For proper sample of read data set the Dunit Control register's      */
-	/* stBurstInDel bits [27:24]                                            */
-	/*		200MHz - 267MHz None reg  = CL + 1			*/
-	/*		200MHz - 267MHz reg	  = CL + 2			*/
-	/*		> 267MHz None reg  = CL + 2			*/
-	/*		> 267MHz reg	  = CL + 3			*/
-	
-	/* For proper sample of read data set the Dunit Control register's      */
-	/* stBurstOutDel bits [23:20]                                           */
-			/********-********-********-********-
-			*  CL=3  |  CL=4  |  CL=5  |  CL=6  |
-			*********-********-********-********-
-	Not Reg.	*  0001  |  0011  |  0101  |  0111  |
-			*********-********-********-********-
-	Registered	*  0011  |  0101  |  0111  |  1001  |
-			*********-********-********-********/
-    
-		/* Set Dunit Control low default value */
-		dunitCtrlLow |= SDRAM_DUNIT_CTRL_LOW_DDR2_DV; 
-
-		switch (minCas)
-		{
-			case DDR2_CL_3: cl = 3; break;
-			case DDR2_CL_4: cl = 4; break;
-			case DDR2_CL_5: cl = 5; break;
-			case DDR2_CL_6: cl = 6; break;
-			default:
-				mvOsOutput("Dram: dunitCtrlLowRegCalc Max. CL out of range %d\n", minCas);
-				return -1;
-		}
-
-		/* registerd DDR SDRAM? */
-		if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-		{
-			dunitCtrlLow |= (sbOutR[cl-3]) << SDRAM_SB_OUT_DEL_OFFS;
-		}
-		else
-		{
-			dunitCtrlLow |= (sbOutU[cl-3]) << SDRAM_SB_OUT_DEL_OFFS;
-		}
-
-		DB(mvOsPrintf("\n\ndunitCtrlLowRegCalc: CL = %d, frequencies=%d\n", cl, busClk));
-
-		if (busClk <= MV_BOARD_SYSCLK_267MHZ)
-		{
-			if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-				cl = cl + 2;
-			else
-				cl = cl + 1;
-		}
-		else
-		{
-			if (pBankInfo->registeredAddrAndControlInputs == MV_TRUE)
-				cl = cl + 3;
-			else
-				cl = cl + 2;
-		}
-		
-        DB(mvOsPrintf("dunitCtrlLowRegCalc: SDRAM_SB_IN_DEL_OFFS = %d \n", cl));
-		dunitCtrlLow |= cl << SDRAM_SB_IN_DEL_OFFS;
-
-	DB(mvOsPrintf("Dram: Reg dunit control low = %x\n", dunitCtrlLow ));
-
-	return dunitCtrlLow;
-}  
-
-/*******************************************************************************
-* dunitCtrlHighRegCalc - Calculate sdram dunit control high register
-*
-* DESCRIPTION: Calculate sdram dunit control high register optimized value based
-*			on the bus clock.
-*
-* INPUT:
-*	busClk	  - DRAM frequency. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram dunit control high reg value.
-*
-*******************************************************************************/
-static MV_U32 dunitCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32  busClk)
-{
-	MV_U32 dunitCtrlHigh;
-	dunitCtrlHigh = MV_REG_READ(SDRAM_DUNIT_CTRL_HI_REG);
-	if(busClk > MV_BOARD_SYSCLK_300MHZ) 
-		dunitCtrlHigh |= SDRAM__P2D_EN;
-	else
-		dunitCtrlHigh &= ~SDRAM__P2D_EN;
-
-	if(busClk > MV_BOARD_SYSCLK_267MHZ) 
-	    dunitCtrlHigh |= (SDRAM__WR_MESH_DELAY_EN | SDRAM__PUP_ZERO_SKEW_EN | SDRAM__ADD_HALF_FCC_EN);
-
-	/* If ECC support we turn on D2P sample */
-	dunitCtrlHigh &= ~SDRAM__D2P_EN;    /* Clear D2P bit */
-	if (( pBankInfo->errorCheckType ) && (busClk > MV_BOARD_SYSCLK_267MHZ))
-		dunitCtrlHigh |= SDRAM__D2P_EN;
-
-	return dunitCtrlHigh;
-}
-
-/*******************************************************************************
-* sdramAddrCtrlRegCalc - Calculate sdram address control register
-*
-* DESCRIPTION: Calculate sdram address control register optimized value based
-*			on the bank info parameters and the minCas.
-*
-* INPUT:
-*	pBankInfo - sdram bank parameters
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram address control reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramAddrCtrlRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_DRAM_BANK_INFO *pBankInfoDIMM1)
-{
-	MV_U32 addrCtrl = 0;
-	
-	if (pBankInfoDIMM1->size)
-	{
-		switch (pBankInfoDIMM1->sdramWidth)
-		{
-			case 4:  /* memory is x4 */
-				mvOsOutput("sdramAddrCtrlRegCalc: Error - x4 not supported!\n");
-				return -1;
-				break;
-			case 8:  /* memory is x8 */
-				addrCtrl |= SDRAM_ADDRSEL_X8(2) | SDRAM_ADDRSEL_X8(3);
-				DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device DIMM2 width x8\n"));
-				break;
-			case 16:
-				addrCtrl |= SDRAM_ADDRSEL_X16(2) | SDRAM_ADDRSEL_X16(3);
-				DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device DIMM2 width x16\n"));
-				break;
-			default: /* memory width unsupported */
-				mvOsOutput("sdramAddrCtrlRegCalc: ERR. DRAM chip width is unknown!\n");
-				return -1;
-		}
-	}
-
-	switch (pBankInfo->sdramWidth)
-	{
-		case 4:  /* memory is x4 */
-			mvOsOutput("sdramAddrCtrlRegCalc: Error - x4 not supported!\n");
-			return -1;
-			break;
-		case 8:  /* memory is x8 */
-			addrCtrl |= SDRAM_ADDRSEL_X8(0) | SDRAM_ADDRSEL_X8(1);
-			DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device width x8\n"));
-			break;
-		case 16:
-			addrCtrl |= SDRAM_ADDRSEL_X16(0) | SDRAM_ADDRSEL_X16(1);
-			DB(mvOsPrintf("sdramAddrCtrlRegCalc: sdramAddrCtrlRegCalc SDRAM device width x16\n"));
-			break;
-		default: /* memory width unsupported */
-			mvOsOutput("sdramAddrCtrlRegCalc: ERR. DRAM chip width is unknown!\n");
-			return -1;
-	}
-
-	/* Note that density is in MB units */
-	switch (pBankInfo->deviceDensity) 
-	{
-		case 256:                 /* 256 Mbit */
-			DB(mvOsPrintf("DRAM Device Density 256Mbit\n"));
-			addrCtrl |= SDRAM_DSIZE_256Mb(0) | SDRAM_DSIZE_256Mb(1);
-			break;
-		case 512:                /* 512 Mbit */
-			DB(mvOsPrintf("DRAM Device Density 512Mbit\n"));
-			addrCtrl |= SDRAM_DSIZE_512Mb(0) | SDRAM_DSIZE_512Mb(1);
-			break;
-		case 1024:                /* 1 Gbit */
-			DB(mvOsPrintf("DRAM Device Density 1Gbit\n"));
-			addrCtrl |= SDRAM_DSIZE_1Gb(0) | SDRAM_DSIZE_1Gb(1);
-			break;
-		case 2048:                /* 2 Gbit */
-			DB(mvOsPrintf("DRAM Device Density 2Gbit\n"));
-			addrCtrl |= SDRAM_DSIZE_2Gb(0) | SDRAM_DSIZE_2Gb(1);
-			break;
-		default:
-			mvOsOutput("Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
-                       pBankInfo->deviceDensity);
-			return -1;
-        }
-
-	if (pBankInfoDIMM1->size)
-	{
-		switch (pBankInfoDIMM1->deviceDensity) 
-		{
-			case 256:                 /* 256 Mbit */
-				DB(mvOsPrintf("DIMM2: DRAM Device Density 256Mbit\n"));
-				addrCtrl |= SDRAM_DSIZE_256Mb(2) | SDRAM_DSIZE_256Mb(3);
-				break;
-			case 512:                /* 512 Mbit */
-				DB(mvOsPrintf("DIMM2: DRAM Device Density 512Mbit\n"));
-				addrCtrl |= SDRAM_DSIZE_512Mb(2) | SDRAM_DSIZE_512Mb(3);
-				break;
-			case 1024:                /* 1 Gbit */
-				DB(mvOsPrintf("DIMM2: DRAM Device Density 1Gbit\n"));
-				addrCtrl |= SDRAM_DSIZE_1Gb(2) | SDRAM_DSIZE_1Gb(3);
-				break;
-			case 2048:                /* 2 Gbit */
-				DB(mvOsPrintf("DIMM2: DRAM Device Density 2Gbit\n"));
-				addrCtrl |= SDRAM_DSIZE_2Gb(2) | SDRAM_DSIZE_2Gb(3);
-				break;
-			default:
-				mvOsOutput("DIMM2: Dram: sdramAddrCtrl unsupported RAM-Device size %d\n",
-						   pBankInfoDIMM1->deviceDensity);
-				return -1;
-		}
-	}
-	/* SDRAM address control */
-	DB(mvOsPrintf("Dram: setting sdram address control with: %x \n", addrCtrl));
-
-	return addrCtrl;
-}
-
-/*******************************************************************************
-* sdramTimeCtrlLowRegCalc - Calculate sdram timing control low register
-*
-* DESCRIPTION: 
-*       This function calculates sdram timing control low register 
-*       optimized value based on the bank info parameters and the minCas.
-*
-* INPUT:
-*	    pBankInfo - sdram bank parameters
-*	minCas	  - minimum CAS supported. 
-*       busClk    - Bus clock
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram timing control low reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramTimeCtrlLowRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 minCas, MV_U32 busClk)
-{
-    MV_U32 tRp  = 0;
-    MV_U32 tRrd = 0;
-    MV_U32 tRcd = 0;
-    MV_U32 tRas = 0;
-    MV_U32 tWr  = 0;
-    MV_U32 tWtr = 0;
-    MV_U32 tRtp = 0;
-    MV_U32 timeCtrlLow = 0;
-	
-    MV_U32 bankNum;
-    
-    busClk = busClk / 1000000;    /* In MHz */
-
-    /* Scan all DRAM banks to find maximum timing values */
-    for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-    {
-        tRp  = MV_MAX(tRp,  pBankInfo[bankNum].minRowPrechargeTime);
-        tRrd = MV_MAX(tRrd, pBankInfo[bankNum].minRowActiveToRowActive);
-        tRcd = MV_MAX(tRcd, pBankInfo[bankNum].minRasToCasDelay);
-        tRas = MV_MAX(tRas, pBankInfo[bankNum].minRasPulseWidth);
-    }
-
-    /* Extract timing (in ns) from SPD value. We ignore the tenth ns part.  */
-    /* by shifting the data two bits right.                                 */
-    tRp  = tRp  >> 2;    /* For example 0x50 -> 20ns                        */
-    tRrd = tRrd >> 2;
-    tRcd = tRcd >> 2;
-	
-    /* Extract clock cycles from time parameter. We need to round up        */
-    tRp  = ((busClk * tRp)  / 1000) + (((busClk * tRp)  % 1000) ? 1 : 0);
-    DB(mvOsPrintf("Dram  Timing Low: tRp = %d ", tRp));
-    tRrd = ((busClk * tRrd) / 1000) + (((busClk * tRrd) % 1000) ? 1 : 0);
-	/* JEDEC min reqeirments tRrd = 2 */
-	if (tRrd < 2)
-		tRrd = 2;
-    DB(mvOsPrintf("tRrd = %d ", tRrd));
-    tRcd = ((busClk * tRcd) / 1000) + (((busClk * tRcd) % 1000) ? 1 : 0);
-    DB(mvOsPrintf("tRcd = %d ", tRcd));
-    tRas = ((busClk * tRas) / 1000) + (((busClk * tRas) % 1000) ? 1 : 0);
-    DB(mvOsPrintf("tRas = %d ", tRas));
-
-    /* tWr and tWtr is different for DDR1 and DDR2. tRtp is only for DDR2   */
-	/* Scan all DRAM banks to find maximum timing values */
-	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-	    tWr  = MV_MAX(tWr,  pBankInfo[bankNum].minWriteRecoveryTime);
-	    tWtr = MV_MAX(tWtr, pBankInfo[bankNum].minWriteToReadCmdDelay);
-	    tRtp = MV_MAX(tRtp, pBankInfo[bankNum].minReadToPrechCmdDelay);
-	}
-	
-	/* Extract timing (in ns) from SPD value. We ignore the tenth ns    */
-	/* part by shifting the data two bits right.                        */
-	tWr  = tWr  >> 2;    /* For example 0x50 -> 20ns                    */
-	tWtr = tWtr >> 2;
-	tRtp = tRtp >> 2;
-	/* Extract clock cycles from time parameter. We need to round up    */
-	tWr  = ((busClk * tWr)  / 1000) + (((busClk * tWr)  % 1000) ? 1 : 0);
-	DB(mvOsPrintf("tWr = %d ", tWr));
-	tWtr = ((busClk * tWtr) / 1000) + (((busClk * tWtr) % 1000) ? 1 : 0);
-	/* JEDEC min reqeirments tWtr = 2 */
-	if (tWtr < 2)
-		tWtr = 2;
-	DB(mvOsPrintf("tWtr = %d ", tWtr));
-	tRtp = ((busClk * tRtp) / 1000) + (((busClk * tRtp) % 1000) ? 1 : 0);
-	/* JEDEC min reqeirments tRtp = 2 */
-	if (tRtp < 2)
-	tRtp = 2;
-	DB(mvOsPrintf("tRtp = %d ", tRtp));
-
-	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
-	timeCtrlLow = (((tRp  - 1) << SDRAM_TRP_OFFS) |
-		    ((tRrd - 1) << SDRAM_TRRD_OFFS) |
-		    ((tRcd - 1) << SDRAM_TRCD_OFFS) |
-		    (((tRas - 1) << SDRAM_TRAS_OFFS) & SDRAM_TRAS_MASK)|
-		    ((tWr  - 1) << SDRAM_TWR_OFFS)  |
-		    ((tWtr - 1) << SDRAM_TWTR_OFFS)	|
-		    ((tRtp - 1) << SDRAM_TRTP_OFFS));
-	
-	/* Check extended tRas bit */
-	if ((tRas - 1) & BIT4)
-	    timeCtrlLow |= (1 << SDRAM_EXT_TRAS_OFFS);
-
-	return timeCtrlLow;
-}
-
-/*******************************************************************************
-* sdramTimeCtrlHighRegCalc - Calculate sdram timing control high register
-*
-* DESCRIPTION: 
-*       This function calculates sdram timing control high register 
-*       optimized value based on the bank info parameters and the bus clock.
-*
-* INPUT:
-*	    pBankInfo - sdram bank parameters
-*       busClk    - Bus clock
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       sdram timing control high reg value.
-*
-*******************************************************************************/
-static MV_U32 sdramTimeCtrlHighRegCalc(MV_DRAM_BANK_INFO *pBankInfo, MV_U32 busClk)
-{
-	MV_U32 tRfc;
-	MV_U32 timingHigh;
-	MV_U32 timeNs = 0;
-	MV_U32 bankNum;
-	
-	busClk = busClk / 1000000;    /* In MHz */
-
-	/* Set DDR timing high register static configuration bits */
-	timingHigh = MV_REG_READ(SDRAM_TIMING_CTRL_HIGH_REG);
-	
-	/* Set DDR timing high register default value */
-	timingHigh |= SDRAM_TIMING_CTRL_HIGH_REG_DV;  
-	
-	/* Clear tRfc field */
-	timingHigh &= ~SDRAM_TRFC_MASK;
-
-	/* Scan all DRAM banks to find maximum timing values */
-	for (bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		timeNs = MV_MAX(timeNs,  pBankInfo[bankNum].minRefreshToActiveCmd);
-		DB(mvOsPrintf("Dram:  Timing High: minRefreshToActiveCmd = %d\n", 
-				pBankInfo[bankNum].minRefreshToActiveCmd));
-	}
-	if(busClk >= 333 && mvCtrlModelGet() == MV_78XX0_A1_REV)
-    {
-        timingHigh |= 0x1 << SDRAM_TR2W_W2R_OFFS;
-    }
-
-	tRfc = ((busClk * timeNs)  / 1000) + (((busClk * timeNs)  % 1000) ? 1 : 0);
-	/* Note: value of 0 in register means one cycle, 1 means two and so on  */
-	DB(mvOsPrintf("Dram:  Timing High: tRfc = %d\n", tRfc));
-	timingHigh |= (((tRfc - 1) & SDRAM_TRFC_MASK) << SDRAM_TRFC_OFFS);
-	DB(mvOsPrintf("Dram:  Timing High: tRfc = %d\n", tRfc));
-	
-	/* SDRAM timing high */
-	DB(mvOsPrintf("Dram: setting timing high with: %x \n", timingHigh));
-
-	return timingHigh;
-}
-/*******************************************************************************
-* sdramDDr2OdtConfig - Set DRAM DDR2 On Die Termination registers.
-*
-* DESCRIPTION: 
-*       This function config DDR2 On Die Termination (ODT) registers.
-*	
-* INPUT:
-*		pBankInfo - bank info parameters.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       None
-*******************************************************************************/
-static void sdramDDr2OdtConfig(MV_DRAM_BANK_INFO *pBankInfo)
-{
-	MV_U32 populateBanks = 0;
-	MV_U32 odtCtrlLow, odtCtrlHigh, dunitOdtCtrl;
-	int bankNum;
-	
-	/* Represent the populate banks in binary form */
-	for(bankNum = 0; bankNum < MV_DRAM_MAX_CS; bankNum++)
-	{
-		if (0 != pBankInfo[bankNum].size)
-		{
-				populateBanks |= (1 << bankNum);
-			}
-		}
-	
-	switch(populateBanks)
-	{
-		case(BANK_PRESENT_CS0):
-		case(BANK_PRESENT_CS0_CS1):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS1_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS1_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS1_DV;
-			break;
-		case(BANK_PRESENT_CS0_CS2):
-		case(BANK_PRESENT_CS0_CS1_CS2):
-		case(BANK_PRESENT_CS0_CS2_CS3):
-		case(BANK_PRESENT_CS0_CS2_CS3_CS4):
-			odtCtrlLow   = DDR2_ODT_CTRL_LOW_CS0_CS1_CS2_CS3_DV;
-			odtCtrlHigh  = DDR2_ODT_CTRL_HIGH_CS0_CS1_CS2_CS3_DV;
-			dunitOdtCtrl = DDR2_DUNIT_ODT_CTRL_CS0_CS1_CS2_CS3_DV;
-			break;
-		default:
-			DB(mvOsPrintf("sdramDDr2OdtConfig: Invalid DRAM bank presence\n"));
-			return;
-	}
- 	/* DDR2 SDRAM ODT ctrl low  */
-	DB(mvOsPrintf("Dram: DDR2 setting ODT ctrl low with: %x \n", odtCtrlLow));
-	MV_REG_WRITE(DRAM_BUF_REG7, odtCtrlLow);
-
- 	/* DDR2 SDRAM ODT ctrl high  */
-	DB(mvOsPrintf("Dram: DDR2 setting ODT ctrl high with: %x \n", odtCtrlHigh));
-	MV_REG_WRITE(DRAM_BUF_REG8, odtCtrlHigh);
-
-	/* DDR2 DUNIT ODT ctrl  */
-	if ( ((mvCtrlModelGet() == MV_78XX0_DEV_ID) && (mvCtrlRevGet() == MV_78XX0_Y0_REV)) ||
-		(mvCtrlModelGet() == MV_76100_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78200_DEV_ID) )
-		dunitOdtCtrl &= ~(BIT9|BIT8); /* Clear ODT always on */
-
-	DB(mvOsPrintf("DUNIT: DDR2 setting ODT ctrl with: %x \n", dunitOdtCtrl));
-	MV_REG_WRITE(DRAM_BUF_REG9, dunitOdtCtrl);
-	return;
-}
-/*******************************************************************************
-* sdramDdr2TimeLoRegCalc - Set DDR2 DRAM Timing Low registers.
-*
-* DESCRIPTION: 
-*       This function config DDR2 DRAM Timing low registers.
-*	
-* INPUT:
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       DDR2 sdram timing low reg value.
-*******************************************************************************/
-static MV_U32 sdramDdr2TimeLoRegCalc(MV_U32 minCas)
-{
-	MV_U8 cl = -1;
-	MV_U32 ddr2TimeLoReg;
-
-	/* read and clear the feilds we are going to set */
-	ddr2TimeLoReg = MV_REG_READ(SDRAM_DDR2_TIMING_LO_REG);
-	ddr2TimeLoReg &= ~(SD2TLR_TODT_ON_RD_MASK	| 
-			   SD2TLR_TODT_OFF_RD_MASK	| 
-			   SD2TLR_TODT_ON_CTRL_RD_MASK	|
-			   SD2TLR_TODT_OFF_CTRL_RD_MASK);
-
-	if( minCas == DDR2_CL_3 )
-	{
-		cl = 3;
-	}
-	else if( minCas == DDR2_CL_4 )
-	{
-		cl = 4;
-	}
-	else if( minCas == DDR2_CL_5 )
-	{
-		cl = 5;
-	}
-	else if( minCas == DDR2_CL_6 )
-	{
-		cl = 6;
-	}
-	else
-	{
-		DB(mvOsPrintf("sdramDdr2TimeLoRegCalc: CAS latency %d unsupported. using CAS latency 4\n",
-				minCas));
-		cl = 4;
-	}
-
-	ddr2TimeLoReg |= ((cl-3) << SD2TLR_TODT_ON_RD_OFFS);
-	ddr2TimeLoReg |= ( cl << SD2TLR_TODT_OFF_RD_OFFS);
-	ddr2TimeLoReg |= ( cl << SD2TLR_TODT_ON_CTRL_RD_OFFS);
-	ddr2TimeLoReg |= ((cl+3) << SD2TLR_TODT_OFF_CTRL_RD_OFFS);
-
-	/* DDR2 SDRAM timing low */
-	DB(mvOsPrintf("Dram: DDR2 setting timing low with: %x \n", ddr2TimeLoReg));
-
-	return ddr2TimeLoReg;
-}
-
-/*******************************************************************************
-* sdramDdr2TimeHiRegCalc - Set DDR2 DRAM Timing High registers.
-*
-* DESCRIPTION: 
-*       This function config DDR2 DRAM Timing high registers.
-*	
-* INPUT:
-*	minCas	  - minimum CAS supported. 
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       DDR2 sdram timing high reg value.
-*******************************************************************************/
-static MV_U32 sdramDdr2TimeHiRegCalc(MV_U32 minCas)
-{
-	MV_U8 cl = -1;
-	MV_U32 ddr2TimeHiReg;
-
-	/* read and clear the feilds we are going to set */
-	ddr2TimeHiReg = MV_REG_READ(SDRAM_DDR2_TIMING_HI_REG);
-	ddr2TimeHiReg &= ~(SD2THR_TODT_ON_WR_MASK	|
-			   SD2THR_TODT_OFF_WR_MASK	|
-			   SD2THR_TODT_ON_CTRL_WR_MASK	|
-			   SD2THR_TODT_OFF_CTRL_WR_MASK);
-
-	if( minCas == DDR2_CL_3 )
-	{
-		cl = 3;
-	}
-	else if( minCas == DDR2_CL_4 )
-	{
-		cl = 4;
-	}
-	else if( minCas == DDR2_CL_5 )
-	{
-		cl = 5;
-	}
-	else if( minCas == DDR2_CL_6 )
-	{
-		cl = 6;
-	}
-	else
-	{
-		mvOsOutput("sdramDdr2TimeHiRegCalc: CAS latency %d unsupported. using CAS latency 4\n", 
-				minCas);
-		cl = 4;
-	}
-
-	ddr2TimeHiReg |= ((cl-3) << SD2THR_TODT_ON_WR_OFFS);
-	ddr2TimeHiReg |= ( cl << SD2THR_TODT_OFF_WR_OFFS);
-	ddr2TimeHiReg |= ( cl << SD2THR_TODT_ON_CTRL_WR_OFFS);
-	ddr2TimeHiReg |= ((cl+3) << SD2THR_TODT_OFF_CTRL_WR_OFFS);
-
-	/* DDR2 SDRAM timin high  */
-	DB(mvOsPrintf("Dram: DDR2 setting timing high with: %x \n", ddr2TimeHiReg));
-
-	return ddr2TimeHiReg;
-}
-#endif
-
-/*******************************************************************************
-* mvDramIfCalGet - Get CAS Latency
-*
-* DESCRIPTION: 
-*       This function get the CAS Latency.
-*
-* INPUT:
-*       None
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       CAS latency times 10 (to avoid using floating point).
-*
-*******************************************************************************/
-MV_U32 mvDramIfCalGet(void)
-{
-	MV_U32 sdramCasLat, casLatMask;
-	
-    casLatMask = (MV_REG_READ(SDRAM_MODE_REG) & SDRAM_CL_MASK);
-
-    switch (casLatMask)
-    {
-        case SDRAM_DDR2_CL_3: 
-            sdramCasLat = 30;
-            break;
-        case SDRAM_DDR2_CL_4: 
-            sdramCasLat = 40;
-            break;
-        case SDRAM_DDR2_CL_5: 
-            sdramCasLat = 50;
-            break;
-        case SDRAM_DDR2_CL_6: 
-            sdramCasLat = 60;
-            break;
-        default:
-            mvOsOutput("mvDramIfCalGet: Err, unknown DDR2 CAL\n");
-            return -1;
-    }                                  
-    
-    return sdramCasLat;
-}
-
-
-/*******************************************************************************
-* mvDramIfSelfRefreshSet - Put the dram in self refresh mode - 
-*
-* DESCRIPTION: 
-*               add support in power management.
-*                          
-*
-* INPUT:
-*       None
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       None
-*
-*******************************************************************************/
-
-MV_VOID mvDramIfSelfRefreshSet()
-{
-    MV_U32 operReg;
-
-      operReg =  MV_REG_READ(SDRAM_OPERATION_REG);
-      MV_REG_WRITE(SDRAM_OPERATION_REG ,operReg |SDRAM_CMD_SLF_RFRSH);
-      /* Read until register is reset to 0 */
-      while(MV_REG_READ(SDRAM_OPERATION_REG));
-}
-/*******************************************************************************
-* mvDramIfDimGetSPDversion - return DIMM SPD version.
-*
-* DESCRIPTION:
-*		This function prints the DRAM controller information.
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		None.
-*
-*******************************************************************************/
-static void mvDramIfDimGetSPDversion(MV_U32 *pMajor, MV_U32 *pMinor, MV_U32 bankNum)
-{
-	MV_DIMM_INFO dimmInfo;
-	if (bankNum >= MV_DRAM_MAX_CS )
-	{
-		DB(mvOsPrintf("Dram: mvDramIfDimGetSPDversion bad params \n")); 
-		return ;
-	}
-	memset(&dimmInfo,0,sizeof(dimmInfo));
-	if ( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
-	{
-		DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
-		return ;
-	}
-	*pMajor = dimmInfo.spdRawData[DIMM_SPD_VERSION]/10;
-	*pMinor = dimmInfo.spdRawData[DIMM_SPD_VERSION]%10;
-}
-/*******************************************************************************
-* mvDramIfShow - Show DRAM controller information.
-*
-* DESCRIPTION:
-*		This function prints the DRAM controller information.
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*		None.
-*
-*******************************************************************************/
-void mvDramIfShow(void)
-{
-    int i, sdramCasLat, sdramCsSize;
-	MV_U32 Major=0, Minor=0;
-    
-    mvOsOutput("DRAM Controller info:\n");
-    
-    mvOsOutput("Total DRAM ");
-    mvSizePrint(mvDramIfSizeGet());
-    mvOsOutput("\n");
-
-	for(i = 0; i < MV_DRAM_MAX_CS; i++)
-	{ 
-        sdramCsSize = mvDramIfBankSizeGet(i);
-        if (sdramCsSize)
-        {
-			if (0 == (i & 1))
-			{
-				mvDramIfDimGetSPDversion(&Major, &Minor,i);
-				mvOsOutput("DIMM %d version %d.%d\n", i/2, Major, Minor);
-			}
-            mvOsOutput("\tDRAM CS[%d] ", i);
-            mvSizePrint(sdramCsSize);
-            mvOsOutput("\n");
-        }
-    }
-    sdramCasLat = mvDramIfCalGet();
-
-    if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_ECC_EN)
-    {
-        mvOsOutput("ECC enabled, ");
-    }
-    else
-    {
-        mvOsOutput("ECC Disabled, ");
-    }
-    
-    if (MV_REG_READ(SDRAM_CONFIG_REG) & SDRAM_REGISTERED)
-    {
-        mvOsOutput("Registered DIMM\n");
-    }
-    else
-    {
-        mvOsOutput("Non registered DIMM\n");
-    }
-
-    mvOsOutput("Configured CAS Latency %d.%d\n", sdramCasLat/10, sdramCasLat%10);
-}
-/*******************************************************************************
-* mvDramIfGetFirstCS - find the  DRAM bank on the lower address
-* 
-*
-* DESCRIPTION:
-*       This function return the fisrt CS on address 0
-*
-* INPUT:
-*		None.
-*
-* OUTPUT:
-*		None.
-*
-* RETURN:
-*       SDRAM_CS0 or SDRAM_CS2
-*
-*******************************************************************************/
-MV_U32 mvDramIfGetFirstCS(void)
-{
-	MV_DRAM_BANK_INFO bankInfo[MV_DRAM_MAX_CS];
-
-	if (DRAM_CS_Order[0] == N_A)
-	{
-		mvDramBankInfoGet(SDRAM_CS0, &bankInfo[SDRAM_CS0]);
-#ifdef MV_INCLUDE_SDRAM_CS2
-		mvDramBankInfoGet(SDRAM_CS2, &bankInfo[SDRAM_CS2]);
-#endif 
-		
-#ifdef MV_INCLUDE_SDRAM_CS2
-		if (bankInfo[SDRAM_CS0].size <  bankInfo[SDRAM_CS2].size)
-		{
-			DRAM_CS_Order[0] = SDRAM_CS2;
-			DRAM_CS_Order[1] = SDRAM_CS3;
-			DRAM_CS_Order[2] = SDRAM_CS0;
-			DRAM_CS_Order[3] = SDRAM_CS1;
-
-			return SDRAM_CS2;
-		}
-#endif
-		DRAM_CS_Order[0] = SDRAM_CS0;
-		DRAM_CS_Order[1] = SDRAM_CS1;
-#ifdef MV_INCLUDE_SDRAM_CS2
-		DRAM_CS_Order[2] = SDRAM_CS2;
-		DRAM_CS_Order[3] = SDRAM_CS3;
-#endif	
-		return SDRAM_CS0;
-	}
-	return DRAM_CS_Order[0];
-}
-/*******************************************************************************
-* mvDramIfGetCSorder - 
-* 
-*
-* DESCRIPTION:
-*       This function return the fisrt CS on address 0
-*
-* INPUT:
-*		CS number.
-*
-* OUTPUT:
-*		CS order.
-*
-* RETURN:
-*       SDRAM_CS0 or SDRAM_CS2
-* 
-* NOTE: mvDramIfGetFirstCS must be caled before this subroutine
-*******************************************************************************/
-MV_U32 mvDramIfGetCSorder(MV_U32 csOrder )
-{
-	return DRAM_CS_Order[csOrder];
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h
deleted file mode 100644
index 23f2e540c0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIf.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvDramIfh
-#define __INCmvDramIfh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* includes */
-#include "ddr2/mvDramIfRegs.h"
-#include "ddr2/mvDramIfConfig.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* defines  */
-/* DRAM Timing parameters */
-#define SDRAM_TWR                    15  /* ns tWr */
-#define SDRAM_TRFC_64_512M_AT_200MHZ 70  /* ns tRfc for dens 64-512 @ 200MHz */
-#define SDRAM_TRFC_64_512M           75  /* ns tRfc for dens 64-512          */
-#define SDRAM_TRFC_1G                120 /* ns tRfc for dens 1GB             */
-#define SDRAM_TR2R_CYC               1   /* cycle for tR2r                   */
-
-#define CAL_AUTO_DETECT     0   /* Do not force CAS latancy (mvDramIfDetect) */
-#define ECC_DISABLE         1   /* Force ECC to Disable                      */
-#define ECC_ENABLE          0   /* Force ECC to ENABLE                       */
-/* typedefs */
-
-/* enumeration for memory types */
-typedef enum _mvMemoryType
-{
-    MEM_TYPE_SDRAM,
-    MEM_TYPE_DDR1,
-    MEM_TYPE_DDR2
-}MV_MEMORY_TYPE;
-
-/* enumeration for DDR2 supported CAS Latencies */
-typedef enum _mvDimmDdr2Cas
-{
-    DDR2_CL_3    = 0x08, 
-    DDR2_CL_4    = 0x10, 
-    DDR2_CL_5    = 0x20, 
-    DDR2_CL_6    = 0x40, 
-    DDR2_CL_FAULT
-} MV_DIMM_DDR2_CAS;
-
-
-typedef struct _mvDramBankInfo
-{
-    MV_MEMORY_TYPE  memoryType; 	/* DDR1, DDR2 or SDRAM */
-
-    /* DIMM dimensions */
-    MV_U32  numOfRowAddr;
-    MV_U32  numOfColAddr;
-    MV_U32  dataWidth;
-    MV_U32  errorCheckType;             /* ECC , PARITY..*/
-    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
-    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
-    MV_U32  burstLengthSupported;
-    MV_U32  numOfBanksOnEachDevice;
-    MV_U32  suportedCasLatencies;
-    MV_U32  refreshInterval;
-
-    /* DIMM timing parameters */
-    MV_U32  minCycleTimeAtMaxCasLatPs;	
-    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
-    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
-    MV_U32  minRowPrechargeTime;
-    MV_U32  minRowActiveToRowActive;
-    MV_U32  minRasToCasDelay;
-    MV_U32  minRasPulseWidth;
-    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
-    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
-    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
-    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
-                      
-    /* Parameters calculated from the extracted DIMM information */
-    MV_U32  size;
-    MV_U32  deviceDensity;           	/* 16,64,128,256 or 512 Mbit */
-    MV_U32  numberOfDevices;
-
-    /* DIMM attributes (MV_TRUE for yes) */
-    MV_BOOL registeredAddrAndControlInputs;
-    MV_BOOL registeredDQMBinputs;
-     
-}MV_DRAM_BANK_INFO;
-
-#include "ddr2/spd/mvSpd.h"
-
-/* mvDramIf.h API list */
-MV_VOID   mvDramIfBasicAsmInit(MV_VOID);
-MV_STATUS mvDramIfDetect(MV_U32 forcedCl, MV_BOOL eccDisable);
-MV_VOID   _mvDramIfConfig(int entryNum);
-
-MV_U32 mvDramIfBankSizeGet(MV_U32 bankNum);
-MV_U32 mvDramIfBankBaseGet(MV_U32 bankNum);
-MV_U32 mvDramIfSizeGet(MV_VOID);
-MV_U32 mvDramIfCalGet(void);
-MV_STATUS mvDramIfSingleBitErrThresholdSet(MV_U32 threshold);
-MV_VOID mvDramIfSelfRefreshSet(void);
-void mvDramIfShow(void);
-MV_U32 mvDramIfGetFirstCS(void);
-MV_U32 mvDramIfGetCSorder(MV_U32 csOrder );
-MV_U32 mvDramCsSizeGet(MV_U32 csNum);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvDramIfh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h
deleted file mode 100644
index 6141c46a08..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfConfig.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvDramIfConfigh
-#define __INCmvDramIfConfigh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* includes */
-
-/* defines  */
-
-/* registers defaults values */
-
-#define SDRAM_CONFIG_DV 	(SDRAM_SRMODE_DRAM | BIT25 | BIT30)
-
-#define SDRAM_DUNIT_CTRL_LOW_DDR2_DV			\
-		(SDRAM_SRCLK_KEPT		|	\
-		 SDRAM_CLK1DRV_NORMAL		|	\
-		 (BIT28 | BIT29))
-
-#define SDRAM_ADDR_CTRL_DV	    2
-		
-#define SDRAM_TIMING_CTRL_LOW_REG_DV 	\
-		((0x2 << SDRAM_TRCD_OFFS) | 	\
-		 (0x2 << SDRAM_TRP_OFFS)  | 	\
-		 (0x1 << SDRAM_TWR_OFFS)  | 	\
-		 (0x0 << SDRAM_TWTR_OFFS) | 	\
-		 (0x5 << SDRAM_TRAS_OFFS) | 	\
-		 (0x1 << SDRAM_TRRD_OFFS))
-
-/* Note: value of 0 in register means one cycle, 1 means two and so on  */
-#define SDRAM_TIMING_CTRL_HIGH_REG_DV 	\
-		((0x0 << SDRAM_TR2R_OFFS)	|	\
-		 (0x0 << SDRAM_TR2W_W2R_OFFS)	|	\
-		 (0x1 << SDRAM_TW2W_OFFS))
-
-#define SDRAM_OPEN_PAGES_CTRL_REG_DV 	SDRAM_OPEN_PAGE_EN	
-
-/* Presence	     Ctrl Low    Ctrl High  Dunit Ctrl   Ext Mode     */
-/* CS0              0x84210000  0x00000000  0x0000780F  0x00000440    */
-/* CS0+CS1          0x84210000  0x00000000  0x0000780F  0x00000440    */
-/* CS0+CS2          0x030C030C  0x00000000  0x0000740F  0x00000404    */
-/* CS0+CS1+CS2      0x030C030C  0x00000000  0x0000740F  0x00000404    */
-/* CS0+CS2+CS3      0x030C030C  0x00000000  0x0000740F  0x00000404    */
-/* CS0+CS1+CS2+CS3  0x030C030C  0x00000000  0x0000740F  0x00000404    */
-
-#define DDR2_ODT_CTRL_LOW_CS0_CS1_DV		0x84210000
-#define DDR2_ODT_CTRL_HIGH_CS0_CS1_DV		0x00000000
-#define DDR2_DUNIT_ODT_CTRL_CS0_CS1_DV		0x0000E80F
-#ifdef MV78XX0
-#define DDR_SDRAM_EXT_MODE_CS0_CS1_DV		0x00000040
-#else
-#define DDR_SDRAM_EXT_MODE_CS0_CS1_DV		0x00000440
-#endif
-
-#define DDR2_ODT_CTRL_LOW_CS0_CS1_CS2_CS3_DV	0x030C030C
-#define DDR2_ODT_CTRL_HIGH_CS0_CS1_CS2_CS3_DV	0x00000000
-#define DDR2_DUNIT_ODT_CTRL_CS0_CS1_CS2_CS3_DV	0x0000F40F
-#ifdef MV78XX0
-#define DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV	0x00000004
-#define DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV	0x00000044
-#else
-#define DDR_SDRAM_EXT_MODE_CS0_CS1_CS2_CS3_DV	0x00000404
-#define DDR_SDRAM_EXT_MODE_FAST_CS0_CS1_CS2_CS3_DV	0x00000444
-#endif
-
-/* DDR SDRAM Adderss/Control and Data Pads Calibration default values */
-#define DDR2_ADDR_CTRL_PAD_STRENGTH_TYPICAL_DV	\
-		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-		
-#define DDR2_DATA_PAD_STRENGTH_TYPICAL_DV		\
-		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-
-/* DDR SDRAM Mode Register default value */
-#define DDR2_MODE_REG_DV		(SDRAM_BURST_LEN_4 | SDRAM_WR_3_CYC)
-/* DDR SDRAM Timing parameter default values */
-#define SDRAM_TIMING_CTRL_LOW_REG_DEFAULT  	0x33136552
-#define SDRAM_TRFC_DEFAULT_VALUE		0x34
-#define SDRAM_TRFC_DEFAULT		SDRAM_TRFC_DEFAULT_VALUE
-#define SDRAM_TW2W_DEFALT		(0x1 << SDRAM_TW2W_OFFS)
-
-#define SDRAM_TIMING_CTRL_HIGH_REG_DEFAULT  (SDRAM_TRFC_DEFAULT | SDRAM_TW2W_DEFALT)
-
-#define SDRAM_FTDLL_REG_DEFAULT_LEFT  		0x88C800
-#define SDRAM_FTDLL_REG_DEFAULT_RIGHT  		0x88C800
-#define SDRAM_FTDLL_REG_DEFAULT_UP  		0x88C800
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvDramIfh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h
deleted file mode 100644
index 369eda692b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfRegs.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDramIfRegsh
-#define __INCmvDramIfRegsh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* DDR SDRAM Controller Address Decode Registers */
- /* SDRAM CSn Base Address Register (SCBAR) */
-#define SDRAM_BASE_ADDR_REG(cpu,csNum)	(0x1500 + ((csNum) * 8) + ((cpu) * 0x70))
-#define SCBAR_BASE_OFFS			16 
-#define SCBAR_BASE_MASK			(0xffff << SCBAR_BASE_OFFS)
-#define SCBAR_BASE_ALIGNMENT		0x10000 
-
-/* SDRAM CSn Size Register (SCSR) */		  
-#define SDRAM_SIZE_REG(cpu,csNum)	(0x1504 + ((csNum) * 8) + ((cpu) * 0x70)) 
-#define SCSR_SIZE_OFFS			24
-#define SCSR_SIZE_MASK			(0xff << SCSR_SIZE_OFFS)
-#define SCSR_SIZE_ALIGNMENT		0x1000000
-#define SCSR_WIN_EN			BIT0
-
-/* configuration register */
-#define SDRAM_CONFIG_REG   		(DRAM_BASE + 0x1400)
-#define SDRAM_REFRESH_OFFS 		0
-#define SDRAM_REFRESH_MAX  		0x3FFF
-#define SDRAM_REFRESH_MASK 		(SDRAM_REFRESH_MAX << SDRAM_REFRESH_OFFS)
-#define SDRAM_DWIDTH_OFFS       	15
-#define SDRAM_DWIDTH_MASK       	(1 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_DWIDTH_32BIT      	(0 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_DWIDTH_64BIT      	(1 << SDRAM_DWIDTH_OFFS)
-#define SDRAM_REGISTERED   		(1 << 17)
-#define SDRAM_ECC_OFFS    		18
-#define SDRAM_ECC_MASK    		(1 << SDRAM_ECC_OFFS)
-#define SDRAM_ECC_DIS     		(0 << SDRAM_ECC_OFFS)
-#define SDRAM_ECC_EN        		(1 << SDRAM_ECC_OFFS)
-#define SDRAM_IERR_OFFS    		19
-#define SDRAM_IERR_MASK    		(1 << SDRAM_IERR_OFFS)
-#define SDRAM_IERR_REPORTE     		(0 << SDRAM_IERR_OFFS)
-#define SDRAM_IERR_IGNORE      		(1 << SDRAM_IERR_OFFS)
-#define SDRAM_SRMODE_OFFS       	24
-#define SDRAM_SRMODE_MASK       	(1 << SDRAM_SRMODE_OFFS)
-#define SDRAM_SRMODE_POWER      	(0 << SDRAM_SRMODE_OFFS)
-#define SDRAM_SRMODE_DRAM       	(1 << SDRAM_SRMODE_OFFS)
-
-/* dunit control low register */
-#define SDRAM_DUNIT_CTRL_REG  		(DRAM_BASE + 0x1404)
-#define SDRAM_2T_OFFS			4
-#define SDRAM_2T_MASK			(1 << SDRAM_2T_OFFS)
-#define SDRAM_2T_MODE			(1 << SDRAM_2T_OFFS)
-
-#define SDRAM_SRCLK_OFFS		5
-#define SDRAM_SRCLK_MASK		(1 << SDRAM_SRCLK_OFFS)
-#define SDRAM_SRCLK_KEPT		(0 << SDRAM_SRCLK_OFFS)
-#define SDRAM_SRCLK_GATED		(1 << SDRAM_SRCLK_OFFS)
-#define SDRAM_CTRL_POS_OFFS	   	6
-#define SDRAM_CTRL_POS_MASK		(1 << SDRAM_CTRL_POS_OFFS)
-#define SDRAM_CTRL_POS_FALL	   	(0 << SDRAM_CTRL_POS_OFFS)
-#define SDRAM_CTRL_POS_RISE	   	(1 << SDRAM_CTRL_POS_OFFS)
-#define SDRAM_CLK1DRV_OFFS      	12
-#define SDRAM_CLK1DRV_MASK      	(1 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_CLK1DRV_HIGH_Z    	(0 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_CLK1DRV_NORMAL    	(1 << SDRAM_CLK1DRV_OFFS)
-#define SDRAM_CLK2DRV_OFFS      	13
-#define SDRAM_CLK2DRV_MASK      	(1 << SDRAM_CLK2DRV_OFFS)
-#define SDRAM_CLK2DRV_HIGH_Z    	(0 << SDRAM_CLK2DRV_OFFS)
-#define SDRAM_CLK2DRV_NORMAL    	(1 << SDRAM_CLK2DRV_OFFS)
-#define SDRAM_SB_OUT_DEL_OFFS 		20
-#define SDRAM_SB_OUT_DEL_MAX 		0xf
-#define SDRAM_SB_OUT_MASK 		(SDRAM_SB_OUT_DEL_MAX<<SDRAM_SB_OUT_DEL_OFFS)
-#define SDRAM_SB_IN_DEL_OFFS 		24
-#define SDRAM_SB_IN_DEL_MAX 		0xf
-#define SDRAM_SB_IN_MASK 		(SDRAM_SB_IN_DEL_MAX<<SDRAM_SB_IN_DEL_OFFS)
-
-/* dunit control hight register */
-#define SDRAM_DUNIT_CTRL_HI_REG  	(DRAM_BASE + 0x1424)
-#define SDRAM__D2P_OFFS			7
-#define SDRAM__D2P_EN			(1 << SDRAM__D2P_OFFS)
-#define SDRAM__P2D_OFFS			8
-#define SDRAM__P2D_EN			(1 << SDRAM__P2D_OFFS)
-#define SDRAM__ADD_HALF_FCC_OFFS	9
-#define SDRAM__ADD_HALF_FCC_EN		(1 << SDRAM__ADD_HALF_FCC_OFFS)
-#define SDRAM__PUP_ZERO_SKEW_OFFS	10
-#define SDRAM__PUP_ZERO_SKEW_EN		(1 << SDRAM__PUP_ZERO_SKEW_OFFS)
-#define SDRAM__WR_MESH_DELAY_OFFS	11
-#define SDRAM__WR_MESH_DELAY_EN		(1 << SDRAM__WR_MESH_DELAY_OFFS)
-
-/* sdram timing control low register */
-#define SDRAM_TIMING_CTRL_LOW_REG	(DRAM_BASE + 0x1408)
-#define SDRAM_TRCD_OFFS 		4
-#define SDRAM_TRCD_MASK 		(0xF << SDRAM_TRCD_OFFS)
-#define SDRAM_TRP_OFFS 			8
-#define SDRAM_TRP_MASK 			(0xF << SDRAM_TRP_OFFS)
-#define SDRAM_TWR_OFFS 			12
-#define SDRAM_TWR_MASK 			(0xF << SDRAM_TWR_OFFS)
-#define SDRAM_TWTR_OFFS 		16
-#define SDRAM_TWTR_MASK 		(0xF << SDRAM_TWTR_OFFS)
-#define SDRAM_TRAS_OFFS 		0
-#define SDRAM_TRAS_MASK 		(0xF << SDRAM_TRAS_OFFS)
-#define SDRAM_EXT_TRAS_OFFS 		20
-#define SDRAM_EXT_TRAS_MASK 		(0x1 << SDRAM_EXT_TRAS_OFFS)
-#define SDRAM_TRRD_OFFS 		24
-#define SDRAM_TRRD_MASK 		(0xF << SDRAM_TRRD_OFFS)
-#define SDRAM_TRTP_OFFS			28
-#define SDRAM_TRTP_MASK			(0xF << SDRAM_TRTP_OFFS)
-#define SDRAM_TRTP_DDR1 		(0x1 << SDRAM_TRTP_OFFS)
-
-/* sdram timing control high register */
-#define SDRAM_TIMING_CTRL_HIGH_REG	(DRAM_BASE + 0x140c)
-#define SDRAM_TRFC_OFFS 		0
-#define SDRAM_TRFC_MASK 		(0x3F << SDRAM_TRFC_OFFS)
-#define SDRAM_TR2R_OFFS 		7
-#define SDRAM_TR2R_MASK 		(0x3 << SDRAM_TR2R_OFFS)
-#define SDRAM_TR2W_W2R_OFFS		9
-#define SDRAM_TR2W_W2R_MASK		(0x3 << SDRAM_TR2W_W2R_OFFS)
-#define SDRAM_TW2W_OFFS			11
-#define SDRAM_TW2W_MASK			(0x3 << SDRAM_TW2W_OFFS)
-
-/* sdram DDR2 timing low register (SD2TLR) */
-#define SDRAM_DDR2_TIMING_LO_REG	(DRAM_BASE + 0x1428)
-#define SD2TLR_TODT_ON_RD_OFFS		4
-#define SD2TLR_TODT_ON_RD_MASK		(0xF << SD2TLR_TODT_ON_RD_OFFS)
-#define SD2TLR_TODT_OFF_RD_OFFS		8
-#define SD2TLR_TODT_OFF_RD_MASK		(0xF << SD2TLR_TODT_OFF_RD_OFFS)
-#define SD2TLR_TODT_ON_CTRL_RD_OFFS	12
-#define SD2TLR_TODT_ON_CTRL_RD_MASK	(0xF << SD2TLR_TODT_ON_CTRL_RD_OFFS)
-#define SD2TLR_TODT_OFF_CTRL_RD_OFFS	16
-#define SD2TLR_TODT_OFF_CTRL_RD_MASK	(0xF << SD2TLR_TODT_OFF_CTRL_RD_OFFS)
-
-/* sdram DDR2 timing high register (SD2TLR) */
-#define SDRAM_DDR2_TIMING_HI_REG	(DRAM_BASE + 0x147C)
-#define SD2THR_TODT_ON_WR_OFFS		0
-#define SD2THR_TODT_ON_WR_MASK		(0xF << SD2THR_TODT_ON_WR_OFFS)
-#define SD2THR_TODT_OFF_WR_OFFS		4
-#define SD2THR_TODT_OFF_WR_MASK		(0xF << SD2THR_TODT_OFF_WR_OFFS)
-#define SD2THR_TODT_ON_CTRL_WR_OFFS	8
-#define SD2THR_TODT_ON_CTRL_WR_MASK	(0xF << SD2THR_TODT_ON_CTRL_WR_OFFS)
-#define SD2THR_TODT_OFF_CTRL_WR_OFFS	12
-#define SD2THR_TODT_OFF_CTRL_WR_MASK	(0xF << SD2THR_TODT_OFF_CTRL_WR_OFFS)
-
-/* address control register */
-#define SDRAM_ADDR_CTRL_REG		(DRAM_BASE + 0x1410)
-#define SDRAM_ADDRSEL_OFFS(cs)		(4 * (cs))
-#define SDRAM_ADDRSEL_MASK(cs)		(0x3 << SDRAM_ADDRSEL_OFFS(cs))
-#define SDRAM_ADDRSEL_X8(cs)		(0x0 << SDRAM_ADDRSEL_OFFS(cs))
-#define SDRAM_ADDRSEL_X16(cs)		(0x1 << SDRAM_ADDRSEL_OFFS(cs))
-#define SDRAM_DSIZE_OFFS(cs)   	    	(2 + 4 * (cs))
-#define SDRAM_DSIZE_MASK(cs)   	    	(0x3 << SDRAM_DSIZE_OFFS(cs))
-#define SDRAM_DSIZE_256Mb(cs) 	    	(0x1 << SDRAM_DSIZE_OFFS(cs))
-#define SDRAM_DSIZE_512Mb(cs)  	    	(0x2 << SDRAM_DSIZE_OFFS(cs))
-#define SDRAM_DSIZE_1Gb(cs)  	    	(0x3 << SDRAM_DSIZE_OFFS(cs))
-#define SDRAM_DSIZE_2Gb(cs)  	    	(0x0 << SDRAM_DSIZE_OFFS(cs))
-
-/* SDRAM Open Pages Control registers */
-#define SDRAM_OPEN_PAGE_CTRL_REG	(DRAM_BASE + 0x1414)
-#define SDRAM_OPEN_PAGE_EN			(0 << 0)
-#define SDRAM_OPEN_PAGE_DIS			(1 << 0)
-
-/* sdram opertion register */
-#define SDRAM_OPERATION_REG 		(DRAM_BASE + 0x1418)
-#define SDRAM_CMD_OFFS  			0
-#define SDRAM_CMD_MASK   			(0xF << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_NORMAL 			(0x0 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_PRECHARGE_ALL 	(0x1 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_REFRESH_ALL 		(0x2 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_REG_SET_CMD 		(0x3 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EXT_MODE_SET 		(0x4 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_NOP 				(0x5 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_SLF_RFRSH 		(0x7 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EMRS2_CMD  		(0x8 << SDRAM_CMD_OFFS)
-#define SDRAM_CMD_EMRS3_CMD  		(0x9 << SDRAM_CMD_OFFS)
-
-/* sdram mode register */
-#define SDRAM_MODE_REG 				(DRAM_BASE + 0x141c)
-#define SDRAM_BURST_LEN_OFFS 		0
-#define SDRAM_BURST_LEN_MASK 		(0x7 << SDRAM_BURST_LEN_OFFS)
-#define SDRAM_BURST_LEN_4    		(0x2 << SDRAM_BURST_LEN_OFFS)
-#define SDRAM_CL_OFFS   			4
-#define SDRAM_CL_MASK   			(0x7 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_3      		(0x3 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_4      		(0x4 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_5    		    (0x5 << SDRAM_CL_OFFS)
-#define SDRAM_DDR2_CL_6    		    (0x6 << SDRAM_CL_OFFS)
-
-#define SDRAM_TM_OFFS           	7
-#define SDRAM_TM_MASK           	(1 << SDRAM_TM_OFFS)
-#define SDRAM_TM_NORMAL         	(0 << SDRAM_TM_OFFS)
-#define SDRAM_TM_TEST_MODE      	(1 << SDRAM_TM_OFFS)
-#define SDRAM_DLL_OFFS         		8
-#define SDRAM_DLL_MASK          	(1 << SDRAM_DLL_OFFS)
-#define SDRAM_DLL_NORMAL        	(0 << SDRAM_DLL_OFFS)
-#define SDRAM_DLL_RESET 			(1 << SDRAM_DLL_OFFS)
-#define SDRAM_WR_OFFS				9
-#define SDRAM_WR_MAX				7
-#define SDRAM_WR_MASK				(SDRAM_WR_MAX << SDRAM_WR_OFFS)
-#define SDRAM_WR_2_CYC				(1 << SDRAM_WR_OFFS)
-#define SDRAM_WR_3_CYC				(2 << SDRAM_WR_OFFS)
-#define SDRAM_WR_4_CYC				(3 << SDRAM_WR_OFFS)
-#define SDRAM_WR_5_CYC				(4 << SDRAM_WR_OFFS)
-#define SDRAM_WR_6_CYC				(5 << SDRAM_WR_OFFS)
-#define SDRAM_PD_OFFS				12
-#define SDRAM_PD_MASK				(1 << SDRAM_PD_OFFS) 
-#define SDRAM_PD_FAST_EXIT			(0 << SDRAM_PD_OFFS) 
-#define SDRAM_PD_SLOW_EXIT			(1 << SDRAM_PD_OFFS) 
-
-/* DDR SDRAM Extended Mode register (DSEMR) */
-#define SDRAM_EXTENDED_MODE_REG		(DRAM_BASE + 0x1420)
-#define DSEMR_DLL_ENABLE			0
-#define DSEMR_DLL_DISABLE			1
-#define DSEMR_DS_OFFS				1
-#define DSEMR_DS_MASK				(1 << DSEMR_DS_OFFS)
-#define DSEMR_DS_NORMAL				(0 << DSEMR_DS_OFFS)
-#define DSEMR_DS_REDUCED			(1 << DSEMR_DS_OFFS)
-#define DSEMR_QOFF_OUTPUT_BUFF_EN	(0 << 12)
-#define DSEMR_RTT0_OFFS				2
-#define DSEMR_RTT1_OFFS				6
-#define DSEMR_RTT_ODT_DISABLE		((0 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
-#define DSEMR_RTT_ODT_75_OHM		((1 << DSEMR_RTT0_OFFS)||(0 << DSEMR_RTT1_OFFS))
-#define DSEMR_RTT_ODT_150_OHM		((0 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
-#define DSEMR_RTT_ODT_50_OHM		((1 << DSEMR_RTT0_OFFS)||(1 << DSEMR_RTT1_OFFS))
-#define DSEMR_DQS_OFFS				10
-#define DSEMR_DQS_MASK				(1 << DSEMR_DQS_OFFS)
-#define DSEMR_DQS_DIFFERENTIAL		(0 << DSEMR_DQS_OFFS)
-#define DSEMR_DQS_SINGLE_ENDED		(1 << DSEMR_DQS_OFFS)
-#define DSEMR_RDQS_ENABLE			(1 << 11)
-#define DSEMR_QOFF_OUTPUT_BUFF_EN	(0 << 12)
-#define DSEMR_QOFF_OUTPUT_BUFF_DIS	(1 << 12)
-
-/* DDR SDRAM Operation Control Register */
-#define SDRAM_OPERATION_CTRL_REG	(DRAM_BASE + 0x142c)
-
-/* Dunit FTDLL Configuration Register */
-#define SDRAM_FTDLL_CONFIG_LEFT_REG		(DRAM_BASE + 0x1484)
-#define SDRAM_FTDLL_CONFIG_RIGHT_REG		(DRAM_BASE + 0x161C)
-#define SDRAM_FTDLL_CONFIG_UP_REG		(DRAM_BASE + 0x1620)
-  
-/* Pads Calibration register */
-#define SDRAM_ADDR_CTRL_PADS_CAL_REG	(DRAM_BASE + 0x14c0)
-#define SDRAM_DATA_PADS_CAL_REG		    (DRAM_BASE + 0x14c4)
-#define SDRAM_DRVN_OFFS 			0
-#define SDRAM_DRVN_MASK 			(0x3F << SDRAM_DRVN_OFFS)
-#define SDRAM_DRVP_OFFS 			6
-#define SDRAM_DRVP_MASK 			(0x3F << SDRAM_DRVP_OFFS)
-#define SDRAM_PRE_DRIVER_STRENGTH_OFFS		12
-#define SDRAM_PRE_DRIVER_STRENGTH_MASK		(3 << SDRAM_PRE_DRIVER_STRENGTH_OFFS)
-#define SDRAM_TUNE_EN   		BIT16
-#define SDRAM_LOCKN_OFFS 			17
-#define SDRAM_LOCKN_MAKS 			(0x3F << SDRAM_LOCKN_OFFS)
-#define SDRAM_LOCKP_OFFS 			23
-#define SDRAM_LOCKP_MAKS 			(0x3F << SDRAM_LOCKP_OFFS)
-#define SDRAM_WR_EN     			(1 << 31)
-
-/* DDR2 SDRAM ODT Control (Low) Register (DSOCLR) */
-#define DDR2_SDRAM_ODT_CTRL_LOW_REG (DRAM_BASE + 0x1494)
-#define DSOCLR_ODT_RD_OFFS(odtNum)  (odtNum * 4)
-#define DSOCLR_ODT_RD_MASK(odtNum)  (0xf << DSOCLR_ODT_RD_OFFS(odtNum))
-#define DSOCLR_ODT_RD(odtNum, bank) ((1 << bank) << DSOCLR_ODT_RD_OFFS(odtNum))
-#define DSOCLR_ODT_WR_OFFS(odtNum)  (16 + (odtNum * 4))
-#define DSOCLR_ODT_WR_MASK(odtNum)  (0xf << DSOCLR_ODT_WR_OFFS(odtNum))
-#define DSOCLR_ODT_WR(odtNum, bank) ((1 << bank) << DSOCLR_ODT_WR_OFFS(odtNum))
-
-/* DDR2 SDRAM ODT Control (High) Register (DSOCHR) */
-#define DDR2_SDRAM_ODT_CTRL_HIGH_REG    	(DRAM_BASE + 0x1498)
-/* Optional control values to DSOCHR_ODT_EN macro */
-#define DDR2_ODT_CTRL_DUNIT         0
-#define DDR2_ODT_CTRL_NEVER         1
-#define DDR2_ODT_CTRL_ALWAYS        3
-#define DSOCHR_ODT_EN_OFFS(odtNum)  (odtNum * 2)
-#define DSOCHR_ODT_EN_MASK(odtNum)  (0x3 << DSOCHR_ODT_EN_OFFS(odtNum))
-#define DSOCHR_ODT_EN(odtNum, ctrl) (ctrl << DSOCHR_ODT_EN_OFFS(odtNum))
-
-/* DDR2 Dunit ODT Control Register (DDOCR)*/
-#define DDR2_DUNIT_ODT_CONTROL_REG  (DRAM_BASE + 0x149c)
-#define DDOCR_ODT_RD_OFFS          	0
-#define DDOCR_ODT_RD_MASK           (0xf << DDOCR_ODT_RD_OFFS)
-#define DDOCR_ODT_RD(bank)          ((1 << bank) << DDOCR_ODT_RD_OFFS)
-#define DDOCR_ODT_WR_OFFS           4
-#define DDOCR_ODT_WR_MASK           (0xf << DDOCR_ODT_WR_OFFS)
-#define DDOCR_ODT_WR(bank)          ((1 << bank) << DDOCR_ODT_WR_OFFS)
-#define DSOCR_ODT_EN_OFFS           8
-#define DSOCR_ODT_EN_MASK           (0x3 << DSOCR_ODT_EN_OFFS)
-/* For ctrl parameters see DDR2 SDRAM ODT Control (High) Register (0x1498) above. */
-#define DSOCR_ODT_EN(ctrl)         	(ctrl << DSOCR_ODT_EN_OFFS)
-#define DSOCR_ODT_SEL_DISABLE	    0	
-#define DSOCR_ODT_SEL_75_OHM	    2	
-#define DSOCR_ODT_SEL_150_OHM	    1
-#define DSOCR_ODT_SEL_50_OHM        3
-#define DSOCR_DQ_ODT_SEL_OFFS       10
-#define DSOCR_DQ_ODT_SEL_MASK       (0x3 << DSOCR_DQ_ODT_SEL_OFFS)
-#define DSOCR_DQ_ODT_SEL(odtSel)    (odtSel << DSOCR_DQ_ODT_SEL_OFFS)
-#define DSOCR_ST_ODT_SEL_OFFS       12
-#define DSOCR_ST_ODT_SEL_MASK       (0x3 << DSOCR_ST_ODT_SEL_OFFS)
-#define DSOCR_ST_ODT_SEL(odtSel)    (odtSel << DSOCR_ST_ODT_SEL_OFFS)
-#define DSOCR_ST_ODT_EN             (1 << 14)
-
-/* DDR SDRAM Initialization Control Register (DSICR) */
-#define DDR_SDRAM_INIT_CTRL_REG	    (DRAM_BASE + 0x1480)
-#define DSICR_INIT_EN		    	(1 << 0)
-#define DSICR_T200_SET		    	(1 << 8)
-
-/* sdram extended mode2 register (SEM2R) */
-#define SDRAM_EXTENDED_MODE2_REG	(DRAM_BASE + 0x148C)
-#define SEM2R_EMRS2_DDR2_OFFS		0
-#define SEM2R_EMRS2_DDR2_MASK		(0x7FFF << SEM2R_EMRS2_DDR2_OFFS)
-
-/* sdram extended mode3 register (SEM3R) */
-#define SDRAM_EXTENDED_MODE3_REG	(DRAM_BASE + 0x1490)
-#define SEM3R_EMRS3_DDR2_OFFS		0
-#define SEM3R_EMRS3_DDR2_MASK		(0x7FFF << SEM3R_EMRS3_DDR2_OFFS)
-
-/* sdram error registers */
-#define SDRAM_ERROR_CAUSE_REG               	(DRAM_BASE + 0x14d0)
-#define SDRAM_ERROR_MASK_REG                	(DRAM_BASE + 0x14d4)
-#define SDRAM_ERROR_DATA_LOW_REG            	(DRAM_BASE + 0x1444)
-#define SDRAM_ERROR_DATA_HIGH_REG           	(DRAM_BASE + 0x1440)
-#define SDRAM_ERROR_ADDR_REG                	(DRAM_BASE + 0x1450)
-#define SDRAM_ERROR_ECC_REG                 	(DRAM_BASE + 0x1448)
-#define SDRAM_CALC_ECC_REG                  	(DRAM_BASE + 0x144c)
-#define SDRAM_ECC_CONTROL_REG               	(DRAM_BASE + 0x1454)
-#define SDRAM_SINGLE_BIT_ERR_CNTR_REG 		(DRAM_BASE + 0x1458)
-#define SDRAM_DOUBLE_BIT_ERR_CNTR_REG 		(DRAM_BASE + 0x145c)
-
-/* SDRAM Error Cause Register (SECR) */
-#define SECR_SINGLE_BIT_ERR			BIT0
-#define SECR_DOUBLE_BIT_ERR			BIT1
-#define SECR_DATA_PATH_PARITY_ERR	BIT2
-/* SDRAM Error Address Register (SEAR) */
-#define SEAR_ERR_TYPE_OFFS			0
-#define SEAR_ERR_TYPE_MASK      	(1 << SEAR_ERR_TYPE_OFFS)
-#define SEAR_ERR_TYPE_SINGLE    	0	
-#define SEAR_ERR_TYPE_DOUBLE    	(1 << SEAR_ERR_TYPE_OFFS)
-#define SEAR_ERR_CS_OFFS			1
-#define SEAR_ERR_CS_MASK			(3 << SEAR_ERR_CS_OFFS)
-#define SEAR_ERR_CS(csNum)			(csNum << SEAR_ERR_CS_OFFS)
-#define SEAR_ERR_ADDR_OFFS      	3
-#define SEAR_ERR_ADDR_MASK      	(0x1FFFFFFF << SEAR_ERR_ADDR_OFFS)
-
-/* SDRAM ECC Control Register (SECR) */
-#define SECR_FORCEECC_OFFS          0
-#define SECR_FORCEECC_MASK          (0xFF << SECR_FORCEECC_OFFS)
-#define SECR_FORCEEN_OFFS           8
-#define SECR_FORCEEN_MASK           (1 << SECR_FORCEEN_OFFS)
-#define SECR_ECC_CALC_MASK          (0 << SECR_FORCEEN_OFFS)
-#define SECR_ECC_USER_MASK          (1 << SECR_FORCEEN_OFFS)
-#define SECR_PERRPROP_EN            BIT9
-#define SECR_CNTMODE_OFFS           10
-#define SECR_CNTMODE_MASK           (1 << SECR_CNTMODE_OFFS)
-#define SECR_ALL_IN_CS0             (0 << SECR_CNTMODE_OFFS)
-#define SECR_NORMAL_COUNTER         (1 << SECR_CNTMODE_OFFS)
-#define SECR_THRECC_OFFS            16
-#define SECR_THRECC_MAX             0xFF
-#define SECR_THRECC_MASK            (SECR_THRECC_MAX << SECR_THRECC_OFFS)
-#define SECR_THRECC(threshold)      (threshold << SECR_THRECC_OFFS)
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvDramIfRegsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h
deleted file mode 100644
index f3bf83b4ea..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/mvDramIfStaticInit.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvDramIfStaticInith
-#define __INCmvDramIfStaticInith
-
-#ifdef MV_STATIC_DRAM_ON_BOARD
-#define STATIC_DRAM_BANK_1
-#undef	STATIC_DRAM_BANK_2             
-#undef	STATIC_DRAM_BANK_3                         
-#undef 	STATIC_DRAM_BANK_4             
-
-
-#ifdef MV_DIMM_TS256MLQ72V5U
-#define	STATIC_DRAM_BANK_2             
-#define	STATIC_DRAM_BANK_3                         
-#undef 	STATIC_DRAM_BANK_4             
-
-#define STATIC_SDRAM_CONFIG_REG		    0x4724481A  /* offset 0x1400 - DMA reg-0xf1000814 */ 
-#define STATIC_SDRAM_DUNIT_CTRL_REG         0x37707450  /* offset 0x1404 - DMA reg-0xf100081c */ 
-#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x11A13330  /* offset 0x1408 - DMA reg-0xf1000824 */ 
-#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x00000601  /* offset 0x140c - DMA reg-0xf1000828 */ 
-#define STATIC_SDRAM_ADDR_CTRL_REG          0x00001CB2  /* offset 0x1410 - DMA reg-0xf1000820 */ 
-#define STATIC_SDRAM_MODE_REG               0x00000642  /* offset 0x141c - DMA reg-0xf1000818 */ 
-#define STATIC_SDRAM_ODT_CTRL_LOW	    0x030C030C /*   0x1494  */  
-#define STATIC_SDRAM_ODT_CTRL_HI	    0x00000000 /*   0x1498  */  
-#define STATIC_SDRAM_DUNIT_ODT_CTRL    	    0x0000740F /*   0x149c  */  
-#define STATIC_SDRAM_EXT_MODE          	    0x00000404 /*   0x1420  */  
-#define STATIC_SDRAM_DDR2_TIMING_LO         0x00074410 /*   0x1428  */  
-#define STATIC_SDRAM_DDR2_TIMING_HI         0x00007441 /*   0x147C  */  
-
-#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x3FFF /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
-#define STATIC_SDRAM_RANK1_SIZE_DIMM0       0x3FFF /* size bank1 dimm0   */ 
-#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x3FFF /* size bank0 dimm1   */ 
-#define STATIC_SDRAM_RANK1_SIZE_DIMM1       0x0	   /* size bank1 dimm1   */ 
-
-#endif /* TS256MLQ72V5U */
-
-
-#ifdef MV_MT9VDDT3272AG
-/* one DIMM 256M  */
-#define STATIC_SDRAM_CONFIG_REG		    0x5820040d  /* offset 0x1400 - DMA reg-0xf1000814 */ 
-#define STATIC_SDRAM_DUNIT_CTRL_REG         0xC4000540  /* offset 0x1404 - DMA reg-0xf100081c */ 
-#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x01602220  /* offset 0x1408 - DMA reg-0xf1000824 */ 
-#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x0000000b  /* offset 0x140c - DMA reg-0xf1000828 */ 
-#define STATIC_SDRAM_ADDR_CTRL_REG          0x00000012  /* offset 0x1410 - DMA reg-0xf1000820 */ 
-#define STATIC_SDRAM_MODE_REG               0x00000062  /* offset 0x141c - DMA reg-0xf1000818 */ 
-#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x0fff /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
-#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x0    /* size bank0 dimm1   */ 
-
-#endif /* MV_MT9VDDT3272AG */
-
-
-
-#ifdef MV_D27RB12P
-/* 
-Two DIMM 512M + ECC enabled, Registered DIMM  CAS Latency 2.5
-*/
-
-#define STATIC_SDRAM_CONFIG_REG		    0x6826081E  /* offset 0x1400 - DMA reg-0xf1000814 */ 
-#define STATIC_SDRAM_DUNIT_CTRL_REG         0xC5000540  /* offset 0x1404 - DMA reg-0xf100081c */ 
-#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    0x01501220  /* offset 0x1408 - DMA reg-0xf1000824 */ 
-#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG   0x00000009  /* offset 0x140c - DMA reg-0xf1000828 */ 
-#define STATIC_SDRAM_ADDR_CTRL_REG          0x00000012  /* offset 0x1410 - DMA reg-0xf1000820 */ 
-#define STATIC_SDRAM_MODE_REG               0x00000062  /* offset 0x141c - DMA reg-0xf1000818 */ 
-#define STATIC_SDRAM_RANK0_SIZE_DIMM0       0x0FFF /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
-#define STATIC_SDRAM_RANK0_SIZE_DIMM1       0x0FFF    /* size bank0 dimm1   */ 
-
-#define STATIC_DRAM_BANK_2             
-
-#define STATIC_DRAM_BANK_3                         
-#define STATIC_DRAM_BANK_4             
-
-#endif /*  mv_D27RB12P  */
-
-#ifdef RD_MV645XX
-
-#define STATIC_MEM_TYPE				MEM_TYPE_DDR2
-#define STATIC_DIMM_INFO_BANK0_SIZE		256
-/* DDR2 boards 256 MB*/
-
-#define STATIC_SDRAM_RANK0_SIZE_DIMM0       	0x00000fff /* size bank0 dimm0   - DMA reg-0xf1000810 */ 
-#define STATIC_SDRAM_CONFIG_REG	     		0x07190618	
-#define STATIC_SDRAM_MODE_REG	     		0x00000432	
-#define STATIC_SDRAM_DUNIT_CTRL_REG     	0xf4a03440
-#define STATIC_SDRAM_ADDR_CTRL_REG	     	0x00000022
-#define STATIC_SDRAM_TIMING_CTRL_LOW_REG    	0x11712220
-#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG	0x00000504
-#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000
-#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000
-#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000780f
-#define STATIC_SDRAM_EXT_MODE          		0x00000440
-#define STATIC_SDRAM_DDR2_TIMING_LO         	0x00063300
-#define STATIC_SDRAM_DDR2_TIMING_HI         	0x00006330
-#endif /* RD_MV645XX */
-
-#if MV_DIMM_M3783354CZ3_CE6 
-
-#define STATIC_SDRAM_RANK0_SIZE_DIMM0		0x00000FFF /* 0x2010 size bank0 dimm0   - DMA reg-0xf1000810 */ 
-#define STATIC_SDRAM_CONFIG_REG	     		0x07190618 /*   0x1400  */ 
-#define STATIC_SDRAM_MODE_REG	     		0x00000432 /*   0x141c  */  
-#define STATIC_SDRAM_DUNIT_CTRL_REG     	0xf4a03440 /*   0x1404  */  
-#define STATIC_SDRAM_ADDR_CTRL_REG	     	0x00000022 /*   0x1410  */  
-#define STATIC_SDRAM_TIMING_CTRL_LOW_REG	0x11712220 /*   0x1408  */  
-#define STATIC_SDRAM_TIMING_CTRL_HIGH_REG	0x00000504 /*   0x140c  */  
-#define STATIC_SDRAM_ODT_CTRL_LOW	     	0x84210000 /*   0x1494  */  
-#define STATIC_SDRAM_ODT_CTRL_HI	     	0x00000000 /*   0x1498  */  
-#define STATIC_SDRAM_DUNIT_ODT_CTRL    		0x0000780f /*   0x149c  */  
-#define STATIC_SDRAM_EXT_MODE          		0x00000440 /*   0x1420  */  
-#define STATIC_SDRAM_DDR2_TIMING_LO		0x00063300 /*   0x1428  */  
-#define STATIC_SDRAM_DDR2_TIMING_HI		0x00006330 /*   0x147C  */  
-
-#endif /* MV_DIMM_M3783354CZ3_CE6 */
-
-#endif /* MV_STATIC_DRAM_ON_BOARD */
-#endif /* __INCmvDramIfStaticInith */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c
deleted file mode 100644
index 7a26f90597..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.c
+++ /dev/null
@@ -1,1474 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "ddr2/spd/mvSpd.h"
-#include "boardEnv/mvBoardEnvLib.h"
-
-/* #define MV_DEBUG */
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
-                                            MV_DRAM_BANK_INFO *pBankInfo);
-static MV_U32  cas2ps(MV_U8 spd_byte);
-/*******************************************************************************
-* mvDramBankGet - Get the DRAM bank paramters.
-*
-* DESCRIPTION:
-*       This function retrieves DRAM bank parameters as described in 
-*       DRAM_BANK_INFO struct to the controller DRAM unit. In case the board 
-*       has its DRAM on DIMMs it will use its EEPROM to extract SPD data
-*       from it. Otherwise, if the DRAM is soldered on board, the function 
-*       should insert its bank information into MV_DRAM_BANK_INFO struct.
-*
-* INPUT:
-*       bankNum  - Board DRAM bank number.
-*
-* OUTPUT:
-*       pBankInfo  - DRAM bank information struct.
-*
-* RETURN:
-*       MV_FAIL - Bank parameters could not be read.
-*
-*******************************************************************************/
-MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo)
-{
-    MV_DIMM_INFO dimmInfo;
-
-    DB(mvOsPrintf("Dram: mvDramBankInfoGet bank %d\n", bankNum)); 
-    /* zero pBankInfo structure */
-
-    if((NULL == pBankInfo) || (bankNum >= MV_DRAM_MAX_CS ))
-    {
-        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
-        return MV_BAD_PARAM;
-    }
-    memset(pBankInfo, 0, sizeof(*pBankInfo));
-
-	if ( MV_OK != dimmSpdGet((MV_U32)(bankNum/2), &dimmInfo))
-	{
-		DB(mvOsPrintf("Dram: ERR dimmSpdGet failed to get dimm info \n"));
-		return MV_FAIL;
-	}
-	if ((dimmInfo.numOfModuleBanks == 1) && ((bankNum % 2) == 1))
-	{
-		DB(mvOsPrintf("Dram: ERR dimmSpdGet. Can't find DIMM bank 2 \n"));
-		return MV_FAIL;
-	}
-	/* convert Dimm info to Bank info */
-    cpyDimm2BankInfo(&dimmInfo, pBankInfo);
-    return MV_OK;
-}
-
-/*******************************************************************************
-* cpyDimm2BankInfo - Convert a Dimm info struct into a bank info struct.
-*
-* DESCRIPTION:
-*       Convert a Dimm info struct into a bank info struct.
-*
-* INPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* OUTPUT:
-*       pBankInfo  - DRAM bank information struct.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-static MV_VOID cpyDimm2BankInfo(MV_DIMM_INFO *pDimmInfo, 
-                                                MV_DRAM_BANK_INFO *pBankInfo)
-{
-    pBankInfo->memoryType = pDimmInfo->memoryType;        
-
-    /* DIMM dimensions */
-    pBankInfo->numOfRowAddr = pDimmInfo->numOfRowAddr;
-    pBankInfo->numOfColAddr = pDimmInfo->numOfColAddr;
-    pBankInfo->dataWidth = pDimmInfo->dataWidth;
-    pBankInfo->errorCheckType = pDimmInfo->errorCheckType;             
-    pBankInfo->sdramWidth = pDimmInfo->sdramWidth;
-    pBankInfo->errorCheckDataWidth = pDimmInfo->errorCheckDataWidth;   
-    pBankInfo->numOfBanksOnEachDevice = pDimmInfo->numOfBanksOnEachDevice;
-    pBankInfo->suportedCasLatencies = pDimmInfo->suportedCasLatencies;
-    pBankInfo->refreshInterval = pDimmInfo->refreshInterval;
- 
-    /* DIMM timing parameters */
-    pBankInfo->minCycleTimeAtMaxCasLatPs = pDimmInfo->minCycleTimeAtMaxCasLatPs;
-    pBankInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
-                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps;
-    pBankInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
-                                    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps;
-
-    pBankInfo->minRowPrechargeTime     = pDimmInfo->minRowPrechargeTime;     
-    pBankInfo->minRowActiveToRowActive = pDimmInfo->minRowActiveToRowActive;
-    pBankInfo->minRasToCasDelay        = pDimmInfo->minRasToCasDelay;       
-    pBankInfo->minRasPulseWidth        = pDimmInfo->minRasPulseWidth;       
-    pBankInfo->minWriteRecoveryTime    = pDimmInfo->minWriteRecoveryTime;
-    pBankInfo->minWriteToReadCmdDelay  = pDimmInfo->minWriteToReadCmdDelay;
-    pBankInfo->minReadToPrechCmdDelay  = pDimmInfo->minReadToPrechCmdDelay;
-    pBankInfo->minRefreshToActiveCmd   = pDimmInfo->minRefreshToActiveCmd;
-               
-    /* Parameters calculated from the extracted DIMM information */
-    pBankInfo->size = pDimmInfo->size/pDimmInfo->numOfModuleBanks;
-    pBankInfo->deviceDensity = pDimmInfo->deviceDensity;              
-    pBankInfo->numberOfDevices = pDimmInfo->numberOfDevices /
-                                 pDimmInfo->numOfModuleBanks;
- 
-    /* DIMM attributes (MV_TRUE for yes) */
-
-    if ((pDimmInfo->memoryType == MEM_TYPE_SDRAM) ||
-        (pDimmInfo->memoryType == MEM_TYPE_DDR1)   )
-    {   
-        if (pDimmInfo->dimmAttributes & BIT1)
-            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
-        else
-            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
-    }
-    else /* pDimmInfo->memoryType == MEM_TYPE_DDR2 */
-    {
-        if (pDimmInfo->dimmTypeInfo & (BIT0 | BIT4))
-            pBankInfo->registeredAddrAndControlInputs = MV_TRUE;
-        else
-            pBankInfo->registeredAddrAndControlInputs = MV_FALSE;
-    }
-
-    return;
-}
-/*******************************************************************************
-* dimmSpdCpy - Cpy SPD parameters from dimm 0 to dimm 1.
-*
-* DESCRIPTION:
-*       Read the DIMM SPD parameters from dimm 0 into dimm 1 SPD.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
-*
-*******************************************************************************/
-MV_STATUS dimmSpdCpy(MV_VOID)
-{
-    MV_U32 i;
-    MV_U32 spdChecksum;
-     
-    MV_TWSI_SLAVE twsiSlave;
-    MV_U8 data[SPD_SIZE];
-
-    /* zero dimmInfo structure */
-    memset(data, 0, SPD_SIZE);
-
-    /* read the dimm eeprom */
-    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
-    twsiSlave.slaveAddr.address = MV_BOARD_DIMM0_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, data, SPD_SIZE) )
-    {
-        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 0\n"));
-        return MV_FAIL;
-    }
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    
-    /* calculate SPD checksum */
-    spdChecksum = 0;
-    
-    for(i = 0 ; i <= 62 ; i++)
-    {
-        spdChecksum += data[i];
-    }
-    
-    if ((spdChecksum & 0xff) != data[63])
-    {
-        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
-                            (MV_U32)(spdChecksum & 0xff), data[63]));
-    }
-    else
-    {
-        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
-    }
-
-    /* copy the SPD content 1:1 into the DIMM 1 SPD */
-    twsiSlave.slaveAddr.address = MV_BOARD_DIMM1_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    for(i = 0 ; i < SPD_SIZE ; i++)
-    {
-	twsiSlave.offset = i;
-	if( MV_OK != mvTwsiWrite (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, &data[i], 1) )
-	{
-	    mvOsPrintf("DRAM: ERR. no DIMM in dimmNum 1 byte %d \n",i);
-	    return MV_FAIL;
-	}
-	mvOsDelay(5);
-    }
-    
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    return MV_OK;
-}
-
-/*******************************************************************************
-* dimmSpdGet - Get the SPD parameters.
-*
-* DESCRIPTION:
-*       Read the DIMM SPD parameters into given struct parameter.
-*
-* INPUT:
-*       dimmNum - DIMM number. See MV_BOARD_DIMM_NUM enumerator.
-*
-* OUTPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* RETURN:
-*       MV_TRUE if function could read DIMM parameters, MV_FALSE otherwise.
-*
-*******************************************************************************/
-MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo)
-{
-    MV_U32 i;
-    MV_U32 density = 1;
-    MV_U32 spdChecksum;
-     
-    MV_TWSI_SLAVE twsiSlave;
-    MV_U8 data[SPD_SIZE];
-
-    if((NULL == pDimmInfo)|| (dimmNum >= MAX_DIMM_NUM))
-    {
-        DB(mvOsPrintf("Dram: mvDramBankInfoGet bad params \n")); 
-        return MV_BAD_PARAM;
-    }
-
-    /* zero dimmInfo structure */
-    memset(data, 0, SPD_SIZE);
-
-    /* read the dimm eeprom */
-    DB(mvOsPrintf("DRAM: Read Dimm eeprom\n"));
-    twsiSlave.slaveAddr.address = (dimmNum == 0) ?
-                            MV_BOARD_DIMM0_I2C_ADDR : MV_BOARD_DIMM1_I2C_ADDR;
-    twsiSlave.slaveAddr.type = ADDR7_BIT;
-    twsiSlave.validOffset = MV_TRUE;
-    twsiSlave.offset = 0;
-    twsiSlave.moreThen256 = MV_FALSE;
-
-    if( MV_OK != mvTwsiRead (MV_BOARD_DIMM_I2C_CHANNEL, &twsiSlave, data, SPD_SIZE) )
-    {
-        DB(mvOsPrintf("DRAM: ERR. no DIMM in dimmNum %d \n", dimmNum));
-        return MV_FAIL;
-    }
-    DB(puts("DRAM: Reading dimm info succeded.\n"));
-    
-    /* calculate SPD checksum */
-    spdChecksum = 0;
-    
-        for(i = 0 ; i <= 62 ; i++)
-        {
-        spdChecksum += data[i];
-    }
-    
-    if ((spdChecksum & 0xff) != data[63])
-    {
-        DB(mvOsPrintf("DRAM: Warning. Wrong SPD Checksum %2x, expValue=%2x\n",
-                            (MV_U32)(spdChecksum & 0xff), data[63]));
-    }
-    else
-    {
-        DB(mvOsPrintf("DRAM: SPD Checksum ok!\n"));
-    }
-
-    /* copy the SPD content 1:1 into the dimmInfo structure*/
-    for(i = 0 ; i < SPD_SIZE ; i++)
-    {
-        pDimmInfo->spdRawData[i] = data[i];
-        DB(mvOsPrintf("SPD-EEPROM Byte %3d = %3x (%3d)\n",i, data[i], data[i]));
-    }
-
-    DB(mvOsPrintf("DRAM SPD Information:\n"));
-
-    /* Memory type (DDR / SDRAM) */
-    switch (data[DIMM_MEM_TYPE])
-    {
-        case (DIMM_MEM_TYPE_SDRAM):
-            pDimmInfo->memoryType = MEM_TYPE_SDRAM;
-            DB(mvOsPrintf("DRAM Memeory type SDRAM\n"));
-            break;
-        case (DIMM_MEM_TYPE_DDR1):
-            pDimmInfo->memoryType = MEM_TYPE_DDR1;
-            DB(mvOsPrintf("DRAM Memeory type DDR1\n"));
-            break;
-        case (DIMM_MEM_TYPE_DDR2):
-            pDimmInfo->memoryType = MEM_TYPE_DDR2;
-            DB(mvOsPrintf("DRAM Memeory type DDR2\n"));
-            break;
-        default:
-            mvOsPrintf("ERROR: Undefined memory type!\n");
-            return MV_ERROR;
-    }
-
-    
-    /* Number Of Row Addresses */
-    pDimmInfo->numOfRowAddr = data[DIMM_ROW_NUM];
-    DB(mvOsPrintf("DRAM numOfRowAddr[3]         %d\n",pDimmInfo->numOfRowAddr));
-        
-    /* Number Of Column Addresses */
-    pDimmInfo->numOfColAddr = data[DIMM_COL_NUM];
-    DB(mvOsPrintf("DRAM numOfColAddr[4]         %d\n",pDimmInfo->numOfColAddr));
-        
-    /* Number Of Module Banks */
-    pDimmInfo->numOfModuleBanks = data[DIMM_MODULE_BANK_NUM];
-    DB(mvOsPrintf("DRAM numOfModuleBanks[5]     0x%x\n", 
-                                                  pDimmInfo->numOfModuleBanks));
-        
-    /* Number of module banks encoded differently for DDR2 */
-    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
-        pDimmInfo->numOfModuleBanks = (pDimmInfo->numOfModuleBanks & 0x7)+1;
-
-    /* Data Width */
-    pDimmInfo->dataWidth = data[DIMM_DATA_WIDTH];
-    DB(mvOsPrintf("DRAM dataWidth[6]            0x%x\n", pDimmInfo->dataWidth));
-        
-    /* Minimum Cycle Time At Max CasLatancy */
-    pDimmInfo->minCycleTimeAtMaxCasLatPs = cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS]);
-
-    /* Error Check Type */
-    pDimmInfo->errorCheckType = data[DIMM_ERR_CHECK_TYPE];
-    DB(mvOsPrintf("DRAM errorCheckType[11]      0x%x\n", 
-                                                    pDimmInfo->errorCheckType));
-
-    /* Refresh Interval */
-    pDimmInfo->refreshInterval = data[DIMM_REFRESH_INTERVAL];
-    DB(mvOsPrintf("DRAM refreshInterval[12]     0x%x\n", 
-                                                   pDimmInfo->refreshInterval));
-    
-    /* Sdram Width */
-    pDimmInfo->sdramWidth = data[DIMM_SDRAM_WIDTH];
-    DB(mvOsPrintf("DRAM sdramWidth[13]          0x%x\n",pDimmInfo->sdramWidth));
-        
-    /* Error Check Data Width */
-    pDimmInfo->errorCheckDataWidth = data[DIMM_ERR_CHECK_DATA_WIDTH];
-    DB(mvOsPrintf("DRAM errorCheckDataWidth[14] 0x%x\n", 
-                                               pDimmInfo->errorCheckDataWidth));
-    
-    /* Burst Length Supported */
-    /*     SDRAM/DDR1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
-                    *********************************************************/ 
-    /*     DDR2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
-                    *********************************************************/ 
-
-    pDimmInfo->burstLengthSupported = data[DIMM_BURST_LEN_SUP];
-    DB(mvOsPrintf("DRAM burstLengthSupported[16] 0x%x\n", 
-                                              pDimmInfo->burstLengthSupported));
-    
-    /* Number Of Banks On Each Device */
-    pDimmInfo->numOfBanksOnEachDevice = data[DIMM_DEV_BANK_NUM];
-    DB(mvOsPrintf("DRAM numOfBanksOnEachDevice[17] 0x%x\n", 
-                                            pDimmInfo->numOfBanksOnEachDevice));
-    
-    /* Suported Cas Latencies */
-                   
-    /*      SDRAM:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
-            ********************************************************/ 
-
-    /*     DDR 1:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
-            *********************************************************/
-
-    /*     DDR 2:
-            *******-******-******-******-******-******-******-******* 
-            * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-            *******-******-******-******-******-******-******-******* 
-    CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-            *********************************************************/
-    
-    pDimmInfo->suportedCasLatencies = data[DIMM_SUP_CAL];
-    DB(mvOsPrintf("DRAM suportedCasLatencies[18]    0x%x\n", 
-                                              pDimmInfo->suportedCasLatencies));
-
-    /* For DDR2 only, get the DIMM type information */
-    if (pDimmInfo->memoryType == MEM_TYPE_DDR2)
-    {   
-        pDimmInfo->dimmTypeInfo = data[DIMM_DDR2_TYPE_INFORMATION];
-        DB(mvOsPrintf("DRAM dimmTypeInfo[20] (DDR2) 0x%x\n", 
-                                                      pDimmInfo->dimmTypeInfo));
-    }
-
-    /* SDRAM Modules Attributes */
-    pDimmInfo->dimmAttributes = data[DIMM_BUF_ADDR_CONT_IN];
-    DB(mvOsPrintf("DRAM dimmAttributes[21]          0x%x\n",    
-                                                    pDimmInfo->dimmAttributes));
-    
-    /* Minimum Cycle Time At Max CasLatancy Minus 1*/
-    pDimmInfo->minCycleTimeAtMaxCasLatMinus1Ps = 
-                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS1]);
-
-    /* Minimum Cycle Time At Max CasLatancy Minus 2*/
-    pDimmInfo->minCycleTimeAtMaxCasLatMinus2Ps = 
-                                    cas2ps(data[DIMM_MIN_CC_AT_MAX_CAS_MINUS2]);
-
-    pDimmInfo->minRowPrechargeTime = data[DIMM_MIN_ROW_PRECHARGE_TIME];
-    DB(mvOsPrintf("DRAM minRowPrechargeTime[27]     0x%x\n", 
-                                               pDimmInfo->minRowPrechargeTime));
-    pDimmInfo->minRowActiveToRowActive = data[DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE];
-    DB(mvOsPrintf("DRAM minRowActiveToRowActive[28] 0x%x\n", 
-                                           pDimmInfo->minRowActiveToRowActive));
-    pDimmInfo->minRasToCasDelay = data[DIMM_MIN_RAS_TO_CAS_DELAY];
-    DB(mvOsPrintf("DRAM minRasToCasDelay[29]        0x%x\n", 
-                                                  pDimmInfo->minRasToCasDelay));
-    pDimmInfo->minRasPulseWidth = data[DIMM_MIN_RAS_PULSE_WIDTH];
-    DB(mvOsPrintf("DRAM minRasPulseWidth[30]        0x%x\n", 
-                                                  pDimmInfo->minRasPulseWidth));
-        
-    /* DIMM Bank Density */
-    pDimmInfo->dimmBankDensity = data[DIMM_BANK_DENSITY];
-    DB(mvOsPrintf("DRAM dimmBankDensity[31]         0x%x\n", 
-                                                   pDimmInfo->dimmBankDensity));
-
-    /* Only DDR2 includes Write Recovery Time field. Other SDRAM ignore     */
-    pDimmInfo->minWriteRecoveryTime = data[DIMM_MIN_WRITE_RECOVERY_TIME];
-    DB(mvOsPrintf("DRAM minWriteRecoveryTime[36]    0x%x\n", 
-                                              pDimmInfo->minWriteRecoveryTime));
-    
-    /* Only DDR2 includes Internal Write To Read Command Delay field.       */
-    pDimmInfo->minWriteToReadCmdDelay = data[DIMM_MIN_WRITE_TO_READ_CMD_DELAY];
-    DB(mvOsPrintf("DRAM minWriteToReadCmdDelay[37]  0x%x\n", 
-                                            pDimmInfo->minWriteToReadCmdDelay));
-    
-    /* Only DDR2 includes Internal Read To Precharge Command Delay field.   */
-    pDimmInfo->minReadToPrechCmdDelay = data[DIMM_MIN_READ_TO_PRECH_CMD_DELAY];
-    DB(mvOsPrintf("DRAM minReadToPrechCmdDelay[38]  0x%x\n",    
-                                            pDimmInfo->minReadToPrechCmdDelay));
-    
-    /* Only DDR2 includes Minimum Refresh to Activate/Refresh Command field */
-    pDimmInfo->minRefreshToActiveCmd = data[DIMM_MIN_REFRESH_TO_ACTIVATE_CMD];
-    DB(mvOsPrintf("DRAM minRefreshToActiveCmd[42]   0x%x\n", 
-                                             pDimmInfo->minRefreshToActiveCmd));
-                 
-    /* calculating the sdram density. Representing device density from      */
-    /* bit 20 to allow representation of 4GB and above.                     */
-    /* For example, if density is 512Mbit 0x20000000, will be represent in  */
-    /* deviceDensity by 0x20000000 >> 16 --> 0x00000200. Another example    */
-    /* is density 8GB 0x200000000 >> 16 --> 0x00002000.                     */
-    density = (1 << ((pDimmInfo->numOfRowAddr + pDimmInfo->numOfColAddr) - 20));
-    pDimmInfo->deviceDensity = density * 
-                                pDimmInfo->numOfBanksOnEachDevice * 
-                                pDimmInfo->sdramWidth;
-    DB(mvOsPrintf("DRAM deviceDensity           %d\n",pDimmInfo->deviceDensity));
-    
-    /* Number of devices includeing Error correction */
-    pDimmInfo->numberOfDevices = (pDimmInfo->dataWidth/pDimmInfo->sdramWidth) * 
-                                  pDimmInfo->numOfModuleBanks;
-    DB(mvOsPrintf("DRAM numberOfDevices         %d\n",  
-                                                   pDimmInfo->numberOfDevices));
-
-    pDimmInfo->size = 0; 
-
-    /* Note that pDimmInfo->size is in MB units */
-    if (pDimmInfo->memoryType == MEM_TYPE_SDRAM)
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 8;                   /* Equal to 8MB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 16;                  /* Equal to 16MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 32;                  /* Equal to 32MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 64;                  /* Equal to 64MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    else if (pDimmInfo->memoryType == MEM_TYPE_DDR1)
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 2048;                /* Equal to 2GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 16;                  /* Equal to 16MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 32;                  /* Equal to 32MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 64;                  /* Equal to 64MB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-    {
-        if (pDimmInfo->dimmBankDensity & BIT0)
-            pDimmInfo->size += 1024;                /* Equal to 1GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT1)
-            pDimmInfo->size += 2048;                /* Equal to 2GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT2)
-            pDimmInfo->size += 4096;                /* Equal to 4GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT3)
-            pDimmInfo->size += 8192;                /* Equal to 8GB     */
-        else if (pDimmInfo->dimmBankDensity & BIT4)
-            pDimmInfo->size += 16384;               /* Equal to 16GB    */
-        else if (pDimmInfo->dimmBankDensity & BIT5)
-            pDimmInfo->size += 128;                 /* Equal to 128MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT6) 
-            pDimmInfo->size += 256;                 /* Equal to 256MB   */
-        else if (pDimmInfo->dimmBankDensity & BIT7) 
-            pDimmInfo->size += 512;                 /* Equal to 512MB   */
-    }
-    
-    pDimmInfo->size *= pDimmInfo->numOfModuleBanks;
-
-    DB(mvOsPrintf("Dram: dimm size    %dMB \n",pDimmInfo->size));
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* dimmSpdPrint - Print the SPD parameters.
-*
-* DESCRIPTION:
-*       Print the Dimm SPD parameters.
-*
-* INPUT:
-*       pDimmInfo - DIMM information structure.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_VOID dimmSpdPrint(MV_U32 dimmNum)
-{
-    MV_DIMM_INFO dimmInfo;
-    MV_U32  i, temp = 0;
-    MV_U32  k, maskLeftOfPoint = 0, maskRightOfPoint = 0;
-    MV_U32  rightOfPoint = 0,leftOfPoint = 0, div, time_tmp, shift;
-    MV_U32  busClkPs;
-    MV_U8   trp_clocks=0, trcd_clocks, tras_clocks, trrd_clocks,
-            temp_buf[40], *spdRawData;
-
-    busClkPs = 1000000000 / (mvBoardSysClkGet() / 100);  /* in 10 ps units */
-
-    spdRawData = dimmInfo.spdRawData;
-    
-    if(MV_OK != dimmSpdGet(dimmNum, &dimmInfo))
-    {
-        mvOsOutput("ERROR: Could not read SPD information!\n");
-        return;
-    }
-
-    /* find Manufactura of Dimm Module */
-    mvOsOutput("\nManufacturer's JEDEC ID Code:   ");
-    for(i = 0 ; i < DIMM_MODULE_MANU_SIZE ; i++)
-    {
-        mvOsOutput("%x",spdRawData[DIMM_MODULE_MANU_OFFS + i]);
-    }
-    mvOsOutput("\n");
-
-    /* Manufacturer's Specific Data */
-    for(i = 0 ; i < DIMM_MODULE_ID_SIZE ; i++)
-    {
-        temp_buf[i] = spdRawData[DIMM_MODULE_ID_OFFS + i];
-    }
-    mvOsOutput("Manufacturer's Specific Data:   %s\n", temp_buf);
-
-    /* Module Part Number */
-    for(i = 0 ; i < DIMM_MODULE_VEN_SIZE ; i++)
-    {
-        temp_buf[i] = spdRawData[DIMM_MODULE_VEN_OFFS + i];
-    }
-    mvOsOutput("Module Part Number:             %s\n", temp_buf);
-
-    /* Module Serial Number */
-    for(i = 0; i < sizeof(MV_U32); i++)
-    {
-    	temp |= spdRawData[95+i] << 8*i;
-    }
-    mvOsOutput("DIMM Serial No.                 %ld (%lx)\n", (long)temp, 
-                                    (long)temp);
-
-    /* find Manufac-Data of Dimm Module */
-    mvOsOutput("Manufactoring Date:             Year 20%d%d/ ww %d%d\n", 
-                        ((spdRawData[93] & 0xf0) >> 4), (spdRawData[93] & 0xf), 
-                        ((spdRawData[94] & 0xf0) >> 4), (spdRawData[94] & 0xf)); 
-    /* find modul_revision of Dimm Module */
-    mvOsOutput("Module Revision:                %d.%d\n", 
-               spdRawData[62]/10, spdRawData[62]%10); 
-
-    /* find manufac_place of Dimm Module */
-    mvOsOutput("manufac_place:                  %d\n", spdRawData[72]);
-    
-    /* go over the first 35 I2C data bytes */
-    for(i = 2 ; i <= 35 ; i++)
-       switch(i)
-        {
-            case 2:  /* Memory type (DDR1/2 / SDRAM) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                    mvOsOutput("Dram Type is:                   SDRAM\n");
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                    mvOsOutput("Dram Type is:                   SDRAM DDR1\n");
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                    mvOsOutput("Dram Type is:                   SDRAM DDR2\n");
-                else
-                    mvOsOutput("Dram Type unknown\n");
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 3:  /* Number Of Row Addresses */
-                mvOsOutput("Module Number of row addresses: %d\n", 
-                                                        dimmInfo.numOfRowAddr);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 4:  /* Number Of Column Addresses */
-                mvOsOutput("Module Number of col addresses: %d\n", 
-                                                        dimmInfo.numOfColAddr);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 5:  /* Number Of Module Banks */
-                mvOsOutput("Number of Banks on Mod.:        %d\n",  
-                                                    dimmInfo.numOfModuleBanks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 6:  /* Data Width */
-                mvOsOutput("Module Data Width:              %d bit\n",  
-                                                           dimmInfo.dataWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 8:  /* Voltage Interface */
-                switch(spdRawData[i])
-                {
-                    case 0x0:
-                        mvOsOutput("Module is               TTL_5V_TOLERANT\n");
-                        break;
-                    case 0x1:
-                        mvOsOutput("Module is               LVTTL\n");
-                        break;
-                    case 0x2:
-                        mvOsOutput("Module is               HSTL_1_5V\n");
-                        break;
-                    case 0x3:
-                        mvOsOutput("Module is               SSTL_3_3V\n");
-                        break;
-                    case 0x4:
-                        mvOsOutput("Module is               SSTL_2_5V\n");
-                        break;
-                    case 0x5:
-                        if (dimmInfo.memoryType != MEM_TYPE_SDRAM)
-                        {
-                            mvOsOutput("Module is                 SSTL_1_8V\n");
-                            break;
-                        }
-                    default:
-                        mvOsOutput("Module is               VOLTAGE_UNKNOWN\n");
-                        break;
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 9:  /* Minimum Cycle Time At Max CasLatancy */
-                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                
-                /* DDR2 addition of right of point */
-                if ((spdRawData[i] & 0x0f) == 0xA)
-                {
-                    rightOfPoint = 25;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xB)
-                {
-                    rightOfPoint = 33;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xC)
-                {
-                    rightOfPoint = 66;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xD)
-                {
-                    rightOfPoint = 75;
-                }
-                mvOsOutput("Minimum Cycle Time At Max CL:   %d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 10: /* Clock To Data Out */
-                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 10:100;
-                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                leftOfPoint     = time_tmp / div;
-                rightOfPoint    = time_tmp % div;
-                mvOsOutput("Clock To Data Out:              %d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 11: /* Error Check Type */
-                mvOsOutput("Error Check Type (0=NONE):      %d\n", 
-                                                      dimmInfo.errorCheckType);
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 12: /* Refresh Interval */
-                mvOsOutput("Refresh Rate:                   %x\n", 
-                                                     dimmInfo.refreshInterval);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 13: /* Sdram Width */
-                mvOsOutput("Sdram Width:                    %d bits\n",     
-                                                          dimmInfo.sdramWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 14: /* Error Check Data Width */
-                mvOsOutput("Error Check Data Width:         %d bits\n", 
-                                                 dimmInfo.errorCheckDataWidth);
-                break;
-/*----------------------------------------------------------------------------*/
-
-           case 15: /* Minimum Clock Delay is unsupported */
-                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
-                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
-                {
-                    mvOsOutput("Minimum Clk Delay back to back: %d\n", 
-                                                                spdRawData[i]);
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 16: /* Burst Length Supported */
-    /*     SDRAM/DDR1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   |  2   |   1  * 
-                    *********************************************************/ 
-    /*     DDR2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-    burst length =  * Page | TBD  | TBD  | TBD  |  8   |  4   | TBD  | TBD  * 
-                    *********************************************************/ 
-                mvOsOutput("Burst Length Supported: ");
-                if ((dimmInfo.memoryType == MEM_TYPE_SDRAM) ||
-                    (dimmInfo.memoryType == MEM_TYPE_DDR1))
-                {
-                    if (dimmInfo.burstLengthSupported & BIT0)
-                        mvOsOutput("1, ");
-                    if (dimmInfo.burstLengthSupported & BIT1)
-                        mvOsOutput("2, ");
-                }
-                if (dimmInfo.burstLengthSupported & BIT2)
-                    mvOsOutput("4, ");
-                if (dimmInfo.burstLengthSupported & BIT3) 
-                    mvOsOutput("8, ");
-                
-                mvOsOutput(" Bit \n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 17: /* Number Of Banks On Each Device */
-                mvOsOutput("Number Of Banks On Each Chip:   %d\n",  
-                                              dimmInfo.numOfBanksOnEachDevice);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 18: /* Suported Cas Latencies */
-                   
-            /*      SDRAM:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  |  7   |  6   |  5   |  4   |  3   |   2  |   1  * 
-                    ********************************************************/ 
-
-            /*     DDR 1:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  |  4   | 3.5  |   3  | 2.5  |  2   | 1.5  |   1  * 
-                    *********************************************************/
-
-            /*     DDR 2:
-                    *******-******-******-******-******-******-******-******* 
-                    * bit7 | bit6 | bit5 | bit4 | bit3 | bit2 | bit1 | bit0 * 
-                    *******-******-******-******-******-******-******-******* 
-            CAS =   * TBD  | TBD  |  5   |  4   |  3   |  2   | TBD  | TBD  * 
-                    *********************************************************/
-
-                mvOsOutput("Suported Cas Latencies: (CL) 			");
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    for (k = 0; k <=7; k++)
-                    {
-                        if (dimmInfo.suportedCasLatencies & (1 << k))
-                            mvOsOutput("%d,             ", k+1);
-                    }
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.suportedCasLatencies & BIT0)
-                        mvOsOutput("1, ");
-                    if (dimmInfo.suportedCasLatencies & BIT1)
-                        mvOsOutput("1.5, ");
-                    if (dimmInfo.suportedCasLatencies & BIT2)
-                        mvOsOutput("2, ");
-                    if (dimmInfo.suportedCasLatencies & BIT3)
-                        mvOsOutput("2.5, ");
-                    if (dimmInfo.suportedCasLatencies & BIT4)
-                        mvOsOutput("3, ");
-                    if (dimmInfo.suportedCasLatencies & BIT5)
-                        mvOsOutput("3.5, ");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if (dimmInfo.suportedCasLatencies & BIT2)
-                        mvOsOutput("2, ");
-                    if (dimmInfo.suportedCasLatencies & BIT3)
-                        mvOsOutput("3, ");
-                    if (dimmInfo.suportedCasLatencies & BIT4)
-                        mvOsOutput("4, ");
-                    if (dimmInfo.suportedCasLatencies & BIT5)
-                        mvOsOutput("5, ");		
-                }
-                else
-                    mvOsOutput("?.?, ");		
-                mvOsOutput("\n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 20:   /* DDR2 DIMM type info */
-                if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if (dimmInfo.dimmTypeInfo & (BIT0 | BIT4))
-                        mvOsOutput("Registered DIMM (RDIMM)\n");
-                    else if (dimmInfo.dimmTypeInfo & (BIT1 | BIT5))
-                        mvOsOutput("Unbuffered DIMM (UDIMM)\n");
-                    else 
-                        mvOsOutput("Unknown DIMM type.\n");
-                }
-
-                break;
-/*----------------------------------------------------------------------------*/
-   
-            case 21: /* SDRAM Modules Attributes */
-                mvOsOutput("\nModule Attributes (SPD Byte 21): \n");
-                
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if (dimmInfo.dimmAttributes & BIT0)
-                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
-                    else
-                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
-
-                    if (dimmInfo.dimmAttributes & BIT1)
-                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
-                    else
-                        mvOsOutput(" Registered Addr/Control Input: No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT2)
-                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
-                    else
-                        mvOsOutput(" On-Card PLL (clock):           No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT3)
-                        mvOsOutput(" Bufferd DQMB Input:            Yes \n");
-                    else
-                        mvOsOutput(" Bufferd DQMB Inputs:           No \n");
-   
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" Registered DQMB Inputs:        Yes \n");
-                    else
-                        mvOsOutput(" Registered DQMB Inputs:        No \n");
- 
-                    if (dimmInfo.dimmAttributes & BIT5)
-                        mvOsOutput(" Differential Clock Input:      Yes \n");
-                    else
-                        mvOsOutput(" Differential Clock Input:      No \n");
-   
-                    if (dimmInfo.dimmAttributes & BIT6)
-                        mvOsOutput(" redundant Row Addressing:      Yes \n");
-                    else
-                        mvOsOutput(" redundant Row Addressing:      No \n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.dimmAttributes & BIT0)
-                        mvOsOutput(" Buffered Addr/Control Input:   Yes\n");
-                    else 
-                        mvOsOutput(" Buffered Addr/Control Input:   No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT1)
-                        mvOsOutput(" Registered Addr/Control Input: Yes\n");
-                    else
-                        mvOsOutput(" Registered Addr/Control Input: No\n");
-   
-                    if (dimmInfo.dimmAttributes & BIT2)
-                        mvOsOutput(" On-Card PLL (clock):           Yes \n");
-                    else
-                        mvOsOutput(" On-Card PLL (clock):           No \n");
-            
-                    if (dimmInfo.dimmAttributes & BIT3)
-                        mvOsOutput(" FET Switch On-Card Enabled:    Yes \n");
-                    else
-                        mvOsOutput(" FET Switch On-Card Enabled:    No \n");
-                    
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
-                    else
-                        mvOsOutput(" FET Switch External Enabled:   No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT5)
-                        mvOsOutput(" Differential Clock Input:      Yes \n");
-                    else
-                        mvOsOutput(" Differential Clock Input:      No \n");
-                }
-                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-                {
-                    mvOsOutput(" Number of Active Registers on the DIMM: %d\n", 
-                                        (dimmInfo.dimmAttributes & 0x3) + 1);
-            
-                    mvOsOutput(" Number of PLLs on the DIMM: %d\n", 
-                                      ((dimmInfo.dimmAttributes) >> 2) & 0x3);
-               
-                    if (dimmInfo.dimmAttributes & BIT4)
-                        mvOsOutput(" FET Switch External Enabled:   Yes \n");
-                    else
-                        mvOsOutput(" FET Switch External Enabled:   No \n");
-
-                    if (dimmInfo.dimmAttributes & BIT6)
-                        mvOsOutput(" Analysis probe installed:      Yes \n");
-                    else
-                        mvOsOutput(" Analysis probe installed:      No \n");
-                }
-                
-                break;
-/*----------------------------------------------------------------------------*/
-
-            case 22: /* Suported AutoPreCharge */
-                mvOsOutput("\nModul Attributes (SPD Byte 22): \n");
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Early Ras Precharge:           Yes \n");
-                    else
-                        mvOsOutput(" Early Ras Precharge:           No \n");
-                                                        
-                    if ( spdRawData[i] & BIT1 )                 
-                        mvOsOutput(" AutoPreCharge:                 Yes \n");
-                    else
-                        mvOsOutput(" AutoPreCharge:                 No \n");
-                                                            
-                    if ( spdRawData[i] & BIT2 )                 
-                        mvOsOutput(" Precharge All:                 Yes \n");
-                    else
-                        mvOsOutput(" Precharge All:                 No \n");
-                                                        
-                    if ( spdRawData[i] & BIT3 )                 
-                        mvOsOutput(" Write 1/ReadBurst:             Yes \n");
-                    else
-                        mvOsOutput(" Write 1/ReadBurst:             No \n");
-                                                        
-                    if ( spdRawData[i] & BIT4 )                 
-                        mvOsOutput(" lower VCC tolerance:           5%%\n");
-                    else
-                        mvOsOutput(" lower VCC tolerance:           10%%\n");
-                                                        
-                    if ( spdRawData[i] & BIT5 )                 
-                        mvOsOutput(" upper VCC tolerance:           5%%\n");
-                    else
-                        mvOsOutput(" upper VCC tolerance:           10%%\n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Supports Weak Driver:          Yes \n");
-                    else
-                        mvOsOutput(" Supports Weak Driver:          No \n");
-
-                    if ( !(spdRawData[i] & BIT4) )
-                        mvOsOutput(" lower VCC tolerance:           0.2V\n");
-   
-                    if ( !(spdRawData[i] & BIT5) )
-                        mvOsOutput(" upper VCC tolerance:           0.2V\n");
-
-                    if ( spdRawData[i] & BIT6 )
-                        mvOsOutput(" Concurrent Auto Preharge:      Yes \n");
-                    else
-                        mvOsOutput(" Concurrent Auto Preharge:      No \n");
-
-                    if ( spdRawData[i] & BIT7 )
-                        mvOsOutput(" Supports Fast AP:              Yes \n");
-                    else
-                        mvOsOutput(" Supports Fast AP:              No \n");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR2)
-                {
-                    if ( spdRawData[i] & BIT0 )
-                        mvOsOutput(" Supports Weak Driver:          Yes \n");
-                    else
-                        mvOsOutput(" Supports Weak Driver:          No \n");
-                }
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 23:
-            /* Minimum Cycle Time At Maximum Cas Latancy Minus 1 (2nd highest CL) */
-                leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                
-                /* DDR2 addition of right of point */
-                if ((spdRawData[i] & 0x0f) == 0xA)
-                {
-                    rightOfPoint = 25;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xB)
-                {
-                    rightOfPoint = 33;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xC)
-                {
-                    rightOfPoint = 66;
-                }
-                if ((spdRawData[i] & 0x0f) == 0xD)
-                {
-                    rightOfPoint = 75;
-                }
-
-                mvOsOutput("Minimum Cycle Time At 2nd highest CasLatancy"
-                           "(0 = Not supported): %d.%d [ns]\n",
-                           leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 24: /* Clock To Data Out 2nd highest Cas Latency Value*/
-                div = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 10:100;
-                time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                    ((spdRawData[i] & 0x0f));
-                leftOfPoint     = time_tmp / div;
-                rightOfPoint    = time_tmp % div;
-                mvOsOutput("Clock To Data Out (2nd CL value): 		%d.%d [ns]\n",
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 25: 
-            /* Minimum Cycle Time At Maximum Cas Latancy Minus 2 (3rd highest CL) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
-                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
-                }
-                else    /* DDR1 or DDR2 */ 
-                {
-                    leftOfPoint = (spdRawData[i] & 0xf0) >> 4;
-                    rightOfPoint = (spdRawData[i] & 0x0f) * 10;
-                    
-                    /* DDR2 addition of right of point */
-                    if ((spdRawData[i] & 0x0f) == 0xA)
-                    {
-                        rightOfPoint = 25;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xB)
-                    {
-                        rightOfPoint = 33;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xC)
-                    {
-                        rightOfPoint = 66;
-                    }
-                    if ((spdRawData[i] & 0x0f) == 0xD)
-                    {
-                        rightOfPoint = 75;
-                    }
-                }
-                mvOsOutput("Minimum Cycle Time At 3rd highest CasLatancy" 
-                           "(0 = Not supported): %d.%d [ns]\n",
-                           leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 26: /* Clock To Data Out 3rd highest Cas Latency Value*/
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    leftOfPoint = (spdRawData[i] & 0xfc) >> 2;
-                    rightOfPoint = (spdRawData[i] & 0x3) * 25;
-                }
-                else    /* DDR1 or DDR2 */ 
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint     = 0;
-                    rightOfPoint    = time_tmp;
-                }
-                mvOsOutput("Clock To Data Out (3rd CL value): 		%d.%2d[ns]\n",
-                                                  leftOfPoint, rightOfPoint );
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 27: /* Minimum Row Precharge Time */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 10ps Intervals*/
-                trp_clocks = (temp + (busClkPs-1)) /  busClkPs;    
-                mvOsOutput("Minimum Row Precharge Time [ns]: 		%d.%d = " 
-                           "in Clk cycles %d\n", 
-                           leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 28: /* Minimum Row Active to Row Active Time */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
-                trrd_clocks = (temp + (busClkPs-1)) / busClkPs;
-                mvOsOutput("Minimum Row Active -To- Row Active Delay [ns]: " 
-                           "%d.%d = in Clk cycles %d\n",
-                            leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 29: /* Minimum Ras-To-Cas Delay */
-                shift = (dimmInfo.memoryType == MEM_TYPE_SDRAM)? 0:2;
-                maskLeftOfPoint  = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0xff : 0xfc;
-                maskRightOfPoint = (dimmInfo.memoryType == MEM_TYPE_SDRAM) ? 
-                                                                    0x00 : 0x03;
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> shift);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint)*25;  
-                temp = ((leftOfPoint*100) + rightOfPoint);/* in 100ns Interval*/
-                trcd_clocks = (temp + (busClkPs-1) )/ busClkPs;
-                mvOsOutput("Minimum Ras-To-Cas Delay [ns]: 			%d.%d = "
-                           "in Clk cycles %d\n", 
-                           leftOfPoint, rightOfPoint, trp_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-   
-            case 30: /* Minimum Ras Pulse Width */
-                tras_clocks = (cas2ps(spdRawData[i])+(busClkPs-1)) / busClkPs;
-                mvOsOutput("Minimum Ras Pulse Width [ns]: 			%d = "
-                           "in Clk cycles %d\n", spdRawData[i], tras_clocks);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 31: /* Module Bank Density */
-                mvOsOutput("Module Bank Density (more than 1= Multisize-Module):");
-
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("8MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("16MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("32MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("64MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                        mvOsOutput("128MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT6) 
-                        mvOsOutput("256MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT7) 
-                        mvOsOutput("512MB, ");
-                }
-                else if (dimmInfo.memoryType == MEM_TYPE_DDR1)
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("2GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("16MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("32MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("64MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                        mvOsOutput("128MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT6) 
-                        mvOsOutput("256MB, ");
-                    if (dimmInfo.dimmBankDensity & BIT7) 
-                        mvOsOutput("512MB, ");
-                }
-                else /* if (dimmInfo.memoryType == MEM_TYPE_DDR2) */
-                {
-                    if (dimmInfo.dimmBankDensity & BIT0)
-                        mvOsOutput("1GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT1)
-                        mvOsOutput("2GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT2)
-                        mvOsOutput("4GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT3)
-                        mvOsOutput("8GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT4)
-                        mvOsOutput("16GB, ");
-                    if (dimmInfo.dimmBankDensity & BIT5)
-                    mvOsOutput("128MB, ");
-                        if (dimmInfo.dimmBankDensity & BIT6) 
-                    mvOsOutput("256MB, ");
-                        if (dimmInfo.dimmBankDensity & BIT7) 
-                    mvOsOutput("512MB, ");
-                }
-                mvOsOutput("\n");
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 32: /* Address And Command Setup Time (measured in ns/1000) */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                    leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100; 
-                }
-                mvOsOutput("Address And Command Setup Time [ns]: 		%d.%d\n",
-                                                     leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 33: /* Address And Command Hold Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                    leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Address And Command Hold Time [ns]: 		%d.%d\n",
-                                                   leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 34: /* Data Input Setup Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                        leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Data Input Setup Time [ns]: 			%d.%d\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 35: /* Data Input Hold Time */
-                if (dimmInfo.memoryType == MEM_TYPE_SDRAM)
-                {
-                    rightOfPoint = (spdRawData[i] & 0x0f);
-                    leftOfPoint  = (spdRawData[i] & 0xf0) >> 4;
-                    if(leftOfPoint > 7)
-                    {
-                        leftOfPoint *= -1;
-                    }
-                }
-                else /* DDR1 or DDR2 */
-                {
-                    time_tmp = (((spdRawData[i] & 0xf0) >> 4)*10) + 
-                                                      ((spdRawData[i] & 0x0f));
-                    leftOfPoint = time_tmp / 100;
-                    rightOfPoint = time_tmp % 100;                 
-                }
-                mvOsOutput("Data Input Hold Time [ns]: 			%d.%d\n\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-    
-            case 36: /* Relevant for DDR2 only: Write Recovery Time */
-                leftOfPoint = ((spdRawData[i] & maskLeftOfPoint) >> 2);
-                rightOfPoint = (spdRawData[i] & maskRightOfPoint) * 25;  
-                mvOsOutput("Write Recovery Time [ns]: 			%d.%d\n", 
-                                                    leftOfPoint, rightOfPoint);
-                break;
-/*----------------------------------------------------------------------------*/
-        }
-    
-}
-
-
-/*
- * translate ns.ns/10 coding of SPD timing values
- * into ps unit values
- */
-/*******************************************************************************
-*  cas2ps - Translate x.y ns parameter to pico-seconds values
-*
-* DESCRIPTION:
-*       This function translates x.y nano seconds to its value in pico seconds.
-*       For example 3.75ns will return 3750.
-*
-* INPUT:
-*       spd_byte - DIMM SPD byte.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       value in pico seconds.
-*
-*******************************************************************************/
-static MV_U32  cas2ps(MV_U8 spd_byte)
-{
-    MV_U32 ns, ns10;
-    
-    /* isolate upper nibble */
-    ns = (spd_byte >> 4) & 0x0F;
-    /* isolate lower nibble */
-    ns10 = (spd_byte & 0x0F);
-    
-    if( ns10 < 10 ) {
-        ns10 *= 10;
-    }
-    else if( ns10 == 10 )
-        ns10 = 25;
-    else if( ns10 == 11 )
-        ns10 = 33;
-    else if( ns10 == 12 )
-        ns10 = 66;
-    else if( ns10 == 13 )
-        ns10 = 75;
-    else 
-    {
-        mvOsOutput("cas2ps Err. unsupported cycle time.\n");
-    }
-    
-    return (ns*1000 + ns10*10);
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h
deleted file mode 100644
index f95546624c..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/ddr2/spd/mvSpd.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvDram
-#define __INCmvDram
-
-#include "ddr2/mvDramIf.h"
-#include "twsi/mvTwsi.h"
-
-#define MAX_DIMM_NUM 			2
-#define SPD_SIZE			128
-
-/* Dimm spd offsets */
-#define DIMM_MEM_TYPE 					2
-#define DIMM_ROW_NUM 					3
-#define DIMM_COL_NUM 					4
-#define DIMM_MODULE_BANK_NUM 				5
-#define DIMM_DATA_WIDTH 				6
-#define DIMM_VOLT_IF 					8
-#define DIMM_MIN_CC_AT_MAX_CAS 				9
-#define DIMM_ERR_CHECK_TYPE 				11
-#define DIMM_REFRESH_INTERVAL 				12
-#define DIMM_SDRAM_WIDTH 				13
-#define DIMM_ERR_CHECK_DATA_WIDTH 			14
-#define DIMM_MIN_CLK_DEL 				15
-#define DIMM_BURST_LEN_SUP 				16
-#define DIMM_DEV_BANK_NUM 				17
-#define DIMM_SUP_CAL 					18
-#define DIMM_DDR2_TYPE_INFORMATION          		20      /* DDR2 only */
-#define DIMM_BUF_ADDR_CONT_IN 				21
-#define DIMM_MIN_CC_AT_MAX_CAS_MINUS1			23
-#define DIMM_MIN_CC_AT_MAX_CAS_MINUS2			25
-#define DIMM_MIN_ROW_PRECHARGE_TIME			27
-#define DIMM_MIN_ROW_ACTIVE_TO_ROW_ACTIVE		28
-#define DIMM_MIN_RAS_TO_CAS_DELAY			29
-#define DIMM_MIN_RAS_PULSE_WIDTH			30
-#define DIMM_BANK_DENSITY				31
-#define DIMM_MIN_WRITE_RECOVERY_TIME        		36
-#define DIMM_MIN_WRITE_TO_READ_CMD_DELAY    		37
-#define DIMM_MIN_READ_TO_PRECH_CMD_DELAY    		38
-#define DIMM_MIN_REFRESH_TO_ACTIVATE_CMD    		42
-#define DIMM_SPD_VERSION    				62
-
-/* Dimm Memory Type values */
-#define DIMM_MEM_TYPE_SDRAM					0x4
-#define DIMM_MEM_TYPE_DDR1 					0x7
-#define DIMM_MEM_TYPE_DDR2 					0x8
-        
-#define DIMM_MODULE_MANU_OFFS 		64
-#define DIMM_MODULE_MANU_SIZE 		8
-#define DIMM_MODULE_VEN_OFFS 		73 
-#define DIMM_MODULE_VEN_SIZE 		25
-#define DIMM_MODULE_ID_OFFS 		99
-#define DIMM_MODULE_ID_SIZE 		18
-
-/* enumeration for voltage levels. */
-typedef enum _mvDimmVoltageIf
-{
-    TTL_5V_TOLERANT, 
-    LVTTL, 
-    HSTL_1_5V, 
-    SSTL_3_3V, 
-    SSTL_2_5V, 
-    VOLTAGE_UNKNOWN, 
-} MV_DIMM_VOLTAGE_IF;
-
-
-/* enumaration for SDRAM CAS Latencies. */
-typedef enum _mvDimmSdramCas
-{
-    SD_CL_1 =1,  
-    SD_CL_2,  
-    SD_CL_3, 
-    SD_CL_4, 
-    SD_CL_5, 
-    SD_CL_6, 
-    SD_CL_7, 
-    SD_FAULT
-}MV_DIMM_SDRAM_CAS;
-
-
-/* DIMM information structure */                                                    
-typedef struct _mvDimmInfo
-{
-    MV_MEMORY_TYPE  memoryType; 	/* DDR or SDRAM */
-
-    MV_U8       spdRawData[SPD_SIZE];  	/* Content of SPD-EEPROM copied 1:1  */
-
-    /* DIMM dimensions */
-    MV_U32  numOfRowAddr;
-    MV_U32  numOfColAddr;
-    MV_U32  numOfModuleBanks;
-    MV_U32  dataWidth;
-    MV_U32  errorCheckType;             /* ECC , PARITY..*/
-    MV_U32  sdramWidth;                 /* 4,8,16 or 32 */
-    MV_U32  errorCheckDataWidth;        /* 0 - no, 1 - Yes */
-    MV_U32  burstLengthSupported;
-    MV_U32  numOfBanksOnEachDevice;
-    MV_U32  suportedCasLatencies;
-    MV_U32  refreshInterval;
-    MV_U32  dimmBankDensity;
-    MV_U32  dimmTypeInfo;           /* DDR2 only */
-    MV_U32  dimmAttributes;
-
-    /* DIMM timing parameters */
-    MV_U32  minCycleTimeAtMaxCasLatPs;	
-    MV_U32  minCycleTimeAtMaxCasLatMinus1Ps;
-    MV_U32  minCycleTimeAtMaxCasLatMinus2Ps;
-	MV_U32  minRowPrechargeTime;
-	MV_U32  minRowActiveToRowActive;
-	MV_U32  minRasToCasDelay;
-	MV_U32  minRasPulseWidth;
-    MV_U32  minWriteRecoveryTime;   /* DDR2 only */
-    MV_U32  minWriteToReadCmdDelay; /* DDR2 only */
-    MV_U32  minReadToPrechCmdDelay; /* DDR2 only */
-    MV_U32  minRefreshToActiveCmd;  /* DDR2 only */
-
-    /* Parameters calculated from the extracted DIMM information */
-    MV_U32  size;               /* 16,64,128,256 or 512 MByte in MB units */
-    MV_U32  deviceDensity;      /* 16,64,128,256 or 512 Mbit in MB units  */
-    MV_U32  numberOfDevices;
-
-} MV_DIMM_INFO;
-
-
-MV_STATUS mvDramBankInfoGet(MV_U32 bankNum, MV_DRAM_BANK_INFO *pBankInfo);
-MV_STATUS dimmSpdGet(MV_U32 dimmNum, MV_DIMM_INFO *pDimmInfo);
-MV_VOID dimmSpdPrint(MV_U32 dimmNum);
-MV_STATUS dimmSpdCpy(MV_VOID);
-
-#endif /* __INCmvDram */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c
deleted file mode 100644
index d24e788fc7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEth.c
+++ /dev/null
@@ -1,2952 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvEth.c - Marvell's Gigabit Ethernet controller low level driver
-*
-* DESCRIPTION:
-*       This file introduce OS independent APIs to Marvell's Gigabit Ethernet
-*       controller. This Gigabit Ethernet Controller driver API controls
-*       1) Operations (i.e. port Init, Finish, Up, Down, PhyReset etc').
-*       2) Data flow (i.e. port Send, Receive etc').
-*       3) MAC Filtering functions (ethSetMcastAddr, ethSetRxFilterMode, etc.)
-*       4) MIB counters support (ethReadMibCounter)
-*       5) Debug functions (ethPortRegs, ethPortCounters, ethPortQueues, etc.)
-*       Each Gigabit Ethernet port is controlled via ETH_PORT_CTRL struct.
-*       This struct includes configuration information as well as driver
-*       internal data needed for its operations.
-*
-*       Supported Features:
-*       - OS independent. All required OS services are implemented via external 
-*       OS dependent components (like osLayer or ethOsg)
-*       - The user is free from Rx/Tx queue managing.
-*       - Simple Gigabit Ethernet port operation API.
-*       - Simple Gigabit Ethernet port data flow API.
-*       - Data flow and operation API support per queue functionality.
-*       - Support cached descriptors for better performance.
-*       - PHY access and control API.
-*       - Port Configuration API.
-*       - Full control over Special and Other Multicast MAC tables.
-*
-*******************************************************************************/
-/* includes */
-#include "mvTypes.h"
-#include "mv802_3.h"
-#include "mvDebug.h"
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "eth-phy/mvEthPhy.h"
-#include "eth/mvEth.h"
-#include "eth/gbe/mvEthGbe.h"
-#include "cpu/mvCpu.h"
-
-#ifdef INCLUDE_SYNC_BARR
-#include "sys/mvCpuIf.h"
-#endif
-
-#ifdef MV_RT_DEBUG
-#   define ETH_DEBUG
-#endif
-
-
-/* locals */
-MV_BOOL         ethDescInSram;
-MV_BOOL         ethDescSwCoher;
-
-/* This array holds the control structure of each port */
-ETH_PORT_CTRL* ethPortCtrl[MV_ETH_MAX_PORTS];
-
-/* Ethernet Port Local routines */
-
-static void    ethInitRxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue);
-
-static void    ethInitTxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue);
-
-static void    ethSetUcastTable(int portNo, int queue);
-
-static MV_BOOL ethSetUcastAddr (int ethPortNum, MV_U8 lastNibble, int queue);
-static MV_BOOL ethSetSpecialMcastAddr(int ethPortNum, MV_U8 lastByte, int queue);
-static MV_BOOL ethSetOtherMcastAddr(int ethPortNum, MV_U8 crc8, int queue);
-
-static void    ethFreeDescrMemory(ETH_PORT_CTRL* pEthPortCtrl, MV_BUF_INFO* pDescBuf);
-static MV_U8*  ethAllocDescrMemory(ETH_PORT_CTRL* pEthPortCtrl, int size, 
-                                   MV_ULONG* pPhysAddr, MV_U32 *memHandle);
-
-static MV_U32 mvEthMruGet(MV_U32 maxRxPktSize);
-
-static void mvEthPortSgmiiConfig(int port);
-
-
-
-/******************************************************************************/
-/*                      EthDrv Initialization functions                       */
-/******************************************************************************/
-
-/*******************************************************************************
-* mvEthHalInit - Initialize the Giga Ethernet unit
-*
-* DESCRIPTION:
-*       This function initialize the Giga Ethernet unit.
-*       1) Configure Address decode windows of the unit
-*       2) Set registers to HW default values. 
-*       3) Clear and Disable interrupts
-*
-* INPUT:  NONE
-*
-* RETURN: NONE
-*
-* NOTE: this function is called once in the boot process.
-*******************************************************************************/
-void    mvEthHalInit(void)
-{
-    int port;
-
-    /* Init static data structures */
-    for (port=0; port<MV_ETH_MAX_PORTS; port++)
-    {
-        ethPortCtrl[port] = NULL;
-    }
-    /* Power down all existing ports */
-    for(port=0; port<mvCtrlEthMaxPortGet(); port++)
-    {
-
-#if defined (MV78200)
-	    /* Skip ports mapped to another CPU*/
-	if (MV_FALSE == mvSocUnitIsMappedToThisCpu(GIGA0+port))
-	{
-		    continue;
-	}		
-#endif
-
-	/* Skip power down ports */
-	if (MV_FALSE == mvCtrlPwrClckGet(ETH_GIG_UNIT_ID, port)) continue;
-
-        /* Disable Giga Ethernet Unit interrupts */
-        MV_REG_WRITE(ETH_UNIT_INTR_MASK_REG(port), 0);
-
-        /* Clear ETH_UNIT_INTR_CAUSE_REG register */
-        MV_REG_WRITE(ETH_UNIT_INTR_CAUSE_REG(port), 0);
-
-    }
-
-    mvEthMemAttrGet(&ethDescInSram, &ethDescSwCoher);
-
-#if defined(ETH_DESCR_IN_SRAM)
-    if(ethDescInSram == MV_FALSE)
-    {
-        mvOsPrintf("ethDrv: WARNING! Descriptors will be allocated in DRAM instead of SRAM.\n");
-    }
-#endif /* ETH_DESCR_IN_SRAM */
-}
-
-/*******************************************************************************
-* mvEthMemAttrGet - Define properties (SRAM/DRAM, SW_COHER / HW_COHER / UNCACHED) 
-*                       of of memory location for RX and TX descriptors.
-*
-* DESCRIPTION:
-*       This function allocates memory for RX and TX descriptors.
-*       - If ETH_DESCR_IN_SRAM defined, allocate from SRAM memory.
-*       - If ETH_DESCR_IN_SDRAM defined, allocate from SDRAM memory.
-*
-* INPUT:
-*   MV_BOOL* pIsSram - place of descriptors: 
-*                      MV_TRUE  - in SRAM
-*                      MV_FALSE - in DRAM
-*   MV_BOOL* pIsSwCoher - cache coherency of descriptors:
-*                      MV_TRUE  - driver is responsible for cache coherency
-*                      MV_FALSE - driver is not responsible for cache coherency
-*
-* RETURN:
-*
-*******************************************************************************/
-void   mvEthMemAttrGet(MV_BOOL* pIsSram, MV_BOOL* pIsSwCoher)
-{
-    MV_BOOL isSram, isSwCoher;
-
-    isSram = MV_FALSE;
-#if (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) 
-    isSwCoher = MV_TRUE;
-#else 
-    isSwCoher = MV_FALSE;
-#endif
-
-#if defined(ETH_DESCR_IN_SRAM)
-    if( mvCtrlSramSizeGet() > 0)
-    {
-        isSram = MV_TRUE;
-        #if (INTEG_SRAM_COHER == MV_CACHE_COHER_SW) 
-            isSwCoher = MV_TRUE;
-        #else 
-            isSwCoher = MV_FALSE;
-        #endif
-    }
-#endif /* ETH_DESCR_IN_SRAM */
-
-    if(pIsSram != NULL)
-        *pIsSram = isSram;
-
-    if(pIsSwCoher != NULL)
-        *pIsSwCoher = isSwCoher;
-}
-
-
-
-/******************************************************************************/
-/*                      Port Initialization functions                         */
-/******************************************************************************/
-
-/*******************************************************************************
-* mvEthPortInit - Initialize the Ethernet port driver
-*
-* DESCRIPTION:
-*       This function initialize the ethernet port.
-*       1) Allocate and initialize internal port Control structure.
-*       2) Create RX and TX descriptor rings for default RX and TX queues
-*       3) Disable RX and TX operations, clear cause registers and 
-*          mask all interrupts.
-*       4) Set all registers to default values and clean all MAC tables. 
-*
-* INPUT:
-*       int             portNo          - Ethernet port number
-*       ETH_PORT_INIT   *pEthPortInit   - Ethernet port init structure
-*
-* RETURN:
-*       void* - ethernet port handler, that should be passed to the most other
-*               functions dealing with this port.
-*
-* NOTE: This function is called once per port when loading the eth module.
-*******************************************************************************/
-void*   mvEthPortInit(int portNo, MV_ETH_PORT_INIT *pEthPortInit)
-{
-    int             queue, descSize;
-    ETH_PORT_CTRL*  pPortCtrl;
-
-    /* Check validity of parameters */
-    if( (portNo >= (int)mvCtrlEthMaxPortGet()) || 
-        (pEthPortInit->rxDefQ   >= MV_ETH_RX_Q_NUM)  ||
-        (pEthPortInit->maxRxPktSize < 1518) )
-    {
-        mvOsPrintf("EthPort #%d: Bad initialization parameters\n", portNo);
-        return NULL;
-    }
-    if( (pEthPortInit->rxDescrNum[pEthPortInit->rxDefQ]) == 0)
-    {
-        mvOsPrintf("EthPort #%d: rxDefQ (%d) must be created\n", 
-                    portNo, pEthPortInit->rxDefQ);
-        return NULL;
-    }
-
-    pPortCtrl = (ETH_PORT_CTRL*)mvOsMalloc( sizeof(ETH_PORT_CTRL) );
-    if(pPortCtrl == NULL)   
-    {
-       mvOsPrintf("EthDrv: Can't allocate %dB for port #%d control structure!\n",
-                   (int)sizeof(ETH_PORT_CTRL), portNo);
-       return NULL;
-    }
-
-    memset(pPortCtrl, 0, sizeof(ETH_PORT_CTRL) );
-    ethPortCtrl[portNo] = pPortCtrl;
-
-    pPortCtrl->portState = MV_UNDEFINED_STATE;
-
-    pPortCtrl->portNo = portNo;
-
-    pPortCtrl->osHandle = pEthPortInit->osHandle;
-
-    /* Copy Configuration parameters */
-    pPortCtrl->portConfig.maxRxPktSize = pEthPortInit->maxRxPktSize;
-    pPortCtrl->portConfig.rxDefQ = pEthPortInit->rxDefQ;
-    pPortCtrl->portConfig.ejpMode = 0;
-
-    for( queue=0; queue<MV_ETH_RX_Q_NUM; queue++ )
-    {
-        pPortCtrl->rxQueueConfig[queue].descrNum = pEthPortInit->rxDescrNum[queue];
-    }
-    for( queue=0; queue<MV_ETH_TX_Q_NUM; queue++ )
-    {
-        pPortCtrl->txQueueConfig[queue].descrNum = pEthPortInit->txDescrNum[queue];
-    }
-
-    mvEthPortDisable(pPortCtrl);
-
-    /* Set the board information regarding PHY address */
-    mvEthPhyAddrSet(pPortCtrl, mvBoardPhyAddrGet(portNo) );
-
-    /* Create all requested RX queues */
-    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
-    {
-        if(pPortCtrl->rxQueueConfig[queue].descrNum == 0)
-            continue;
-
-        /* Allocate memory for RX descriptors */
-        descSize = ((pPortCtrl->rxQueueConfig[queue].descrNum * ETH_RX_DESC_ALIGNED_SIZE) +
-                                                        CPU_D_CACHE_LINE_SIZE);
- 
-        pPortCtrl->rxQueue[queue].descBuf.bufVirtPtr = 
-                        ethAllocDescrMemory(pPortCtrl, descSize, 
-					    &pPortCtrl->rxQueue[queue].descBuf.bufPhysAddr,
-					    &pPortCtrl->rxQueue[queue].descBuf.memHandle);
-        pPortCtrl->rxQueue[queue].descBuf.bufSize = descSize;
-        if(pPortCtrl->rxQueue[queue].descBuf.bufVirtPtr == NULL)
-        {
-            mvOsPrintf("EthPort #%d, rxQ=%d: Can't allocate %d bytes in %s for %d RX descr\n", 
-                        pPortCtrl->portNo, queue, descSize, 
-                        ethDescInSram ? "SRAM" : "DRAM",
-                        pPortCtrl->rxQueueConfig[queue].descrNum);
-            return NULL;
-        }
-
-        ethInitRxDescRing(pPortCtrl, queue);
-    }
-    /* Create TX queues */
-    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
-    {
-        if(pPortCtrl->txQueueConfig[queue].descrNum == 0)
-            continue;
-
-        /* Allocate memory for TX descriptors */
-        descSize = ((pPortCtrl->txQueueConfig[queue].descrNum * ETH_TX_DESC_ALIGNED_SIZE) +
-                                                        CPU_D_CACHE_LINE_SIZE);
- 
-        pPortCtrl->txQueue[queue].descBuf.bufVirtPtr = 
-		ethAllocDescrMemory(pPortCtrl, descSize,
-				    &pPortCtrl->txQueue[queue].descBuf.bufPhysAddr,
-				    &pPortCtrl->txQueue[queue].descBuf.memHandle);
-        pPortCtrl->txQueue[queue].descBuf.bufSize = descSize;
-        if(pPortCtrl->txQueue[queue].descBuf.bufVirtPtr == NULL)
-        {
-            mvOsPrintf("EthPort #%d, txQ=%d: Can't allocate %d bytes in %s for %d TX descr\n", 
-                        pPortCtrl->portNo, queue, descSize, ethDescInSram ? "SRAM" : "DRAM",
-                        pPortCtrl->txQueueConfig[queue].descrNum);
-            return NULL;
-        }
-
-        ethInitTxDescRing(pPortCtrl, queue);
-    }
-    mvEthDefaultsSet(pPortCtrl);
-
-    pPortCtrl->portState = MV_IDLE;
-    return pPortCtrl;
-}
-
-/*******************************************************************************
-* ethPortFinish - Finish the Ethernet port driver
-*
-* DESCRIPTION:
-*       This function finish the ethernet port.
-*       1) Down ethernet port if needed.
-*       2) Delete RX and TX descriptor rings for all created RX and TX queues
-*       3) Free internal port Control structure.
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   NONE.
-*
-*******************************************************************************/
-void    mvEthPortFinish(void* pPortHndl)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    int             queue, portNo  = pPortCtrl->portNo;
-
-    if(pPortCtrl->portState == MV_ACTIVE)
-    {
-        mvOsPrintf("ethPort #%d: Warning !!! Finish port in Active state\n",
-                 portNo);
-        mvEthPortDisable(pPortHndl);
-    }
-
-    /* Free all allocated RX queues */
-    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
-    {
-        ethFreeDescrMemory(pPortCtrl, &pPortCtrl->rxQueue[queue].descBuf);
-    }
-
-    /* Free all allocated TX queues */
-    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
-    {
-        ethFreeDescrMemory(pPortCtrl, &pPortCtrl->txQueue[queue].descBuf);
-    }
-
-    /* Free port control structure */
-    mvOsFree(pPortCtrl);
-
-    ethPortCtrl[portNo] = NULL;
-}
-
-/*******************************************************************************
-* mvEthDefaultsSet - Set defaults to the ethernet port
-*
-* DESCRIPTION:
-*       This function set default values to the ethernet port.
-*       1) Clear Cause registers and Mask all interrupts
-*       2) Clear all MAC tables
-*       3) Set defaults to all registers
-*       4) Reset all created RX and TX descriptors ring
-*       5) Reset PHY
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   MV_STATUS  
-*               MV_OK - Success, Others - Failure
-* NOTE:
-*   This function update all the port configuration except those set
-*   Initialy by the OsGlue by MV_ETH_PORT_INIT.
-*   This function can be called after portDown to return the port setting 
-*   to defaults.
-*******************************************************************************/
-MV_STATUS   mvEthDefaultsSet(void* pPortHndl)
-{
-    int                 ethPortNo, queue;
-    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    ETH_QUEUE_CTRL*     pQueueCtrl;
-    MV_U32              txPrio;
-    MV_U32              portCfgReg, portCfgExtReg, portSerialCtrlReg, portSerialCtrl1Reg, portSdmaCfgReg;
-    MV_BOARD_MAC_SPEED  boardMacCfg;
-
-    ethPortNo = pPortCtrl->portNo;
-
-    /* Clear Cause registers */
-    MV_REG_WRITE(ETH_INTR_CAUSE_REG(ethPortNo),0);
-    MV_REG_WRITE(ETH_INTR_CAUSE_EXT_REG(ethPortNo),0);
-
-    /* Mask all interrupts */
-    MV_REG_WRITE(ETH_INTR_MASK_REG(ethPortNo),0);
-    MV_REG_WRITE(ETH_INTR_MASK_EXT_REG(ethPortNo),0);
-
-    portCfgReg  =   PORT_CONFIG_VALUE;
-    portCfgExtReg  =  PORT_CONFIG_EXTEND_VALUE;
-
-    boardMacCfg = mvBoardMacSpeedGet(ethPortNo);
-
-    if(boardMacCfg == BOARD_MAC_SPEED_100M)
-    {
-        portSerialCtrlReg = PORT_SERIAL_CONTROL_100MB_FORCE_VALUE;
-    }
-    else if(boardMacCfg == BOARD_MAC_SPEED_1000M)
-    {
-        portSerialCtrlReg = PORT_SERIAL_CONTROL_1000MB_FORCE_VALUE;
-    }
-    else
-    {
-        portSerialCtrlReg =  PORT_SERIAL_CONTROL_VALUE;
-    }
-
-    /* build PORT_SDMA_CONFIG_REG */
-    portSdmaCfgReg = ETH_TX_INTR_COAL_MASK(0);
-    portSdmaCfgReg |= ETH_TX_BURST_SIZE_MASK(ETH_BURST_SIZE_16_64BIT_VALUE);
-
-#if ( (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WB) ||  \
-      (ETHER_DRAM_COHER == MV_CACHE_COHER_HW_WT) )
-    /* some devices have restricted RX burst size when using HW coherency */
-    portSdmaCfgReg |= ETH_RX_BURST_SIZE_MASK(ETH_BURST_SIZE_4_64BIT_VALUE);
-#else
-    portSdmaCfgReg |= ETH_RX_BURST_SIZE_MASK(ETH_BURST_SIZE_16_64BIT_VALUE);
-#endif
-
-#if defined(MV_CPU_BE)
-    /* big endian */
-# if defined(MV_ARM)
-    portSdmaCfgReg |= (ETH_RX_NO_DATA_SWAP_MASK |
-                       ETH_TX_NO_DATA_SWAP_MASK |
-                       ETH_DESC_SWAP_MASK);
-# elif defined(MV_PPC)
-    portSdmaCfgReg |= (ETH_RX_DATA_SWAP_MASK |
-                       ETH_TX_DATA_SWAP_MASK |
-                       ETH_NO_DESC_SWAP_MASK);
-# else
-# error "Giga Ethernet Swap policy is not defined for the CPU_ARCH"
-# endif /* MV_ARM / MV_PPC */
-
-#else /* MV_CPU_LE */
-    /* little endian */
-    portSdmaCfgReg |= (ETH_RX_NO_DATA_SWAP_MASK | 
-                       ETH_TX_NO_DATA_SWAP_MASK | 
-                       ETH_NO_DESC_SWAP_MASK);
-#endif /* MV_CPU_BE / MV_CPU_LE */
-
-    pPortCtrl->portRxQueueCmdReg = 0;
-    pPortCtrl->portTxQueueCmdReg = 0;
-
-#if (MV_ETH_VERSION >= 4) 
-    if(pPortCtrl->portConfig.ejpMode == MV_TRUE)
-    {
-        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(ethPortNo), ETH_TX_EJP_ENABLE_MASK);
-    }
-    else
-    {
-        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(ethPortNo), 0)
-    }
-#endif /* (MV_ETH_VERSION >= 4) */
-
-    ethSetUcastTable(ethPortNo, -1);
-    mvEthSetSpecialMcastTable(ethPortNo, -1);
-    mvEthSetOtherMcastTable(ethPortNo, -1);
-
-    portSerialCtrlReg &= ~ETH_MAX_RX_PACKET_SIZE_MASK;
-
-    portSerialCtrlReg |= mvEthMruGet(pPortCtrl->portConfig.maxRxPktSize);
-
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNo), portSerialCtrlReg);
-
-    /* Update value of PortConfig register accordingly with all RxQueue types */
-    pPortCtrl->portConfig.rxArpQ = pPortCtrl->portConfig.rxDefQ;
-    pPortCtrl->portConfig.rxBpduQ = pPortCtrl->portConfig.rxDefQ; 
-    pPortCtrl->portConfig.rxTcpQ = pPortCtrl->portConfig.rxDefQ; 
-    pPortCtrl->portConfig.rxUdpQ = pPortCtrl->portConfig.rxDefQ; 
-
-    portCfgReg &= ~ETH_DEF_RX_QUEUE_ALL_MASK;
-    portCfgReg |= ETH_DEF_RX_QUEUE_MASK(pPortCtrl->portConfig.rxDefQ);
-    
-    portCfgReg &= ~ETH_DEF_RX_ARP_QUEUE_ALL_MASK;
-    portCfgReg |= ETH_DEF_RX_ARP_QUEUE_MASK(pPortCtrl->portConfig.rxArpQ); 
-
-    portCfgReg &= ~ETH_DEF_RX_BPDU_QUEUE_ALL_MASK;
-    portCfgReg |= ETH_DEF_RX_BPDU_QUEUE_MASK(pPortCtrl->portConfig.rxBpduQ);
-
-    portCfgReg &= ~ETH_DEF_RX_TCP_QUEUE_ALL_MASK;
-    portCfgReg |= ETH_DEF_RX_TCP_QUEUE_MASK(pPortCtrl->portConfig.rxTcpQ);
-
-    portCfgReg &= ~ETH_DEF_RX_UDP_QUEUE_ALL_MASK;
-    portCfgReg |= ETH_DEF_RX_UDP_QUEUE_MASK(pPortCtrl->portConfig.rxUdpQ);
-
-    /* Assignment of Tx CTRP of given queue */
-    txPrio = 0;
-
-    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
-    {
-        pQueueCtrl = &pPortCtrl->txQueue[queue];
-
-        if(pQueueCtrl->pFirstDescr != NULL)
-        {
-            ethResetTxDescRing(pPortCtrl, queue);
-
-            MV_REG_WRITE(ETH_TXQ_TOKEN_COUNT_REG(ethPortNo, queue),
-                         0x3fffffff);
-            MV_REG_WRITE(ETH_TXQ_TOKEN_CFG_REG(ethPortNo, queue), 
-                         0x03ffffff);
-        }
-        else
-        {
-            MV_REG_WRITE(ETH_TXQ_TOKEN_COUNT_REG(ethPortNo, queue),  0x0);
-            MV_REG_WRITE(ETH_TXQ_TOKEN_CFG_REG(ethPortNo, queue), 0x0);
-        }
-    }
-
-    /* Assignment of Rx CRDP of given queue */
-    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
-    {
-        ethResetRxDescRing(pPortCtrl, queue);
-    }
-
-    /* Allow receiving packes with odd number of preamble nibbles */
-    portSerialCtrl1Reg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(ethPortNo));
-    portSerialCtrl1Reg |= ETH_EN_MII_ODD_PRE_MASK;
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(ethPortNo), portSerialCtrl1Reg);
-
-    /* Assign port configuration and command. */
-    MV_REG_WRITE(ETH_PORT_CONFIG_REG(ethPortNo), portCfgReg);
-
-    MV_REG_WRITE(ETH_PORT_CONFIG_EXTEND_REG(ethPortNo), portCfgExtReg);
-
-    /* Assign port SDMA configuration */
-    MV_REG_WRITE(ETH_SDMA_CONFIG_REG(ethPortNo), portSdmaCfgReg);
-    
-    /* Turn off the port/queue bandwidth limitation */
-    MV_REG_WRITE(ETH_MAX_TRANSMIT_UNIT_REG(ethPortNo), 0x0);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* ethPortUp - Start the Ethernet port RX and TX activity.
-*
-* DESCRIPTION:
-*       This routine start Rx and Tx activity:
-*
-*       Note: Each Rx and Tx queue descriptor's list must be initialized prior
-*       to calling this function (use etherInitTxDescRing for Tx queues and
-*       etherInitRxDescRing for Rx queues).
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   MV_STATUS
-*           MV_OK - Success, Others - Failure.
-*
-* NOTE : used for port link up.
-*******************************************************************************/
-MV_STATUS   mvEthPortUp(void* pEthPortHndl)
-{
-    int             ethPortNo;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-
-    ethPortNo = pPortCtrl->portNo;
-    
-    if( (pPortCtrl->portState != MV_ACTIVE) && 
-        (pPortCtrl->portState != MV_PAUSED) )
-    {
-        mvOsPrintf("ethDrv port%d: Unexpected port state %d\n", 
-                        ethPortNo, pPortCtrl->portState);
-        return MV_BAD_STATE;
-    }
-    
-    ethPortNo = pPortCtrl->portNo;
-
-    /* Enable port RX. */
-    MV_REG_WRITE(ETH_RX_QUEUE_COMMAND_REG(ethPortNo), pPortCtrl->portRxQueueCmdReg);
-
-    /* Enable port TX. */
-    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(ethPortNo)) = pPortCtrl->portTxQueueCmdReg;
-
-    pPortCtrl->portState = MV_ACTIVE;
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* ethPortDown - Stop the Ethernet port activity.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   MV_STATUS
-*               MV_OK - Success, Others - Failure.
-*
-* NOTE : used for port link down.
-*******************************************************************************/
-MV_STATUS   mvEthPortDown(void* pEthPortHndl)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    int             ethPortNum = pPortCtrl->portNo;
-    unsigned int    regData;
-    volatile int    uDelay, mDelay;
-
-    /* Stop Rx port activity. Check port Rx activity. */
-    regData = (MV_REG_READ(ETH_RX_QUEUE_COMMAND_REG(ethPortNum))) & ETH_RXQ_ENABLE_MASK;
-    if(regData != 0)
-    {
-        /* Issue stop command for active channels only */
-        MV_REG_WRITE(ETH_RX_QUEUE_COMMAND_REG(ethPortNum), (regData << ETH_RXQ_DISABLE_OFFSET));
-    }
-
-    /* Stop Tx port activity. Check port Tx activity. */
-    regData = (MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(ethPortNum))) & ETH_TXQ_ENABLE_MASK;
-    if(regData != 0)
-    {
-        /* Issue stop command for active channels only */
-        MV_REG_WRITE(ETH_TX_QUEUE_COMMAND_REG(ethPortNum), 
-                            (regData << ETH_TXQ_DISABLE_OFFSET) ); 
-    }
-
-    /* Force link down */
-/*
-    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
-    regData &= ~(ETH_DO_NOT_FORCE_LINK_FAIL_MASK);
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
-*/
-    /* Wait for all Rx activity to terminate. */
-    mDelay = 0;
-    do
-    {
-        if(mDelay >= RX_DISABLE_TIMEOUT_MSEC)
-        {
-            mvOsPrintf("ethPort_%d: TIMEOUT for RX stopped !!! rxQueueCmd - 0x08%x\n", 
-                        ethPortNum, regData);
-            break;
-        }
-        mvOsDelay(1);
-        mDelay++;
-        
-        /* Check port RX Command register that all Rx queues are stopped */
-        regData = MV_REG_READ(ETH_RX_QUEUE_COMMAND_REG(ethPortNum));
-    }
-    while(regData & 0xFF);
-
-    /* Wait for all Tx activity to terminate. */
-    mDelay = 0;
-    do
-    {
-        if(mDelay >= TX_DISABLE_TIMEOUT_MSEC)
-        {
-            mvOsPrintf("ethPort_%d: TIMEOUT for TX stoped !!! txQueueCmd - 0x08%x\n", 
-                        ethPortNum, regData);
-            break;
-        }
-        mvOsDelay(1);
-        mDelay++;
-
-        /* Check port TX Command register that all Tx queues are stopped */
-        regData = MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(ethPortNum));
-    }
-    while(regData & 0xFF);
-    
-    /* Double check to Verify that TX FIFO is Empty */
-    mDelay = 0;
-    while(MV_TRUE)
-    {
-        do
-        {
-            if(mDelay >= TX_FIFO_EMPTY_TIMEOUT_MSEC)
-            {
-                mvOsPrintf("\n ethPort_%d: TIMEOUT for TX FIFO empty !!! portStatus - 0x08%x\n", 
-                            ethPortNum, regData);
-                break;
-            }
-            mvOsDelay(1);
-            mDelay++;
-
-            regData = MV_REG_READ(ETH_PORT_STATUS_REG(ethPortNum));
-        }
-        while( ((regData & ETH_TX_FIFO_EMPTY_MASK) == 0) || 
-               ((regData & ETH_TX_IN_PROGRESS_MASK) != 0) );
-
-        if(mDelay >= TX_FIFO_EMPTY_TIMEOUT_MSEC)
-            break;
-
-        /* Double check */
-        regData = MV_REG_READ(ETH_PORT_STATUS_REG(ethPortNum));
-        if( ((regData & ETH_TX_FIFO_EMPTY_MASK) != 0) && 
-            ((regData & ETH_TX_IN_PROGRESS_MASK) == 0) )
-        {
-            break;
-        }
-        else
-            mvOsPrintf("ethPort_%d: TX FIFO Empty double check failed. %d msec, portStatus=0x%x\n",
-                                ethPortNum, mDelay, regData);     
-    }
-
-    /* Do NOT force link down */
-/*
-    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
-    regData |= (ETH_DO_NOT_FORCE_LINK_FAIL_MASK);
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
-*/
-    /* Wait about 2500 tclk cycles */
-    uDelay = (PORT_DISABLE_WAIT_TCLOCKS/(mvBoardTclkGet()/1000000));
-    mvOsUDelay(uDelay);
-
-    pPortCtrl->portState = MV_PAUSED;
-
-    return MV_OK;   
-}
-
-
-/*******************************************************************************
-* ethPortEnable - Enable the Ethernet port and Start RX and TX.
-*
-* DESCRIPTION:
-*       This routine enable the Ethernet port and Rx and Tx activity:
-*
-*       Note: Each Rx and Tx queue descriptor's list must be initialized prior
-*       to calling this function (use etherInitTxDescRing for Tx queues and
-*       etherInitRxDescRing for Rx queues).
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   MV_STATUS
-*               MV_OK - Success, Others - Failure.
-*
-* NOTE: main usage is to enable the port after ifconfig up.
-*******************************************************************************/
-MV_STATUS   mvEthPortEnable(void* pEthPortHndl)
-{
-    int             ethPortNo;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    MV_U32      portSerialCtrlReg;
-
-    ethPortNo = pPortCtrl->portNo;
-
-    /* Enable port */
-    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNo));
-    portSerialCtrlReg |= (ETH_DO_NOT_FORCE_LINK_FAIL_MASK | ETH_PORT_ENABLE_MASK);
-
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNo), portSerialCtrlReg);
-
-    mvEthMibCountersClear(pEthPortHndl);
-
-    pPortCtrl->portState = MV_PAUSED;
-
-    /* If Link is UP, Start RX and TX traffic */
-    if( MV_REG_READ( ETH_PORT_STATUS_REG(ethPortNo) ) & ETH_LINK_UP_MASK)
-        return( mvEthPortUp(pEthPortHndl) );
-    
-    return MV_NOT_READY;
-}
-
-
-/*******************************************************************************
-* mvEthPortDisable - Stop RX and TX activities and Disable the Ethernet port.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       void*   pEthPortHndl  - Ethernet port handler
-*
-* RETURN:   MV_STATUS
-*               MV_OK - Success, Others - Failure.
-*
-* NOTE: main usage is to disable the port after ifconfig down.
-*******************************************************************************/
-MV_STATUS   mvEthPortDisable(void* pEthPortHndl)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    int             ethPortNum = pPortCtrl->portNo;
-    unsigned int    regData;
-    volatile int    mvDelay;
-
-    if(pPortCtrl->portState == MV_ACTIVE)           
-    {    
-        /* Stop RX and TX activities */
-        mvEthPortDown(pEthPortHndl);
-    }
-
-    /* Reset the Enable bit in the Serial Control Register */
-    regData = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(ethPortNum));
-    regData &= ~(ETH_PORT_ENABLE_MASK);
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(ethPortNum), regData);
-
-    /* Wait about 2500 tclk cycles */
-    mvDelay = (PORT_DISABLE_WAIT_TCLOCKS*(mvCpuPclkGet()/mvBoardTclkGet()));
-    for(mvDelay; mvDelay>0; mvDelay--);
-
-    pPortCtrl->portState = MV_IDLE;
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthPortForceTxDone - Get next buffer from TX queue in spite of buffer ownership.
-*
-* DESCRIPTION:
-*       This routine used to free buffers attached to the Tx ring and should
-*       be called only when Giga Ethernet port is Down
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       int         txQueue         - Number of TX queue.
-*
-* OUTPUT:
-*       MV_PKT_INFO *pPktInfo       - Pointer to packet was sent.
-*
-* RETURN:
-*       MV_EMPTY    - There is no more buffers in this queue.
-*       MV_OK       - Buffer detached from the queue and pPktInfo structure 
-*                   filled with relevant information.
-*
-*******************************************************************************/
-MV_PKT_INFO*    mvEthPortForceTxDone(void* pEthPortHndl, int txQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    MV_PKT_INFO*    pPktInfo;
-    ETH_TX_DESC*    pTxDesc;
-    int             port = pPortCtrl->portNo;
-       
-    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
-
-    while( (pQueueCtrl->pUsedDescr != pQueueCtrl->pCurrentDescr) ||
-           (pQueueCtrl->resource == 0) )
-    {
-        /* Free next descriptor */
-        pQueueCtrl->resource++;
-        pTxDesc = (ETH_TX_DESC*)pQueueCtrl->pUsedDescr;
-
-	/* pPktInfo is available only in descriptors which are last descriptors */
-        pPktInfo = (MV_PKT_INFO*)pTxDesc->returnInfo;
-	if (pPktInfo)
-        	pPktInfo->status = pTxDesc->cmdSts;
-
-        pTxDesc->cmdSts = 0x0;
-        pTxDesc->returnInfo = 0x0;
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxDesc);
-
-        pQueueCtrl->pUsedDescr = TX_NEXT_DESC_PTR(pTxDesc, pQueueCtrl);
-
-        if (pPktInfo)
-		if (pPktInfo->status  & ETH_TX_LAST_DESC_MASK) 
-            		return pPktInfo;
-    }   
-    MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(port, txQueue), 
-                    (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
-    return NULL;
-}
-
-        
-
-/*******************************************************************************
-* mvEthPortForceRx - Get next buffer from RX queue in spite of buffer ownership.
-*
-* DESCRIPTION:
-*       This routine used to free buffers attached to the Rx ring and should
-*       be called only when Giga Ethernet port is Down
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       int         rxQueue         - Number of Rx queue.
-*
-* OUTPUT:
-*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
-*
-* RETURN:
-*       MV_EMPTY    - There is no more buffers in this queue.
-*       MV_OK       - Buffer detached from the queue and pBufInfo structure 
-*                   filled with relevant information.
-*
-*******************************************************************************/
-MV_PKT_INFO*    mvEthPortForceRx(void* pEthPortHndl, int rxQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    ETH_RX_DESC*    pRxDesc;
-    MV_PKT_INFO*    pPktInfo;
-    int             port = pPortCtrl->portNo;
-       
-    pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
-
-    if(pQueueCtrl->resource == 0)
-    {
-        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(port, rxQueue), 
-                    (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
-
-        return NULL;
-    }
-    /* Free next descriptor */
-    pQueueCtrl->resource--;
-    pRxDesc = (ETH_RX_DESC*)pQueueCtrl->pCurrentDescr;
-    pPktInfo = (MV_PKT_INFO*)pRxDesc->returnInfo;
-
-    pPktInfo->status  = pRxDesc->cmdSts;
-    pRxDesc->cmdSts = 0x0;
-    pRxDesc->returnInfo = 0x0;
-    ETH_DESCR_FLUSH_INV(pPortCtrl, pRxDesc);
-
-    pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxDesc, pQueueCtrl);
-    return pPktInfo;    
-}
-
-
-/******************************************************************************/
-/*                          Port Configuration functions                      */
-/******************************************************************************/
-/*******************************************************************************
-* mvEthMruGet - Get MRU configuration for Max Rx packet size.
-*
-* INPUT:
-*           MV_U32 maxRxPktSize - max  packet size.
-*
-* RETURN:   MV_U32 - MRU configuration.
-*
-*******************************************************************************/
-static MV_U32 mvEthMruGet(MV_U32 maxRxPktSize)
-{
-    MV_U32 portSerialCtrlReg = 0;
-
-    if(maxRxPktSize > 9192)
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9700BYTE;
-    else if(maxRxPktSize > 9022)
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9192BYTE;
-    else if(maxRxPktSize > 1552)
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_9022BYTE;
-    else if(maxRxPktSize > 1522)
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1552BYTE;
-    else if(maxRxPktSize > 1518)
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1522BYTE;
-    else
-        portSerialCtrlReg |= ETH_MAX_RX_PACKET_1518BYTE;
-
-    return portSerialCtrlReg;
-}
-
-/*******************************************************************************
-* mvEthRxCoalSet  - Sets coalescing interrupt mechanism on RX path
-*
-* DESCRIPTION:
-*       This routine sets the RX coalescing interrupt mechanism parameter.
-*       This parameter is a timeout counter, that counts in 64 tClk
-*       chunks, that when timeout event occurs a maskable interrupt occurs.
-*       The parameter is calculated using the tCLK frequency of the
-*       MV-64xxx chip, and the required number is in micro seconds.
-*
-* INPUT:
-*       void*           pPortHndl   - Ethernet Port handler.
-*       MV_U32          uSec        - Number of micro seconds between 
-*                                   RX interrupts
-*
-* RETURN:
-*       None.
-*
-* COMMENT:     
-*   1 sec           - TCLK_RATE clocks
-*   1 uSec          - TCLK_RATE / 1,000,000 clocks
-*
-*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_U32    mvEthRxCoalSet (void* pPortHndl, MV_U32 uSec) 
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    MV_U32          coal = ((uSec * (mvBoardTclkGet() / 1000000)) / 64);
-    MV_U32          portSdmaCfgReg;
-
-    portSdmaCfgReg =  MV_REG_READ(ETH_SDMA_CONFIG_REG(pPortCtrl->portNo));
-    portSdmaCfgReg &= ~ETH_RX_INTR_COAL_ALL_MASK;
-
-    portSdmaCfgReg |= ETH_RX_INTR_COAL_MASK(coal);
-
-#if (MV_ETH_VERSION >= 2)
-    /* Set additional bit if needed ETH_RX_INTR_COAL_MSB_BIT (25) */
-    if(ETH_RX_INTR_COAL_MASK(coal) > ETH_RX_INTR_COAL_ALL_MASK)
-        portSdmaCfgReg |= ETH_RX_INTR_COAL_MSB_MASK;
-#endif /* MV_ETH_VERSION >= 2 */
-
-    MV_REG_WRITE (ETH_SDMA_CONFIG_REG(pPortCtrl->portNo), portSdmaCfgReg);
-    return coal;
-}
-
-/*******************************************************************************
-* mvEthTxCoalSet - Sets coalescing interrupt mechanism on TX path
-*
-* DESCRIPTION:
-*       This routine sets the TX coalescing interrupt mechanism parameter.
-*       This parameter is a timeout counter, that counts in 64 tClk
-*       chunks, that when timeout event occurs a maskable interrupt
-*       occurs.
-*       The parameter is calculated using the tCLK frequency of the
-*       MV-64xxx chip, and the required number is in micro seconds.
-*
-* INPUT:
-*       void*           pPortHndl    - Ethernet Port handler.
-*       MV_U32          uSec        - Number of micro seconds between 
-*                                   RX interrupts
-*
-* RETURN:
-*       None.
-*
-* COMMENT:     
-*   1 sec           - TCLK_RATE clocks
-*   1 uSec          - TCLK_RATE / 1,000,000 clocks
-*
-*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
-*
-*******************************************************************************/
-MV_U32    mvEthTxCoalSet(void* pPortHndl, MV_U32 uSec) 
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    MV_U32          coal = ((uSec * (mvBoardTclkGet() / 1000000)) / 64);
-    MV_U32          regVal;
-
-    regVal = MV_REG_READ(ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo));
-    regVal &= ~ETH_TX_INTR_COAL_ALL_MASK;
-    regVal |= ETH_TX_INTR_COAL_MASK(coal);
-
-    /* Set TX Coalescing mechanism */
-    MV_REG_WRITE (ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo), regVal); 
-    return coal;
-}
-
-/*******************************************************************************
-* mvEthCoalGet - Gets RX and TX coalescing values in micro seconds
-*
-* DESCRIPTION:
-*       This routine gets the RX and TX coalescing interrupt values.
-*       The parameter is calculated using the tCLK frequency of the
-*       MV-64xxx chip, and the returned numbers are in micro seconds.
-*
-* INPUTs:
-*       void*   pPortHndl   - Ethernet Port handler.
-*
-* OUTPUTs:
-*       MV_U32* pRxCoal     - Number of micro seconds between RX interrupts
-*       MV_U32* pTxCoal     - Number of micro seconds between TX interrupts
-*
-* RETURN:
-*       MV_STATUS   MV_OK  - success
-*                   Others - failure.
-*
-* COMMENT:     
-*   1 sec           - TCLK_RATE clocks
-*   1 uSec          - TCLK_RATE / 1,000,000 clocks
-*
-*   Register Value for N micro seconds -  ((N * ( (TCLK_RATE / 1,000,000)) / 64)
-*
-*******************************************************************************/
-MV_STATUS   mvEthCoalGet(void* pPortHndl, MV_U32* pRxCoal, MV_U32* pTxCoal)
-{
-    MV_U32  regVal, coal, usec;
-
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    /* get TX Coalescing */
-    regVal = MV_REG_READ (ETH_TX_FIFO_URGENT_THRESH_REG(pPortCtrl->portNo));
-    coal = ((regVal & ETH_TX_INTR_COAL_ALL_MASK) >> ETH_TX_INTR_COAL_OFFSET);
-
-    usec = (coal * 64) / (mvBoardTclkGet() / 1000000);
-    if(pTxCoal != NULL)
-        *pTxCoal = usec;
-
-    /* Get RX Coalescing */
-    regVal =  MV_REG_READ(ETH_SDMA_CONFIG_REG(pPortCtrl->portNo));
-    coal = ((regVal & ETH_RX_INTR_COAL_ALL_MASK) >> ETH_RX_INTR_COAL_OFFSET);
-
-#if (MV_ETH_VERSION >= 2)
-    if(regVal & ETH_RX_INTR_COAL_MSB_MASK)
-    {
-        /* Add MSB */
-        coal |= (ETH_RX_INTR_COAL_ALL_MASK + 1);
-    }
-#endif /* MV_ETH_VERSION >= 2 */
-
-    usec = (coal * 64) / (mvBoardTclkGet() / 1000000);
-    if(pRxCoal != NULL)
-        *pRxCoal = usec;
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthMaxRxSizeSet - 
-*
-* DESCRIPTION:
-*       Change maximum receive size of the port. This configuration will take place 
-*       after next call of ethPortSetDefaults() function.
-*
-* INPUT:
-*
-* RETURN:
-*******************************************************************************/
-MV_STATUS   mvEthMaxRxSizeSet(void* pPortHndl, int maxRxSize)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    MV_U32      portSerialCtrlReg;
-
-    if((maxRxSize < 1518) || (maxRxSize & ~ETH_RX_BUFFER_MASK))
-       return MV_BAD_PARAM;
-    
-    pPortCtrl->portConfig.maxRxPktSize = maxRxSize;
-
-    portSerialCtrlReg =  MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(pPortCtrl->portNo));
-    portSerialCtrlReg &= ~ETH_MAX_RX_PACKET_SIZE_MASK;
-    portSerialCtrlReg |= mvEthMruGet(pPortCtrl->portConfig.maxRxPktSize);
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(pPortCtrl->portNo), portSerialCtrlReg);
-
-    return MV_OK;
-}
-
-
-/******************************************************************************/
-/*                      MAC Filtering functions                               */
-/******************************************************************************/
-
-/*******************************************************************************
-* mvEthRxFilterModeSet - Configure Fitering mode of Ethernet port
-*
-* DESCRIPTION:
-*       This routine used to free buffers attached to the Rx ring and should
-*       be called only when Giga Ethernet port is Down
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       MV_BOOL     isPromisc       - Promiscous mode
-*                                   MV_TRUE  - accept all Broadcast, Multicast 
-*                                              and Unicast packets
-*                                   MV_FALSE - accept all Broadcast, 
-*                                              specially added Multicast and
-*                                              single Unicast packets
-*
-* RETURN:   MV_STATUS   MV_OK - Success, Other - Failure
-*
-*******************************************************************************/
-MV_STATUS   mvEthRxFilterModeSet(void* pEthPortHndl, MV_BOOL isPromisc)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    int             queue;
-    MV_U32      portCfgReg;
-
-    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
-    /* Set / Clear UPM bit in port configuration register */
-    if(isPromisc)
-    {
-        /* Accept all multicast packets to RX default queue */
-        queue = pPortCtrl->portConfig.rxDefQ;
-        portCfgReg |= ETH_UNICAST_PROMISCUOUS_MODE_MASK;
-        memset(pPortCtrl->mcastCount, 1, sizeof(pPortCtrl->mcastCount));
-        MV_REG_WRITE(ETH_MAC_ADDR_LOW_REG(pPortCtrl->portNo),0xFFFF);
-        MV_REG_WRITE(ETH_MAC_ADDR_HIGH_REG(pPortCtrl->portNo),0xFFFFFFFF);
-    }
-    else
-    {
-        /* Reject all Multicast addresses */
-        queue = -1;
-        portCfgReg &= ~ETH_UNICAST_PROMISCUOUS_MODE_MASK;
-        /* Clear all mcastCount */
-        memset(pPortCtrl->mcastCount, 0, sizeof(pPortCtrl->mcastCount));
-    }
-    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);        
-
-    /* Set Special Multicast and Other Multicast tables */
-    mvEthSetSpecialMcastTable(pPortCtrl->portNo, queue);
-    mvEthSetOtherMcastTable(pPortCtrl->portNo, queue);
-    ethSetUcastTable(pPortCtrl->portNo, queue);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthMacAddrSet - This function Set the port Unicast address.
-*
-* DESCRIPTION:
-*       This function Set the port Ethernet MAC address. This address
-*       will be used to send Pause frames if enabled. Packets with this
-*       address will be accepted and dispatched to default RX queue
-*
-* INPUT:
-*       void*   pEthPortHndl    - Ethernet port handler.
-*       char*   pAddr           - Address to be set
-*
-* RETURN:   MV_STATUS
-*               MV_OK - Success,  Other - Faulure
-*
-*******************************************************************************/
-MV_STATUS   mvEthMacAddrSet(void* pPortHndl, unsigned char *pAddr, int queue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    unsigned int    macH;
-    unsigned int    macL;
-
-    if(queue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", queue);
-        return MV_BAD_PARAM;
-    }
-
-    if(queue != -1)
-    {
-        macL =  (pAddr[4] << 8) | (pAddr[5]);
-        macH =  (pAddr[0] << 24)| (pAddr[1] << 16) |
-                (pAddr[2] << 8) | (pAddr[3] << 0);
-
-        MV_REG_WRITE(ETH_MAC_ADDR_LOW_REG(pPortCtrl->portNo),  macL);
-        MV_REG_WRITE(ETH_MAC_ADDR_HIGH_REG(pPortCtrl->portNo), macH);
-    }
-
-    /* Accept frames of this address */
-    ethSetUcastAddr(pPortCtrl->portNo, pAddr[5], queue);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthMacAddrGet - This function returns the port Unicast address.
-*
-* DESCRIPTION:
-*       This function returns the port Ethernet MAC address.
-*
-* INPUT:
-*       int     portNo          - Ethernet port number.
-*       char*   pAddr           - Pointer where address will be written to
-*
-* RETURN:   MV_STATUS
-*               MV_OK - Success,  Other - Faulure
-*
-*******************************************************************************/
-MV_STATUS   mvEthMacAddrGet(int portNo, unsigned char *pAddr)
-{
-    unsigned int    macH;
-    unsigned int    macL;
-
-    if(pAddr == NULL)
-    {
-        mvOsPrintf("mvEthMacAddrGet: NULL pointer.\n");
-        return MV_BAD_PARAM;
-    }
-
-    macH = MV_REG_READ(ETH_MAC_ADDR_HIGH_REG(portNo));
-    macL = MV_REG_READ(ETH_MAC_ADDR_LOW_REG(portNo));
-    pAddr[0] = (macH >> 24) & 0xff;
-    pAddr[1] = (macH >> 16) & 0xff;
-    pAddr[2] = (macH >> 8) & 0xff;
-    pAddr[3] = macH  & 0xff;
-    pAddr[4] = (macL >> 8) & 0xff;
-    pAddr[5] = macL  & 0xff;
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthMcastCrc8Get - Calculate CRC8 of MAC address.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       MV_U8*  pAddr           - Address to calculate CRC-8
-*
-* RETURN: MV_U8 - CRC-8 of this MAC address
-*
-*******************************************************************************/
-MV_U8   mvEthMcastCrc8Get(MV_U8* pAddr)
-{
-    unsigned int    macH;
-    unsigned int    macL;
-    int             macArray[48];
-    int             crc[8];
-    int             i;
-    unsigned char   crcResult = 0;
-
-        /* Calculate CRC-8 out of the given address */
-    macH =  (pAddr[0] << 8) | (pAddr[1]);
-    macL =  (pAddr[2] << 24)| (pAddr[3] << 16) |
-            (pAddr[4] << 8) | (pAddr[5] << 0);
-
-    for(i=0; i<32; i++)
-        macArray[i] = (macL >> i) & 0x1;
-
-    for(i=32; i<48; i++)
-        macArray[i] = (macH >> (i - 32)) & 0x1;
-
-    crc[0] = macArray[45] ^ macArray[43] ^ macArray[40] ^ macArray[39] ^
-             macArray[35] ^ macArray[34] ^ macArray[31] ^ macArray[30] ^
-             macArray[28] ^ macArray[23] ^ macArray[21] ^ macArray[19] ^
-             macArray[18] ^ macArray[16] ^ macArray[14] ^ macArray[12] ^
-             macArray[8]  ^ macArray[7]  ^ macArray[6]  ^ macArray[0];
-
-    crc[1] = macArray[46] ^ macArray[45] ^ macArray[44] ^ macArray[43] ^
-             macArray[41] ^ macArray[39] ^ macArray[36] ^ macArray[34] ^
-             macArray[32] ^ macArray[30] ^ macArray[29] ^ macArray[28] ^
-             macArray[24] ^ macArray[23] ^ macArray[22] ^ macArray[21] ^
-             macArray[20] ^ macArray[18] ^ macArray[17] ^ macArray[16] ^
-             macArray[15] ^ macArray[14] ^ macArray[13] ^ macArray[12] ^
-             macArray[9]  ^ macArray[6]  ^ macArray[1]  ^ macArray[0];
-
-    crc[2] = macArray[47] ^ macArray[46] ^ macArray[44] ^ macArray[43] ^
-             macArray[42] ^ macArray[39] ^ macArray[37] ^ macArray[34] ^
-             macArray[33] ^ macArray[29] ^ macArray[28] ^ macArray[25] ^
-             macArray[24] ^ macArray[22] ^ macArray[17] ^ macArray[15] ^
-             macArray[13] ^ macArray[12] ^ macArray[10] ^ macArray[8]  ^
-             macArray[6]  ^ macArray[2]  ^ macArray[1]  ^ macArray[0];
-
-    crc[3] = macArray[47] ^ macArray[45] ^ macArray[44] ^ macArray[43] ^
-             macArray[40] ^ macArray[38] ^ macArray[35] ^ macArray[34] ^
-             macArray[30] ^ macArray[29] ^ macArray[26] ^ macArray[25] ^
-             macArray[23] ^ macArray[18] ^ macArray[16] ^ macArray[14] ^
-             macArray[13] ^ macArray[11] ^ macArray[9]  ^ macArray[7]  ^
-             macArray[3]  ^ macArray[2]  ^ macArray[1];
-
-    crc[4] = macArray[46] ^ macArray[45] ^ macArray[44] ^ macArray[41] ^
-             macArray[39] ^ macArray[36] ^ macArray[35] ^ macArray[31] ^
-             macArray[30] ^ macArray[27] ^ macArray[26] ^ macArray[24] ^
-             macArray[19] ^ macArray[17] ^ macArray[15] ^ macArray[14] ^
-             macArray[12] ^ macArray[10] ^ macArray[8]  ^ macArray[4]  ^
-             macArray[3]  ^ macArray[2];
-
-    crc[5] = macArray[47] ^ macArray[46] ^ macArray[45] ^ macArray[42] ^
-             macArray[40] ^ macArray[37] ^ macArray[36] ^ macArray[32] ^
-             macArray[31] ^ macArray[28] ^ macArray[27] ^ macArray[25] ^
-             macArray[20] ^ macArray[18] ^ macArray[16] ^ macArray[15] ^
-             macArray[13] ^ macArray[11] ^ macArray[9]  ^ macArray[5]  ^
-             macArray[4]  ^ macArray[3];
-
-    crc[6] = macArray[47] ^ macArray[46] ^ macArray[43] ^ macArray[41] ^
-             macArray[38] ^ macArray[37] ^ macArray[33] ^ macArray[32] ^
-             macArray[29] ^ macArray[28] ^ macArray[26] ^ macArray[21] ^
-             macArray[19] ^ macArray[17] ^ macArray[16] ^ macArray[14] ^
-             macArray[12] ^ macArray[10] ^ macArray[6]  ^ macArray[5]  ^
-             macArray[4];
-
-    crc[7] = macArray[47] ^ macArray[44] ^ macArray[42] ^ macArray[39] ^
-             macArray[38] ^ macArray[34] ^ macArray[33] ^ macArray[30] ^
-             macArray[29] ^ macArray[27] ^ macArray[22] ^ macArray[20] ^
-             macArray[18] ^ macArray[17] ^ macArray[15] ^ macArray[13] ^
-             macArray[11] ^ macArray[7]  ^ macArray[6]  ^ macArray[5];
-
-    for(i=0; i<8; i++)
-        crcResult = crcResult | (crc[i] << i);
-
-    return crcResult;
-}
-/*******************************************************************************
-* mvEthMcastAddrSet - Multicast address settings.
-*
-* DESCRIPTION:
-*       This API controls the MV device MAC multicast support.
-*       The MV device supports multicast using two tables:
-*       1) Special Multicast Table for MAC addresses of the form
-*          0x01-00-5E-00-00-XX (where XX is between 0x00 and 0xFF).
-*          The MAC DA[7:0] bits are used as a pointer to the Special Multicast
-*          Table entries in the DA-Filter table.
-*          In this case, the function calls ethPortSmcAddr() routine to set the
-*          Special Multicast Table.
-*       2) Other Multicast Table for multicast of another type. A CRC-8bit
-*          is used as an index to the Other Multicast Table entries in the
-*          DA-Filter table.
-*          In this case, the function calculates the CRC-8bit value and calls
-*          ethPortOmcAddr() routine to set the Other Multicast Table.
-*
-* INPUT:
-*       void*   pEthPortHndl    - Ethernet port handler.
-*       MV_U8*  pAddr           - Address to be set
-*       int     queue           - RX queue to capture all packets with this 
-*                               Multicast MAC address.
-*                               -1 means delete this Multicast address.
-*
-* RETURN: MV_STATUS
-*       MV_TRUE - Success, Other - Failure
-*
-*******************************************************************************/
-MV_STATUS   mvEthMcastAddrSet(void* pPortHndl, MV_U8 *pAddr, int queue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    unsigned char   crcResult = 0;
-
-    if(queue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethPort %d: RX queue #%d is out of range\n", 
-                    pPortCtrl->portNo, queue);
-        return MV_BAD_PARAM;
-    }
-
-    if((pAddr[0] == 0x01) &&
-       (pAddr[1] == 0x00) &&
-       (pAddr[2] == 0x5E) &&
-       (pAddr[3] == 0x00) &&
-       (pAddr[4] == 0x00))
-    {
-        ethSetSpecialMcastAddr(pPortCtrl->portNo, pAddr[5], queue);
-    }
-    else
-    {
-        crcResult = mvEthMcastCrc8Get(pAddr);
-
-        /* Check Add counter for this CRC value */
-        if(queue == -1)
-        {
-            if(pPortCtrl->mcastCount[crcResult] == 0)
-            {
-                mvOsPrintf("ethPort #%d: No valid Mcast for crc8=0x%02x\n",
-                            pPortCtrl->portNo, (unsigned)crcResult);
-                return MV_NO_SUCH;
-            }
-
-            pPortCtrl->mcastCount[crcResult]--;
-            if(pPortCtrl->mcastCount[crcResult] != 0)
-            {
-                mvOsPrintf("ethPort #%d: After delete there are %d valid Mcast for crc8=0x%02x\n",
-                            pPortCtrl->portNo, pPortCtrl->mcastCount[crcResult],
-                            (unsigned)crcResult);
-                return MV_NO_CHANGE;
-            }
-        }
-        else
-        {
-            pPortCtrl->mcastCount[crcResult]++;
-            if(pPortCtrl->mcastCount[crcResult] > 1)
-            {
-                mvOsPrintf("ethPort #%d: Valid Mcast for crc8=0x%02x already exists\n",
-                                pPortCtrl->portNo, (unsigned)crcResult);
-                return MV_NO_CHANGE;
-            }
-        }
-        ethSetOtherMcastAddr(pPortCtrl->portNo, crcResult, queue);
-    }
-    return MV_OK;
-}
-
-/*******************************************************************************
-* ethSetUcastTable - Unicast address settings.
-*
-* DESCRIPTION:
-*      Set all entries in the Unicast MAC Table queue==-1 means reject all 
-* INPUT:
-*
-* RETURN: 
-*
-*******************************************************************************/
-static void    ethSetUcastTable(int portNo, int queue)
-{
-    int     offset;
-    MV_U32  regValue;
-
-    if(queue == -1)
-    {
-        regValue = 0;
-    }
-    else
-    {
-        regValue = (((0x01 | (queue<<1)) << 0)  |
-                    ((0x01 | (queue<<1)) << 8)  |
-                    ((0x01 | (queue<<1)) << 16) |
-                    ((0x01 | (queue<<1)) << 24));
-    }
-
-    for (offset=0; offset<=0xC; offset+=4)
-        MV_REG_WRITE((ETH_DA_FILTER_UCAST_BASE(portNo) + offset), regValue);
-}
-
-/*******************************************************************************
-* mvEthSetSpecialMcastTable - Special Multicast address settings.
-*
-* DESCRIPTION:
-*   Set all entries to the Special Multicast MAC Table. queue==-1 means reject all
-* INPUT:
-*
-* RETURN: 
-*
-*******************************************************************************/
-MV_VOID    mvEthSetSpecialMcastTable(int portNo, int queue)
-{
-    int     offset;
-    MV_U32  regValue;
-
-    if(queue == -1)
-    {
-        regValue = 0;
-    }
-    else
-    {
-        regValue = (((0x01 | (queue<<1)) << 0)  |
-                    ((0x01 | (queue<<1)) << 8)  |
-                    ((0x01 | (queue<<1)) << 16) |
-                    ((0x01 | (queue<<1)) << 24));
-    }
-
-    for (offset=0; offset<=0xFC; offset+=4)
-    {
-        MV_REG_WRITE((ETH_DA_FILTER_SPEC_MCAST_BASE(portNo) + 
-                      offset), regValue);
-    }
-}
-
-/*******************************************************************************
-* mvEthSetOtherMcastTable - Other Multicast address settings.
-*
-* DESCRIPTION:
-*   Set all entries to the Other Multicast MAC Table. queue==-1 means reject all
-* INPUT:
-*
-* RETURN: 
-*
-*******************************************************************************/
-MV_VOID    mvEthSetOtherMcastTable(int portNo, int queue)
-{
-    int     offset;
-    MV_U32  regValue;
-
-    if(queue == -1)
-    {
-        regValue = 0;
-    }
-    else
-    {
-        regValue = (((0x01 | (queue<<1)) << 0)  |
-                    ((0x01 | (queue<<1)) << 8)  |
-                    ((0x01 | (queue<<1)) << 16) |
-                    ((0x01 | (queue<<1)) << 24));
-    }
-
-    for (offset=0; offset<=0xFC; offset+=4)
-    {
-        MV_REG_WRITE((ETH_DA_FILTER_OTH_MCAST_BASE(portNo) + 
-                      offset), regValue);
-    }
-}
-
-/*******************************************************************************
-* ethSetUcastAddr - This function Set the port unicast address table
-*
-* DESCRIPTION:
-*       This function locates the proper entry in the Unicast table for the
-*       specified MAC nibble and sets its properties according to function
-*       parameters.
-*
-* INPUT:
-*       int     ethPortNum  - Port number.
-*       MV_U8   lastNibble  - Unicast MAC Address last nibble.
-*       int     queue       - Rx queue number for this MAC address.
-*                           value "-1" means remove address
-*
-* OUTPUT:
-*       This function add/removes MAC addresses from the port unicast address
-*       table.
-*
-* RETURN:
-*       MV_TRUE is output succeeded.
-*       MV_FALSE if option parameter is invalid.
-*
-*******************************************************************************/
-static MV_BOOL ethSetUcastAddr(int portNo, MV_U8 lastNibble, int queue)
-{
-    unsigned int unicastReg;
-    unsigned int tblOffset;
-    unsigned int regOffset;
-
-    /* Locate the Unicast table entry */
-    lastNibble  = (0xf & lastNibble);
-    tblOffset = (lastNibble / 4) * 4; /* Register offset from unicast table base*/
-    regOffset = lastNibble % 4;     /* Entry offset within the above register */
-
-
-    unicastReg = MV_REG_READ( (ETH_DA_FILTER_UCAST_BASE(portNo) + 
-                               tblOffset));
-                 
-
-    if(queue == -1)
-    {
-        /* Clear accepts frame bit at specified unicast DA table entry */
-        unicastReg &= ~(0xFF << (8*regOffset));
-    }
-    else
-    {
-        unicastReg &= ~(0xFF << (8*regOffset));
-        unicastReg |= ((0x01 | (queue<<1)) << (8*regOffset));
-    }
-    MV_REG_WRITE( (ETH_DA_FILTER_UCAST_BASE(portNo) + tblOffset),
-                  unicastReg);
-
-    return MV_TRUE;
-}
-
-/*******************************************************************************
-* ethSetSpecialMcastAddr - Special Multicast address settings.
-*
-* DESCRIPTION:
-*       This routine controls the MV device special MAC multicast support.
-*       The Special Multicast Table for MAC addresses supports MAC of the form
-*       0x01-00-5E-00-00-XX (where XX is between 0x00 and 0xFF).
-*       The MAC DA[7:0] bits are used as a pointer to the Special Multicast
-*       Table entries in the DA-Filter table.
-*       This function set the Special Multicast Table appropriate entry
-*       according to the argument given.
-*
-* INPUT:
-*       int     ethPortNum      Port number.
-*       unsigned char   mcByte      Multicast addr last byte (MAC DA[7:0] bits).
-*       int          queue      Rx queue number for this MAC address.
-*       int             option      0 = Add, 1 = remove address.
-*
-* OUTPUT:
-*       See description.
-*
-* RETURN:
-*       MV_TRUE is output succeeded.
-*       MV_FALSE if option parameter is invalid.
-*
-*******************************************************************************/
-static MV_BOOL ethSetSpecialMcastAddr(int ethPortNum, MV_U8 lastByte, int queue)
-{
-    unsigned int smcTableReg;
-    unsigned int tblOffset;
-    unsigned int regOffset;
-
-    /* Locate the SMC table entry */
-    tblOffset = (lastByte / 4);     /* Register offset from SMC table base    */
-    regOffset = lastByte % 4;       /* Entry offset within the above register */
-
-    smcTableReg = MV_REG_READ((ETH_DA_FILTER_SPEC_MCAST_BASE(ethPortNum) + tblOffset*4));
-    
-    if(queue == -1)
-    {
-        /* Clear accepts frame bit at specified Special DA table entry */
-        smcTableReg &= ~(0xFF << (8 * regOffset));
-    }
-    else
-    {
-        smcTableReg &= ~(0xFF << (8 * regOffset));
-        smcTableReg |= ((0x01 | (queue<<1)) << (8 * regOffset));
-    }
-    MV_REG_WRITE((ETH_DA_FILTER_SPEC_MCAST_BASE(ethPortNum) + 
-                  tblOffset*4), smcTableReg);
-
-    return MV_TRUE;
-}
-
-/*******************************************************************************
-* ethSetOtherMcastAddr - Multicast address settings.
-*
-* DESCRIPTION:
-*       This routine controls the MV device Other MAC multicast support.
-*       The Other Multicast Table is used for multicast of another type.
-*       A CRC-8bit is used as an index to the Other Multicast Table entries
-*       in the DA-Filter table.
-*       The function gets the CRC-8bit value from the calling routine and
-*       set the Other Multicast Table appropriate entry according to the
-*       CRC-8 argument given.
-*
-* INPUT:
-*       int     ethPortNum  Port number.
-*       MV_U8   crc8        A CRC-8bit (Polynomial: x^8+x^2+x^1+1).
-*       int     queue       Rx queue number for this MAC address.
-*
-* OUTPUT:
-*       See description.
-*
-* RETURN:
-*       MV_TRUE is output succeeded.
-*       MV_FALSE if option parameter is invalid.
-*
-*******************************************************************************/
-static MV_BOOL ethSetOtherMcastAddr(int ethPortNum, MV_U8 crc8, int queue)
-{
-    unsigned int omcTableReg;
-    unsigned int tblOffset;
-    unsigned int regOffset;
-
-    /* Locate the OMC table entry */
-    tblOffset = (crc8 / 4) * 4;     /* Register offset from OMC table base    */
-    regOffset = crc8 % 4;           /* Entry offset within the above register */
-
-    omcTableReg = MV_REG_READ(
-        (ETH_DA_FILTER_OTH_MCAST_BASE(ethPortNum) + tblOffset));
-
-    if(queue == -1)
-    {
-        /* Clear accepts frame bit at specified Other DA table entry */
-        omcTableReg &= ~(0xFF << (8 * regOffset));
-    }
-    else
-    {
-        omcTableReg &= ~(0xFF << (8 * regOffset));
-        omcTableReg |= ((0x01 | (queue<<1)) << (8 * regOffset));
-    }
-
-    MV_REG_WRITE((ETH_DA_FILTER_OTH_MCAST_BASE(ethPortNum) + tblOffset), 
-                    omcTableReg);
-
-    return MV_TRUE;
-}
-
-
-/******************************************************************************/
-/*                      MIB Counters functions                                */
-/******************************************************************************/
-
-
-/*******************************************************************************
-* mvEthMibCounterRead - Read a MIB counter
-*
-* DESCRIPTION:
-*       This function reads a MIB counter of a specific ethernet port.
-*       NOTE - Read from ETH_MIB_GOOD_OCTETS_RECEIVED_LOW or 
-*              ETH_MIB_GOOD_OCTETS_SENT_LOW counters will return 64 bits value,
-*              so pHigh32 pointer should not be NULL in this case.
-*
-* INPUT:
-*       int           ethPortNum  - Ethernet Port number.
-*       unsigned int  mibOffset   - MIB counter offset.
-*
-* OUTPUT:
-*       MV_U32*       pHigh32 - pointer to place where 32 most significant bits
-*                             of the counter will be stored.
-*
-* RETURN:
-*       32 low sgnificant bits of MIB counter value.
-*
-*******************************************************************************/
-MV_U32  mvEthMibCounterRead(void* pPortHandle, unsigned int mibOffset, 
-                            MV_U32* pHigh32)
-{
-    int             portNo;
-    MV_U32          valLow32, valHigh32;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-
-    portNo = pPortCtrl->portNo;
-
-    valLow32 = MV_REG_READ(ETH_MIB_COUNTERS_BASE(portNo) + mibOffset);
-    
-    /* Implement FEr ETH. Erroneous Value when Reading the Upper 32-bits    */
-    /* of a 64-bit MIB Counter.                                             */
-    if( (mibOffset == ETH_MIB_GOOD_OCTETS_RECEIVED_LOW) || 
-        (mibOffset == ETH_MIB_GOOD_OCTETS_SENT_LOW) )
-    {
-        valHigh32 = MV_REG_READ(ETH_MIB_COUNTERS_BASE(portNo) + mibOffset + 4);
-        if(pHigh32 != NULL)
-            *pHigh32 = valHigh32;
-    }
-    return valLow32;
-}
-
-/*******************************************************************************
-* mvEthMibCountersClear - Clear all MIB counters
-*
-* DESCRIPTION:
-*       This function clears all MIB counters
-*
-* INPUT:
-*       int           ethPortNum  - Ethernet Port number.
-*
-*
-* RETURN:   void
-*
-*******************************************************************************/
-void  mvEthMibCountersClear(void* pPortHandle)
-{
-    int             i, portNo;
-    unsigned int    dummy;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-
-    portNo = pPortCtrl->portNo;
-
-    /* Perform dummy reads from MIB counters */
-    for(i=ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i<ETH_MIB_LATE_COLLISION; i+=4)
-        dummy = MV_REG_READ((ETH_MIB_COUNTERS_BASE(portNo) + i));
-}
-    
-
-/******************************************************************************/
-/*                        RX Dispatching configuration routines               */
-/******************************************************************************/
-
-int     mvEthTosToRxqGet(void* pPortHandle, int tos)
-{
-    MV_U32          regValue;
-    int             regIdx, regOffs, rxq;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-
-    if(tos > 0xFF)
-    {
-        mvOsPrintf("eth_%d: tos=0x%x is out of range\n", pPortCtrl->portNo, tos);
-        return -1;
-    }
-    regIdx  = mvOsDivide(tos>>2, 10);
-    regOffs = mvOsReminder(tos>>2, 10);
-    
-    regValue = MV_REG_READ(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx) );
-    rxq = (regValue >> (regOffs*3));
-    rxq &= 0x7;
-
-    return rxq;
-}
-
-/*******************************************************************************
-* mvEthTosToRxqSet - Map packets with special TOS value to special RX queue
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     tos         - TOS value in the IP header of the packet
-*       int     rxq         - RX Queue for packets with the configured TOS value
-*                           Negative value (-1) means no special processing for these packets, 
-*                           so they will be processed as regular packets.
-*
-* RETURN:   MV_STATUS
-*******************************************************************************/
-MV_STATUS   mvEthTosToRxqSet(void* pPortHandle, int tos, int rxq)
-{
-    MV_U32          regValue;
-    int             regIdx, regOffs;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-
-    if( (rxq < 0) || (rxq >= MV_ETH_RX_Q_NUM) )
-    {
-        mvOsPrintf("eth_%d: RX queue #%d is out of range\n", pPortCtrl->portNo, rxq);
-        return MV_BAD_PARAM;
-    }
-    if(tos > 0xFF)
-    {
-        mvOsPrintf("eth_%d: tos=0x%x is out of range\n", pPortCtrl->portNo, tos);
-        return MV_BAD_PARAM;
-    }
-    regIdx  = mvOsDivide(tos>>2, 10);
-    regOffs = mvOsReminder(tos>>2, 10);
-    
-    regValue = MV_REG_READ(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx) );
-    regValue &= ~(0x7 << (regOffs*3));
-    regValue |= (rxq << (regOffs*3));
-
-    MV_REG_WRITE(ETH_DIFF_SERV_PRIO_REG(pPortCtrl->portNo, regIdx), regValue);
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthVlanPrioRxQueue - Configure RX queue to capture VLAN tagged packets with 
-*                        special priority bits [0-2]
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     bpduQueue   - Special queue to capture VLAN tagged packets with special
-*                           priority.
-*                           Negative value (-1) means no special processing for these packets, 
-*                           so they will be processed as regular packets.
-*
-* RETURN:   MV_STATUS
-*       MV_OK       - Success
-*       MV_FAIL     - Failed. 
-*
-*******************************************************************************/
-MV_STATUS   mvEthVlanPrioRxQueue(void* pPortHandle, int vlanPrio, int vlanPrioQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    MV_U32          vlanPrioReg;
-
-    if(vlanPrioQueue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", vlanPrioQueue);
-        return MV_BAD_PARAM;
-    }
-    if(vlanPrio >= 8)
-    {
-        mvOsPrintf("ethDrv: vlanPrio=%d is out of range\n", vlanPrio);
-        return MV_BAD_PARAM;
-    }
-  
-    vlanPrioReg = MV_REG_READ(ETH_VLAN_TAG_TO_PRIO_REG(pPortCtrl->portNo));
-    vlanPrioReg &= ~(0x7 << (vlanPrio*3));
-    vlanPrioReg |= (vlanPrioQueue << (vlanPrio*3));
-    MV_REG_WRITE(ETH_VLAN_TAG_TO_PRIO_REG(pPortCtrl->portNo), vlanPrioReg);
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvEthBpduRxQueue - Configure RX queue to capture BPDU packets.
-*
-* DESCRIPTION:
-*       This function defines processing of BPDU packets. 
-*   BPDU packets can be accepted and captured to one of RX queues 
-*   or can be processing as regular Multicast packets. 
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     bpduQueue   - Special queue to capture BPDU packets (DA is equal to 
-*                           01-80-C2-00-00-00 through 01-80-C2-00-00-FF, 
-*                           except for the Flow-Control Pause packets). 
-*                           Negative value (-1) means no special processing for BPDU, 
-*                           packets so they will be processed as regular Multicast packets.
-*
-* RETURN:   MV_STATUS
-*       MV_OK       - Success
-*       MV_FAIL     - Failed. 
-*
-*******************************************************************************/
-MV_STATUS   mvEthBpduRxQueue(void* pPortHandle, int bpduQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    MV_U32      portCfgReg;
-    MV_U32      portCfgExtReg;
-
-    if(bpduQueue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", bpduQueue);
-        return MV_BAD_PARAM;
-    }
-  
-    portCfgExtReg = MV_REG_READ(ETH_PORT_CONFIG_EXTEND_REG(pPortCtrl->portNo));
-
-    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
-    if(bpduQueue >= 0)
-    {
-        pPortCtrl->portConfig.rxBpduQ = bpduQueue;
-
-        portCfgReg &= ~ETH_DEF_RX_BPDU_QUEUE_ALL_MASK;
-        portCfgReg |= ETH_DEF_RX_BPDU_QUEUE_MASK(pPortCtrl->portConfig.rxBpduQ);
-
-        MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
-
-        portCfgExtReg |= ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK;
-    }
-    else
-    {
-        pPortCtrl->portConfig.rxBpduQ = -1;
-        /* no special processing for BPDU packets */
-        portCfgExtReg &= (~ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK);
-    }
-
-    MV_REG_WRITE(ETH_PORT_CONFIG_EXTEND_REG(pPortCtrl->portNo),  portCfgExtReg);
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvEthArpRxQueue - Configure RX queue to capture ARP packets.
-*
-* DESCRIPTION:
-*       This function defines processing of ARP (type=0x0806) packets. 
-*   ARP packets can be accepted and captured to one of RX queues 
-*   or can be processed as other Broadcast packets. 
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     arpQueue    - Special queue to capture ARP packets (type=0x806). 
-*                           Negative value (-1) means discard ARP packets
-*
-* RETURN:   MV_STATUS
-*       MV_OK       - Success
-*       MV_FAIL     - Failed. 
-*
-*******************************************************************************/
-MV_STATUS   mvEthArpRxQueue(void* pPortHandle, int arpQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    MV_U32      portCfgReg;
-
-    if(arpQueue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", arpQueue);
-        return MV_BAD_PARAM;
-    }
-
-    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
-
-    if(arpQueue >= 0)
-    {
-        pPortCtrl->portConfig.rxArpQ = arpQueue;
-        portCfgReg &= ~ETH_DEF_RX_ARP_QUEUE_ALL_MASK;
-        portCfgReg |= ETH_DEF_RX_ARP_QUEUE_MASK(pPortCtrl->portConfig.rxArpQ);
-
-        portCfgReg &= (~ETH_REJECT_ARP_BCAST_MASK);
-    }
-    else
-    {
-        pPortCtrl->portConfig.rxArpQ = -1;
-        portCfgReg |= ETH_REJECT_ARP_BCAST_MASK;
-    }
-
-    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvEthTcpRxQueue - Configure RX queue to capture TCP packets.
-*
-* DESCRIPTION:
-*       This function defines processing of TCP packets. 
-*   TCP packets can be accepted and captured to one of RX queues 
-*   or can be processed as regular Unicast packets. 
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     tcpQueue    - Special queue to capture TCP packets. Value "-1" 
-*                           means no special processing for TCP packets, 
-*                           so they will be processed as regular
-*
-* RETURN:   MV_STATUS
-*       MV_OK       - Success
-*       MV_FAIL     - Failed. 
-*
-*******************************************************************************/
-MV_STATUS   mvEthTcpRxQueue(void* pPortHandle, int tcpQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    MV_U32      portCfgReg;
-
-    if(tcpQueue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", tcpQueue);
-        return MV_BAD_PARAM;
-    }
-    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
-
-    if(tcpQueue >= 0)
-    {
-        pPortCtrl->portConfig.rxTcpQ = tcpQueue;
-        portCfgReg &= ~ETH_DEF_RX_TCP_QUEUE_ALL_MASK;
-        portCfgReg |= ETH_DEF_RX_TCP_QUEUE_MASK(pPortCtrl->portConfig.rxTcpQ);
-
-        portCfgReg |= ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK;
-    }
-    else
-    {
-        pPortCtrl->portConfig.rxTcpQ = -1;
-        portCfgReg &= (~ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK);
-    }
-
-    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvEthUdpRxQueue - Configure RX queue to capture UDP packets.
-*
-* DESCRIPTION:
-*       This function defines processing of UDP packets. 
-*   TCP packets can be accepted and captured to one of RX queues 
-*   or can be processed as regular Unicast packets. 
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*       int     udpQueue    - Special queue to capture UDP packets. Value "-1" 
-*                           means no special processing for UDP packets, 
-*                           so they will be processed as regular
-*
-* RETURN:   MV_STATUS
-*       MV_OK       - Success
-*       MV_FAIL     - Failed. 
-*
-*******************************************************************************/
-MV_STATUS   mvEthUdpRxQueue(void* pPortHandle, int udpQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    MV_U32          portCfgReg;
-
-    if(udpQueue >= MV_ETH_RX_Q_NUM)
-    {
-        mvOsPrintf("ethDrv: RX queue #%d is out of range\n", udpQueue);
-        return MV_BAD_PARAM;
-    }
-
-    portCfgReg = MV_REG_READ(ETH_PORT_CONFIG_REG(pPortCtrl->portNo));
-
-    if(udpQueue >= 0)
-    {
-        pPortCtrl->portConfig.rxUdpQ = udpQueue;
-        portCfgReg &= ~ETH_DEF_RX_UDP_QUEUE_ALL_MASK;
-        portCfgReg |= ETH_DEF_RX_UDP_QUEUE_MASK(pPortCtrl->portConfig.rxUdpQ);
-
-        portCfgReg |= ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK;        
-    }
-    else
-    {
-        pPortCtrl->portConfig.rxUdpQ = -1;
-        portCfgReg &= ~ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK;
-    }
-
-    MV_REG_WRITE(ETH_PORT_CONFIG_REG(pPortCtrl->portNo), portCfgReg);
-
-    return MV_OK;
-}
-
-
-/******************************************************************************/
-/*                          Speed, Duplex, FlowControl routines               */
-/******************************************************************************/
-
-/*******************************************************************************
-* mvEthSpeedDuplexSet - Set Speed and Duplex of the port.
-*
-* DESCRIPTION:
-*       This function configure the port to work with desirable Duplex and Speed.
-*       Changing of these parameters are allowed only when port is disabled.
-*       This function disable the port if was enabled, change duplex and speed 
-*       and, enable the port back if needed.
-*
-* INPUT:
-*       void*           pPortHandle - Pointer to port specific handler;
-*       ETH_PORT_SPEED  speed       - Speed of the port.
-*       ETH_PORT_SPEED  duplex      - Duplex of the port.
-*
-* RETURN:   MV_STATUS
-*       MV_OK           - Success
-*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
-*       MV_NOT_FOUND    - Failed. Port is not initialized.
-*       MV_BAD_PARAM    - Input parameters (speed/duplex) in conflict.
-*       MV_BAD_VALUE    - Value of one of input parameters (speed, duplex) 
-*                       is not valid
-*
-*******************************************************************************/
-MV_STATUS   mvEthSpeedDuplexSet(void* pPortHandle, MV_ETH_PORT_SPEED speed, 
-                                MV_ETH_PORT_DUPLEX duplex)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    MV_U32      portSerialCtrlReg;
-    
-    if( (port < 0) || (port >= (int)mvCtrlEthMaxPortGet()) )
-        return MV_OUT_OF_RANGE;
-
-    pPortCtrl = ethPortCtrl[port];
-    if(pPortCtrl == NULL)
-        return MV_NOT_FOUND;
-
-    /* Check validity */
-    if( (speed == MV_ETH_SPEED_1000) && (duplex == MV_ETH_DUPLEX_HALF) )
-        return MV_BAD_PARAM;
-
-    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
-    /* Set Speed */
-    switch(speed)
-    {
-        case MV_ETH_SPEED_AN:
-            portSerialCtrlReg &= ~ETH_DISABLE_SPEED_AUTO_NEG_MASK;
-            break;
-
-        case MV_ETH_SPEED_10:
-            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
-            portSerialCtrlReg &= ~ETH_SET_GMII_SPEED_1000_MASK;
-            portSerialCtrlReg &= ~ETH_SET_MII_SPEED_100_MASK;
-            break;
-
-        case MV_ETH_SPEED_100:
-            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
-            portSerialCtrlReg &= ~ETH_SET_GMII_SPEED_1000_MASK;
-            portSerialCtrlReg |= ETH_SET_MII_SPEED_100_MASK;
-            break;
-
-        case MV_ETH_SPEED_1000:
-            portSerialCtrlReg |= ETH_DISABLE_SPEED_AUTO_NEG_MASK;
-            portSerialCtrlReg |= ETH_SET_GMII_SPEED_1000_MASK;
-            break;
-
-        default:
-            mvOsPrintf("ethDrv: Unexpected Speed value %d\n", speed);
-            return MV_BAD_VALUE;
-    }
-    /* Set duplex */
-    switch(duplex)
-    {
-        case MV_ETH_DUPLEX_AN:
-            portSerialCtrlReg &= ~ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
-            break;
-
-        case MV_ETH_DUPLEX_HALF:
-            portSerialCtrlReg |= ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
-            portSerialCtrlReg &= ~ETH_SET_FULL_DUPLEX_MASK;
-            break;
-
-        case MV_ETH_DUPLEX_FULL:
-            portSerialCtrlReg |= ETH_DISABLE_DUPLEX_AUTO_NEG_MASK;
-            portSerialCtrlReg |= ETH_SET_FULL_DUPLEX_MASK;
-            break;
-
-        default:
-            mvOsPrintf("ethDrv: Unexpected Duplex value %d\n", duplex);
-            return MV_BAD_VALUE;
-    }
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(port), portSerialCtrlReg);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthFlowCtrlSet - Set Flow Control of the port.
-*
-* DESCRIPTION:
-*       This function configure the port to work with desirable Duplex and 
-*       Speed. Changing of these parameters are allowed only when port is 
-*       disabled. This function disable the port if was enabled, change 
-*       duplex and speed and, enable the port back if needed.
-*
-* INPUT:
-*       void*           pPortHandle - Pointer to port specific handler;
-*       MV_ETH_PORT_FC  flowControl - Flow control of the port.
-*
-* RETURN:   MV_STATUS
-*       MV_OK           - Success
-*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
-*       MV_NOT_FOUND    - Failed. Port is not initialized.
-*       MV_BAD_VALUE    - Value flowControl parameters is not valid
-*
-*******************************************************************************/
-MV_STATUS   mvEthFlowCtrlSet(void* pPortHandle, MV_ETH_PORT_FC flowControl)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    MV_U32      portSerialCtrlReg;
-    
-    if( (port < 0) || (port >= (int)mvCtrlEthMaxPortGet() ) )
-        return MV_OUT_OF_RANGE;
-
-    pPortCtrl = ethPortCtrl[port];
-    if(pPortCtrl == NULL)
-        return MV_NOT_FOUND;
-
-    portSerialCtrlReg = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
-    switch(flowControl)
-    {
-        case MV_ETH_FC_AN_ADV_DIS:
-            portSerialCtrlReg &= ~ETH_DISABLE_FC_AUTO_NEG_MASK;
-            portSerialCtrlReg &= ~ETH_ADVERTISE_SYM_FC_MASK;
-            break;
-
-        case MV_ETH_FC_AN_ADV_SYM:
-            portSerialCtrlReg &= ~ETH_DISABLE_FC_AUTO_NEG_MASK;
-            portSerialCtrlReg |= ETH_ADVERTISE_SYM_FC_MASK;
-            break;
-
-        case MV_ETH_FC_DISABLE:
-            portSerialCtrlReg |= ETH_DISABLE_FC_AUTO_NEG_MASK;
-            portSerialCtrlReg &= ~ETH_SET_FLOW_CTRL_MASK;
-            break;
-
-        case MV_ETH_FC_ENABLE:
-            portSerialCtrlReg |= ETH_DISABLE_FC_AUTO_NEG_MASK;
-            portSerialCtrlReg |= ETH_SET_FLOW_CTRL_MASK;
-            break;
-
-        default:
-            mvOsPrintf("ethDrv: Unexpected FlowControl value %d\n", flowControl);
-            return MV_BAD_VALUE;
-    }
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_REG(port), portSerialCtrlReg);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthHeaderModeSet - Set port header mode.
-*
-* DESCRIPTION:
-*       This function configures the port to work in Marvell-Header mode.
-*
-* INPUT:
-*       void*           pPortHandle - Pointer to port specific handler;
-*       MV_ETH_HEADER_MODE headerMode - The header mode to set the port in.
-*
-* RETURN:   MV_STATUS
-*       MV_OK           - Success
-*       MV_NOT_SUPPORTED- Feature not supported.
-*       MV_OUT_OF_RANGE - Failed. Port is out of valid range
-*       MV_NOT_FOUND    - Failed. Port is not initialized.
-*       MV_BAD_VALUE    - Value of headerMode or numRxQueue parameter is not valid.
-*
-*******************************************************************************/
-MV_STATUS mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    MV_U32			mvHeaderReg;
-    MV_U32          numRxQ = MV_ETH_RX_Q_NUM;
-    
-    if((port < 0) || (port >= mvCtrlEthMaxPortGet()))
-        return MV_OUT_OF_RANGE;
-
-    pPortCtrl = ethPortCtrl[port];
-    if(pPortCtrl == NULL)
-        return MV_NOT_FOUND;
-
-    mvHeaderReg = MV_REG_READ(ETH_PORT_MARVELL_HEADER_REG(port));
-    /* Disable header mode.             */
-    mvHeaderReg &= ~ETH_MVHDR_EN_MASK;
-
-    if(headerMode != MV_ETH_DISABLE_HEADER_MODE)
-    {
-        /* Enable Header mode.              */
-        mvHeaderReg |= ETH_MVHDR_EN_MASK;
-
-        /* Clear DA-Prefix  & MHMask fields.*/
-        mvHeaderReg &= ~(ETH_MVHDR_DAPREFIX_MASK | ETH_MVHDR_MHMASK_MASK);
-
-        if(numRxQ > 1)
-        {
-            switch (headerMode)
-            {
-                case(MV_ETH_ENABLE_HEADER_MODE_PRI_2_1):
-                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_PRI_1_2;
-                    break;
-                case(MV_ETH_ENABLE_HEADER_MODE_PRI_DBNUM):
-                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_DBNUM_PRI;
-                    break;
-                case(MV_ETH_ENABLE_HEADER_MODE_PRI_SPID):
-                    mvHeaderReg |= ETH_MVHDR_DAPREFIX_SPID_PRI;
-                    break;
-                default:
-                    break;
-            }
-
-            switch (numRxQ)
-            {
-                case (4):
-                    mvHeaderReg |= ETH_MVHDR_MHMASK_4_QUEUE;
-                    break;
-                case (8):
-                    mvHeaderReg |= ETH_MVHDR_MHMASK_8_QUEUE;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    MV_REG_WRITE(ETH_PORT_MARVELL_HEADER_REG(port), mvHeaderReg);
-
-    return MV_OK;
-}
-
-#if (MV_ETH_VERSION >= 4)
-/*******************************************************************************
-* mvEthEjpModeSet - Enable / Disable EJP policy for TX.
-*
-* DESCRIPTION:
-*       This function 
-*
-* INPUT:
-*       void*           pPortHandle - Pointer to port specific handler;
-*       MV_BOOL         TRUE - enable EJP mode
-*                       FALSE - disable EJP mode
-*
-* OUTPUT:   MV_STATUS
-*       MV_OK           - Success
-*       Other           - Failure
-*
-* RETURN:   None.
-*
-*******************************************************************************/
-MV_STATUS    mvEthEjpModeSet(void* pPortHandle, int mode) 
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    
-    if((port < 0) || (port >= mvCtrlEthMaxPortGet()))
-        return MV_OUT_OF_RANGE;
-
-    pPortCtrl = ethPortCtrl[port];
-    if(pPortCtrl == NULL)
-        return MV_NOT_FOUND;
-    
-    pPortCtrl->portConfig.ejpMode = mode;
-    if(mode)
-    {
-        /* EJP enabled */
-        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(port), ETH_TX_EJP_ENABLE_MASK);
-    }
-    else
-    {
-        /* EJP disabled */
-        MV_REG_WRITE(ETH_TXQ_CMD_1_REG(port), 0);
-    }
-    mvOsPrintf("eth_%d: EJP %s - ETH_TXQ_CMD_1_REG: 0x%x = 0x%08x\n", 
-        port, mode ? "Enabled" : "Disabled", ETH_TXQ_CMD_1_REG(port), 
-                    MV_REG_READ(ETH_TXQ_CMD_1_REG(port)));
-
-    return MV_OK;
-}
-#endif /* MV_ETH_VERSION >= 4 */
-
-/*******************************************************************************
-* mvEthStatusGet - Get major properties of the port .
-*
-* DESCRIPTION:
-*       This function get major properties of the port (link, speed, duplex, 
-*       flowControl, etc) and return them using the single structure.
-*
-* INPUT:
-*       void*           pPortHandle - Pointer to port specific handler;
-*
-* OUTPUT:
-*       MV_ETH_PORT_STATUS* pStatus - Pointer to structure, were port status 
-*                                   will be placed.
-*
-* RETURN:   None.
-*
-*******************************************************************************/
-void    mvEthStatusGet(void* pPortHandle, MV_ETH_PORT_STATUS* pStatus)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-
-    MV_U32  regValue;
-
-    regValue = MV_REG_READ( ETH_PORT_STATUS_REG(port) );
-
-    if(regValue & ETH_GMII_SPEED_1000_MASK)
-        pStatus->speed = MV_ETH_SPEED_1000;
-    else if(regValue & ETH_MII_SPEED_100_MASK)
-        pStatus->speed = MV_ETH_SPEED_100;
-    else
-        pStatus->speed = MV_ETH_SPEED_10;
-
-    if(regValue & ETH_LINK_UP_MASK) 
-        pStatus->isLinkUp = MV_TRUE;
-    else
-        pStatus->isLinkUp = MV_FALSE;
-
-    if(regValue & ETH_FULL_DUPLEX_MASK) 
-        pStatus->duplex = MV_ETH_DUPLEX_FULL; 
-    else
-        pStatus->duplex = MV_ETH_DUPLEX_HALF; 
-
-
-    if(regValue & ETH_ENABLE_RCV_FLOW_CTRL_MASK) 
-        pStatus->flowControl = MV_ETH_FC_ENABLE;
-    else
-        pStatus->flowControl = MV_ETH_FC_DISABLE;
-}
-
-
-/******************************************************************************/
-/*                         PHY Control Functions                              */
-/******************************************************************************/
-
-
-/*******************************************************************************
-* mvEthPhyAddrSet - Set the ethernet port PHY address.
-*
-* DESCRIPTION:
-*       This routine set the ethernet port PHY address according to given
-*       parameter.
-*
-* INPUT:
-*       void*   pPortHandle     - Pointer to port specific handler;
-*       int     phyAddr         - PHY address       
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-void    mvEthPhyAddrSet(void* pPortHandle, int phyAddr)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    unsigned int    regData;
-
-    regData = MV_REG_READ(ETH_PHY_ADDR_REG(port));
-
-    regData &= ~ETH_PHY_ADDR_MASK;
-    regData |=  phyAddr;
-
-    MV_REG_WRITE(ETH_PHY_ADDR_REG(port), regData);
-
-    return;
-}
-
-/*******************************************************************************
-* mvEthPhyAddrGet - Get the ethernet port PHY address.
-*
-* DESCRIPTION:
-*       This routine returns the given ethernet port PHY address.
-*
-* INPUT:
-*       void*   pPortHandle - Pointer to port specific handler;
-*
-*
-* RETURN: int - PHY address.
-*
-*******************************************************************************/
-int     mvEthPhyAddrGet(void* pPortHandle)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHandle;
-    int             port = pPortCtrl->portNo;
-    unsigned int    regData;
-
-    regData = MV_REG_READ(ETH_PHY_ADDR_REG(port));
-
-    return ((regData >> (5 * port)) & 0x1f);
-}
-
-/******************************************************************************/
-/*                Descriptor handling Functions                               */
-/******************************************************************************/
-
-/*******************************************************************************
-* etherInitRxDescRing - Curve a Rx chain desc list and buffer in memory.
-*
-* DESCRIPTION:
-*       This function prepares a Rx chained list of descriptors and packet
-*       buffers in a form of a ring. The routine must be called after port
-*       initialization routine and before port start routine.
-*       The Ethernet SDMA engine uses CPU bus addresses to access the various
-*       devices in the system (i.e. DRAM). This function uses the ethernet
-*       struct 'virtual to physical' routine (set by the user) to set the ring
-*       with physical addresses.
-*
-* INPUT:
-*       ETH_QUEUE_CTRL  *pEthPortCtrl   Ethernet Port Control srtuct.
-*       int             rxQueue         Number of Rx queue.
-*       int             rxDescNum       Number of Rx descriptors
-*       MV_U8*          rxDescBaseAddr  Rx descriptors memory area base addr.
-*
-* OUTPUT:
-*       The routine updates the Ethernet port control struct with information
-*       regarding the Rx descriptors and buffers.
-*
-* RETURN: None
-*
-*******************************************************************************/
-static void ethInitRxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue)
-{
-    ETH_RX_DESC     *pRxDescBase, *pRxDesc, *pRxPrevDesc; 
-    int             ix, rxDescNum = pPortCtrl->rxQueueConfig[queue].descrNum;
-    ETH_QUEUE_CTRL  *pQueueCtrl = &pPortCtrl->rxQueue[queue];
-
-    /* Make sure descriptor address is cache line size aligned  */        
-    pRxDescBase = (ETH_RX_DESC*)MV_ALIGN_UP((MV_ULONG)pQueueCtrl->descBuf.bufVirtPtr,
-                                     CPU_D_CACHE_LINE_SIZE);
-
-    pRxDesc      = (ETH_RX_DESC*)pRxDescBase;
-    pRxPrevDesc  = pRxDesc;
-
-    /* initialize the Rx descriptors ring */
-    for (ix=0; ix<rxDescNum; ix++)
-    {
-        pRxDesc->bufSize     = 0x0;
-        pRxDesc->byteCnt     = 0x0;
-        pRxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
-        pRxDesc->bufPtr      = 0x0;
-        pRxDesc->returnInfo  = 0x0;
-        pRxPrevDesc = pRxDesc;
-        if(ix == (rxDescNum-1))
-        {
-            /* Closing Rx descriptors ring */
-            pRxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pRxDescBase);
-        }
-        else
-        {
-            pRxDesc = (ETH_RX_DESC*)((MV_ULONG)pRxDesc + ETH_RX_DESC_ALIGNED_SIZE);
-            pRxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pRxDesc);
-        }
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pRxPrevDesc);
-    }
-
-    pQueueCtrl->pCurrentDescr = pRxDescBase;
-    pQueueCtrl->pUsedDescr = pRxDescBase;
-    
-    pQueueCtrl->pFirstDescr = pRxDescBase;
-    pQueueCtrl->pLastDescr = pRxDesc;
-    pQueueCtrl->resource = 0;
-}
-
-void ethResetRxDescRing(void* pPortHndl, int queue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->rxQueue[queue];
-    ETH_RX_DESC*    pRxDesc = (ETH_RX_DESC*)pQueueCtrl->pFirstDescr;
-
-    pQueueCtrl->resource = 0;
-    if(pQueueCtrl->pFirstDescr != NULL)
-    {
-        while(MV_TRUE)
-        {
-            pRxDesc->bufSize     = 0x0;
-            pRxDesc->byteCnt     = 0x0;
-            pRxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
-            pRxDesc->bufPtr      = 0x0;
-            pRxDesc->returnInfo  = 0x0;
-            ETH_DESCR_FLUSH_INV(pPortCtrl, pRxDesc);
-            if( (void*)pRxDesc == pQueueCtrl->pLastDescr)
-                    break;
-            pRxDesc = RX_NEXT_DESC_PTR(pRxDesc, pQueueCtrl);
-        }
-        pQueueCtrl->pCurrentDescr = pQueueCtrl->pFirstDescr;
-        pQueueCtrl->pUsedDescr = pQueueCtrl->pFirstDescr;
-
-        /* Update RX Command register */
-        pPortCtrl->portRxQueueCmdReg |= (1 << queue);
-
-        /* update HW */
-        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue),
-                 (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
-    }
-    else
-    {
-        /* Update RX Command register */
-        pPortCtrl->portRxQueueCmdReg &= ~(1 << queue);
-
-        /* update HW */
-        MV_REG_WRITE( ETH_RX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue), 0);
-    }
-}
-
-/*******************************************************************************
-* etherInitTxDescRing - Curve a Tx chain desc list and buffer in memory.
-*
-* DESCRIPTION:
-*       This function prepares a Tx chained list of descriptors and packet
-*       buffers in a form of a ring. The routine must be called after port
-*       initialization routine and before port start routine.
-*       The Ethernet SDMA engine uses CPU bus addresses to access the various
-*       devices in the system (i.e. DRAM). This function uses the ethernet
-*       struct 'virtual to physical' routine (set by the user) to set the ring
-*       with physical addresses.
-*
-* INPUT:
-*       ETH_PORT_CTRL   *pEthPortCtrl   Ethernet Port Control srtuct.
-*       int             txQueue         Number of Tx queue.
-*       int             txDescNum       Number of Tx descriptors
-*       int             txBuffSize      Size of Tx buffer
-*       MV_U8*          pTxDescBase     Tx descriptors memory area base addr.
-*
-* OUTPUT:
-*       The routine updates the Ethernet port control struct with information
-*       regarding the Tx descriptors and buffers.
-*
-* RETURN:   None.
-*
-*******************************************************************************/
-static void ethInitTxDescRing(ETH_PORT_CTRL* pPortCtrl, int queue)
-{
-    ETH_TX_DESC     *pTxDescBase, *pTxDesc, *pTxPrevDesc; 
-    int             ix, txDescNum = pPortCtrl->txQueueConfig[queue].descrNum;
-    ETH_QUEUE_CTRL  *pQueueCtrl = &pPortCtrl->txQueue[queue];
-
-    /* Make sure descriptor address is cache line size aligned  */
-    pTxDescBase = (ETH_TX_DESC*)MV_ALIGN_UP((MV_ULONG)pQueueCtrl->descBuf.bufVirtPtr, 
-                                     CPU_D_CACHE_LINE_SIZE);
-
-    pTxDesc      = (ETH_TX_DESC*)pTxDescBase;
-    pTxPrevDesc  = pTxDesc;
-
-    /* initialize the Tx descriptors ring */
-    for (ix=0; ix<txDescNum; ix++)
-    {
-        pTxDesc->byteCnt     = 0x0000;
-        pTxDesc->L4iChk      = 0x0000;
-        pTxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
-        pTxDesc->bufPtr      = 0x0;
-        pTxDesc->returnInfo  = 0x0;
-
-        pTxPrevDesc = pTxDesc;
-
-        if(ix == (txDescNum-1))
-        {
-            /* Closing Tx descriptors ring */
-            pTxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pTxDescBase);
-        }
-        else
-        {
-            pTxDesc = (ETH_TX_DESC*)((MV_ULONG)pTxDesc + ETH_TX_DESC_ALIGNED_SIZE);
-            pTxPrevDesc->nextDescPtr = (MV_U32)ethDescVirtToPhy(pQueueCtrl, (void*)pTxDesc);
-        }
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxPrevDesc);
-    }
-
-    pQueueCtrl->pCurrentDescr = pTxDescBase;
-    pQueueCtrl->pUsedDescr = pTxDescBase;
-    
-    pQueueCtrl->pFirstDescr = pTxDescBase;
-    pQueueCtrl->pLastDescr = pTxDesc;
-    /* Leave one TX descriptor out of use */
-    pQueueCtrl->resource = txDescNum - 1;
-}
-
-void ethResetTxDescRing(void* pPortHndl, int queue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->txQueue[queue];
-    ETH_TX_DESC*    pTxDesc = (ETH_TX_DESC*)pQueueCtrl->pFirstDescr;
-    
-    pQueueCtrl->resource = 0;
-    if(pQueueCtrl->pFirstDescr != NULL)
-    {
-        while(MV_TRUE)
-        {
-            pTxDesc->byteCnt     = 0x0000;
-            pTxDesc->L4iChk      = 0x0000;
-            pTxDesc->cmdSts      = ETH_BUFFER_OWNED_BY_HOST;
-            pTxDesc->bufPtr      = 0x0;
-            pTxDesc->returnInfo  = 0x0;
-            ETH_DESCR_FLUSH_INV(pPortCtrl, pTxDesc);
-            pQueueCtrl->resource++;
-            if( (void*)pTxDesc == pQueueCtrl->pLastDescr)
-                    break;
-            pTxDesc = TX_NEXT_DESC_PTR(pTxDesc, pQueueCtrl);
-        }
-        /* Leave one TX descriptor out of use */
-        pQueueCtrl->resource--;
-        pQueueCtrl->pCurrentDescr = pQueueCtrl->pFirstDescr;
-        pQueueCtrl->pUsedDescr = pQueueCtrl->pFirstDescr;
-
-        /* Update TX Command register */
-        pPortCtrl->portTxQueueCmdReg |= MV_32BIT_LE_FAST(1 << queue);
-        /* update HW */
-        MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue),
-        (MV_U32)ethDescVirtToPhy(pQueueCtrl, pQueueCtrl->pCurrentDescr) );
-    }
-    else
-    {
-        /* Update TX Command register */
-        pPortCtrl->portTxQueueCmdReg &=  MV_32BIT_LE_FAST(~(1 << queue));
-        /* update HW */
-        MV_REG_WRITE( ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue), 0 );    
-    }
-}
-
-/*******************************************************************************
-* ethAllocDescrMemory - Free memory allocated for RX and TX descriptors.
-*
-* DESCRIPTION:
-*       This function allocates memory for RX and TX descriptors.
-*       - If ETH_DESCR_IN_SRAM defined, allocate memory from SRAM.
-*       - If ETH_DESCR_IN_SDRAM defined, allocate memory in SDRAM.
-*
-* INPUT:
-*       int size - size of memory should be allocated.
-*
-* RETURN: None
-*
-*******************************************************************************/
-static MV_U8*  ethAllocDescrMemory(ETH_PORT_CTRL* pPortCtrl, int descSize, 
-                            MV_ULONG* pPhysAddr, MV_U32 *memHandle)
-{
-    MV_U8*  pVirt;
-
-#if defined(ETH_DESCR_IN_SRAM)
-    if(ethDescInSram == MV_TRUE)
-        pVirt = (char*)mvSramMalloc(descSize, pPhysAddr);
-    else
-#endif /* ETH_DESCR_IN_SRAM */
-    {
-#ifdef ETH_DESCR_UNCACHED
-        pVirt = (MV_U8*)mvOsIoUncachedMalloc(pPortCtrl->osHandle, descSize,
-					    pPhysAddr,memHandle);
-#else
-        pVirt = (MV_U8*)mvOsIoCachedMalloc(pPortCtrl->osHandle, descSize,
-					  pPhysAddr, memHandle);
-#endif /* ETH_DESCR_UNCACHED */
-    }
-    memset(pVirt, 0, descSize);
-
-    return pVirt;
-}
-
-/*******************************************************************************
-* ethFreeDescrMemory - Free memory allocated for RX and TX descriptors.
-*
-* DESCRIPTION:
-*       This function frees memory allocated for RX and TX descriptors.
-*       - If ETH_DESCR_IN_SRAM defined, free memory using gtSramFree() function.
-*       - If ETH_DESCR_IN_SDRAM defined, free memory using mvOsFree() function.
-*
-* INPUT:
-*       void* pVirtAddr - virtual pointer to memory allocated for RX and TX
-*                       desriptors.        
-*
-* RETURN: None
-*
-*******************************************************************************/
-void    ethFreeDescrMemory(ETH_PORT_CTRL* pPortCtrl, MV_BUF_INFO* pDescBuf)
-{
-    if( (pDescBuf == NULL) || (pDescBuf->bufVirtPtr == NULL) )
-        return;
-
-#if defined(ETH_DESCR_IN_SRAM)
-    if( ethDescInSram )
-    {
-        mvSramFree(pDescBuf->bufSize, pDescBuf->bufPhysAddr, pDescBuf->bufVirtPtr);
-        return;
-    }
-#endif /* ETH_DESCR_IN_SRAM */
-
-#ifdef ETH_DESCR_UNCACHED
-    mvOsIoUncachedFree(pPortCtrl->osHandle, pDescBuf->bufSize, pDescBuf->bufPhysAddr, 
-                     pDescBuf->bufVirtPtr,pDescBuf->memHandle);
-#else
-    mvOsIoCachedFree(pPortCtrl->osHandle, pDescBuf->bufSize, pDescBuf->bufPhysAddr, 
-                     pDescBuf->bufVirtPtr,pDescBuf->memHandle);
-#endif /* ETH_DESCR_UNCACHED */
-}
-                                                                                                                             
-/******************************************************************************/
-/*                Other Functions                                         */
-/******************************************************************************/
-
-void mvEthPortPowerUp(int port)
-{
-    MV_U32  regVal;
-
-    /* MAC Cause register should be cleared */
-    MV_REG_WRITE(ETH_UNIT_INTR_CAUSE_REG(port), 0);
-
-	if (mvBoardIsPortInSgmii(port))
-    mvEthPortSgmiiConfig(port);
-
-    /* Cancel Port Reset */
-    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
-    regVal &= (~ETH_PORT_RESET_MASK);
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal);
-    while( (MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port)) & ETH_PORT_RESET_MASK) != 0);
-}
-
-void mvEthPortPowerDown(int port)
-{
-    MV_U32  regVal;
-
-    /* Port must be DISABLED */
-    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_REG(port));
-    if( (regVal & ETH_PORT_ENABLE_MASK) != 0)
-    {
-        mvOsPrintf("ethPort #%d: PowerDown - port must be Disabled (PSC=0x%x)\n",
-                    port, regVal);
-        return;
-    }
-
-    /* Port Reset (Read after write the register as a precaution) */
-    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal | ETH_PORT_RESET_MASK);
-    while((MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port)) & ETH_PORT_RESET_MASK) == 0);
-}
-
-static void mvEthPortSgmiiConfig(int port)
-{
-    MV_U32  regVal;
-
-    regVal = MV_REG_READ(ETH_PORT_SERIAL_CTRL_1_REG(port));
-
-    regVal |= (ETH_SGMII_MODE_MASK /*| ETH_INBAND_AUTO_NEG_ENABLE_MASK */);
-    regVal &= (~ETH_INBAND_AUTO_NEG_BYPASS_MASK);
-
-    MV_REG_WRITE(ETH_PORT_SERIAL_CTRL_1_REG(port), regVal);
-}
-
-
-
-
-
-
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
deleted file mode 100644
index eabac5ad93..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.c
+++ /dev/null
@@ -1,748 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvEthDebug.c - Source file for user friendly debug functions
-*
-* DESCRIPTION:
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-#include "mvOs.h"
-#include "mvCommon.h"
-#include "mvTypes.h"
-#include "mv802_3.h"
-#include "mvDebug.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "eth-phy/mvEthPhy.h"
-#include "eth/mvEth.h"
-#include "eth/gbe/mvEthDebug.h"
-
-/* #define mvOsPrintf printf */
-
-void    mvEthPortShow(void* pHndl);
-void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode);
-
-/******************************************************************************/
-/*                          Debug functions                                   */
-/******************************************************************************/
-void    ethRxCoal(int port, int usec)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthRxCoalSet(pHndl, usec);
-    }
-}
-
-void    ethTxCoal(int port, int usec)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthTxCoalSet(pHndl, usec);
-    }
-}
-
-#if (MV_ETH_VERSION >= 4)
-void     ethEjpModeSet(int port, int mode)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthEjpModeSet(pHndl, mode);
-    }
-}
-#endif /* (MV_ETH_VERSION >= 4) */
-
-void    ethBpduRxQ(int port, int bpduQueue)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthBpduRxQueue(pHndl, bpduQueue);
-    }
-}
-
-void    ethArpRxQ(int port, int arpQueue)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthArpRxQueue(pHndl, arpQueue);
-    }
-}
-
-void    ethTcpRxQ(int port, int tcpQueue)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthTcpRxQueue(pHndl, tcpQueue);
-    }
-}
-
-void    ethUdpRxQ(int port, int udpQueue)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthUdpRxQueue(pHndl, udpQueue);
-    }
-}
-
-void    ethTxPolicyRegs(int port)
-{
-    int             queue;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)mvEthPortHndlGet(port);
-
-    if(pPortCtrl == NULL) 
-    {
-        return;
-    }
-    mvOsPrintf("Port #%d TX Policy: EJP=%d, TXQs: ", 
-                port, pPortCtrl->portConfig.ejpMode);
-    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
-    {
-        if(pPortCtrl->txQueueConfig[queue].descrNum > 0)
-            mvOsPrintf("%d, ", queue);
-    }
-    mvOsPrintf("\n");
-
-    mvOsPrintf("\n\t TX policy Port #%d configuration registers\n", port);
-
-    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
-                ETH_TX_QUEUE_COMMAND_REG(port), 
-                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    
-    
-    mvOsPrintf("ETH_TX_FIXED_PRIO_CFG_REG           : 0x%X = 0x%08x\n", 
-                ETH_TX_FIXED_PRIO_CFG_REG(port), 
-                MV_REG_READ( ETH_TX_FIXED_PRIO_CFG_REG(port) ) );
-
-    mvOsPrintf("ETH_TX_TOKEN_RATE_CFG_REG           : 0x%X = 0x%08x\n", 
-                ETH_TX_TOKEN_RATE_CFG_REG(port), 
-                MV_REG_READ( ETH_TX_TOKEN_RATE_CFG_REG(port) ) );
-
-    mvOsPrintf("ETH_MAX_TRANSMIT_UNIT_REG           : 0x%X = 0x%08x\n", 
-                ETH_MAX_TRANSMIT_UNIT_REG(port), 
-                MV_REG_READ( ETH_MAX_TRANSMIT_UNIT_REG(port) ) );
-
-    mvOsPrintf("ETH_TX_TOKEN_BUCKET_SIZE_REG        : 0x%X = 0x%08x\n", 
-                ETH_TX_TOKEN_BUCKET_SIZE_REG(port), 
-                MV_REG_READ( ETH_TX_TOKEN_BUCKET_SIZE_REG(port) ) );
-
-    mvOsPrintf("ETH_TX_TOKEN_BUCKET_COUNT_REG       : 0x%X = 0x%08x\n", 
-                ETH_TX_TOKEN_BUCKET_COUNT_REG(port), 
-                MV_REG_READ( ETH_TX_TOKEN_BUCKET_COUNT_REG(port) ) );
-
-    for(queue=0; queue<MV_ETH_MAX_TXQ; queue++)
-    {
-        mvOsPrintf("\n\t TX policy Port #%d, Queue #%d configuration registers\n", port, queue);
-
-        mvOsPrintf("ETH_TXQ_TOKEN_COUNT_REG             : 0x%X = 0x%08x\n", 
-                ETH_TXQ_TOKEN_COUNT_REG(port, queue), 
-                MV_REG_READ( ETH_TXQ_TOKEN_COUNT_REG(port, queue) ) );
-
-        mvOsPrintf("ETH_TXQ_TOKEN_CFG_REG               : 0x%X = 0x%08x\n", 
-                ETH_TXQ_TOKEN_CFG_REG(port, queue), 
-                MV_REG_READ( ETH_TXQ_TOKEN_CFG_REG(port, queue) ) );
-
-        mvOsPrintf("ETH_TXQ_ARBITER_CFG_REG             : 0x%X = 0x%08x\n", 
-                ETH_TXQ_ARBITER_CFG_REG(port, queue), 
-                MV_REG_READ( ETH_TXQ_ARBITER_CFG_REG(port, queue) ) );
-    }
-    mvOsPrintf("\n");
-}
-
-/* Print important registers of Ethernet port */
-void    ethPortRegs(int port)
-{
-    mvOsPrintf("\n\t ethGiga #%d port Registers:\n", port);
-
-    mvOsPrintf("ETH_PORT_STATUS_REG                 : 0x%X = 0x%08x\n", 
-                ETH_PORT_STATUS_REG(port), 
-                MV_REG_READ( ETH_PORT_STATUS_REG(port) ) );
-
-    mvOsPrintf("ETH_PORT_SERIAL_CTRL_REG            : 0x%X = 0x%08x\n", 
-                ETH_PORT_SERIAL_CTRL_REG(port), 
-                MV_REG_READ( ETH_PORT_SERIAL_CTRL_REG(port) ) );
-
-    mvOsPrintf("ETH_PORT_CONFIG_REG                 : 0x%X = 0x%08x\n", 
-                ETH_PORT_CONFIG_REG(port), 
-                MV_REG_READ( ETH_PORT_CONFIG_REG(port) ) );    
-
-    mvOsPrintf("ETH_PORT_CONFIG_EXTEND_REG          : 0x%X = 0x%08x\n", 
-                ETH_PORT_CONFIG_EXTEND_REG(port), 
-                MV_REG_READ( ETH_PORT_CONFIG_EXTEND_REG(port) ) );    
-
-    mvOsPrintf("ETH_SDMA_CONFIG_REG                 : 0x%X = 0x%08x\n", 
-                ETH_SDMA_CONFIG_REG(port), 
-                MV_REG_READ( ETH_SDMA_CONFIG_REG(port) ) );    
-
-    mvOsPrintf("ETH_TX_FIFO_URGENT_THRESH_REG       : 0x%X = 0x%08x\n", 
-                ETH_TX_FIFO_URGENT_THRESH_REG(port), 
-                MV_REG_READ( ETH_TX_FIFO_URGENT_THRESH_REG(port) ) );    
-
-    mvOsPrintf("ETH_RX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
-                ETH_RX_QUEUE_COMMAND_REG(port), 
-                MV_REG_READ( ETH_RX_QUEUE_COMMAND_REG(port) ) );    
-
-    mvOsPrintf("ETH_TX_QUEUE_COMMAND_REG            : 0x%X = 0x%08x\n", 
-                ETH_TX_QUEUE_COMMAND_REG(port), 
-                MV_REG_READ( ETH_TX_QUEUE_COMMAND_REG(port) ) );    
-
-    mvOsPrintf("ETH_INTR_CAUSE_REG                  : 0x%X = 0x%08x\n", 
-                ETH_INTR_CAUSE_REG(port), 
-                MV_REG_READ( ETH_INTR_CAUSE_REG(port) ) );    
-
-    mvOsPrintf("ETH_INTR_EXTEND_CAUSE_REG           : 0x%X = 0x%08x\n", 
-                ETH_INTR_CAUSE_EXT_REG(port), 
-                MV_REG_READ( ETH_INTR_CAUSE_EXT_REG(port) ) );    
-
-    mvOsPrintf("ETH_INTR_MASK_REG                   : 0x%X = 0x%08x\n", 
-                ETH_INTR_MASK_REG(port), 
-                MV_REG_READ( ETH_INTR_MASK_REG(port) ) );    
-
-    mvOsPrintf("ETH_INTR_EXTEND_MASK_REG            : 0x%X = 0x%08x\n", 
-                ETH_INTR_MASK_EXT_REG(port), 
-                MV_REG_READ( ETH_INTR_MASK_EXT_REG(port) ) );    
-
-    mvOsPrintf("ETH_RX_DESCR_STAT_CMD_REG           : 0x%X = 0x%08x\n", 
-                ETH_RX_DESCR_STAT_CMD_REG(port, 0), 
-                MV_REG_READ( ETH_RX_DESCR_STAT_CMD_REG(port, 0) ) );    
-
-    mvOsPrintf("ETH_RX_BYTE_COUNT_REG               : 0x%X = 0x%08x\n", 
-                ETH_RX_BYTE_COUNT_REG(port, 0), 
-                MV_REG_READ( ETH_RX_BYTE_COUNT_REG(port, 0) ) );    
-
-    mvOsPrintf("ETH_RX_BUF_PTR_REG                  : 0x%X = 0x%08x\n", 
-                ETH_RX_BUF_PTR_REG(port, 0), 
-                MV_REG_READ( ETH_RX_BUF_PTR_REG(port, 0) ) );    
-
-    mvOsPrintf("ETH_RX_CUR_DESC_PTR_REG             : 0x%X = 0x%08x\n", 
-                ETH_RX_CUR_DESC_PTR_REG(port, 0), 
-                MV_REG_READ( ETH_RX_CUR_DESC_PTR_REG(port, 0) ) );    
-}
-
-
-/* Print Giga Ethernet UNIT registers */
-void    ethRegs(int port)
-{
-    mvOsPrintf("ETH_PHY_ADDR_REG               : 0x%X = 0x%08x\n", 
-                ETH_PHY_ADDR_REG(port), 
-                MV_REG_READ(ETH_PHY_ADDR_REG(port)) );    
-
-    mvOsPrintf("ETH_UNIT_INTR_CAUSE_REG        : 0x%X = 0x%08x\n", 
-                ETH_UNIT_INTR_CAUSE_REG(port), 
-                MV_REG_READ( ETH_UNIT_INTR_CAUSE_REG(port)) );    
-
-    mvOsPrintf("ETH_UNIT_INTR_MASK_REG         : 0x%X = 0x%08x\n", 
-                ETH_UNIT_INTR_MASK_REG(port), 
-                MV_REG_READ( ETH_UNIT_INTR_MASK_REG(port)) );    
-
-    mvOsPrintf("ETH_UNIT_ERROR_ADDR_REG        : 0x%X = 0x%08x\n", 
-                ETH_UNIT_ERROR_ADDR_REG(port), 
-                MV_REG_READ(ETH_UNIT_ERROR_ADDR_REG(port)) );    
-
-    mvOsPrintf("ETH_UNIT_INT_ADDR_ERROR_REG    : 0x%X = 0x%08x\n", 
-                ETH_UNIT_INT_ADDR_ERROR_REG(port), 
-                MV_REG_READ(ETH_UNIT_INT_ADDR_ERROR_REG(port)) );    
-    
-}
-
-/******************************************************************************/
-/*                      MIB Counters functions                                */
-/******************************************************************************/
-
-/*******************************************************************************
-* ethClearMibCounters - Clear all MIB counters
-*
-* DESCRIPTION:
-*       This function clears all MIB counters of a specific ethernet port.
-*       A read from the MIB counter will reset the counter.
-*
-* INPUT:
-*       int    port -  Ethernet Port number.
-*
-* RETURN: None
-*
-*******************************************************************************/
-void ethClearCounters(int port)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-        mvEthMibCountersClear(pHndl);
-
-    return;
-}
-
-
-/* Print counters of the Ethernet port */
-void    ethPortCounters(int port)
-{
-    MV_U32  regValue, regValHigh;
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl == NULL)
-        return;
-
-    mvOsPrintf("\n\t Port #%d MIB Counters\n\n", port);
-
-    mvOsPrintf("GoodFramesReceived          = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FRAMES_RECEIVED, NULL));
-    mvOsPrintf("BadFramesReceived           = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_BAD_FRAMES_RECEIVED, NULL));
-    mvOsPrintf("BroadcastFramesReceived     = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_BROADCAST_FRAMES_RECEIVED, NULL));
-    mvOsPrintf("MulticastFramesReceived     = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_MULTICAST_FRAMES_RECEIVED, NULL));
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW, 
-                                 &regValHigh);
-    mvOsPrintf("GoodOctetsReceived          = 0x%08x%08x\n", 
-               regValHigh, regValue);
-
-    mvOsPrintf("\n");
-    mvOsPrintf("GoodFramesSent              = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FRAMES_SENT, NULL));
-    mvOsPrintf("BroadcastFramesSent         = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_BROADCAST_FRAMES_SENT, NULL));
-    mvOsPrintf("MulticastFramesSent         = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_MULTICAST_FRAMES_SENT, NULL));
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_OCTETS_SENT_LOW, 
-                                 &regValHigh);
-    mvOsPrintf("GoodOctetsSent              = 0x%08x%08x\n", regValHigh, regValue);
-
-
-    mvOsPrintf("\n\t FC Control Counters\n");
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_UNREC_MAC_CONTROL_RECEIVED, NULL);
-    mvOsPrintf("UnrecogMacControlReceived   = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_GOOD_FC_RECEIVED, NULL);
-    mvOsPrintf("GoodFCFramesReceived        = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_FC_RECEIVED, NULL);
-    mvOsPrintf("BadFCFramesReceived         = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_FC_SENT, NULL);
-    mvOsPrintf("FCFramesSent                = %u\n", regValue);
-
-
-    mvOsPrintf("\n\t RX Errors\n");
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_OCTETS_RECEIVED, NULL);
-    mvOsPrintf("BadOctetsReceived           = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_UNDERSIZE_RECEIVED, NULL);
-    mvOsPrintf("UndersizeFramesReceived     = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_FRAGMENTS_RECEIVED, NULL);
-    mvOsPrintf("FragmentsReceived           = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_OVERSIZE_RECEIVED, NULL);
-    mvOsPrintf("OversizeFramesReceived      = %u\n", regValue);
-    
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_JABBER_RECEIVED, NULL);
-    mvOsPrintf("JabbersReceived             = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_MAC_RECEIVE_ERROR, NULL);
-    mvOsPrintf("MacReceiveErrors            = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_BAD_CRC_EVENT, NULL);
-    mvOsPrintf("BadCrcReceived              = %u\n", regValue);
-
-    mvOsPrintf("\n\t TX Errors\n");
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR, NULL);
-    mvOsPrintf("TxMacErrors                 = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_EXCESSIVE_COLLISION, NULL);
-    mvOsPrintf("TxExcessiveCollisions       = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_COLLISION, NULL);
-    mvOsPrintf("TxCollisions                = %u\n", regValue);
-
-    regValue = mvEthMibCounterRead(pHndl, ETH_MIB_LATE_COLLISION, NULL);
-    mvOsPrintf("TxLateCollisions            = %u\n", regValue);
-
-
-    mvOsPrintf("\n");
-    regValue = MV_REG_READ( ETH_RX_DISCARD_PKTS_CNTR_REG(port));
-    mvOsPrintf("Rx Discard packets counter  = %u\n", regValue);
-
-    regValue = MV_REG_READ(ETH_RX_OVERRUN_PKTS_CNTR_REG(port));
-    mvOsPrintf("Rx Overrun packets counter  = %u\n", regValue);
-}
-
-/* Print RMON counters of the Ethernet port */
-void    ethPortRmonCounters(int port)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl == NULL)
-        return;
-
-    mvOsPrintf("\n\t Port #%d RMON MIB Counters\n\n", port);
-
-    mvOsPrintf("64 ByteFramesReceived           = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_64_OCTETS, NULL));
-    mvOsPrintf("65...127 ByteFramesReceived     = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_65_TO_127_OCTETS, NULL));
-    mvOsPrintf("128...255 ByteFramesReceived    = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_128_TO_255_OCTETS, NULL));
-    mvOsPrintf("256...511 ByteFramesReceived    = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_256_TO_511_OCTETS, NULL));
-    mvOsPrintf("512...1023 ByteFramesReceived   = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_512_TO_1023_OCTETS, NULL));
-    mvOsPrintf("1024...Max ByteFramesReceived   = %u\n", 
-              mvEthMibCounterRead(pHndl, ETH_MIB_FRAMES_1024_TO_MAX_OCTETS, NULL));
-}
-
-/* Print port information */
-void    ethPortStatus(int port)
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthPortShow(pHndl);
-    }
-}
-
-/* Print port queues information */
-void    ethPortQueues(int port, int rxQueue, int txQueue, int mode)  
-{
-    void*   pHndl;
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvEthQueuesShow(pHndl, rxQueue, txQueue, mode);
-    }
-}
-
-void    ethUcastSet(int port, char* macStr, int queue)
-{
-    void*   pHndl;
-    MV_U8   macAddr[MV_MAC_ADDR_SIZE];
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvMacStrToHex(macStr, macAddr);
-        mvEthMacAddrSet(pHndl, macAddr, queue);
-    }
-}
-
-
-void    ethPortUcastShow(int port)
-{
-    MV_U32  unicastReg, macL, macH;
-    int     i, j;
-
-    macL = MV_REG_READ(ETH_MAC_ADDR_LOW_REG(port));
-    macH = MV_REG_READ(ETH_MAC_ADDR_HIGH_REG(port));
- 
-    mvOsPrintf("\n\t Port #%d Unicast MAC table: %02x:%02x:%02x:%02x:%02x:%02x\n\n", 
-                port, ((macH >> 24) & 0xff), ((macH >> 16) & 0xff),
-                      ((macH >> 8) & 0xff), (macH  & 0xff), 
-                      ((macL >> 8) & 0xff), (macL  & 0xff) );
-
-    for (i=0; i<4; i++)
-    {
-        unicastReg = MV_REG_READ( (ETH_DA_FILTER_UCAST_BASE(port) + i*4));
-        for(j=0; j<4; j++)
-        {
-            MV_U8   macEntry = (unicastReg >> (8*j)) & 0xFF;
-
-            mvOsPrintf("%X: %8s, Q = %d\n", i*4+j, 
-                (macEntry & BIT0) ? "Accept" : "Reject", (macEntry >> 1) & 0x7);
-        }
-    }
-} 
-
-void    ethMcastAdd(int port, char* macStr, int queue)
-{
-    void*   pHndl;
-    MV_U8   macAddr[MV_MAC_ADDR_SIZE];
-
-    pHndl = mvEthPortHndlGet(port);
-    if(pHndl != NULL)
-    {
-        mvMacStrToHex(macStr, macAddr);
-        mvEthMcastAddrSet(pHndl, macAddr, queue);
-    }
-}
-
-void    ethPortMcast(int port)
-{
-    int     tblIdx, regIdx;
-    MV_U32  regVal;
-
-    mvOsPrintf("\n\t Port #%d Special (IP) Multicast table: 01:00:5E:00:00:XX\n\n", 
-                port);
-
-    for(tblIdx=0; tblIdx<(256/4); tblIdx++)
-    {
-        regVal = MV_REG_READ((ETH_DA_FILTER_SPEC_MCAST_BASE(port) + tblIdx*4));
-        for(regIdx=0; regIdx<4; regIdx++)
-        {
-            if((regVal & (0x01 << (regIdx*8))) != 0)
-            {
-                mvOsPrintf("0x%02X: Accepted, rxQ = %d\n", 
-                    tblIdx*4+regIdx, ((regVal >> (regIdx*8+1)) & 0x07));
-            }
-        }
-    }
-    mvOsPrintf("\n\t Port #%d Other Multicast table\n\n", port);
-    for(tblIdx=0; tblIdx<(256/4); tblIdx++)
-    {
-        regVal = MV_REG_READ((ETH_DA_FILTER_OTH_MCAST_BASE(port) + tblIdx*4));
-        for(regIdx=0; regIdx<4; regIdx++)
-        {
-            if((regVal & (0x01 << (regIdx*8))) != 0)
-            {
-                mvOsPrintf("Crc8=0x%02X: Accepted, rxQ = %d\n", 
-                    tblIdx*4+regIdx, ((regVal >> (regIdx*8+1)) & 0x07));
-            }
-        }
-    }
-}
-
-
-/* Print status of Ethernet port */
-void    mvEthPortShow(void* pHndl)
-{
-    MV_U32              regValue, rxCoal, txCoal;
-    int                 speed, queue, port;
-    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pHndl;
-
-    port = pPortCtrl->portNo;
-
-    regValue = MV_REG_READ( ETH_PORT_STATUS_REG(port) );
-
-    mvOsPrintf("\n\t ethGiga #%d port Status: 0x%04x = 0x%08x\n\n", 
-                port, ETH_PORT_STATUS_REG(port), regValue);
-
-    mvOsPrintf("descInSram=%d, descSwCoher=%d\n", 
-                ethDescInSram, ethDescSwCoher);
-
-    if(regValue & ETH_GMII_SPEED_1000_MASK)
-        speed = 1000;
-    else if(regValue & ETH_MII_SPEED_100_MASK)
-        speed = 100;
-    else
-        speed = 10;
-
-    mvEthCoalGet(pPortCtrl, &rxCoal, &txCoal);
-
-    /* Link, Speed, Duplex, FlowControl */
-    mvOsPrintf("Link=%s, Speed=%d, Duplex=%s, RxFlowControl=%s",
-                (regValue & ETH_LINK_UP_MASK) ? "UP" : "DOWN",
-                speed, 
-                (regValue & ETH_FULL_DUPLEX_MASK) ? "FULL" : "HALF",
-                (regValue & ETH_ENABLE_RCV_FLOW_CTRL_MASK) ? "ENABLE" : "DISABLE");
-
-    mvOsPrintf("\n");
-
-    mvOsPrintf("RxCoal = %d usec, TxCoal = %d usec\n", 
-                rxCoal, txCoal);
-
-    mvOsPrintf("rxDefQ=%d, arpQ=%d, bpduQ=%d, tcpQ=%d, udpQ=%d\n\n",
-                pPortCtrl->portConfig.rxDefQ, pPortCtrl->portConfig.rxArpQ, 
-                pPortCtrl->portConfig.rxBpduQ, 
-                pPortCtrl->portConfig.rxTcpQ, pPortCtrl->portConfig.rxUdpQ); 
-
-    /* Print all RX and TX queues */
-    for(queue=0; queue<MV_ETH_RX_Q_NUM; queue++)
-    {
-        mvOsPrintf("RX Queue #%d: base=0x%lx, free=%d\n", 
-                    queue, (MV_ULONG)pPortCtrl->rxQueue[queue].pFirstDescr,
-                    mvEthRxResourceGet(pPortCtrl, queue) );
-    }
-    mvOsPrintf("\n");
-    for(queue=0; queue<MV_ETH_TX_Q_NUM; queue++)
-    {
-        mvOsPrintf("TX Queue #%d: base=0x%lx, free=%d\n", 
-                queue, (MV_ULONG)pPortCtrl->txQueue[queue].pFirstDescr,
-                mvEthTxResourceGet(pPortCtrl, queue) );
-    }
-}
-
-/* Print RX and TX queue of the Ethernet port */
-void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode)  
-{
-    ETH_PORT_CTRL   *pPortCtrl = (ETH_PORT_CTRL*)pHndl;
-    ETH_QUEUE_CTRL  *pQueueCtrl;
-    MV_U32          regValue;
-    ETH_RX_DESC     *pRxDescr;
-    ETH_TX_DESC     *pTxDescr;
-    int             i, port = pPortCtrl->portNo;
-
-    if( (rxQueue >=0) && (rxQueue < MV_ETH_RX_Q_NUM) )
-    {
-        pQueueCtrl = &(pPortCtrl->rxQueue[rxQueue]);
-        mvOsPrintf("Port #%d, RX Queue #%d\n\n", port, rxQueue);
-
-        mvOsPrintf("CURR_RX_DESC_PTR        : 0x%X = 0x%08x\n", 
-            ETH_RX_CUR_DESC_PTR_REG(port, rxQueue), 
-            MV_REG_READ( ETH_RX_CUR_DESC_PTR_REG(port, rxQueue)));
-
-
-        if(pQueueCtrl->pFirstDescr != NULL)
-        {
-            mvOsPrintf("pFirstDescr=0x%lx, pLastDescr=0x%lx, numOfResources=%d\n",
-                (MV_ULONG)pQueueCtrl->pFirstDescr, (MV_ULONG)pQueueCtrl->pLastDescr, 
-                pQueueCtrl->resource);
-            mvOsPrintf("pCurrDescr: 0x%lx, pUsedDescr: 0x%lx\n",
-                (MV_ULONG)pQueueCtrl->pCurrentDescr, 
-                (MV_ULONG)pQueueCtrl->pUsedDescr);
-
-            if(mode == 1)
-            {
-                pRxDescr = (ETH_RX_DESC*)pQueueCtrl->pFirstDescr;
-                i = 0; 
-                do 
-                {
-                    mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
-                                i, (MV_U32)pRxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pRxDescr), 
-                                pRxDescr->cmdSts, pRxDescr->byteCnt, (MV_U32)pRxDescr->bufSize, 
-                                (unsigned int)pRxDescr->bufPtr, (MV_ULONG)pRxDescr->returnInfo,
-                                ((MV_PKT_INFO*)pRxDescr->returnInfo)->osInfo);
-
-                    ETH_DESCR_INV(pPortCtrl, pRxDescr);
-                    pRxDescr = RX_NEXT_DESC_PTR(pRxDescr, pQueueCtrl);
-                    i++;
-                } while (pRxDescr != pQueueCtrl->pFirstDescr);
-            }
-        }
-        else
-            mvOsPrintf("RX Queue #%d is NOT CREATED\n", rxQueue);
-    }
-
-    if( (txQueue >=0) && (txQueue < MV_ETH_TX_Q_NUM) )
-    {
-        pQueueCtrl = &(pPortCtrl->txQueue[txQueue]);
-        mvOsPrintf("Port #%d, TX Queue #%d\n\n", port, txQueue);
-
-        regValue = MV_REG_READ( ETH_TX_CUR_DESC_PTR_REG(port, txQueue));
-        mvOsPrintf("CURR_TX_DESC_PTR        : 0x%X = 0x%08x\n", 
-                    ETH_TX_CUR_DESC_PTR_REG(port, txQueue), regValue);
-
-        if(pQueueCtrl->pFirstDescr != NULL)
-        {
-            mvOsPrintf("pFirstDescr=0x%lx, pLastDescr=0x%lx, numOfResources=%d\n",
-                       (MV_ULONG)pQueueCtrl->pFirstDescr, 
-                       (MV_ULONG)pQueueCtrl->pLastDescr, 
-                        pQueueCtrl->resource);
-            mvOsPrintf("pCurrDescr: 0x%lx, pUsedDescr: 0x%lx\n",
-                       (MV_ULONG)pQueueCtrl->pCurrentDescr, 
-                       (MV_ULONG)pQueueCtrl->pUsedDescr);
-
-            if(mode == 1)
-            {
-                pTxDescr = (ETH_TX_DESC*)pQueueCtrl->pFirstDescr;
-                i = 0; 
-                do 
-                {
-                    mvOsPrintf("%3d. desc=%08x (%08x), cmd=%08x, data=%4d, buf=%08x, pkt=%lx, os=%lx\n", 
-                                i, (MV_U32)pTxDescr, (MV_U32)ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxDescr), 
-                                pTxDescr->cmdSts, pTxDescr->byteCnt, 
-                                (MV_U32)pTxDescr->bufPtr, (MV_ULONG)pTxDescr->returnInfo,
-                                pTxDescr->returnInfo ? (((MV_PKT_INFO*)pTxDescr->returnInfo)->osInfo) : 0x0);
-
-                    ETH_DESCR_INV(pPortCtrl, pTxDescr);
-                    pTxDescr = TX_NEXT_DESC_PTR(pTxDescr, pQueueCtrl);
-                    i++;
-                } while (pTxDescr != pQueueCtrl->pFirstDescr);
-            }
-        }
-        else
-            mvOsPrintf("TX Queue #%d is NOT CREATED\n", txQueue);
-    }
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h
deleted file mode 100644
index 6db85f7a75..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthDebug.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __MV_ETH_DEBUG_H__
-#define __MV_ETH_DEBUG_H__
-
-#if 0
-/*
- ** Externs
- */
-void     ethBpduRxQ(int port, int bpduQueue);
-void     ethArpRxQ(int port, int bpduQueue);
-void     ethTcpRxQ(int port, int bpduQueue);
-void     ethUdpRxQ(int port, int bpduQueue);
-void     ethMcastAdd(int port, char* macStr, int queue);
-
-#ifdef INCLUDE_MULTI_QUEUE
-void   	ethRxPolicy( int port);
-void   	ethTxPolicy( int port);
-void   	ethTxPolDA(int port, char* macStr, int txQ, char* headerHexStr);
-void   	ethRxPolMode(int port, MV_ETH_PRIO_MODE prioMode);
-void    ethRxPolQ(int port, int rxQueue, int rxQuota);
-#endif /* INCLUDE_MULTI_QUEUE */
-
-void    print_egiga_stat(void *sc, unsigned int port);
-void    ethPortStatus (int port);
-void    ethPortQueues( int port, int rxQueue, int txQueue, int mode);
-void    ethPortMcast(int port);
-void    ethPortRegs(int port);
-void    ethPortCounters(int port);
-void 	ethPortRmonCounters(int port);
-void    ethRxCoal(int port, int usec);
-void    ethTxCoal(int port, int usec);
-
-void    ethRegs(int port);
-void	ethClearCounters(int port);
-void    ethUcastSet(int port, char* macStr, int queue);
-void    ethPortUcastShow(int port);
-
-#ifdef CONFIG_MV_ETH_HEADER
-void	run_com_header(const char *buffer);
-#endif
-
-#ifdef INCLUDE_MULTI_QUEUE
-void    ethRxPolMode(int port, MV_ETH_PRIO_MODE prioMode);
-void    ethRxPolQ(int port, int queue, int quota);
-void    ethRxPolicy(int port);
-void    ethTxPolDef(int port, int txQ, char* headerHexStr);
-void    ethTxPolDA(int port, char* macStr, int txQ, char* headerHexStr);
-void    ethTxPolicy(int port);
-#endif /* INCLUDE_MULTI_QUEUE */
-
-#if (MV_ETH_VERSION >= 4)
-void     ethEjpModeSet(int port, int mode)
-#endif
-#endif /* 0 */
-
-
-
-
-void    ethRxCoal(int port, int usec);
-void    ethTxCoal(int port, int usec);
-#if (MV_ETH_VERSION >= 4)
-void     ethEjpModeSet(int port, int mode);
-#endif /* (MV_ETH_VERSION >= 4) */
-
-void    ethBpduRxQ(int port, int bpduQueue);
-void    ethArpRxQ(int port, int arpQueue);
-void    ethTcpRxQ(int port, int tcpQueue);
-void    ethUdpRxQ(int port, int udpQueue);
-void    ethTxPolicyRegs(int port);
-void    ethPortRegs(int port);
-void    ethRegs(int port);
-void ethClearCounters(int port);
-void    ethPortCounters(int port);
-void    ethPortRmonCounters(int port);
-void    ethPortStatus(int port);
-void    ethPortQueues(int port, int rxQueue, int txQueue, int mode);
-void    ethUcastSet(int port, char* macStr, int queue);
-void    ethPortUcastShow(int port);
-void    ethMcastAdd(int port, char* macStr, int queue);
-void    ethPortMcast(int port);
-void    mvEthPortShow(void* pHndl);
-void    mvEthQueuesShow(void* pHndl, int rxQueue, int txQueue, int mode);
-
-#endif
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h
deleted file mode 100644
index f4cae50781..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthGbe.h
+++ /dev/null
@@ -1,751 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvEth.h - Header File for : Marvell Gigabit Ethernet Controller
-*
-* DESCRIPTION:
-*       This header file contains macros typedefs and function declaration specific to 
-*       the Marvell Gigabit Ethernet Controller.
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-#ifndef __mvEthGbe_h__
-#define __mvEthGbe_h__
-
-extern MV_BOOL         ethDescInSram;
-extern MV_BOOL         ethDescSwCoher;
-extern ETH_PORT_CTRL*  ethPortCtrl[];
-
-static INLINE MV_ULONG  ethDescVirtToPhy(ETH_QUEUE_CTRL* pQueueCtrl, MV_U8* pDesc)
-{
-#if defined (ETH_DESCR_IN_SRAM)
-    if( ethDescInSram )
-        return mvSramVirtToPhy(pDesc);
-    else
-#endif /* ETH_DESCR_IN_SRAM */
-        return (pQueueCtrl->descBuf.bufPhysAddr + (pDesc - pQueueCtrl->descBuf.bufVirtPtr));
-}
-/* Return port handler */
-#define mvEthPortHndlGet(port)  ethPortCtrl[port]
-
-/* Used as WA for HW/SW race on TX */
-static INLINE int      mvEthPortTxEnable(void* pPortHndl, int queue, int max_deep)
-{
-    int                 deep = 0;
-    MV_U32              txCurrReg, txEnReg;
-    ETH_TX_DESC*        pTxLastDesc;
-    ETH_QUEUE_CTRL*     pQueueCtrl;
-    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    txEnReg = MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo));
-    if( (txEnReg & MV_32BIT_LE_FAST(ETH_TXQ_ENABLE_MASK)) == 0)
-    {
-        MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
-        return 0;
-    }
-
-    pQueueCtrl = &pPortCtrl->txQueue[queue];
-    pTxLastDesc = pQueueCtrl->pCurrentDescr;
-    txCurrReg = MV_REG_READ(ETH_TX_CUR_DESC_PTR_REG(pPortCtrl->portNo, queue));
-    if(ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxLastDesc) == txCurrReg)
-    {
-        /* All descriptors are processed, no chance for race */
-        return 0;
-    }
-
-    /* Check distance betwee HW and SW location: */
-    /* If distance between HW and SW pointers is less than max_deep descriptors */
-    /* Race condition is possible, so wait end of TX and restart TXQ */
-    while(deep < max_deep)
-    {
-        pTxLastDesc = TX_PREV_DESC_PTR(pTxLastDesc, pQueueCtrl);
-        if(ethDescVirtToPhy(pQueueCtrl, (MV_U8*)pTxLastDesc) == txCurrReg)
-        {
-            int count = 0;
-
-            while( (txEnReg & MV_32BIT_LE_FAST(ETH_TXQ_ENABLE_MASK)) != 0)
-            {   
-                count++;
-                if(count > 10000)
-                {
-                    mvOsPrintf("mvEthPortTxEnable: timeout - TXQ_CMD=0x%08x\n", 
-                                MV_REG_READ(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) );
-                    break;
-                }
-                txEnReg = MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo));
-            }
-
-            MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
-            return count;
-        }
-        deep++;
-    }
-    /* Distance between HW and SW pointers is more than max_deep descriptors, */
-    /* So NO race condition - do nothing */
-    return -1;
-}
-
-
-/* defines  */
-#define ETH_CSUM_MIN_BYTE_COUNT     72
-
-/* Tailgate and Kirwood have only 2K TX FIFO */
-#if (MV_ETH_VERSION == 2) || (MV_ETH_VERSION == 4)
-#define ETH_CSUM_MAX_BYTE_COUNT     1600
-#else
-#define ETH_CSUM_MAX_BYTE_COUNT     9*1024
-#endif /* MV_ETH_VERSION */
-
-#define ETH_MV_HEADER_SIZE	    2
-#define ETH_MV_TX_EN
-
-/* An offest in Tx descriptors to store data for buffers less than 8 Bytes */
-#define MIN_TX_BUFF_LOAD            8
-#define TX_BUF_OFFSET_IN_DESC       (ETH_TX_DESC_ALIGNED_SIZE - MIN_TX_BUFF_LOAD)
-
-/* Default port configuration value */
-#define PORT_CONFIG_VALUE                       \
-             ETH_DEF_RX_QUEUE_MASK(0)       |   \
-             ETH_DEF_RX_ARP_QUEUE_MASK(0)   |   \
-             ETH_DEF_RX_TCP_QUEUE_MASK(0)   |   \
-             ETH_DEF_RX_UDP_QUEUE_MASK(0)   |   \
-             ETH_DEF_RX_BPDU_QUEUE_MASK(0)  |   \
-             ETH_RX_CHECKSUM_WITH_PSEUDO_HDR
-
-/* Default port extend configuration value */
-#define PORT_CONFIG_EXTEND_VALUE            0
-
-#define PORT_SERIAL_CONTROL_VALUE                           \
-            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
-            BIT9                                        |   \
-            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
-            ETH_MAX_RX_PACKET_1552BYTE                  |   \
-            ETH_SET_FULL_DUPLEX_MASK
-
-#define PORT_SERIAL_CONTROL_100MB_FORCE_VALUE               \
-            ETH_FORCE_LINK_PASS_MASK                    |   \
-            ETH_DISABLE_DUPLEX_AUTO_NEG_MASK            |   \
-            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
-            BIT9                                        |   \
-            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
-            ETH_DISABLE_SPEED_AUTO_NEG_MASK             |   \
-            ETH_SET_FULL_DUPLEX_MASK                    |   \
-            ETH_SET_MII_SPEED_100_MASK                  |   \
-            ETH_MAX_RX_PACKET_1552BYTE
-
-
-#define PORT_SERIAL_CONTROL_1000MB_FORCE_VALUE              \
-            ETH_FORCE_LINK_PASS_MASK                    |   \
-            ETH_DISABLE_DUPLEX_AUTO_NEG_MASK            |   \
-            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
-            BIT9                                        |   \
-            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
-            ETH_DISABLE_SPEED_AUTO_NEG_MASK             |   \
-            ETH_SET_FULL_DUPLEX_MASK                    |   \
-            ETH_SET_GMII_SPEED_1000_MASK                |   \
-            ETH_MAX_RX_PACKET_1552BYTE
-
-#define PORT_SERIAL_CONTROL_SGMII_IBAN_VALUE                \
-            ETH_DISABLE_FC_AUTO_NEG_MASK                |   \
-            BIT9                                        |   \
-            ETH_IN_BAND_AN_EN_MASK                      |   \
-            ETH_DO_NOT_FORCE_LINK_FAIL_MASK             |   \
-            ETH_MAX_RX_PACKET_1552BYTE                  
-
-/* Function headers: */
-MV_VOID     mvEthSetSpecialMcastTable(int portNo, int queue);
-MV_STATUS   mvEthArpRxQueue(void* pPortHandle, int arpQueue);
-MV_STATUS   mvEthUdpRxQueue(void* pPortHandle, int udpQueue);
-MV_STATUS   mvEthTcpRxQueue(void* pPortHandle, int tcpQueue);
-MV_STATUS   mvEthMacAddrGet(int portNo, unsigned char *pAddr);
-MV_VOID     mvEthSetOtherMcastTable(int portNo, int queue);
-MV_STATUS   mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode);
-/* Interrupt Coalesting functions */
-MV_U32      mvEthRxCoalSet(void* pPortHndl, MV_U32 uSec);
-MV_U32      mvEthTxCoalSet(void* pPortHndl, MV_U32 uSec);
-MV_STATUS   mvEthCoalGet(void* pPortHndl, MV_U32* pRxCoal, MV_U32* pTxCoal);
-
-/******************************************************************************/
-/*                          Data Flow functions                               */
-/******************************************************************************/
-static INLINE void      mvEthPortTxRestart(void* pPortHndl)
-{
-    ETH_PORT_CTRL*      pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(pPortCtrl->portNo)) = pPortCtrl->portTxQueueCmdReg;
-}
-
-/* Get number of Free resources in specific TX queue */
-static INLINE int     mvEthTxResourceGet(void* pPortHndl, int txQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    return (pPortCtrl->txQueue[txQueue].resource);      
-}
-
-/* Get number of Free resources in specific RX queue */
-static INLINE int     mvEthRxResourceGet(void* pPortHndl, int rxQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    return (pPortCtrl->rxQueue[rxQueue].resource);      
-}
-
-static INLINE int     mvEthTxQueueIsFull(void* pPortHndl, int txQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    if(pPortCtrl->txQueue[txQueue].resource == 0)
-        return MV_TRUE;
-
-    return MV_FALSE;
-}
-
-/* Get number of Free resources in specific RX queue */
-static INLINE int     mvEthRxQueueIsFull(void* pPortHndl, int rxQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
-
-    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) && 
-        (pQueueCtrl->resource != 0) )
-        return MV_TRUE;
-
-    return MV_FALSE;
-}
-
-static INLINE int     mvEthTxQueueIsEmpty(void* pPortHndl, int txQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl = &pPortCtrl->txQueue[txQueue];
-
-    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) &&
-        (pQueueCtrl->resource != 0) )
-    {
-        return MV_TRUE;
-    }
-    return MV_FALSE;
-}
-
-/* Get number of Free resources in specific RX queue */
-static INLINE int     mvEthRxQueueIsEmpty(void* pPortHndl, int rxQueue)
-{
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pPortHndl;
-
-    if(pPortCtrl->rxQueue[rxQueue].resource == 0)
-        return MV_TRUE;
-
-    return MV_FALSE;
-}
-
-/*******************************************************************************
-* mvEthPortTx - Send an Ethernet packet
-*
-* DESCRIPTION:
-*       This routine send a given packet described by pPktInfo parameter. 
-*       Single buffer only.
-*
-* INPUT:
-*       void*       pEthPortHndl  - Ethernet Port handler.
-*       int         txQueue       - Number of Tx queue.
-*       MV_PKT_INFO *pPktInfo     - User packet to send.
-*
-* RETURN:
-*       MV_NO_RESOURCE  - No enough resources to send this packet.
-*       MV_ERROR        - Unexpected Fatal error.
-*       MV_OK           - Packet send successfully.
-*
-*******************************************************************************/
-static INLINE MV_STATUS   mvEthPortTx(void* pEthPortHndl, int txQueue, MV_PKT_INFO* pPktInfo)
-{
-    ETH_TX_DESC*    pTxCurrDesc;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    int             portNo;
-    MV_BUF_INFO*    pBufInfo = pPktInfo->pFrags;
-
-#ifdef ETH_DEBUG
-    if(pPortCtrl->portState != MV_ACTIVE)
-        return MV_BAD_STATE;
-#endif /* ETH_DEBUG */
-
-    portNo = pPortCtrl->portNo;
-    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
-
-    /* Get the Tx Desc ring indexes */
-    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
-
-    /* Check if there is enough resources to send the packet */
-    if(pQueueCtrl->resource == 0)
-        return MV_NO_RESOURCE;
-
-    pTxCurrDesc->byteCnt = pBufInfo->dataSize;
-
-    /* Flash Buffer */
-    if(pPktInfo->pktSize != 0)
-    {
-#ifdef MV_NETBSD
-        pTxCurrDesc->bufPtr = pBufInfo->bufPhysAddr;
-        ETH_PACKET_CACHE_FLUSH(pBufInfo->bufVirtPtr, pPktInfo->pktSize);
-#else
-        pTxCurrDesc->bufPtr = ETH_PACKET_CACHE_FLUSH(pBufInfo->bufVirtPtr, pPktInfo->pktSize);
-#endif
-        pPktInfo->pktSize = 0;
-    }
-    else
-        pTxCurrDesc->bufPtr = pBufInfo->bufPhysAddr;
-
-    pTxCurrDesc->returnInfo = (MV_ULONG)pPktInfo;
-
-    /* There is only one buffer in the packet */
-    /* The OSG might set some bits for checksum offload, so add them to first descriptor */
-    pTxCurrDesc->cmdSts = pPktInfo->status              |
-                          ETH_BUFFER_OWNED_BY_DMA       |
-                          ETH_TX_GENERATE_CRC_MASK      |
-                          ETH_TX_ENABLE_INTERRUPT_MASK  |
-                          ETH_TX_ZERO_PADDING_MASK      |
-                          ETH_TX_FIRST_DESC_MASK        |
-                          ETH_TX_LAST_DESC_MASK;
-
-    ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
-
-    pQueueCtrl->resource--;
-    pQueueCtrl->pCurrentDescr = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
-
-    /* Apply send command */
-    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(portNo)) = pPortCtrl->portTxQueueCmdReg;
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvEthPortSgTx - Send an Ethernet packet
-*
-* DESCRIPTION:
-*       This routine send a given packet described by pBufInfo parameter. It
-*       supports transmitting of a packet spaned over multiple buffers. 
-*
-* INPUT:
-*       void*       pEthPortHndl  - Ethernet Port handler.
-*       int         txQueue       - Number of Tx queue.
-*       MV_PKT_INFO *pPktInfo     - User packet to send.
-*
-* RETURN:
-*       MV_NO_RESOURCE  - No enough resources to send this packet.
-*       MV_ERROR        - Unexpected Fatal error.
-*       MV_OK           - Packet send successfully.
-*
-*******************************************************************************/
-static INLINE MV_STATUS   mvEthPortSgTx(void* pEthPortHndl, int txQueue, MV_PKT_INFO* pPktInfo)
-{
-    ETH_TX_DESC*    pTxFirstDesc;
-    ETH_TX_DESC*    pTxCurrDesc;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    int             portNo, bufCount;
-    MV_BUF_INFO*    pBufInfo = pPktInfo->pFrags;
-    MV_U8*          pTxBuf;
-
-#ifdef ETH_DEBUG
-    if(pPortCtrl->portState != MV_ACTIVE)
-        return MV_BAD_STATE;
-#endif /* ETH_DEBUG */
-
-    portNo = pPortCtrl->portNo;
-    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
-
-    /* Get the Tx Desc ring indexes */
-    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
-
-    /* Check if there is enough resources to send the packet */
-    if(pQueueCtrl->resource < pPktInfo->numFrags)
-        return MV_NO_RESOURCE;
-
-    /* Remember first desc */
-    pTxFirstDesc  = pTxCurrDesc;
-
-    bufCount = 0;
-    while(MV_TRUE)
-    {   
-        if(pBufInfo[bufCount].dataSize <= MIN_TX_BUFF_LOAD)
-        {
-            /* Buffers with a payload smaller than MIN_TX_BUFF_LOAD (8 bytes) must be aligned    */
-            /* to 64-bit boundary. Two options here:                                             */
-            /* 1) Usually, copy the payload to the reserved 8 bytes inside descriptor.           */
-            /* 2) In the Half duplex workaround, the reserved 8 bytes inside descriptor are used */ 
-            /*    as a pointer to the aligned buffer, copy the small payload to this buffer.     */
-            pTxBuf = ((MV_U8*)pTxCurrDesc)+TX_BUF_OFFSET_IN_DESC;
-            mvOsBCopy(pBufInfo[bufCount].bufVirtPtr, pTxBuf, pBufInfo[bufCount].dataSize);
-            pTxCurrDesc->bufPtr = ethDescVirtToPhy(pQueueCtrl, pTxBuf);
-        }
-        else
-        {
-            /* Flash Buffer */
-#ifdef MV_NETBSD
-            pTxCurrDesc->bufPtr = pBufInfo[bufCount].bufPhysAddr;
-	    ETH_PACKET_CACHE_FLUSH(pBufInfo[bufCount].bufVirtPtr, pBufInfo[bufCount].dataSize);
-#else
-            pTxCurrDesc->bufPtr = ETH_PACKET_CACHE_FLUSH(pBufInfo[bufCount].bufVirtPtr, pBufInfo[bufCount].dataSize);
-#endif
-        }
-
-        pTxCurrDesc->byteCnt = pBufInfo[bufCount].dataSize;
-        bufCount++;
-
-        if(bufCount >= pPktInfo->numFrags)
-            break;
-
-        if(bufCount > 1)
-        {
-            /* There is middle buffer of the packet Not First and Not Last */
-            pTxCurrDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA;
-            ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
-        }
-        /* Go to next descriptor and next buffer */
-        pTxCurrDesc = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
-    }
-    /* Set last desc with DMA ownership and interrupt enable. */
-    pTxCurrDesc->returnInfo = (MV_ULONG)pPktInfo;
-    if(bufCount == 1) 
-    {
-        /* There is only one buffer in the packet */
-        /* The OSG might set some bits for checksum offload, so add them to first descriptor */
-        pTxCurrDesc->cmdSts = pPktInfo->status              |
-                              ETH_BUFFER_OWNED_BY_DMA       |
-                              ETH_TX_GENERATE_CRC_MASK      |
-                              ETH_TX_ENABLE_INTERRUPT_MASK  |
-                              ETH_TX_ZERO_PADDING_MASK      |
-                              ETH_TX_FIRST_DESC_MASK        |
-                              ETH_TX_LAST_DESC_MASK;
-
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
-    }
-    else
-    {
-        /* Last but not First */
-        pTxCurrDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA       |
-                              ETH_TX_ENABLE_INTERRUPT_MASK  |
-                              ETH_TX_ZERO_PADDING_MASK      |
-                              ETH_TX_LAST_DESC_MASK;
-
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxCurrDesc);
-
-        /* Update First when more than one buffer in the packet */
-        /* The OSG might set some bits for checksum offload, so add them to first descriptor */
-        pTxFirstDesc->cmdSts = pPktInfo->status             |
-                               ETH_BUFFER_OWNED_BY_DMA      |
-                               ETH_TX_GENERATE_CRC_MASK     |
-                               ETH_TX_FIRST_DESC_MASK;
-
-        ETH_DESCR_FLUSH_INV(pPortCtrl, pTxFirstDesc);
-    }
-    /* Update txQueue state */
-    pQueueCtrl->resource -= bufCount;
-    pQueueCtrl->pCurrentDescr = TX_NEXT_DESC_PTR(pTxCurrDesc, pQueueCtrl);
-
-    /* Apply send command */
-    MV_REG_VALUE(ETH_TX_QUEUE_COMMAND_REG(portNo)) = pPortCtrl->portTxQueueCmdReg;
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvEthPortTxDone - Free all used Tx descriptors and mBlks.
-*
-* DESCRIPTION:
-*       This routine returns the transmitted packet information to the caller.
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       int         txQueue         - Number of Tx queue.
-*
-* OUTPUT:
-*       MV_PKT_INFO *pPktInfo       - Pointer to packet was sent.
-*
-* RETURN:
-*       MV_NOT_FOUND    - No transmitted packets to return. Transmit in progress.
-*       MV_EMPTY        - No transmitted packets to return. TX Queue is empty.
-*       MV_ERROR        - Unexpected Fatal error.
-*       MV_OK           - There is transmitted packet in the queue, 
-*                       'pPktInfo' filled with relevant information.
-*
-*******************************************************************************/
-static INLINE MV_PKT_INFO*    mvEthPortTxDone(void* pEthPortHndl, int txQueue)
-{
-    ETH_TX_DESC*    pTxCurrDesc;
-    ETH_TX_DESC*    pTxUsedDesc;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    MV_PKT_INFO*    pPktInfo;
-    MV_U32          commandStatus;
-
-    pQueueCtrl = &pPortCtrl->txQueue[txQueue];
-
-    pTxUsedDesc = pQueueCtrl->pUsedDescr;
-    pTxCurrDesc = pQueueCtrl->pCurrentDescr;
-
-    while(MV_TRUE)
-    {
-        /* No more used descriptors */
-        commandStatus = pTxUsedDesc->cmdSts;
-        if (commandStatus  & (ETH_BUFFER_OWNED_BY_DMA))
-        {    
-            ETH_DESCR_INV(pPortCtrl, pTxUsedDesc);
-            return NULL;
-        }
-        if( (pTxUsedDesc == pTxCurrDesc) &&
-            (pQueueCtrl->resource != 0) )
-        {
-            return NULL;
-        }
-        pQueueCtrl->resource++;
-        pQueueCtrl->pUsedDescr = TX_NEXT_DESC_PTR(pTxUsedDesc, pQueueCtrl);
-        if(commandStatus & (ETH_TX_LAST_DESC_MASK)) 
-        {
-            pPktInfo = (MV_PKT_INFO*)pTxUsedDesc->returnInfo;
-            pPktInfo->status  = commandStatus;            
-            return pPktInfo;
-        }
-        pTxUsedDesc = pQueueCtrl->pUsedDescr;
-    }
-}
-
-/*******************************************************************************
-* mvEthPortRx - Get new received packets from Rx queue.
-*
-* DESCRIPTION:
-*       This routine returns the received data to the caller. There is no
-*       data copying during routine operation. All information is returned
-*       using pointer to packet information struct passed from the caller.
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       int         rxQueue         - Number of Rx queue.
-*
-* OUTPUT:
-*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
-*
-* RETURN:
-*       MV_NO_RESOURCE  - No free resources in RX queue.
-*       MV_ERROR        - Unexpected Fatal error.
-*       MV_OK           - New packet received and 'pBufInfo' structure filled
-*                       with relevant information.
-*
-*******************************************************************************/
-static INLINE MV_PKT_INFO*    mvEthPortRx(void* pEthPortHndl, int rxQueue)
-{
-    ETH_RX_DESC     *pRxCurrDesc;
-    MV_U32          commandStatus;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    MV_PKT_INFO*    pPktInfo;
-
-    pQueueCtrl = &(pPortCtrl->rxQueue[rxQueue]);
-
-    /* Check resources */
-    if(pQueueCtrl->resource == 0)
-    {
-        mvOsPrintf("ethPortRx: no more resources\n");
-        return NULL;
-    }
-    while(MV_TRUE)
-    {
-        /* Get the Rx Desc ring 'curr and 'used' indexes */
-        pRxCurrDesc = pQueueCtrl->pCurrentDescr;
-
-	commandStatus   = pRxCurrDesc->cmdSts;
-        if (commandStatus & (ETH_BUFFER_OWNED_BY_DMA))
-        {
-            /* Nothing to receive... */
-            ETH_DESCR_INV(pPortCtrl, pRxCurrDesc);
-            return NULL;
-        }
-
-        /* Valid RX only if FIRST and LAST bits are set */
-        if( (commandStatus & (ETH_RX_LAST_DESC_MASK | ETH_RX_FIRST_DESC_MASK)) == 
-                             (ETH_RX_LAST_DESC_MASK | ETH_RX_FIRST_DESC_MASK) )
-        {
-            pPktInfo = (MV_PKT_INFO*)pRxCurrDesc->returnInfo;
-            pPktInfo->pFrags->dataSize  = pRxCurrDesc->byteCnt - 4;
-            pPktInfo->status            = commandStatus;
-            pPktInfo->fragIP            = pRxCurrDesc->bufSize & ETH_RX_IP_FRAGMENTED_FRAME_MASK;
-
-            pQueueCtrl->resource--;
-            /* Update 'curr' in data structure */
-            pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxCurrDesc, pQueueCtrl);
-
-#ifdef INCLUDE_SYNC_BARR
-            mvCpuIfSyncBarr(DRAM_TARGET);
-#endif
-            return pPktInfo;
-        }
-        else
-        {
-            ETH_RX_DESC*    pRxUsedDesc = pQueueCtrl->pUsedDescr;
-
-#ifdef ETH_DEBUG
-            mvOsPrintf("ethDrv: Unexpected Jumbo frame: "
-                       "status=0x%08x, byteCnt=%d, pData=0x%x\n", 
-                        commandStatus, pRxCurrDesc->byteCnt, pRxCurrDesc->bufPtr);
-#endif /* ETH_DEBUG */
-
-            /* move buffer from pCurrentDescr position to pUsedDescr position */
-            pRxUsedDesc->bufPtr     = pRxCurrDesc->bufPtr;
-            pRxUsedDesc->returnInfo = pRxCurrDesc->returnInfo;
-            pRxUsedDesc->bufSize    = pRxCurrDesc->bufSize & ETH_RX_BUFFER_MASK;
-
-            /* Return the descriptor to DMA ownership */
-            pRxUsedDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA | 
-                                  ETH_RX_ENABLE_INTERRUPT_MASK;
-
-            /* Flush descriptor and CPU pipe */
-            ETH_DESCR_FLUSH_INV(pPortCtrl, pRxUsedDesc);
-
-            /* Move the used descriptor pointer to the next descriptor */
-            pQueueCtrl->pUsedDescr = RX_NEXT_DESC_PTR(pRxUsedDesc, pQueueCtrl);
-            pQueueCtrl->pCurrentDescr = RX_NEXT_DESC_PTR(pRxCurrDesc, pQueueCtrl);            
-        }
-    }
-}
-
-/*******************************************************************************
-* mvEthPortRxDone - Returns a Rx buffer back to the Rx ring.
-*
-* DESCRIPTION:
-*       This routine returns a Rx buffer back to the Rx ring. 
-*
-* INPUT:
-*       void*       pEthPortHndl    - Ethernet Port handler.
-*       int         rxQueue         - Number of Rx queue.
-*       MV_PKT_INFO *pPktInfo       - Pointer to received packet.
-*
-* RETURN:
-*       MV_ERROR        - Unexpected Fatal error.
-*       MV_OUT_OF_RANGE - RX queue is already FULL, so this buffer can't be 
-*                       returned to this queue.
-*       MV_FULL         - Buffer returned successfully and RX queue became full.
-*                       More buffers should not be returned at the time.
-*       MV_OK           - Buffer returned successfully and there are more free 
-*                       places in the queue.
-*
-*******************************************************************************/
-static INLINE MV_STATUS   mvEthPortRxDone(void* pEthPortHndl, int rxQueue, MV_PKT_INFO *pPktInfo)
-{
-    ETH_RX_DESC*    pRxUsedDesc;
-    ETH_QUEUE_CTRL* pQueueCtrl;
-    ETH_PORT_CTRL*  pPortCtrl = (ETH_PORT_CTRL*)pEthPortHndl;
-            
-    pQueueCtrl = &pPortCtrl->rxQueue[rxQueue];
-
-    /* Get 'used' Rx descriptor */
-    pRxUsedDesc = pQueueCtrl->pUsedDescr;
-
-    /* Check that ring is not FULL */
-    if( (pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) && 
-        (pQueueCtrl->resource != 0) )
-    {
-        mvOsPrintf("%s %d: out of range Error resource=%d, curr=%p, used=%p\n", 
-                    __FUNCTION__, pPortCtrl->portNo, pQueueCtrl->resource, 
-                    pQueueCtrl->pCurrentDescr, pQueueCtrl->pUsedDescr);
-        return MV_OUT_OF_RANGE;
-    }
-
-    pRxUsedDesc->bufPtr     = pPktInfo->pFrags->bufPhysAddr;
-    pRxUsedDesc->returnInfo = (MV_ULONG)pPktInfo;
-    pRxUsedDesc->bufSize    = pPktInfo->pFrags->bufSize & ETH_RX_BUFFER_MASK;
-
-    /* Invalidate data buffer accordingly with pktSize */
-    if(pPktInfo->pktSize != 0)
-    {
-        ETH_PACKET_CACHE_INVALIDATE(pPktInfo->pFrags->bufVirtPtr, pPktInfo->pktSize);
-        pPktInfo->pktSize = 0;
-    }
-
-    /* Return the descriptor to DMA ownership */
-    pRxUsedDesc->cmdSts = ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT_MASK;
-
-    /* Flush descriptor and CPU pipe */
-    ETH_DESCR_FLUSH_INV(pPortCtrl, pRxUsedDesc);
-
-    pQueueCtrl->resource++;
-
-    /* Move the used descriptor pointer to the next descriptor */
-    pQueueCtrl->pUsedDescr = RX_NEXT_DESC_PTR(pRxUsedDesc, pQueueCtrl);
-    
-    /* If ring became Full return MV_FULL */
-    if(pQueueCtrl->pUsedDescr == pQueueCtrl->pCurrentDescr) 
-        return MV_FULL;
-
-    return MV_OK;
-}
-
-
-#endif /* __mvEthGbe_h__ */
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h
deleted file mode 100644
index 7b9f0520fb..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/gbe/mvEthRegs.h
+++ /dev/null
@@ -1,700 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCmvEthRegsh
-#define __INCmvEthRegsh
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-/****************************************/
-/*        Ethernet Unit Registers       */
-/****************************************/
-#define ETH_REG_BASE 					MV_ETH_REG_BASE
-
-#define ETH_PHY_ADDR_REG(port)              (ETH_REG_BASE(port) + 0x000)
-#define ETH_SMI_REG(port)                   (ETH_REG_BASE(port) + 0x004)
-#define ETH_UNIT_DEF_ADDR_REG(port)         (ETH_REG_BASE(port) + 0x008)
-#define ETH_UNIT_DEF_ID_REG(port)           (ETH_REG_BASE(port) + 0x00c)
-#define ETH_UNIT_RESERVED(port)             (ETH_REG_BASE(port) + 0x014)
-#define ETH_UNIT_INTR_CAUSE_REG(port)       (ETH_REG_BASE(port) + 0x080)
-#define ETH_UNIT_INTR_MASK_REG(port)        (ETH_REG_BASE(port) + 0x084)
-
-
-#define ETH_UNIT_ERROR_ADDR_REG(port)       (ETH_REG_BASE(port) + 0x094)
-#define ETH_UNIT_INT_ADDR_ERROR_REG(port)   (ETH_REG_BASE(port) + 0x098)
-#define ETH_UNIT_CONTROL_REG(port)          (ETH_REG_BASE(port) + 0x0B0)
-
-#define ETH_PORT_CONFIG_REG(port)           (ETH_REG_BASE(port) + 0x400)
-#define ETH_PORT_CONFIG_EXTEND_REG(port)    (ETH_REG_BASE(port) + 0x404)
-#define ETH_MII_SERIAL_PARAM_REG(port)      (ETH_REG_BASE(port) + 0x408)
-#define ETH_GMII_SERIAL_PARAM_REG(port)     (ETH_REG_BASE(port) + 0x40c)
-#define ETH_VLAN_ETHER_TYPE_REG(port)       (ETH_REG_BASE(port) + 0x410)
-#define ETH_MAC_ADDR_LOW_REG(port)          (ETH_REG_BASE(port) + 0x414)
-#define ETH_MAC_ADDR_HIGH_REG(port)         (ETH_REG_BASE(port) + 0x418)
-#define ETH_SDMA_CONFIG_REG(port)           (ETH_REG_BASE(port) + 0x41c)
-#define ETH_DIFF_SERV_PRIO_REG(port, code)  (ETH_REG_BASE(port) + 0x420  + ((code)<<2))
-#define ETH_PORT_SERIAL_CTRL_REG(port)      (ETH_REG_BASE(port) + 0x43c)
-#define ETH_VLAN_TAG_TO_PRIO_REG(port)      (ETH_REG_BASE(port) + 0x440)
-#define ETH_PORT_STATUS_REG(port)           (ETH_REG_BASE(port) + 0x444)
-
-#define ETH_RX_QUEUE_COMMAND_REG(port)      (ETH_REG_BASE(port) + 0x680)
-#define ETH_TX_QUEUE_COMMAND_REG(port)      (ETH_REG_BASE(port) + 0x448)
-
-#define ETH_PORT_SERIAL_CTRL_1_REG(port)    (ETH_REG_BASE(port) + 0x44c)
-#define ETH_PORT_STATUS_1_REG(port)         (ETH_REG_BASE(port) + 0x450)
-#define ETH_PORT_MARVELL_HEADER_REG(port)   (ETH_REG_BASE(port) + 0x454)
-#define ETH_PORT_FIFO_PARAMS_REG(port)      (ETH_REG_BASE(port) + 0x458)
-#define ETH_MAX_TOKEN_BUCKET_SIZE_REG(port) (ETH_REG_BASE(port) + 0x45c)
-#define ETH_INTR_CAUSE_REG(port)            (ETH_REG_BASE(port) + 0x460)
-#define ETH_INTR_CAUSE_EXT_REG(port)        (ETH_REG_BASE(port) + 0x464)
-#define ETH_INTR_MASK_REG(port)             (ETH_REG_BASE(port) + 0x468)
-#define ETH_INTR_MASK_EXT_REG(port)         (ETH_REG_BASE(port) + 0x46c)
-#define ETH_TX_FIFO_URGENT_THRESH_REG(port) (ETH_REG_BASE(port) + 0x474)
-#define ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (ETH_REG_BASE(port) + 0x47c)
-#define ETH_RX_DISCARD_PKTS_CNTR_REG(port)  (ETH_REG_BASE(port) + 0x484)
-#define ETH_RX_OVERRUN_PKTS_CNTR_REG(port)  (ETH_REG_BASE(port) + 0x488)
-#define ETH_INTERNAL_ADDR_ERROR_REG(port)   (ETH_REG_BASE(port) + 0x494)
-#define ETH_TX_FIXED_PRIO_CFG_REG(port)     (ETH_REG_BASE(port) + 0x4dc)
-#define ETH_TX_TOKEN_RATE_CFG_REG(port)     (ETH_REG_BASE(port) + 0x4e0)
-#define ETH_TX_QUEUE_COMMAND1_REG(port)     (ETH_REG_BASE(port) + 0x4e4)
-#define ETH_MAX_TRANSMIT_UNIT_REG(port)     (ETH_REG_BASE(port) + 0x4e8)
-#define ETH_TX_TOKEN_BUCKET_SIZE_REG(port)  (ETH_REG_BASE(port) + 0x4ec)
-#define ETH_TX_TOKEN_BUCKET_COUNT_REG(port) (ETH_REG_BASE(port) + 0x780)
-#define ETH_RX_DESCR_STAT_CMD_REG(port, q)  (ETH_REG_BASE(port) + 0x600 + ((q)<<4))
-#define ETH_RX_BYTE_COUNT_REG(port, q)      (ETH_REG_BASE(port) + 0x604 + ((q)<<4))
-#define ETH_RX_BUF_PTR_REG(port, q)         (ETH_REG_BASE(port) + 0x608 + ((q)<<4))
-#define ETH_RX_CUR_DESC_PTR_REG(port, q)    (ETH_REG_BASE(port) + 0x60c + ((q)<<4))
-#define ETH_TX_CUR_DESC_PTR_REG(port, q)    (ETH_REG_BASE(port) + 0x6c0 + ((q)<<2))
-
-#define ETH_TXQ_TOKEN_COUNT_REG(port, q)    (ETH_REG_BASE(port) + 0x700 + ((q)<<4))
-#define ETH_TXQ_TOKEN_CFG_REG(port, q)      (ETH_REG_BASE(port) + 0x704 + ((q)<<4))
-#define ETH_TXQ_ARBITER_CFG_REG(port, q)    (ETH_REG_BASE(port) + 0x708 + ((q)<<4))
-
-#if (MV_ETH_VERSION >= 4) 
-#define ETH_TXQ_CMD_1_REG(port)             (ETH_REG_BASE(port) + 0x4E4)
-#define ETH_EJP_TX_HI_IPG_REG(port)         (ETH_REG_BASE(port) + 0x7A8)
-#define ETH_EJP_TX_LO_IPG_REG(port)         (ETH_REG_BASE(port) + 0x7B8)
-#define ETH_EJP_HI_TKN_LO_PKT_REG(port)     (ETH_REG_BASE(port) + 0x7C0)
-#define ETH_EJP_HI_TKN_ASYNC_PKT_REG(port)  (ETH_REG_BASE(port) + 0x7C4)
-#define ETH_EJP_LO_TKN_ASYNC_PKT_REG(port)  (ETH_REG_BASE(port) + 0x7C8)
-#define ETH_EJP_TX_SPEED_REG(port)          (ETH_REG_BASE(port) + 0x7D0)
-#endif /* MV_ETH_VERSION >= 4 */
-
-#define ETH_MIB_COUNTERS_BASE(port)         (ETH_REG_BASE(port) + 0x1000)
-#define ETH_DA_FILTER_SPEC_MCAST_BASE(port) (ETH_REG_BASE(port) + 0x1400)
-#define ETH_DA_FILTER_OTH_MCAST_BASE(port)  (ETH_REG_BASE(port) + 0x1500)
-#define ETH_DA_FILTER_UCAST_BASE(port)      (ETH_REG_BASE(port) + 0x1600)
-
-/* Phy address register definitions */
-#define ETH_PHY_ADDR_OFFS          0                                       
-#define ETH_PHY_ADDR_MASK          (0x1f <<ETH_PHY_ADDR_OFFS)
-                                 
-/* MIB Counters register definitions */
-#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW    0x0
-#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH   0x4
-#define ETH_MIB_BAD_OCTETS_RECEIVED         0x8
-#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR   0xc
-#define ETH_MIB_GOOD_FRAMES_RECEIVED        0x10
-#define ETH_MIB_BAD_FRAMES_RECEIVED         0x14
-#define ETH_MIB_BROADCAST_FRAMES_RECEIVED   0x18
-#define ETH_MIB_MULTICAST_FRAMES_RECEIVED   0x1c
-#define ETH_MIB_FRAMES_64_OCTETS            0x20
-#define ETH_MIB_FRAMES_65_TO_127_OCTETS     0x24
-#define ETH_MIB_FRAMES_128_TO_255_OCTETS    0x28
-#define ETH_MIB_FRAMES_256_TO_511_OCTETS    0x2c
-#define ETH_MIB_FRAMES_512_TO_1023_OCTETS   0x30
-#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS   0x34
-#define ETH_MIB_GOOD_OCTETS_SENT_LOW        0x38
-#define ETH_MIB_GOOD_OCTETS_SENT_HIGH       0x3c
-#define ETH_MIB_GOOD_FRAMES_SENT            0x40
-#define ETH_MIB_EXCESSIVE_COLLISION         0x44
-#define ETH_MIB_MULTICAST_FRAMES_SENT       0x48
-#define ETH_MIB_BROADCAST_FRAMES_SENT       0x4c
-#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED  0x50
-#define ETH_MIB_FC_SENT                     0x54
-#define ETH_MIB_GOOD_FC_RECEIVED            0x58
-#define ETH_MIB_BAD_FC_RECEIVED             0x5c
-#define ETH_MIB_UNDERSIZE_RECEIVED          0x60
-#define ETH_MIB_FRAGMENTS_RECEIVED          0x64
-#define ETH_MIB_OVERSIZE_RECEIVED           0x68
-#define ETH_MIB_JABBER_RECEIVED             0x6c
-#define ETH_MIB_MAC_RECEIVE_ERROR           0x70
-#define ETH_MIB_BAD_CRC_EVENT               0x74
-#define ETH_MIB_COLLISION                   0x78
-#define ETH_MIB_LATE_COLLISION              0x7c
-
-
-/****************************************/
-/*        Ethernet Unit Register BITs   */
-/****************************************/
-
-#define ETH_RXQ_ENABLE_OFFSET               0
-#define ETH_RXQ_ENABLE_MASK                 (0x000000FF << ETH_RXQ_ENABLE_OFFSET)
-
-#define ETH_RXQ_DISABLE_OFFSET              8
-#define ETH_RXQ_DISABLE_MASK                (0x000000FF << ETH_RXQ_DISABLE_OFFSET)
-
-/***** BITs of Transmit Queue Command (TQC) register *****/
-#define ETH_TXQ_ENABLE_OFFSET               0
-#define ETH_TXQ_ENABLE_MASK                 (0x000000FF << ETH_TXQ_ENABLE_OFFSET)
-
-#define ETH_TXQ_DISABLE_OFFSET              8
-#define ETH_TXQ_DISABLE_MASK                (0x000000FF << ETH_TXQ_DISABLE_OFFSET)
-
-#if (MV_ETH_VERSION >= 4) 
-#define ETH_TX_EJP_RESET_BIT                0
-#define ETH_TX_EJP_RESET_MASK               (1 << ETH_TX_EJP_RESET_BIT)
-
-#define ETH_TX_EJP_ENABLE_BIT               2
-#define ETH_TX_EJP_ENABLE_MASK              (1 << ETH_TX_EJP_ENABLE_BIT)
-
-#define ETH_TX_LEGACY_WRR_BIT               3
-#define ETH_TX_LEGACY_WRR_MASK              (1 << ETH_TX_LEGACY_WRR_BIT)
-#endif /* (MV_ETH_VERSION >= 4) */
-
-/***** BITs of Ethernet Port Status reg (PSR) *****/
-#define ETH_LINK_UP_BIT                     1
-#define ETH_LINK_UP_MASK                    (1<<ETH_LINK_UP_BIT)
-                     
-#define ETH_FULL_DUPLEX_BIT                 2
-#define ETH_FULL_DUPLEX_MASK                (1<<ETH_FULL_DUPLEX_BIT)
-
-#define ETH_ENABLE_RCV_FLOW_CTRL_BIT        3
-#define ETH_ENABLE_RCV_FLOW_CTRL_MASK       (1<<ETH_ENABLE_RCV_FLOW_CTRL_BIT)
-
-#define ETH_GMII_SPEED_1000_BIT             4
-#define ETH_GMII_SPEED_1000_MASK            (1<<ETH_GMII_SPEED_1000_BIT)
-
-#define ETH_MII_SPEED_100_BIT               5
-#define ETH_MII_SPEED_100_MASK              (1<<ETH_MII_SPEED_100_BIT)
-
-#define ETH_TX_IN_PROGRESS_BIT              7
-#define ETH_TX_IN_PROGRESS_MASK             (1<<ETH_TX_IN_PROGRESS_BIT)
-
-#define ETH_TX_FIFO_EMPTY_BIT               10
-#define ETH_TX_FIFO_EMPTY_MASK              (1<<ETH_TX_FIFO_EMPTY_BIT)
-
-/***** BITs of Ethernet Port Status 1 reg (PS1R) *****/
-#define ETH_AUTO_NEG_DONE_BIT               4
-#define ETH_AUTO_NEG_DONE_MASK              (1<<ETH_AUTO_NEG_DONE_BIT)
-
-#define ETH_SERDES_PLL_LOCKED_BIT           6
-#define ETH_SERDES_PLL_LOCKED_MASK          (1<<ETH_SERDES_PLL_LOCKED_BIT)
-
-/***** BITs of Port Configuration reg (PxCR) *****/
-#define ETH_UNICAST_PROMISCUOUS_MODE_BIT    0
-#define ETH_UNICAST_PROMISCUOUS_MODE_MASK   (1<<ETH_UNICAST_PROMISCUOUS_MODE_BIT)
-
-#define ETH_DEF_RX_QUEUE_OFFSET             1
-#define ETH_DEF_RX_QUEUE_ALL_MASK           (0x7<<ETH_DEF_RX_QUEUE_OFFSET)
-#define ETH_DEF_RX_QUEUE_MASK(queue)        ((queue)<<ETH_DEF_RX_QUEUE_OFFSET)
-
-#define ETH_DEF_RX_ARP_QUEUE_OFFSET         4
-#define ETH_DEF_RX_ARP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_ARP_QUEUE_OFFSET)
-#define ETH_DEF_RX_ARP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_ARP_QUEUE_OFFSET)
-
-#define ETH_REJECT_NOT_IP_ARP_BCAST_BIT     7
-#define ETH_REJECT_NOT_IP_ARP_BCAST_MASK    (1<<ETH_REJECT_NOT_IP_ARP_BCAST_BIT)
-
-#define ETH_REJECT_IP_BCAST_BIT             8
-#define ETH_REJECT_IP_BCAST_MASK            (1<<ETH_REJECT_IP_BCAST_BIT)
-
-#define ETH_REJECT_ARP_BCAST_BIT            9
-#define ETH_REJECT_ARP_BCAST_MASK           (1<<ETH_REJECT_ARP_BCAST_BIT)
-
-#define ETH_TX_NO_SET_ERROR_SUMMARY_BIT     12
-#define ETH_TX_NO_SET_ERROR_SUMMARY_MASK    (1<<ETH_TX_NO_SET_ERROR_SUMMARY_BIT)
-
-#define ETH_CAPTURE_TCP_FRAMES_ENABLE_BIT   14
-#define ETH_CAPTURE_TCP_FRAMES_ENABLE_MASK  (1<<ETH_CAPTURE_TCP_FRAMES_ENABLE_BIT)
-
-#define ETH_CAPTURE_UDP_FRAMES_ENABLE_BIT   15
-#define ETH_CAPTURE_UDP_FRAMES_ENABLE_MASK  (1<<ETH_CAPTURE_UDP_FRAMES_ENABLE_BIT)
-
-#define ETH_DEF_RX_TCP_QUEUE_OFFSET         16
-#define ETH_DEF_RX_TCP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_TCP_QUEUE_OFFSET)
-#define ETH_DEF_RX_TCP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_TCP_QUEUE_OFFSET)
-
-#define ETH_DEF_RX_UDP_QUEUE_OFFSET         19
-#define ETH_DEF_RX_UDP_QUEUE_ALL_MASK       (0x7<<ETH_DEF_RX_UDP_QUEUE_OFFSET)
-#define ETH_DEF_RX_UDP_QUEUE_MASK(queue)    ((queue)<<ETH_DEF_RX_UDP_QUEUE_OFFSET)
-
-#define ETH_DEF_RX_BPDU_QUEUE_OFFSET        22
-#define ETH_DEF_RX_BPDU_QUEUE_ALL_MASK      (0x7<<ETH_DEF_RX_BPDU_QUEUE_OFFSET)
-#define ETH_DEF_RX_BPDU_QUEUE_MASK(queue)   ((queue)<<ETH_DEF_RX_BPDU_QUEUE_OFFSET)
-
-#define ETH_RX_CHECKSUM_MODE_OFFSET         25
-#define ETH_RX_CHECKSUM_NO_PSEUDO_HDR       (0<<ETH_RX_CHECKSUM_MODE_OFFSET)
-#define ETH_RX_CHECKSUM_WITH_PSEUDO_HDR     (1<<ETH_RX_CHECKSUM_MODE_OFFSET)
-
-/***** BITs of Port Configuration Extend reg (PxCXR) *****/
-#define ETH_CAPTURE_SPAN_BPDU_ENABLE_BIT    1
-#define ETH_CAPTURE_SPAN_BPDU_ENABLE_MASK   (1<<ETH_CAPTURE_SPAN_BPDU_ENABLE_BIT)
-
-#define ETH_TX_DISABLE_GEN_CRC_BIT          3
-#define ETH_TX_DISABLE_GEN_CRC_MASK         (1<<ETH_TX_DISABLE_GEN_CRC_BIT)
-
-/***** BITs of Tx/Rx queue command reg (RQCR/TQCR) *****/
-#define ETH_QUEUE_ENABLE_OFFSET             0
-#define ETH_QUEUE_ENABLE_ALL_MASK           (0xFF<<ETH_QUEUE_ENABLE_OFFSET)
-#define ETH_QUEUE_ENABLE_MASK(queue)        (1<<((queue)+ETH_QUEUE_ENABLE_OFFSET))
-
-#define ETH_QUEUE_DISABLE_OFFSET            8 
-#define ETH_QUEUE_DISABLE_ALL_MASK          (0xFF<<ETH_QUEUE_DISABLE_OFFSET)
-#define ETH_QUEUE_DISABLE_MASK(queue)       (1<<((queue)+ETH_QUEUE_DISABLE_OFFSET))
-
-
-/***** BITs of Port Sdma Configuration reg (SDCR) *****/
-#define ETH_RX_FRAME_INTERRUPT_BIT          0
-#define ETH_RX_FRAME_INTERRUPT_MASK         (1<<ETH_RX_FRAME_INTERRUPT_BIT)
-
-#define ETH_BURST_SIZE_1_64BIT_VALUE        0   
-#define ETH_BURST_SIZE_2_64BIT_VALUE        1
-#define ETH_BURST_SIZE_4_64BIT_VALUE        2
-#define ETH_BURST_SIZE_8_64BIT_VALUE        3
-#define ETH_BURST_SIZE_16_64BIT_VALUE       4
-
-#define ETH_RX_BURST_SIZE_OFFSET            1
-#define ETH_RX_BURST_SIZE_ALL_MASK          (0x7<<ETH_RX_BURST_SIZE_OFFSET)
-#define ETH_RX_BURST_SIZE_MASK(burst)       ((burst)<<ETH_RX_BURST_SIZE_OFFSET)
-
-#define ETH_RX_NO_DATA_SWAP_BIT             4
-#define ETH_RX_NO_DATA_SWAP_MASK            (1<<ETH_RX_NO_DATA_SWAP_BIT)
-#define ETH_RX_DATA_SWAP_MASK               (0<<ETH_RX_NO_DATA_SWAP_BIT)
-
-#define ETH_TX_NO_DATA_SWAP_BIT             5
-#define ETH_TX_NO_DATA_SWAP_MASK            (1<<ETH_TX_NO_DATA_SWAP_BIT)
-#define ETH_TX_DATA_SWAP_MASK               (0<<ETH_TX_NO_DATA_SWAP_BIT)
-
-#define ETH_DESC_SWAP_BIT                   6
-#define ETH_DESC_SWAP_MASK                  (1<<ETH_DESC_SWAP_BIT)
-#define ETH_NO_DESC_SWAP_MASK               (0<<ETH_DESC_SWAP_BIT)
-
-#define ETH_RX_INTR_COAL_OFFSET             7
-#define ETH_RX_INTR_COAL_ALL_MASK           (0x3fff<<ETH_RX_INTR_COAL_OFFSET)
-#define ETH_RX_INTR_COAL_MASK(value)        (((value)<<ETH_RX_INTR_COAL_OFFSET)  \
-                                             & ETH_RX_INTR_COAL_ALL_MASK)
-
-#define ETH_TX_BURST_SIZE_OFFSET            22
-#define ETH_TX_BURST_SIZE_ALL_MASK          (0x7<<ETH_TX_BURST_SIZE_OFFSET)
-#define ETH_TX_BURST_SIZE_MASK(burst)       ((burst)<<ETH_TX_BURST_SIZE_OFFSET)
-
-#define ETH_RX_INTR_COAL_MSB_BIT            25
-#define ETH_RX_INTR_COAL_MSB_MASK           (1<<ETH_RX_INTR_COAL_MSB_BIT)  
-
-/* BITs Port #x Tx FIFO Urgent Threshold (PxTFUT) */
-#define ETH_TX_INTR_COAL_OFFSET             4
-#define ETH_TX_INTR_COAL_ALL_MASK           (0x3fff << ETH_TX_INTR_COAL_OFFSET)
-#define ETH_TX_INTR_COAL_MASK(value)        (((value) << ETH_TX_INTR_COAL_OFFSET)  \
-                                             & ETH_TX_INTR_COAL_ALL_MASK)
-
-/* BITs of Port Serial Control reg (PSCR) */
-#define ETH_PORT_ENABLE_BIT                 0
-#define ETH_PORT_ENABLE_MASK                (1<<ETH_PORT_ENABLE_BIT)
-
-#define ETH_FORCE_LINK_PASS_BIT             1
-#define ETH_FORCE_LINK_PASS_MASK            (1<<ETH_FORCE_LINK_PASS_BIT)
-
-#define ETH_DISABLE_DUPLEX_AUTO_NEG_BIT     2
-#define ETH_DISABLE_DUPLEX_AUTO_NEG_MASK    (1<<ETH_DISABLE_DUPLEX_AUTO_NEG_BIT)
-
-#define ETH_DISABLE_FC_AUTO_NEG_BIT         3
-#define ETH_DISABLE_FC_AUTO_NEG_MASK        (1<<ETH_DISABLE_FC_AUTO_NEG_BIT)
-
-#define ETH_ADVERTISE_SYM_FC_BIT            4
-#define ETH_ADVERTISE_SYM_FC_MASK           (1<<ETH_ADVERTISE_SYM_FC_BIT)
-
-#define ETH_TX_FC_MODE_OFFSET               5
-#define ETH_TX_FC_MODE_MASK                 (3<<ETH_TX_FC_MODE_OFFSET)
-#define ETH_TX_FC_NO_PAUSE                  (0<<ETH_TX_FC_MODE_OFFSET)
-#define ETH_TX_FC_SEND_PAUSE                (1<<ETH_TX_FC_MODE_OFFSET)
-
-#define ETH_TX_BP_MODE_OFFSET               7
-#define ETH_TX_BP_MODE_MASK                 (3<<ETH_TX_BP_MODE_OFFSET)
-#define ETH_TX_BP_NO_JAM                    (0<<ETH_TX_BP_MODE_OFFSET)
-#define ETH_TX_BP_SEND_JAM                  (1<<ETH_TX_BP_MODE_OFFSET)
-
-#define ETH_DO_NOT_FORCE_LINK_FAIL_BIT      10
-#define ETH_DO_NOT_FORCE_LINK_FAIL_MASK     (1<<ETH_DO_NOT_FORCE_LINK_FAIL_BIT)
-
-#define ETH_RETRANSMIT_FOREVER_BIT          11
-#define ETH_RETRANSMIT_FOREVER_MASK         (1<<ETH_RETRANSMIT_FOREVER_BIT)
-
-#define ETH_DISABLE_SPEED_AUTO_NEG_BIT      13
-#define ETH_DISABLE_SPEED_AUTO_NEG_MASK     (1<<ETH_DISABLE_SPEED_AUTO_NEG_BIT)
-
-#define ETH_DTE_ADVERT_BIT                  14    
-#define ETH_DTE_ADVERT_MASK                 (1<<ETH_DTE_ADVERT_BIT)    
-
-#define ETH_MII_PHY_MODE_BIT                15  
-#define ETH_MII_PHY_MODE_MAC                (0<<ETH_MII_PHY_MODE_BIT)
-#define ETH_MII_PHY_MODE_PHY                (1<<ETH_MII_PHY_MODE_BIT)
-
-#define ETH_MII_SOURCE_SYNCH_BIT            16
-#define ETH_MII_STANDARD_SYNCH              (0<<ETH_MII_SOURCE_SYNCH_BIT)
-#define ETH_MII_400Mbps_SYNCH               (1<<ETH_MII_SOURCE_CLK_BIT)
-
-#define ETH_MAX_RX_PACKET_SIZE_OFFSET       17
-#define ETH_MAX_RX_PACKET_SIZE_MASK         (7<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_1518BYTE          (0<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_1522BYTE          (1<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_1552BYTE          (2<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_9022BYTE          (3<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_9192BYTE          (4<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-#define ETH_MAX_RX_PACKET_9700BYTE          (5<<ETH_MAX_RX_PACKET_SIZE_OFFSET)
-
-#define ETH_SET_FULL_DUPLEX_BIT             21
-#define ETH_SET_FULL_DUPLEX_MASK            (1<<ETH_SET_FULL_DUPLEX_BIT)
-
-#define ETH_SET_FLOW_CTRL_BIT               22
-#define ETH_SET_FLOW_CTRL_MASK              (1<<ETH_SET_FLOW_CTRL_BIT)
-
-#define ETH_SET_GMII_SPEED_1000_BIT         23
-#define ETH_SET_GMII_SPEED_1000_MASK        (1<<ETH_SET_GMII_SPEED_1000_BIT)
-
-#define ETH_SET_MII_SPEED_100_BIT           24
-#define ETH_SET_MII_SPEED_100_MASK          (1<<ETH_SET_MII_SPEED_100_BIT)
-
-/* BITs of Port Serial Control 1 reg (PSC1R) */
-#define ETH_PSC_ENABLE_BIT                  2
-#define ETH_PSC_ENABLE_MASK                 (1<<ETH_PSC_ENABLE_BIT)
-
-#define ETH_RGMII_ENABLE_BIT                3
-#define ETH_RGMII_ENABLE_MASK               (1<<ETH_RGMII_ENABLE_BIT)
-
-#define ETH_PORT_RESET_BIT                  4
-#define ETH_PORT_RESET_MASK                 (1<<ETH_PORT_RESET_BIT)
-
-#define ETH_INBAND_AUTO_NEG_ENABLE_BIT      6
-#define ETH_INBAND_AUTO_NEG_ENABLE_MASK     (1<<ETH_INBAND_AUTO_NEG_ENABLE_BIT)
-
-#define ETH_INBAND_AUTO_NEG_BYPASS_BIT      7
-#define ETH_INBAND_AUTO_NEG_BYPASS_MASK     (1<<ETH_INBAND_AUTO_NEG_BYPASS_BIT)
-
-#define ETH_INBAND_AUTO_NEG_START_BIT       8
-#define ETH_INBAND_AUTO_NEG_START_MASK      (1<<ETH_INBAND_AUTO_NEG_START_BIT)
-
-#define ETH_PORT_TYPE_BIT                   11
-#define ETH_PORT_TYPE_1000BasedX_MASK       (1<<ETH_PORT_TYPE_BIT)
-
-#define ETH_SGMII_MODE_BIT                  12
-#define ETH_1000BaseX_MODE_MASK             (0<<ETH_SGMII_MODE_BIT)
-#define ETH_SGMII_MODE_MASK                 (1<<ETH_SGMII_MODE_BIT)
-            
-#define ETH_MGMII_MODE_BIT                  13
-
-#define ETH_EN_MII_ODD_PRE_BIT		    22
-#define ETH_EN_MII_ODD_PRE_MASK		    (1<<ETH_EN_MII_ODD_PRE_BIT)
-
-/* BITs of SDMA Descriptor Command/Status field */
-#if defined(MV_CPU_BE)
-typedef struct _ethRxDesc
-{
-    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
-    MV_U16      bufSize    ;    /* Buffer size                      */
-    MV_U32      cmdSts     ;    /* Descriptor command status        */
-    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
-    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
-    MV_ULONG    returnInfo ;    /* User resource return information */
-} ETH_RX_DESC;
-
-typedef struct _ethTxDesc
-{
-    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
-    MV_U16      L4iChk     ;    /* CPU provided TCP Checksum        */
-    MV_U32      cmdSts     ;    /* Descriptor command status        */
-    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
-    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
-    MV_ULONG    returnInfo ;    /* User resource return information */
-    MV_U8*      alignBufPtr;    /* Pointer to 8 byte aligned buffer */
-} ETH_TX_DESC;
-
-#elif defined(MV_CPU_LE)
-
-typedef struct _ethRxDesc
-{
-    MV_U32      cmdSts     ;    /* Descriptor command status        */
-    MV_U16      bufSize    ;    /* Buffer size                      */
-    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
-    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
-    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
-    MV_ULONG    returnInfo ;    /* User resource return information */
-} ETH_RX_DESC;
-
-typedef struct _ethTxDesc
-{
-    MV_U32      cmdSts     ;    /* Descriptor command status        */
-    MV_U16      L4iChk     ;    /* CPU provided TCP Checksum        */
-    MV_U16      byteCnt    ;    /* Descriptor buffer byte count     */
-    MV_U32      bufPtr     ;    /* Descriptor buffer pointer        */
-    MV_U32      nextDescPtr;    /* Next descriptor pointer          */
-    MV_ULONG    returnInfo ;    /* User resource return information */
-    MV_U8*      alignBufPtr;    /* Pointer to 32 byte aligned buffer */
-} ETH_TX_DESC;
-
-#else
-#error "MV_CPU_BE or MV_CPU_LE must be defined"
-#endif /* MV_CPU_BE || MV_CPU_LE */
-
-/* Buffer offset from buffer pointer */
-#define ETH_RX_BUF_OFFSET               0x2
-
-
-/* Tx & Rx descriptor bits */
-#define ETH_ERROR_SUMMARY_BIT               0
-#define ETH_ERROR_SUMMARY_MASK              (1<<ETH_ERROR_SUMMARY_BIT)
-
-#define ETH_BUFFER_OWNER_BIT                31             
-#define ETH_BUFFER_OWNED_BY_DMA             (1<<ETH_BUFFER_OWNER_BIT)
-#define ETH_BUFFER_OWNED_BY_HOST            (0<<ETH_BUFFER_OWNER_BIT)
-
-/* Tx descriptor bits */
-#define ETH_TX_ERROR_CODE_OFFSET            1
-#define ETH_TX_ERROR_CODE_MASK              (3<<ETH_TX_ERROR_CODE_OFFSET)
-#define ETH_TX_LATE_COLLISION_ERROR         (0<<ETH_TX_ERROR_CODE_OFFSET)
-#define ETH_TX_UNDERRUN_ERROR               (1<<ETH_TX_ERROR_CODE_OFFSET)
-#define ETH_TX_EXCESSIVE_COLLISION_ERROR    (2<<ETH_TX_ERROR_CODE_OFFSET)
-
-#define ETH_TX_LLC_SNAP_FORMAT_BIT          9
-#define ETH_TX_LLC_SNAP_FORMAT_MASK         (1<<ETH_TX_LLC_SNAP_FORMAT_BIT)
-
-#define ETH_TX_IP_FRAG_BIT                  10
-#define ETH_TX_IP_FRAG_MASK                 (1<<ETH_TX_IP_FRAG_BIT)
-#define ETH_TX_IP_FRAG                      (0<<ETH_TX_IP_FRAG_BIT)
-#define ETH_TX_IP_NO_FRAG                   (1<<ETH_TX_IP_FRAG_BIT)
-
-#define ETH_TX_IP_HEADER_LEN_OFFSET         11
-#define ETH_TX_IP_HEADER_LEN_ALL_MASK       (0xF<<ETH_TX_IP_HEADER_LEN_OFFSET)
-#define ETH_TX_IP_HEADER_LEN_MASK(len)      ((len)<<ETH_TX_IP_HEADER_LEN_OFFSET)
-
-#define ETH_TX_VLAN_TAGGED_FRAME_BIT        15
-#define ETH_TX_VLAN_TAGGED_FRAME_MASK       (1<<ETH_TX_VLAN_TAGGED_FRAME_BIT)
-
-#define ETH_TX_L4_TYPE_BIT                  16
-#define ETH_TX_L4_TCP_TYPE                  (0<<ETH_TX_L4_TYPE_BIT)
-#define ETH_TX_L4_UDP_TYPE                  (1<<ETH_TX_L4_TYPE_BIT)
-
-#define ETH_TX_GENERATE_L4_CHKSUM_BIT       17
-#define ETH_TX_GENERATE_L4_CHKSUM_MASK      (1<<ETH_TX_GENERATE_L4_CHKSUM_BIT)
-
-#define ETH_TX_GENERATE_IP_CHKSUM_BIT       18
-#define ETH_TX_GENERATE_IP_CHKSUM_MASK      (1<<ETH_TX_GENERATE_IP_CHKSUM_BIT)
-
-#define ETH_TX_ZERO_PADDING_BIT             19
-#define ETH_TX_ZERO_PADDING_MASK            (1<<ETH_TX_ZERO_PADDING_BIT)
-
-#define ETH_TX_LAST_DESC_BIT                20
-#define ETH_TX_LAST_DESC_MASK               (1<<ETH_TX_LAST_DESC_BIT)
-
-#define ETH_TX_FIRST_DESC_BIT               21
-#define ETH_TX_FIRST_DESC_MASK              (1<<ETH_TX_FIRST_DESC_BIT)
-
-#define ETH_TX_GENERATE_CRC_BIT             22
-#define ETH_TX_GENERATE_CRC_MASK            (1<<ETH_TX_GENERATE_CRC_BIT)
-
-#define ETH_TX_ENABLE_INTERRUPT_BIT         23
-#define ETH_TX_ENABLE_INTERRUPT_MASK        (1<<ETH_TX_ENABLE_INTERRUPT_BIT)
-
-#define ETH_TX_AUTO_MODE_BIT                30
-#define ETH_TX_AUTO_MODE_MASK               (1<<ETH_TX_AUTO_MODE_BIT)
-
-
-/* Rx descriptor bits */
-#define ETH_RX_ERROR_CODE_OFFSET            1
-#define ETH_RX_ERROR_CODE_MASK              (3<<ETH_RX_ERROR_CODE_OFFSET)
-#define ETH_RX_CRC_ERROR                    (0<<ETH_RX_ERROR_CODE_OFFSET)
-#define ETH_RX_OVERRUN_ERROR                (1<<ETH_RX_ERROR_CODE_OFFSET)
-#define ETH_RX_MAX_FRAME_LEN_ERROR          (2<<ETH_RX_ERROR_CODE_OFFSET)
-#define ETH_RX_RESOURCE_ERROR               (3<<ETH_RX_ERROR_CODE_OFFSET)
-
-#define ETH_RX_L4_CHECKSUM_OFFSET           3
-#define ETH_RX_L4_CHECKSUM_MASK             (0xffff<<ETH_RX_L4_CHECKSUM_OFFSET)
-
-#define ETH_RX_VLAN_TAGGED_FRAME_BIT        19
-#define ETH_RX_VLAN_TAGGED_FRAME_MASK       (1<<ETH_RX_VLAN_TAGGED_FRAME_BIT)
-
-#define ETH_RX_BPDU_FRAME_BIT               20
-#define ETH_RX_BPDU_FRAME_MASK              (1<<ETH_RX_BPDU_FRAME_BIT)
-
-#define ETH_RX_L4_TYPE_OFFSET               21
-#define ETH_RX_L4_TYPE_MASK                 (3<<ETH_RX_L4_TYPE_OFFSET)
-#define ETH_RX_L4_TCP_TYPE                  (0<<ETH_RX_L4_TYPE_OFFSET)
-#define ETH_RX_L4_UDP_TYPE                  (1<<ETH_RX_L4_TYPE_OFFSET)
-#define ETH_RX_L4_OTHER_TYPE                (2<<ETH_RX_L4_TYPE_OFFSET)
-
-#define ETH_RX_NOT_LLC_SNAP_FORMAT_BIT      23
-#define ETH_RX_NOT_LLC_SNAP_FORMAT_MASK     (1<<ETH_RX_NOT_LLC_SNAP_FORMAT_BIT)
-
-#define ETH_RX_IP_FRAME_TYPE_BIT            24
-#define ETH_RX_IP_FRAME_TYPE_MASK           (1<<ETH_RX_IP_FRAME_TYPE_BIT)
-
-#define ETH_RX_IP_HEADER_OK_BIT             25
-#define ETH_RX_IP_HEADER_OK_MASK            (1<<ETH_RX_IP_HEADER_OK_BIT)
-
-#define ETH_RX_LAST_DESC_BIT                26
-#define ETH_RX_LAST_DESC_MASK               (1<<ETH_RX_LAST_DESC_BIT)
-
-#define ETH_RX_FIRST_DESC_BIT               27
-#define ETH_RX_FIRST_DESC_MASK              (1<<ETH_RX_FIRST_DESC_BIT)
-
-#define ETH_RX_UNKNOWN_DA_BIT               28
-#define ETH_RX_UNKNOWN_DA_MASK              (1<<ETH_RX_UNKNOWN_DA_BIT)
-
-#define ETH_RX_ENABLE_INTERRUPT_BIT         29
-#define ETH_RX_ENABLE_INTERRUPT_MASK        (1<<ETH_RX_ENABLE_INTERRUPT_BIT)
-
-#define ETH_RX_L4_CHECKSUM_OK_BIT           30
-#define ETH_RX_L4_CHECKSUM_OK_MASK          (1<<ETH_RX_L4_CHECKSUM_OK_BIT)
-
-/* Rx descriptor bufSize field */
-#define ETH_RX_IP_FRAGMENTED_FRAME_BIT      2
-#define ETH_RX_IP_FRAGMENTED_FRAME_MASK     (1<<ETH_RX_IP_FRAGMENTED_FRAME_BIT)
-
-#define ETH_RX_BUFFER_MASK                  0xFFF8
-
-
-/* Ethernet Cause Register BITs */
-#define ETH_CAUSE_RX_READY_SUM_BIT          0
-#define ETH_CAUSE_EXTEND_BIT                1
-
-#define ETH_CAUSE_RX_READY_OFFSET           2
-#define ETH_CAUSE_RX_READY_BIT(queue)       (ETH_CAUSE_RX_READY_OFFSET + (queue))
-#define ETH_CAUSE_RX_READY_MASK(queue)      (1 << (ETH_CAUSE_RX_READY_BIT(queue))) 
-
-#define ETH_CAUSE_RX_ERROR_SUM_BIT          10
-#define ETH_CAUSE_RX_ERROR_OFFSET           11
-#define ETH_CAUSE_RX_ERROR_BIT(queue)       (ETH_CAUSE_RX_ERROR_OFFSET + (queue))
-#define ETH_CAUSE_RX_ERROR_MASK(queue)      (1 << (ETH_CAUSE_RX_ERROR_BIT(queue))) 
-
-#define ETH_CAUSE_TX_END_BIT                19
-#define ETH_CAUSE_SUM_BIT                   31
-
-/* Ethernet Cause Extended Register BITs */
-#define ETH_CAUSE_TX_BUF_OFFSET             0
-#define ETH_CAUSE_TX_BUF_BIT(queue)         (ETH_CAUSE_TX_BUF_OFFSET + (queue))
-#define ETH_CAUSE_TX_BUF_MASK(queue)        (1 << (ETH_CAUSE_TX_BUF_BIT(queue)))
-         
-#define ETH_CAUSE_TX_ERROR_OFFSET           8
-#define ETH_CAUSE_TX_ERROR_BIT(queue)       (ETH_CAUSE_TX_ERROR_OFFSET + (queue))
-#define ETH_CAUSE_TX_ERROR_MASK(queue)      (1 << (ETH_CAUSE_TX_ERROR_BIT(queue)))
-
-#define ETH_CAUSE_PHY_STATUS_CHANGE_BIT     16
-#define ETH_CAUSE_RX_OVERRUN_BIT            18          
-#define ETH_CAUSE_TX_UNDERRUN_BIT           19
-#define ETH_CAUSE_LINK_STATE_CHANGE_BIT     20
-#define ETH_CAUSE_INTERNAL_ADDR_ERR_BIT     23
-#define ETH_CAUSE_EXTEND_SUM_BIT            31
-
-/* Marvell Header Register */
-/* Marvell Header register bits */
-#define ETH_MVHDR_EN_BIT                    0
-#define ETH_MVHDR_EN_MASK                   (1 << ETH_MVHDR_EN_BIT)
-
-#define ETH_MVHDR_DAPREFIX_BIT              1
-#define ETH_MVHDR_DAPREFIX_MASK             (0x3 << ETH_MVHDR_DAPREFIX_BIT)
-#define ETH_MVHDR_DAPREFIX_PRI_1_2          (0x1 << ETH_MVHDR_DAPREFIX_BIT)
-#define ETH_MVHDR_DAPREFIX_DBNUM_PRI        (0x2 << ETH_MVHDR_DAPREFIX_BIT)
-#define ETH_MVHDR_DAPREFIX_SPID_PRI         (0x3 << ETH_MVHDR_DAPREFIX_BIT)
-
-#define ETH_MVHDR_MHMASK_BIT                8
-#define ETH_MVHDR_MHMASK_MASK               (0x3 << ETH_MVHDR_MHMASK_BIT)
-#define ETH_MVHDR_MHMASK_8_QUEUE            (0x0 << ETH_MVHDR_MHMASK_BIT)
-#define ETH_MVHDR_MHMASK_4_QUEUE            (0x1 << ETH_MVHDR_MHMASK_BIT)
-#define ETH_MVHDR_MHMASK_2_QUEUE            (0x3 << ETH_MVHDR_MHMASK_BIT)
-
-
-/* Relevant for 6183 ONLY */
-#define ETH_UNIT_PORTS_PADS_CALIB_0_REG     (MV_ETH_REG_BASE(0) + 0x0A0)
-#define ETH_UNIT_PORTS_PADS_CALIB_1_REG     (MV_ETH_REG_BASE(0) + 0x0A4)
-#define ETH_UNIT_PORTS_PADS_CALIB_2_REG     (MV_ETH_REG_BASE(0) + 0x0A8)
-/* Ethernet Unit Ports Pads Calibration_REG (ETH_UNIT_PORTS_PADS_CALIB_x_REG)  */
-#define ETH_ETHERNET_PAD_CLIB_DRVN_OFFS		0
-#define ETH_ETHERNET_PAD_CLIB_DRVN_MASK		(0x1F << ETH_ETHERNET_PAD_CLIB_DRVN_OFFS)
-
-#define ETH_ETHERNET_PAD_CLIB_DRVP_OFFS         5                      
-#define ETH_ETHERNET_PAD_CLIB_DRVP_MASK         (0x1F << ETH_ETHERNET_PAD_CLIB_DRVP_OFFS)
- 
-#define ETH_ETHERNET_PAD_CLIB_TUNEEN_OFFS       16                      
-#define ETH_ETHERNET_PAD_CLIB_TUNEEN_MASK       (0x1 << ETH_ETHERNET_PAD_CLIB_TUNEEN_OFFS) 
-
-#define ETH_ETHERNET_PAD_CLIB_LOCKN_OFFS        17                   
-#define ETH_ETHERNET_PAD_CLIB_LOCKN_MASK        (0x1F << ETH_ETHERNET_PAD_CLIB_LOCKN_OFFS) 
-
-#define ETH_ETHERNET_PAD_CLIB_OFFST_OFFS        24                   
-#define ETH_ETHERNET_PAD_CLIB_OFFST_MASK        (0x1F << ETH_ETHERNET_PAD_CLIB_OFFST_OFFS) 
-
-#define ETH_ETHERNET_PAD_CLIB_WR_EN_OFFS        31                   
-#define ETH_ETHERNET_PAD_CLIB_WR_EN_MASK        (0x1  << ETH_ETHERNET_PAD_CLIB_WR_EN_OFFS) 
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvEthRegsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h
deleted file mode 100644
index c42ed1a657..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/eth/mvEth.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/*******************************************************************************
-* mvEth.h - Header File for : Ethernet Controller 
-*
-* DESCRIPTION:
-*       This header file contains macros typedefs and function declaration for
-*       Marvell Gigabit Ethernet Controllers.
-*
-* DEPENDENCIES:
-*       None.
-*
-*******************************************************************************/
-
-#ifndef __mvEth_h__
-#define __mvEth_h__
-
-/* includes */
-#include "mvTypes.h"
-#include "mv802_3.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-#include "eth/gbe/mvEthRegs.h"
-#include "mvSysHwConfig.h"
-
-/* defines  */
-
-#define MV_ETH_EXTRA_FRAGS_NUM      2
-
-
-typedef enum
-{
-    MV_ETH_SPEED_AN,
-    MV_ETH_SPEED_10,
-    MV_ETH_SPEED_100,
-    MV_ETH_SPEED_1000
-    
-} MV_ETH_PORT_SPEED;
-
-typedef enum
-{
-    MV_ETH_DUPLEX_AN,
-    MV_ETH_DUPLEX_HALF,
-    MV_ETH_DUPLEX_FULL
-    
-} MV_ETH_PORT_DUPLEX;
-
-typedef enum
-{
-    MV_ETH_FC_AN_ADV_DIS,
-    MV_ETH_FC_AN_ADV_SYM,
-    MV_ETH_FC_DISABLE,
-    MV_ETH_FC_ENABLE
-
-} MV_ETH_PORT_FC;
-
-typedef enum
-{
-    MV_ETH_PRIO_FIXED = 0,  /* Fixed priority mode */
-    MV_ETH_PRIO_WRR   = 1   /* Weighted round robin priority mode */    
-} MV_ETH_PRIO_MODE;
-
-/* Ethernet port specific infomation */
-typedef struct
-{
-    int     maxRxPktSize;
-    int     rxDefQ;
-    int     rxBpduQ;
-    int     rxArpQ;
-    int     rxTcpQ;
-    int     rxUdpQ;
-    int     ejpMode;
-} MV_ETH_PORT_CFG;
-
-typedef struct
-{
-    int     descrNum;
-} MV_ETH_RX_Q_CFG;
-
-typedef struct
-{
-    int         descrNum;
-    MV_ETH_PRIO_MODE    prioMode;
-    int         quota;
-} MV_ETH_TX_Q_CFG;
-
-typedef struct
-{
-    int     maxRxPktSize;
-    int     rxDefQ;
-    int     txDescrNum[MV_ETH_TX_Q_NUM];
-    int     rxDescrNum[MV_ETH_RX_Q_NUM];
-    void    *osHandle;
-} MV_ETH_PORT_INIT;
-
-typedef struct
-{
-    MV_BOOL             isLinkUp;
-    MV_ETH_PORT_SPEED   speed;
-    MV_ETH_PORT_DUPLEX  duplex;
-    MV_ETH_PORT_FC      flowControl;
-
-} MV_ETH_PORT_STATUS;
-
-typedef enum
-{
-	MV_ETH_DISABLE_HEADER_MODE = 0, 
-	MV_ETH_ENABLE_HEADER_MODE_PRI_2_1 = 1, 
-	MV_ETH_ENABLE_HEADER_MODE_PRI_DBNUM = 2, 
-	MV_ETH_ENABLE_HEADER_MODE_PRI_SPID = 3
-} MV_ETH_HEADER_MODE;
-
-
-/* ethernet.h API list */
-void        mvEthHalInit(void);
-void        mvEthMemAttrGet(MV_BOOL* pIsSram, MV_BOOL* pIsSwCoher);
-
-/* Port Initalization routines */
-void*       mvEthPortInit (int port, MV_ETH_PORT_INIT *pPortInit);
-void        ethResetTxDescRing(void* pPortHndl, int queue);
-void        ethResetRxDescRing(void* pPortHndl, int queue);
-
-void*       mvEthPortHndlGet(int port);
-
-void        mvEthPortFinish(void* pEthPortHndl);
-MV_STATUS   mvEthPortDown(void* pEthPortHndl);
-MV_STATUS   mvEthPortDisable(void* pEthPortHndl);
-MV_STATUS   mvEthPortUp(void* pEthPortHndl);
-MV_STATUS   mvEthPortEnable(void* pEthPortHndl);
-
-/* Port data flow routines */
-MV_PKT_INFO *mvEthPortForceTxDone(void* pEthPortHndl, int txQueue);
-MV_PKT_INFO *mvEthPortForceRx(void* pEthPortHndl, int rxQueue);
-
-/* Port Configuration routines */
-MV_STATUS   mvEthDefaultsSet(void* pEthPortHndl);
-MV_STATUS   mvEthMaxRxSizeSet(void* pPortHndl, int maxRxSize);
-
-/* Port RX MAC Filtering control routines */
-MV_U8       mvEthMcastCrc8Get(MV_U8* pAddr);
-MV_STATUS   mvEthRxFilterModeSet(void* pPortHndl, MV_BOOL isPromisc);
-MV_STATUS   mvEthMacAddrSet(void* pPortHandle, MV_U8* pMacAddr, int queue);
-MV_STATUS   mvEthMcastAddrSet(void* pPortHandle, MV_U8 *pAddr, int queue);
-
-/* MIB Counters APIs */
-MV_U32      mvEthMibCounterRead(void* pPortHndl, unsigned int mibOffset, 
-                               MV_U32* pHigh32);
-void        mvEthMibCountersClear(void* pPortHandle);
-
-/* TX Scheduling configuration routines */
-MV_STATUS   mvEthTxQueueConfig(void* pPortHandle, int txQueue,                          
-                               MV_ETH_PRIO_MODE txPrioMode, int txQuota);
-
-/* RX Dispatching configuration routines */
-MV_STATUS   mvEthBpduRxQueue(void* pPortHandle, int bpduQueue);
-MV_STATUS   mvEthVlanPrioRxQueue(void* pPortHandle, int vlanPrio, int vlanPrioQueue);
-MV_STATUS   mvEthTosToRxqSet(void* pPortHandle, int tos, int rxq);
-int         mvEthTosToRxqGet(void* pPortHandle, int tos);
-
-/* Speed, Duplex, FlowControl routines */
-MV_STATUS   mvEthSpeedDuplexSet(void* pPortHandle, MV_ETH_PORT_SPEED speed, 
-                                                   MV_ETH_PORT_DUPLEX duplex);
-
-MV_STATUS   mvEthFlowCtrlSet(void* pPortHandle, MV_ETH_PORT_FC flowControl);
-
-#if (MV_ETH_VERSION >= 4)
-MV_STATUS   mvEthEjpModeSet(void* pPortHandle, int mode);
-#endif /* (MV_ETH_VERSION >= 4) */
-
-void        mvEthStatusGet(void* pPortHandle, MV_ETH_PORT_STATUS* pStatus);
-
-/* Marvell Header control               */
-MV_STATUS   mvEthHeaderModeSet(void* pPortHandle, MV_ETH_HEADER_MODE headerMode);
-
-/* PHY routines */
-void       mvEthPhyAddrSet(void* pPortHandle, int phyAddr);
-int        mvEthPhyAddrGet(void* pPortHandle);
-
-/* Power management routines */
-void        mvEthPortPowerDown(int port);
-void        mvEthPortPowerUp(int port);
-
-/******************** ETH PRIVATE ************************/
-
-/*#define UNCACHED_TX_BUFFERS*/
-/*#define UNCACHED_RX_BUFFERS*/
-
-
-/* Port attributes */
-/* Size of a Tx/Rx descriptor used in chain list data structure */
-#define ETH_RX_DESC_ALIGNED_SIZE        32
-#define ETH_TX_DESC_ALIGNED_SIZE        32
-
-#define TX_DISABLE_TIMEOUT_MSEC     1000
-#define RX_DISABLE_TIMEOUT_MSEC     1000
-#define TX_FIFO_EMPTY_TIMEOUT_MSEC  10000
-#define PORT_DISABLE_WAIT_TCLOCKS   5000
-
-/* Macros that save access to desc in order to find next desc pointer  */
-#define RX_NEXT_DESC_PTR(pRxDescr, pQueueCtrl)                              \
-        ((pRxDescr) == (pQueueCtrl)->pLastDescr) ?                          \
-               (ETH_RX_DESC*)((pQueueCtrl)->pFirstDescr) :                  \
-               (ETH_RX_DESC*)(((MV_ULONG)(pRxDescr)) + ETH_RX_DESC_ALIGNED_SIZE)
-
-#define TX_NEXT_DESC_PTR(pTxDescr, pQueueCtrl)                              \
-        ((pTxDescr) == (pQueueCtrl)->pLastDescr) ?                          \
-               (ETH_TX_DESC*)((pQueueCtrl)->pFirstDescr) :                  \
-               (ETH_TX_DESC*)(((MV_ULONG)(pTxDescr)) + ETH_TX_DESC_ALIGNED_SIZE)
-
-#define RX_PREV_DESC_PTR(pRxDescr, pQueueCtrl)                              \
-        ((pRxDescr) == (pQueueCtrl)->pFirstDescr) ?                          \
-               (ETH_RX_DESC*)((pQueueCtrl)->pLastDescr) :                  \
-               (ETH_RX_DESC*)(((MV_ULONG)(pRxDescr)) - ETH_RX_DESC_ALIGNED_SIZE)
-
-#define TX_PREV_DESC_PTR(pTxDescr, pQueueCtrl)                              \
-        ((pTxDescr) == (pQueueCtrl)->pFirstDescr) ?                          \
-               (ETH_TX_DESC*)((pQueueCtrl)->pLastDescr) :                  \
-               (ETH_TX_DESC*)(((MV_ULONG)(pTxDescr)) - ETH_TX_DESC_ALIGNED_SIZE)
-
-
-/* Queue specific information */
-typedef struct 
-{
-    void*       pFirstDescr;
-    void*       pLastDescr;
-    void*       pCurrentDescr;
-    void*       pUsedDescr;
-    int         resource;
-    MV_BUF_INFO descBuf;
-} ETH_QUEUE_CTRL;
-
-
-/* Ethernet port specific infomation */
-typedef struct _ethPortCtrl
-{
-    int             portNo;
-    ETH_QUEUE_CTRL  rxQueue[MV_ETH_RX_Q_NUM]; /* Rx ring resource  */
-    ETH_QUEUE_CTRL  txQueue[MV_ETH_TX_Q_NUM]; /* Tx ring resource  */
-
-    MV_ETH_PORT_CFG portConfig;
-    MV_ETH_RX_Q_CFG rxQueueConfig[MV_ETH_RX_Q_NUM];
-    MV_ETH_TX_Q_CFG txQueueConfig[MV_ETH_TX_Q_NUM];
-
-    /* Register images - For DP */
-    MV_U32          portTxQueueCmdReg;   /* Port active Tx queues summary    */
-    MV_U32          portRxQueueCmdReg;   /* Port active Rx queues summary    */
-
-    MV_STATE        portState;
-
-    MV_U8           mcastCount[256];
-    MV_U32*         hashPtr;
-    void 	    *osHandle;
-} ETH_PORT_CTRL; 
-
-/************** MACROs ****************/
-
-/* MACROs to Flush / Invalidate TX / RX Buffers */
-#if (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) && !defined(UNCACHED_TX_BUFFERS)
-#   define ETH_PACKET_CACHE_FLUSH(pAddr, size)                                  \
-        mvOsCacheClear(NULL, (pAddr), (size));                                  \
-        /*CPU_PIPE_FLUSH;*/
-#else
-#   define ETH_PACKET_CACHE_FLUSH(pAddr, size)                                  \
-        mvOsIoVirtToPhy(NULL, (pAddr));
-#endif /* ETHER_DRAM_COHER == MV_CACHE_COHER_SW */
-
-#if ( (ETHER_DRAM_COHER == MV_CACHE_COHER_SW) && !defined(UNCACHED_RX_BUFFERS) )
-#   define ETH_PACKET_CACHE_INVALIDATE(pAddr, size)                             \
-        mvOsCacheInvalidate (NULL, (pAddr), (size));                            \
-        /*CPU_PIPE_FLUSH;*/
-#else
-#   define ETH_PACKET_CACHE_INVALIDATE(pAddr, size)    
-#endif /* ETHER_DRAM_COHER == MV_CACHE_COHER_SW && !UNCACHED_RX_BUFFERS */
-
-#ifdef ETH_DESCR_UNCACHED
-
-#define ETH_DESCR_FLUSH_INV(pPortCtrl, pDescr)
-#define ETH_DESCR_INV(pPortCtrl, pDescr)
-
-#else
-
-#define ETH_DESCR_FLUSH_INV(pPortCtrl, pDescr)      \
-        mvOsCacheLineFlushInv(pPortCtrl->osHandle, (MV_ULONG)(pDescr))
-
-#define ETH_DESCR_INV(pPortCtrl, pDescr)            \
-        mvOsCacheLineInv(pPortCtrl->osHandle, (MV_ULONG)(pDescr))
-
-#endif /* ETH_DESCR_UNCACHED */
-
-#include "eth/gbe/mvEthGbe.h"
-
-#endif /* __mvEth_h__ */
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c
deleted file mode 100644
index 889d4d9e9e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "gpp/mvGpp.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-
-static MV_VOID gppRegSet(MV_U32 group, MV_U32 regOffs,MV_U32 mask,MV_U32 value);
-
-/*******************************************************************************
-* mvGppTypeSet - Enable a GPP (OUT) pin
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the type
-*               of corresponding GPP will be set. Other GPPs are ignored.
-*       value - 32bit value that describes GPP type per pin.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Set GPP8 to input and GPP15 to output.
-*       mvGppTypeSet(0, (GPP8 | GPP15), 
-*                    ((MV_GPP_IN & GPP8) | (MV_GPP_OUT & GPP15)) );
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvGppTypeSet(MV_U32 group, MV_U32 mask, MV_U32 value)
-{
-	if (group >= MV_GPP_MAX_GROUP)
-	{
-		DB(mvOsPrintf("mvGppTypeSet: ERR. invalid group number \n"));
-		return MV_BAD_PARAM;
-	}
-
-	gppRegSet(group, GPP_DATA_OUT_EN_REG(group), mask, value);
-
-    /* Workaround for Erratum FE-MISC-70*/
-    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV && (group == 1))
-    {
-        mask &= 0x2;
-        gppRegSet(0, GPP_DATA_OUT_EN_REG(0), mask, value);
-    } /*End of WA*/
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvGppBlinkEn - Set a GPP (IN) Pin list to blink every ~100ms
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the type
-*               of corresponding GPP will be set. Other GPPs are ignored.
-*       value - 32bit value that describes GPP blink per pin.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Set GPP8 to be static and GPP15 to be blinking.
-*       mvGppBlinkEn(0, (GPP8 | GPP15), 
-*                    ((MV_GPP_OUT_STATIC & GPP8) | (MV_GPP_OUT_BLINK & GPP15)) );
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvGppBlinkEn(MV_U32 group, MV_U32 mask, MV_U32 value)
-{
-	if (group >= MV_GPP_MAX_GROUP)
-	{
-		DB(mvOsPrintf("mvGppBlinkEn: ERR. invalid group number \n"));
-		return MV_BAD_PARAM;
-	}
-
-	gppRegSet(group, GPP_BLINK_EN_REG(group), mask, value);
-
-	return MV_OK;
-
-}
-/*******************************************************************************
-* mvGppPolaritySet - Set a GPP (IN) Pin list Polarity mode
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the type
-*               of corresponding GPP will be set. Other GPPs are ignored.
-*       value - 32bit value that describes GPP polarity per pin.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Set GPP8 to the actual pin value and GPP15 to be inverted.
-*       mvGppPolaritySet(0, (GPP8 | GPP15), 
-*                    ((MV_GPP_IN_ORIGIN & GPP8) | (MV_GPP_IN_INVERT & GPP15)) );
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvGppPolaritySet(MV_U32 group, MV_U32 mask, MV_U32 value)
-{
-	if (group >= MV_GPP_MAX_GROUP)
-	{
-		DB(mvOsPrintf("mvGppPolaritySet: ERR. invalid group number \n"));
-		return MV_BAD_PARAM;
-	}
-
-	gppRegSet(group, GPP_DATA_IN_POL_REG(group), mask, value);
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvGppPolarityGet - Get a value of relevant bits from GPP Polarity register.
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the 
-*               returned value is valid for it.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Get GPP8 and GPP15 value.
-*       mvGppPolarityGet(0, (GPP8 | GPP15));
-*
-* RETURN:
-*       32bit value that describes GPP polatity mode per pin.
-*
-*******************************************************************************/
-MV_U32  mvGppPolarityGet(MV_U32 group, MV_U32 mask)
-{
-    MV_U32  regVal;
-
-  	if (group >= MV_GPP_MAX_GROUP)
-	{
-		DB(mvOsPrintf("mvGppActiveSet: Error invalid group number \n"));
-		return MV_ERROR;
-	}
-    regVal = MV_REG_READ(GPP_DATA_IN_POL_REG(group));
-    
-    return (regVal & mask);
-}
-
-/*******************************************************************************
-* mvGppValueGet - Get a GPP Pin list value.
-*
-* DESCRIPTION:
-*       This function get GPP value.
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the 
-*               returned value is valid for it.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Get GPP8 and GPP15 value.
-*       mvGppValueGet(0, (GPP8 | GPP15));
-*
-* RETURN:
-*       32bit value that describes GPP activity mode per pin.
-*
-*******************************************************************************/
-MV_U32 mvGppValueGet(MV_U32 group, MV_U32 mask)
-{
-	MV_U32 gppData;
-
-	gppData = MV_REG_READ(GPP_DATA_IN_REG(group));
-
-	gppData &= mask;
-
-	return gppData;
-
-}
-
-/*******************************************************************************
-* mvGppValueSet - Set a GPP Pin list value.
-*
-* DESCRIPTION:
-*       This function set value for given GPP pin list.
-*
-* INPUT:
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the 
-*               value of corresponding GPP will be set accordingly. Other GPP 
-*               are not affected.
-*       value - 32bit value that describes GPP value per pin.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Set GPP8 value of '0' and GPP15 value of '1'.
-*       mvGppActiveSet(0, (GPP8 | GPP15), ((0 & GPP8) | (GPP15)) );
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvGppValueSet (MV_U32 group, MV_U32 mask, MV_U32 value)
-{
-	MV_U32 outEnable, tmp;
-	MV_U32 i;
-
-	if (group >= MV_GPP_MAX_GROUP)
-	{
-		DB(mvOsPrintf("mvGppValueSet: Error invalid group number \n"));
-		return MV_BAD_PARAM;
-	}
-
-	/* verify that the gpp pin is configured as output 		*/
-	/* Note that in the register out enabled -> bit = '0'. 	*/
-	outEnable = ~MV_REG_READ(GPP_DATA_OUT_EN_REG(group));
-
-    /* Workaround for Erratum FE-MISC-70*/
-    if(mvCtrlRevGet()==MV_88F6XXX_A0_REV && (group == 1))
-    {
-        tmp = ~MV_REG_READ(GPP_DATA_OUT_EN_REG(0));
-        outEnable &= 0xfffffffd;
-        outEnable |= (tmp & 0x2);
-    } /*End of WA*/
-
-	for (i = 0 ; i < 32 ;i++)
-	{
-		if (((mask & (1 << i)) & (outEnable & (1 << i))) != (mask & (1 << i)))
-		{
-			mvOsPrintf("mvGppValueSet: Err. An attempt to set output "\
-					   "value to GPP %d in input mode.\n", i);
-			return MV_ERROR;
-		}
-	}
-
-	gppRegSet(group, GPP_DATA_OUT_REG(group), mask, value);
-
-	return MV_OK;
-
-}
-/*******************************************************************************
-* gppRegSet - Set a specific GPP pin on a specific GPP register
-*
-* DESCRIPTION:
-*       This function set a specific GPP pin on a specific GPP register
-*
-* INPUT:
-*		regOffs - GPP Register offset 
-*       group - GPP group number
-*       mask  - 32bit mask value. Each set bit in the mask means that the 
-*               value of corresponding GPP will be set accordingly. Other GPP 
-*               are not affected.
-*       value - 32bit value that describes GPP value per pin.
-*
-* OUTPUT:
-*       None.
-*
-* EXAMPLE:
-*       Set GPP8 value of '0' and GPP15 value of '1'.
-*       mvGppActiveSet(0, (GPP8 | GPP15), ((0 & GPP8) | (1 & GPP15)) );
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-static MV_VOID gppRegSet (MV_U32 group, MV_U32 regOffs,MV_U32 mask,MV_U32 value)
-{
-	MV_U32 gppData;
-
-	gppData = MV_REG_READ(regOffs);
-
-	gppData &= ~mask;
-
-	gppData |= (value & mask);
-
-	MV_REG_WRITE(regOffs, gppData);
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h
deleted file mode 100644
index 526d324fd3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGpp.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvGppH
-#define __INCmvGppH
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "gpp/mvGppRegs.h"
-
-/* These macros describes the GPP type. Each of the GPPs pins can        	*/
-/* be assigned to act as a general purpose input or output pin.             */
-#define	MV_GPP_IN	0xFFFFFFFF      			/* GPP input   */
-#define MV_GPP_OUT  0    						/* GPP output  */
-
-
-/* These macros describes the GPP Out Enable. */
-#define	MV_GPP_OUT_DIS	0xFFFFFFFF         	/* Out pin disabled*/
-#define MV_GPP_OUT_EN   0    			 	/* Out pin enabled*/
-
-/* These macros describes the GPP Out Blinking. */
-/* When set and the corresponding bit in GPIO Data Out Enable Control 		*/
-/* Register is enabled, the GPIO pin blinks every ~100 ms (a period of		*/
-/* 2^24 TCLK clocks).														*/
-#define	MV_GPP_OUT_BLINK	0xFFFFFFFF         	/* Out pin blinking*/
-#define MV_GPP_OUT_STATIC   0    			 	/* Out pin static*/
-
-
-/* These macros describes the GPP Polarity. */
-/* When set to 1 GPIO Data In Register reflects the inverted value of the	*/
-/* corresponding pin.														*/
-
-#define	MV_GPP_IN_INVERT	0xFFFFFFFF         	/* Inverted value is got*/
-#define MV_GPP_IN_ORIGIN    0    			 	/* original value is got*/
-
-/* mvGppTypeSet - Set PP pin mode (IN or OUT) */
-MV_STATUS mvGppTypeSet(MV_U32 group, MV_U32 mask, MV_U32 value);
-
-/* mvGppBlinkEn - Set a GPP (IN) Pin list to blink every ~100ms */
-MV_STATUS mvGppBlinkEn(MV_U32 group, MV_U32 mask, MV_U32 value);
-
-/* mvGppPolaritySet - Set a GPP (IN) Pin list Polarity mode. */
-MV_STATUS mvGppPolaritySet(MV_U32 group, MV_U32 mask, MV_U32 value);
-
-/* mvGppPolarityGet - Get the Polarity of a GPP Pin */
-MV_U32  mvGppPolarityGet(MV_U32 group, MV_U32 mask);
-
-/* mvGppValueGet - Get a GPP Pin list value.*/
-MV_U32 mvGppValueGet(MV_U32 group, MV_U32 mask);
-
-
-/* mvGppValueSet - Set a GPP Pin list value. */
-MV_STATUS mvGppValueSet (MV_U32 group, MV_U32 mask, MV_U32 value);
-
-#endif /* #ifndef __INCmvGppH */ 
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h
deleted file mode 100644
index b6fec34fa8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/gpp/mvGppRegs.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvGppRegsH
-#define __INCmvGppRegsH
-
-#define    MV_GPP0  BIT0
-#define    MV_GPP1  BIT1
-#define    MV_GPP2  BIT2
-#define    MV_GPP3  BIT3
-#define    MV_GPP4  BIT4
-#define    MV_GPP5  BIT5
-#define    MV_GPP6  BIT6
-#define    MV_GPP7  BIT7
-#define    MV_GPP8  BIT8
-#define    MV_GPP9  BIT9
-#define    MV_GPP10 BIT10
-#define    MV_GPP11 BIT11
-#define    MV_GPP12 BIT12
-#define    MV_GPP13 BIT13
-#define    MV_GPP14 BIT14
-#define    MV_GPP15 BIT15
-#define    MV_GPP16 BIT16
-#define    MV_GPP17 BIT17
-#define    MV_GPP18 BIT18
-#define    MV_GPP19 BIT19
-#define    MV_GPP20 BIT20
-#define    MV_GPP21 BIT21
-#define    MV_GPP22 BIT22
-#define    MV_GPP23 BIT23
-#define    MV_GPP24 BIT24
-#define    MV_GPP25 BIT25
-#define    MV_GPP26 BIT26
-#define    MV_GPP27 BIT27
-#define    MV_GPP28 BIT28
-#define    MV_GPP29 BIT29
-#define    MV_GPP30 BIT30
-#define    MV_GPP31 BIT31
-
-
-/* registers offsets */
-   
-#define GPP_DATA_OUT_REG(grp)			((grp == 0) ? 0x10100 : 0x10140)
-#define GPP_DATA_OUT_EN_REG(grp)		((grp == 0) ? 0x10104 : 0x10144)
-#define GPP_BLINK_EN_REG(grp)			((grp == 0) ? 0x10108 : 0x10148)
-#define GPP_DATA_IN_POL_REG(grp)		((grp == 0) ? 0x1010C : 0x1014c)
-#define GPP_DATA_IN_REG(grp)			((grp == 0) ? 0x10110 : 0x10150)
-#define GPP_INT_CAUSE_REG(grp)			((grp == 0) ? 0x10114 : 0x10154)
-#define GPP_INT_MASK_REG(grp)			((grp == 0) ? 0x10118 : 0x10158)
-#define GPP_INT_LVL_REG(grp)			((grp == 0) ? 0x1011c : 0x1015c)
-
-#define GPP_DATA_OUT_SET_REG			0x10120
-#define GPP_DATA_OUT_CLEAR_REG			0x10124
-
-#endif /* #ifndef __INCmvGppRegsH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c
deleted file mode 100644
index 672d3e31f8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvPciIf.h"
-#include "ctrlEnv/sys/mvSysPex.h"
-
-#if defined(MV_INCLUDE_PCI)
-#include "ctrlEnv/sys/mvSysPci.h"
-#endif
-
-
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-					 
-
-/*******************************************************************************
-* mvPciInit - Initialize PCI interfaces
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
-*
-*******************************************************************************/
-
-
-MV_STATUS mvPciIfInit(MV_U32 pciIf, PCI_IF_MODE pciIfmode)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		
-        MV_PCI_MOD pciMod;
-		
-        if (PCI_IF_MODE_HOST == pciIfmode)
-        {
-            pciMod = MV_PCI_MOD_HOST;
-        }
-        else if (PCI_IF_MODE_DEVICE == pciIfmode)
-        {
-            pciMod = MV_PCI_MOD_DEVICE;
-        }
-        else
-        {
-            mvOsPrintf("%s: ERROR!!! Bus %d mode %d neither host nor device!\n", 
-                        __FUNCTION__, pciIf, pciIfmode);
-            return MV_FAIL;
-        }
-        
-        return mvPciInit(pciIf - MV_PCI_START_IF, pciMod);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		
-        MV_PEX_TYPE pexType;
-		
-        if (PCI_IF_MODE_HOST == pciIfmode)
-        {
-            pexType = MV_PEX_ROOT_COMPLEX;
-        }
-        else if (PCI_IF_MODE_DEVICE == pciIfmode)
-        {
-            pexType = MV_PEX_END_POINT;
-        }
-        else
-        {
-            mvOsPrintf("%s: ERROR!!! Bus %d type %d neither root complex nor" \
-                       " end point\n", __FUNCTION__, pciIf, pciIfmode);
-            return MV_FAIL;
-        }
-		return mvPexInit(pciIf - MV_PEX_START_IF, pexType);
-
-		#else
-		return MV_OK;
-		#endif
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-/* PCI configuration space read write */
-
-/*******************************************************************************
-* mvPciConfigRead - Read from configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit read from PCI configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to read from local bus segment, use 
-*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       bus     - PCI segment bus number.
-*       dev     - PCI device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit register data, 0xffffffff on error
-*
-*******************************************************************************/
-MV_U32 mvPciIfConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
-                        MV_U32 regOff)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciConfigRead(pciIf - MV_PCI_START_IF,
-								bus,
-								dev, 
-                                func,
-								regOff);
-		#else
-		return 0xffffffff;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexConfigRead(pciIf - MV_PEX_START_IF,
-								bus,
-								dev, 
-                                func,
-								regOff);
-		#else
-		return 0xffffffff;
-		#endif
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return 0;
-
-}
-
-/*******************************************************************************
-* mvPciConfigWrite - Write to configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit write to PCI configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to write to local bus segment, use 
-*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       bus     - PCI segment bus number.
-*       dev     - PCI device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*       data    - 32bit data.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciIfConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, 
-                           MV_U32 func, MV_U32 regOff, MV_U32 data)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciConfigWrite(pciIf - MV_PCI_START_IF,
-								bus,
-								dev, 
-                                func,
-								regOff,
-								data);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexConfigWrite(pciIf - MV_PEX_START_IF,
-								bus,
-								dev, 
-                                func,
-								regOff,
-								data);
-		#else
-		return MV_OK;
-		#endif
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-/*******************************************************************************
-* mvPciMasterEnable - Enable/disale PCI interface master transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PCI command status 
-*       (offset 0x4) to set/reset bit 2. After this bit is set, the PCI 
-*       master is allowed to gain ownership on the bus, otherwise it is 
-*       incapable to do so.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciIfMasterEnable(MV_U32 pciIf, MV_BOOL enable)
-{
-
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciMasterEnable(pciIf - MV_PCI_START_IF,
-								enable);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexMasterEnable(pciIf - MV_PEX_START_IF,
-								enable);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-
-/*******************************************************************************
-* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PCI command status 
-*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
-*       the PCI slave is allowed to respond to PCI IO space access (bit 0) 
-*       and PCI memory space access (bit 1). 
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       dev     - PCI device number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciIfSlaveEnable(MV_U32 pciIf,MV_U32 bus, MV_U32 dev, MV_BOOL enable)
-{
-
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciSlaveEnable(pciIf - MV_PCI_START_IF,bus,dev,
-								enable);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexSlaveEnable(pciIf - MV_PEX_START_IF,bus,dev,
-								enable);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-/*******************************************************************************
-* mvPciLocalBusNumSet - Set PCI interface local bus number.
-*
-* DESCRIPTION:
-*       This function sets given PCI interface its local bus number.
-*       Note: In case the PCI interface is PCI-X, the information is read-only.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       busNum - Bus number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PCI interface is PCI-X. 
-*		MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciIfLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciLocalBusNumSet(pciIf - MV_PCI_START_IF,
-								busNum);	
-		#else
-		return MV_OK;
-		#endif
-    }
-    else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexLocalBusNumSet(pciIf - MV_PEX_START_IF,
-								busNum);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-/*******************************************************************************
-* mvPciLocalBusNumGet - Get PCI interface local bus number.
-*
-* DESCRIPTION:
-*       This function gets the local bus number of a given PCI interface.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local bus number.0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPciIfLocalBusNumGet(MV_U32 pciIf)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciLocalBusNumGet(pciIf - MV_PCI_START_IF);
-		#else
-		return 0xFFFFFFFF;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexLocalBusNumGet(pciIf - MV_PEX_START_IF);
-		#else
-		return 0xFFFFFFFF;
-		#endif
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n",__FUNCTION__, pciIf);
-	}
-
-	return 0;
-
-}
-
-
-/*******************************************************************************
-* mvPciLocalDevNumSet - Set PCI interface local device number.
-*
-* DESCRIPTION:
-*       This function sets given PCI interface its local device number.
-*       Note: In case the PCI interface is PCI-X, the information is read-only.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       devNum - Device number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PCI interface is PCI-X. MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciIfLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciLocalDevNumSet(pciIf - MV_PCI_START_IF,
-								devNum);	
-		#else
-		return MV_OK;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexLocalDevNumSet(pciIf - MV_PEX_START_IF,
-								devNum);
-		#else
-		return MV_OK;
-		#endif
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return MV_FAIL;
-
-}
-
-/*******************************************************************************
-* mvPciLocalDevNumGet - Get PCI interface local device number.
-*
-* DESCRIPTION:
-*       This function gets the local device number of a given PCI interface.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local device number. 0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPciIfLocalDevNumGet(MV_U32 pciIf)
-{
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PCI)
-		return mvPciLocalDevNumGet(pciIf - MV_PCI_START_IF);
-		#else
-		return 0xFFFFFFFF;
-		#endif
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		#if defined(MV_INCLUDE_PEX)
-		return mvPexLocalDevNumGet(pciIf - MV_PEX_START_IF);
-		#else
-		return 0xFFFFFFFF;
-		#endif
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return 0;
-
-}
-
-/*******************************************************************************
-* mvPciIfTypeGet - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-
-PCI_IF_TYPE mvPciIfTypeGet(MV_U32 pciIf)
-{
-
-	if ((pciIf >= MV_PCI_START_IF)&&(pciIf < MV_PCI_MAX_IF + MV_PCI_START_IF))
-	{
-		return PCI_IF_TYPE_CONVEN_PCIX;
-	}
-	else if ((pciIf >= MV_PEX_START_IF) &&
-			 (pciIf < MV_PEX_MAX_IF + MV_PEX_START_IF))
-	{
-		return PCI_IF_TYPE_PEX;
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return 0xffffffff;
-
-}
-
-/*******************************************************************************
-* mvPciIfTypeGet - 
-*
-* DESCRIPTION:
-*
-* INPUT:
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*
-*******************************************************************************/
-
-MV_U32  mvPciRealIfNumGet(MV_U32 pciIf)
-{
-
-	PCI_IF_TYPE pciIfType = mvPciIfTypeGet(pciIf);
-
-	if (PCI_IF_TYPE_CONVEN_PCIX == pciIfType)
-	{
-		return (pciIf - MV_PCI_START_IF);
-	}
-	else if (PCI_IF_TYPE_PEX == pciIfType)
-	{
-		return (pciIf - MV_PEX_START_IF);
-
-	}
-	else
-	{
-		mvOsPrintf("%s: ERROR!!! Invalid pciIf %d\n", __FUNCTION__, pciIf);
-	}
-
-	return 0xffffffff;
-
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h
deleted file mode 100644
index 9c2d1604e7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIf.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCPCIIFH
-#define __INCPCIIFH
-
-#include "mvSysHwConfig.h"
-#include "pci-if/mvPciIfRegs.h"
-#if defined(MV_INCLUDE_PEX)
-#include "pex/mvPex.h"
-#endif
-#if defined(MV_INCLUDE_PCI)
-#include "pci/mvPci.h"
-#endif
-#include "ctrlEnv/mvCtrlEnvLib.h"
-#include "ctrlEnv/mvCtrlEnvAddrDec.h"
-
-typedef enum _mvPCIIfType
-{
-	PCI_IF_TYPE_CONVEN_PCIX,
-	PCI_IF_TYPE_PEX
-
-}PCI_IF_TYPE;
-
-typedef enum _mvPCIIfMode
-{
-	PCI_IF_MODE_HOST,
-	PCI_IF_MODE_DEVICE
-}PCI_IF_MODE;
-
-
-/* Global Functions prototypes */
-
-/* mvPciIfInit - Initialize PCI interfaces*/
-MV_STATUS mvPciIfInit(MV_U32 pciIf, PCI_IF_MODE pciIfmode);
-
-/* mvPciIfConfigRead - Read from configuration space */
-MV_U32 mvPciIfConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
-						MV_U32 func,MV_U32 regOff);
-
-/* mvPciIfConfigWrite - Write to configuration space */
-MV_STATUS mvPciIfConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
-                           MV_U32 func, MV_U32 regOff, MV_U32 data);
-
-/* mvPciIfMasterEnable - Enable/disale PCI interface master transactions.*/
-MV_STATUS mvPciIfMasterEnable(MV_U32 pciIf, MV_BOOL enable);
-
-/* mvPciIfSlaveEnable - Enable/disale PCI interface slave transactions.*/
-MV_STATUS mvPciIfSlaveEnable(MV_U32 pciIf,MV_U32 bus, MV_U32 dev, 
-							 MV_BOOL enable);
-
-/* mvPciIfLocalBusNumSet - Set PCI interface local bus number.*/
-MV_STATUS mvPciIfLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum);
-
-/* mvPciIfLocalBusNumGet - Get PCI interface local bus number.*/
-MV_U32 mvPciIfLocalBusNumGet(MV_U32 pciIf);
-
-/* mvPciIfLocalDevNumSet - Set PCI interface local device number.*/
-MV_STATUS mvPciIfLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum);
-
-/* mvPciIfLocalDevNumGet - Get PCI interface local device number.*/
-MV_U32 mvPciIfLocalDevNumGet(MV_U32 pciIf);
-
-/* mvPciIfTypeGet - Get PCI If type*/
-PCI_IF_TYPE mvPciIfTypeGet(MV_U32 pciIf);
-
-MV_U32  mvPciRealIfNumGet(MV_U32 pciIf);
-
-/* mvPciIfAddrDecShow - Display address decode windows attributes */
-MV_VOID mvPciIfAddrDecShow(MV_VOID);
-
-#endif /* #ifndef __INCPCIIFH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h
deleted file mode 100644
index 08d4d2d901..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/mvPciIfRegs.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCPCIIFREGSH
-#define __INCPCIIFREGSH
-
-
-/* defines */
-#define MAX_PCI_DEVICES         32
-#define MAX_PCI_FUNCS           8
-#define MAX_PCI_BUSSES          128
-
-/***************************************/
-/* PCI Configuration registers */
-/***************************************/
-
-/*********************************************/
-/* PCI Configuration, Function 0, Registers  */
-/*********************************************/
-
-
-/* Standard registers */
-#define PCI_DEVICE_AND_VENDOR_ID					0x000
-#define PCI_STATUS_AND_COMMAND						0x004
-#define PCI_CLASS_CODE_AND_REVISION_ID			    0x008
-#define PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE		0x00C
-#define PCI_MEMORY_BAR_BASE_ADDR(barNum)		 	(0x010 + ((barNum) << 2))
-#define PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID		 	0x02C
-#define PCI_EXPANSION_ROM_BASE_ADDR_REG			    0x030
-#define PCI_CAPABILTY_LIST_POINTER			        0x034
-#define PCI_INTERRUPT_PIN_AND_LINE					0x03C
-
-
-/* PCI Device and Vendor ID Register (PDVIR) */
-#define PDVIR_VEN_ID_OFFS			0 	/* Vendor ID */
-#define PDVIR_VEN_ID_MASK			(0xffff << PDVIR_VEN_ID_OFFS)
-
-#define PDVIR_DEV_ID_OFFS			16	/* Device ID */
-#define PDVIR_DEV_ID_MASK  			(0xffff << PDVIR_DEV_ID_OFFS)
-
-/* PCI Status and Command Register (PSCR) */
-#define PSCR_IO_EN			BIT0 	/* IO Enable 							  */
-#define PSCR_MEM_EN			BIT1	/* Memory Enable 						  */
-#define PSCR_MASTER_EN		BIT2	/* Master Enable 						  */
-#define PSCR_SPECIAL_EN		BIT3	/* Special Cycle Enable 				  */
-#define PSCR_MEM_WRI_INV	BIT4	/* Memory Write and Invalidate Enable	  */
-#define PSCR_VGA			BIT5	/* VGA Palette Snoops 					  */
-#define PSCR_PERR_EN		BIT6	/* Parity Errors Respond Enable 		  */
-#define PSCR_ADDR_STEP   	BIT7    /* Address Stepping Enable (Wait Cycle En)*/
-#define PSCR_SERR_EN		BIT8	/* Ability to assert SERR# line			  */
-#define PSCR_FAST_BTB_EN	BIT9	/* generate fast back-to-back transactions*/
-#define PSCR_CAP_LIST		BIT20	/* Capability List Support 				  */
-#define PSCR_66MHZ_EN		BIT21   /* 66 MHz Capable 						  */
-#define PSCR_UDF_EN			BIT22   /* User definable features 				  */
-#define PSCR_TAR_FAST_BB 	BIT23   /* fast back-to-back transactions capable */
-#define PSCR_DATA_PERR		BIT24   /* Data Parity reported 				  */
-
-#define PSCR_DEVSEL_TIM_OFFS 	25  /* DEVSEL timing */
-#define PSCR_DEVSEL_TIM_MASK 	(0x3 << PSCR_DEVSEL_TIM_OFFS)
-#define PSCR_DEVSEL_TIM_FAST	(0x0 << PSCR_DEVSEL_TIM_OFFS)
-#define PSCR_DEVSEL_TIM_MED 	(0x1 << PSCR_DEVSEL_TIM_OFFS)
-#define PSCR_DEVSEL_TIM_SLOW 	(0x2 << PSCR_DEVSEL_TIM_OFFS)
-
-#define PSCR_SLAVE_TABORT	BIT27	/* Signalled Target Abort 	*/
-#define PSCR_MASTER_TABORT	BIT28	/* Recieved Target Abort 	*/
-#define PSCR_MABORT			BIT29	/* Recieved Master Abort 	*/
-#define PSCR_SYSERR			BIT30	/* Signalled system error 	*/
-#define PSCR_DET_PARERR		BIT31	/* Detect Parity Error 		*/
-
-/* 	PCI configuration register offset=0x08 fields 
-	(PCI_CLASS_CODE_AND_REVISION_ID)(PCCRI) 				*/
-
-#define PCCRIR_REVID_OFFS		0		/* Revision ID */
-#define PCCRIR_REVID_MASK		(0xff << PCCRIR_REVID_OFFS)
-
-#define PCCRIR_FULL_CLASS_OFFS	8		/* Full Class Code */
-#define PCCRIR_FULL_CLASS_MASK	(0xffffff << PCCRIR_FULL_CLASS_OFFS)
-
-#define PCCRIR_PROGIF_OFFS		8		/* Prog .I/F*/
-#define PCCRIR_PROGIF_MASK		(0xff << PCCRIR_PROGIF_OFFS)
-
-#define PCCRIR_SUB_CLASS_OFFS	16		/* Sub Class*/
-#define PCCRIR_SUB_CLASS_MASK	(0xff << PCCRIR_SUB_CLASS_OFFS)
-
-#define PCCRIR_BASE_CLASS_OFFS	24		/* Base Class*/
-#define PCCRIR_BASE_CLASS_MASK	(0xff << PCCRIR_BASE_CLASS_OFFS)
-
-/* 	PCI configuration register offset=0x0C fields 
-	(PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE)(PBHTLTCL) 				*/
-
-#define PBHTLTCLR_CACHELINE_OFFS		0	/* Specifies the cache line size */
-#define PBHTLTCLR_CACHELINE_MASK		(0xff << PBHTLTCLR_CACHELINE_OFFS)
-	
-#define PBHTLTCLR_LATTIMER_OFFS			8	/* latency timer */
-#define PBHTLTCLR_LATTIMER_MASK			(0xff << PBHTLTCLR_LATTIMER_OFFS)
-
-#define PBHTLTCLR_HEADTYPE_FULL_OFFS	16	/* Full Header Type */
-#define PBHTLTCLR_HEADTYPE_FULL_MASK	(0xff << PBHTLTCLR_HEADTYPE_FULL_OFFS)
-
-#define PBHTLTCLR_MULTI_FUNC			BIT23	/* Multi/Single function */
-
-#define PBHTLTCLR_HEADER_OFFS			16		/* Header type */
-#define PBHTLTCLR_HEADER_MASK			(0x7f << PBHTLTCLR_HEADER_OFFS)
-#define PBHTLTCLR_HEADER_STANDARD		(0x0 << PBHTLTCLR_HEADER_OFFS)
-#define PBHTLTCLR_HEADER_PCI2PCI_BRIDGE	(0x1 << PBHTLTCLR_HEADER_OFFS)
-
-
-#define PBHTLTCLR_BISTCOMP_OFFS		24	/* BIST Completion Code */
-#define PBHTLTCLR_BISTCOMP_MASK		(0xf << PBHTLTCLR_BISTCOMP_OFFS)
-
-#define PBHTLTCLR_BISTACT			BIT30	/* BIST Activate bit */
-#define PBHTLTCLR_BISTCAP			BIT31	/* BIST Capable Bit */
-
-
-/* PCI Bar Base Low Register (PBBLR) */
-#define PBBLR_IOSPACE			BIT0	/* Memory Space Indicator */
-
-#define PBBLR_TYPE_OFFS			1	   /* BAR Type/Init Val. */ 
-#define PBBLR_TYPE_MASK			(0x3 << PBBLR_TYPE_OFFS)
-#define PBBLR_TYPE_32BIT_ADDR	(0x0 << PBBLR_TYPE_OFFS)
-#define PBBLR_TYPE_64BIT_ADDR	(0x2 << PBBLR_TYPE_OFFS)
-
-#define PBBLR_PREFETCH_EN		BIT3 	/* Prefetch Enable */
-
-				
-#define PBBLR_MEM_BASE_OFFS		4	/* Memory Bar Base address. Corresponds to
-									address bits [31:4] */
-#define PBBLR_MEM_BASE_MASK		(0xfffffff << PBBLR_MEM_BASE_OFFS)
-
-#define PBBLR_IO_BASE_OFFS		2	/* IO Bar Base address. Corresponds to 
-										address bits [31:2] */
-#define PBBLR_IO_BASE_MASK		(0x3fffffff << PBBLR_IO_BASE_OFFS)
-
-
-#define PBBLR_BASE_OFFS			12		/* Base address. Address bits [31:12] */
-#define PBBLR_BASE_MASK			(0xfffff << PBBLR_BASE_OFFS)
-#define PBBLR_BASE_ALIGNMET		(1 << PBBLR_BASE_OFFS)
-
-
-/* PCI Bar Base High Fegister (PBBHR) */
-#define PBBHR_BASE_OFFS			0		/* Base address. Address bits [31:12] */
-#define PBBHR_BASE_MASK			(0xffffffff << PBBHR_BASE_OFFS)
-
-
-/* 	PCI configuration register offset=0x2C fields 
-	(PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID)(PSISVI) 				*/
-
-#define PSISVIR_VENID_OFFS	0	/* Subsystem Manufacturer Vendor ID Number */
-#define PSISVIR_VENID_MASK	(0xffff << PSISVIR_VENID_OFFS)
-
-#define PSISVIR_DEVID_OFFS	16	/* Subsystem Device ID Number */
-#define PSISVIR_DEVID_MASK	(0xffff << PSISVIR_DEVID_OFFS)
-
-/* 	PCI configuration register offset=0x30 fields 
-	(PCI_EXPANSION_ROM_BASE_ADDR_REG)(PERBA) 				*/
-
-#define PERBAR_EXPROMEN		BIT0	/* Expansion ROM Enable */
-
-#define PERBAR_BASE_OFFS		12		/* Expansion ROM Base Address */
-#define PERBAR_BASE_MASK		(0xfffff << PERBAR_BASE_OFFS) 	
-
-/* 	PCI configuration register offset=0x34 fields 
-	(PCI_CAPABILTY_LIST_POINTER)(PCLP) 				*/
-
-#define PCLPR_CAPPTR_OFFS	0		/* Capability List Pointer */
-#define PCLPR_CAPPTR_MASK	(0xff << PCLPR_CAPPTR_OFFS)
-
-/* 	PCI configuration register offset=0x3C fields 
-	(PCI_INTERRUPT_PIN_AND_LINE)(PIPL) 				*/
-
-#define PIPLR_INTLINE_OFFS	0	/* Interrupt line (IRQ) */
-#define PIPLR_INTLINE_MASK	(0xff << PIPLR_INTLINE_OFFS)
-
-#define PIPLR_INTPIN_OFFS	8	/* interrupt pin (A,B,C,D) */
-#define PIPLR_INTPIN_MASK	(0xff << PIPLR_INTPIN_OFFS)
-
-#define PIPLR_MINGRANT_OFFS	16	/* Minimum Grant on 250 nano seconds units */
-#define PIPLR_MINGRANT_MASK	(0xff << PIPLR_MINGRANT_OFFS)
-
-#define PIPLR_MAXLATEN_OFFS	24	/* Maximum latency on 250 nano seconds units */
-#define PIPLR_MAXLATEN_MASK	(0xff << PIPLR_MAXLATEN_OFFS)
-
-#endif /* #ifndef __INCPCIIFREGSH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c
deleted file mode 100644
index f2169793b8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-/* includes */
-#include "mvPciUtils.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* #define MV_DEBUG */
-/* defines  */
-#ifdef MV_DEBUG
-	#define DB(x)	x
-	#define mvOsPrintf printf
-#else
-	#define DB(x)
-#endif
-
-/*
-This module only support scanning of Header type 00h of pci devices
-There is no suppotr for Header type 01h of pci devices  ( PCI bridges )
-*/
-
-
-static MV_STATUS pciDetectDevice(MV_U32 pciIf,
-   								 MV_U32 bus,
-   								 MV_U32 dev,
-   								 MV_U32 func,
-								 MV_PCI_DEVICE *pPciAgent);
-
-static MV_U32 pciDetectDeviceBars(MV_U32 pciIf,
-									MV_U32 bus,
-									MV_U32 dev,
-									MV_U32 func,
-									MV_PCI_DEVICE *pPciAgent);
-
-
-
-
-
-
-/*******************************************************************************
-* mvPciScan - Scan a PCI interface bus
-*
-* DESCRIPTION:
-* Performs a full scan on a PCI interface and returns all possible details
-* on the agents found on the bus.
-*
-* INPUT:
-*       pciIf       - PCI Interface
-*       pPciAgents 	- Pointer to an Array of the pci agents to be detected
-*		pPciAgentsNum - pPciAgents array maximum number of elements
-*
-* OUTPUT:
-*       pPciAgents - Array of the pci agents detected on the bus
-*		pPciAgentsNum - Number of pci agents detected on the bus
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-
-MV_STATUS mvPciScan(MV_U32 pciIf,
-					MV_PCI_DEVICE *pPciAgents,
-					MV_U32 *pPciAgentsNum)
-{
-
-	MV_U32 devIndex,funcIndex=0,busIndex=0,detectedDevNum=0;
-    MV_U32 localBus=mvPciIfLocalBusNumGet(pciIf);
-    MV_PCI_DEVICE *pPciDevice;
-	MV_PCI_DEVICE *pMainDevice;
-
-	DB(mvOsPrintf("mvPciScan: PCI interface num %d\n", pciIf));
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPexMaxIfGet())
-	{
-		DB(mvOsPrintf("mvPciScan: ERR. Invalid PCI interface num %d\n", pciIf));
-		return MV_BAD_PARAM;
-	}
-	if (NULL == pPciAgents)
-	{
-		DB(mvOsPrintf("mvPciScan: ERR. pPciAgents=NULL \n"));
-		return MV_BAD_PARAM;
-	}
-	if (NULL == pPciAgentsNum)
-	{
-		DB(mvOsPrintf("mvPciScan: ERR. pPciAgentsNum=NULL \n"));
-		return MV_BAD_PARAM;
-	}
-
-
-	DB(mvOsPrintf("mvPciScan: PCI interface num %d mvPciMasterEnable\n", pciIf));
-	/* Master enable the MV PCI master */
-	if (MV_OK != mvPciIfMasterEnable(pciIf,MV_TRUE))
-	{
-		DB(mvOsPrintf("mvPciScan: ERR. mvPciMasterEnable failed  \n"));
-		return MV_ERROR;
-
-	}
-
-	DB(mvOsPrintf("mvPciScan: PCI interface num scan%d\n", pciIf));
-
-	/* go through all busses */
-	for (busIndex=localBus ; busIndex < MAX_PCI_BUSSES ; busIndex++)
-	{
-		/* go through all possible devices on the local bus */
-		for (devIndex=0 ; devIndex < MAX_PCI_DEVICES ; devIndex++)
-		{
-			/* always start with function equal to zero */
-			funcIndex=0;
-
-			pPciDevice=&pPciAgents[detectedDevNum];
-			DB(mvOsPrintf("mvPciScan: PCI interface num scan%d:%d\n", busIndex, devIndex));
-
-			if (MV_ERROR == pciDetectDevice(pciIf,
-										   busIndex,
-										   devIndex,
-										   funcIndex,
-										   pPciDevice))
-			{
-				/* no device detected , try the next address */
-				continue;
-			}
-
-			/* We are here ! means we have detected a device*/
-			/* always we start with only one function per device */
-			pMainDevice = pPciDevice;
-			pPciDevice->funtionsNum = 1;
-
-
-			/* move on */
-			detectedDevNum++;
-
-
-			/* check if we have no more room for a new device */
-			if (detectedDevNum == *pPciAgentsNum)
-			{
-				DB(mvOsPrintf("mvPciScan: ERR. array passed too small \n"));
-				return MV_ERROR;
-			}
-
-			/* check the detected device if it is a multi functional device then
-			scan all device functions*/
-			if (pPciDevice->isMultiFunction == MV_TRUE)
-			{
-				/* start with function number 1 because we have already detected
-				function 0 */
-				for (funcIndex=1; funcIndex<MAX_PCI_FUNCS ; funcIndex++)
-				{
-					pPciDevice=&pPciAgents[detectedDevNum];
-
-					if (MV_ERROR == pciDetectDevice(pciIf,
-												   busIndex,
-												   devIndex,
-												   funcIndex,
-												   pPciDevice))
-					{
-						/* no device detected means no more functions !*/
-						continue;
-					}
-					/* We are here ! means we have detected a device */
-
-					/* move on */
-					pMainDevice->funtionsNum++;
-					detectedDevNum++;
-
-					/* check if we have no more room for a new device */
-					if (detectedDevNum == *pPciAgentsNum)
-					{
-						DB(mvOsPrintf("mvPciScan: ERR. Array too small\n"));
-						return MV_ERROR;
-					}
-
-
-				}
-			}
-
-		}
-
-	}
-
-	/* return the number of devices actually detected on the bus ! */
-	*pPciAgentsNum = detectedDevNum;
-
-	return MV_OK;
-
-}
-
-
-/*******************************************************************************
-* pciDetectDevice - Detect a pci device parameters
-*
-* DESCRIPTION:
-*	This function detect if a pci agent exist on certain address !
-*   and if exists then it fills all possible information on the
-*   agent
-*
-* INPUT:
-*       pciIf       - PCI Interface
-*		bus		-	Bus number
-*		dev		- 	Device number
-*		func	-	Function number
-*
-*
-*
-* OUTPUT:
-*       pPciAgent - pointer to the pci agent filled with its information
-*
-* RETURN:
-*       MV_ERROR if no device , MV_OK otherwise
-*
-*******************************************************************************/
-
-static MV_STATUS pciDetectDevice(MV_U32 pciIf,
-   								 MV_U32 bus,
-   								 MV_U32 dev,
-   								 MV_U32 func,
-								 MV_PCI_DEVICE *pPciAgent)
-{
-	MV_U32 pciData;
-
-	/* no Parameters checking ! because it is static function and it is assumed
-	that all parameters were checked in the calling function */
-
-
-	/* Try read the PCI Vendor ID and Device ID */
-
-	/*  We will scan only ourselves and the PCI slots that exist on the
-		board, because we may have a case that we have one slot that has
-		a Cardbus connector, and because CardBus answers all IDsels we want
-		to scan only this slot and ourseleves.
-
-	*/
-	#if defined(MV_INCLUDE_PCI)
-	if ((PCI_IF_TYPE_CONVEN_PCIX == mvPciIfTypeGet(pciIf)) &&
-					(DB_88F5181_DDR1_PRPMC != mvBoardIdGet()) &&
-					(DB_88F5181_DDR1_PEXPCI != mvBoardIdGet()) &&
-					(DB_88F5181_DDR1_MNG != mvBoardIdGet()))
-    	{
-
-			if (mvBoardIsOurPciSlot(bus, dev) == MV_FALSE)
-			{
-				return MV_ERROR;
-			}
-	}
-	#endif /* defined(MV_INCLUDE_PCI) */
-
-	pciData = mvPciIfConfigRead(pciIf, bus,dev,func, PCI_DEVICE_AND_VENDOR_ID);
-
-	if (PCI_ERROR_CODE == pciData)
-	{
-		/* no device exist */
-		return MV_ERROR;
-	}
-
-	/* we are here ! means a device is detected */
-
-	/* fill basic information */
-	pPciAgent->busNumber=bus;
-	pPciAgent->deviceNum=dev;
-	pPciAgent->function=func;
-
-	/* Fill the PCI Vendor ID and Device ID */
-
-	pPciAgent->venID = (pciData & PDVIR_VEN_ID_MASK) >> PDVIR_VEN_ID_OFFS;
-	pPciAgent->deviceID = (pciData & PDVIR_DEV_ID_MASK) >> PDVIR_DEV_ID_OFFS;
-
-	/* Read Status and command */
-	pciData = mvPciIfConfigRead(pciIf,
-							  bus,dev,func,
-							  PCI_STATUS_AND_COMMAND);
-
-
-	/* Fill related Status and Command information*/
-
-	if (pciData & PSCR_TAR_FAST_BB)
-	{
-		pPciAgent->isFastB2BCapable = MV_TRUE;
-	}
-	else
-	{
-		pPciAgent->isFastB2BCapable = MV_FALSE;
-	}
-
-	if (pciData & PSCR_CAP_LIST)
-	{
-		pPciAgent->isCapListSupport=MV_TRUE;
-	}
-	else
-	{
-		pPciAgent->isCapListSupport=MV_FALSE;
-	}
-
-	if (pciData & PSCR_66MHZ_EN)
-	{
-		pPciAgent->is66MHZCapable=MV_TRUE;
-	}
-	else
-	{
-		pPciAgent->is66MHZCapable=MV_FALSE;
-	}
-
-	/* Read Class Code and Revision */
-	pciData = mvPciIfConfigRead(pciIf,
-							  bus,dev,func,
-							  PCI_CLASS_CODE_AND_REVISION_ID);
-
-
-	pPciAgent->baseClassCode =
-		(pciData & PCCRIR_BASE_CLASS_MASK) >> PCCRIR_BASE_CLASS_OFFS;
-
-	pPciAgent->subClassCode =
-		(pciData & PCCRIR_SUB_CLASS_MASK) >> PCCRIR_SUB_CLASS_OFFS;
-
-	pPciAgent->progIf =
-		(pciData & PCCRIR_PROGIF_MASK) >> PCCRIR_PROGIF_OFFS;
-
-	pPciAgent->revisionID =
-		(pciData & PCCRIR_REVID_MASK) >> PCCRIR_REVID_OFFS;
-
-	/* Read  PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE */
-	pciData = mvPciIfConfigRead(pciIf,
-							  bus,dev,func,
-							  PCI_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE);
-
-
-
-	pPciAgent->pciCacheLine=
-		(pciData & PBHTLTCLR_CACHELINE_MASK ) >> PBHTLTCLR_CACHELINE_OFFS;
-	pPciAgent->pciLatencyTimer=
-		(pciData & PBHTLTCLR_LATTIMER_MASK) >> PBHTLTCLR_LATTIMER_OFFS;
-
-	switch (pciData & PBHTLTCLR_HEADER_MASK)
-	{
-	case PBHTLTCLR_HEADER_STANDARD:
-
-		pPciAgent->pciHeader=MV_PCI_STANDARD;
-		break;
-	case PBHTLTCLR_HEADER_PCI2PCI_BRIDGE:
-
-		pPciAgent->pciHeader=MV_PCI_PCI2PCI_BRIDGE;
-		break;
-
-	}
-
-	if (pciData & PBHTLTCLR_MULTI_FUNC)
-	{
-		pPciAgent->isMultiFunction=MV_TRUE;
-	}
-	else
-	{
-		pPciAgent->isMultiFunction=MV_FALSE;
-	}
-
-	if (pciData & PBHTLTCLR_BISTCAP)
-	{
-		pPciAgent->isBISTCapable=MV_TRUE;
-	}
-	else
-	{
-		pPciAgent->isBISTCapable=MV_FALSE;
-	}
-
-
-	/* read this device pci bars */
-
-	pciDetectDeviceBars(pciIf,
-					  bus,dev,func,
-	 				 pPciAgent);
-
-
-	/* check if we are bridge*/
-	if ((pPciAgent->baseClassCode == PCI_BRIDGE_CLASS)&&
-		(pPciAgent->subClassCode == P2P_BRIDGE_SUB_CLASS_CODE))
-	{
-
-		/* Read  P2P_BUSSES_NUM */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  P2P_BUSSES_NUM);
-
-		pPciAgent->p2pPrimBusNum =
-			(pciData & PBM_PRIME_BUS_NUM_MASK) >> PBM_PRIME_BUS_NUM_OFFS;
-
-		pPciAgent->p2pSecBusNum =
-			(pciData & PBM_SEC_BUS_NUM_MASK) >> PBM_SEC_BUS_NUM_OFFS;
-
-		pPciAgent->p2pSubBusNum =
-			(pciData & PBM_SUB_BUS_NUM_MASK) >> PBM_SUB_BUS_NUM_OFFS;
-
-		pPciAgent->p2pSecLatencyTimer =
-			(pciData & PBM_SEC_LAT_TMR_MASK) >> PBM_SEC_LAT_TMR_OFFS;
-
-		/* Read  P2P_IO_BASE_LIMIT_SEC_STATUS */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  P2P_IO_BASE_LIMIT_SEC_STATUS);
-
-		pPciAgent->p2pSecStatus =
-			(pciData & PIBLSS_SEC_STATUS_MASK) >> PIBLSS_SEC_STATUS_OFFS;
-
-
-		pPciAgent->p2pIObase =
-			(pciData & PIBLSS_IO_BASE_MASK) << PIBLSS_IO_LIMIT_OFFS;
-
-		/* clear low address (should be zero)*/
-		pPciAgent->p2pIObase &= PIBLSS_HIGH_ADDR_MASK;
-
-		pPciAgent->p2pIOLimit =
-			(pciData & PIBLSS_IO_LIMIT_MASK);
-
-		/* fill low address with 0xfff */
-		pPciAgent->p2pIOLimit |= PIBLSS_LOW_ADDR_MASK;
-
-
-		switch ((pciData & PIBLSS_ADD_CAP_MASK) >> PIBLSS_ADD_CAP_OFFS)
-		{
-		case PIBLSS_ADD_CAP_16BIT:
-
-			pPciAgent->bIO32 = MV_FALSE;
-
-			break;
-		case PIBLSS_ADD_CAP_32BIT:
-
-			pPciAgent->bIO32 = MV_TRUE;
-
-			/* Read  P2P_IO_BASE_LIMIT_UPPER_16 */
-			pciData = mvPciIfConfigRead(pciIf,
-									  bus,dev,func,
-									  P2P_IO_BASE_LIMIT_UPPER_16);
-
-			pPciAgent->p2pIObase |=
-				(pciData & PRBU_IO_UPP_BASE_MASK) << PRBU_IO_UPP_LIMIT_OFFS;
-
-
-			pPciAgent->p2pIOLimit |=
-				(pciData & PRBU_IO_UPP_LIMIT_MASK);
-
-			break;
-
-		}
-
-
-		/* Read  P2P_MEM_BASE_LIMIT */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  P2P_MEM_BASE_LIMIT);
-
-		pPciAgent->p2pMemBase =
-			(pciData & PMBL_MEM_BASE_MASK) << PMBL_MEM_LIMIT_OFFS;
-
-		/* clear low address */
-		pPciAgent->p2pMemBase &= PMBL_HIGH_ADDR_MASK;
-
-		pPciAgent->p2pMemLimit =
-			(pciData & PMBL_MEM_LIMIT_MASK);
-
-		/* add 0xfffff */
-		pPciAgent->p2pMemLimit |= PMBL_LOW_ADDR_MASK;
-
-
-		/* Read  P2P_PREF_MEM_BASE_LIMIT */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  P2P_PREF_MEM_BASE_LIMIT);
-
-
-		pPciAgent->p2pPrefMemBase =
-			(pciData & PRMBL_PREF_MEM_BASE_MASK) << PRMBL_PREF_MEM_LIMIT_OFFS;
-
-		/* get high address only */
-		pPciAgent->p2pPrefMemBase &= PRMBL_HIGH_ADDR_MASK;
-
-
-
-		pPciAgent->p2pPrefMemLimit =
-			(pciData & PRMBL_PREF_MEM_LIMIT_MASK);
-
-		/* add 0xfffff */
-		pPciAgent->p2pPrefMemLimit |= PRMBL_LOW_ADDR_MASK;
-
-		switch (pciData & PRMBL_ADD_CAP_MASK)
-		{
-		case PRMBL_ADD_CAP_32BIT:
-
-			pPciAgent->bPrefMem64 = MV_FALSE;
-
-			/* Read  P2P_PREF_BASE_UPPER_32 */
-			pPciAgent->p2pPrefBaseUpper32Bits = 0;
-
-			/* Read  P2P_PREF_LIMIT_UPPER_32 */
-			pPciAgent->p2pPrefLimitUpper32Bits = 0;
-
-			break;
-		case PRMBL_ADD_CAP_64BIT:
-
-			pPciAgent->bPrefMem64 = MV_TRUE;
-
-			/* Read  P2P_PREF_BASE_UPPER_32 */
-			pPciAgent->p2pPrefBaseUpper32Bits = mvPciIfConfigRead(pciIf,
-									  bus,dev,func,
-									  P2P_PREF_BASE_UPPER_32);
-
-			/* Read  P2P_PREF_LIMIT_UPPER_32 */
-			pPciAgent->p2pPrefLimitUpper32Bits = mvPciIfConfigRead(pciIf,
-									  bus,dev,func,
-									  P2P_PREF_LIMIT_UPPER_32);
-
-			break;
-
-		}
-
-	}
-	else /* no bridge */
-	{
-		/* Read  PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  PCI_SUBSYS_ID_AND_SUBSYS_VENDOR_ID);
-
-
-		pPciAgent->subSysVenID =
-			(pciData & PSISVIR_VENID_MASK) >> PSISVIR_VENID_OFFS;
-		pPciAgent->subSysID =
-			(pciData & PSISVIR_DEVID_MASK) >> PSISVIR_DEVID_OFFS;
-
-
-		/* Read  PCI_EXPANSION_ROM_BASE_ADDR_REG */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  PCI_EXPANSION_ROM_BASE_ADDR_REG);
-
-
-		if (pciData & PERBAR_EXPROMEN)
-		{
-			pPciAgent->isExpRom = MV_TRUE;
-		}
-		else
-		{
-			pPciAgent->isExpRom = MV_FALSE;
-		}
-
-		pPciAgent->expRomAddr =
-			(pciData & PERBAR_BASE_MASK) >> PERBAR_BASE_OFFS;
-
-	}
-
-
-	if (MV_TRUE == pPciAgent->isCapListSupport)
-	{
-		/* Read  PCI_CAPABILTY_LIST_POINTER */
-		pciData = mvPciIfConfigRead(pciIf,
-								  bus,dev,func,
-								  PCI_CAPABILTY_LIST_POINTER);
-
-		pPciAgent->capListPointer =
-			(pciData & PCLPR_CAPPTR_MASK) >> PCLPR_CAPPTR_OFFS;
-
-	}
-
-	/* Read  PCI_INTERRUPT_PIN_AND_LINE */
-	pciData = mvPciIfConfigRead(pciIf,
-							  bus,dev,func,
-							  PCI_INTERRUPT_PIN_AND_LINE);
-
-
-	pPciAgent->irqLine=
-		(pciData & PIPLR_INTLINE_MASK) >> PIPLR_INTLINE_OFFS;
-
-	pPciAgent->intPin=
-		(MV_PCI_INT_PIN)(pciData & PIPLR_INTPIN_MASK) >> PIPLR_INTPIN_OFFS;
-
-	pPciAgent->minGrant=
-		(pciData & PIPLR_MINGRANT_MASK) >> PIPLR_MINGRANT_OFFS;
-	pPciAgent->maxLatency=
-		(pciData & PIPLR_MAXLATEN_MASK) >> PIPLR_MAXLATEN_OFFS;
-
-	mvPciClassNameGet(pPciAgent->baseClassCode,
-					  (MV_8 *)pPciAgent->type);
-
-	return MV_OK;
-
-
-}
-
-/*******************************************************************************
-* pciDetectDeviceBars - Detect a pci device bars
-*
-* DESCRIPTION:
-*	This function detects all pci agent bars
-*
-* INPUT:
-*       pciIf       - PCI Interface
-*		bus		-	Bus number
-*		dev		- 	Device number
-*		func	-	Function number
-*
-*
-*
-* OUTPUT:
-*       pPciAgent - pointer to the pci agent filled with its information
-*
-* RETURN:
-*       detected bars number
-*
-*******************************************************************************/
-static MV_U32 pciDetectDeviceBars(MV_U32 pciIf,
-									MV_U32 bus,
-									MV_U32 dev,
-									MV_U32 func,
-									MV_PCI_DEVICE *pPciAgent)
-{
-	MV_U32 pciData,barIndex,detectedBar=0;
-	MV_U32 tmpBaseHigh=0,tmpBaseLow=0;
-	MV_U32 pciMaxBars=0;
-
-	pPciAgent->barsNum=0;
-
-	/* check if we are bridge*/
-	if ((pPciAgent->baseClassCode == PCI_BRIDGE_CLASS)&&
-		(pPciAgent->subClassCode == P2P_BRIDGE_SUB_CLASS_CODE))
-	{
-		pciMaxBars = 2;
-	}
-	else /* no bridge */
-	{
-		pciMaxBars = 6;
-	}
-
-	/* read this device pci bars */
-	for (barIndex = 0 ; barIndex < pciMaxBars ; barIndex++ )
-	{
-		/* Read  PCI_MEMORY_BAR_BASE_ADDR */
-		tmpBaseLow = pciData = mvPciIfConfigRead(pciIf,
-									   bus,dev,func,
-						               PCI_MEMORY_BAR_BASE_ADDR(barIndex));
-
-		pPciAgent->pciBar[detectedBar].barOffset =
-			PCI_MEMORY_BAR_BASE_ADDR(barIndex);
-
-		/* check if the bar is 32bit or 64bit bar */
-		switch (pciData & PBBLR_TYPE_MASK)
-		{
-		case PBBLR_TYPE_32BIT_ADDR:
-			pPciAgent->pciBar[detectedBar].barType = PCI_32BIT_BAR;
-			break;
-		case PBBLR_TYPE_64BIT_ADDR:
-			pPciAgent->pciBar[detectedBar].barType = PCI_64BIT_BAR;
-			break;
-
-		}
-
-		/* check if it is memory or IO bar */
-		if (pciData & PBBLR_IOSPACE)
-		{
-			pPciAgent->pciBar[detectedBar].barMapping=PCI_IO_BAR;
-		}
-		else
-		{
-			pPciAgent->pciBar[detectedBar].barMapping=PCI_MEMORY_BAR;
-		}
-
-		/* if it is memory bar then check if it is prefetchable */
-		if (PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping)
-		{
-			if (pciData & PBBLR_PREFETCH_EN)
-			{
-				pPciAgent->pciBar[detectedBar].isPrefetchable = MV_TRUE;
-			}
-			else
-			{
-				pPciAgent->pciBar[detectedBar].isPrefetchable = MV_FALSE;
-			}
-
-            pPciAgent->pciBar[detectedBar].barBaseLow =
-				pciData & PBBLR_MEM_BASE_MASK;
-
-
-		}
-		else /* IO Bar */
-		{
-			pPciAgent->pciBar[detectedBar].barBaseLow =
-				pciData & PBBLR_IO_BASE_MASK;
-
-		}
-
-		pPciAgent->pciBar[detectedBar].barBaseHigh=0;
-
-		if (PCI_64BIT_BAR == pPciAgent->pciBar[detectedBar].barType)
-		{
-			barIndex++;
-
-			tmpBaseHigh = pPciAgent->pciBar[detectedBar].barBaseHigh =
-				mvPciIfConfigRead(pciIf,
-								bus,dev,func,
-								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
-
-
-		}
-
-		/* calculating full base address (64bit) */
-		pPciAgent->pciBar[detectedBar].barBaseAddr =
-			(MV_U64)pPciAgent->pciBar[detectedBar].barBaseHigh;
-
-		pPciAgent->pciBar[detectedBar].barBaseAddr <<= 32;
-
-		pPciAgent->pciBar[detectedBar].barBaseAddr |=
-			(MV_U64)pPciAgent->pciBar[detectedBar].barBaseLow;
-
-
-
-		/* get the sizes of the the bar */
-
-		pPciAgent->pciBar[detectedBar].barSizeHigh=0;
-
-		if ((PCI_64BIT_BAR == pPciAgent->pciBar[detectedBar].barType) &&
-			(PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping))
-
-		{
-			/* write oxffffffff to the bar to get the size */
-			/* start with sizelow ( original value was saved in tmpBaseLow ) */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex-1),
-							0xffffffff);
-
-			/* read size */
-			pPciAgent->pciBar[detectedBar].barSizeLow =
-				mvPciIfConfigRead(pciIf,
-								bus,dev,func,
-								PCI_MEMORY_BAR_BASE_ADDR(barIndex-1));
-
-
-
-			/* restore original value */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex-1),
-							tmpBaseLow);
-
-
-			/* now do the same for BaseHigh */
-
-			/* write oxffffffff to the bar to get the size */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
-							0xffffffff);
-
-			/* read size */
-			pPciAgent->pciBar[detectedBar].barSizeHigh =
-				mvPciIfConfigRead(pciIf,
-								bus,dev,func,
-								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
-
-			/* restore original value */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
-							tmpBaseHigh);
-
-			if ((0 == pPciAgent->pciBar[detectedBar].barSizeLow)&&
-				(0 == pPciAgent->pciBar[detectedBar].barSizeHigh))
-			{
-				/* this bar is not applicable for this device,
-				   ignore all previous settings and check the next bar*/
-
-				/* we though this was a 64bit bar , and it seems this
-				   was wrong ! so decrement barIndex */
-				barIndex--;
-				continue;
-			}
-
-			/* calculate the full 64 bit size  */
-
-			if (0 != pPciAgent->pciBar[detectedBar].barSizeHigh)
-			{
-				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
-
-				pPciAgent->pciBar[detectedBar].barSizeLow =
-					~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
-
-				pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
-
-			}
-			else
-			{
-
-				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
-
-				pPciAgent->pciBar[detectedBar].barSizeLow =
-					~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
-
-				pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
-
-			}
-
-
-
-		}
-		else /* 32bit bar */
-		{
-			/* write oxffffffff to the bar to get the size */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
-							0xffffffff);
-
-			/* read size */
-			pPciAgent->pciBar[detectedBar].barSizeLow =
-				mvPciIfConfigRead(pciIf,
-								bus,dev,func,
-								PCI_MEMORY_BAR_BASE_ADDR(barIndex));
-
-			if (0 == pPciAgent->pciBar[detectedBar].barSizeLow)
-			{
-				/* this bar is not applicable for this device,
-				   ignore all previous settings and check the next bar*/
-				continue;
-			}
-
-
-			/* restore original value */
-			mvPciIfConfigWrite(pciIf,
-							bus,dev,func,
-							PCI_MEMORY_BAR_BASE_ADDR(barIndex),
-							tmpBaseLow);
-
-		/* calculate size low */
-
-			if (PCI_MEMORY_BAR == pPciAgent->pciBar[detectedBar].barMapping)
-			{
-				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_MEM_BASE_MASK;
-			}
-			else
-			{
-				pPciAgent->pciBar[detectedBar].barSizeLow &= PBBLR_IO_BASE_MASK;
-			}
-
-			pPciAgent->pciBar[detectedBar].barSizeLow =
-				~pPciAgent->pciBar[detectedBar].barSizeLow + 1;
-
-			pPciAgent->pciBar[detectedBar].barSizeHigh = 0;
-			pPciAgent->pciBar[detectedBar].barSize =
-				(MV_U64)pPciAgent->pciBar[detectedBar].barSizeLow;
-
-
-		}
-
-		/* we are here ! this means we have already detected a bar for
-		this device , now move on */
-
-		detectedBar++;
-		pPciAgent->barsNum++;
-	}
-
-	return detectedBar;
-}
-
-
-/*******************************************************************************
-* mvPciClassNameGet - get PCI  class name
-*
-* DESCRIPTION:
-*		This function returns the PCI class name
-*
-* INPUT:
-*       baseClassCode       - Base Class Code.
-*
-* OUTPUT:
-*       pType - the class name
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciClassNameGet(MV_U32 baseClassCode, MV_8 *pType)
-{
-
-    switch(baseClassCode)
-    {
-        case 0x0:
-            strcpy(pType,"Old generation device");
-            break;
-        case 0x1:
-            strcpy(pType,"Mass storage controller");
-            break;
-        case 0x2:
-            strcpy(pType,"Network controller");
-            break;
-        case 0x3:
-            strcpy(pType,"Display controller");
-            break;
-        case 0x4:
-            strcpy(pType,"Multimedia device");
-            break;
-        case 0x5:
-            strcpy(pType,"Memory controller");
-            break;
-        case 0x6:
-            strcpy(pType,"Bridge Device");
-            break;
-        case 0x7:
-            strcpy(pType,"Simple Communication controllers");
-            break;
-        case 0x8:
-            strcpy(pType,"Base system peripherals");
-            break;
-        case 0x9:
-            strcpy(pType,"Input Devices");
-            break;
-        case 0xa:
-            strcpy(pType,"Docking stations");
-            break;
-        case 0xb:
-            strcpy(pType,"Processors");
-            break;
-        case 0xc:
-            strcpy(pType,"Serial bus controllers");
-            break;
-        case 0xd:
-            strcpy(pType,"Wireless controllers");
-            break;
-        case 0xe:
-            strcpy(pType,"Intelligent I/O controllers");
-            break;
-        case 0xf:
-            strcpy(pType,"Satellite communication controllers");
-            break;
-        case 0x10:
-            strcpy(pType,"Encryption/Decryption controllers");
-            break;
-        case 0x11:
-            strcpy(pType,"Data acquisition and signal processing controllers");
-            break;
-        default:
-            strcpy(pType,"Unknown device");
-            break;
-    }
-
-	return MV_OK;
-
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h
deleted file mode 100644
index 2ee0b1738b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci-if/pci_util/mvPciUtils.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvPciUtilsh
-#define __INCmvPciUtilsh
-
-/* 
-This module only support scanning of Header type 00h of pci devices 
-There is no suppotr for Header type 01h of pci devices  ( PCI bridges )
-*/
-
-/* includes */
-#include "mvSysHwConfig.h"
-#include "pci-if/mvPciIf.h"
-#include "pci/mvPciRegs.h"
-
-
-
-/* PCI base address low bar mask */
-#define PCI_ERROR_CODE                      0xffffffff
-
-#define PCI_BRIDGE_CLASS					0x6
-#define P2P_BRIDGE_SUB_CLASS_CODE			0x4
-
-
-#define P2P_BUSSES_NUM						0x18
-#define P2P_IO_BASE_LIMIT_SEC_STATUS		0x1C
-#define P2P_MEM_BASE_LIMIT					0x20
-#define P2P_PREF_MEM_BASE_LIMIT				0x24
-#define P2P_PREF_BASE_UPPER_32				0x28
-#define P2P_PREF_LIMIT_UPPER_32				0x2C
-#define P2P_IO_BASE_LIMIT_UPPER_16			0x30
-#define P2P_EXP_ROM							0x38
-
-/* P2P_BUSSES_NUM  (PBM) */
-
-#define PBM_PRIME_BUS_NUM_OFFS				0
-#define PBM_PRIME_BUS_NUM_MASK				(0xff << PBM_PRIME_BUS_NUM_OFFS)
-
-#define PBM_SEC_BUS_NUM_OFFS				8
-#define PBM_SEC_BUS_NUM_MASK				(0xff << PBM_SEC_BUS_NUM_OFFS)
-
-#define PBM_SUB_BUS_NUM_OFFS				16
-#define PBM_SUB_BUS_NUM_MASK				(0xff << PBM_SUB_BUS_NUM_OFFS)
-
-#define PBM_SEC_LAT_TMR_OFFS				24
-#define PBM_SEC_LAT_TMR_MASK				(0xff << PBM_SEC_LAT_TMR_OFFS)
-
-/* P2P_IO_BASE_LIMIT_SEC_STATUS (PIBLSS) */
-
-#define PIBLSS_IO_BASE_OFFS					0
-#define PIBLSS_IO_BASE_MASK					(0xff << PIBLSS_IO_BASE_OFFS)
-
-#define PIBLSS_ADD_CAP_OFFS					0
-#define PIBLSS_ADD_CAP_MASK 				(0x3 << PIBLSS_ADD_CAP_OFFS)
-#define PIBLSS_ADD_CAP_16BIT 				(0x0 << PIBLSS_ADD_CAP_OFFS)
-#define PIBLSS_ADD_CAP_32BIT 				(0x1 << PIBLSS_ADD_CAP_OFFS)
-
-#define PIBLSS_LOW_ADDR_OFFS				0
-#define PIBLSS_LOW_ADDR_MASK				(0xFFF << PIBLSS_LOW_ADDR_OFFS)
-
-#define PIBLSS_HIGH_ADDR_OFFS				12
-#define PIBLSS_HIGH_ADDR_MASK				(0xF << PIBLSS_HIGH_ADDR_OFFS)
-
-#define PIBLSS_IO_LIMIT_OFFS				8
-#define PIBLSS_IO_LIMIT_MASK				(0xff << PIBLSS_IO_LIMIT_OFFS)
-
-#define PIBLSS_SEC_STATUS_OFFS				16
-#define PIBLSS_SEC_STATUS_MASK				(0xffff << PIBLSS_SEC_STATUS_OFFS)
-
-
-/* P2P_MEM_BASE_LIMIT (PMBL)*/
-
-#define PMBL_MEM_BASE_OFFS					0
-#define PMBL_MEM_BASE_MASK					(0xffff << PMBL_MEM_BASE_OFFS)
-
-#define PMBL_MEM_LIMIT_OFFS					16
-#define PMBL_MEM_LIMIT_MASK					(0xffff << PMBL_MEM_LIMIT_OFFS)
-
-
-#define PMBL_LOW_ADDR_OFFS					0
-#define PMBL_LOW_ADDR_MASK					(0xFFFFF << PMBL_LOW_ADDR_OFFS)
-
-#define PMBL_HIGH_ADDR_OFFS					20
-#define PMBL_HIGH_ADDR_MASK					(0xFFF << PMBL_HIGH_ADDR_OFFS)
-
-
-/* P2P_PREF_MEM_BASE_LIMIT (PRMBL) */
-
-#define PRMBL_PREF_MEM_BASE_OFFS			0
-#define PRMBL_PREF_MEM_BASE_MASK			(0xffff << PRMBL_PREF_MEM_BASE_OFFS)
-
-#define PRMBL_PREF_MEM_LIMIT_OFFS			16
-#define PRMBL_PREF_MEM_LIMIT_MASK			(0xffff<<PRMBL_PREF_MEM_LIMIT_OFFS)
-
-#define PRMBL_LOW_ADDR_OFFS					0
-#define PRMBL_LOW_ADDR_MASK					(0xFFFFF << PRMBL_LOW_ADDR_OFFS)
-
-#define PRMBL_HIGH_ADDR_OFFS				20
-#define PRMBL_HIGH_ADDR_MASK				(0xFFF << PRMBL_HIGH_ADDR_OFFS)
-
-#define PRMBL_ADD_CAP_OFFS					0
-#define PRMBL_ADD_CAP_MASK					(0xf << PRMBL_ADD_CAP_OFFS)
-#define PRMBL_ADD_CAP_32BIT					(0x0 << PRMBL_ADD_CAP_OFFS)
-#define PRMBL_ADD_CAP_64BIT					(0x1 << PRMBL_ADD_CAP_OFFS)
-
-/* P2P_IO_BASE_LIMIT_UPPER_16 (PIBLU) */
-
-#define PRBU_IO_UPP_BASE_OFFS				0
-#define PRBU_IO_UPP_BASE_MASK				(0xffff << PRBU_IO_UPP_BASE_OFFS)
-
-#define PRBU_IO_UPP_LIMIT_OFFS				16
-#define PRBU_IO_UPP_LIMIT_MASK				(0xffff << PRBU_IO_UPP_LIMIT_OFFS)
-
-
-/* typedefs */
-
-typedef enum _mvPciBarMapping
-{
-    PCI_MEMORY_BAR, 
-    PCI_IO_BAR, 
-    PCI_NO_MAPPING
-}MV_PCI_BAR_MAPPING;
-
-typedef enum _mvPciBarType
-{
-    PCI_32BIT_BAR, 
-    PCI_64BIT_BAR
-}MV_PCI_BAR_TYPE;
-
-typedef enum _mvPciIntPin
-{
-    MV_PCI_INTA = 1,
-    MV_PCI_INTB = 2,
-    MV_PCI_INTC = 3,
-    MV_PCI_INTD = 4
-}MV_PCI_INT_PIN;
-
-typedef enum _mvPciHeader
-{
-    MV_PCI_STANDARD,
-    MV_PCI_PCI2PCI_BRIDGE
-
-}MV_PCI_HEADER;
-
-
-/* BAR structure */
-typedef struct _pciBar
-{
-    MV_U32 barOffset;
-    MV_U32 barBaseLow;
-    MV_U32 barBaseHigh;
-    MV_U32 barSizeLow;
-    MV_U32 barSizeHigh;
-    /* The 'barBaseAddr' is a 64-bit variable
-       that will contain the TOTAL base address
-       value achived by combining both the 'barBaseLow'
-       and the 'barBaseHigh' parameters as follows:
-
-       BIT: 63          31         0
-            |           |         |
-            barBaseHigh barBaseLow */
-    MV_U64 barBaseAddr;
-    /* The 'barSize' is a 64-bit variable
-       that will contain the TOTAL size achived
-       by combining both the 'barSizeLow' and
-       the 'barSizeHigh' parameters as follows:
-
-       BIT: 63          31         0
-            |           |         |
-            barSizeHigh barSizeLow
-
-       NOTE: The total size described above
-             is AFTER the size calculation as
-             described in PCI spec rev2.2 */
-    MV_U64 barSize;
-    MV_BOOL            isPrefetchable;
-    MV_PCI_BAR_TYPE       barType;
-    MV_PCI_BAR_MAPPING    barMapping;
-
-
-} PCI_BAR;
-
-/* Device information structure */
-typedef struct _mvPciDevice
-{
-    /* Device specific information */
-	MV_U32			busNumber; 	/* Pci agent bus number */
-    MV_U32			deviceNum;	/* Pci agent device number */
-    MV_U32			function;	/* Pci agent function number */
-
-	MV_U32			venID;		/* Pci agent Vendor ID */
-    MV_U32			deviceID;	/* Pci agent Device ID */
-
-    MV_BOOL			isFastB2BCapable;	/* Capability of Fast Back to Back 
-										   transactions */
-	MV_BOOL			isCapListSupport;	/* Support of Capability list */
-	MV_BOOL			is66MHZCapable;		/* 66MHZ support */
-
-    MV_U32			baseClassCode;		/* Pci agent base Class Code */
-    MV_U32			subClassCode;		/* Pci agent sub Class Code */
-    MV_U32			progIf;				/* Pci agent Programing interface */
-	MV_U32			revisionID;
-
-    PCI_BAR			pciBar[6]; 			/* Pci agent bar list */
-
-	MV_U32			p2pPrimBusNum;		/* P2P Primary Bus number*/
-	MV_U32			p2pSecBusNum;		/* P2P Secondary Bus Number*/
-	MV_U32			p2pSubBusNum;		/* P2P Subordinate bus Number */
-	MV_U32			p2pSecLatencyTimer;	/* P2P Econdary Latency Timer*/
-	MV_U32			p2pIObase;			/* P2P IO Base */
-	MV_U32			p2pIOLimit;			/* P2P IO Linit */
-	MV_BOOL			bIO32;	
-	MV_U32			p2pSecStatus;		/* P2P Secondary Status */
-	MV_U32			p2pMemBase;			/* P2P Memory Space */
-	MV_U32			p2pMemLimit;		/* P2P Memory Limit*/
-	MV_U32			p2pPrefMemBase;		/* P2P Prefetchable Mem Base*/
-	MV_U32			p2pPrefMemLimit;	/* P2P Prefetchable Memory Limit*/
-	MV_BOOL			bPrefMem64;	
-	MV_U32			p2pPrefBaseUpper32Bits;/* P2P Prefetchable upper 32 bits*/
-	MV_U32			p2pPrefLimitUpper32Bits;/* P2P prefetchable limit upper 32*/
-
-
-	MV_U32			pciCacheLine;		/* Pci agent cache line */
-	MV_U32			pciLatencyTimer;	/* Pci agent Latency timer  */
-    MV_PCI_HEADER	pciHeader;			/* Pci agent header type*/
-    MV_BOOL			isMultiFunction;	/* Multi function support */
-	MV_BOOL			isBISTCapable;		/* Self test capable */
-
-	MV_U32			subSysID;			/* Sub System ID */
-	MV_U32			subSysVenID;		/* Sub System Vendor ID */
-
-	MV_BOOL			isExpRom;			/* Expantion Rom support */
-	MV_U32			expRomAddr;			/* Expantion Rom pointer */
-
-	MV_U32			capListPointer;		/* Capability list pointer */
-
-	MV_U32			irqLine;		/* IRQ line  */
-	MV_PCI_INT_PIN	intPin;			/* Interrupt pin */
-	MV_U32			minGrant;		/* Minimum grant*/
-	MV_U32			maxLatency;		/* Maximum latency*/
-
-	MV_U32 			funtionsNum;	/* pci agent total functions number */
-
-	MV_U32 			barsNum;
-    MV_U8           type[60];		/* class name of the pci agent */
-
-
-} MV_PCI_DEVICE;
-
-/* PCI gloabl functions */
-MV_STATUS mvPciClassNameGet(MV_U32 classCode, MV_8 *pType);
-
-
-/* Performs a full scan on both PCIs and returns all possible details on the
-   agents found on the bus. */
-MV_STATUS mvPciScan(MV_U32 pciIf,
-					MV_PCI_DEVICE *pPciAgents,
-					MV_U32 *pPciAgentsNum);
-
-
-#endif /* #ifndef __INCmvPciUtilsh */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c
deleted file mode 100644
index 4a087343de..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#include "pci/mvPci.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-					 
-
-
-MV_VOID mvPciHalInit(MV_U32 pciIf, MV_PCI_MOD pciIfmod)
-{
-        if (MV_PCI_MOD_HOST == pciIfmod)
-    {
-
-                mvPciLocalBusNumSet(pciIf, PCI_HOST_BUS_NUM(pciIf));
-                mvPciLocalDevNumSet(pciIf, PCI_HOST_DEV_NUM(pciIf));
-        
-                /* Local device master Enable */
-                mvPciMasterEnable(pciIf, MV_TRUE);
-        
-                /* Local device slave Enable */
-                mvPciSlaveEnable(pciIf, mvPciLocalBusNumGet(pciIf),
-                                                 mvPciLocalDevNumGet(pciIf), MV_TRUE);
-        }
-        /* enable CPU-2-PCI ordering */
-        MV_REG_BIT_SET(PCI_CMD_REG(0), PCR_CPU_TO_PCI_ORDER_EN);
-}
-
-/*******************************************************************************
-* mvPciCommandSet - Set PCI comman register value.
-*
-* DESCRIPTION:
-*       This function sets a given PCI interface with its command register 
-*       value.
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       command - 32bit value to be written to comamnd register.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM if pciIf is not in range otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciCommandSet(MV_U32 pciIf, MV_U32 command)
-{
-    MV_U32 locBusNum, locDevNum, regVal;
-
-    locBusNum =  mvPciLocalBusNumGet(pciIf);
-    locDevNum =  mvPciLocalDevNumGet(pciIf);
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciCommandSet: ERR. Invalid PCI IF num %d\n", pciIf);
-		return MV_BAD_PARAM;
-	}
-
-	/* Set command register */
-	MV_REG_WRITE(PCI_CMD_REG(pciIf), command);
-
-    /* Upodate device max outstanding split tarnsaction */
-    if ((command & PCR_CPU_TO_PCI_ORDER_EN) && 
-        (command & PCR_PCI_TO_CPU_ORDER_EN))
-    {
-        /* Read PCI-X command register */
-        regVal = mvPciConfigRead (pciIf, locBusNum, locDevNum, 0, PCIX_COMMAND);
-                        
-        /* clear bits 22:20 */
-        regVal &= 0xff8fffff;
-
-        /* set reset value */
-        regVal |= (0x3 << 20);
-        
-        /* Write back the value */
-        mvPciConfigWrite (pciIf, locBusNum, locDevNum, 0, PCIX_COMMAND, regVal);
-    }
-
-	return MV_OK;
-
-
-}
-
-
-/*******************************************************************************
-* mvPciModeGet - Get PCI interface mode.
-*
-* DESCRIPTION:
-*       This function returns the given PCI interface mode.
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*
-* OUTPUT:
-*       pPciMode - Pointer to PCI mode structure.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciModeGet(MV_U32 pciIf, MV_PCI_MODE *pPciMode)
-{
-	MV_U32 pciMode;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciModeGet: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_BAD_PARAM;
-	}
-	if (NULL == pPciMode)
-	{
-		mvOsPrintf("mvPciModeGet: ERR. pPciMode = NULL  \n");
-		return MV_BAD_PARAM;
-	}
-
-	/* Read pci mode register */
-	pciMode = MV_REG_READ(PCI_MODE_REG(pciIf));
-	
-	switch (pciMode & PMR_PCI_MODE_MASK)
-	{
-		case PMR_PCI_MODE_CONV:
-            pPciMode->pciType  = MV_PCI_CONV;
-
-			if (MV_REG_READ(PCI_DLL_CTRL_REG(pciIf)) & PDC_DLL_EN)
-			{
-				pPciMode->pciSpeed = 66000000; /* 66MHZ */
-			}
-			else
-			{
-				pPciMode->pciSpeed = 33000000; /* 33MHZ */
-			}
-			
-			break;
-		
-		case PMR_PCI_MODE_PCIX_66MHZ:	
-			pPciMode->pciType  = MV_PCIX;
-			pPciMode->pciSpeed = 66000000; /* 66MHZ */	
-			break;
-		
-		case PMR_PCI_MODE_PCIX_100MHZ:	
-			pPciMode->pciType  = MV_PCIX;
-			pPciMode->pciSpeed = 100000000; /* 100MHZ */	
-			break;
-		
-		case PMR_PCI_MODE_PCIX_133MHZ:	
-			pPciMode->pciType  = MV_PCIX;
-			pPciMode->pciSpeed = 133000000; /* 133MHZ */	
-			break;
-
-		default:
-			{
-				mvOsPrintf("mvPciModeGet: ERR. Non existing mode !!\n");
-				return MV_ERROR;
-			}
-	}
-
-	switch (pciMode & PMR_PCI_64_MASK)
-	{
-		case PMR_PCI_64_64BIT:
-			pPciMode->pciWidth = MV_PCI_64;
-			break;
-		
-		case PMR_PCI_64_32BIT:
-            pPciMode->pciWidth = MV_PCI_32;
-            break;
-		
-		default:
-			{
-				mvOsPrintf("mvPciModeGet: ERR. Non existing mode !!\n");
-				return MV_ERROR;
-			}
-	}
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPciRetrySet - Set PCI retry counters
-*
-* DESCRIPTION:
-*       This function specifies the number of times the PCI controller 
-*       retries a transaction before it quits.
-*       Applies to the PCI Master when acting as a requester.
-*       Applies to the PCI slave when acting as a completer (PCI-X mode).
-*       A 0x00 value means a "retry forever".
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       counter - Number of times PCI controller retry. Use counter value 
-*                 up to PRR_RETRY_CNTR_MAX.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciRetrySet(MV_U32 pciIf, MV_U32 counter)
-{
-	MV_U32 pciRetry;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciRetrySet: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_BAD_PARAM;
-	}
-
-	if (counter >= PRR_RETRY_CNTR_MAX)
-	{
-		mvOsPrintf("mvPciRetrySet: ERR. Invalid counter: %d\n", counter);
-		return MV_BAD_PARAM;
-
-	}
-
-	/* Reading PCI retry register */
-    pciRetry  = MV_REG_READ(PCI_RETRY_REG(pciIf));
-
-	pciRetry &= ~PRR_RETRY_CNTR_MASK;
-
-	pciRetry |= (counter << PRR_RETRY_CNTR_OFFS);
-
-	/* write new value */
-	MV_REG_WRITE(PCI_RETRY_REG(pciIf), pciRetry);
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPciDiscardTimerSet - Set PCI discard timer
-*
-* DESCRIPTION:
-*       This function set PCI discard timer.
-*       In conventional PCI mode:
-*       Specifies the number of PCLK cycles the PCI slave keeps a non-accessed
-*       read buffers (non-completed delayed read) before invalidate the buffer.
-*       Set to '0' to disable the timer. The PCI slave waits for delayed 
-*       read completion forever.
-*       In PCI-X mode:
-*       Specifies the number of PCLK cycles the PCI master waits for split
-*       completion transaction, before it invalidates the pre-allocated read
-*       buffer.
-*       Set to '0' to disable the timer. The PCI master waits for split 
-*       completion forever.
-*       NOTE: Must be set to a number greater than MV_PCI_MAX_DISCARD_CLK, 
-*       unless using the "wait for ever" setting 0x0.
-*       NOTE: Must not be updated while there are pending read requests.
-*
-* INPUT:
-*       pciIf      - PCI interface number.
-*       pClkCycles - Number of PCI clock cycles.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciDiscardTimerSet(MV_U32 pciIf, MV_U32 pClkCycles)
-{
-	MV_U32 pciDiscardTimer;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciDiscardTimerSet: ERR. Invalid PCI interface %d\n", 
-																		pciIf);
-		return MV_BAD_PARAM;
-	}
-
-	if (pClkCycles >= PDTR_TIMER_MIN)
-	{
-		mvOsPrintf("mvPciDiscardTimerSet: ERR. Invalid Clk value: %d\n", 	
-																   pClkCycles);
-		return MV_BAD_PARAM;
-
-	}
-
-	/* Read  PCI Discard Timer */
-	pciDiscardTimer  = MV_REG_READ(PCI_DISCARD_TIMER_REG(pciIf));
-
-	pciDiscardTimer &= ~PDTR_TIMER_MASK;
-
-    pciDiscardTimer |= (pClkCycles << PDTR_TIMER_OFFS);
-
-	/* Write new value */
-	MV_REG_WRITE(PCI_DISCARD_TIMER_REG(pciIf), pciDiscardTimer);
-
-	return MV_OK;
-
-}
-
-/* PCI Arbiter routines */
-
-/*******************************************************************************
-* mvPciArbEnable - PCI arbiter enable/disable
-*
-* DESCRIPTION:
-*       This fuction enable/disables a given PCI interface arbiter.
-*       NOTE: Arbiter setting can not be changed while in work. It should only 
-*             be set once.
-* INPUT:
-*       pciIf  - PCI interface number.
-*       enable - Enable/disable parameter. If enable = MV_TRUE then enable.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvPciArbEnable(MV_U32 pciIf, MV_BOOL enable)
-{
-	MV_U32 regVal;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciArbEnable: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_ERROR;
-	}
-    	
-    /* Set PCI Arbiter Control register according to default configuration 	*/
-	regVal = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
-
-	/* Make sure arbiter disabled before changing its values */
-	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
-
-	regVal &= ~PCI_ARBITER_CTRL_DEFAULT_MASK;	
-
-	regVal |= PCI_ARBITER_CTRL_DEFAULT;		/* Set default configuration	*/
-
-	if (MV_TRUE == enable)
-	{
-		regVal |= PACR_ARB_ENABLE; 
-	}
-	else
-	{
-		regVal &= ~PACR_ARB_ENABLE; 
-	}
-
-	/* Write to register 										            */
-	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), regVal);
-
-	return MV_OK;	
-}
-
-
-/*******************************************************************************
-* mvPciArbParkDis - Disable arbiter parking on agent
-*
-* DESCRIPTION:
-*       This function disables the PCI arbiter from parking on the given agent
-*       list.
-*
-* INPUT:
-*       pciIf        - PCI interface number.
-*       pciAgentMask - When a bit in the mask is set to '1', parking on 
-*                      the associated PCI master is disabled. Mask bit 
-*                      refers to bit 0 - 6. For example disable parking on PCI
-*                      agent 3 set pciAgentMask 0x4 (bit 3 is set).
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-MV_STATUS mvPciArbParkDis(MV_U32 pciIf, MV_U32 pciAgentMask)
-{
-	MV_U32 pciArbiterCtrl;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciArbParkDis: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_ERROR;
-	}
-
-	/* Reading Arbiter Control register */
-	pciArbiterCtrl = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
-
-	/* Arbiter must be disabled before changing parking */
-	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
-
-	/* do the change */
-    pciArbiterCtrl &= ~PACR_PARK_DIS_MASK;
-	pciArbiterCtrl |= (pciAgentMask << PACR_PARK_DIS_OFFS);
-
-	/* writing new value ( if th earbiter was enabled before the change		*/ 
-	/* here it will be reenabled 											*/
-	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), pciArbiterCtrl);
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPciArbBrokDetectSet - Set PCI arbiter broken detection
-*
-* DESCRIPTION:
-*       This function sets the maximum number of cycles that the arbiter 
-*       waits for a PCI master to respond to its grant assertion. If a 
-*       PCI agent fails to respond within this time, the PCI arbiter aborts 
-*       the transaction and performs a new arbitration cycle.
-*       NOTE: Value must be greater than '1' for conventional PCI and 
-*       greater than '5' for PCI-X.
-*
-* INPUT:
-*       pciIf      - PCI interface number.
-*       pClkCycles - Number of PCI clock cycles. If equal to '0' the broken
-*                    master detection is disabled.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciArbBrokDetectSet(MV_U32 pciIf, MV_U32 pClkCycles)
-{
-	MV_U32 pciArbiterCtrl;
-	MV_U32 pciMode;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciArbBrokDetectSet: ERR. Invalid PCI interface %d\n", 
-																		pciIf);
-		return MV_BAD_PARAM;
-	}
-
-	/* Checking PCI mode and if pClkCycles is legal value */
-	pciMode = MV_REG_READ(PCI_MODE_REG(pciIf));
-	pciMode &= PMR_PCI_MODE_MASK;
-
-	if (PMR_PCI_MODE_CONV == pciMode)
-	{
-		if (pClkCycles < PACR_BROKEN_VAL_CONV_MIN) 
-			return MV_ERROR;
-	}
-	else
-	{
-		if (pClkCycles < PACR_BROKEN_VAL_PCIX_MIN) 
-			return MV_ERROR;
-	}
-
-	pClkCycles <<= PACR_BROKEN_VAL_OFFS;
-
-	/* Reading Arbiter Control register */
-	pciArbiterCtrl  = MV_REG_READ(PCI_ARBITER_CTRL_REG(pciIf));
-	pciArbiterCtrl &= ~PACR_BROKEN_VAL_MASK;
-	pciArbiterCtrl |= pClkCycles;
-
-	/* Arbiter must be disabled before changing broken detection */
-	MV_REG_BIT_RESET(PCI_ARBITER_CTRL_REG(pciIf), PACR_ARB_ENABLE); 
-
-	/* writing new value ( if th earbiter was enabled before the change 	*/
-	/* here it will be reenabled 											*/
-
-	MV_REG_WRITE(PCI_ARBITER_CTRL_REG(pciIf), pciArbiterCtrl);
-
-	return MV_OK;
-}
-
-/* PCI configuration space read write */
-
-/*******************************************************************************
-* mvPciConfigRead - Read from configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit read from PCI configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to read from local bus segment, use 
-*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       bus     - PCI segment bus number.
-*       dev     - PCI device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit register data, 0xffffffff on error
-*
-*******************************************************************************/
-MV_U32 mvPciConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
-                        MV_U32 regOff)
-{
-	MV_U32 pciData = 0;
-
-	/* Parameter checking   */
-	if (PCI_DEFAULT_IF != pciIf)
-	{
-		if (pciIf >= mvCtrlPciMaxIfGet())
-		{
-			mvOsPrintf("mvPciConfigRead: ERR. Invalid PCI interface %d\n",pciIf);
-			return 0xFFFFFFFF;
-		}
-	}
-
-	if (dev >= MAX_PCI_DEVICES)
-	{
-		DB(mvOsPrintf("mvPciConfigRead: ERR. device number illigal %d\n", dev));
-		return 0xFFFFFFFF;
-	}
-	
-	if (func >= MAX_PCI_FUNCS)
-	{
-		DB(mvOsPrintf("mvPciConfigRead: ERR. function number illigal %d\n", func));
-		return 0xFFFFFFFF;
-	}
-	
-	if (bus >= MAX_PCI_BUSSES)
-	{
-		DB(mvOsPrintf("mvPciConfigRead: ERR. bus number illigal %d\n", bus));
-		return MV_ERROR;
-	}
-
-
-	/* Creating PCI address to be passed */
-	pciData |= (bus << PCAR_BUS_NUM_OFFS);
-	pciData |= (dev << PCAR_DEVICE_NUM_OFFS);
-	pciData |= (func << PCAR_FUNC_NUM_OFFS);
-	pciData |= (regOff & PCAR_REG_NUM_MASK);
-
-	pciData |= PCAR_CONFIG_EN; 
-	
-	/* Write the address to the PCI configuration address register */
-	MV_REG_WRITE(PCI_CONFIG_ADDR_REG(pciIf), pciData);
-
-	/* In order to let the PCI controller absorbed the address of the read 	*/
-	/* transaction we perform a validity check that the address was written */
-	if(pciData != MV_REG_READ(PCI_CONFIG_ADDR_REG(pciIf)))
-	{
-		return MV_ERROR;
-	}
-	/* Read the Data returned in the PCI Data register */
-	pciData = MV_REG_READ(PCI_CONFIG_DATA_REG(pciIf));
-
-	return pciData;
-}
-
-/*******************************************************************************
-* mvPciConfigWrite - Write to configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit write to PCI configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to write to local bus segment, use 
-*       bus number retrieved from mvPciLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pciIf   - PCI interface number.
-*       bus     - PCI segment bus number.
-*       dev     - PCI device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*       data    - 32bit data.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, 
-                           MV_U32 func, MV_U32 regOff, MV_U32 data)
-{
-	MV_U32 pciData = 0;
-
-	/* Parameter checking   */
-	if (PCI_DEFAULT_IF != pciIf)
-	{
-		if (pciIf >= mvCtrlPciMaxIfGet())
-		{
-			mvOsPrintf("mvPciConfigWrite: ERR. Invalid PCI interface %d\n", 
-																		pciIf);
-			return 0xFFFFFFFF;
-		}
-	}
-
-	if (dev >= MAX_PCI_DEVICES)
-	{
-		mvOsPrintf("mvPciConfigWrite: ERR. device number illigal %d\n",dev);
-		return MV_BAD_PARAM;
-	}
-
-	if (func >= MAX_PCI_FUNCS)
-	{
-		mvOsPrintf("mvPciConfigWrite: ERR. function number illigal %d\n", func);
-		return MV_ERROR;
-	}
-
-	if (bus >= MAX_PCI_BUSSES)
-	{
-		mvOsPrintf("mvPciConfigWrite: ERR. bus number illigal %d\n", bus);
-		return MV_ERROR;
-	}
-
-	/* Creating PCI address to be passed */
-	pciData |= (bus << PCAR_BUS_NUM_OFFS);
-	pciData |= (dev << PCAR_DEVICE_NUM_OFFS);
-	pciData |= (func << PCAR_FUNC_NUM_OFFS);
-	pciData |= (regOff & PCAR_REG_NUM_MASK);
-
-	pciData |= PCAR_CONFIG_EN;
-	
-	/* Write the address to the PCI configuration address register */
-	MV_REG_WRITE(PCI_CONFIG_ADDR_REG(pciIf), pciData);
-
-	/* In order to let the PCI controller absorbed the address of the read 	*/
-	/* transaction we perform a validity check that the address was written */
-	if(pciData != MV_REG_READ(PCI_CONFIG_ADDR_REG(pciIf)))
-	{
-		return MV_ERROR;
-	}
-
-	/* Write the Data passed to the PCI Data register */
-	MV_REG_WRITE(PCI_CONFIG_DATA_REG(pciIf), data);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPciMasterEnable - Enable/disale PCI interface master transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PCI command status 
-*       (offset 0x4) to set/reset bit 2. After this bit is set, the PCI 
-*       master is allowed to gain ownership on the bus, otherwise it is 
-*       incapable to do so.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciMasterEnable(MV_U32 pciIf, MV_BOOL enable)
-{
-	MV_U32 pciCommandStatus;
-	MV_U32 RegOffs;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciMasterEnable: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_ERROR;
-	}
-
-	localBus = mvPciLocalBusNumGet(pciIf);
-	localDev = mvPciLocalDevNumGet(pciIf);
-	
-	RegOffs = PCI_STATUS_AND_COMMAND;
-
-	pciCommandStatus = mvPciConfigRead(pciIf, localBus, localDev, 0, RegOffs);
-
-	if (MV_TRUE == enable)
-	{
-		pciCommandStatus |= PSCR_MASTER_EN;
-	}
-	else
-	{
-		pciCommandStatus &= ~PSCR_MASTER_EN;
-	}
-
-	mvPciConfigWrite(pciIf, localBus, localDev, 0, RegOffs, pciCommandStatus);
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PCI command status 
-*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
-*       the PCI slave is allowed to respond to PCI IO space access (bit 0) 
-*       and PCI memory space access (bit 1). 
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       dev     - PCI device number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciSlaveEnable(MV_U32 pciIf, MV_U32 bus, MV_U32 dev, MV_BOOL enable)
-{
-	MV_U32 pciCommandStatus;
-	MV_U32 RegOffs;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciSlaveEnable: ERR. Invalid PCI interface %d\n", pciIf);
-		return MV_BAD_PARAM;
-	}
-	if (dev >= MAX_PCI_DEVICES)
-	{
-		mvOsPrintf("mvPciLocalDevNumSet: ERR. device number illigal %d\n", dev);
-		return MV_BAD_PARAM;
-
-	}
-
-	RegOffs = PCI_STATUS_AND_COMMAND;
-	
-	pciCommandStatus=mvPciConfigRead(pciIf, bus, dev, 0, RegOffs);
-
-    if (MV_TRUE == enable)
-	{
-		pciCommandStatus |= (PSCR_IO_EN | PSCR_MEM_EN);
-	}
-	else                             
-	{
-		pciCommandStatus &= ~(PSCR_IO_EN | PSCR_MEM_EN);
-	}
-
-	mvPciConfigWrite(pciIf, bus, dev, 0, RegOffs, pciCommandStatus);
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPciLocalBusNumSet - Set PCI interface local bus number.
-*
-* DESCRIPTION:
-*       This function sets given PCI interface its local bus number.
-*       Note: In case the PCI interface is PCI-X, the information is read-only.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       busNum - Bus number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PCI interface is PCI-X. 
-*       MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum)
-{
-	MV_U32 pciP2PConfig;
-	MV_PCI_MODE pciMode;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciLocalBusNumSet: ERR. Invalid PCI interface %d\n",pciIf);
-		return MV_BAD_PARAM;
-	}
-	if (busNum >= MAX_PCI_BUSSES)
-	{
-		mvOsPrintf("mvPciLocalBusNumSet: ERR. bus number illigal %d\n", busNum);
-		return MV_ERROR;
-
-	}
-
-	localBus = mvPciLocalBusNumGet(pciIf);
-	localDev = mvPciLocalDevNumGet(pciIf);
-
-
-	/* PCI interface mode */
-	mvPciModeGet(pciIf, &pciMode);
-
-	/* if PCI type is PCI-X then it is not allowed to change the dev number */
-	if (MV_PCIX == pciMode.pciType)
-	{
-		pciP2PConfig = mvPciConfigRead(pciIf, localBus, localDev, 0, PCIX_STATUS );
-
-		pciP2PConfig &= ~PXS_BN_MASK;
-
-		pciP2PConfig |= (busNum << PXS_BN_OFFS) & PXS_BN_MASK;
-
-		mvPciConfigWrite(pciIf, localBus, localDev, 0, PCIX_STATUS,pciP2PConfig );
-
-	}
-	else
-	{
-		pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
-
-		pciP2PConfig &= ~PPCR_BUS_NUM_MASK;
-
-		pciP2PConfig |= (busNum << PPCR_BUS_NUM_OFFS) & PPCR_BUS_NUM_MASK;
-
-		MV_REG_WRITE(PCI_P2P_CONFIG_REG(pciIf), pciP2PConfig);
-
-	}
-
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPciLocalBusNumGet - Get PCI interface local bus number.
-*
-* DESCRIPTION:
-*       This function gets the local bus number of a given PCI interface.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local bus number.0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPciLocalBusNumGet(MV_U32 pciIf)
-{
-	MV_U32 pciP2PConfig;
-
-	/* Parameter checking   */
-	if (PCI_DEFAULT_IF != pciIf)
-	{
-		if (pciIf >= mvCtrlPciMaxIfGet())
-		{
-			mvOsPrintf("mvPciLocalBusNumGet: ERR. Invalid PCI interface %d\n", 
-													   					pciIf);
-			return 0xFFFFFFFF;
-		}
-	}
-
-	pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
-	pciP2PConfig &= PPCR_BUS_NUM_MASK;
-	return (pciP2PConfig >> PPCR_BUS_NUM_OFFS);
-}
-
-
-/*******************************************************************************
-* mvPciLocalDevNumSet - Set PCI interface local device number.
-*
-* DESCRIPTION:
-*       This function sets given PCI interface its local device number.
-*       Note: In case the PCI interface is PCI-X, the information is read-only.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*       devNum - Device number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PCI interface is PCI-X. MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPciLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum)
-{
-	MV_U32 pciP2PConfig;
-	MV_PCI_MODE pciMode;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-	/* Parameter checking   */
-	if (pciIf >= mvCtrlPciMaxIfGet())
-	{
-		mvOsPrintf("mvPciLocalDevNumSet: ERR. Invalid PCI interface %d\n",pciIf);
-		return MV_BAD_PARAM;
-	}
-	if (devNum >= MAX_PCI_DEVICES)
-	{
-		mvOsPrintf("mvPciLocalDevNumSet: ERR. device number illigal %d\n", 
-																	   devNum);
-		return MV_BAD_PARAM;
-
-	}
-	
-	localBus = mvPciLocalBusNumGet(pciIf);
-	localDev = mvPciLocalDevNumGet(pciIf);
-
-	/* PCI interface mode */
-	mvPciModeGet(pciIf, &pciMode);
-
-	/* if PCI type is PCIX then it is not allowed to change the dev number */
-	if (MV_PCIX == pciMode.pciType)
-	{
-		pciP2PConfig = mvPciConfigRead(pciIf, localBus, localDev, 0, PCIX_STATUS );
-
-		pciP2PConfig &= ~PXS_DN_MASK;
-
-		pciP2PConfig |= (devNum << PXS_DN_OFFS) & PXS_DN_MASK;
-
-		mvPciConfigWrite(pciIf,localBus, localDev, 0, PCIX_STATUS,pciP2PConfig );
-	}
-	else
-	{
-		pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
-
-		pciP2PConfig &= ~PPCR_DEV_NUM_MASK;
-
-		pciP2PConfig |= (devNum << PPCR_DEV_NUM_OFFS) & PPCR_DEV_NUM_MASK;
-
-		MV_REG_WRITE(PCI_P2P_CONFIG_REG(pciIf), pciP2PConfig);
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPciLocalDevNumGet - Get PCI interface local device number.
-*
-* DESCRIPTION:
-*       This function gets the local device number of a given PCI interface.
-*
-* INPUT:
-*       pciIf  - PCI interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local device number. 0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPciLocalDevNumGet(MV_U32 pciIf)
-{
-	MV_U32 pciP2PConfig;
-
-	/* Parameter checking   */
-	
-	if (PCI_DEFAULT_IF != pciIf)
-	{
-		if (pciIf >= mvCtrlPciMaxIfGet())
-		{
-			mvOsPrintf("mvPciLocalDevNumGet: ERR. Invalid PCI interface %d\n", 
-																   		pciIf);
-			return 0xFFFFFFFF;
-		}
-	}
-	
-	pciP2PConfig  = MV_REG_READ(PCI_P2P_CONFIG_REG(pciIf));
-
-	pciP2PConfig &= PPCR_DEV_NUM_MASK;
-
-	return (pciP2PConfig >> PPCR_DEV_NUM_OFFS);
-}
-
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h
deleted file mode 100644
index 474633627e..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPci.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#ifndef __INCPCIH
-#define __INCPCIH
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-#include "pci/mvPciRegs.h"
-
-
-/* NOTE not supported in this driver:
-
- Built In Self Test (BIST)
- Vital Product Data (VPD)
- Message Signaled Interrupt (MSI)
- Power Management
- Compact PCI Hot Swap
- Header retarget
- 
-Registers not supported: 
-1) PCI DLL Status and Control (PCI0 0x1D20, PCI1 0x1DA0)
-2) PCI/MPP Pads Calibration (CI0/MPP[31:16] 0x1D1C, PCI1/MPP[15:0] 0X1D9C)
-*/  
-
-/* defines */
-/* The number of supported PCI interfaces depend on Marvell controller 		*/
-/* device number. This device number ID is located on the PCI unit 			*/
-/* configuration header. This creates a loop where calling PCI 				*/
-/* configuration read/write	routine results a call to get PCI configuration */
-/* information etc. This macro defines a default PCI interface. This PCI	*/
-/* interface is sure to exist.												*/
-#define PCI_DEFAULT_IF	0
-
-
-/* typedefs */
-/* The Marvell controller supports both conventional PCI and PCI-X.         */
-/* This enumeration describes the PCI type.                                 */
-typedef enum _mvPciType
-{
-    MV_PCI_CONV,    /* Conventional PCI */
-    MV_PCIX         /* PCI-X            */
-}MV_PCI_TYPE;
-
-typedef enum _mvPciMod
-{
-	MV_PCI_MOD_HOST,
-	MV_PCI_MOD_DEVICE
-}MV_PCI_MOD;
-
-
-/* The Marvell controller supports both PCI width of 32 and 64 bit.         */
-/* This enumerator describes PCI width                                      */
-typedef enum _mvPciWidth
-{
-    MV_PCI_32,  /* PCI width 32bit  */
-    MV_PCI_64   /* PCI width 64bit  */
-}MV_PCI_WIDTH;
-
-/* This structure describes the PCI unit configured type, speed and width.  */
-typedef struct _mvPciMode
-{
-    MV_PCI_TYPE  pciType;    /* PCI type                                    */
-    MV_U32       pciSpeed;   /* Assuming PCI base clock on board is 33MHz   */
-    MV_PCI_WIDTH pciWidth;   /* PCI bus width                               */
-}MV_PCI_MODE;
-
-/* mvPciInit - Initialize PCI interfaces*/
-MV_VOID mvPciHalInit(MV_U32 pciIf, MV_PCI_MOD pciIfmod);
-
-/* mvPciCommandSet - Set PCI comman register value.*/
-MV_STATUS mvPciCommandSet(MV_U32 pciIf, MV_U32 command);
-
-/* mvPciModeGet - Get PCI interface mode.*/
-MV_STATUS mvPciModeGet(MV_U32 pciIf, MV_PCI_MODE *pPciMode);
-
-/* mvPciRetrySet - Set PCI retry counters*/
-MV_STATUS mvPciRetrySet(MV_U32 pciIf, MV_U32 counter);
-
-/* mvPciDiscardTimerSet - Set PCI discard timer*/
-MV_STATUS mvPciDiscardTimerSet(MV_U32 pciIf, MV_U32 pClkCycles);
-
-/* mvPciArbEnable - PCI arbiter enable/disable*/
-MV_STATUS mvPciArbEnable(MV_U32 pciIf, MV_BOOL enable);
-
-/* mvPciArbParkDis - Disable arbiter parking on agent */
-MV_STATUS mvPciArbParkDis(MV_U32 pciIf, MV_U32 pciAgentMask);
-
-/* mvPciArbBrokDetectSet - Set PCI arbiter broken detection */
-MV_STATUS mvPciArbBrokDetectSet(MV_U32 pciIf, MV_U32 pClkCycles);
-
-/* mvPciConfigRead - Read from configuration space */
-MV_U32 mvPciConfigRead (MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
-						MV_U32 func,MV_U32 regOff);
-
-/* mvPciConfigWrite - Write to configuration space */
-MV_STATUS mvPciConfigWrite(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,
-                           MV_U32 func, MV_U32 regOff, MV_U32 data);
-
-/* mvPciMasterEnable - Enable/disale PCI interface master transactions.*/
-MV_STATUS mvPciMasterEnable(MV_U32 pciIf, MV_BOOL enable);
-
-/* mvPciSlaveEnable - Enable/disale PCI interface slave transactions.*/
-MV_STATUS mvPciSlaveEnable(MV_U32 pciIf, MV_U32 bus, MV_U32 dev,MV_BOOL enable);
-
-/* mvPciLocalBusNumSet - Set PCI interface local bus number.*/
-MV_STATUS mvPciLocalBusNumSet(MV_U32 pciIf, MV_U32 busNum);
-
-/* mvPciLocalBusNumGet - Get PCI interface local bus number.*/
-MV_U32 mvPciLocalBusNumGet(MV_U32 pciIf);
-
-/* mvPciLocalDevNumSet - Set PCI interface local device number.*/
-MV_STATUS mvPciLocalDevNumSet(MV_U32 pciIf, MV_U32 devNum);
-
-/* mvPciLocalDevNumGet - Get PCI interface local device number.*/
-MV_U32 mvPciLocalDevNumGet(MV_U32 pciIf);
-
-
-#endif /* #ifndef __INCPCIH */
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h
deleted file mode 100644
index 89d0ef12d7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pci/mvPciRegs.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCPCIREGSH
-#define __INCPCIREGSH
-
-
-#include "pci-if/mvPciIfRegs.h"
-/* defines */
-#define MAX_PCI_DEVICES         32
-#define MAX_PCI_FUNCS           8
-#define MAX_PCI_BUSSES          128
-
-/* enumerators */
-
-/* This enumerator described the possible PCI slave targets.    	   */
-/* PCI slave targets are designated memory/IO address spaces that the  */
-/* PCI slave targets can access. They are also refered as "targets"    */
-/* this enumeratoe order is determined by the content of : 
-		PCI_BASE_ADDR_ENABLE_REG 				 					*/
-
-
-/* registers offsetes defines */
-
-
-
-/*************************/
-/* PCI control registers */
-/*************************/
-/* maen : should add new registers */
-#define PCI_CMD_REG(pciIf)				 		(0x30c00  + ((pciIf) * 0x80))
-#define PCI_MODE_REG(pciIf)				 		(0x30d00  + ((pciIf) * 0x80))
-#define PCI_RETRY_REG(pciIf)					(0x30c04  + ((pciIf) * 0x80))
-#define PCI_DISCARD_TIMER_REG(pciIf)			(0x30d04  + ((pciIf) * 0x80))
-#define PCI_ARBITER_CTRL_REG(pciIf)				(0x31d00 + ((pciIf) * 0x80))
-#define PCI_P2P_CONFIG_REG(pciIf)				(0x31d14 + ((pciIf) * 0x80))
-#define PCI_ACCESS_CTRL_BASEL_REG(pciIf, targetWin) \
-							(0x31e00 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
-#define PCI_ACCESS_CTRL_BASEH_REG(pciIf, targetWin) \
-							(0x31e04 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
-#define PCI_ACCESS_CTRL_SIZE_REG(pciIf, targetWin)	\
-							(0x31e08 + ((pciIf) * 0x80) + ((targetWin) * 0x10))
-							
-#define PCI_DLL_CTRL_REG(pciIf)	   		 		(0x31d20  + ((pciIf) * 0x80))
-
-/* PCI Dll Control (PDC)*/
-#define PDC_DLL_EN					BIT0
-
-
-/* PCI Command Register (PCR) */
-#define PCR_MASTER_BYTE_SWAP_EN     BIT0
-#define PCR_MASTER_WR_COMBINE_EN    BIT4
-#define PCR_MASTER_RD_COMBINE_EN    BIT5
-#define PCR_MASTER_WR_TRIG_WHOLE    BIT6
-#define PCR_MASTER_RD_TRIG_WHOLE    BIT7
-#define PCR_MASTER_MEM_RD_LINE_EN   BIT8
-#define PCR_MASTER_MEM_RD_MULT_EN   BIT9
-#define PCR_MASTER_WORD_SWAP_EN     BIT10
-#define PCR_SLAVE_WORD_SWAP_EN      BIT11
-#define PCR_NS_ACCORDING_RCV_TRANS  BIT14
-#define PCR_MASTER_PCIX_REQ64N_EN   BIT15
-#define PCR_SLAVE_BYTE_SWAP_EN      BIT16
-#define PCR_MASTER_DAC_EN           BIT17
-#define PCR_MASTER_M64_ALLIGN       BIT18
-#define PCR_ERRORS_PROPAGATION_EN   BIT19
-#define PCR_SLAVE_SWAP_ENABLE       BIT20
-#define PCR_MASTER_SWAP_ENABLE      BIT21
-#define PCR_MASTER_INT_SWAP_EN      BIT22
-#define PCR_LOOP_BACK_ENABLE        BIT23
-#define PCR_SLAVE_INTREG_SWAP_OFFS  24
-#define PCR_SLAVE_INTREG_SWAP_MASK  0x3
-#define PCR_SLAVE_INTREG_BYTE_SWAP  \
-                             (MV_BYTE_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
-#define PCR_SLAVE_INTREG_NO_SWAP    \
-                             (MV_NO_SWAP   << PCR_SLAVE_INT_REG_SWAP_MASK)
-#define PCR_SLAVE_INTREG_BYTE_WORD  \
-                             (MV_BYTE_WORD_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
-#define PCR_SLAVE_INTREG_WORD_SWAP  \
-                             (MV_WORD_SWAP << PCR_SLAVE_INT_REG_SWAP_MASK)
-#define PCR_RESET_REASSERTION_EN    BIT26
-#define PCR_PCI_TO_CPU_REG_ORDER_EN BIT28
-#define PCR_CPU_TO_PCI_ORDER_EN     BIT29
-#define PCR_PCI_TO_CPU_ORDER_EN     BIT30
-
-/* PCI Mode Register (PMR) */
-#define PMR_PCI_ID_OFFS 			0  /* PCI Interface ID */
-#define PMR_PCI_ID_MASK 			(0x1 << PMR_PCI_ID_OFFS)
-#define PMR_PCI_ID_PCI(pciNum) 		((pciNum) << PCI_MODE_PCIID_OFFS)
-
-#define PMR_PCI_64_OFFS				2 	/* 64-bit PCI Interface */
-#define PMR_PCI_64_MASK				(0x1 << PMR_PCI_64_OFFS)
-#define PMR_PCI_64_64BIT			(0x1 << PMR_PCI_64_OFFS)
-#define PMR_PCI_64_32BIT			(0x0 << PMR_PCI_64_OFFS)
-
-#define PMR_PCI_MODE_OFFS			4 	/* PCI interface mode of operation */
-#define PMR_PCI_MODE_MASK			(0x3 << PMR_PCI_MODE_OFFS)
-#define PMR_PCI_MODE_CONV			(0x0 << PMR_PCI_MODE_OFFS)
-#define PMR_PCI_MODE_PCIX_66MHZ		(0x1 << PMR_PCI_MODE_OFFS)
-#define PMR_PCI_MODE_PCIX_100MHZ	(0x2 << PMR_PCI_MODE_OFFS)
-#define PMR_PCI_MODE_PCIX_133MHZ	(0x3 << PMR_PCI_MODE_OFFS)
-
-#define PMR_EXP_ROM_SUPPORT			BIT8	/* Expansion ROM Active */
-
-#define PMR_PCI_RESET_OFFS			31 /* PCI Interface Reset Indication */
-#define PMR_PCI_RESET_MASK			(0x1 << PMR_PCI_RESET_OFFS)
-#define PMR_PCI_RESET_PCIXRST		(0x0 << PMR_PCI_RESET_OFFS)
-
-
-/* PCI Retry Register (PRR) */
-#define PRR_RETRY_CNTR_OFFS			16 /* Retry Counter */
-#define PRR_RETRY_CNTR_MAX			0xff
-#define PRR_RETRY_CNTR_MASK			(PRR_RETRY_CNTR_MAX << PRR_RETRY_CNTR_OFFS)
-
-
-/* PCI Discard Timer Register (PDTR) */
-#define PDTR_TIMER_OFFS				0	/* Timer */
-#define PDTR_TIMER_MAX				0xffff
-#define PDTR_TIMER_MIN				0x7F
-#define PDTR_TIMER_MASK				(PDTR_TIMER_MAX << PDTR_TIMER_OFFS)
-
-
-/* PCI Arbiter Control Register (PACR) */
-#define PACR_BROKEN_DETECT_EN		BIT1	/* Broken Detection Enable */
-
-#define PACR_BROKEN_VAL_OFFS		3	/* Broken Value */
-#define PACR_BROKEN_VAL_MASK		(0xf << PACR_BROKEN_VAL_OFFS)
-#define PACR_BROKEN_VAL_CONV_MIN	0x2
-#define PACR_BROKEN_VAL_PCIX_MIN	0x6
-
-#define PACR_PARK_DIS_OFFS		14	/* Parking Disable */
-#define PACR_PARK_DIS_MAX_AGENT	0x3f
-#define PACR_PARK_DIS_MASK		(PACR_PARK_DIS_MAX_AGENT<<PACR_PARK_DIS_OFFS)
-#define PACR_PARK_DIS(agent)	((1 << (agent)) << PACR_PARK_DIS_OFFS)
-
-#define PACR_ARB_ENABLE				BIT31	/* Enable Internal Arbiter */
-
-
-/* PCI P2P Configuration Register (PPCR) */
-#define PPCR_2ND_BUS_L_OFFS			0	/* 2nd PCI Interface Bus Range Lower */
-#define PPCR_2ND_BUS_L_MASK			(0xff << PPCR_2ND_BUS_L_OFFS)
-
-#define PPCR_2ND_BUS_H_OFFS			8	/* 2nd PCI Interface Bus Range Upper */
-#define PPCR_2ND_BUS_H_MASK			(0xff << PPCR_2ND_BUS_H_OFFS)
-
-#define PPCR_BUS_NUM_OFFS			16  /* The PCI interface's Bus number */
-#define PPCR_BUS_NUM_MASK			(0xff << PPCR_BUS_NUM_OFFS)
-
-#define PPCR_DEV_NUM_OFFS			24  /* The PCI interface’s Device number */
-#define PPCR_DEV_NUM_MASK			(0xff << PPCR_DEV_NUM_OFFS)
-
-
-/* PCI Access Control Base Low Register (PACBLR) */
-#define PACBLR_EN					BIT0 /* Access control window enable */
-
-#define PACBLR_ACCPROT				BIT4 /* Access Protect */
-#define PACBLR_WRPROT				BIT5 /* Write Protect */
-
-#define PACBLR_PCISWAP_OFFS			6 	 /* PCI slave Data Swap Control */
-#define PACBLR_PCISWAP_MASK			(0x3 << PACBLR_PCISWAP_OFFS)
-#define PACBLR_PCISWAP_BYTE			(0x0 << PACBLR_PCISWAP_OFFS)
-#define PACBLR_PCISWAP_NO_SWAP		(0x1 << PACBLR_PCISWAP_OFFS)
-#define PACBLR_PCISWAP_BYTE_WORD	(0x2 << PACBLR_PCISWAP_OFFS)
-#define PACBLR_PCISWAP_WORD			(0x3 << PACBLR_PCISWAP_OFFS)
-
-#define PACBLR_RDMBURST_OFFS		8 /* Read Max Burst */
-#define PACBLR_RDMBURST_MASK		(0x3 << PACBLR_RDMBURST_OFFS)
-#define PACBLR_RDMBURST_32BYTE		(0x0 << PACBLR_RDMBURST_OFFS)
-#define PACBLR_RDMBURST_64BYTE		(0x1 << PACBLR_RDMBURST_OFFS)
-#define PACBLR_RDMBURST_128BYTE		(0x2 << PACBLR_RDMBURST_OFFS)
-
-#define PACBLR_RDSIZE_OFFS			10 /* Typical PCI read transaction Size. */
-#define PACBLR_RDSIZE_MASK			(0x3 << PACBLR_RDSIZE_OFFS)
-#define PACBLR_RDSIZE_32BYTE		(0x0 << PACBLR_RDSIZE_OFFS)
-#define PACBLR_RDSIZE_64BYTE		(0x1 << PACBLR_RDSIZE_OFFS)
-#define PACBLR_RDSIZE_128BYTE		(0x2 << PACBLR_RDSIZE_OFFS)
-#define PACBLR_RDSIZE_256BYTE		(0x3 << PACBLR_RDSIZE_OFFS)
-
-#define PACBLR_BASE_L_OFFS			12	/* Corresponds to address bits [31:12] */
-#define PACBLR_BASE_L_MASK			(0xfffff << PACBLR_BASE_L_OFFS)
-#define PACBLR_BASE_L_ALIGNMENT		(1 << PACBLR_BASE_L_OFFS)
-#define PACBLR_BASE_ALIGN_UP(base)  \
-                             ((base+PACBLR_BASE_L_ALIGNMENT)&PACBLR_BASE_L_MASK)
-#define PACBLR_BASE_ALIGN_DOWN(base)  (base & PACBLR_BASE_L_MASK)
-
-
-/* PCI Access Control Base High Register (PACBHR) 	*/
-#define PACBHR_BASE_H_OFFS			0	/* Corresponds to address bits [63:32] */
-#define PACBHR_CTRL_BASE_H_MASK		(0xffffffff << PACBHR_BASE_H_OFFS)
-
-/* PCI Access Control Size Register (PACSR) 		*/
-#define PACSR_WRMBURST_OFFS			8 /* Write Max Burst */
-#define PACSR_WRMBURST_MASK			(0x3 << PACSR_WRMBURST_OFFS)
-#define PACSR_WRMBURST_32BYTE		(0x0 << PACSR_WRMBURST_OFFS)
-#define PACSR_WRMBURST_64BYTE		(0x1 << PACSR_WRMBURST_OFFS)
-#define PACSR_WRMBURST_128BYTE		(0x2 << PACSR_WRMBURST_OFFS)
-
-#define PACSR_PCI_ORDERING			BIT11 /* PCI Ordering required */
-
-#define PACSR_SIZE_OFFS				12	/* PCI access window size */
-#define PACSR_SIZE_MASK				(0xfffff << PACSR_SIZE_OFFS)
-#define PACSR_SIZE_ALIGNMENT		(1 << PACSR_SIZE_OFFS)
-#define PACSR_SIZE_ALIGN_UP(size)   \
-                                   ((size+PACSR_SIZE_ALIGNMENT)&PACSR_SIZE_MASK)
-#define PACSR_SIZE_ALIGN_DOWN(size) (size & PACSR_SIZE_MASK)
-
-
-/***************************************/
-/* PCI Configuration Access Registers  */
-/***************************************/
-
-#define PCI_CONFIG_ADDR_REG(pciIf)	(0x30C78 - ((pciIf) * 0x80) )
-#define PCI_CONFIG_DATA_REG(pciIf)	(0x30C7C - ((pciIf) * 0x80) )
-#define PCI_INT_ACK_REG(pciIf)		(0x30C34 + ((pciIf) * 0x80) )
-
-/* PCI Configuration Address Register (PCAR) */
-#define PCAR_REG_NUM_OFFS			2
-#define PCAR_REG_NUM_MASK			(0x3F << PCAR_REG_NUM_OFFS)
-		
-#define PCAR_FUNC_NUM_OFFS			8
-#define PCAR_FUNC_NUM_MASK			(0x7 << PCAR_FUNC_NUM_OFFS)
-		
-#define PCAR_DEVICE_NUM_OFFS		11
-#define PCAR_DEVICE_NUM_MASK		(0x1F << PCAR_DEVICE_NUM_OFFS)
-		
-#define PCAR_BUS_NUM_OFFS			16
-#define PCAR_BUS_NUM_MASK			(0xFF << PCAR_BUS_NUM_OFFS)
-		
-#define PCAR_CONFIG_EN				BIT31
-
-
-/***************************************/
-/* PCI Configuration registers */
-/***************************************/
-
-/*********************************************/
-/* PCI Configuration, Function 0, Registers  */
-/*********************************************/
-
-/* Marvell Specific */
-#define PCI_SCS0_BASE_ADDR_LOW			   			0x010
-#define PCI_SCS0_BASE_ADDR_HIGH			   			0x014
-#define PCI_SCS1_BASE_ADDR_LOW		  				0x018
-#define PCI_SCS1_BASE_ADDR_HIGH			  			0x01C
-#define PCI_INTER_REG_MEM_MAPPED_BASE_ADDR_L 		0x020
-#define PCI_INTER_REG_MEM_MAPPED_BASE_ADDR_H		0x024
-
-/* capability list */
-#define PCI_POWER_MNG_CAPABILITY		            0x040
-#define PCI_POWER_MNG_STATUS_CONTROL		        0x044
-#define PCI_VPD_ADDRESS_REG	                        0x048
-#define PCI_VPD_DATA_REG	                        0x04c
-#define PCI_MSI_MESSAGE_CONTROL						0x050
-#define PCI_MSI_MESSAGE_ADDR		                0x054
-#define PCI_MSI_MESSAGE_UPPER_ADDR		            0x058
-#define PCI_MSI_MESSAGE_DATA		                0x05c
-#define PCIX_COMMAND		                        0x060
-#define PCIX_STATUS		                            0x064
-#define PCI_COMPACT_PCI_HOT_SWAP		            0x068
-
-
-/*********************************************/
-/* PCI Configuration, Function 1, Registers  */
-/*********************************************/
-
-#define PCI_SCS2_BASE_ADDR_LOW						0x10
-#define PCI_SCS2_BASE_ADDR_HIGH						0x14
-#define PCI_SCS3_BASE_ADDR_LOW		 				0x18
-#define PCI_SCS3_BASE_ADDR_HIGH						0x1c
-
-
-/***********************************************/
-/*  PCI Configuration, Function 2, Registers   */
-/***********************************************/
-
-#define PCI_DEVCS0_BASE_ADDR_LOW					0x10
-#define PCI_DEVCS0_BASE_ADDR_HIGH		 			0x14
-#define PCI_DEVCS1_BASE_ADDR_LOW		 			0x18
-#define PCI_DEVCS1_BASE_ADDR_HIGH		      		0x1c
-#define PCI_DEVCS2_BASE_ADDR_LOW		 			0x20
-#define PCI_DEVCS2_BASE_ADDR_HIGH		      		0x24
-
-/***********************************************/
-/*  PCI Configuration, Function 3, Registers   */
-/***********************************************/
-
-#define PCI_BOOTCS_BASE_ADDR_LOW					0x18
-#define PCI_BOOTCS_BASE_ADDR_HIGH		      		0x1c
-
-/***********************************************/
-/*  PCI Configuration, Function 4, Registers   */
-/***********************************************/
-
-#define PCI_P2P_MEM0_BASE_ADDR_LOW				   	0x10
-#define PCI_P2P_MEM0_BASE_ADDR_HIGH		 			0x14
-#define PCI_P2P_IO_BASE_ADDR		               	0x20
-#define PCI_INTER_REGS_IO_MAPPED_BASE_ADDR		   0x24
-
-/* PCIX_STATUS  register fields (PXS) */
-
-#define PXS_FN_OFFS		0	/* Description Number */
-#define PXS_FN_MASK		(0x7 << PXS_FN_OFFS)
-
-#define PXS_DN_OFFS		3	/* Device Number */
-#define PXS_DN_MASK		(0x1f << PXS_DN_OFFS)
-
-#define PXS_BN_OFFS		8	/* Bus Number */
-#define PXS_BN_MASK		(0xff << PXS_BN_OFFS)
-
-
-/* PCI Error Report Register Map */
-#define PCI_SERRN_MASK_REG(pciIf)		(0x30c28  + (pciIf * 0x80))
-#define PCI_CAUSE_REG(pciIf)			(0x31d58 + (pciIf * 0x80))
-#define PCI_MASK_REG(pciIf)				(0x31d5C + (pciIf * 0x80))
-#define PCI_ERROR_ADDR_LOW_REG(pciIf)	(0x31d40 + (pciIf * 0x80))
-#define PCI_ERROR_ADDR_HIGH_REG(pciIf)	(0x31d44 + (pciIf * 0x80))
-#define PCI_ERROR_ATTRIBUTE_REG(pciIf)	(0x31d48 + (pciIf * 0x80))
-#define PCI_ERROR_COMMAND_REG(pciIf)	(0x31d50 + (pciIf * 0x80))
-
-/* PCI Interrupt Cause Register (PICR) */
-#define PICR_ERR_SEL_OFFS           27
-#define PICR_ERR_SEL_MASK           (0x1f << PICR_ERR_SEL_OFFS)
-
-/* PCI Error Command Register (PECR) */
-#define PECR_ERR_CMD_OFFS			0
-#define PECR_ERR_CMD_MASK			(0xf << PECR_ERR_CMD_OFFS)
-#define PECR_DAC					BIT4
-
-
-/* defaults */
-/* Set bits means value is about to change according to new value */
-#define PCI_COMMAND_DEFAULT_MASK                0xffffdff1
-#define PCI_COMMAND_DEFAULT                             \
-                (PCR_MASTER_WR_TRIG_WHOLE   |   \
-         PCR_MASTER_RD_TRIG_WHOLE       |       \
-                 PCR_MASTER_MEM_RD_LINE_EN      |       \
-         PCR_MASTER_MEM_RD_MULT_EN  |   \
-                 PCR_NS_ACCORDING_RCV_TRANS     |       \
-                 PCR_MASTER_PCIX_REQ64N_EN      |       \
-                 PCR_MASTER_DAC_EN                      |       \
-                 PCR_MASTER_M64_ALLIGN          |       \
-                 PCR_ERRORS_PROPAGATION_EN)
-                 
-                 
-#define PCI_ARBITER_CTRL_DEFAULT_MASK   0x801fc07a
-#define PCI_ARBITER_CTRL_DEFAULT        \
-        (PACR_BROKEN_VAL_PCIX_MIN << PACR_BROKEN_VAL_OFFS)
-
-
-#endif /* #ifndef __INCPCIREGSH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c
deleted file mode 100644
index 068aac2bf8..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.c
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "pex/mvPex.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* defines  */       
-#ifdef MV_DEBUG         
-#define DB(x)	x
-#else                
-#define DB(x)    
-#endif	             
-
-MV_STATUS mvPexHalInit(MV_U32 pexIf, MV_PEX_TYPE pexType)
-{
-	MV_PEX_MODE pexMode;
-	MV_U32 regVal;
-	MV_U32	status;
- 
-    /* First implement Guideline (GL# PCI Express-2) Wrong Default Value    */
-    /* to Transmitter Output Current (TXAMP) Relevant for: 88F5181-A1/B0/B1 */
-    /* and 88F5281-B0 and above, 88F5182, 88F5082, 88F5181L, 88F6082/L      */
- 
-    if ((mvCtrlModelGet() != MV_1281_DEV_ID) &&
-	(mvCtrlModelGet() != MV_6281_DEV_ID) &&
-	(mvCtrlModelGet() != MV_6192_DEV_ID) &&
-    (mvCtrlModelGet() != MV_6190_DEV_ID) &&
-	(mvCtrlModelGet() != MV_6180_DEV_ID) &&
-        	(mvCtrlModelGet() != MV_6183_DEV_ID) &&
-	(mvCtrlModelGet() != MV_6183L_DEV_ID) &&
-        	(mvCtrlModelGet() != MV_78100_DEV_ID) &&
-        	(mvCtrlModelGet() != MV_78200_DEV_ID) &&
-	(mvCtrlModelGet() != MV_76100_DEV_ID) &&
-	(mvCtrlModelGet() != MV_78XX0_DEV_ID))
-    {
-
-        /* Read current value of TXAMP */
-        MV_REG_WRITE(0x41b00, 0x80820000);   /* Write the read command   */
-
-        regVal = MV_REG_READ(0x41b00);      /* Extract the data         */
-
-        /* Prepare new data for write */
-        regVal &= ~0x7;                     /* Clear bits [2:0]         */
-        regVal |=  0x4;                     /* Set the new value        */
-        regVal &= ~0x80000000;              /* Set "write" command      */
-        MV_REG_WRITE(0x41b00, regVal);      /* Write the write command  */
-
-    }
-    else
-    {
-        /* Implement 1.0V termination GL for 88F1281 device only */
-        /* BIT0 - Common mode feedback */
-        /* BIT3 - TxBuf, extra drive for 1.0V termination */
-        if (mvCtrlModelGet() == MV_1281_DEV_ID)
-        {
-                MV_REG_WRITE(0x41b00, 0x80860000);   /* Write the read command   */
-                regVal = MV_REG_READ(0x41b00);      /* Extract the data         */
-                regVal |= (BIT0 | BIT3);
-                regVal &= ~0x80000000;              /* Set "write" command      */
-                MV_REG_WRITE(0x41b00, regVal);      /* Write the write command  */
-
-                MV_REG_WRITE(0x31b00, 0x80860000);   /* Write the read command   */
-                regVal = MV_REG_READ(0x31b00);      /* Extract the data         */
-                regVal |= (BIT0 | BIT3);
-                regVal &= ~0x80000000;              /* Set "write" command      */
-                MV_REG_WRITE(0x31b00, regVal);      /* Write the write command  */
-        }
-    }
-
-        if( mvPexModeGet(pexIf, &pexMode) != MV_OK)
-        {
-                mvOsPrintf("PEX init ERR. mvPexModeGet failed (pexType=%d)\n",pexMode.pexType);
-                return MV_ERROR;
-        }
-
-        /* Check that required PEX type is the one set in reset time */
-        if (pexType != pexMode.pexType)
-        {
-                /* No Link. Shut down the Phy */
-		mvPexPowerDown(pexIf);
-                mvOsPrintf("PEX init ERR. PEX type sampled mismatch (%d,%d)\n",pexType,pexMode.pexType);
-                return MV_ERROR;
-        }
-
-        if (MV_PEX_ROOT_COMPLEX == pexType)
-        {
-                mvPexLocalBusNumSet(pexIf, PEX_HOST_BUS_NUM(pexIf));
-                mvPexLocalDevNumSet(pexIf, PEX_HOST_DEV_NUM(pexIf));
-        
-                /* Local device master Enable */
-                mvPexMasterEnable(pexIf, MV_TRUE);
-        
-                /* Local device slave Enable */
-                mvPexSlaveEnable(pexIf, mvPexLocalBusNumGet(pexIf),
-                                                 mvPexLocalDevNumGet(pexIf), MV_TRUE);
-		/* Interrupt disable */
-		status = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_STATUS_AND_COMMAND));
-		status |= PXSAC_INT_DIS;
-		MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_STATUS_AND_COMMAND), status);
-        }
-
-        /* now wait 500 ms to be sure the link is valid (spec compliant) */ 
-        mvOsDelay(500);
-	/* Check if we have link */
-	if (MV_REG_READ(PEX_STATUS_REG(pexIf)) & PXSR_DL_DOWN)
-	{
-		mvOsPrintf("PEX%d interface detected no Link.\n",pexIf);
-		return MV_NO_SUCH;
-	}
-
-	if (MV_PEX_WITDH_X1 ==  pexMode.pexWidth)
-	{
-		mvOsPrintf("PEX%d interface detected Link X1\n",pexIf);
-	}
-	else
-	{
-		mvOsPrintf("PEX%d interface detected Link X4\n",pexIf);
-	}
-
-#ifdef PCIE_VIRTUAL_BRIDGE_SUPPORT
-	mvPexVrtBrgInit(pexIf);
-#endif
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPexModeGet - Get Pex Mode
-*
-* DESCRIPTION:
-*
-* INPUT:
-*       pexIf   - PEX interface number.
-*
-* OUTPUT:
-*       pexMode - Pex mode structure
-*
-* RETURN:
-*       MV_OK on success , MV_ERROR otherwise
-*
-*******************************************************************************/
-MV_U32 mvPexModeGet(MV_U32 pexIf,MV_PEX_MODE *pexMode)
-{
-	MV_U32 pexData;
-
-	/* Parameter checking   */
-	if (PEX_DEFAULT_IF != pexIf)
-	{
-		if (pexIf >= mvCtrlPexMaxIfGet())
-		{
-			mvOsPrintf("mvPexModeGet: ERR. Invalid PEX interface %d\n",pexIf);
-			return MV_ERROR;
-		}
-	}
-
-	pexData = MV_REG_READ(PEX_CTRL_REG(pexIf));
-
-	switch (pexData & PXCR_DEV_TYPE_CTRL_MASK)
-	{
-	case PXCR_DEV_TYPE_CTRL_CMPLX:
-		pexMode->pexType = MV_PEX_ROOT_COMPLEX;
-		break;
-	case PXCR_DEV_TYPE_CTRL_POINT:
-		pexMode->pexType = MV_PEX_END_POINT;
-		break;
-
-	}
-
-    /* Check if we have link */
-    if (MV_REG_READ(PEX_STATUS_REG(pexIf)) & PXSR_DL_DOWN)
-    {
-        pexMode->pexLinkUp = MV_FALSE;
-        
-        /* If there is no link, the auto negotiation data is worthless */
-        pexMode->pexWidth  = MV_PEX_WITDH_INVALID;
-    }   
-    else
-    {
-        pexMode->pexLinkUp = MV_TRUE;
-
-        /* We have link. The link width is now valid */
-        pexData = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG));
-        pexMode->pexWidth = ((pexData & PXLCSR_NEG_LNK_WDTH_MASK) >> 
-                             PXLCSR_NEG_LNK_WDTH_OFFS);
-    }
-
-    return MV_OK;
-}
-
-
-/* PEX configuration space read write */
-
-/*******************************************************************************
-* mvPexConfigRead - Read from configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit read from PEX configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to read from local bus segment, use 
-*       bus number retrieved from mvPexLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pexIf   - PEX interface number.
-*       bus     - PEX segment bus number.
-*       dev     - PEX device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       32bit register data, 0xffffffff on error
-*
-*******************************************************************************/
-MV_U32 mvPexConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
-                        MV_U32 regOff)
-{
-#if defined(PCIE_VIRTUAL_BRIDGE_SUPPORT)
-        return mvPexVrtBrgConfigRead (pexIf, bus, dev, func, regOff);
-}
-
-MV_U32 mvPexHwConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func,
-                        MV_U32 regOff)
-{
-#endif
-	MV_U32 pexData = 0;
-	MV_U32	localDev,localBus;
-
-	/* Parameter checking   */
-	if (PEX_DEFAULT_IF != pexIf)
-	{
-		if (pexIf >= mvCtrlPexMaxIfGet())
-		{
-			mvOsPrintf("mvPexConfigRead: ERR. Invalid PEX interface %d\n",pexIf);
-			return 0xFFFFFFFF;
-		}
-	}
-
-	if (dev >= MAX_PEX_DEVICES)
-	{
-		DB(mvOsPrintf("mvPexConfigRead: ERR. device number illigal %d\n", dev));
-		return 0xFFFFFFFF;
-	}
-	
-	if (func >= MAX_PEX_FUNCS)
-	{
-		DB(mvOsPrintf("mvPexConfigRead: ERR. function num illigal %d\n", func));
-		return 0xFFFFFFFF;
-	}
-	
-	if (bus >= MAX_PEX_BUSSES)
-	{
-		DB(mvOsPrintf("mvPexConfigRead: ERR. bus number illigal %d\n", bus));
-		return MV_ERROR;
-	}
-    	     
-    DB(mvOsPrintf("mvPexConfigRead: pexIf %d, bus %d, dev %d, func %d, regOff 0x%x\n",
-                   pexIf, bus, dev, func, regOff));
-	
-	localDev = mvPexLocalDevNumGet(pexIf);
-	localBus = mvPexLocalBusNumGet(pexIf);
-                                     
-    /* Speed up the process. In case on no link, return MV_ERROR */
-    if ((dev != localDev) || (bus != localBus))
-    {
-        pexData = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-        if ((pexData & PXSR_DL_DOWN))
-        {
-            return MV_ERROR;
-        }
-    }
-
-    /* in PCI Express we have only one device number */
-	/* and this number is the first number we encounter 
-	else that the localDev*/
-	/* spec pex define return on config read/write on any device */
-	if (bus == localBus)
-	{
-		if (localDev == 0)
-		{
-			/* if local dev is 0 then the first number we encounter 
-			after 0 is 1 */
-			if ((dev != 1)&&(dev != localDev))
-			{
-				return MV_ERROR;
-			}	
-		}
-		else
-		{
-			/* if local dev is not 0 then the first number we encounter 
-			is 0 */
-	
-			if ((dev != 0)&&(dev != localDev))
-			{
-				return MV_ERROR;
-			}
-		}
-		if(func != 0 ) /* i.e bridge */
-		{
-			return MV_ERROR;
-		}
-	}
-    
-    
-	/* Creating PEX address to be passed */
-	pexData = (bus << PXCAR_BUS_NUM_OFFS);
-	pexData |= (dev << PXCAR_DEVICE_NUM_OFFS);
-	pexData |= (func << PXCAR_FUNC_NUM_OFFS);
-	pexData |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
-	/* extended register space */
-	pexData |=(((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> 
-				PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS);
-
-	pexData |= PXCAR_CONFIG_EN; 
-	
-	/* Write the address to the PEX configuration address register */
-	MV_REG_WRITE(PEX_CFG_ADDR_REG(pexIf), pexData);
-
-	DB(mvOsPrintf("mvPexConfigRead:address pexData=%x ",pexData));
-    
-	
-	/* In order to let the PEX controller absorbed the address of the read 	*/
-	/* transaction we perform a validity check that the address was written */
-	if(pexData != MV_REG_READ(PEX_CFG_ADDR_REG(pexIf)))
-	{
-		return MV_ERROR;
-	}
-
-	/* cleaning Master Abort */
-	MV_REG_BIT_SET(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_STATUS_AND_COMMAND), 
-				   PXSAC_MABORT);
-#if 0
-	/* Guideline (GL# PCI Express-1) Erroneous Read Data on Configuration   */
-	/* This guideline is relevant for all devices except of the following devices:
-	   88F5281-BO and above, 88F5181L-A0 and above, 88F1281 A0 and above
-	   88F6183 A0 and above, 88F6183L  */
-	if ( ( (dev != localDev) || (bus != localBus) ) && 
-		(
-		!(MV_5281_DEV_ID == mvCtrlModelGet())&&
-		!((MV_5181_DEV_ID == mvCtrlModelGet())&& (mvCtrlRevGet() >= MV_5181L_A0_REV))&&
-		!(MV_1281_DEV_ID == mvCtrlModelGet())&&
-		!(MV_6183_DEV_ID == mvCtrlModelGet())&&
-		!(MV_6183L_DEV_ID == mvCtrlModelGet())&&
-		!(MV_6281_DEV_ID == mvCtrlModelGet())&&
-		!(MV_6192_DEV_ID == mvCtrlModelGet())&&
-		!(MV_6190_DEV_ID == mvCtrlModelGet())&&
-        !(MV_6180_DEV_ID == mvCtrlModelGet())&& 
-		!(MV_78XX0_DEV_ID == mvCtrlModelGet()) 
-		))
-	{
-
-		/* PCI-Express configuration read work-around */
-
-		/* we will use one of the Punit (AHBToMbus) windows to access the xbar 
-		and read the data from there */
-		/*
-		Need to configure the 2 free Punit (AHB to MBus bridge) 
-		address decoding windows:
-		Configure the flash Window to handle Configuration space requests 
-		for PEX0/1:
-		1.    write 0x7931/0x7941 to the flash window and the size, 
-		      79-xbar attr (pci cfg), 3/4-xbar target (pex0/1), 1-WinEn
-		2.    write base to flash window 
-		
-		Configuration transactions from the CPU should write/read the data 
-		to/from address of the form:
-		addr[31:28] = 0x5 (for PEX0) or 0x6 (for PEX1)
-		addr[27:24] = extended register number
-		addr[23:16] = bus number
-		addr[15:11] = device number
-		addr[10:8]   = function number
-		addr[7:0]     = register number
-		*/
-
-		#include "ctrlEnv/sys/mvAhbToMbus.h"
-		{
-			MV_U32 winNum;
-			MV_AHB_TO_MBUS_DEC_WIN originWin;
-			MV_U32 pciAddr=0;
-			MV_U32 remapLow=0,remapHigh=0;
-
-			/* 
-			We will use DEV_CS2\Flash window for this workarround 
-			*/
-            
-			winNum = mvAhbToMbusWinTargetGet(PEX_CONFIG_RW_WA_TARGET);
-
-			/* save remap values if exist */
-			if ((1 == winNum)||(0 == winNum))
-			{
-				remapLow = MV_REG_READ(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum));
-				remapHigh = MV_REG_READ(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum));
-
-			}
-			
-
-			/* save the original window values */
-			mvAhbToMbusWinGet(winNum,&originWin);
-
-			if (PEX_CONFIG_RW_WA_USE_ORIGINAL_WIN_VALUES)
-			{
-				/* set the window as xbar window */
-				if (pexIf)
-				{
-					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
-					(0x7931 | (((originWin.addrWin.size >> 16)-1) ) << 16));
-				}
-				else
-				{
-					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
-					(0x7941 | (((originWin.addrWin.size >> 16)-1) ) << 16));
-				}
-
-				MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum),
-							 originWin.addrWin.baseLow);
-
-				/*pciAddr = originWin.addrWin.baseLow;*/
-				pciAddr = (MV_U32)CPU_MEMIO_UNCACHED_ADDR(
-					(MV_U32)originWin.addrWin.baseLow);
-			
-			}
-			else
-			{
-				/* set the window as xbar window */
-				if (pexIf)
-				{
-					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
-					(0x7931 | (((PEX_CONFIG_RW_WA_SIZE >> 16)-1) ) << 16));
-				}
-				else
-				{
-					MV_REG_WRITE(AHB_TO_MBUS_WIN_CTRL_REG(winNum), 
-					(0x7941 | (((PEX_CONFIG_RW_WA_SIZE >> 16)-1) ) << 16));
-				}
-
-				MV_REG_WRITE(AHB_TO_MBUS_WIN_BASE_REG(winNum),
-							 PEX_CONFIG_RW_WA_BASE);
-
-				pciAddr = (MV_U32)CPU_MEMIO_UNCACHED_ADDR(PEX_CONFIG_RW_WA_BASE);
-			}
-			
-			
-			/* remap should be as base */
-			if ((1 == winNum)||(0 == winNum))
-			{
-			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum),pciAddr);
-			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum),0);
-
-			}
-
-			/* extended register space */
-			pciAddr |= (bus << 16);
-			pciAddr |= (dev << 11);
-			pciAddr |= (func << 8);
-			pciAddr |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
-
-			pexData = *(MV_U32*)pciAddr; 
-			pexData = MV_32BIT_LE(pexData); /* Data always in LE */
-
-			/* restore the original window values */
-			mvAhbToMbusWinSet(winNum,&originWin);
-
-			/* restore original remap values*/
-			if ((1 == winNum)||(0 == winNum))
-			{
-			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_LOW_REG(winNum),remapLow);
-			   MV_REG_WRITE(AHB_TO_MBUS_WIN_REMAP_HIGH_REG(winNum),remapHigh);
-
-			}
-		}
-	}
-	else
-#endif
-	{
-		/* Read the Data returned in the PEX Data register */
-		pexData = MV_REG_READ(PEX_CFG_DATA_REG(pexIf));
-
-	}
-
-	DB(mvOsPrintf("mvPexConfigRead: got : %x \n",pexData));
-	
-	return pexData;
-
-}
-
-/*******************************************************************************
-* mvPexConfigWrite - Write to configuration space
-*
-* DESCRIPTION:
-*       This function performs a 32 bit write to PEX configuration space.
-*       It supports both type 0 and type 1 of Configuration Transactions 
-*       (local and over bridge). In order to write to local bus segment, use 
-*       bus number retrieved from mvPexLocalBusNumGet(). Other bus numbers 
-*       will result configuration transaction of type 1 (over bridge).
-*
-* INPUT:
-*       pexIf   - PEX interface number.
-*       bus     - PEX segment bus number.
-*       dev     - PEX device number.
-*       func    - Function number.
-*       regOffs - Register offset.       
-*       data    - 32bit data.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
-                           MV_U32 func, MV_U32 regOff, MV_U32 data)
-{
-#if defined(PCIE_VIRTUAL_BRIDGE_SUPPORT)
-        return mvPexVrtBrgConfigWrite (pexIf, bus, dev, func, regOff, data);
-}
-
-MV_STATUS mvPexHwConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
-                           MV_U32 func, MV_U32 regOff, MV_U32 data)
-{
-#endif
-	MV_U32 pexData = 0;
-	MV_U32	localDev,localBus;
-
-	/* Parameter checking   */
-	if (PEX_DEFAULT_IF != pexIf)
-	{
-		if (pexIf >= mvCtrlPexMaxIfGet())
-		{
-			mvOsPrintf("mvPexConfigWrite: ERR. Invalid PEX interface %d\n", 
-																		pexIf);
-			return MV_ERROR;
-		}
-	}
-
-	if (dev >= MAX_PEX_DEVICES)
-	{
-		mvOsPrintf("mvPexConfigWrite: ERR. device number illigal %d\n",dev);
-		return MV_BAD_PARAM;
-	}
-
-	if (func >= MAX_PEX_FUNCS)
-	{
-		mvOsPrintf("mvPexConfigWrite: ERR. function number illigal %d\n", func);
-		return MV_ERROR;
-	}
-
-	if (bus >= MAX_PEX_BUSSES)
-	{
-		mvOsPrintf("mvPexConfigWrite: ERR. bus number illigal %d\n", bus);
-		return MV_ERROR;
-	}
-
-
-
-	localDev = mvPexLocalDevNumGet(pexIf);
-	localBus = mvPexLocalBusNumGet(pexIf);
-
-	
-	/* in PCI Express we have only one device number other than ourselves*/
-	/* and this number is the first number we encounter 
-		else than the localDev that can be any valid dev number*/
-	/* pex spec define return on config read/write on any device */
-	if (bus == localBus)
-	{
-
-		if (localDev == 0)
-		{
-			/* if local dev is 0 then the first number we encounter 
-			after 0 is 1 */
-			if ((dev != 1)&&(dev != localDev))
-			{
-				return MV_ERROR;
-			}
-	
-		}
-		else
-		{
-			/* if local dev is not 0 then the first number we encounter 
-			is 0 */
-	
-			if ((dev != 0)&&(dev != localDev))
-			{
-				return MV_ERROR;
-			}
-		}
-
-		
-	}
-
-	/* if we are not accessing ourselves , then check the link */
-	if ((dev != localDev) || (bus != localBus) )
-	{
-		/* workarround */
-		/* when no link return MV_ERROR */
-
-		pexData = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-		if ((pexData & PXSR_DL_DOWN))
-		{
-			return MV_ERROR;
-		}
-
-	}
-
-	pexData =0;
-
-	/* Creating PEX address to be passed */
-	pexData |= (bus << PXCAR_BUS_NUM_OFFS);
-	pexData |= (dev << PXCAR_DEVICE_NUM_OFFS);
-	pexData |= (func << PXCAR_FUNC_NUM_OFFS);
-	pexData |= (regOff & PXCAR_REG_NUM_MASK); /* lgacy register space */
-	/* extended register space */
-	pexData |=(((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> 
-				PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS);
-	pexData |= PXCAR_CONFIG_EN; 
-	
-	DB(mvOsPrintf("mvPexConfigWrite: If=%x bus=%x func=%x dev=%x regOff=%x data=%x \n",
-		   pexIf,bus,func,dev,regOff,data,pexData) ); 
-
-	/* Write the address to the PEX configuration address register */
-	MV_REG_WRITE(PEX_CFG_ADDR_REG(pexIf), pexData);
-
-	/* Clear CPU pipe. Important where CPU can perform OOO execution */
-    	CPU_PIPE_FLUSH;
-
-	/* In order to let the PEX controller absorbed the address of the read 	*/
-	/* transaction we perform a validity check that the address was written */
-	if(pexData != MV_REG_READ(PEX_CFG_ADDR_REG(pexIf)))
-	{
-		return MV_ERROR;
-	}
-
-	/* Write the Data passed to the PEX Data register */
-	MV_REG_WRITE(PEX_CFG_DATA_REG(pexIf), data);
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvPexMasterEnable - Enable/disale PEX interface master transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PEX command status 
-*       (offset 0x4) to set/reset bit 2. After this bit is set, the PEX 
-*       master is allowed to gain ownership on the bus, otherwise it is 
-*       incapable to do so.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexMasterEnable(MV_U32 pexIf, MV_BOOL enable)
-{
-	MV_U32 pexCommandStatus;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexMasterEnable: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_ERROR;
-	}
-
-	localBus = mvPexLocalBusNumGet(pexIf);
-	localDev = mvPexLocalDevNumGet(pexIf);
-	
-	pexCommandStatus = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf,
-							    PEX_STATUS_AND_COMMAND));
-
-
-	if (MV_TRUE == enable)
-	{
-		pexCommandStatus |= PXSAC_MASTER_EN;
-	}
-	else
-	{
-		pexCommandStatus &= ~PXSAC_MASTER_EN;
-	}
-
-	
-	MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf,PEX_STATUS_AND_COMMAND),
-				 pexCommandStatus);
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPexSlaveEnable - Enable/disale PEX interface slave transactions.
-*
-* DESCRIPTION:
-*       This function performs read modified write to PEX command status 
-*       (offset 0x4) to set/reset bit 0 and 1. After those bits are set, 
-*       the PEX slave is allowed to respond to PEX IO space access (bit 0) 
-*       and PEX memory space access (bit 1). 
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*       dev     - PEX device number.
-*       enable - Enable/disable parameter.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_BAD_PARAM for bad parameters ,MV_ERROR on error ! otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexSlaveEnable(MV_U32 pexIf, MV_U32 bus,MV_U32 dev, MV_BOOL enable)
-{
-	MV_U32 pexCommandStatus;
-	MV_U32 RegOffs;
-
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexSlaveEnable: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-	if (dev >= MAX_PEX_DEVICES)
-	{
-		mvOsPrintf("mvPexLocalDevNumSet: ERR. device number illigal %d\n", dev);
-		return MV_BAD_PARAM;
-
-	}
-
-	
-	RegOffs = PEX_STATUS_AND_COMMAND;
-	
-	pexCommandStatus = mvPexConfigRead(pexIf, bus, dev, 0, RegOffs);
-
-    if (MV_TRUE == enable)
-	{
-		pexCommandStatus |= (PXSAC_IO_EN | PXSAC_MEM_EN);
-	}
-	else                             
-	{
-		pexCommandStatus &= ~(PXSAC_IO_EN | PXSAC_MEM_EN);
-	}
-
-	mvPexConfigWrite(pexIf, bus, dev, 0, RegOffs, pexCommandStatus);
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvPexLocalBusNumSet - Set PEX interface local bus number.
-*
-* DESCRIPTION:
-*       This function sets given PEX interface its local bus number.
-*       Note: In case the PEX interface is PEX-X, the information is read-only.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*       busNum - Bus number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PEX interface is PEX-X. 
-*		MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexLocalBusNumSet(MV_U32 pexIf, MV_U32 busNum)
-{
-	MV_U32 pexStatus;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexLocalBusNumSet: ERR. Invalid PEX interface %d\n",pexIf);
-		return MV_BAD_PARAM;
-	}
-	if (busNum >= MAX_PEX_BUSSES)
-	{
-		mvOsPrintf("mvPexLocalBusNumSet: ERR. bus number illigal %d\n", busNum);
-		return MV_ERROR;
-
-	}
-
-	localBus = mvPexLocalBusNumGet(pexIf);
-	localDev = mvPexLocalDevNumGet(pexIf);
-
-
-
-	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-	pexStatus &= ~PXSR_PEX_BUS_NUM_MASK;
-
-	pexStatus |= (busNum << PXSR_PEX_BUS_NUM_OFFS) & PXSR_PEX_BUS_NUM_MASK;
-
-	MV_REG_WRITE(PEX_STATUS_REG(pexIf), pexStatus);
-
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPexLocalBusNumGet - Get PEX interface local bus number.
-*
-* DESCRIPTION:
-*       This function gets the local bus number of a given PEX interface.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local bus number.0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPexLocalBusNumGet(MV_U32 pexIf)
-{
-	MV_U32 pexStatus;
-
-	/* Parameter checking   */
-	if (PEX_DEFAULT_IF != pexIf)
-	{
-		if (pexIf >= mvCtrlPexMaxIfGet())
-		{
-			mvOsPrintf("mvPexLocalBusNumGet: ERR. Invalid PEX interface %d\n",pexIf);
-			return 0xFFFFFFFF;
-		}
-	}
-
-
-	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-	pexStatus &= PXSR_PEX_BUS_NUM_MASK;
-
-	return (pexStatus >> PXSR_PEX_BUS_NUM_OFFS);
-
-}
-
-
-/*******************************************************************************
-* mvPexLocalDevNumSet - Set PEX interface local device number.
-*
-* DESCRIPTION:
-*       This function sets given PEX interface its local device number.
-*       Note: In case the PEX interface is PEX-X, the information is read-only.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*       devNum - Device number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_NOT_ALLOWED in case PEX interface is PEX-X. 
-*		MV_BAD_PARAM on bad parameters ,
-*       otherwise MV_OK
-*
-*******************************************************************************/
-MV_STATUS mvPexLocalDevNumSet(MV_U32 pexIf, MV_U32 devNum)
-{
-	MV_U32 pexStatus;
-	MV_U32 localBus;
-	MV_U32 localDev;
-
-	/* Parameter checking   */
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexLocalDevNumSet: ERR. Invalid PEX interface %d\n",pexIf);
-		return MV_BAD_PARAM;
-	}
-	if (devNum >= MAX_PEX_DEVICES)
-	{
-		mvOsPrintf("mvPexLocalDevNumSet: ERR. device number illigal %d\n", 
-																	   devNum);
-		return MV_BAD_PARAM;
-
-	}
-	
-	localBus = mvPexLocalBusNumGet(pexIf);
-	localDev = mvPexLocalDevNumGet(pexIf);
-
-
-	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-	pexStatus &= ~PXSR_PEX_DEV_NUM_MASK;
-
-	pexStatus |= (devNum << PXSR_PEX_DEV_NUM_OFFS) & PXSR_PEX_DEV_NUM_MASK;
-
-	MV_REG_WRITE(PEX_STATUS_REG(pexIf), pexStatus);
-
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvPexLocalDevNumGet - Get PEX interface local device number.
-*
-* DESCRIPTION:
-*       This function gets the local device number of a given PEX interface.
-*
-* INPUT:
-*       pexIf  - PEX interface number.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Local device number. 0xffffffff on Error
-*
-*******************************************************************************/
-MV_U32 mvPexLocalDevNumGet(MV_U32 pexIf)
-{
-	MV_U32 pexStatus;
-
-	/* Parameter checking   */
-	
-	if (PEX_DEFAULT_IF != pexIf)
-	{
-		if (pexIf >= mvCtrlPexMaxIfGet())
-		{
-			mvOsPrintf("mvPexLocalDevNumGet: ERR. Invalid PEX interface %d\n", 
-																   		pexIf);
-			return 0xFFFFFFFF;
-		}
-	}
-	
-	pexStatus  = MV_REG_READ(PEX_STATUS_REG(pexIf));
-
-	pexStatus &= PXSR_PEX_DEV_NUM_MASK;
-
-	return (pexStatus >> PXSR_PEX_DEV_NUM_OFFS);
-}
-
-MV_VOID mvPexPhyRegRead(MV_U32 pexIf, MV_U32 regOffset, MV_U16 *value)
-{
-
-	MV_U32 regAddr;
-	if (pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexPhyRegRead: ERR. Invalid PEX interface %d\n", pexIf);
-		return;
-	}
-	regAddr = (BIT31 | ((regOffset & 0x3fff) << 16));
-	MV_REG_WRITE(PEX_PHY_ACCESS_REG(pexIf), regAddr);
-	*value = MV_REG_READ(PEX_PHY_ACCESS_REG(pexIf)); 
-}
-
-
-MV_VOID mvPexPhyRegWrite(MV_U32 pexIf, MV_U32 regOffset, MV_U16 value)
-{
-
-	MV_U32 regAddr;
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexPhyRegWrite: ERR. Invalid PEX interface %d\n", pexIf);
-		return;
-	}
-	regAddr = (((regOffset & 0x3fff) << 16) | value);
-	MV_REG_WRITE(PEX_PHY_ACCESS_REG(pexIf), regAddr);
-}
-
-/*******************************************************************************
-* mvPexActiveStateLinkPMEnable
-*
-* DESCRIPTION:
-*       Enable Active Link State Power Management
-*
-* INPUT:
-*       pexIf   - PEX interface number.
-*	enable	- MV_TRUE to enable ASPM, MV_FALSE to disable.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       MV_OK on success , MV_ERROR otherwise
-*
-*******************************************************************************/
-MV_STATUS mvPexActiveStateLinkPMEnable(MV_U32 pexIf, MV_BOOL enable)
-{
-	MV_U32 reg;
-
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexActiveStateLinkPMEnable: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_ERROR;
-	}
-
-	reg = MV_REG_READ(PEX_PWR_MNG_EXT_REG(pexIf)) & ~PXPMER_L1_ASPM_EN_MASK;
-	if(enable == MV_TRUE)
-		reg |= PXPMER_L1_ASPM_EN_MASK;
-	MV_REG_WRITE(PEX_PWR_MNG_EXT_REG(pexIf), reg);
-
-	/* Enable / Disable L0/1 entry */ 
-	reg = MV_REG_READ(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG))
-			& ~PXLCSR_ASPM_CNT_MASK;
-	if(enable == MV_TRUE)
-		reg |= PXLCSR_ASPM_CNT_L0S_L1S_ENT_SUPP;
-	MV_REG_WRITE(PEX_CFG_DIRECT_ACCESS(pexIf, PEX_LINK_CTRL_STAT_REG), reg);
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvPexForceX1
-*
-* DESCRIPTION:
-*       shut down lanes 1-3 if recognize that attached to an x1 end-point
-* INPUT:
-*       pexIf   - PEX interface number.
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       MV_OK on success , MV_ERROR otherwise
-*
-*******************************************************************************/
-MV_U32 mvPexForceX1(MV_U32 pexIf)
-{
-	MV_U32 regData = 0;
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexForceX1: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_BAD_PARAM;
-	}
-
-	regData  = MV_REG_READ(PEX_CTRL_REG(pexIf)) & ~(PXCR_CONF_LINK_MASK) ;
-	regData |= PXCR_CONF_LINK_X1;
-
-	MV_REG_WRITE(PEX_CTRL_REG(pexIf), regData);
-	return MV_OK;
-}
-
-MV_BOOL mvPexIsPowerUp(MV_U32 pexIf)
-{
-	if(pexIf >= mvCtrlPexMaxIfGet())
-	{
-		mvOsPrintf("mvPexIsPowerUp: ERR. Invalid PEX interface %d\n", pexIf);
-		return MV_FALSE;
-	}
-	return mvCtrlPwrClckGet(PEX_UNIT_ID, pexIf);	
-}
-
-
-MV_VOID mvPexPowerDown(MV_U32 pexIf)
-{
-	if ( (mvCtrlModelGet() == MV_78XX0_DEV_ID) ||
-		(mvCtrlModelGet() == MV_76100_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78200_DEV_ID) )
-	{
-		mvCtrlPwrClckSet(PEX_UNIT_ID, pexIf, MV_FALSE);	
-	}
-	else
-	{
-		MV_REG_WRITE((0x41B00 -(pexIf)*0x10000), 0x20800087);
-	}
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h
deleted file mode 100644
index d8f1cdd9f9..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPex.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCPEXH
-#define __INCPEXH
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "pex/mvPexRegs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-
-
-/* NOTE not supported in this driver:*/
-  
-
-/* defines */
-/* The number of supported PEX interfaces depend on Marvell controller 		*/
-/* device number. This device number ID is located on the PEX unit 			*/
-/* configuration header. This creates a loop where calling PEX 				*/
-/* configuration read/write	routine results a call to get PEX configuration */
-/* information etc. This macro defines a default PEX interface. This PEX	*/
-/* interface is sure to exist.												*/
-#define PEX_DEFAULT_IF	0
-
-
-/* typedefs */
-/* The Marvell controller supports both root complex and end point devices */
-/* This enumeration describes the PEX type.                                 */
-typedef enum _mvPexType
-{
-    MV_PEX_ROOT_COMPLEX,   	/* root complex device */
-    MV_PEX_END_POINT        /* end point device */
-}MV_PEX_TYPE;
-
-typedef enum _mvPexWidth
-{
-    MV_PEX_WITDH_X1 = 1,
-    MV_PEX_WITDH_X2,
-    MV_PEX_WITDH_X3,
-    MV_PEX_WITDH_X4,
-    MV_PEX_WITDH_INVALID
-}MV_PEX_WIDTH;
-
-/* PEX Bar attributes */
-typedef struct _mvPexMode
-{
-	MV_PEX_TYPE 	pexType;
-	MV_PEX_WIDTH    pexWidth;
-	MV_BOOL         pexLinkUp;
-}MV_PEX_MODE;
-
-
-
-/* Global Functions prototypes */
-/* mvPexInit - Initialize PEX interfaces*/
-MV_STATUS mvPexHalInit(MV_U32 pexIf, MV_PEX_TYPE pexType);
-
-/* mvPexModeGet - Get Pex If mode */
-MV_U32 mvPexModeGet(MV_U32 pexIf,MV_PEX_MODE *pexMode);
-
-/* mvPexConfigRead - Read from configuration space */
-MV_U32 mvPexConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
-						MV_U32 func,MV_U32 regOff);
-
-/* mvPexConfigWrite - Write to configuration space */
-MV_STATUS mvPexConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
-                           MV_U32 func, MV_U32 regOff, MV_U32 data);
-
-/* mvPexMasterEnable - Enable/disale PEX interface master transactions.*/
-MV_STATUS mvPexMasterEnable(MV_U32 pexIf, MV_BOOL enable);
-
-/* mvPexSlaveEnable - Enable/disale PEX interface slave transactions.*/
-MV_STATUS mvPexSlaveEnable(MV_U32 pexIf, MV_U32 bus,MV_U32 dev, MV_BOOL enable);
-
-/* mvPexLocalBusNumSet - Set PEX interface local bus number.*/
-MV_STATUS mvPexLocalBusNumSet(MV_U32 pexIf, MV_U32 busNum);
-
-/* mvPexLocalBusNumGet - Get PEX interface local bus number.*/
-MV_U32 mvPexLocalBusNumGet(MV_U32 pexIf);
-
-/* mvPexLocalDevNumSet - Set PEX interface local device number.*/
-MV_STATUS mvPexLocalDevNumSet(MV_U32 pexIf, MV_U32 devNum);
-
-/* mvPexLocalDevNumGet - Get PEX interface local device number.*/
-MV_U32 mvPexLocalDevNumGet(MV_U32 pexIf);
-/* mvPexForceX1 - Force PEX interface to X1 mode. */
-MV_U32 mvPexForceX1(MV_U32 pexIf);
-
-/* mvPexIsPowerUp - Is PEX interface Power up? */
-MV_BOOL mvPexIsPowerUp(MV_U32 pexIf);
-
-/* mvPexPowerDown - Power Down */
-MV_VOID mvPexPowerDown(MV_U32 pexIf);
-
-/* mvPexPowerUp - Power Up */
-MV_VOID mvPexPowerUp(MV_U32 pexIf);
-
-/* mvPexPhyRegRead - Pex phy read */
-MV_VOID mvPexPhyRegRead(MV_U32 pexIf, MV_U32 regOffset, MV_U16 *value);
-
-/* mvPexPhyRegWrite - Pex phy write */
-MV_VOID mvPexPhyRegWrite(MV_U32 pexIf, MV_U32 regOffset, MV_U16 value);
-
-MV_STATUS mvPexActiveStateLinkPMEnable(MV_U32 pexIf, MV_BOOL enable);
-
-#endif /* #ifndef __INCPEXH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h
deleted file mode 100644
index 8ac1698364..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvPexRegs.h
+++ /dev/null
@@ -1,751 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCPEXREGSH
-#define __INCPEXREGSH
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* defines */
-#define MAX_PEX_DEVICES         32
-#define MAX_PEX_FUNCS           8
-#define MAX_PEX_BUSSES          256
-
-
-
-/*********************************************************/
-/* PCI Express Configuration Cycles Generation Registers */
-/*********************************************************/
-
-#define PEX_CFG_ADDR_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x18F8)
-#define PEX_CFG_DATA_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x18FC)
-#define PEX_PHY_ACCESS_REG(pexIf)	((PEX_IF_BASE(pexIf)) + 0x1B00)
-/* PCI Express Configuration Address Register */
-/* PEX_CFG_ADDR_REG (PXCAR)*/
-
-#define PXCAR_REG_NUM_OFFS			2
-#define PXCAR_REG_NUM_MAX			0x3F
-#define PXCAR_REG_NUM_MASK			(PXCAR_REG_NUM_MAX << PXCAR_REG_NUM_OFFS)
-#define PXCAR_FUNC_NUM_OFFS			8
-#define PXCAR_FUNC_NUM_MAX			0x7
-#define PXCAR_FUNC_NUM_MASK			(PXCAR_FUNC_NUM_MAX << PXCAR_FUNC_NUM_OFFS)
-#define PXCAR_DEVICE_NUM_OFFS		11
-#define PXCAR_DEVICE_NUM_MAX		0x1F
-#define PXCAR_DEVICE_NUM_MASK		(PXCAR_DEVICE_NUM_MAX << PXCAR_DEVICE_NUM_OFFS)
-#define PXCAR_BUS_NUM_OFFS			16
-#define PXCAR_BUS_NUM_MAX			0xFF
-#define PXCAR_BUS_NUM_MASK			(PXCAR_BUS_NUM_MAX << PXCAR_BUS_NUM_OFFS)
-#define PXCAR_EXT_REG_NUM_OFFS		24
-#define PXCAR_EXT_REG_NUM_MAX		0xF
-
-/* in pci express register address is now the legacy register address (8 bits)
-with the new extended register address (more 4 bits) , below is the mask of
-the upper 4 bits of the full register address */
-
-#define PXCAR_REAL_EXT_REG_NUM_OFFS	8
-#define PXCAR_EXT_REG_NUM_MASK		(PXCAR_EXT_REG_NUM_MAX << PXCAR_EXT_REG_NUM_OFFS)
-#define PXCAR_CONFIG_EN				BIT31
-
-#define PXCAR_REAL_EXT_REG_NUM_OFFS     8
-#define PXCAR_REAL_EXT_REG_NUM_MASK     (0xF << PXCAR_REAL_EXT_REG_NUM_OFFS)
-
-/* The traditional PCI spec defined 6-bit field to describe register offset.*/ 
-/* The new PCI Express extend the register offset by an extra 4-bits.       */
-/* The below macro assign 10-bit register offset into the apprpreate        */
-/* fields in the CFG_ADDR_REG                                               */
-#define PXCAR_REG_OFFS_SET(regOffs)                         \
- ( (regOff & PXCAR_REG_NUM_MASK) | \
-   ( ((regOff & PXCAR_REAL_EXT_REG_NUM_MASK) >> PXCAR_REAL_EXT_REG_NUM_OFFS) << PXCAR_EXT_REG_NUM_OFFS) )
-
-/***********************************/
-/* PCI Express Interrupt registers */
-/***********************************/
-#define PEX_CAUSE_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x1900)
-#define PEX_MASK_REG(pexIf)		((PEX_IF_BASE(pexIf)) + 0x1910)
-
-#define PXICR_TX_REQ_IN_DLDOWN_ERR  BIT0  /* Transmit request while field   */
-                                          /* <DLDown> of the PCI Express    */
-/* PCI Express Interrupt Cause */
-/* PEX_INT_CAUSE_REG  (PXICR)*/
-/* PEX_INT_MASK_REG*/
-/*
-NOTE:All bits except bits[27:24] are Read/Write Clear only. A cause bit sets
-upon an error event occurrence. A write of 0 clears the bit. A write of 1 has
-no affect. Bits[24:27} are set and cleared upon reception of interrupt
-emulation messages.
-
-Mask bit per cause bit. If a bit is set to 1, the corresponding event is
-enabled. Mask does not affect setting of the Interrupt Cause register bits;
-it only affects the assertion of the interrupt .*/
-                                          
-
-#define PXICR_MDIS_CAUSE			BIT1  /* Attempt to generate PCI transaction 
-                                             while master is disabled */
-#define PXICR_ERR_WRTO_REG_CAUSE	BIT3  /* Erroneous write attempt to
-                                             PCI Express internal register*/
-#define PXICR_HIT_DFLT_WIN_ERR		BIT4  /* Hit Default Window Error */
-#define PXICR_RX_RAM_PAR_ERR        BIT6  /* Rx RAM Parity Error */
-#define PXICR_TX_RAM_PAR_ERR        BIT7  /* Tx RAM Parity Error */
-#define PXICR_COR_ERR_DET			BIT8  /* Correctable Error Detected*/
-#define PXICR_NF_ERR_DET			BIT9  /* Non-Fatal Error Detected*/
-#define PXICR_FERR_DET				BIT10 /* Fatal Error Detected*/
-#define PXICR_DSTATE_CHANGE			BIT11 /* Dstate Change Indication*/
-#define PXICR_BIST					BIT12 /* PCI-Express BIST activated*/
-#define PXICR_FLW_CTRL_PROT     BIT14 /* Flow Control Protocol Error */
-
-#define PXICR_RCV_UR_CA_ERR         BIT15 /* Received UR or CA status. */
-#define PXICR_RCV_ERR_FATAL			BIT16 /* Received ERR_FATAL message.*/
-#define PXICR_RCV_ERR_NON_FATAL		BIT17 /* Received ERR_NONFATAL message*/
-#define PXICR_RCV_ERR_COR			BIT18 /* Received ERR_COR message.*/
-#define PXICR_RCV_CRS				BIT19 /* Received CRS completion status*/
-#define PXICR_SLV_HOT_RESET			BIT20 /* Received Hot Reset Indication*/
-#define PXICR_SLV_DIS_LINK			BIT21 /* Slave Disable Link Indication*/
-#define PXICR_SLV_LB				BIT22 /* Slave Loopback Indication*/
-#define PXICR_LINK_FAIL				BIT23 /* Link Failure indication.*/
-#define PXICR_RCV_INTA				BIT24 /* IntA status.*/
-#define PXICR_RCV_INTB				BIT25 /* IntB status.*/
-#define PXICR_RCV_INTC				BIT26 /* IntC status.*/
-#define PXICR_RCV_INTD				BIT27 /* IntD status.*/
-#define PXICR_RCV_PM_PME            BIT28 /* Received PM_PME message. */
-
-
-/********************************************/
-/* PCI Express Control and Status Registers */
-/********************************************/
-#define PEX_CTRL_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1A00)
-#define PEX_STATUS_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1A04)
-#define PEX_COMPLT_TMEOUT_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A10)
-#define PEX_PWR_MNG_EXT_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A18)
-#define PEX_FLOW_CTRL_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A20)
-#define PEX_ACK_TMR_4X_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A30)
-#define PEX_ACK_TMR_1X_REG(pexIf)			((PEX_IF_BASE(pexIf)) + 0x1A40)
-#define PEX_TL_CTRL_REG(pexIf)				((PEX_IF_BASE(pexIf)) + 0x1AB0)
-
-
-#define PEX_RAM_PARITY_CTRL_REG(pexIf)  		((PEX_IF_BASE(pexIf)) + 0x1A50)
-/* PCI Express Control Register */
-/* PEX_CTRL_REG (PXCR) */
-
-#define PXCR_CONF_LINK_OFFS             0
-#define PXCR_CONF_LINK_MASK             (1 << PXCR_CONF_LINK_OFFS)
-#define PXCR_CONF_LINK_X4               (0 << PXCR_CONF_LINK_OFFS)
-#define PXCR_CONF_LINK_X1               (1 << PXCR_CONF_LINK_OFFS)
-#define PXCR_DEV_TYPE_CTRL_OFFS			1     /*PCI ExpressDevice Type Control*/
-#define PXCR_DEV_TYPE_CTRL_MASK			BIT1
-#define PXCR_DEV_TYPE_CTRL_CMPLX		(1 << PXCR_DEV_TYPE_CTRL_OFFS)
-#define PXCR_DEV_TYPE_CTRL_POINT		(0 << PXCR_DEV_TYPE_CTRL_OFFS)
-#define PXCR_CFG_MAP_TO_MEM_EN			BIT2  /* Configuration Header Mapping 
-											   to Memory Space Enable         */
-
-#define PXCR_CFG_MAP_TO_MEM_EN			BIT2 /* Configuration Header Mapping 
-											   to Memory Space Enable*/
-
-#define PXCR_RSRV1_OFFS					5
-#define PXCR_RSRV1_MASK					(0x7 << PXCR_RSRV1_OFFS)
-#define PXCR_RSRV1_VAL					(0x0 << PXCR_RSRV1_OFFS)
-
-#define PXCR_CONF_MAX_OUTSTND_OFFS		8 /*Maximum outstanding NP requests as a master*/
-#define PXCR_CONF_MAX_OUTSTND_MASK		(0x3 << PXCR_CONF_MAX_OUTSTND_OFFS)
-
-
-#define PXCR_CONF_NFTS_OFFS				16 /*number of FTS Ordered-Sets*/
-#define PXCR_CONF_NFTS_MASK				(0xff << PXCR_CONF_NFTS_OFFS)
-
-#define PXCR_CONF_MSTR_HOT_RESET		BIT24 /*Master Hot-Reset.*/
-#define PXCR_CONF_MSTR_LB				BIT26 /* Master Loopback */
-#define PXCR_CONF_MSTR_DIS_SCRMB		BIT27 /* Master Disable Scrambling*/
-#define PXCR_CONF_DIRECT_DIS_SCRMB		BIT28 /* Direct Disable Scrambling*/
-
-/* PCI Express Status Register */
-/* PEX_STATUS_REG (PXSR) */
-
-#define PXSR_DL_DOWN					BIT0 /* DL_Down indication.*/
-
-#define PXSR_PEX_BUS_NUM_OFFS			8 /* Bus Number Indication */
-#define PXSR_PEX_BUS_NUM_MASK			(0xff << PXSR_PEX_BUS_NUM_OFFS)
-
-#define PXSR_PEX_DEV_NUM_OFFS			16 /* Device Number Indication */
-#define PXSR_PEX_DEV_NUM_MASK			(0x1f << PXSR_PEX_DEV_NUM_OFFS)
-
-#define PXSR_PEX_SLV_HOT_RESET			BIT24 /* Slave Hot Reset Indication*/
-#define PXSR_PEX_SLV_DIS_LINK			BIT25 /* Slave Disable Link Indication*/
-#define PXSR_PEX_SLV_LB					BIT26 /* Slave Loopback Indication*/
-#define PXSR_PEX_SLV_DIS_SCRMB			BIT27 /* Slave Disable Scrambling Indication*/
-
-
-/* PCI Express Completion Timeout Register */
-/* PEX_COMPLT_TMEOUT_REG (PXCTR)*/
-
-#define PXCTR_CMP_TO_THRSHLD_OFFS		0 /* Completion Timeout Threshold */
-#define PXCTR_CMP_TO_THRSHLD_MASK		(0xffff << PXCTR_CMP_TO_THRSHLD_OFFS)
-
-/* PCI Express Power Management Extended Register */
-/* PEX_PWR_MNG_EXT_REG (PXPMER) */
-
-#define PXPMER_L1_ASPM_EN_OFFS			1
-#define PXPMER_L1_ASPM_EN_MASK			(0x1 << PXPMER_L1_ASPM_EN_OFFS)
-
-/* PCI Express Flow Control Register */
-/* PEX_FLOW_CTRL_REG (PXFCR)*/
-
-#define PXFCR_PH_INIT_FC_OFFS			0 /*Posted Headers Flow Control Credit
-										    Initial Value.*/
-#define PXFCR_PH_INIT_FC_MASK			(0xff << PXFCR_PH_INIT_FC_OFFS)
-
-
-#define PXFCR_NPH_INIT_FC_OFFS			8 /* Classified Non-Posted Headers
-											 Flow Control Credit Initial Value*/
-#define PXFCR_NPH_INIT_FC_MASK			(0xff << PXFCR_NPH_INIT_FC_OFFS)
-
-#define PXFCR_CH_INIT_FC_OFFS			16 /* Completion Headers Flow Control
-											  Credit Initial Value Infinite*/
-										
-#define PXFCR_CH_INIT_FC_MASK			(0xff << PXFCR_CH_INIT_FC_OFFS)
-
-#define PXFCR_FC_UPDATE_TO_OFFS			24 /* Flow Control Update Timeout */
-#define PXFCR_FC_UPDATE_TO_MASK			(0xff << PXFCR_FC_UPDATE_TO_OFFS)
-
-/* PCI Express Acknowledge Timers (4X) Register */
-/* PEX_ACK_TMR_4X_REG (PXAT4R) */
-#define PXAT1R_ACK_LAT_TOX4_OFFS		0  /* Ack Latency Timer Timeout Value */
-#define PXAT1R_ACK_LAT_TOX4_MASK		(0xffff << PXAT4R_ACK_LAT_TOX1_OFFS)
-#define PXAT1R_ACK_RPLY_TOX4_OFFS		16 /* Ack Replay Timer Timeout Value  */
-#define PXAT1R_ACK_RPLY_TOX4_MASK		(0xffff << PXAT1R_ACK_RPLY_TOX1_OFFS)
-
-/* PCI Express Acknowledge Timers (1X) Register */
-/* PEX_ACK_TMR_1X_REG (PXAT1R) */
-
-#define PXAT1R_ACK_LAT_TOX1_OFFS		0 /* Acknowledge Latency Timer Timeout
-										     Value for 1X Link*/
-#define PXAT1R_ACK_LAT_TOX1_MASK		(0xffff << PXAT1R_ACK_LAT_TOX1_OFFS)
-
-#define PXAT1R_ACK_RPLY_TOX1_OFFS		16 /* Acknowledge Replay Timer Timeout
-											  Value for 1X*/
-#define PXAT1R_ACK_RPLY_TOX1_MASK		(0xffff << PXAT1R_ACK_RPLY_TOX1_OFFS)
-
-
-/* PCI Express TL Control Register */
-/* PEX_TL_CTRL_REG (PXTCR) */
-
-#define PXTCR_TX_CMP_BUFF_NO_OFFS		8 /*Number of completion buffers in Tx*/
-#define PXTCR_TX_CMP_BUFF_NO_MASK		(0xf << PXTCR_TX_CMP_BUFF_NO_OFFS)
-
-/* PCI Express Debug MAC Control Register */
-/* PEX_DEBUG_MAC_CTRL_REG (PXDMCR) */
-
-#define PXDMCR_LINKUP					BIT4
-
-
-
-/**********************************************/
-/* PCI Express Configuration Header Registers */
-/**********************************************/
-#define PEX_CFG_DIRECT_ACCESS(pexIf,cfgReg)	((PEX_IF_BASE(pexIf)) + (cfgReg))
-
-#define PEX_DEVICE_AND_VENDOR_ID					0x000
-#define PEX_STATUS_AND_COMMAND						0x004
-#define PEX_CLASS_CODE_AND_REVISION_ID			    0x008
-#define PEX_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE		0x00C
-#define PEX_MEMORY_BAR_BASE_ADDR(barNum)		 	(0x010 + ((barNum) << 2))
-#define PEX_MV_BAR_BASE(barNum)						(0x010 + (barNum) * 8)
-#define PEX_MV_BAR_BASE_HIGH(barNum)				(0x014 + (barNum) * 8)
-#define PEX_BAR0_INTER_REG							0x010
-#define PEX_BAR0_INTER_REG_HIGH						0x014
-#define PEX_BAR1_REG								0x018
-#define PEX_BAR1_REG_HIGH							0x01C
-#define PEX_BAR2_REG								0x020
-#define PEX_BAR2_REG_HIGH							0x024
-
-#define PEX_SUBSYS_ID_AND_SUBSYS_VENDOR_ID			0x02C
-#define PEX_EXPANSION_ROM_BASE_ADDR_REG				0x030
-#define PEX_CAPABILTY_LIST_POINTER					0x034
-#define PEX_INTERRUPT_PIN_AND_LINE					0x03C
-
-/* capability list */
-#define PEX_POWER_MNG_CAPABILITY		            0x040
-#define PEX_POWER_MNG_STATUS_CONTROL		        0x044
-
-#define PEX_MSI_MESSAGE_CONTROL						0x050
-#define PEX_MSI_MESSAGE_ADDR		                0x054
-#define PEX_MSI_MESSAGE_HIGH_ADDR		            0x058
-#define PEX_MSI_MESSAGE_DATA		                0x05C
-
-#define PEX_CAPABILITY_REG							0x60
-#define PEX_DEV_CAPABILITY_REG						0x64
-#define PEX_DEV_CTRL_STAT_REG						0x68
-#define PEX_LINK_CAPABILITY_REG						0x6C
-#define PEX_LINK_CTRL_STAT_REG						0x70
-
-#define PEX_ADV_ERR_RPRT_HDR_TRGT_REG				0x100
-#define PEX_UNCORRECT_ERR_STAT_REG					0x104
-#define PEX_UNCORRECT_ERR_MASK_REG					0x108
-#define PEX_UNCORRECT_ERR_SERVITY_REG				0x10C
-#define PEX_CORRECT_ERR_STAT_REG					0x110
-#define PEX_CORRECT_ERR_MASK_REG					0x114
-#define PEX_ADV_ERR_CAPABILITY_CTRL_REG				0x118
-#define PEX_HDR_LOG_FIRST_DWORD_REG					0x11C
-#define PEX_HDR_LOG_SECOND_DWORD_REG				0x120
-#define PEX_HDR_LOG_THIRD_DWORD_REG					0x124
-#define PEX_HDR_LOG_FOURTH_DWORD_REG				0x128
-
-
-
-/* PCI Express Device and Vendor ID Register*/
-/*PEX_DEVICE_AND_VENDOR_ID (PXDAVI)*/
-
-#define PXDAVI_VEN_ID_OFFS			0 	/* Vendor ID */
-#define PXDAVI_VEN_ID_MASK			(0xffff << PXDAVI_VEN_ID_OFFS)
-
-#define PXDAVI_DEV_ID_OFFS			16	/* Device ID */
-#define PXDAVI_DEV_ID_MASK  		(0xffff << PXDAVI_DEV_ID_OFFS)
-
-
-/* PCI Express Command and Status Register*/
-/*PEX_STATUS_AND_COMMAND (PXSAC)*/
-
-#define PXSAC_IO_EN			BIT0 	/* IO Enable 							  */
-#define PXSAC_MEM_EN		BIT1	/* Memory Enable 						  */
-#define PXSAC_MASTER_EN		BIT2	/* Master Enable 						  */
-#define PXSAC_PERR_EN		BIT6	/* Parity Errors Respond Enable 		  */
-#define PXSAC_SERR_EN		BIT8	/* Ability to assert SERR# line			  */
-#define PXSAC_INT_DIS		BIT10   /* Interrupt Disable 					  */
-#define PXSAC_INT_STAT		BIT19   /* Interrupt Status 			*/
-#define PXSAC_CAP_LIST		BIT20	/* Capability List Support 				  */
-#define PXSAC_MAS_DATA_PERR	BIT24   /* Master Data Parity Error				  */
-#define PXSAC_SLAVE_TABORT	BIT27	/* Signalled Target Abort 	*/
-#define PXSAC_RT_ABORT		BIT28	/* Recieved Target Abort 	*/
-#define PXSAC_MABORT			BIT29	/* Recieved Master Abort 	*/
-#define PXSAC_SYSERR			BIT30	/* Signalled system error 	*/
-#define PXSAC_DET_PARERR		BIT31	/* Detect Parity Error 		*/
-
-
-/* PCI Express Class Code and Revision ID Register*/
-/*PEX_CLASS_CODE_AND_REVISION_ID (PXCCARI)*/       
-
-#define PXCCARI_REVID_OFFS		0		/* Revision ID */
-#define PXCCARI_REVID_MASK		(0xff << PXCCARI_REVID_OFFS)
-
-#define PXCCARI_FULL_CLASS_OFFS	8		/* Full Class Code */
-#define PXCCARI_FULL_CLASS_MASK	(0xffffff << PXCCARI_FULL_CLASS_OFFS)
-
-#define PXCCARI_PROGIF_OFFS		8		/* Prog .I/F*/
-#define PXCCARI_PROGIF_MASK		(0xff << PXCCARI_PROGIF_OFFS)
-
-#define PXCCARI_SUB_CLASS_OFFS	16		/* Sub Class*/
-#define PXCCARI_SUB_CLASS_MASK	(0xff << PXCCARI_SUB_CLASS_OFFS)
-
-#define PXCCARI_BASE_CLASS_OFFS	24		/* Base Class*/
-#define PXCCARI_BASE_CLASS_MASK	(0xff << PXCCARI_BASE_CLASS_OFFS)
-
-
-/* PCI Express BIST, Header Type and Cache Line Size Register*/
-/*PEX_BIST_HDR_TYPE_LAT_TMR_CACHE_LINE (PXBHTLTCL)*/ 
-
-#define PXBHTLTCL_CACHELINE_OFFS		0	/* Specifies the cache line size */
-#define PXBHTLTCL_CACHELINE_MASK		(0xff << PXBHTLTCL_CACHELINE_OFFS)
-
-#define PXBHTLTCL_HEADTYPE_FULL_OFFS	16	/* Full Header Type */
-#define PXBHTLTCL_HEADTYPE_FULL_MASK	(0xff << PXBHTLTCL_HEADTYPE_FULL_OFFS)
-
-#define PXBHTLTCL_MULTI_FUNC			BIT23	/* Multi/Single function */
-
-#define PXBHTLTCL_HEADER_OFFS			16		/* Header type */
-#define PXBHTLTCL_HEADER_MASK			(0x7f << PXBHTLTCL_HEADER_OFFS)
-#define PXBHTLTCL_HEADER_STANDARD		(0x0 << PXBHTLTCL_HEADER_OFFS)
-#define PXBHTLTCL_HEADER_PCI2PCI_BRIDGE	(0x1 << PXBHTLTCL_HEADER_OFFS)
-
-
-#define PXBHTLTCL_BISTCOMP_OFFS		24	/* BIST Completion Code */
-#define PXBHTLTCL_BISTCOMP_MASK		(0xf << PXBHTLTCL_BISTCOMP_OFFS)
-
-#define PXBHTLTCL_BISTACT			BIT30	/* BIST Activate bit */
-#define PXBHTLTCL_BISTCAP			BIT31	/* BIST Capable Bit */
-#define PXBHTLTCL_BISTCAP_OFFS		31	
-#define PXBHTLTCL_BISTCAP_MASK		BIT31	
-#define PXBHTLTCL_BISTCAP_VAL		0
-
-
-/* PCI Express Subsystem Device and Vendor ID */
-/*PEX_SUBSYS_ID_AND_SUBSYS_VENDOR_ID (PXSIASVI)*/
-
-#define PXSIASVI_VENID_OFFS	0	/* Subsystem Manufacturer Vendor ID Number */
-#define PXSIASVI_VENID_MASK	(0xffff << PXSIASVI_VENID_OFFS)
-
-#define PXSIASVI_DEVID_OFFS	16	/* Subsystem Device ID Number */
-#define PXSIASVI_DEVID_MASK	(0xffff << PXSIASVI_DEVID_OFFS)
-
-
-/* PCI Express Capability List Pointer Register*/
-/*PEX_CAPABILTY_LIST_POINTER (PXCLP)*/
-
-#define PXCLP_CAPPTR_OFFS	0		/* Capability List Pointer */
-#define PXCLP_CAPPTR_MASK	(0xff << PXCLP_CAPPTR_OFFS)
-
-/* PCI Express Interrupt Pin and Line Register */
-/*PEX_INTERRUPT_PIN_AND_LINE (PXIPAL)*/
-
-#define PXIPAL_INTLINE_OFFS	0	/* Interrupt line (IRQ) */
-#define PXIPAL_INTLINE_MASK	(0xff << PXIPAL_INTLINE_OFFS)
-
-#define PXIPAL_INTPIN_OFFS	8	/* interrupt pin (A,B,C,D) */
-#define PXIPAL_INTPIN_MASK	(0xff << PXIPAL_INTPIN_OFFS)
-
-
-/* PCI Express Power Management Capability Header Register*/
-/*PEX_POWER_MNG_CAPABILITY (PXPMC)*/
-
-#define PXPMC_CAP_ID_OFFS		0 /* Capability ID */
-#define PXPMC_CAP_ID_MASK		(0xff << PXPMC_CAP_ID_OFFS)
-
-#define PXPMC_NEXT_PTR_OFFS		8 /* Next Item Pointer */
-#define PXPMC_NEXT_PTR_MASK		(0xff << PXPMC_NEXT_PTR_OFFS)
-
-#define PXPMC_PMC_VER_OFFS		16 /* PCI Power Management Capability Version*/
-#define PXPMC_PMC_VER_MASK		(0x7 << PXPMC_PMC_VER_OFFS)
-
-#define PXPMC_DSI 				BIT21/* Device Specific Initialization */
-
-#define PXPMC_AUX_CUR_OFFS		22 /* Auxiliary Current Requirements */
-#define PXPMC_AUX_CUR_MASK		(0x7 << PXPMC_AUX_CUR_OFFS)
-
-#define PXPMC_D1_SUP 			BIT25 /* D1 Power Management support*/
-
-#define PXPMC_D2_SUP 			BIT26 /* D2 Power Management support*/
-
-#define PXPMC_PME_SUP_OFFS		27 /* PM Event generation support*/
-#define PXPMC_PME_SUP_MASK		(0x1f << PXPMC_PME_SUP_OFFS)
-
-/* PCI Express Power Management Control and Status Register*/
-/*PEX_POWER_MNG_STATUS_CONTROL (PXPMSC)*/
-
-#define PXPMSC_PM_STATE_OFFS	0	/* Power State */
-#define PXPMSC_PM_STATE_MASK	(0x3 << PXPMSC_PM_STATE_OFFS)
-#define PXPMSC_PM_STATE_D0		(0x0 << PXPMSC_PM_STATE_OFFS)
-#define PXPMSC_PM_STATE_D1		(0x1 << PXPMSC_PM_STATE_OFFS)
-#define PXPMSC_PM_STATE_D2		(0x2 << PXPMSC_PM_STATE_OFFS)
-#define PXPMSC_PM_STATE_D3		(0x3 << PXPMSC_PM_STATE_OFFS)
-
-#define PXPMSC_PME_EN			BIT8/* PM_PME Message Generation Enable */
-
-#define PXPMSC_PM_DATA_SEL_OFFS	9	/* Data Select*/
-#define PXPMSC_PM_DATA_SEL_MASK	(0xf << PXPMSC_PM_DATA_SEL_OFFS)
-
-#define PXPMSC_PM_DATA_SCALE_OFFS	13	/* Data Scale */
-#define PXPMSC_PM_DATA_SCALE_MASK	(0x3 << PXPMSC_PM_DATA_SCALE_OFFS)
-
-#define PXPMSC_PME_STAT				BIT15/* PME Status */
-
-#define PXPMSC_PM_DATA_OFFS			24		/* State Data */
-#define PXPMSC_PM_DATA_MASK			(0xff << PXPMSC_PM_DATA_OFFS)
-
-
-/* PCI Express MSI Message Control Register*/								 
-/*PEX_MSI_MESSAGE_CONTROL (PXMMC)*/
-
-#define PXMMC_CAP_ID_OFFS			0 /* Capability ID */
-#define PXMMC_CAP_ID_MASK			(0xff << PXMMC_CAP_ID_OFFS)
-
-#define PXMMC_NEXT_PTR_OFFS			8 /* Next Item Pointer */
-#define PXMMC_NEXT_PTR_MASK			(0xff << PXMMC_NEXT_PTR_OFFS)
-
-#define PXMMC_MSI_EN				BIT18 /* MSI Enable */
-
-#define PXMMC_MULTI_CAP_OFFS		17 /* Multiple Message Capable */
-#define PXMMC_MULTI_CAP_MASK		(0x7 << PXMMC_MULTI_CAP_OFFS)
-
-#define PXMMC_MULTI_EN_OFFS			20  /* Multiple Messages Enable */
-#define PXMMC_MULTI_EN_MASK			(0x7 << PXMMC_MULTI_EN_OFFS)
-
-#define PXMMC_ADDR64				BIT23	/* 64-bit Addressing Capable */
-
-
-/* PCI Express MSI Message Address Register*/
-/*PEX_MSI_MESSAGE_ADDR (PXMMA)*/
-
-#define PXMMA_MSI_ADDR_OFFS			2 /* Message Address  corresponds to 
-										Address[31:2] of the MSI MWr TLP*/
-#define PXMMA_MSI_ADDR_MASK			(0x3fffffff << PXMMA_MSI_ADDR_OFFS)
-
-
-/* PCI Express MSI Message Address (High) Register */
-/*PEX_MSI_MESSAGE_HIGH_ADDR (PXMMHA)*/
-
-#define PXMMA_MSI_ADDR_H_OFFS		0 /* Message Upper Address corresponds to 
-											Address[63:32] of the MSI MWr TLP*/
-#define PXMMA_MSI_ADDR_H_MASK		(0xffffffff << PXMMA_MSI_ADDR_H_OFFS )
-
-
-/* PCI Express MSI Message Data Register*/
-/*PEX_MSI_MESSAGE_DATA (PXMMD)*/
-
-#define PXMMD_MSI_DATA_OFFS 		0 /* Message Data */
-#define PXMMD_MSI_DATA_MASK 		(0xffff << PXMMD_MSI_DATA_OFFS )
-
-
-/* PCI Express Capability Register*/								 
-/*PEX_CAPABILITY_REG (PXCR)*/
-
-#define PXCR_CAP_ID_OFFS			0	/* Capability ID*/
-#define PXCR_CAP_ID_MASK			(0xff << PXCR_CAP_ID_OFFS)
-
-#define PXCR_NEXT_PTR_OFFS			8 /* Next Item Pointer*/
-#define PXCR_NEXT_PTR_MASK			(0xff << PXCR_NEXT_PTR_OFFS)
-
-#define PXCR_CAP_VER_OFFS			16 /* Capability Version*/
-#define PXCR_CAP_VER_MASK			(0xf << PXCR_CAP_VER_OFFS)
-
-#define PXCR_DEV_TYPE_OFFS			20 /*  Device/Port Type*/
-#define PXCR_DEV_TYPE_MASK			(0xf << PXCR_DEV_TYPE_OFFS)
-
-#define PXCR_SLOT_IMP 				BIT24 /* Slot Implemented*/
-
-#define PXCR_INT_MSG_NUM_OFFS		25 /* Interrupt Message Number*/
-#define PXCR_INT_MSG_NUM_MASK		(0x1f << PXCR_INT_MSG_NUM_OFFS)
-
-
-/* PCI Express Device Capabilities Register */
-/*PEX_DEV_CAPABILITY_REG (PXDCR)*/
-
-#define PXDCR_MAX_PLD_SIZE_SUP_OFFS			0 /* Maximum Payload Size Supported*/
-#define PXDCR_MAX_PLD_SIZE_SUP_MASK			(0x7 << PXDCR_MAX_PLD_SIZE_SUP_OFFS)
-
-#define PXDCR_EP_L0S_ACC_LAT_OFFS			6/* Endpoint L0s Acceptable Latency*/
-#define PXDCR_EP_L0S_ACC_LAT_MASK			(0x7 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_64NS_LESS		(0x0 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_64NS_128NS		(0x1 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_128NS_256NS	(0x2 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_256NS_512NS	(0x3 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_512NS_1US		(0x4 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_1US_2US		(0x5 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_2US_4US		(0x6 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-#define PXDCR_EP_L0S_ACC_LAT_4US_MORE		(0x7 << PXDCR_EP_L0S_ACC_LAT_OFFS)
-
-#define PXDCR_EP_L1_ACC_LAT_OFFS 			9 /* Endpoint L1 Acceptable Latency*/
-#define PXDCR_EP_L1_ACC_LAT_MASK			(0x7 << PXDCR_EP_L1_ACC_LAT_OFFS)
-#define PXDCR_EP_L1_ACC_LAT_64NS_LESS       (0x0 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_64NS_128NS      (0x1 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_128NS_256NS     (0x2 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_256NS_512NS     (0x3 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_512NS_1US       (0x4 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_1US_2US         (0x5 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_2US_4US         (0x6 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-#define PXDCR_EP_L1_ACC_LAT_4US_MORE        (0x7 << PXDCR_EP_L1_ACC_LAT_OFFS) 
-
-
-#define PXDCR_ATT_BUT_PRS_OFFS				12 /* Attention Button Present*/
-#define PXDCR_ATT_BUT_PRS_MASK				BIT12
-#define PXDCR_ATT_BUT_PRS_IMPLEMENTED		BIT12
-
-#define PXDCR_ATT_IND_PRS_OFFS				13 /* Attention Indicator Present*/
-#define PXDCR_ATT_IND_PRS_MASK				BIT13
-#define PXDCR_ATT_IND_PRS_IMPLEMENTED		BIT13
-
-#define PXDCR_PWR_IND_PRS_OFFS        		14/* Power Indicator Present*/
-#define PXDCR_PWR_IND_PRS_MASK       		BIT14
-#define PXDCR_PWR_IND_PRS_IMPLEMENTED		BIT14
-
-#define PXDCR_CAP_SPL_VAL_OFFS				18 /*Captured Slot Power Limit 
-												 Value*/
-#define PXDCR_CAP_SPL_VAL_MASK				(0xff << PXDCR_CAP_SPL_VAL_OFFS)
-
-#define PXDCR_CAP_SP_LSCL_OFFS				26 /* Captured Slot Power Limit
-												  Scale */
-#define PXDCR_CAP_SP_LSCL_MASK				(0x3 << PXDCR_CAP_SP_LSCL_OFFS)
-
-/* PCI Express Device Control Status Register */
-/*PEX_DEV_CTRL_STAT_REG (PXDCSR)*/
-
-#define PXDCSR_COR_ERR_REP_EN		BIT0 /* Correctable Error Reporting Enable*/
-#define PXDCSR_NF_ERR_REP_EN		BIT1 /* Non-Fatal Error Reporting Enable*/
-#define PXDCSR_F_ERR_REP_EN			BIT2 /* Fatal Error Reporting Enable*/
-#define PXDCSR_UR_REP_EN			BIT3 /* Unsupported Request (UR) 
-													Reporting Enable*/
-#define PXDCSR_EN_RO 				BIT4 /* Enable Relaxed Ordering*/
-
-#define PXDCSR_MAX_PLD_SZ_OFFS		5	 /* Maximum Payload Size*/
-#define PXDCSR_MAX_PLD_SZ_MASK		(0x7 << PXDCSR_MAX_PLD_SZ_OFFS)
-#define PXDCSR_MAX_PLD_SZ_128B		(0x0 << PXDCSR_MAX_PLD_SZ_OFFS)
-#define PXDCSR_EN_NS				BIT11  /* Enable No Snoop*/
-
-#define PXDCSR_MAX_RD_RQ_SZ_OFFS	12 /* Maximum Read Request Size*/
-#define PXDCSR_MAX_RD_RQ_SZ_MASK	(0x7 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_128B	(0x0 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_256B	(0x1 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_512B	(0x2 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_1KB		(0x3 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_2KB		(0x4 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-#define PXDCSR_MAX_RD_RQ_SZ_4KB		(0x5 << PXDCSR_MAX_RD_RQ_SZ_OFFS)
-
-#define PXDCSR_COR_ERR_DET 			BIT16 /* Correctable Error Detected*/
-#define PXDCSR_NF_ERR_DET 			BIT17 /* Non-Fatal Error Detected.*/
-#define PXDCSR_F_ERR_DET 			BIT18 /* Fatal Error Detected.*/
-#define PXDCSR_UR_DET				BIT19 /* Unsupported Request Detected */
-#define PXDCSR_AUX_PWR_DET 			BIT20 /* Reserved*/
-
-#define PXDCSR_TRANS_PEND_OFFS 			21 /* Transactions Pending*/
-#define PXDCSR_TRANS_PEND_MASK 			BIT21
-#define PXDCSR_TRANS_PEND_NOT_COMPLETED (0x1 << PXDCSR_TRANS_PEND_OFFS)
-
-
-/* PCI Express Link Capabilities Register*/
-/*PEX_LINK_CAPABILITY_REG (PXLCR)*/
-
-#define PXLCR_MAX_LINK_SPD_OFFS		0 /* Maximum Link Speed*/
-#define PXLCR_MAX_LINK_SPD_MASK		(0xf << PXLCR_MAX_LINK_SPD_OFFS)
-
-#define PXLCR_MAX_LNK_WDTH_OFFS 	3 /* Maximum Link Width*/
-#define PXLCR_MAX_LNK_WDTH_MASK		(0x3f << PXLCR_MAX_LNK_WDTH_OFFS)
-
-#define PXLCR_ASPM_SUP_OFFS 		10 /* Active State Link PM Support*/
-#define PXLCR_ASPM_SUP_MASK			(0x3 << PXLCR_ASPM_SUP_OFFS)
-
-#define PXLCR_L0S_EXT_LAT_OFFS 			12 /* L0s Exit Latency*/
-#define PXLCR_L0S_EXT_LAT_MASK			(0x7 << PXLCR_L0S_EXT_LAT_OFFS)
-#define PXLCR_L0S_EXT_LAT_64NS_LESS     (0x0 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_64NS_128NS   	(0x1 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_128NS_256NS   (0x2 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_256NS_512NS   (0x3 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_512NS_1US     (0x4 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_1US_2US       (0x5 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-#define PXLCR_L0S_EXT_LAT_2US_4US       (0x6 << PXDCR_EP_L1_ACC_LAT_OFFS)  
-
-#define PXLCR_POR_TNUM_OFFS 			24 /* Port Number */
-#define PXLCR_POR_TNUM_MASK				(0xff << PXLCR_POR_TNUM_OFFS)
-
-/* PCI Express Link Control Status Register */
-/*PEX_LINK_CTRL_STAT_REG (PXLCSR)*/
-
-#define PXLCSR_ASPM_CNT_OFFS			0 /* Active State Link PM Control */
-#define PXLCSR_ASPM_CNT_MASK			(0x3 << PXLCSR_ASPM_CNT_OFFS)
-#define PXLCSR_ASPM_CNT_DISABLED		(0x0 << PXLCSR_ASPM_CNT_OFFS)
-#define PXLCSR_ASPM_CNT_L0S_ENT_SUPP		(0x1 << PXLCSR_ASPM_CNT_OFFS)
-#define PXLCSR_ASPM_CNT_L1S_ENT_SUPP		(0x2 << PXLCSR_ASPM_CNT_OFFS)
-#define PXLCSR_ASPM_CNT_L0S_L1S_ENT_SUPP	(0x3 << PXLCSR_ASPM_CNT_OFFS)
-
-#define PXLCSR_RCB_OFFS				3 /* Read Completion Boundary */
-#define PXLCSR_RCB_MASK				BIT3
-#define PXLCSR_RCB_64B				(0 << PXLCSR_RCB_OFFS)
-#define PXLCSR_RCB_128B				(1 << PXLCSR_RCB_OFFS)
-
-#define PXLCSR_LNK_DIS 				BIT4 /* Link Disable */
-#define PXLCSR_RETRN_LNK 			BIT5 /* Retrain Link */
-#define PXLCSR_CMN_CLK_CFG			BIT6 /* Common Clock Configuration */
-#define PXLCSR_EXTD_SNC 			BIT7 /* Extended Sync */
-
-#define PXLCSR_LNK_SPD_OFFS 		16 /* Link Speed */
-#define PXLCSR_LNK_SPD_MASK			(0xf << PXLCSR_LNK_SPD_OFFS)
-
-#define PXLCSR_NEG_LNK_WDTH_OFFS	20  /* Negotiated Link Width */
-#define PXLCSR_NEG_LNK_WDTH_MASK 	(0x3f << PXLCSR_NEG_LNK_WDTH_OFFS)
-#define PXLCSR_NEG_LNK_WDTH_X1		(0x1 << PXLCSR_NEG_LNK_WDTH_OFFS)
-
-#define PXLCSR_LNK_TRN 				BIT27 /* Link Training */
-
-#define PXLCSR_SLT_CLK_CFG_OFFS		28 /* Slot Clock Configuration */
-#define PXLCSR_SLT_CLK_CFG_MASK		BIT28
-#define PXLCSR_SLT_CLK_CFG_INDPNT	(0x0 << PXLCSR_SLT_CLK_CFG_OFFS)
-#define PXLCSR_SLT_CLK_CFG_REF		(0x1 << PXLCSR_SLT_CLK_CFG_OFFS)
-								
-/* PCI Express Advanced Error Report Header Register */								 
-/*PEX_ADV_ERR_RPRT_HDR_TRGT_REG (PXAERHTR)*/
-
-/* PCI Express Uncorrectable Error Status Register*/
-/*PEX_UNCORRECT_ERR_STAT_REG (PXUESR)*/
-
-/* PCI Express Uncorrectable Error Mask Register */
-/*PEX_UNCORRECT_ERR_MASK_REG (PXUEMR)*/
-
-/* PCI Express Uncorrectable Error Severity Register */
-/*PEX_UNCORRECT_ERR_SERVITY_REG (PXUESR)*/
-
-/* PCI Express Correctable Error Status Register */
-/*PEX_CORRECT_ERR_STAT_REG (PXCESR)*/
-
-/* PCI Express Correctable Error Mask Register */
-/*PEX_CORRECT_ERR_MASK_REG (PXCEMR)*/
-
-/* PCI Express Advanced Error Capability and Control Register*/
-/*PEX_ADV_ERR_CAPABILITY_CTRL_REG (PXAECCR)*/
-
-/* PCI Express Header Log First DWORD Register*/
-/*PEX_HDR_LOG_FIRST_DWORD_REG (PXHLFDR)*/
-
-/* PCI Express Header Log Second DWORD Register*/
-/*PEX_HDR_LOG_SECOND_DWORD_REG (PXHLSDR)*/
-
-/* PCI Express Header Log Third DWORD Register*/
-/*PEX_HDR_LOG_THIRD_DWORD_REG (PXHLTDR)*/
-
-/* PCI Express Header Log Fourth DWORD Register*/
-/*PEX_HDR_LOG_FOURTH_DWORD_REG (PXHLFDR)*/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* #ifndef __INCPEXREGSH */
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c
deleted file mode 100644
index 13d2f87261..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "mvPex.h"
-
-//#define MV_DEBUG
-/* defines  */       
-#ifdef MV_DEBUG         
-	#define DB(x)	x
-#else                
-	#define DB(x)    
-#endif	             
-
-/* locals */         
-typedef struct
-{
-	MV_U32 data;
-	MV_U32 mask;
-}PEX_HEADER_DATA;
-
-/* local function forwad decleration */
-MV_U32 mvPexHwConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
-                        MV_U32 regOff);
-MV_STATUS mvPexHwConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
-                           MV_U32 func, MV_U32 regOff, MV_U32 data);
-void resetPexConfig(MV_U32 pexIf, MV_U32 bus, MV_U32 dev);
-
-
-PEX_HEADER_DATA configHdr[16] = 
-{
-{0x888811ab, 0x00000000}, /*[device ID, vendor ID] */
-{0x00100007, 0x0000ffff}, /*[status register, command register] */  
-{0x0604000e, 0x00000000}, /*[programming interface, sub class code, class code, revision ID] */
-{0x00010008, 0x00000000},  /*[BIST, header type, latency time, cache line] */
-{0x00000000, 0x00000000},  /*[base address 0] */             
-{0x00000000, 0x00000000},  /*[base address 1] */             
-{0x00000000, 0x00ffffff},  /*[secondary latency timersubordinate bus number, secondary bus number, primary bus number] */         
-{0x0000f101, 0x00000000},  /*[secondary status ,IO limit, IO base] */
-{0x9ff0a000, 0x00000000},  /*[memory limit, memory base] */                
-{0x0001fff1, 0x00000000},  /*[prefetch memory limit, prefetch memory base] */       
-{0xffffffff, 0x00000000},  /*[prefetch memory base upper] */ 
-{0x00000000, 0x00000000},  /*[prefetch memory limit upper] */
-{0xeffff000, 0x00000000},  /*[IO limit upper 16 bits, IO base upper 16 bits] */      
-{0x00000000, 0x00000000},  /*[reserved, capability pointer] */ 
-{0x00000000, 0x00000000},  /*[expansion ROM base address] */ 
-{0x00000000, 0x000000FF},  /*[bridge control, interrupt pin, interrupt line] */             
-};
-
-
-#define HEADER_WRITE(data, offset) configHdr[offset/4].data = ((configHdr[offset/4].data & ~configHdr[offset/4].mask) | \
-																(data & configHdr[offset/4].mask))
-#define HEADER_READ(offset) configHdr[offset/4].data
-
-/*******************************************************************************
-* mvVrtBrgPexInit - Initialize PEX interfaces
-*
-* DESCRIPTION:
-*
-* This function is responsible of intialization of the Pex Interface , It 
-* configure the Pex Bars and Windows in the following manner:
-*
-*  Assumptions : 
-*				Bar0 is always internal registers bar
-*			    Bar1 is always the DRAM bar
-*				Bar2 is always the Device bar
-*
-*  1) Sets the Internal registers bar base by obtaining the base from
-*	  the CPU Interface
-*  2) Sets the DRAM bar base and size by getting the base and size from
-*     the CPU Interface when the size is the sum of all enabled DRAM 
-*	  chip selects and the base is the base of CS0 .
-*  3) Sets the Device bar base and size by getting these values from the 
-*     CPU Interface when the base is the base of the lowest base of the
-*     Device chip selects, and the 
-*
-*
-* INPUT:
-*
-*       pexIf   -  PEX interface number.
-*
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK if function success otherwise MV_ERROR or MV_BAD_PARAM
-*
-*******************************************************************************/
-MV_STATUS mvPexVrtBrgInit(MV_U32 pexIf)
-{
-	/* reset PEX tree to recover previous U-boot/Boot configurations */
-	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
-
-
-	resetPexConfig(pexIf, localBus, 1);
-	return MV_OK;
-}
-
-
-MV_U32 mvPexVrtBrgConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev, MV_U32 func, 
-                        MV_U32 regOff)
-{
-	
-	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
-	MV_U32 localDev = mvPexLocalDevNumGet(pexIf);
-	MV_U32 val;  
-	if(bus == localBus)
-	{
-		if(dev > 1)
-		{
-/* on the local device allow only device #0 & #1 */
-			return 0xffffffff;
-		}
-		else
-		if (dev == localDev)
-		{
-			/* read the memory controller registers */
-			return mvPexHwConfigRead (pexIf, bus, dev, func, regOff);
-		}
-		else
-		{
-			/* access the virtual brg header */
-			return HEADER_READ(regOff);
-		}
-	}
-	else
-	if(bus == (localBus + 1))
-	{
-		/* access the device behind the virtual bridge */
-		if((dev == localDev) || (dev > 1))
-		{
-			return 0xffffffff;
-		}
-		else
-		{
-			/* access the device behind the virtual bridge, in this case 
-			*  change the bus number to the local bus number in order to 
-			*  generate type 0 config cycle
-			*/			
-			mvPexLocalBusNumSet(pexIf, bus);
-			mvPexLocalDevNumSet(pexIf, 1);
-			val = mvPexHwConfigRead (pexIf, bus, 0, func, regOff);
-			mvPexLocalBusNumSet(pexIf, localBus);
-			mvPexLocalDevNumSet(pexIf, localDev);
-			return val;
-		}
-	}
-	/* for all other devices use the HW function to get the 
-	*  requested registers
-	*/
-	mvPexLocalDevNumSet(pexIf, 1);
-	val = mvPexHwConfigRead (pexIf, bus, dev, func, regOff);
-	mvPexLocalDevNumSet(pexIf, localDev);	
-	return val;
-}
-
-
-MV_STATUS mvPexVrtBrgConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev, 
-                           MV_U32 func, MV_U32 regOff, MV_U32 data)
-{
-	MV_U32 localBus = mvPexLocalBusNumGet(pexIf);
-	MV_U32 localDev = mvPexLocalDevNumGet(pexIf);
-	MV_STATUS	status;
-
-	if(bus == localBus)
-	{
-		if(dev > 1)
-		{
-			/* on the local device allow only device #0 & #1 */
-			return MV_ERROR;
-		}
-		else
-		if (dev == localDev)
-		{
-			/* read the memory controller registers */
-			return mvPexHwConfigWrite (pexIf, bus, dev, func, regOff, data);			
-		}
-		else
-		{
-			/* access the virtual brg header */
-			HEADER_WRITE(data, regOff);
-			return MV_OK;
-		}
-	}
-	else
-	if(bus == (localBus + 1))
-	{
-		/* access the device behind the virtual bridge */
-		if((dev == localDev) || (dev > 1))
-		{
-			return MV_ERROR;
-		}
-		else
-		{
-			/* access the device behind the virtual bridge, in this case 
-			*  change the bus number to the local bus number in order to 
-			*  generate type 0 config cycle
-			*/
-			//return mvPexHwConfigWrite (pexIf, localBus, dev, func, regOff, data);
-			mvPexLocalBusNumSet(pexIf, bus);
-			mvPexLocalDevNumSet(pexIf, 1);
-			status = mvPexHwConfigWrite (pexIf, bus, 0, func, regOff, data);
-			mvPexLocalBusNumSet(pexIf, localBus);
-			mvPexLocalDevNumSet(pexIf, localDev);
-			return status;
-
-		}
-	}
-	/* for all other devices use the HW function to get the 
-	*  requested registers
-	*/
-	mvPexLocalDevNumSet(pexIf, 1);
-	status = mvPexHwConfigWrite (pexIf, bus, dev, func, regOff, data);
-	mvPexLocalDevNumSet(pexIf, localDev);
-	return status;
-}
-
-
-
-
-void resetPexConfig(MV_U32 pexIf, MV_U32 bus, MV_U32 dev)
-{
-	MV_U32 tData;
-	MV_U32 i;
-
-	/* restore the PEX configuration to initialization state */
-	/* in case PEX P2P call recursive and reset config */
-	tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x0);
-	if(tData != 0xffffffff)
-	{
-		/* agent had been found - check whether P2P */
-		tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x8);
-		if((tData & 0xffff0000) == 0x06040000)
-		{/* P2P */
-			/* get the sec bus and the subordinate */
-			MV_U32 secBus;	
-			tData = mvPexHwConfigRead (pexIf, bus, dev, 0x0, 0x18);
-			secBus = ((tData >> 8) & 0xff);
-			/* now scan on sec bus */
-			for(i = 0;i < 0xff;i++)
-			{
-				resetPexConfig(pexIf, secBus, i);
-			}
-			/* now reset this device */
-			DB(mvOsPrintf("Reset bus %d dev %d\n", bus, dev));
-			mvPexHwConfigWrite(pexIf, bus, dev, 0x0, 0x18, 0x0); 
-			DB(mvOsPrintf("Reset bus %d dev %d\n", bus, dev));
-		}
-	}
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h
deleted file mode 100644
index d01f0248ad..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/pex/mvVrtBrgPex.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCVRTBRGPEXH
-#define __INCVRTBRGPEXH
-
-
-/* Global Functions prototypes */
-/* mvPexInit - Initialize PEX interfaces*/
-MV_STATUS mvPexVrtBrgInit(MV_U32 pexIf);
-
-/* mvPexConfigRead - Read from configuration space */
-MV_U32 mvPexVrtBrgConfigRead (MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
-						MV_U32 func,MV_U32 regOff);
-
-/* mvPexConfigWrite - Write to configuration space */
-MV_STATUS mvPexVrtBrgConfigWrite(MV_U32 pexIf, MV_U32 bus, MV_U32 dev,
-                           MV_U32 func, MV_U32 regOff, MV_U32 data);
-
-
-#endif /* #ifndef __INCPEXH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c
deleted file mode 100644
index 6c5bc191cc..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.c
+++ /dev/null
@@ -1,1522 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#include "mvOs.h"
-#include "sflash/mvSFlash.h"
-#include "sflash/mvSFlashSpec.h"
-#include "spi/mvSpi.h"
-#include "spi/mvSpiCmnd.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/*#define MV_DEBUG*/
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-/* Globals */
-static MV_SFLASH_DEVICE_PARAMS sflash[] = {
-    /* ST M25P32 SPI flash, 4MB, 64 sectors of 64K each */
-    {
-     MV_M25P_WREN_CMND_OPCD,
-     MV_M25P_WRDI_CMND_OPCD,
-     MV_M25P_RDID_CMND_OPCD,
-     MV_M25P_RDSR_CMND_OPCD,
-     MV_M25P_WRSR_CMND_OPCD,
-     MV_M25P_READ_CMND_OPCD,
-     MV_M25P_FAST_RD_CMND_OPCD,
-     MV_M25P_PP_CMND_OPCD,
-     MV_M25P_SE_CMND_OPCD,
-     MV_M25P_BE_CMND_OPCD,
-     MV_M25P_RES_CMND_OPCD,
-     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
-     MV_M25P32_SECTOR_SIZE,
-     MV_M25P32_SECTOR_NUMBER,
-     MV_M25P_PAGE_SIZE,
-     "ST M25P32",
-     MV_M25PXXX_ST_MANF_ID,
-     MV_M25P32_DEVICE_ID,
-     MV_M25P32_MAX_SPI_FREQ,
-     MV_M25P32_MAX_FAST_SPI_FREQ,
-     MV_M25P32_FAST_READ_DUMMY_BYTES
-    },
-    /* ST M25P64 SPI flash, 8MB, 128 sectors of 64K each */
-    {
-     MV_M25P_WREN_CMND_OPCD,
-     MV_M25P_WRDI_CMND_OPCD,
-     MV_M25P_RDID_CMND_OPCD,
-     MV_M25P_RDSR_CMND_OPCD,
-     MV_M25P_WRSR_CMND_OPCD,
-     MV_M25P_READ_CMND_OPCD,
-     MV_M25P_FAST_RD_CMND_OPCD,
-     MV_M25P_PP_CMND_OPCD,
-     MV_M25P_SE_CMND_OPCD,
-     MV_M25P_BE_CMND_OPCD,
-     MV_M25P_RES_CMND_OPCD,
-     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
-     MV_M25P64_SECTOR_SIZE,
-     MV_M25P64_SECTOR_NUMBER,
-     MV_M25P_PAGE_SIZE,
-     "ST M25P64",
-     MV_M25PXXX_ST_MANF_ID,
-     MV_M25P64_DEVICE_ID,
-     MV_M25P64_MAX_SPI_FREQ,
-     MV_M25P64_MAX_FAST_SPI_FREQ,
-     MV_M25P64_FAST_READ_DUMMY_BYTES
-    },
-    /* ST M25P128 SPI flash, 16MB, 64 sectors of 256K each */
-    {
-     MV_M25P_WREN_CMND_OPCD,
-     MV_M25P_WRDI_CMND_OPCD,
-     MV_M25P_RDID_CMND_OPCD,
-     MV_M25P_RDSR_CMND_OPCD,
-     MV_M25P_WRSR_CMND_OPCD,
-     MV_M25P_READ_CMND_OPCD,
-     MV_M25P_FAST_RD_CMND_OPCD,
-     MV_M25P_PP_CMND_OPCD,
-     MV_M25P_SE_CMND_OPCD,
-     MV_M25P_BE_CMND_OPCD,
-     MV_M25P_RES_CMND_OPCD,
-     MV_SFLASH_NO_SPECIFIC_OPCD,    /* power save not supported */
-     MV_M25P128_SECTOR_SIZE,
-     MV_M25P128_SECTOR_NUMBER,
-     MV_M25P_PAGE_SIZE,
-     "ST M25P128",
-     MV_M25PXXX_ST_MANF_ID,
-     MV_M25P128_DEVICE_ID,
-     MV_M25P128_MAX_SPI_FREQ,
-     MV_M25P128_MAX_FAST_SPI_FREQ,
-     MV_M25P128_FAST_READ_DUMMY_BYTES
-    },
-    /* Macronix MXIC MX25L6405 SPI flash, 8MB, 128 sectors of 64K each */
-    {
-     MV_MX25L_WREN_CMND_OPCD,
-     MV_MX25L_WRDI_CMND_OPCD,
-     MV_MX25L_RDID_CMND_OPCD,
-     MV_MX25L_RDSR_CMND_OPCD,
-     MV_MX25L_WRSR_CMND_OPCD,
-     MV_MX25L_READ_CMND_OPCD,
-     MV_MX25L_FAST_RD_CMND_OPCD,
-     MV_MX25L_PP_CMND_OPCD,
-     MV_MX25L_SE_CMND_OPCD,
-     MV_MX25L_BE_CMND_OPCD,
-     MV_MX25L_RES_CMND_OPCD,
-     MV_MX25L_DP_CMND_OPCD,
-     MV_MX25L6405_SECTOR_SIZE,
-     MV_MX25L6405_SECTOR_NUMBER,
-     MV_MXIC_PAGE_SIZE,
-     "MXIC MX25L6405",
-     MV_MXIC_MANF_ID,
-     MV_MX25L6405_DEVICE_ID,
-     MV_MX25L6405_MAX_SPI_FREQ,
-     MV_MX25L6405_MAX_FAST_SPI_FREQ,
-     MV_MX25L6405_FAST_READ_DUMMY_BYTES
-    },
-    /* SPANSION S25FL128P SPI flash, 16MB, 64 sectors of 256K each */
-    {
-     MV_S25FL_WREN_CMND_OPCD,
-     MV_S25FL_WRDI_CMND_OPCD,
-     MV_S25FL_RDID_CMND_OPCD,
-     MV_S25FL_RDSR_CMND_OPCD,
-     MV_S25FL_WRSR_CMND_OPCD,
-     MV_S25FL_READ_CMND_OPCD,
-     MV_S25FL_FAST_RD_CMND_OPCD,
-     MV_S25FL_PP_CMND_OPCD,
-     MV_S25FL_SE_CMND_OPCD,
-     MV_S25FL_BE_CMND_OPCD,
-     MV_S25FL_RES_CMND_OPCD,
-     MV_S25FL_DP_CMND_OPCD,
-     MV_S25FL128_SECTOR_SIZE,
-     MV_S25FL128_SECTOR_NUMBER,
-     MV_S25FL_PAGE_SIZE,
-     "SPANSION S25FL128",
-     MV_SPANSION_MANF_ID,
-     MV_S25FL128_DEVICE_ID,
-     MV_S25FL128_MAX_SPI_FREQ,
-     MV_M25P128_MAX_FAST_SPI_FREQ,
-     MV_M25P128_FAST_READ_DUMMY_BYTES
-    }
-};
-
-/* Static Functions */
-static MV_STATUS    mvWriteEnable   (MV_SFLASH_INFO * pFlinfo);
-static MV_STATUS    mvStatusRegGet  (MV_SFLASH_INFO * pFlinfo, MV_U8 * pStatReg);
-static MV_STATUS    mvStatusRegSet  (MV_SFLASH_INFO * pFlinfo, MV_U8 sr);
-static MV_STATUS    mvWaitOnWipClear(MV_SFLASH_INFO * pFlinfo);
-static MV_STATUS    mvSFlashPageWr  (MV_SFLASH_INFO * pFlinfo, MV_U32 offset, \
-							         MV_U8* pPageBuff, MV_U32 buffSize);
-static MV_STATUS    mvSFlashWithDefaultsIdGet (MV_SFLASH_INFO * pFlinfo, \
-                                            MV_U8* manId, MV_U16* devId);
-
-/*******************************************************************************
-* mvWriteEnable - serialize the write enable sequence
-*
-* DESCRIPTION:
-*       transmit the sequence for write enable
-*
-********************************************************************************/
-static MV_STATUS mvWriteEnable(MV_SFLASH_INFO * pFlinfo)
-{
-	MV_U8 cmd[MV_SFLASH_WREN_CMND_LENGTH];
-
-
-    cmd[0] = sflash[pFlinfo->index].opcdWREN;
-
-	return mvSpiWriteThenRead(cmd, MV_SFLASH_WREN_CMND_LENGTH, NULL, 0, 0);
-}
-
-/*******************************************************************************
-* mvStatusRegGet - Retrieve the value of the status register
-*
-* DESCRIPTION:
-*       perform the RDSR sequence to get the 8bit status register
-*
-********************************************************************************/
-static MV_STATUS mvStatusRegGet(MV_SFLASH_INFO * pFlinfo, MV_U8 * pStatReg)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_RDSR_CMND_LENGTH];
-	MV_U8 sr[MV_SFLASH_RDSR_REPLY_LENGTH];
-
-
-
-
-	cmd[0] = sflash[pFlinfo->index].opcdRDSR;
-
-	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_RDSR_CMND_LENGTH, sr,
-                                         MV_SFLASH_RDSR_REPLY_LENGTH,0)) != MV_OK)
-        return ret;
-
-    *pStatReg = sr[0];
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvWaitOnWipClear - Block waiting for the WIP (write in progress) to be cleared
-*
-* DESCRIPTION:
-*       Block waiting for the WIP (write in progress) to be cleared
-*
-********************************************************************************/
-static MV_STATUS mvWaitOnWipClear(MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-	MV_U32 i;
-    MV_U8 stat;
-
-	for (i=0; i<MV_SFLASH_MAX_WAIT_LOOP; i++)
-	{
-        if ((ret = mvStatusRegGet(pFlinfo, &stat)) != MV_OK)
-            return ret;
-
-		if ((stat & MV_SFLASH_STATUS_REG_WIP_MASK) == 0)
-			return MV_OK;
-	}
-
-    DB(mvOsPrintf("%s WARNING: Write Timeout!\n", __FUNCTION__);)
-	return MV_TIMEOUT;
-}
-
-/*******************************************************************************
-* mvWaitOnChipEraseDone - Block waiting for the WIP (write in progress) to be
-*                         cleared after a chip erase command which is supposed
-*                         to take about 2:30 minutes
-*
-* DESCRIPTION:
-*       Block waiting for the WIP (write in progress) to be cleared
-*
-********************************************************************************/
-static MV_STATUS mvWaitOnChipEraseDone(MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-	MV_U32 i;
-    MV_U8 stat;
-
-	for (i=0; i<MV_SFLASH_CHIP_ERASE_MAX_WAIT_LOOP; i++)
-	{
-        if ((ret = mvStatusRegGet(pFlinfo, &stat)) != MV_OK)
-            return ret;
-
-		if ((stat & MV_SFLASH_STATUS_REG_WIP_MASK) == 0)
-			return MV_OK;
-	}
-
-    DB(mvOsPrintf("%s WARNING: Write Timeout!\n", __FUNCTION__);)
-	return MV_TIMEOUT;
-}
-
-/*******************************************************************************
-*  mvStatusRegSet - Set the value of the 8bit status register
-*
-* DESCRIPTION:
-*       Set the value of the 8bit status register
-*
-********************************************************************************/
-static MV_STATUS mvStatusRegSet(MV_SFLASH_INFO * pFlinfo, MV_U8 sr)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_WRSR_CMND_LENGTH];
-
-
-    /* Issue the Write enable command prior the WRSR command */
-	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
-		return ret;
-
-    /* Write the SR with the new values */
-    cmd[0] = sflash[pFlinfo->index].opcdWRSR;
-	cmd[1] = sr;
-
-	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_WRSR_CMND_LENGTH, NULL, 0, 0)) != MV_OK)
-		return ret;
-
-    if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
-		return ret;
-
-    mvOsDelay(1);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashPageWr - Write up to 256 Bytes in the same page
-*
-* DESCRIPTION:
-*       Write a buffer up to the page size in length provided that the whole address
-*		range is within the same page (alligned to page bounderies)
-*
-*******************************************************************************/
-static MV_STATUS mvSFlashPageWr (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-							     MV_U8* pPageBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_PP_CMND_LENGTH];
-
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invalid parameter device index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-	/* check that we do not cross the page bounderies */
-    if (((offset & (sflash[pFlinfo->index].pageSize - 1)) + buffSize) >
-        sflash[pFlinfo->index].pageSize)
-    {
-        DB(mvOsPrintf("%s WARNING: Page allignment problem!\n", __FUNCTION__);)
-		return MV_OUT_OF_RANGE;
-    }
-
-	/* Issue the Write enable command prior the page program command */
-	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
-		return ret;
-
-    cmd[0] = sflash[pFlinfo->index].opcdPP;
-	cmd[1] = ((offset >> 16) & 0xFF);
-	cmd[2] = ((offset >> 8) & 0xFF);
-	cmd[3] = (offset & 0xFF);
-
-	if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_PP_CMND_LENGTH, pPageBuff, buffSize)) != MV_OK)
-		return ret;
-
-	if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
-		return ret;
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashWithDefaultsIdGet - Try to read the manufacturer and Device IDs from
-*       the device using the default RDID opcode and the default WREN opcode.
-*
-* DESCRIPTION:
-*       This is used to detect a generic device that uses the default opcodes
-*       for the WREN and RDID.
-*
-********************************************************************************/
-static MV_STATUS mvSFlashWithDefaultsIdGet (MV_SFLASH_INFO * pFlinfo, MV_U8* manId, MV_U16* devId)
-{
-    MV_STATUS ret;
-    MV_U8 cmdRDID[MV_SFLASH_RDID_CMND_LENGTH];
-	MV_U8 id[MV_SFLASH_RDID_REPLY_LENGTH];
-
-
-
-    /* Use the default RDID opcode to read the IDs */
-    cmdRDID[0] = MV_SFLASH_DEFAULT_RDID_OPCD;   /* unknown model try default */
-	if ((ret = mvSpiWriteThenRead(cmdRDID, MV_SFLASH_RDID_CMND_LENGTH, id, MV_SFLASH_RDID_REPLY_LENGTH, 0)) != MV_OK)
-		return ret;
-
-	*manId = id[0];
-	*devId = 0;
-	*devId |= (id[1] << 8);
-	*devId |= id[2];
-
-	return MV_OK;
-}
-
-/*
-#####################################################################################
-#####################################################################################
-*/
-
-/*******************************************************************************
-* mvSFlashInit - Initialize the serial flash device
-*
-* DESCRIPTION:
-*       Perform the neccessary initialization and configuration
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*           pFlinfo->baseAddr: base address in fast mode.
-*           pFlinfo->index: Index of the flash in the sflash tabel. If the SPI
-*                           flash device does not support read Id command with
-*                           the standard opcode, then the user should supply this
-*                           as an input to skip the autodetection process!!!!
-*
-* OUTPUT:
-*       pFlinfo: pointer to the Flash information structure after detection
-*           pFlinfo->manufacturerId: Manufacturer ID
-*           pFlinfo->deviceId: Device ID
-*           pFlinfo->sectorSize: size of the sector (all sectors are the same).
-*           pFlinfo->sectorNumber: number of sectors.
-*           pFlinfo->pageSize: size of the page.
-*           pFlinfo->index: Index of the detected flash in the sflash tabel
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashInit (MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-    MV_U8 manf;
-    MV_U16 dev;
-    MV_U32 indx;
-    MV_BOOL detectFlag = MV_FALSE;
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Initialize the SPI interface with low frequency to make sure that the read ID succeeds */
-    if ((ret = mvSpiInit(MV_SFLASH_BASIC_SPI_FREQ)) != MV_OK)
-    {
-        mvOsPrintf("%s ERROR: Failed to initialize the SPI interface!\n", __FUNCTION__);
-        return ret;
-    }
-
-    /* First try to read the Manufacturer and Device IDs */
-    if ((ret = mvSFlashIdGet(pFlinfo, &manf, &dev)) != MV_OK)
-    {
-        mvOsPrintf("%s ERROR: Failed to get the SFlash ID!\n", __FUNCTION__);
-        return ret;
-    }
-
-    /* loop over the whole table and look for the appropriate SFLASH */
-    for (indx=0; indx<MV_ARRAY_SIZE(sflash); indx++)
-    {
-        if ((manf == sflash[indx].manufacturerId) && (dev == sflash[indx].deviceId))
-        {
-            pFlinfo->manufacturerId = manf;
-            pFlinfo->deviceId = dev;
-            pFlinfo->index = indx;
-            detectFlag = MV_TRUE;
-        }
-    }
-
-    if(!detectFlag)
-    {
-        mvOsPrintf("%s ERROR: Unknown SPI flash device!\n", __FUNCTION__);
-        return MV_FAIL;
-    }
-
-    /* fill the info based on the model detected */
-    pFlinfo->sectorSize = sflash[pFlinfo->index].sectorSize;
-    pFlinfo->sectorNumber = sflash[pFlinfo->index].sectorNumber;
-    pFlinfo->pageSize = sflash[pFlinfo->index].pageSize;
-
-    /* Set the SPI frequency to the MAX allowed for the device for best performance */
-    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFreq)) != MV_OK)
-    {
-        mvOsPrintf("%s ERROR: Failed to set the SPI frequency!\n", __FUNCTION__);
-        return ret;
-    }
-
-    /* As default lock the SR */
-    if ((ret = mvSFlashStatRegLock(pFlinfo, MV_TRUE)) != MV_OK)
-        return ret;
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashSectorErase - Erasse a single sector of the serial flash
-*
-* DESCRIPTION:
-*       Issue the erase sector command and address
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		secNumber: sector Number to erase (0 -> (sectorNumber-1))
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashSectorErase (MV_SFLASH_INFO * pFlinfo, MV_U32 secNumber)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_SE_CMND_LENGTH];
-
-    MV_U32 secAddr = (secNumber * pFlinfo->sectorSize);
-#if 0
-    MV_U32 i;
-    MV_U32 * pW = (MV_U32*) (secAddr + pFlinfo->baseAddr);
-    MV_U32 erasedWord = 0xFFFFFFFF;
-    MV_U32 wordsPerSector = (pFlinfo->sectorSize / sizeof(MV_U32));
-    MV_BOOL eraseNeeded = MV_FALSE;
-#endif
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* check that the sector number is valid */
-    if (secNumber >= pFlinfo->sectorNumber)
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter sector number!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-    
-    /* we don't want to access SPI in direct mode from in-direct API, 
-	becasue of timing issue between CS asserts. */
-#if 0
-    /* First compare to FF and check if erase is needed */
-    for (i=0; i<wordsPerSector; i++)
-    {
-        if (memcmp(pW, &erasedWord, sizeof(MV_U32)) != 0)
-        {
-            eraseNeeded = MV_TRUE;
-            break;
-        }
-
-        ++pW;
-    }
-    if (!eraseNeeded)
-        return MV_OK;
-#endif
-
-    cmd[0] = sflash[pFlinfo->index].opcdSE;
-	cmd[1] = ((secAddr >> 16) & 0xFF);
-	cmd[2] = ((secAddr >> 8) & 0xFF);
-	cmd[3] = (secAddr & 0xFF);
-
-	/* Issue the Write enable command prior the sector erase command */
-	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
-		return ret;
-
-	if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_SE_CMND_LENGTH, NULL, 0)) != MV_OK)
-		return ret;
-
-	if ((ret = mvWaitOnWipClear(pFlinfo)) != MV_OK)
-		return ret;
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashChipErase - Erasse the whole serial flash
-*
-* DESCRIPTION:
-*       Issue the bulk (chip) erase command
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashChipErase (MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_BE_CMND_LENGTH];
-
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    cmd[0] = sflash[pFlinfo->index].opcdBE;
-
-	/* Issue the Write enable command prior the Bulk erase command */
-	if ((ret = mvWriteEnable(pFlinfo)) != MV_OK)
-		return ret;
-
-    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_BE_CMND_LENGTH, NULL, 0)) != MV_OK)
-		return ret;
-
-	if ((ret = mvWaitOnChipEraseDone(pFlinfo)) != MV_OK)
-		return ret;
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashBlockRd - Read from the serial flash
-*
-* DESCRIPTION:
-*       Issue the read command and address then perfom the needed read
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		offset: byte offset with the flash to start reading from
-*		pReadBuff: pointer to the buffer to read the data in
-*		buffSize: size of the buffer to read.
-*
-* OUTPUT:
-*       pReadBuff: pointer to the buffer containing the read data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-						   MV_U8* pReadBuff, MV_U32 buffSize)
-{
-	MV_U8 cmd[MV_SFLASH_READ_CMND_LENGTH];
-
-
-    /* check for NULL pointer */
-    if ((pFlinfo == NULL) || (pReadBuff == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    cmd[0] = sflash[pFlinfo->index].opcdREAD;
-	cmd[1] = ((offset >> 16) & 0xFF);
-	cmd[2] = ((offset >> 8) & 0xFF);
-	cmd[3] = (offset & 0xFF);
-
-	return mvSpiWriteThenRead(cmd, MV_SFLASH_READ_CMND_LENGTH, pReadBuff, buffSize, 0);
-}
-
-/*******************************************************************************
-* mvSFlashFastBlockRd - Fast read from the serial flash
-*
-* DESCRIPTION:
-*       Issue the fast read command and address then perfom the needed read
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		offset: byte offset with the flash to start reading from
-*		pReadBuff: pointer to the buffer to read the data in
-*		buffSize: size of the buffer to read.
-*
-* OUTPUT:
-*       pReadBuff: pointer to the buffer containing the read data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashFastBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-						       MV_U8* pReadBuff, MV_U32 buffSize)
-{
-    MV_U8 cmd[MV_SFLASH_READ_CMND_LENGTH];
-    MV_STATUS ret;
-
-    /* check for NULL pointer */
-    if ((pFlinfo == NULL) || (pReadBuff == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* Set the SPI frequency to the MAX allowed for fast-read operations */
-    mvOsPrintf("Setting freq to %d.\n",sflash[pFlinfo->index].spiMaxFastFreq);
-    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFastFreq)) != MV_OK)
-    {
-        mvOsPrintf("%s ERROR: Failed to set the SPI fast frequency!\n", __FUNCTION__);
-        return ret;
-    }
-
-    cmd[0] = sflash[pFlinfo->index].opcdFSTRD;
-    cmd[1] = ((offset >> 16) & 0xFF);
-    cmd[2] = ((offset >> 8) & 0xFF);
-    cmd[3] = (offset & 0xFF);
-
-
-    ret = mvSpiWriteThenRead(cmd, MV_SFLASH_READ_CMND_LENGTH, pReadBuff, buffSize,
-                             sflash[pFlinfo->index].spiFastRdDummyBytes);
-
-    /* Reset the SPI frequency to the MAX allowed for the device for best performance */
-    if ((ret = mvSpiBaudRateSet(sflash[pFlinfo->index].spiMaxFreq)) != MV_OK)
-    {
-        mvOsPrintf("%s ERROR: Failed to set the SPI frequency!\n", __FUNCTION__);
-        return ret;
-    }
-
-    return ret;
-}
-
-
-/*******************************************************************************
-* mvSFlashBlockWr - Write a buffer with any size
-*
-* DESCRIPTION:
-*       write regardless of the page boundaries and size limit per Page
-*		program command
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		offset: byte offset within the flash region
-*		pWriteBuff: pointer to the buffer holding the data to program
-*		buffSize: size of the buffer to write
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashBlockWr (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-						   MV_U8* pWriteBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-	MV_U32 data2write	= buffSize;
-    MV_U32 preAllOffset = (offset & MV_SFLASH_PAGE_ALLIGN_MASK(MV_M25P_PAGE_SIZE));
-    MV_U32 preAllSz		= (preAllOffset ? (MV_M25P_PAGE_SIZE - preAllOffset) : 0);
-	MV_U32 writeOffset	= offset;
-
-    /* check for NULL pointer */
-#ifndef CONFIG_MARVELL
-    if(NULL == pWriteBuff)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-#endif
-
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-	/* check that the buffer size does not exceed the flash size */
-    if ((offset + buffSize) > mvSFlashSizeGet(pFlinfo))
-    {
-        DB(mvOsPrintf("%s WARNING: Write exceeds flash size!\n", __FUNCTION__);)
-	    return MV_OUT_OF_RANGE;
-    }
-
-	/* check if the total block size is less than the first chunk remainder */
-	if (data2write < preAllSz)
-		preAllSz = data2write;
-
-	/* check if programing does not start at a 64byte alligned offset */
-	if (preAllSz)
-	{
-		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, preAllSz)) != MV_OK)
-			return ret;
-
-		/* increment pointers and counters */
-		writeOffset += preAllSz;
-		data2write -= preAllSz;
-		pWriteBuff += preAllSz;
-	}
-
-	/* program the data that fits in complete page chunks */
-	while (data2write >= sflash[pFlinfo->index].pageSize)
-	{
-		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, sflash[pFlinfo->index].pageSize)) != MV_OK)
-			return ret;
-
-		/* increment pointers and counters */
-		writeOffset += sflash[pFlinfo->index].pageSize;
-		data2write -= sflash[pFlinfo->index].pageSize;
-		pWriteBuff += sflash[pFlinfo->index].pageSize;
-	}
-
-	/* program the last partial chunk */
-	if (data2write)
-	{
-		if ((ret = mvSFlashPageWr(pFlinfo, writeOffset, pWriteBuff, data2write)) != MV_OK)
-			return ret;
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashIdGet - Get the manufacturer and device IDs.
-*
-* DESCRIPTION:
-*       Get the Manufacturer and device IDs from the serial flash through
-*		writing the RDID command then reading 3 bytes of data. In case that
-*       this command was called for the first time in order to detect the
-*       manufacturer and device IDs, then the default RDID opcode will be used
-*       unless the device index is indicated by the user (in case the SPI flash
-*       does not use the default RDID opcode).
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		pManId: pointer to the 8bit variable to hold the manufacturing ID
-*		pDevId: pointer to the 16bit variable to hold the device ID
-*
-* OUTPUT:
-*		pManId: pointer to the 8bit variable holding the manufacturing ID
-*		pDevId: pointer to the 16bit variable holding the device ID
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashIdGet (MV_SFLASH_INFO * pFlinfo, MV_U8* pManId, MV_U16* pDevId)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_RDID_CMND_LENGTH];
-	MV_U8 id[MV_SFLASH_RDID_REPLY_LENGTH];
-
-
-
-    /* check for NULL pointer */
-    if ((pFlinfo == NULL) || (pManId == NULL) || (pDevId == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-        return mvSFlashWithDefaultsIdGet(pFlinfo, pManId, pDevId);
-    else
-        cmd[0] = sflash[pFlinfo->index].opcdRDID;
-
-	if ((ret = mvSpiWriteThenRead(cmd, MV_SFLASH_RDID_CMND_LENGTH, id, MV_SFLASH_RDID_REPLY_LENGTH, 0)) != MV_OK)
-		return ret;
-
-	*pManId = id[0];
-	*pDevId = 0;
-	*pDevId |= (id[1] << 8);
-	*pDevId |= id[2];
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashWpRegionSet - Set the Write-Protected region
-*
-* DESCRIPTION:
-*       Set the Write-Protected region
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		wpRegion: which region will be protected
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashWpRegionSet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION wpRegion)
-{
-    MV_U8 wpMask;
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* Check if the chip is an ST flash; then WP supports only 3 bits */
-    if (pFlinfo->manufacturerId == MV_M25PXXX_ST_MANF_ID)
-    {
-        switch (wpRegion)
-        {
-            case MV_WP_NONE:
-                wpMask = MV_M25P_STATUS_BP_NONE;
-                break;
-
-            case MV_WP_UPR_1OF128:
-                DB(mvOsPrintf("%s WARNING: Invaild option for this flash chip!\n", __FUNCTION__);)
-                return MV_NOT_SUPPORTED;
-
-            case MV_WP_UPR_1OF64:
-                wpMask = MV_M25P_STATUS_BP_1_OF_64;
-                break;
-
-            case MV_WP_UPR_1OF32:
-                wpMask = MV_M25P_STATUS_BP_1_OF_32;
-                break;
-
-            case MV_WP_UPR_1OF16:
-                wpMask = MV_M25P_STATUS_BP_1_OF_16;
-                break;
-
-            case MV_WP_UPR_1OF8:
-                wpMask = MV_M25P_STATUS_BP_1_OF_8;
-                break;
-
-            case MV_WP_UPR_1OF4:
-                wpMask = MV_M25P_STATUS_BP_1_OF_4;
-                break;
-
-            case MV_WP_UPR_1OF2:
-                wpMask = MV_M25P_STATUS_BP_1_OF_2;
-                break;
-
-            case MV_WP_ALL:
-                wpMask = MV_M25P_STATUS_BP_ALL;
-                break;
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
-                return MV_BAD_PARAM;
-        }
-    }
-    /* check if the manufacturer is MXIC then the WP is 4bits */
-    else if (pFlinfo->manufacturerId == MV_MXIC_MANF_ID)
-    {
-        switch (wpRegion)
-        {
-            case MV_WP_NONE:
-                wpMask = MV_MX25L_STATUS_BP_NONE;
-                break;
-
-            case MV_WP_UPR_1OF128:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_128;
-                break;
-
-            case MV_WP_UPR_1OF64:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_64;
-                break;
-
-            case MV_WP_UPR_1OF32:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_32;
-                break;
-
-            case MV_WP_UPR_1OF16:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_16;
-                break;
-
-            case MV_WP_UPR_1OF8:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_8;
-                break;
-
-            case MV_WP_UPR_1OF4:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_4;
-                break;
-
-            case MV_WP_UPR_1OF2:
-                wpMask = MV_MX25L_STATUS_BP_1_OF_2;
-                break;
-
-            case MV_WP_ALL:
-                wpMask = MV_MX25L_STATUS_BP_ALL;
-                break;
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
-                return MV_BAD_PARAM;
-        }
-    }
-    /* check if the manufacturer is SPANSION then the WP is 4bits */
-    else if (pFlinfo->manufacturerId == MV_SPANSION_MANF_ID)
-    {
-        switch (wpRegion)
-        {
-            case MV_WP_NONE:
-                wpMask = MV_S25FL_STATUS_BP_NONE;
-                break;
-
-            case MV_WP_UPR_1OF128:
-                DB(mvOsPrintf("%s WARNING: Invaild option for this flash chip!\n", __FUNCTION__);)
-                return MV_NOT_SUPPORTED;
-
-            case MV_WP_UPR_1OF64:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_64;
-                break;
-
-            case MV_WP_UPR_1OF32:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_32;
-                break;
-
-            case MV_WP_UPR_1OF16:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_16;
-                break;
-
-            case MV_WP_UPR_1OF8:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_8;
-                break;
-
-            case MV_WP_UPR_1OF4:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_4;
-                break;
-
-            case MV_WP_UPR_1OF2:
-                wpMask = MV_S25FL_STATUS_BP_1_OF_2;
-                break;
-
-            case MV_WP_ALL:
-                wpMask = MV_S25FL_STATUS_BP_ALL;
-                break;
-
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Invaild parameter WP region!\n", __FUNCTION__);)
-                return MV_BAD_PARAM;
-        }
-    }
-    else
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter Manufacturer ID!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* Verify that the SRWD bit is always set - register is s/w locked */
-    wpMask |= MV_SFLASH_STATUS_REG_SRWD_MASK;
-
-	return mvStatusRegSet(pFlinfo, wpMask);
-}
-
-/*******************************************************************************
-* mvSFlashWpRegionGet - Get the Write-Protected region configured
-*
-* DESCRIPTION:
-*       Get from the chip the Write-Protected region configured
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		pWpRegion: pointer to the variable to return the WP region in
-*
-* OUTPUT:
-*		wpRegion: pointer to the variable holding the WP region configured
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashWpRegionGet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION * pWpRegion)
-{
-    MV_STATUS ret;
-	MV_U8 reg;
-
-    /* check for NULL pointer */
-    if ((pFlinfo == NULL) || (pWpRegion == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    if ((ret = mvStatusRegGet(pFlinfo, &reg)) != MV_OK)
-        return ret;
-
-    /* Check if the chip is an ST flash; then WP supports only 3 bits */
-    if (pFlinfo->manufacturerId == MV_M25PXXX_ST_MANF_ID)
-    {
-        switch ((reg & MV_M25P_STATUS_REG_WP_MASK))
-        {
-            case MV_M25P_STATUS_BP_NONE:
-                *pWpRegion = MV_WP_NONE;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_64:
-                *pWpRegion = MV_WP_UPR_1OF64;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_32:
-                *pWpRegion = MV_WP_UPR_1OF32;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_16:
-                *pWpRegion = MV_WP_UPR_1OF16;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_8:
-                *pWpRegion = MV_WP_UPR_1OF8;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_4:
-                *pWpRegion = MV_WP_UPR_1OF4;
-                break;
-
-            case MV_M25P_STATUS_BP_1_OF_2:
-                *pWpRegion = MV_WP_UPR_1OF2;
-                break;
-
-            case MV_M25P_STATUS_BP_ALL:
-                *pWpRegion = MV_WP_ALL;
-                break;
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
-                return MV_BAD_VALUE;
-        }
-    }
-    /* check if the manufacturer is MXIC then the WP is 4bits */
-    else if (pFlinfo->manufacturerId == MV_MXIC_MANF_ID)
-    {
-        switch ((reg & MV_MX25L_STATUS_REG_WP_MASK))
-        {
-            case MV_MX25L_STATUS_BP_NONE:
-                *pWpRegion = MV_WP_NONE;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_128:
-                *pWpRegion = MV_WP_UPR_1OF128;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_64:
-                *pWpRegion = MV_WP_UPR_1OF64;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_32:
-                *pWpRegion = MV_WP_UPR_1OF32;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_16:
-                *pWpRegion = MV_WP_UPR_1OF16;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_8:
-                *pWpRegion = MV_WP_UPR_1OF8;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_4:
-                *pWpRegion = MV_WP_UPR_1OF4;
-                break;
-
-            case MV_MX25L_STATUS_BP_1_OF_2:
-                *pWpRegion = MV_WP_UPR_1OF2;
-                break;
-
-            case MV_MX25L_STATUS_BP_ALL:
-                *pWpRegion = MV_WP_ALL;
-                break;
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
-                return MV_BAD_VALUE;
-        }
-    }
-    /* Check if the chip is an SPANSION flash; then WP supports only 3 bits */
-    else if (pFlinfo->manufacturerId == MV_SPANSION_MANF_ID)
-    {
-        switch ((reg & MV_S25FL_STATUS_REG_WP_MASK))
-        {
-            case MV_S25FL_STATUS_BP_NONE:
-                *pWpRegion = MV_WP_NONE;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_64:
-                *pWpRegion = MV_WP_UPR_1OF64;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_32:
-                *pWpRegion = MV_WP_UPR_1OF32;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_16:
-                *pWpRegion = MV_WP_UPR_1OF16;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_8:
-                *pWpRegion = MV_WP_UPR_1OF8;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_4:
-                *pWpRegion = MV_WP_UPR_1OF4;
-                break;
-
-            case MV_S25FL_STATUS_BP_1_OF_2:
-                *pWpRegion = MV_WP_UPR_1OF2;
-                break;
-
-            case MV_S25FL_STATUS_BP_ALL:
-                *pWpRegion = MV_WP_ALL;
-                break;
-
-            default:
-                DB(mvOsPrintf("%s WARNING: Unidentified WP region in h/w!\n", __FUNCTION__);)
-                return MV_BAD_VALUE;
-        }
-    }
-    else
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter Manufacturer ID!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSFlashStatRegLock - Lock the status register for writing - W/Vpp
-*		pin should be low to take effect
-*
-* DESCRIPTION:
-*       Lock the access to the Status Register for writing. This will
-*		cause the flash to enter the hardware protection mode if the W/Vpp
-*		is low. If the W/Vpp is hi, the chip will be in soft protection mode, but
-*		the register will continue to be writable if WREN sequence was used.
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*		srLock: enable/disable (MV_TRUE/MV_FALSE) status registor lock mechanism
-*
-* OUTPUT:
-*       None
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashStatRegLock (MV_SFLASH_INFO * pFlinfo, MV_BOOL srLock)
-{
-    MV_STATUS ret;
-	MV_U8 reg;
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    if ((ret = mvStatusRegGet(pFlinfo, &reg)) != MV_OK)
-        return ret;
-
-	if (srLock)
-		reg |= MV_SFLASH_STATUS_REG_SRWD_MASK;
-	else
-		reg &= ~MV_SFLASH_STATUS_REG_SRWD_MASK;
-
-	return mvStatusRegSet(pFlinfo, reg);
-}
-
-/*******************************************************************************
-* mvSFlashSizeGet - Get the size of the SPI flash
-*
-* DESCRIPTION:
-*       based on the sector number and size of each sector calculate the total
-*       size of the flash memory.
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Size of the flash in bytes.
-*
-*
-*******************************************************************************/
-MV_U32 mvSFlashSizeGet (MV_SFLASH_INFO * pFlinfo)
-{
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return 0;
-    }
-
-    return (pFlinfo->sectorSize * pFlinfo->sectorNumber);
-}
-
-/*******************************************************************************
-* mvSFlashPowerSaveEnter - Cause the falsh device to go into power save mode
-*
-* DESCRIPTION:
-*       Enter a special power save mode.
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Size of the flash in bytes.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashPowerSaveEnter(MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_DP_CMND_LENGTH];
-
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return 0;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* check that power save mode is supported in the specific device */
-    if (sflash[pFlinfo->index].opcdPwrSave == MV_SFLASH_NO_SPECIFIC_OPCD)
-    {
-        DB(mvOsPrintf("%s WARNING: Power save not supported for this device!\n", __FUNCTION__);)
-        return MV_NOT_SUPPORTED;
-    }
-
-    cmd[0] = sflash[pFlinfo->index].opcdPwrSave;
-
-    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_DP_CMND_LENGTH, NULL, 0)) != MV_OK)
-		return ret;
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvSFlashPowerSaveExit - Cause the falsh device to exit the power save mode
-*
-* DESCRIPTION:
-*       Exit the deep power save mode.
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Size of the flash in bytes.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSFlashPowerSaveExit (MV_SFLASH_INFO * pFlinfo)
-{
-    MV_STATUS ret;
-	MV_U8 cmd[MV_SFLASH_RES_CMND_LENGTH];
-
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return 0;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return MV_BAD_PARAM;
-    }
-
-    /* check that power save mode is supported in the specific device */
-    if (sflash[pFlinfo->index].opcdRES == MV_SFLASH_NO_SPECIFIC_OPCD)
-    {
-        DB(mvOsPrintf("%s WARNING: Read Electronic Signature not supported for this device!\n", __FUNCTION__);)
-        return MV_NOT_SUPPORTED;
-    }
-
-    cmd[0] = sflash[pFlinfo->index].opcdRES;
-
-    if ((ret = mvSpiWriteThenWrite(cmd, MV_SFLASH_RES_CMND_LENGTH, NULL, 0)) != MV_OK)
-		return ret;
-
-    /* add the delay needed for the device to wake up */
-    mvOsDelay(MV_MXIC_DP_EXIT_DELAY);   /* 30 ms */
-
-	return MV_OK;
-
-}
-
-/*******************************************************************************
-* mvSFlashModelGet - Retreive the string with the device manufacturer and model
-*
-* DESCRIPTION:
-*       Retreive the string with the device manufacturer and model
-*
-* INPUT:
-*       pFlinfo: pointer to the Flash information structure
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       pointer to the string indicating the device manufacturer and model
-*
-*
-*******************************************************************************/
-const MV_8 * mvSFlashModelGet (MV_SFLASH_INFO * pFlinfo)
-{
-    static const MV_8 * unknModel = (const MV_8 *)"Unknown";
-
-    /* check for NULL pointer */
-    if (pFlinfo == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return 0;
-    }
-
-    /* Protection - check if the model was detected */
-    if (pFlinfo->index >= MV_ARRAY_SIZE(sflash))
-    {
-        DB(mvOsPrintf("%s WARNING: Invaild parameter index!\n", __FUNCTION__);)
-        return unknModel;
-    }
-
-    return sflash[pFlinfo->index].deviceModel;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h
deleted file mode 100644
index f441a5cf52..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlash.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSFlashH
-#define __INCmvSFlashH
-
-#include "mvTypes.h"
-
-/* MCAROS */
-#define MV_SFLASH_PAGE_ALLIGN_MASK(pgSz)    (pgSz-1)
-#define MV_ARRAY_SIZE(a)                    ((sizeof(a)) / (sizeof(a[0])))
-
-/* Constants */
-#define MV_INVALID_DEVICE_NUMBER            0xFFFFFFFF
-/* 10 MHz is the minimum possible SPI frequency when tclk is set 200MHz*/
-#define MV_SFLASH_BASIC_SPI_FREQ            10000000
-/* enumerations */
-typedef enum
-{
-	MV_WP_NONE,             /* Unprotect the whole chip */
-    MV_WP_UPR_1OF128,       /* Write protect the upper 1/128 part */
-    MV_WP_UPR_1OF64,        /* Write protect the upper 1/64 part */
-	MV_WP_UPR_1OF32,        /* Write protect the upper 1/32 part */
-	MV_WP_UPR_1OF16,        /* Write protect the upper 1/16 part */
-	MV_WP_UPR_1OF8,         /* Write protect the upper 1/8 part */
-	MV_WP_UPR_1OF4,         /* Write protect the upper 1/4 part */
-	MV_WP_UPR_1OF2,         /* Write protect the upper 1/2 part */
-	MV_WP_ALL               /* Write protect the whole chip */
-} MV_SFLASH_WP_REGION;
-
-/* Type Definitions */
-typedef struct
-{
-    MV_U8   opcdWREN;       /* Write enable opcode */
-    MV_U8   opcdWRDI;       /* Write disable opcode */
-    MV_U8   opcdRDID;       /* Read ID opcode */
-    MV_U8   opcdRDSR;       /* Read Status Register opcode */
-    MV_U8   opcdWRSR;       /* Write Status register opcode */
-    MV_U8   opcdREAD;       /* Read opcode */
-    MV_U8   opcdFSTRD;      /* Fast Read opcode */
-    MV_U8   opcdPP;         /* Page program opcode */
-    MV_U8   opcdSE;         /* Sector erase opcode */
-    MV_U8   opcdBE;         /* Bulk erase opcode */
-    MV_U8   opcdRES;        /* Read electronic signature */
-    MV_U8   opcdPwrSave;    /* Go into power save mode */
-    MV_U32  sectorSize;     /* Size of each sector */
-    MV_U32  sectorNumber;   /* Number of sectors */
-    MV_U32  pageSize;       /* size of each page */
-    const char * deviceModel;    /* string with the device model */
-    MV_U32  manufacturerId; /* The manufacturer ID */
-    MV_U32  deviceId;       /* Device ID */
-    MV_U32  spiMaxFreq;     /* The MAX frequency that can be used with the device */
-    MV_U32  spiMaxFastFreq; /* The MAX frequency that can be used with the device for fast reads */
-    MV_U32  spiFastRdDummyBytes; /* Number of dumy bytes to read before real data when working in fast read mode. */
-} MV_SFLASH_DEVICE_PARAMS;
-
-typedef struct
-{
-    MV_U32					baseAddr;       /* Flash Base Address used in fast mode */
-	MV_U8	                manufacturerId;	/* Manufacturer ID */
-    MV_U16	                deviceId;	    /* Device ID */
-    MV_U32                  sectorSize;     /* Size of each sector - all the same */
-    MV_U32                  sectorNumber;   /* Number of sectors */
-    MV_U32                  pageSize;       /* Page size - affect allignment */
-    MV_U32                  index;          /* index of the device in the sflash table (internal parameter) */
-} MV_SFLASH_INFO;
-
-/* Function Prototypes */
-/* Init */
-MV_STATUS	mvSFlashInit		(MV_SFLASH_INFO * pFlinfo);
-
-/* erase */
-MV_STATUS 	mvSFlashSectorErase (MV_SFLASH_INFO * pFlinfo, MV_U32 secNumber);
-MV_STATUS 	mvSFlashChipErase   (MV_SFLASH_INFO * pFlinfo);
-
-/* Read */
-MV_STATUS	mvSFlashBlockRd  	(MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-							     MV_U8* pReadBuff, MV_U32 buffSize);
-MV_STATUS mvSFlashFastBlockRd (MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-							     MV_U8* pReadBuff, MV_U32 buffSize);
-
-/* write regardless of the page boundaries and size limit per Page program command */
-MV_STATUS	mvSFlashBlockWr		(MV_SFLASH_INFO * pFlinfo, MV_U32 offset,
-							     MV_U8* pWriteBuff, MV_U32 buffSize);
-/* Get IDs */
-MV_STATUS 	mvSFlashIdGet      	(MV_SFLASH_INFO * pFlinfo, MV_U8* pManId, MV_U16* pDevId);
-
-/* Set and Get the Write Protection region - if the Status register is not locked */
-MV_STATUS   mvSFlashWpRegionSet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION wpRegion);
-MV_STATUS   mvSFlashWpRegionGet (MV_SFLASH_INFO * pFlinfo, MV_SFLASH_WP_REGION * pWpRegion);
-
-/* Lock the status register for writing - W/Vpp pin should be low to take effect */
-MV_STATUS   mvSFlashStatRegLock (MV_SFLASH_INFO * pFlinfo, MV_BOOL srLock);
-
-/* Get the regions sizes */
-MV_U32      mvSFlashSizeGet     (MV_SFLASH_INFO * pFlinfo);
-
-/* Cause the falsh device to go into power save mode */
-MV_STATUS   mvSFlashPowerSaveEnter(MV_SFLASH_INFO * pFlinfo);
-MV_STATUS   mvSFlashPowerSaveExit (MV_SFLASH_INFO * pFlinfo);
-
-/* Retreive the string with the device manufacturer and model */
-const MV_8 *     mvSFlashModelGet    (MV_SFLASH_INFO * pFlinfo);
-
-#endif /* __INCmvSFlashH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h
deleted file mode 100644
index eeb44262e2..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/sflash/mvSFlashSpec.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSFlashSpecH
-#define __INCmvSFlashSpecH
-
-/* Constants */
-#define		MV_SFLASH_READ_CMND_LENGTH		    4		/* 1B opcode + 3B address */
-#define		MV_SFLASH_SE_CMND_LENGTH		    4		/* 1B opcode + 3B address */
-#define		MV_SFLASH_BE_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_PP_CMND_LENGTH		    4		/* 1B opcode + 3B address */
-#define		MV_SFLASH_WREN_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_WRDI_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_RDID_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_RDID_REPLY_LENGTH		    3		/* 1B manf ID and 2B device ID */
-#define		MV_SFLASH_RDSR_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_RDSR_REPLY_LENGTH		    1		/* 1B status */
-#define		MV_SFLASH_WRSR_CMND_LENGTH		    2		/* 1B opcode + 1B status value */
-#define		MV_SFLASH_DP_CMND_LENGTH		    1		/* 1B opcode */
-#define		MV_SFLASH_RES_CMND_LENGTH		    1		/* 1B opcode */
-
-/* Status Register Bit Masks */
-#define		MV_SFLASH_STATUS_REG_WIP_OFFSET	    0	    /* bit 0; write in progress */
-#define		MV_SFLASH_STATUS_REG_WP_OFFSET	    2       /* bit 2-4; write protect option */
-#define		MV_SFLASH_STATUS_REG_SRWD_OFFSET	7	    /* bit 7; lock status register write */
-#define		MV_SFLASH_STATUS_REG_WIP_MASK	    (0x1 << MV_SFLASH_STATUS_REG_WIP_OFFSET)
-#define		MV_SFLASH_STATUS_REG_SRWD_MASK	    (0x1 << MV_SFLASH_STATUS_REG_SRWD_OFFSET)
-
-#define		MV_SFLASH_MAX_WAIT_LOOP			    1000000
-#define     MV_SFLASH_CHIP_ERASE_MAX_WAIT_LOOP  0x50000000
-
-#define		MV_SFLASH_DEFAULT_RDID_OPCD		    0x9F	/* Default Read ID */
-#define     MV_SFLASH_DEFAULT_WREN_OPCD         0x06	/* Default Write Enable */
-#define     MV_SFLASH_NO_SPECIFIC_OPCD          0x00
-
-/********************************/
-/*  ST M25Pxxx Device Specific  */
-/********************************/
-
-/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
-#define     MV_M25PXXX_ST_MANF_ID               0x20
-#define     MV_M25P32_DEVICE_ID                 0x2016
-#define     MV_M25P32_MAX_SPI_FREQ              20000000    /* 20MHz */
-#define     MV_M25P32_MAX_FAST_SPI_FREQ         50000000    /* 50MHz */
-#define     MV_M25P32_FAST_READ_DUMMY_BYTES     1
-#define     MV_M25P64_DEVICE_ID                 0x2017
-#define     MV_M25P64_MAX_SPI_FREQ              20000000    /* 20MHz */
-#define     MV_M25P64_MAX_FAST_SPI_FREQ         50000000    /* 50MHz */
-#define     MV_M25P64_FAST_READ_DUMMY_BYTES     1
-#define     MV_M25P128_DEVICE_ID                0x2018
-#define     MV_M25P128_MAX_SPI_FREQ             20000000    /* 20MHz */
-#define     MV_M25P128_MAX_FAST_SPI_FREQ        50000000    /* 50MHz */
-#define     MV_M25P128_FAST_READ_DUMMY_BYTES    1
-
-
-/* Sector Sizes and population per device model*/
-#define     MV_M25P32_SECTOR_SIZE               0x10000 /* 64K */
-#define     MV_M25P64_SECTOR_SIZE               0x10000 /* 64K */
-#define     MV_M25P128_SECTOR_SIZE              0x40000 /* 256K */
-#define     MV_M25P32_SECTOR_NUMBER             64
-#define     MV_M25P64_SECTOR_NUMBER             128
-#define     MV_M25P128_SECTOR_NUMBER            64
-#define		MV_M25P_PAGE_SIZE				    0x100   /* 256 byte */
-
-#define		MV_M25P_WREN_CMND_OPCD			    0x06	/* Write Enable */
-#define		MV_M25P_WRDI_CMND_OPCD			    0x04	/* Write Disable */
-#define		MV_M25P_RDID_CMND_OPCD			    0x9F	/* Read ID */
-#define		MV_M25P_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
-#define		MV_M25P_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
-#define		MV_M25P_READ_CMND_OPCD			    0x03	/* Sequential Read */
-#define		MV_M25P_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
-#define		MV_M25P_PP_CMND_OPCD			    0x02	/* Page Program */
-#define		MV_M25P_SE_CMND_OPCD			    0xD8	/* Sector Erase */
-#define		MV_M25P_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
-#define		MV_M25P_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
-
-/* Status Register Write Protect Bit Masks - 3bits */
-#define		MV_M25P_STATUS_REG_WP_MASK	        (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_NONE              (0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_64           (0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_32           (0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_16           (0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_8            (0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_4            (0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_1_OF_2            (0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_M25P_STATUS_BP_ALL               (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-
-/************************************/
-/*  MXIC MX25L6405 Device Specific  */
-/************************************/
-
-/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
-#define     MV_MXIC_MANF_ID                     0xC2
-#define     MV_MX25L6405_DEVICE_ID              0x2017
-#define     MV_MX25L6405_MAX_SPI_FREQ           20000000    /* 20MHz */
-#define     MV_MX25L6405_MAX_FAST_SPI_FREQ      50000000    /* 50MHz */
-#define     MV_MX25L6405_FAST_READ_DUMMY_BYTES  1
-#define     MV_MXIC_DP_EXIT_DELAY               30          /* 30 ms */
-
-/* Sector Sizes and population per device model*/
-#define     MV_MX25L6405_SECTOR_SIZE            0x10000 /* 64K */
-#define     MV_MX25L6405_SECTOR_NUMBER          128
-#define		MV_MXIC_PAGE_SIZE			        0x100   /* 256 byte */
-
-#define		MV_MX25L_WREN_CMND_OPCD			    0x06	/* Write Enable */
-#define		MV_MX25L_WRDI_CMND_OPCD			    0x04	/* Write Disable */
-#define		MV_MX25L_RDID_CMND_OPCD			    0x9F	/* Read ID */
-#define		MV_MX25L_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
-#define		MV_MX25L_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
-#define		MV_MX25L_READ_CMND_OPCD			    0x03	/* Sequential Read */
-#define		MV_MX25L_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
-#define		MV_MX25L_PP_CMND_OPCD			    0x02	/* Page Program */
-#define		MV_MX25L_SE_CMND_OPCD			    0xD8	/* Sector Erase */
-#define		MV_MX25L_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
-#define     MV_MX25L_DP_CMND_OPCD               0xB9    /* Deep Power Down */
-#define		MV_MX25L_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
-
-/* Status Register Write Protect Bit Masks - 4bits */
-#define		MV_MX25L_STATUS_REG_WP_MASK	        (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_NONE             (0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_128         (0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_64          (0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_32          (0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_16          (0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_8           (0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_4           (0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_1_OF_2           (0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     MV_MX25L_STATUS_BP_ALL              (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
-
-/************************************/
-/*  SPANSION S25FL128P Device Specific  */
-/************************************/
-
-/* Manufacturer IDs and Device IDs for SFLASHs supported by the driver */
-#define     MV_SPANSION_MANF_ID                     	0x01
-#define     MV_S25FL128_DEVICE_ID              		0x2018
-#define     MV_S25FL128_MAX_SPI_FREQ           		33000000    /* 33MHz */
-#define     MV_S25FL128_MAX_FAST_SPI_FREQ        	104000000    /* 104MHz */
-#define     MV_S25FL128_FAST_READ_DUMMY_BYTES    	1
-
-/* Sector Sizes and population per device model*/
-#define     MV_S25FL128_SECTOR_SIZE            			0x40000 /* 256K */
-#define     MV_S25FL128_SECTOR_NUMBER          			64
-#define	    MV_S25FL_PAGE_SIZE			        	0x100   /* 256 byte */
-
-#define		MV_S25FL_WREN_CMND_OPCD			    0x06	/* Write Enable */
-#define		MV_S25FL_WRDI_CMND_OPCD			    0x04	/* Write Disable */
-#define		MV_S25FL_RDID_CMND_OPCD			    0x9F	/* Read ID */
-#define		MV_S25FL_RDSR_CMND_OPCD			    0x05	/* Read Status Register */
-#define		MV_S25FL_WRSR_CMND_OPCD			    0x01	/* Write Status Register */
-#define		MV_S25FL_READ_CMND_OPCD			    0x03	/* Sequential Read */
-#define		MV_S25FL_FAST_RD_CMND_OPCD		    0x0B	/* Fast Read */
-#define		MV_S25FL_PP_CMND_OPCD			    0x02	/* Page Program */
-#define		MV_S25FL_SE_CMND_OPCD			    0xD8	/* Sector Erase */
-#define		MV_S25FL_BE_CMND_OPCD			    0xC7	/* Bulk Erase */
-#define     	MV_S25FL_DP_CMND_OPCD               	    0xB9    	/* Deep Power Down */
-#define		MV_S25FL_RES_CMND_OPCD			    0xAB	/* Read Electronic Signature */
-
-/* Status Register Write Protect Bit Masks - 4bits */
-#define		MV_S25FL_STATUS_REG_WP_MASK	        (0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_NONE             	(0x00 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_128         	(0x01 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_64          	(0x02 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_32          	(0x03 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_16          	(0x04 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_8           	(0x05 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_4           	(0x06 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_1_OF_2           	(0x07 << MV_SFLASH_STATUS_REG_WP_OFFSET)
-#define     	MV_S25FL_STATUS_BP_ALL              	(0x0F << MV_SFLASH_STATUS_REG_WP_OFFSET)
-
-#endif /* __INCmvSFlashSpecH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c
deleted file mode 100644
index 39e0b720d1..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "spi/mvSpi.h"
-#include "spi/mvSpiSpec.h"
-
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-/* #define MV_DEBUG */
-#ifdef MV_DEBUG
-#define DB(x) x
-#define mvOsPrintf printf
-#else
-#define DB(x)
-#endif
-
-
-/*******************************************************************************
-* mvSpi16bitDataTxRx - Transmt and receive data
-*
-* DESCRIPTION:
-*       Tx data and block waiting for data to be transmitted
-*
-********************************************************************************/
-static MV_STATUS mvSpi16bitDataTxRx (MV_U16 txData, MV_U16 * pRxData)
-{
-    MV_U32 i;
-    MV_BOOL ready = MV_FALSE;
-
-    /* First clear the bit in the interrupt cause register */
-    MV_REG_WRITE(MV_SPI_INT_CAUSE_REG, 0x0);
-
-    /* Transmit data */
-    MV_REG_WRITE(MV_SPI_DATA_OUT_REG, MV_16BIT_LE(txData));
-
-    /* wait with timeout for memory ready */
-    for (i=0; i<MV_SPI_WAIT_RDY_MAX_LOOP; i++)
-    {
-        if (MV_REG_READ(MV_SPI_INT_CAUSE_REG))
-        {
-            ready = MV_TRUE;
-            break;
-        }
-#ifdef MV_SPI_SLEEP_ON_WAIT
-        mvOsSleep(1);
-#endif /* MV_SPI_SLEEP_ON_WAIT */
-    }
-
-    if (!ready)
-        return MV_TIMEOUT;
-
-    /* check that the RX data is needed */
-    if (pRxData)
-    {
-    	if ((MV_U32)pRxData &  0x1) /* check if address is not alligned to 16bit */
-    	{
-#if defined(MV_CPU_LE)
-    		/* perform the data write to the buffer in two stages with 8bit each */
-    		MV_U8 * bptr = (MV_U8*)pRxData;
-    		MV_U16 data = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
-    		*bptr = (data & 0xFF);
-    		++bptr;
-    		*bptr = ((data >> 8) & 0xFF);
-
-#elif defined(MV_CPU_BE)
-
-    		/* perform the data write to the buffer in two stages with 8bit each */
-    		MV_U8 * bptr = (MV_U8 *)pRxData;
-    		MV_U16 data = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
-    		*bptr = ((data >> 8) & 0xFF);
-    		++bptr;
-    		*bptr = (data & 0xFF);
-
-#else
-    #error "CPU endianess isn't defined!\n"
-#endif
-
-    	}
-    	else
-        	*pRxData = MV_16BIT_LE(MV_REG_READ(MV_SPI_DATA_IN_REG));
-    }
-
-    return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvSpi8bitDataTxRx - Transmt and receive data (8bits)
-*
-* DESCRIPTION:
-*       Tx data and block waiting for data to be transmitted
-*
-********************************************************************************/
-static MV_STATUS mvSpi8bitDataTxRx (MV_U8 txData, MV_U8 * pRxData)
-{
-    MV_U32 i;
-    MV_BOOL ready = MV_FALSE;
-
-    /* First clear the bit in the interrupt cause register */
-    MV_REG_WRITE(MV_SPI_INT_CAUSE_REG, 0x0);
-
-    /* Transmit data */
-    MV_REG_WRITE(MV_SPI_DATA_OUT_REG, txData);
-
-    /* wait with timeout for memory ready */
-    for (i=0; i<MV_SPI_WAIT_RDY_MAX_LOOP; i++)
-    {
-        if (MV_REG_READ(MV_SPI_INT_CAUSE_REG))
-        {
-            ready = MV_TRUE;
-            break;
-        }
-#ifdef MV_SPI_SLEEP_ON_WAIT
-        mvOsSleep(1);
-#endif /* MV_SPI_SLEEP_ON_WAIT */
-    }
-
-    if (!ready)
-        return MV_TIMEOUT;
-
-    /* check that the RX data is needed */
-    if (pRxData)
-    	*pRxData = MV_REG_READ(MV_SPI_DATA_IN_REG);
-
-    return MV_OK;
-}
-
-/*
-#####################################################################################
-#####################################################################################
-*/
-
-/*******************************************************************************
-* mvSpiInit - Initialize the SPI controller
-*
-* DESCRIPTION:
-*       Perform the neccessary initialization in order to be able to send an
-*		receive over the SPI interface.
-*
-* INPUT:
-*       serialBaudRate: Baud rate (SPI clock frequency)
-*		use16BitMode: Whether to use 2bytes (MV_TRUE) or 1bytes (MV_FALSE)
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiInit	(MV_U32 serialBaudRate)
-{
-    MV_STATUS ret;
-
-    /* Set the serial clock */
-    if ((ret = mvSpiBaudRateSet(serialBaudRate)) != MV_OK)
-        return ret;
-
-    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
-    mvMPPConfigToSPI();
-
-	/* Configure the default SPI mode to be 16bit */
-	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* Fix ac timing on SPI in 6183, 6183L and 78x00 only */
-	if ( (mvCtrlModelGet() == MV_6183_DEV_ID) ||
-		 (mvCtrlModelGet() == MV_6183L_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78100_DEV_ID) ||
-		(mvCtrlModelGet() == MV_78200_DEV_ID) ||
-		(mvCtrlModelGet() == MV_76100_DEV_ID))
-	    MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, BIT14);
-
-    /* Verify that the CS is deasserted */
-    mvSpiCsDeassert();
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSpiBaudRateSet - Set the Frequency of the SPI clock
-*
-* DESCRIPTION:
-*       Set the Prescale bits to adapt to the requested baud rate (the clock
-*       used for thr SPI).
-*
-* INPUT:
-*       serialBaudRate: Baud rate (SPI clock frequency)
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiBaudRateSet (MV_U32 serialBaudRate)
-{
-    MV_U8 i;
-	/* MV_U8 preScale[32] = {1, 1, 2, 3, 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-						  2, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30};
-	*/
-	MV_U8 preScale[14] = { 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30};
-	MV_U8 bestPrescaleIndx = 100;
-	MV_U32 minBaudOffset = 0xFFFFFFFF;
-	MV_U32 cpuClk = mvBoardTclkGet(); /*mvCpuPclkGet();*/
-	MV_U32 tempReg;
-
-	/* Find the best prescale configuration - less or equal */
-	for (i=0; i<14; i++)
-	{
-		/* check for higher - irrelevent */
-		if ((cpuClk / preScale[i]) > serialBaudRate)
-			continue;
-
-		/* check for exact fit */
-		if ((cpuClk / preScale[i]) == serialBaudRate)
-		{
-			bestPrescaleIndx = i;
-			break;
-		}
-
-		/* check if this is better than the previous one */
-		if ((serialBaudRate - (cpuClk / preScale[i])) < minBaudOffset)
-		{
-			minBaudOffset = (serialBaudRate - (cpuClk / preScale[i]));
-			bestPrescaleIndx = i;
-		}
-	}
-
-	if (bestPrescaleIndx > 14)
-    {
-        mvOsPrintf("%s ERROR: SPI baud rate prescale error!\n", __FUNCTION__);
-		return MV_OUT_OF_RANGE;
-    }
-
-	/* configure the Prescale */
-	tempReg = MV_REG_READ(MV_SPI_IF_CONFIG_REG);
-	tempReg = ((tempReg & ~MV_SPI_CLK_PRESCALE_MASK) | (bestPrescaleIndx + 0x12));
-	MV_REG_WRITE(MV_SPI_IF_CONFIG_REG, tempReg);
-
-    return MV_OK;
-}
-
-/*******************************************************************************
-* mvSpiCsAssert - Assert the Chip Select pin indicating a new transfer
-*
-* DESCRIPTION:
-*       Assert The chip select - used to select an external SPI device
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-********************************************************************************/
-MV_VOID mvSpiCsAssert(MV_VOID)
-{
-    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
-    mvMPPConfigToSPI();
-    mvOsUDelay(1);
-    MV_REG_BIT_SET(MV_SPI_IF_CTRL_REG, MV_SPI_CS_ENABLE_MASK);
-}
-
-/*******************************************************************************
-* mvSpiCsDeassert - DeAssert the Chip Select pin indicating the end of a
-*				  SPI transfer sequence
-*
-* DESCRIPTION:
-*       DeAssert the chip select pin
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-********************************************************************************/
-MV_VOID mvSpiCsDeassert(MV_VOID)
-{
-	MV_REG_BIT_RESET(MV_SPI_IF_CTRL_REG, MV_SPI_CS_ENABLE_MASK);
-
-    /* For devices in which the SPI is muxed on the MPP with other interfaces*/
-    mvMPPConfigToDefault();
-}
-
-/*******************************************************************************
-* mvSpiRead - Read a buffer over the SPI interface
-*
-* DESCRIPTION:
-*       Receive (read) a buffer over the SPI interface in 16bit chunks. If the
-*		buffer size is odd, then the last chunk will be 8bits. Chip select is not
-*       handled at this level.
-*
-* INPUT:
-*		pRxBuff: Pointer to the buffer to hold the received data
-*		buffSize: length of the pRxBuff
-*
-* OUTPUT:
-*		pRxBuff: Pointer to the buffer with the received data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiRead	(MV_U8* pRxBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-	MV_U32 bytesLeft = buffSize;
-	MV_U16* rxPtr = (MV_U16*)pRxBuff;
-
-    /* check for null parameters */
-    if (pRxBuff == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Check that the buffer pointer and the buffer size are 16bit aligned */
-    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pRxBuff & 1) == 0))
-    {
-	/* Verify that the SPI mode is in 16bit mode */
-	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX as long we have complete 16bit chunks */
-	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
-	{
-		/* Transmitted and wait for the transfer to be completed */
-		if ((ret = mvSpi16bitDataTxRx(MV_SPI_DUMMY_WRITE_16BITS, rxPtr)) != MV_OK)
-			return ret;
-
-		/* increment the pointers */
-		rxPtr++;
-		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
-	}
-
-    }
-    else
-    {
-	/* Verify that the SPI mode is in 8bit mode */
-	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX in 8bit chanks */
-	while (bytesLeft > 0)
-	{
-        	/* Transmitted and wait for the transfer to be completed */
-		if ((ret = mvSpi8bitDataTxRx(MV_SPI_DUMMY_WRITE_8BITS, pRxBuff)) != MV_OK)
-			return ret;
-		/* increment the pointers */
-		pRxBuff++;
-		bytesLeft--;
-	}
-    }
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvSpiWrite - Transmit a buffer over the SPI interface
-*
-* DESCRIPTION:
-*       Transmit a buffer over the SPI interface in 16bit chunks. If the
-*		buffer size is odd, then the last chunk will be 8bits. No chip select
-*       action is taken.
-*
-* INPUT:
-*		pTxBuff: Pointer to the buffer holding the TX data
-*		buffSize: length of the pTxBuff
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiWrite(MV_U8* pTxBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-	MV_U32 bytesLeft = buffSize;
-	MV_U16* txPtr = (MV_U16*)pTxBuff;
-
-    /* check for null parameters */
-    if (pTxBuff == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Check that the buffer pointer and the buffer size are 16bit aligned */
-    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pTxBuff & 1) == 0))
-    {
-	/* Verify that the SPI mode is in 16bit mode */
-	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX as long we have complete 16bit chunks */
-	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
-	{
-        /* Transmitted and wait for the transfer to be completed */
-		if ((ret = mvSpi16bitDataTxRx(*txPtr, NULL)) != MV_OK)
-			return ret;
-
-		/* increment the pointers */
-		txPtr++;
-		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
-	}
-    }
-    else
-    {
-
-	/* Verify that the SPI mode is in 8bit mode */
-	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX in 8bit chanks */
-	while (bytesLeft > 0)
-	{
-		/* Transmitted and wait for the transfer to be completed */
-		if ((ret = mvSpi8bitDataTxRx(*pTxBuff, NULL)) != MV_OK)
-			return ret;
-
-		/* increment the pointers */
-		pTxBuff++;
-		bytesLeft--;
-	}
-    }
-
-	return MV_OK;
-}
-
-
-/*******************************************************************************
-* mvSpiReadWrite - Read and Write a buffer simultanuosely
-*
-* DESCRIPTION:
-*       Transmit and receive a buffer over the SPI in 16bit chunks. If the
-*		buffer size is odd, then the last chunk will be 8bits. The SPI chip
-*       select is not handled implicitely.
-*
-* INPUT:
-*       pRxBuff: Pointer to the buffer to write the RX info in
-*		pTxBuff: Pointer to the buffer holding the TX info
-*		buffSize: length of both the pTxBuff and pRxBuff
-*
-* OUTPUT:
-*       pRxBuff: Pointer of the buffer holding the RX data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiReadWrite(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-    MV_U32 bytesLeft = buffSize;
-    MV_U16* txPtr = (MV_U16*)pTxBuff;
-    MV_U16* rxPtr = (MV_U16*)pRxBuff;
-
-    /* check for null parameters */
-    if ((pRxBuff == NULL) || (pTxBuff == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-    /* Check that the buffer pointer and the buffer size are 16bit aligned */
-    if ((((MV_U32)buffSize & 1) == 0) && (((MV_U32)pTxBuff & 1) == 0) && (((MV_U32)pRxBuff & 1) == 0))
-    {
-	/* Verify that the SPI mode is in 16bit mode */
-	MV_REG_BIT_SET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX as long we have complete 16bit chunks */
-	while (bytesLeft >= MV_SPI_16_BIT_CHUNK_SIZE)
-	{
-        /* Transmitted and wait for the transfer to be completed */
-		if ((ret = mvSpi16bitDataTxRx(*txPtr, rxPtr)) != MV_OK)
-			return ret;
-
-		/* increment the pointers */
-		txPtr++;
-		rxPtr++;
-		bytesLeft -= MV_SPI_16_BIT_CHUNK_SIZE;
-	}
-    }
-    else
-    {
-	/* Verify that the SPI mode is in 8bit mode */
-	MV_REG_BIT_RESET(MV_SPI_IF_CONFIG_REG, MV_SPI_BYTE_LENGTH_MASK);
-
-	/* TX/RX in 8bit chanks */
-	while (bytesLeft > 0)
-	{
-		/* Transmitted and wait for the transfer to be completed */
-		if ( (ret = mvSpi8bitDataTxRx(*pTxBuff, pRxBuff) ) != MV_OK)
-			return ret;
-		pRxBuff++;
-		pTxBuff++;
-		bytesLeft--;
-	}
-    }
-
-	return MV_OK;
-}
-
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h
deleted file mode 100644
index 74859f03e7..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpi.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSpihH
-#define __INCmvSpihH
-
-#include "mvCommon.h"
-#include "mvOs.h"
-#include "ctrlEnv/mvCtrlEnvSpec.h"
-
-/* Function Prototypes */
-/* Init */
-MV_STATUS   mvSpiInit		(MV_U32 serialBaudRate);
-
-/* Set the Frequency of the Spi clock */
-MV_STATUS   mvSpiBaudRateSet(MV_U32 serialBaudRate);
-
-/* Assert the SPI chip select */
-MV_VOID     mvSpiCsAssert   (MV_VOID);
-
-/* De-assert the SPI chip select */
-MV_VOID     mvSpiCsDeassert (MV_VOID);
-
-/* Simultanuous Read and write */
-MV_STATUS	mvSpiReadWrite	(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize);
-
-/* serialize a buffer on the TX line - Rx is ignored */
-MV_STATUS	mvSpiWrite  	(MV_U8* pTxBuff, MV_U32 buffSize);
-
-/* read from the RX line by writing dummy values to the TX line */
-MV_STATUS	mvSpiRead   	(MV_U8* pRxBuff, MV_U32 buffSize);
-
-#endif /* __INCmvSpihH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c
deleted file mode 100644
index a5d5a6478b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include "spi/mvSpi.h"
-#include "spi/mvSpiSpec.h"
-
-/*#define MV_DEBUG*/
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-
-/*******************************************************************************
-* mvSpiReadAndWrite - Read and Write a buffer simultanuousely
-*
-* DESCRIPTION:
-*       Transmit and receive a buffer over the SPI in 16bit chunks. If the
-*		buffer size is odd, then the last chunk will be 8bits.
-*
-* INPUT:
-*       pRxBuff: Pointer to the buffer to write the RX info in
-*		pTxBuff: Pointer to the buffer holding the TX info
-*		buffSize: length of both the pTxBuff and pRxBuff
-*
-* OUTPUT:
-*       pRxBuff: Pointer of the buffer holding the RX data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiReadAndWrite(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize)
-{
-    MV_STATUS ret;
-
-    /* check for null parameters */
-    if ((pRxBuff == NULL) || (pTxBuff == NULL) || (buffSize == 0))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-	/* First assert the chip select */
-	mvSpiCsAssert();
-
-    ret = mvSpiReadWrite(pRxBuff, pTxBuff, buffSize);
-
-	/* Finally deassert the chip select */
-	mvSpiCsDeassert();
-
-	return ret;
-}
-
-/*******************************************************************************
-* mvSpiWriteThenWrite - Serialize a command followed by the data over the TX line
-*
-* DESCRIPTION:
-*       Assert the chip select line. Transmit the command buffer followed by
-*       the data buffer. Then deassert the CS line.
-*
-* INPUT:
-*       pCmndBuff: Pointer to the command buffer to transmit
-*       cmndSize: length of the command size
-*		pTxDataBuff: Pointer to the data buffer to transmit
-*		txDataSize: length of the data buffer
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS	mvSpiWriteThenWrite (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pTxDataBuff,
-                                 MV_U32 txDataSize)
-{
-    MV_STATUS ret = MV_OK, tempRet;
-
-    /* check for null parameters */
-#ifndef CONFIG_MARVELL
-    if(NULL == pTxDataBuff)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-#endif
-
-    if (pCmndBuff == NULL)
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-	/* First assert the chip select */
-	mvSpiCsAssert();
-
-    /* first write the command */
-    if ((cmndSize) && (pCmndBuff != NULL))
-    {
-        if ((tempRet = mvSpiWrite(pCmndBuff, cmndSize)) != MV_OK)
-            ret = tempRet;
-    }
-
-    /* Then write the data buffer */
-#ifndef CONFIG_MARVELL
-    if (txDataSize)
-#else
-    if ((txDataSize) && (pTxDataBuff != NULL))
-#endif
-    {
-        if ((tempRet = mvSpiWrite(pTxDataBuff, txDataSize)) != MV_OK)
-            ret = tempRet;
-    }
-
-	/* Finally deassert the chip select */
-	mvSpiCsDeassert();
-
-	return ret;
-}
-
-/*******************************************************************************
-* mvSpiWriteThenRead - Serialize a command then read a data buffer
-*
-* DESCRIPTION:
-*       Assert the chip select line. Transmit the command buffer then read
-*       the data buffer. Then deassert the CS line.
-*
-* INPUT:
-*       pCmndBuff: Pointer to the command buffer to transmit
-*       cmndSize: length of the command size
-*		pRxDataBuff: Pointer to the buffer to read the data in
-*		txDataSize: length of the data buffer
-*
-* OUTPUT:
-*		pRxDataBuff: Pointer to the buffer holding the data
-*
-* RETURN:
-*       Success or Error code.
-*
-*
-*******************************************************************************/
-MV_STATUS mvSpiWriteThenRead (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pRxDataBuff,
-                              MV_U32 rxDataSize,MV_U32 dummyBytesToRead)
-{
-    MV_STATUS ret = MV_OK, tempRet;
-    MV_U8   dummyByte;
-
-    /* check for null parameters */
-    if ((pCmndBuff == NULL) && (pRxDataBuff == NULL))
-    {
-        mvOsPrintf("%s ERROR: Null pointer parameter!\n", __FUNCTION__);
-        return MV_BAD_PARAM;
-    }
-
-	/* First assert the chip select */
-	mvSpiCsAssert();
-
-    /* first write the command */
-    if ((cmndSize) && (pCmndBuff != NULL))
-    {
-        if ((tempRet = mvSpiWrite(pCmndBuff, cmndSize)) != MV_OK)
-            ret = tempRet;
-    }
-
-    /* Read dummy bytes before real data.   */
-    while(dummyBytesToRead)
-    {
-        mvSpiRead(&dummyByte,1);
-        dummyBytesToRead--;
-    }
-
-    /* Then write the data buffer */
-    if ((rxDataSize) && (pRxDataBuff != NULL))
-    {
-        if ((tempRet = mvSpiRead(pRxDataBuff, rxDataSize)) != MV_OK)
-            ret = tempRet;
-    }
-
-	/* Finally deassert the chip select */
-	mvSpiCsDeassert();
-
-	return ret;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h
deleted file mode 100644
index 329e26b7c0..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiCmnd.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSpiCmndhH
-#define __INCmvSpiCmndhH
-
-#include "mvTypes.h"
-
-/* Function Prototypes */
-
-/* Simultanuous Read and write */
-MV_STATUS	mvSpiReadAndWrite	(MV_U8* pRxBuff, MV_U8* pTxBuff, MV_U32 buffSize);
-
-/* write command - write a command and then write data */
-MV_STATUS	mvSpiWriteThenWrite (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pTxDataBuff, MV_U32 txDataSize);
-
-/* read command - write a command and then read data by writing dummy data */
-MV_STATUS mvSpiWriteThenRead (MV_U8* pCmndBuff, MV_U32 cmndSize, MV_U8* pRxDataBuff,
-                              MV_U32 rxDataSize,MV_U32 dummyBytesToRead);
-
-#endif /* __INCmvSpiCmndhH */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h
deleted file mode 100644
index 658159abbb..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/spi/mvSpiSpec.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef __INCmvSpiSpecH
-#define __INCmvSpiSpecH
-
-/* Constants */
-#define		MV_SPI_WAIT_RDY_MAX_LOOP			100000
-#define		MV_SPI_16_BIT_CHUNK_SIZE			2
-#define		MV_SPI_DUMMY_WRITE_16BITS			0xFFFF
-#define		MV_SPI_DUMMY_WRITE_8BITS			0xFF
-
-/* Marvell Flash Device Controller Registers */
-#define		MV_SPI_CTRLR_OFST					0x10600
-#define		MV_SPI_IF_CTRL_REG					(MV_SPI_CTRLR_OFST + 0x00)
-#define		MV_SPI_IF_CONFIG_REG				(MV_SPI_CTRLR_OFST + 0x04)
-#define		MV_SPI_DATA_OUT_REG					(MV_SPI_CTRLR_OFST + 0x08)
-#define		MV_SPI_DATA_IN_REG					(MV_SPI_CTRLR_OFST + 0x0c)
-#define		MV_SPI_INT_CAUSE_REG				(MV_SPI_CTRLR_OFST + 0x10)
-#define		MV_SPI_INT_CAUSE_MASK_REG			(MV_SPI_CTRLR_OFST + 0x14)
-
-/* Serial Memory Interface Control Register Masks */
-#define		MV_SPI_CS_ENABLE_OFFSET				0		/* bit 0 */
-#define		MV_SPI_MEMORY_READY_OFFSET			1		/* bit 1 */
-#define		MV_SPI_CS_ENABLE_MASK				(0x1  << MV_SPI_CS_ENABLE_OFFSET)
-#define		MV_SPI_MEMORY_READY_MASK			(0x1  << MV_SPI_MEMORY_READY_OFFSET)
-
-/* Serial Memory Interface Configuration Register Masks */
-#define		MV_SPI_CLK_PRESCALE_OFFSET			0		/* bit 0-4 */
-#define		MV_SPI_BYTE_LENGTH_OFFSET			5		/* bit 5 */
-#define		MV_SPI_ADDRESS_BURST_LENGTH_OFFSET  8	    /* bit 8-9 */
-#define		MV_SPI_CLK_PRESCALE_MASK			(0x1F << MV_SPI_CLK_PRESCALE_OFFSET)
-#define		MV_SPI_BYTE_LENGTH_MASK				(0x1  << MV_SPI_BYTE_LENGTH_OFFSET)
-#define		MV_SPI_ADDRESS_BURST_LENGTH_MASK	(0x3  << MV_SPI_ADDRESS_BURST_LENGTH_OFFSET)
-
-#endif /* __INCmvSpiSpecH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c
deleted file mode 100644
index 0bf8b7571b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.c
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File in accordance with the terms and conditions of the General
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is
-available along with the File in the license.txt file or by writing to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
-DISCLAIMED.  The GPL License provides additional details about this warranty
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or
-modify this File under the following licensing terms.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer.
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    *   Neither the name of Marvell nor the names of its contributors may be
-        used to endorse or promote products derived from this software without
-        specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-
-#include "mvTwsi.h"
-#include "mvTwsiSpec.h"
-#include "cpu/mvCpu.h"
-
-
-/*#define MV_DEBUG*/
-#ifdef MV_DEBUG
-#define DB(x) x
-#else
-#define DB(x)
-#endif
-
-static MV_VOID twsiIntFlgClr(MV_U8 chanNum);
-static MV_BOOL twsiMainIntGet(MV_U8 chanNum);
-static MV_VOID twsiAckBitSet(MV_U8 chanNum);
-static MV_U32 twsiStsGet(MV_U8 chanNum);
-static MV_VOID twsiReset(MV_U8 chanNum);
-static MV_STATUS twsiAddr7BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command);
-static MV_STATUS twsiAddr10BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command);
-static MV_STATUS twsiDataTransmit(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize);
-static MV_STATUS twsiDataReceive(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize);
-static MV_STATUS twsiTargetOffsSet(MV_U8 chanNum, MV_U32 offset,MV_BOOL moreThen256);
-
-
-static MV_BOOL twsiTimeoutChk(MV_U32 timeout, const MV_8 *pString)
-{
-	if(timeout >= TWSI_TIMEOUT_VALUE)
-	{
-		DB(mvOsPrintf("%s",pString));
-		return MV_TRUE;
-	}
-	return MV_FALSE;
-	
-}
-/*******************************************************************************
-* mvTwsiStartBitSet - Set start bit on the bus
-*
-* DESCRIPTION:
-*       This routine sets the start bit on the TWSI bus. 
-*       The routine first checks for interrupt flag condition, then it sets 
-*       the start bit  in the TWSI Control register. 
-*       If the interrupt flag condition check previously was set, the function 
-*       will clear it.
-*       The function then wait for the start bit to be cleared by the HW. 
-*       Then it waits for the interrupt flag to be set and eventually, the 
-*       TWSI status is checked to be 0x8 or 0x10(repeated start bit).
-*
-* INPUT:
-*       chanNum - TWSI channel.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK is start bit was set successfuly on the bus.
-*       MV_FAIL if interrupt flag was set before setting start bit.
-*
-*******************************************************************************/
-MV_STATUS mvTwsiStartBitSet(MV_U8 chanNum)
-{
-	MV_BOOL isIntFlag = MV_FALSE;
-	MV_U32 timeout, temp;
-
-	DB(mvOsPrintf("TWSI: mvTwsiStartBitSet \n"));
-	/* check Int flag */
-    	if(twsiMainIntGet(chanNum))
-		isIntFlag = MV_TRUE;
-	/* set start Bit */
-    	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_START_BIT);
-	
-	/* in case that the int flag was set before i.e. repeated start bit */
-	if(isIntFlag){
-		DB(mvOsPrintf("TWSI: mvTwsiStartBitSet repeated start Bit\n"));
-		twsiIntFlgClr(chanNum);
-	}
-	
-   	/* wait for interrupt */
-	timeout = 0;
-	while(!twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-	
-	/* check for timeout */	
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: mvTwsiStartBitSet ERROR - Start Clear bit TimeOut .\n"))
-		return MV_TIMEOUT;
-
-
-	/* check that start bit went down */
-	if((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_START_BIT) != 0)
-	{
-		mvOsPrintf("TWSI: mvTwsiStartBitSet ERROR - start bit didn't went down\n");
-		return MV_FAIL;
-	}	
-
-	/* check the status */
-	temp = twsiStsGet(chanNum);
-	if(( temp != TWSI_START_CON_TRA ) && ( temp != TWSI_REPEATED_START_CON_TRA ))
-	  {
-		mvOsPrintf("TWSI: mvTwsiStartBitSet ERROR - status %x after Set Start Bit. \n",temp);
-		return MV_FAIL;
-	}
-
-	return MV_OK;	
-
-}
-
-/*******************************************************************************
-* mvTwsiStopBitSet - Set stop bit on the bus
-*
-* DESCRIPTION:
-*       This routine set the stop bit on the TWSI bus. 
-*       The function then wait for the stop bit to be cleared by the HW. 
-*       Finally the function checks for status of 0xF8.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE is stop bit was set successfuly on the bus.
-*
-*******************************************************************************/
-MV_STATUS mvTwsiStopBitSet(MV_U8 chanNum)
-{
-    	MV_U32	timeout, temp;
-
-    	/* Generate stop bit */
-	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_STOP_BIT);
-
-	twsiIntFlgClr(chanNum);
-		
-   	/* wait for stop bit to come down */
-	timeout = 0;
-	while( ((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_STOP_BIT) != 0) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: mvTwsiStopBitSet ERROR - Stop bit TimeOut .\n"))
-		return MV_TIMEOUT;
-	
-	/* check that the stop bit went down */
-	if((MV_REG_READ(TWSI_CONTROL_REG(chanNum)) & TWSI_CONTROL_STOP_BIT) != 0)	
-	{
-		mvOsPrintf("TWSI: mvTwsiStopBitSet ERROR - stop bit didn't went down. \n");
-		return MV_FAIL;
-	}
-	
-	/* check the status */
-	temp = twsiStsGet(chanNum);
-	if( temp != TWSI_NO_REL_STS_INT_FLAG_IS_KEPT_0){
-		mvOsPrintf("TWSI: mvTwsiStopBitSet ERROR - status %x after Stop Bit. \n", temp);
-		return MV_FAIL;
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* twsiMainIntGet - Get twsi bit from main Interrupt cause.
-*
-* DESCRIPTION:
-*       This routine returns the twsi interrupt flag value.
-*       
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_TRUE is interrupt flag is set, MV_FALSE otherwise.
-*
-*******************************************************************************/
-static MV_BOOL twsiMainIntGet(MV_U8 chanNum)
-{
-	MV_U32 temp;
-	
-	/* get the int flag bit */
-
-	temp = MV_REG_READ(TWSI_CPU_MAIN_INT_CAUSE_REG);
-	if (temp & (TWSI0_CPU_MAIN_INT_BIT << chanNum))
-	    return MV_TRUE;
-    
-	return MV_FALSE;
-}
-/*******************************************************************************
-* twsiIntFlgClr - Clear Interrupt flag.
-*
-* DESCRIPTION:
-*       This routine clears the interrupt flag. It does NOT poll the interrupt
-*       to make sure the clear. After clearing the interrupt, it waits for at 
-*       least 1 miliseconds.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-static MV_VOID twsiIntFlgClr(MV_U8 chanNum)
-{
-	MV_U32 temp;
-
-	/* wait for 1 mili to prevent TWSI register write after write problems */
-   	mvOsDelay(1);
-	/* clear the int flag bit */
-	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum),temp & ~(TWSI_CONTROL_INT_FLAG_SET));
-
-	/* wait for 1 mili sec for the clear to take effect */
-   	mvOsDelay(1);
-	
-	return;
-}
-
-
-/*******************************************************************************
-* twsiAckBitSet - Set acknowledge bit on the bus
-*
-* DESCRIPTION:
-*       This routine set the acknowledge bit on the TWSI bus.
-*
-* INPUT:
-*       None.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None.
-*
-*******************************************************************************/
-static MV_VOID twsiAckBitSet(MV_U8 chanNum)
-{
-	MV_U32 temp;
-
-	/*Set the Ack bit */
-	temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-    	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp | TWSI_CONTROL_ACK);
-
-	/* Add delay of 1ms */
-	mvOsDelay(1);
-	return;
-}
-
-
-/*******************************************************************************
-* twsiInit - Initialize TWSI interface
-*
-* DESCRIPTION:
-*       This routine:
-*	-Reset the TWSI.
-*	-Initialize the TWSI clock baud rate according to given frequancy
-*	 parameter based on Tclk frequancy and enables TWSI slave.
-*       -Set the ack bit.
-*	-Assign the TWSI slave address according to the TWSI address Type.
-*       
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       frequancy - TWSI frequancy in KHz. (up to 100KHZ)
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       Actual frequancy.
-*
-*******************************************************************************/
-MV_U32 mvTwsiInit(MV_U8 chanNum, MV_HZ frequancy, MV_U32 Tclk, MV_TWSI_ADDR *pTwsiAddr, MV_BOOL generalCallEnable)
-{
-    	MV_U32	n,m,freq,margin,minMargin = 0xffffffff;
-	MV_U32	power;
-    	MV_U32	actualFreq = 0,actualN = 0,actualM = 0,val;
-
-	if(frequancy > 100000)
-	{
-		mvOsPrintf("Warning TWSI frequancy is too high, please use up tp 100Khz. \n");
-	}
-
-	DB(mvOsPrintf("TWSI: mvTwsiInit - Tclk = %d freq = %d\n",Tclk,frequancy));
-    	/* Calucalte N and M for the TWSI clock baud rate */
-    	for(n = 0 ; n < 8 ; n++)
-    	{
-        	for(m = 0 ; m < 16 ; m++)
-        	{
-            		power = 2 << n; /* power = 2^(n+1) */
-            		freq = Tclk/(10*(m+1)*power);
-            		margin = MV_ABS(frequancy - freq);
-            		if(margin < minMargin)
-            		{
-                		minMargin   = margin;
-                		actualFreq  = freq;
-                		actualN     = n;
-                		actualM     = m;
-            		}
-        	}
-		}
-	DB(mvOsPrintf("TWSI: mvTwsiInit - actN %d actM %d actFreq %d\n",actualN , actualM, actualFreq));
-	/* Reset the TWSI logic */
-	twsiReset(chanNum);
-
-	/* Set the baud rate */
-	val = ((actualM<< TWSI_BAUD_RATE_M_OFFS) | actualN << TWSI_BAUD_RATE_N_OFFS);
-    	MV_REG_WRITE(TWSI_STATUS_BAUDE_RATE_REG(chanNum),val);
-
-    	/* Enable the TWSI and slave */
-	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), TWSI_CONTROL_ENA | TWSI_CONTROL_ACK); 
-
-	/* set the TWSI slave address */
-	if( pTwsiAddr->type == ADDR10_BIT )/* 10 Bit deviceAddress */
-    	{
-		/* writing the 2 most significant bits of the 10 bit address*/
-		val = ((pTwsiAddr->address & TWSI_SLAVE_ADDR_10BIT_MASK) >> TWSI_SLAVE_ADDR_10BIT_OFFS );
-		/* bits 7:3 must be 0x11110 */
-		val |= TWSI_SLAVE_ADDR_10BIT_CONST;
-		/* set GCE bit */
-		if(generalCallEnable)
-			val |= TWSI_SLAVE_ADDR_GCE_ENA;
-		/* write slave address */
-		MV_REG_WRITE(TWSI_SLAVE_ADDR_REG(chanNum),val);
-
-         	/* writing the 8 least significant bits of the 10 bit address*/
-        	val = (pTwsiAddr->address << TWSI_EXTENDED_SLAVE_OFFS) & TWSI_EXTENDED_SLAVE_MASK;  
-        	MV_REG_WRITE(TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum), val);
-    	}
-    	else /*7 bit address*/
-    	{
-		/* set the 7 Bits address */
-        	MV_REG_WRITE(TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum),0x0);
-		val = (pTwsiAddr->address << TWSI_SLAVE_ADDR_7BIT_OFFS) & TWSI_SLAVE_ADDR_7BIT_MASK;
-        	MV_REG_WRITE(TWSI_SLAVE_ADDR_REG(chanNum), val);
-    	}
-
-	/* unmask twsi int */
-    val = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-	MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), val | TWSI_CONTROL_INT_ENA);
-	/* Add delay of 1ms */
-	mvOsDelay(1);
-	
-   return actualFreq;
-} 
-
-
-/*******************************************************************************
-* twsiStsGet - Get the TWSI status value.
-*
-* DESCRIPTION:
-*       This routine returns the TWSI status value.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_U32 - the TWSI status.
-*
-*******************************************************************************/
-static MV_U32 twsiStsGet(MV_U8 chanNum)
-{
-    return MV_REG_READ(TWSI_STATUS_BAUDE_RATE_REG(chanNum));
-
-}
-
-/*******************************************************************************
-* twsiReset - Reset the TWSI.
-*
-* DESCRIPTION:
-*       Resets the TWSI logic and sets all TWSI registers to their reset values.
-*
-* INPUT:
-*      chanNum - TWSI channel
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       None
-*
-*******************************************************************************/
-static MV_VOID twsiReset(MV_U8 chanNum)
-{
-    	/* Reset the TWSI logic */
-    	MV_REG_WRITE(TWSI_SOFT_RESET_REG(chanNum),0);
-
-	/* wait for 2 mili sec */
-   	mvOsDelay(2);
-
-	return;
-}
-
-
-
-
-/******************************* POLICY ****************************************/
-
-
-
-/*******************************************************************************
-* mvTwsiAddrSet - Set address on TWSI bus.
-*
-* DESCRIPTION:
-*       This function Set address (7 or 10 Bit address) on the Twsi Bus.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       pTwsiAddr - twsi address.
-*	command	 - read / write .
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK - if setting the address completed succesfully.
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-MV_STATUS mvTwsiAddrSet(MV_U8 chanNum, MV_TWSI_ADDR *pTwsiAddr, MV_TWSI_CMD command)
-{
-	DB(mvOsPrintf("TWSI: mvTwsiAddr7BitSet addr %x , type %d, cmd is %s\n",pTwsiAddr->address,\
-		 			pTwsiAddr->type, ((command==MV_TWSI_WRITE)?"Write":"Read") ));
-	/* 10 Bit address */
-	if(pTwsiAddr->type == ADDR10_BIT)
-	{
-		return twsiAddr10BitSet(chanNum, pTwsiAddr->address,command);
-	}
-	/* 7 Bit address */
-	else
-	{
-		return twsiAddr7BitSet(chanNum, pTwsiAddr->address,command);
-	}
-
-}
-
-/*******************************************************************************
-* twsiAddr10BitSet - Set 10 Bit address on TWSI bus.
-*
-* DESCRIPTION:
-*       There are two address phases:
-*       1) Write '11110' to data register bits [7:3] and 10-bit address MSB 
-*          (bits [9:8]) to data register bits [2:1] plus a write(0) or read(1) bit 
-*          to the Data register. Then it clears interrupt flag which drive 
-*          the address on the TWSI bus. The function then waits for interrupt 
-*          flag to be active and status 0x18 (write) or 0x40 (read) to be set.
-*       2) write the rest of 10-bit address to data register and clears 
-*          interrupt flag which drive the address on the TWSI bus. The 
-*          function then waits for interrupt flag to be active and status 
-*          0xD0 (write) or 0xE0 (read) to be set. 
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       deviceAddress - twsi address.
-*	command	 - read / write .
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK - if setting the address completed succesfully.
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-static MV_STATUS twsiAddr10BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command)
-{
-	MV_U32 val,timeout;
-
-	/* writing the 2 most significant bits of the 10 bit address*/
-	val = ((deviceAddress & TWSI_DATA_ADDR_10BIT_MASK) >> TWSI_DATA_ADDR_10BIT_OFFS );
-	/* bits 7:3 must be 0x11110 */
-	val |= TWSI_DATA_ADDR_10BIT_CONST;
-	/* set command */
-	val |= command;
-	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
-	/* WA add a delay */
-	mvOsDelay(1);
-
-	/* clear Int flag */
-	twsiIntFlgClr(chanNum);
-
-	/* wait for Int to be Set */
-	timeout = 0;
-	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr10BitSet ERROR - 1st addr (10Bit) Int TimeOut.\n"))
-		return MV_TIMEOUT;
-	
-	/* check the status */
-	val = twsiStsGet(chanNum);
-	if(( (val != TWSI_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
-	   ( (val != TWSI_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
-	{
-		mvOsPrintf("TWSI: twsiAddr10BitSet ERROR - status %x 1st addr (10 Bit) in %s mode.\n"\
-						,val, ((command==MV_TWSI_WRITE)?"Write":"Read") );
-		return MV_FAIL;
-	}
-
-	/* set 	8 LSB of the address */
-	val = (deviceAddress << TWSI_DATA_ADDR_7BIT_OFFS) & TWSI_DATA_ADDR_7BIT_MASK;
-	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
-
-	/* clear Int flag */
-	twsiIntFlgClr(chanNum);
-
-	/* wait for Int to be Set */
-	timeout = 0;
-	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr10BitSet ERROR - 2nd (10 Bit) Int TimOut.\n"))
-		return MV_TIMEOUT;
-	
-	/* check the status */
-	val = twsiStsGet(chanNum);
-	if(( (val != TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
-	   ( (val != TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
-	{
-		mvOsPrintf("TWSI: twsiAddr10BitSet ERROR - status %x 2nd addr(10 Bit) in %s mode.\n"\
-						,val, ((command==MV_TWSI_WRITE)?"Write":"Read") );
-		return MV_FAIL;
-	}
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* twsiAddr7BitSet - Set 7 Bit address on TWSI bus.
-*
-* DESCRIPTION:
-*       This function writes 7 bit address plus a write or read bit to the 
-*       Data register. Then it clears interrupt flag which drive the address on 
-*       the TWSI bus. The function then waits for interrupt flag to be active
-*       and status 0x18 (write) or 0x40 (read) to be set.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       deviceAddress - twsi address.
-*	command	 - read / write .
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK - if setting the address completed succesfully.
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-static MV_STATUS twsiAddr7BitSet(MV_U8 chanNum, MV_U32 deviceAddress,MV_TWSI_CMD command)
-{
-	MV_U32 val,timeout;
-
-	/* set the address */
-	val = (deviceAddress << TWSI_DATA_ADDR_7BIT_OFFS) & TWSI_DATA_ADDR_7BIT_MASK;
-	/* set command */
-	val |= command;	
-	MV_REG_WRITE(TWSI_DATA_REG(chanNum), val);
-	/* WA add a delay */
-	mvOsDelay(1);
-
-	/* clear Int flag */
-	twsiIntFlgClr(chanNum);
-
-	/* wait for Int to be Set */
-	timeout = 0;
-	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiAddr7BitSet ERROR - Addr (7 Bit) int TimeOut.\n"))
-		return MV_TIMEOUT;
-	
-	/* check the status */
-	val = twsiStsGet(chanNum);
-	if(( (val != TWSI_AD_PLS_RD_BIT_TRA_ACK_REC) && (command == MV_TWSI_READ ) ) || 
-	   ( (val != TWSI_AD_PLS_WR_BIT_TRA_ACK_REC) && (command == MV_TWSI_WRITE) ))
-	{
-		/* only in debug, since in boot we try to read the SPD of both DRAM, and we don't
-			want error messeges in case DIMM doesn't exist. */
-		DB(mvOsPrintf("TWSI: twsiAddr7BitSet ERROR - status %x addr (7 Bit) in %s mode.\n"\
-						,val,((command==MV_TWSI_WRITE)?"Write":"Read") ));
-		return MV_FAIL;
-	}
-	
-	return MV_OK;
-}
-
-/*******************************************************************************
-* twsiDataWrite - Trnasmit a data block over TWSI bus.
-*
-* DESCRIPTION:
-*       This function writes a given data block to TWSI bus in 8 bit granularity.
-*	first The function waits for interrupt flag to be active then
-*       For each 8-bit data:
-*        The function writes data to data register. It then clears 
-*        interrupt flag which drives the data on the TWSI bus. 
-*        The function then waits for interrupt flag to be active and status 
-*        0x28 to be set. 
-*      
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       pBlock - Data block.
-*	blockSize - number of chars in pBlock.
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK - if transmiting the block completed succesfully,
-*	MV_BAD_PARAM - if pBlock is NULL,
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-static MV_STATUS twsiDataTransmit(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize)
-{
-	MV_U32 timeout, temp, blockSizeWr = blockSize;
-
-	if(NULL == pBlock)
-		return MV_BAD_PARAM;
-
-	/* wait for Int to be Set */
-	timeout = 0;
-	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataTransmit ERROR - Read Data Int TimeOut.\n"))
-		return MV_TIMEOUT;
-
-	while(blockSizeWr)
-	{
-		/* write the data*/
-		MV_REG_WRITE(TWSI_DATA_REG(chanNum),(MV_U32)*pBlock);
-		DB(mvOsPrintf("TWSI: twsiDataTransmit place = %d write %x \n",\
-						blockSize - blockSizeWr, *pBlock));
-		pBlock++;
-		blockSizeWr--;
-
-		twsiIntFlgClr(chanNum);
-
-		/* wait for Int to be Set */
-		timeout = 0;
-		while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-		/* check for timeout */
-		if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataTransmit ERROR - Read Data Int TimeOut.\n"))
-			return MV_TIMEOUT;
-
-		/* check the status */
-		temp = twsiStsGet(chanNum);
-		if(temp != TWSI_M_TRAN_DATA_BYTE_ACK_REC) 
-		{
-			mvOsPrintf("TWSI: twsiDataTransmit ERROR - status %x in write trans\n",temp);
-			return MV_FAIL;
-		}
-		
-	}
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* twsiDataReceive - Receive data block from TWSI bus.
-*
-* DESCRIPTION:
-*       This function receive data block from TWSI bus in 8bit granularity 
-*       into pBlock buffer.
-*	first The function waits for interrupt flag to be active then
-*       For each 8-bit data:
-*        It clears the interrupt flag which allows the next data to be 
-*        received from TWSI bus.
-*	 The function waits for interrupt flag to be active,
-*	 and status reg is 0x50. 
-*	 Then the function reads data from data register, and copies it to 
-*	 the given buffer. 
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       blockSize - number of bytes to read.
-*
-* OUTPUT:
-*       pBlock - Data block.
-*
-* RETURN:
-*       MV_OK - if receive transaction completed succesfully,
-*	MV_BAD_PARAM - if pBlock is NULL,
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-static MV_STATUS twsiDataReceive(MV_U8 chanNum, MV_U8 *pBlock, MV_U32 blockSize)
-{
-	MV_U32 timeout, temp, blockSizeRd = blockSize;
-	if(NULL == pBlock)
-		return MV_BAD_PARAM;
-
-	/* wait for Int to be Set */
-	timeout = 0;
-	while( !twsiMainIntGet(chanNum) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-	/* check for timeout */
-	if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataReceive ERROR - Read Data int Time out .\n"))
-		return MV_TIMEOUT;
-
-	while(blockSizeRd)
-	{
-		if(blockSizeRd == 1)
-		{
-			/* clear ack and Int flag */
-			temp = MV_REG_READ(TWSI_CONTROL_REG(chanNum));
-			temp &=  ~(TWSI_CONTROL_ACK);
-			MV_REG_WRITE(TWSI_CONTROL_REG(chanNum), temp);
-		}
-		twsiIntFlgClr(chanNum);
-		/* wait for Int to be Set */
-		timeout = 0;
-		while( (!twsiMainIntGet(chanNum)) && (timeout++ < TWSI_TIMEOUT_VALUE));
-
-		/* check for timeout */
-		if(MV_TRUE == twsiTimeoutChk(timeout,"TWSI: twsiDataReceive ERROR - Read Data Int Time out .\n"))
-			return MV_TIMEOUT;
-
-		/* check the status */
-		temp = twsiStsGet(chanNum);
-		if((temp != TWSI_M_REC_RD_DATA_ACK_TRA) && (blockSizeRd !=1))
-		{
-			mvOsPrintf("TWSI: twsiDataReceive ERROR - status %x in read trans \n",temp);
-			return MV_FAIL;
-		}
-		else if((temp != TWSI_M_REC_RD_DATA_ACK_NOT_TRA) && (blockSizeRd ==1))
-		{
-			mvOsPrintf("TWSI: twsiDataReceive ERROR - status %x in Rd Terminate\n",temp);
-			return MV_FAIL;
-		}
-		
-		/* read the data*/
-		*pBlock = (MV_U8)MV_REG_READ(TWSI_DATA_REG(chanNum));
-		DB(mvOsPrintf("TWSI: twsiDataReceive  place %d read %x \n",\
-						blockSize - blockSizeRd,*pBlock));
-		pBlock++;
-		blockSizeRd--;
-	}
-
-	return MV_OK;
-}
-
-
-
-/*******************************************************************************
-* twsiTargetOffsSet - Set TWST target offset on TWSI bus.
-*
-* DESCRIPTION:
-*       The function support TWSI targets that have inside address space (for
-*       example EEPROMs). The function:
-*       1) Convert the given offset into pBlock and size.
-*		in case the offset should be set to a TWSI slave which support 
-*		more then 256 bytes offset, the offset setting will be done
-*		in 2 transactions.
-*       2) Use twsiDataTransmit to place those on the bus.
-*
-* INPUT:
-*	chanNum - TWSI channel
-*       offset - offset to be set on the EEPROM device.
-*	moreThen256 - whether the EEPROM device support more then 256 byte offset. 
-*
-* OUTPUT:
-*       None.
-*
-* RETURN:
-*       MV_OK - if setting the offset completed succesfully.
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-static MV_STATUS twsiTargetOffsSet(MV_U8 chanNum, MV_U32 offset, MV_BOOL moreThen256)
-{
-	MV_U8 offBlock[2];
-	MV_U32 offSize;
-
-	if(moreThen256 == MV_TRUE)
-	{
-		offBlock[0] = (offset >> 8) & 0xff;
-		offBlock[1] = offset & 0xff;
-		offSize = 2;
-	}
-	else
-	{
-		offBlock[0] = offset & 0xff;
-		offSize = 1;
-	}
-	DB(mvOsPrintf("TWSI: twsiTargetOffsSet offSize = %x addr1 = %x addr2 = %x\n",\
-							offSize,offBlock[0],offBlock[1]));
-	return twsiDataTransmit(chanNum, offBlock, offSize);
-
-}
-
-/*******************************************************************************
-* mvTwsiRead - Read data block from a TWSI Slave.
-*
-* DESCRIPTION:
-*       The function calls the following functions:
-*       -) mvTwsiStartBitSet();
-*	if(EEPROM device)
-*       	-) mvTwsiAddrSet(w);
-*       	-) twsiTargetOffsSet();
-*       	-) mvTwsiStartBitSet();
-*       -) mvTwsiAddrSet(r);
-*       -) twsiDataReceive();
-*       -) mvTwsiStopBitSet();
-*
-* INPUT:
-*	chanNum - TWSI channel
-*      	pTwsiSlave - Twsi Slave structure. 
-*       blockSize - number of bytes to read.	
-*
-* OUTPUT:
-*      	pBlock - Data block.
-*
-* RETURN:
-*       MV_OK - if EEPROM read transaction completed succesfully,
-* 	MV_BAD_PARAM - if pBlock is NULL,
-*	MV_FAIL otherwmise.
-*
-*******************************************************************************/
-MV_STATUS mvTwsiRead(MV_U8 chanNum, MV_TWSI_SLAVE *pTwsiSlave, MV_U8 *pBlock, MV_U32 blockSize)
-{
-	if((NULL == pBlock) || (NULL == pTwsiSlave))
-		return MV_BAD_PARAM;
-	if(MV_OK != mvTwsiStartBitSet(chanNum))
-	{
-		mvTwsiStopBitSet(chanNum);
-		 return MV_FAIL;
-	}
-	
-	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStartBitSet\n"));
-	
-	/* in case offset exsist (i.e. eeprom ) */
-	if(MV_TRUE == pTwsiSlave->validOffset)
-	{
-		if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_WRITE)) 
-		{
-			mvTwsiStopBitSet(chanNum);
-			return MV_FAIL;
-		} 
-		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiAddrSet\n"));
-		if(MV_OK != twsiTargetOffsSet(chanNum, pTwsiSlave->offset, pTwsiSlave->moreThen256)) 
-		{
-			mvTwsiStopBitSet(chanNum);
-			return MV_FAIL;
-		}
-		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after twsiTargetOffsSet\n"));
-		if(MV_OK != mvTwsiStartBitSet(chanNum)) 
-		{
-			mvTwsiStopBitSet(chanNum);
-			return MV_FAIL;
-		}
-		DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStartBitSet\n"));
-	}
-	if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_READ)) 
-	{
-		mvTwsiStopBitSet(chanNum);
-		return MV_FAIL;
-	} 
-	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiAddrSet\n"));
-	if(MV_OK != twsiDataReceive(chanNum, pBlock, blockSize))
-	{
-		mvTwsiStopBitSet(chanNum);
-		return MV_FAIL;
-	}
-	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after twsiDataReceive\n"));
-
-	if(MV_OK != mvTwsiStopBitSet(chanNum))
-	{
-		return MV_FAIL;
-	}
-
-	twsiAckBitSet(chanNum);
-
-	DB(mvOsPrintf("TWSI: mvTwsiEepromRead after mvTwsiStopBitSet\n"));
-
-	return MV_OK;
-}
-
-/*******************************************************************************
-* mvTwsiWrite - Write data block to a TWSI Slave.
-*
-* DESCRIPTION:
-*       The function calls the following functions:
-*       -) mvTwsiStartBitSet();
-*       -) mvTwsiAddrSet();
-*	-)if(EEPROM device)
-*       	-) twsiTargetOffsSet();
-*       -) twsiDataTransmit();
-*       -) mvTwsiStopBitSet();
-*
-* INPUT:
-*	chanNum - TWSI channel
-*      	eepromAddress - eeprom address. 
-*       blockSize - number of bytes to write.	
-*      	pBlock - Data block.
-*
-* OUTPUT:
-*	None
-*
-* RETURN:
-*       MV_OK - if EEPROM read transaction completed succesfully.
-*	MV_BAD_PARAM - if pBlock is NULL,
-*	MV_FAIL otherwmise.
-*
-* NOTE: Part of the EEPROM, required that the offset will be aligned to the
-*	max write burst supported.
-*******************************************************************************/
-MV_STATUS mvTwsiWrite(MV_U8 chanNum, MV_TWSI_SLAVE *pTwsiSlave, MV_U8 *pBlock, MV_U32 blockSize)
-{
-	if((NULL == pBlock) || (NULL == pTwsiSlave))
-		return MV_BAD_PARAM;
-
-	if(MV_OK != mvTwsiStartBitSet(chanNum)) 
-	{
-		mvTwsiStopBitSet(chanNum);
-		return MV_FAIL;
-	}
-
-	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after mvTwsiStartBitSet\n"));
-	if(MV_OK != mvTwsiAddrSet(chanNum, &(pTwsiSlave->slaveAddr), MV_TWSI_WRITE))
-	{
-		mvTwsiStopBitSet(chanNum);
-		return MV_FAIL;
-	}
-	DB(mvOsPrintf("TWSI :mvTwsiEepromWrite after mvTwsiAddrSet\n"));
-
-	/* in case offset exsist (i.e. eeprom ) */
-	if(MV_TRUE == pTwsiSlave->validOffset)
-	{
-		if(MV_OK != twsiTargetOffsSet(chanNum, pTwsiSlave->offset, pTwsiSlave->moreThen256)) 
-		{
-			mvTwsiStopBitSet(chanNum);
-			return MV_FAIL;
-		}
-		DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after twsiTargetOffsSet\n"));
-	}
-	if(MV_OK != twsiDataTransmit(chanNum, pBlock, blockSize)) 
-	{
-		mvTwsiStopBitSet(chanNum);
-		return MV_FAIL;
-	}
-	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after twsiDataTransmit\n"));
-	if(MV_OK != mvTwsiStopBitSet(chanNum)) 
-	{
-		return MV_FAIL;
-	}
-	DB(mvOsPrintf("TWSI: mvTwsiEepromWrite after mvTwsiStopBitSet\n"));
-
-	return MV_OK;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h
deleted file mode 100644
index bd5b6d0090..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsi.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-#ifndef __INCmvTwsiH
-#define __INCmvTwsiH
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* need to update this includes */
-#include "twsi/mvTwsiSpec.h"
-#include "ctrlEnv/mvCtrlEnvLib.h"
-
-
-/* The TWSI interface supports both 7-bit and 10-bit addressing.            */
-/* This enumerator describes addressing type.                               */
-typedef enum _mvTwsiAddrType
-{
-    ADDR7_BIT,                      /* 7 bit address    */
-    ADDR10_BIT                      /* 10 bit address   */
-}MV_TWSI_ADDR_TYPE;
-
-/* This structure describes TWSI address.                                   */
-typedef struct _mvTwsiAddr
-{
-    MV_U32              address;    /* address          */
-    MV_TWSI_ADDR_TYPE   type;       /* Address type     */
-}MV_TWSI_ADDR;
-
-/* This structure describes a TWSI slave.                                   */
-typedef struct _mvTwsiSlave
-{
-    MV_TWSI_ADDR	slaveAddr;
-    MV_BOOL 		validOffset;		/* whether the slave has offset (i.e. Eeprom  etc.) 	*/
-    MV_U32		offset;		/* offset in the slave.					*/
-    MV_BOOL 		moreThen256;	/* whether the ofset is bigger then 256 		*/
-}MV_TWSI_SLAVE;
-
-/* This enumerator describes TWSI protocol commands.                        */
-typedef enum _mvTwsiCmd
-{
-    MV_TWSI_WRITE,   /* TWSI write command - 0 according to spec   */
-    MV_TWSI_READ   /* TWSI read command  - 1 according to spec */
-}MV_TWSI_CMD;
-
-MV_STATUS mvTwsiStartBitSet(MV_U8 chanNum);
-MV_STATUS mvTwsiStopBitSet(MV_U8 chanNum);
-MV_STATUS mvTwsiAddrSet(MV_U8 chanNum, MV_TWSI_ADDR *twsiAddr, MV_TWSI_CMD command);
-
-MV_U32 mvTwsiInit(MV_U8 chanNum, MV_KHZ frequancy, MV_U32 Tclk, MV_TWSI_ADDR *twsiAddr, MV_BOOL generalCallEnable); 
-MV_STATUS mvTwsiRead (MV_U8 chanNum, MV_TWSI_SLAVE *twsiSlave, MV_U8 *pBlock, MV_U32 blockSize);
-MV_STATUS mvTwsiWrite(MV_U8 chanNum, MV_TWSI_SLAVE *twsiSlave, MV_U8 *pBlock, MV_U32 blockSize);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvTwsiH */
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h b/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h
deleted file mode 100644
index d0c2b9e7bd..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/kirkwood/mvHal/mv_hal/twsi/mvTwsiSpec.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
-Copyright (C) Marvell International Ltd. and its affiliates
-
-This software file (the "File") is owned and distributed by Marvell 
-International Ltd. and/or its affiliates ("Marvell") under the following
-alternative licensing terms.  Once you have made an election to distribute the
-File under one of the following license alternatives, please (i) delete this
-introductory statement regarding license alternatives, (ii) delete the two
-license alternatives that you have not elected to use and (iii) preserve the
-Marvell copyright notice above.
-
-********************************************************************************
-Marvell Commercial License Option
-
-If you received this File from Marvell and you have entered into a commercial
-license agreement (a "Commercial License") with Marvell, the File is licensed
-to you under the terms of the applicable Commercial License.
-
-********************************************************************************
-Marvell GPL License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File in accordance with the terms and conditions of the General 
-Public License Version 2, June 1991 (the "GPL License"), a copy of which is 
-available along with the File in the license.txt file or by writing to the Free 
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or 
-on the worldwide web at http://www.gnu.org/licenses/gpl.txt. 
-
-THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY 
-DISCLAIMED.  The GPL License provides additional details about this warranty 
-disclaimer.
-********************************************************************************
-Marvell BSD License Option
-
-If you received this File from Marvell, you may opt to use, redistribute and/or 
-modify this File under the following licensing terms. 
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    *   Redistributions of source code must retain the above copyright notice,
-	    this list of conditions and the following disclaimer. 
-
-    *   Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution. 
-
-    *   Neither the name of Marvell nor the names of its contributors may be 
-        used to endorse or promote products derived from this software without 
-        specific prior written permission. 
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-/****************************************/
-/* TWSI Registers                        */
-/****************************************/
-#ifndef __INCmvTwsiSpech
-#define __INCmvTwsiSpech
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* defines */
-#define TWSI_SLAVE_ADDR_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum)+ 0x00)
-
-#define TWSI_SLAVE_ADDR_GCE_ENA		BIT0
-#define TWSI_SLAVE_ADDR_7BIT_OFFS	0x1
-#define TWSI_SLAVE_ADDR_7BIT_MASK 	(0xFF << TWSI_SLAVE_ADDR_7BIT_OFFS)
-#define TWSI_SLAVE_ADDR_10BIT_OFFS	0x7
-#define TWSI_SLAVE_ADDR_10BIT_MASK 	0x300
-#define	TWSI_SLAVE_ADDR_10BIT_CONST 	0xF0
-
-
-#define TWSI_EXTENDED_SLAVE_ADDR_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x10)
-#define TWSI_EXTENDED_SLAVE_OFFS 	0
-#define TWSI_EXTENDED_SLAVE_MASK	(0xFF << TWSI_EXTENDED_SLAVE_OFFS)
-
-
-#define TWSI_DATA_REG(chanNum)		(TWSI_SLAVE_BASE(chanNum) + 0x04)
-#define TWSI_DATA_COMMAND_OFFS		0x0
-#define TWSI_DATA_COMMAND_MASK 		(0x1 << TWSI_DATA_COMMAND_OFFS)
-#define TWSI_DATA_COMMAND_WR		(0x1 << TWSI_DATA_COMMAND_OFFS)
-#define TWSI_DATA_COMMAND_RD		(0x0 << TWSI_DATA_COMMAND_OFFS)
-#define TWSI_DATA_ADDR_7BIT_OFFS	0x1
-#define TWSI_DATA_ADDR_7BIT_MASK 	(0xFF << TWSI_DATA_ADDR_7BIT_OFFS)
-#define TWSI_DATA_ADDR_10BIT_OFFS	0x7
-#define TWSI_DATA_ADDR_10BIT_MASK	0x300
-#define TWSI_DATA_ADDR_10BIT_CONST	0xF0
-
-
-#define TWSI_CONTROL_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x08)
-#define TWSI_CONTROL_ACK            	BIT2
-#define TWSI_CONTROL_INT_FLAG_SET   	BIT3
-#define TWSI_CONTROL_STOP_BIT    	BIT4
-#define TWSI_CONTROL_START_BIT 		BIT5 
-#define TWSI_CONTROL_ENA     		BIT6
-#define TWSI_CONTROL_INT_ENA    	BIT7
-
-
-#define TWSI_STATUS_BAUDE_RATE_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x0c)
-#define TWSI_BAUD_RATE_N_OFFS		0
-#define TWSI_BAUD_RATE_N_MASK		(0x7 << TWSI_BAUD_RATE_N_OFFS)
-#define TWSI_BAUD_RATE_M_OFFS   	3
-#define TWSI_BAUD_RATE_M_MASK  		(0xF << TWSI_BAUD_RATE_M_OFFS)
-
-#define TWSI_SOFT_RESET_REG(chanNum)	(TWSI_SLAVE_BASE(chanNum) + 0x1c)
-
-/* defines */
-#define TWSI_TIMEOUT_VALUE 		0x500 
-
-/* TWSI status codes */
-#define TWSI_BUS_ERROR                                            0x00
-#define TWSI_START_CON_TRA                                        0x08
-#define TWSI_REPEATED_START_CON_TRA                               0x10
-#define TWSI_AD_PLS_WR_BIT_TRA_ACK_REC                            0x18
-#define TWSI_AD_PLS_WR_BIT_TRA_ACK_NOT_REC                        0x20
-#define TWSI_M_TRAN_DATA_BYTE_ACK_REC                             0x28
-#define TWSI_M_TRAN_DATA_BYTE_ACK_NOT_REC                         0x30
-#define TWSI_M_LOST_ARB_DUR_AD_OR_DATA_TRA                        0x38
-#define TWSI_AD_PLS_RD_BIT_TRA_ACK_REC                            0x40
-#define TWSI_AD_PLS_RD_BIT_TRA_ACK_NOT_REC                        0x48
-#define TWSI_M_REC_RD_DATA_ACK_TRA                                0x50
-#define TWSI_M_REC_RD_DATA_ACK_NOT_TRA                            0x58
-#define TWSI_SLA_REC_AD_PLS_WR_BIT_ACK_TRA                        0x60
-#define TWSI_M_LOST_ARB_DUR_AD_TRA_AD_IS_TRGT_TO_SLA_ACK_TRA_W    0x68
-#define TWSI_GNL_CALL_REC_ACK_TRA                                 0x70
-#define TWSI_M_LOST_ARB_DUR_AD_TRA_GNL_CALL_AD_REC_ACK_TRA        0x78
-#define TWSI_SLA_REC_WR_DATA_AF_REC_SLA_AD_ACK_TRAN               0x80
-#define TWSI_SLA_REC_WR_DATA_AF_REC_SLA_AD_ACK_NOT_TRAN           0x88
-#define TWSI_SLA_REC_WR_DATA_AF_REC_GNL_CALL_ACK_TRAN             0x90
-#define TWSI_SLA_REC_WR_DATA_AF_REC_GNL_CALL_ACK_NOT_TRAN         0x98
-#define TWSI_SLA_REC_STOP_OR_REPEATED_STRT_CON                    0xA0
-#define TWSI_SLA_REC_AD_PLS_RD_BIT_ACK_TRA                        0xA8
-#define TWSI_M_LOST_ARB_DUR_AD_TRA_AD_IS_TRGT_TO_SLA_ACK_TRA_R    0xB0
-#define TWSI_SLA_TRA_RD_DATA_ACK_REC                              0xB8
-#define TWSI_SLA_TRA_RD_DATA_ACK_NOT_REC                          0xC0
-#define TWSI_SLA_TRA_LAST_RD_DATA_ACK_REC                         0xC8
-#define TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_REC                        0xD0
-#define TWSI_SEC_AD_PLS_WR_BIT_TRA_ACK_NOT_REC                    0xD8
-#define TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_REC                        0xE0
-#define TWSI_SEC_AD_PLS_RD_BIT_TRA_ACK_NOT_REC                    0xE8
-#define TWSI_NO_REL_STS_INT_FLAG_IS_KEPT_0                        0xF8
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __INCmvTwsiSpech */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ocf-bench.c b/target/linux/generic-2.6/files/crypto/ocf/ocf-bench.c
deleted file mode 100644
index d32523185f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ocf-bench.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * A loadable module that benchmarks the OCF crypto speed from kernel space.
- *
- * Copyright (C) 2004-2010 David McCullough <david_mccullough@mcafee.com>
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- */
-
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/version.h>
-#include <linux/interrupt.h>
-#include <cryptodev.h>
-
-#ifdef I_HAVE_AN_XSCALE_WITH_INTEL_SDK
-#define BENCH_IXP_ACCESS_LIB 1
-#endif
-#ifdef BENCH_IXP_ACCESS_LIB
-#include <IxTypes.h>
-#include <IxOsBuffMgt.h>
-#include <IxNpeDl.h>
-#include <IxCryptoAcc.h>
-#include <IxQMgr.h>
-#include <IxOsServices.h>
-#include <IxOsCacheMMU.h>
-#endif
-
-/*
- * support for access lib version 1.4
- */
-#ifndef IX_MBUF_PRIV
-#define IX_MBUF_PRIV(x) ((x)->priv)
-#endif
-
-/*
- * the number of simultaneously active requests
- */
-static int request_q_len = 20;
-module_param(request_q_len, int, 0);
-MODULE_PARM_DESC(request_q_len, "Number of outstanding requests");
-/*
- * how many requests we want to have processed
- */
-static int request_num = 1024;
-module_param(request_num, int, 0);
-MODULE_PARM_DESC(request_num, "run for at least this many requests");
-/*
- * the size of each request
- */
-static int request_size = 1500;
-module_param(request_size, int, 0);
-MODULE_PARM_DESC(request_size, "size of each request");
-
-/*
- * a structure for each request
- */
-typedef struct  {
-	struct work_struct work;
-#ifdef BENCH_IXP_ACCESS_LIB
-	IX_MBUF mbuf;
-#endif
-	unsigned char *buffer;
-} request_t;
-
-static request_t *requests;
-
-static int outstanding;
-static int total;
-
-/*************************************************************************/
-/*
- * OCF benchmark routines
- */
-
-static uint64_t ocf_cryptoid;
-static int ocf_init(void);
-static int ocf_cb(struct cryptop *crp);
-static void ocf_request(void *arg);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void ocf_request_wq(struct work_struct *work);
-#endif
-
-static int
-ocf_init(void)
-{
-	int error;
-	struct cryptoini crie, cria;
-	struct cryptodesc crda, crde;
-
-	memset(&crie, 0, sizeof(crie));
-	memset(&cria, 0, sizeof(cria));
-	memset(&crde, 0, sizeof(crde));
-	memset(&crda, 0, sizeof(crda));
-
-	cria.cri_alg  = CRYPTO_SHA1_HMAC;
-	cria.cri_klen = 20 * 8;
-	cria.cri_key  = "0123456789abcdefghij";
-
-	crie.cri_alg  = CRYPTO_3DES_CBC;
-	crie.cri_klen = 24 * 8;
-	crie.cri_key  = "0123456789abcdefghijklmn";
-
-	crie.cri_next = &cria;
-
-	error = crypto_newsession(&ocf_cryptoid, &crie, 0);
-	if (error) {
-		printk("crypto_newsession failed %d\n", error);
-		return -1;
-	}
-	return 0;
-}
-
-static int
-ocf_cb(struct cryptop *crp)
-{
-	request_t *r = (request_t *) crp->crp_opaque;
-
-	if (crp->crp_etype)
-		printk("Error in OCF processing: %d\n", crp->crp_etype);
-	total++;
-	crypto_freereq(crp);
-	crp = NULL;
-
-	if (total > request_num) {
-		outstanding--;
-		return 0;
-	}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-	INIT_WORK(&r->work, ocf_request_wq);
-#else
-	INIT_WORK(&r->work, ocf_request, r);
-#endif
-	schedule_work(&r->work);
-	return 0;
-}
-
-
-static void
-ocf_request(void *arg)
-{
-	request_t *r = arg;
-	struct cryptop *crp = crypto_getreq(2);
-	struct cryptodesc *crde, *crda;
-
-	if (!crp) {
-		outstanding--;
-		return;
-	}
-
-	crde = crp->crp_desc;
-	crda = crde->crd_next;
-
-	crda->crd_skip = 0;
-	crda->crd_flags = 0;
-	crda->crd_len = request_size;
-	crda->crd_inject = request_size;
-	crda->crd_alg = CRYPTO_SHA1_HMAC;
-	crda->crd_key = "0123456789abcdefghij";
-	crda->crd_klen = 20 * 8;
-
-	crde->crd_skip = 0;
-	crde->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_ENCRYPT;
-	crde->crd_len = request_size;
-	crde->crd_inject = request_size;
-	crde->crd_alg = CRYPTO_3DES_CBC;
-	crde->crd_key = "0123456789abcdefghijklmn";
-	crde->crd_klen = 24 * 8;
-
-	crp->crp_ilen = request_size + 64;
-	crp->crp_flags = CRYPTO_F_CBIMM;
-	crp->crp_buf = (caddr_t) r->buffer;
-	crp->crp_callback = ocf_cb;
-	crp->crp_sid = ocf_cryptoid;
-	crp->crp_opaque = (caddr_t) r;
-	crypto_dispatch(crp);
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void
-ocf_request_wq(struct work_struct *work)
-{
-	request_t *r = container_of(work, request_t, work);
-	ocf_request(r);
-}
-#endif
-
-/*************************************************************************/
-#ifdef BENCH_IXP_ACCESS_LIB
-/*************************************************************************/
-/*
- * CryptoAcc benchmark routines
- */
-
-static IxCryptoAccCtx ixp_ctx;
-static UINT32 ixp_ctx_id;
-static IX_MBUF ixp_pri;
-static IX_MBUF ixp_sec;
-static int ixp_registered = 0;
-
-static void ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp,
-					IxCryptoAccStatus status);
-static void ixp_perform_cb(UINT32 ctx_id, IX_MBUF *sbufp, IX_MBUF *dbufp,
-					IxCryptoAccStatus status);
-static void ixp_request(void *arg);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void ixp_request_wq(struct work_struct *work);
-#endif
-
-static int
-ixp_init(void)
-{
-	IxCryptoAccStatus status;
-
-	ixp_ctx.cipherCtx.cipherAlgo = IX_CRYPTO_ACC_CIPHER_3DES;
-	ixp_ctx.cipherCtx.cipherMode = IX_CRYPTO_ACC_MODE_CBC;
-	ixp_ctx.cipherCtx.cipherKeyLen = 24;
-	ixp_ctx.cipherCtx.cipherBlockLen = IX_CRYPTO_ACC_DES_BLOCK_64;
-	ixp_ctx.cipherCtx.cipherInitialVectorLen = IX_CRYPTO_ACC_DES_IV_64;
-	memcpy(ixp_ctx.cipherCtx.key.cipherKey, "0123456789abcdefghijklmn", 24);
-
-	ixp_ctx.authCtx.authAlgo = IX_CRYPTO_ACC_AUTH_SHA1;
-	ixp_ctx.authCtx.authDigestLen = 12;
-	ixp_ctx.authCtx.aadLen = 0;
-	ixp_ctx.authCtx.authKeyLen = 20;
-	memcpy(ixp_ctx.authCtx.key.authKey, "0123456789abcdefghij", 20);
-
-	ixp_ctx.useDifferentSrcAndDestMbufs = 0;
-	ixp_ctx.operation = IX_CRYPTO_ACC_OP_ENCRYPT_AUTH ;
-
-	IX_MBUF_MLEN(&ixp_pri)  = IX_MBUF_PKT_LEN(&ixp_pri) = 128;
-	IX_MBUF_MDATA(&ixp_pri) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
-	IX_MBUF_MLEN(&ixp_sec)  = IX_MBUF_PKT_LEN(&ixp_sec) = 128;
-	IX_MBUF_MDATA(&ixp_sec) = (unsigned char *) kmalloc(128, SLAB_ATOMIC);
-
-	status = ixCryptoAccCtxRegister(&ixp_ctx, &ixp_pri, &ixp_sec,
-			ixp_register_cb, ixp_perform_cb, &ixp_ctx_id);
-
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status) {
-		while (!ixp_registered)
-			schedule();
-		return ixp_registered < 0 ? -1 : 0;
-	}
-
-	printk("ixp: ixCryptoAccCtxRegister failed %d\n", status);
-	return -1;
-}
-
-static void
-ixp_register_cb(UINT32 ctx_id, IX_MBUF *bufp, IxCryptoAccStatus status)
-{
-	if (bufp) {
-		IX_MBUF_MLEN(bufp) = IX_MBUF_PKT_LEN(bufp) = 0;
-		kfree(IX_MBUF_MDATA(bufp));
-		IX_MBUF_MDATA(bufp) = NULL;
-	}
-
-	if (IX_CRYPTO_ACC_STATUS_WAIT == status)
-		return;
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS == status)
-		ixp_registered = 1;
-	else
-		ixp_registered = -1;
-}
-
-static void
-ixp_perform_cb(
-	UINT32 ctx_id,
-	IX_MBUF *sbufp,
-	IX_MBUF *dbufp,
-	IxCryptoAccStatus status)
-{
-	request_t *r = NULL;
-
-	total++;
-	if (total > request_num) {
-		outstanding--;
-		return;
-	}
-
-	if (!sbufp || !(r = IX_MBUF_PRIV(sbufp))) {
-		printk("crappo %p %p\n", sbufp, r);
-		outstanding--;
-		return;
-	}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-	INIT_WORK(&r->work, ixp_request_wq);
-#else
-	INIT_WORK(&r->work, ixp_request, r);
-#endif
-	schedule_work(&r->work);
-}
-
-static void
-ixp_request(void *arg)
-{
-	request_t *r = arg;
-	IxCryptoAccStatus status;
-
-	memset(&r->mbuf, 0, sizeof(r->mbuf));
-	IX_MBUF_MLEN(&r->mbuf) = IX_MBUF_PKT_LEN(&r->mbuf) = request_size + 64;
-	IX_MBUF_MDATA(&r->mbuf) = r->buffer;
-	IX_MBUF_PRIV(&r->mbuf) = r;
-	status = ixCryptoAccAuthCryptPerform(ixp_ctx_id, &r->mbuf, NULL,
-			0, request_size, 0, request_size, request_size, r->buffer);
-	if (IX_CRYPTO_ACC_STATUS_SUCCESS != status) {
-		printk("status1 = %d\n", status);
-		outstanding--;
-		return;
-	}
-	return;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-static void
-ixp_request_wq(struct work_struct *work)
-{
-	request_t *r = container_of(work, request_t, work);
-	ixp_request(r);
-}
-#endif
-
-/*************************************************************************/
-#endif /* BENCH_IXP_ACCESS_LIB */
-/*************************************************************************/
-
-int
-ocfbench_init(void)
-{
-	int i, jstart, jstop;
-
-	printk("Crypto Speed tests\n");
-
-	requests = kmalloc(sizeof(request_t) * request_q_len, GFP_KERNEL);
-	if (!requests) {
-		printk("malloc failed\n");
-		return -EINVAL;
-	}
-
-	for (i = 0; i < request_q_len; i++) {
-		/* +64 for return data */
-		requests[i].buffer = kmalloc(request_size + 128, GFP_DMA);
-		if (!requests[i].buffer) {
-			printk("malloc failed\n");
-			return -EINVAL;
-		}
-		memset(requests[i].buffer, '0' + i, request_size + 128);
-	}
-
-	/*
-	 * OCF benchmark
-	 */
-	printk("OCF: testing ...\n");
-	ocf_init();
-	total = outstanding = 0;
-	jstart = jiffies;
-	for (i = 0; i < request_q_len; i++) {
-		outstanding++;
-		ocf_request(&requests[i]);
-	}
-	while (outstanding > 0)
-		schedule();
-	jstop = jiffies;
-
-	printk("OCF: %d requests of %d bytes in %d jiffies\n", total, request_size,
-			jstop - jstart);
-
-#ifdef BENCH_IXP_ACCESS_LIB
-	/*
-	 * IXP benchmark
-	 */
-	printk("IXP: testing ...\n");
-	ixp_init();
-	total = outstanding = 0;
-	jstart = jiffies;
-	for (i = 0; i < request_q_len; i++) {
-		outstanding++;
-		ixp_request(&requests[i]);
-	}
-	while (outstanding > 0)
-		schedule();
-	jstop = jiffies;
-
-	printk("IXP: %d requests of %d bytes in %d jiffies\n", total, request_size,
-			jstop - jstart);
-#endif /* BENCH_IXP_ACCESS_LIB */
-
-	for (i = 0; i < request_q_len; i++)
-		kfree(requests[i].buffer);
-	kfree(requests);
-	return -EINVAL; /* always fail to load so it can be re-run quickly ;-) */
-}
-
-static void __exit ocfbench_exit(void)
-{
-}
-
-module_init(ocfbench_init);
-module_exit(ocfbench_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("Benchmark various in-kernel crypto speeds");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ocf-compat.h b/target/linux/generic-2.6/files/crypto/ocf/ocf-compat.h
deleted file mode 100644
index 212f971239..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ocf-compat.h
+++ /dev/null
@@ -1,294 +0,0 @@
-#ifndef _BSD_COMPAT_H_
-#define _BSD_COMPAT_H_ 1
-/****************************************************************************/
-/*
- * Provide compat routines for older linux kernels and BSD kernels
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2010 David McCullough <david_mccullough@mcafee.com>
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this file
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- */
-/****************************************************************************/
-#ifdef __KERNEL__
-/*
- * fake some BSD driver interface stuff specifically for OCF use
- */
-
-typedef struct ocf_device *device_t;
-
-typedef struct {
-	int (*cryptodev_newsession)(device_t dev, u_int32_t *sidp, struct cryptoini *cri);
-	int (*cryptodev_freesession)(device_t dev, u_int64_t tid);
-	int (*cryptodev_process)(device_t dev, struct cryptop *crp, int hint);
-	int (*cryptodev_kprocess)(device_t dev, struct cryptkop *krp, int hint);
-} device_method_t;
-#define DEVMETHOD(id, func)	id: func
-
-struct ocf_device {
-	char name[32];		/* the driver name */
-	char nameunit[32];	/* the driver name + HW instance */
-	int  unit;
-	device_method_t	methods;
-	void *softc;
-};
-
-#define CRYPTODEV_NEWSESSION(dev, sid, cri) \
-	((*(dev)->methods.cryptodev_newsession)(dev,sid,cri))
-#define CRYPTODEV_FREESESSION(dev, sid) \
-	((*(dev)->methods.cryptodev_freesession)(dev, sid))
-#define CRYPTODEV_PROCESS(dev, crp, hint) \
-	((*(dev)->methods.cryptodev_process)(dev, crp, hint))
-#define CRYPTODEV_KPROCESS(dev, krp, hint) \
-	((*(dev)->methods.cryptodev_kprocess)(dev, krp, hint))
-
-#define device_get_name(dev)	((dev)->name)
-#define device_get_nameunit(dev)	((dev)->nameunit)
-#define device_get_unit(dev)	((dev)->unit)
-#define device_get_softc(dev)	((dev)->softc)
-
-#define	softc_device_decl \
-		struct ocf_device _device; \
-		device_t
-
-#define	softc_device_init(_sc, _name, _unit, _methods) \
-	if (1) {\
-	strncpy((_sc)->_device.name, _name, sizeof((_sc)->_device.name) - 1); \
-	snprintf((_sc)->_device.nameunit, sizeof((_sc)->_device.name), "%s%d", _name, _unit); \
-	(_sc)->_device.unit = _unit; \
-	(_sc)->_device.methods = _methods; \
-	(_sc)->_device.softc = (void *) _sc; \
-	*(device_t *)((softc_get_device(_sc))+1) = &(_sc)->_device; \
-	} else
-
-#define	softc_get_device(_sc)	(&(_sc)->_device)
-
-/*
- * iomem support for 2.4 and 2.6 kernels
- */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define ocf_iomem_t	unsigned long
-
-/*
- * implement simple workqueue like support for older kernels
- */
-
-#include <linux/tqueue.h>
-
-#define work_struct tq_struct
-
-#define INIT_WORK(wp, fp, ap) \
-	do { \
-		(wp)->sync = 0; \
-		(wp)->routine = (fp); \
-		(wp)->data = (ap); \
-	} while (0)
-
-#define schedule_work(wp) \
-	do { \
-		queue_task((wp), &tq_immediate); \
-		mark_bh(IMMEDIATE_BH); \
-	} while (0)
-
-#define flush_scheduled_work()	run_task_queue(&tq_immediate)
-
-#else
-#define ocf_iomem_t	void __iomem *
-
-#include <linux/workqueue.h>
-
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-#include <linux/fdtable.h>
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-#define files_fdtable(files)	(files)
-#endif
-
-#ifdef MODULE_PARM
-#undef module_param	/* just in case */
-#define	module_param(a,b,c)		MODULE_PARM(a,"i")
-#endif
-
-#define bzero(s,l)		memset(s,0,l)
-#define bcopy(s,d,l)	memcpy(d,s,l)
-#define bcmp(x, y, l)	memcmp(x,y,l)
-
-#define MIN(x,y)	((x) < (y) ? (x) : (y))
-
-#define device_printf(dev, a...) ({ \
-				printk("%s: ", device_get_nameunit(dev)); printk(a); \
-			})
-
-#undef printf
-#define printf(fmt...)	printk(fmt)
-
-#define KASSERT(c,p)	if (!(c)) { printk p ; } else
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define ocf_daemonize(str) \
-	daemonize(); \
-	spin_lock_irq(&current->sigmask_lock); \
-	sigemptyset(&current->blocked); \
-	recalc_sigpending(current); \
-	spin_unlock_irq(&current->sigmask_lock); \
-	sprintf(current->comm, str);
-#else
-#define ocf_daemonize(str) daemonize(str);
-#endif
-
-#define	TAILQ_INSERT_TAIL(q,d,m) list_add_tail(&(d)->m, (q))
-#define	TAILQ_EMPTY(q)	list_empty(q)
-#define	TAILQ_FOREACH(v, q, m) list_for_each_entry(v, q, m)
-
-#define read_random(p,l) get_random_bytes(p,l)
-
-#define DELAY(x)	((x) > 2000 ? mdelay((x)/1000) : udelay(x))
-#define strtoul simple_strtoul
-
-#define pci_get_vendor(dev)	((dev)->vendor)
-#define pci_get_device(dev)	((dev)->device)
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define pci_set_consistent_dma_mask(dev, mask) (0)
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-#define pci_dma_sync_single_for_cpu pci_dma_sync_single
-#endif
-
-#ifndef DMA_32BIT_MASK
-#define DMA_32BIT_MASK  0x00000000ffffffffULL
-#endif
-
-#ifndef htole32
-#define htole32(x)	cpu_to_le32(x)
-#endif
-#ifndef htobe32
-#define htobe32(x)	cpu_to_be32(x)
-#endif
-#ifndef htole16
-#define htole16(x)	cpu_to_le16(x)
-#endif
-#ifndef htobe16
-#define htobe16(x)	cpu_to_be16(x)
-#endif
-
-/* older kernels don't have these */
-
-#include <asm/irq.h>
-#if !defined(IRQ_NONE) && !defined(IRQ_RETVAL)
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_WAKE_THREAD
-#define IRQ_RETVAL
-#define irqreturn_t void
-typedef irqreturn_t (*irq_handler_t)(int irq, void *arg, struct pt_regs *regs);
-#endif
-#ifndef IRQF_SHARED
-#define IRQF_SHARED	SA_SHIRQ
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-# define strlcpy(dest,src,len) \
-		({strncpy(dest,src,(len)-1); ((char *)dest)[(len)-1] = '\0'; })
-#endif
-
-#ifndef MAX_ERRNO
-#define MAX_ERRNO	4095
-#endif
-#ifndef IS_ERR_VALUE
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,5)
-#include <linux/err.h>
-#endif
-#ifndef IS_ERR_VALUE
-#define IS_ERR_VALUE(x) ((unsigned long)(x) >= (unsigned long)-MAX_ERRNO)
-#endif
-#endif
-
-/*
- * common debug for all
- */
-#if 1
-#define dprintk(a...)	do { if (debug) printk(a); } while(0)
-#else
-#define dprintk(a...)
-#endif
-
-#ifndef SLAB_ATOMIC
-/* Changed in 2.6.20, must use GFP_ATOMIC now */
-#define	SLAB_ATOMIC	GFP_ATOMIC
-#endif
-
-/*
- * need some additional support for older kernels */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,2)
-#define pci_register_driver_compat(driver, rc) \
-	do { \
-		if ((rc) > 0) { \
-			(rc) = 0; \
-		} else if (rc == 0) { \
-			(rc) = -ENODEV; \
-		} else { \
-			pci_unregister_driver(driver); \
-		} \
-	} while (0)
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-#define pci_register_driver_compat(driver,rc) ((rc) = (rc) < 0 ? (rc) : 0)
-#else
-#define pci_register_driver_compat(driver,rc)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-
-static inline void sg_set_page(struct scatterlist *sg,  struct page *page,
-			       unsigned int len, unsigned int offset)
-{
-	sg->page = page;
-	sg->offset = offset;
-	sg->length = len;
-}
-
-static inline void *sg_virt(struct scatterlist *sg)
-{
-	return page_address(sg->page) + sg->offset;
-}
-
-#define sg_init_table(sg, n)
-
-#endif
-
-#ifndef late_initcall
-#define late_initcall(init) module_init(init)
-#endif
-
-#endif /* __KERNEL__ */
-
-/****************************************************************************/
-#endif /* _BSD_COMPAT_H_ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ocfnull/Makefile b/target/linux/generic-2.6/files/crypto/ocf/ocfnull/Makefile
deleted file mode 100644
index 044bcacb7b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ocfnull/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_OCFNULL) += ocfnull.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/..
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/ocfnull/ocfnull.c b/target/linux/generic-2.6/files/crypto/ocf/ocfnull/ocfnull.c
deleted file mode 100644
index a6b76cdaef..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/ocfnull/ocfnull.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * An OCF module for determining the cost of crypto versus the cost of
- * IPSec processing outside of OCF.  This modules gives us the effect of
- * zero cost encryption,  of course you will need to run it at both ends
- * since it does no crypto at all.
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough 
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/crypto.h>
-#include <linux/interrupt.h>
-
-#include <cryptodev.h>
-#include <uio.h>
-
-static int32_t			 null_id = -1;
-static u_int32_t		 null_sesnum = 0;
-
-static int null_process(device_t, struct cryptop *, int);
-static int null_newsession(device_t, u_int32_t *, struct cryptoini *);
-static int null_freesession(device_t, u_int64_t);
-
-#define debug ocfnull_debug
-int ocfnull_debug = 0;
-module_param(ocfnull_debug, int, 0644);
-MODULE_PARM_DESC(ocfnull_debug, "Enable debug");
-
-/*
- * dummy device structure
- */
-
-static struct {
-	softc_device_decl	sc_dev;
-} nulldev;
-
-static device_method_t null_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	null_newsession),
-	DEVMETHOD(cryptodev_freesession,null_freesession),
-	DEVMETHOD(cryptodev_process,	null_process),
-};
-
-/*
- * Generate a new software session.
- */
-static int
-null_newsession(device_t arg, u_int32_t *sid, struct cryptoini *cri)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid == NULL || cri == NULL) {
-		dprintk("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	if (null_sesnum == 0)
-		null_sesnum++;
-	*sid = null_sesnum++;
-	return 0;
-}
-
-
-/*
- * Free a session.
- */
-static int
-null_freesession(device_t arg, u_int64_t tid)
-{
-	u_int32_t sid = CRYPTO_SESID2LID(tid);
-
-	dprintk("%s()\n", __FUNCTION__);
-	if (sid > null_sesnum) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	/* Silently accept and return */
-	if (sid == 0)
-		return 0;
-	return 0;
-}
-
-
-/*
- * Process a request.
- */
-static int
-null_process(device_t arg, struct cryptop *crp, int hint)
-{
-	unsigned int lid;
-
-	dprintk("%s()\n", __FUNCTION__);
-
-	/* Sanity check */
-	if (crp == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-
-	crp->crp_etype = 0;
-
-	if (crp->crp_desc == NULL || crp->crp_buf == NULL) {
-		dprintk("%s,%d: EINVAL\n", __FILE__, __LINE__);
-		crp->crp_etype = EINVAL;
-		goto done;
-	}
-
-	/*
-	 * find the session we are using
-	 */
-
-	lid = crp->crp_sid & 0xffffffff;
-	if (lid >= null_sesnum || lid == 0) {
-		crp->crp_etype = ENOENT;
-		dprintk("%s,%d: ENOENT\n", __FILE__, __LINE__);
-		goto done;
-	}
-
-done:
-	crypto_done(crp);
-	return 0;
-}
-
-
-/*
- * our driver startup and shutdown routines
- */
-
-static int
-null_init(void)
-{
-	dprintk("%s(%p)\n", __FUNCTION__, null_init);
-
-	memset(&nulldev, 0, sizeof(nulldev));
-	softc_device_init(&nulldev, "ocfnull", 0, null_methods);
-
-	null_id = crypto_get_driverid(softc_get_device(&nulldev),
-				CRYPTOCAP_F_HARDWARE);
-	if (null_id < 0)
-		panic("ocfnull: crypto device cannot initialize!");
-
-#define	REGISTER(alg) \
-	crypto_register(null_id,alg,0,0)
-	REGISTER(CRYPTO_DES_CBC);
-	REGISTER(CRYPTO_3DES_CBC);
-	REGISTER(CRYPTO_RIJNDAEL128_CBC);
-	REGISTER(CRYPTO_MD5);
-	REGISTER(CRYPTO_SHA1);
-	REGISTER(CRYPTO_MD5_HMAC);
-	REGISTER(CRYPTO_SHA1_HMAC);
-#undef REGISTER
-
-	return 0;
-}
-
-static void
-null_exit(void)
-{
-	dprintk("%s()\n", __FUNCTION__);
-	crypto_unregister_all(null_id);
-	null_id = -1;
-}
-
-module_init(null_init);
-module_exit(null_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("ocfnull - claims a lot but does nothing");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/pasemi/Makefile b/target/linux/generic-2.6/files/crypto/ocf/pasemi/Makefile
deleted file mode 100644
index b0a3980f21..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/pasemi/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_PASEMI) += pasemi.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi.c b/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi.c
deleted file mode 100644
index c3bb9313d3..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi.c
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*
- * Copyright (C) 2007 PA Semi, Inc
- *
- * Driver for the PA Semi PWRficient DMA Crypto Engine
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/random.h>
-#include <linux/skbuff.h>
-#include <asm/scatterlist.h>
-#include <linux/moduleparam.h>
-#include <linux/pci.h>
-#include <cryptodev.h>
-#include <uio.h>
-#include "pasemi_fnu.h"
-
-#define DRV_NAME "pasemi"
-
-#define TIMER_INTERVAL 1000
-
-static void __devexit pasemi_dma_remove(struct pci_dev *pdev);
-static struct pasdma_status volatile * dma_status;
-
-static int debug;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Enable debug");
-
-static void pasemi_desc_start(struct pasemi_desc *desc, u64 hdr)
-{
-	desc->postop = 0;
-	desc->quad[0] = hdr;
-	desc->quad_cnt = 1;
-	desc->size = 1;
-}
-
-static void pasemi_desc_build(struct pasemi_desc *desc, u64 val)
-{
-	desc->quad[desc->quad_cnt++] = val;
-	desc->size = (desc->quad_cnt + 1) / 2;
-}
-
-static void pasemi_desc_hdr(struct pasemi_desc *desc, u64 hdr)
-{
-	desc->quad[0] |= hdr;
-}
-
-static int pasemi_desc_size(struct pasemi_desc *desc)
-{
-	return desc->size;
-}
-
-static void pasemi_ring_add_desc(
-				 struct pasemi_fnu_txring *ring,
-				 struct pasemi_desc *desc,
-				 struct cryptop *crp) {
-	int i;
-	int ring_index = 2 * (ring->next_to_fill & (TX_RING_SIZE-1));
-
-	TX_DESC_INFO(ring, ring->next_to_fill).desc_size = desc->size;
-	TX_DESC_INFO(ring, ring->next_to_fill).desc_postop = desc->postop;
-	TX_DESC_INFO(ring, ring->next_to_fill).cf_crp = crp;
-
-	for (i = 0; i < desc->quad_cnt; i += 2) {
-		ring_index = 2 * (ring->next_to_fill & (TX_RING_SIZE-1));
-		ring->desc[ring_index] = desc->quad[i];
-		ring->desc[ring_index + 1] = desc->quad[i + 1];
-		ring->next_to_fill++;
-	}
-
-	if (desc->quad_cnt & 1)
-		ring->desc[ring_index + 1] = 0;
-}
-
-static void pasemi_ring_incr(struct pasemi_softc *sc, int chan_index, int incr)
-{
-	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_INCR(sc->base_chan + chan_index),
-		 incr);
-}
-
-/*
- * Generate a new software session.
- */
-static int
-pasemi_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
-{
-	struct cryptoini *c, *encini = NULL, *macini = NULL;
-	struct pasemi_softc *sc = device_get_softc(dev);
-	struct pasemi_session *ses = NULL, **sespp;
-	int sesn, blksz = 0;
-	u64 ccmd = 0;
-	unsigned long flags;
-	struct pasemi_desc init_desc;
-	struct pasemi_fnu_txring *txring;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	if (sidp == NULL || cri == NULL || sc == NULL) {
-		DPRINTF("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return -EINVAL;
-	}
-	for (c = cri; c != NULL; c = c->cri_next) {
-		if (ALG_IS_SIG(c->cri_alg)) {
-			if (macini)
-				return -EINVAL;
-			macini = c;
-		} else if (ALG_IS_CIPHER(c->cri_alg)) {
-			if (encini)
-				return -EINVAL;
-			encini = c;
-		} else {
-			DPRINTF("UNKNOWN c->cri_alg %d\n", c->cri_alg);
-			return -EINVAL;
-		}
-	}
-	if (encini == NULL && macini == NULL)
-		return -EINVAL;
-	if (encini) {
-		/* validate key length */
-		switch (encini->cri_alg) {
-		case CRYPTO_DES_CBC:
-			if (encini->cri_klen != 64)
-				return -EINVAL;
-			ccmd = DMA_CALGO_DES;
-			break;
-		case CRYPTO_3DES_CBC:
-			if (encini->cri_klen != 192)
-				return -EINVAL;
-			ccmd = DMA_CALGO_3DES;
-			break;
-		case CRYPTO_AES_CBC:
-			if (encini->cri_klen != 128 &&
-			    encini->cri_klen != 192 &&
-			    encini->cri_klen != 256)
-				return -EINVAL;
-			ccmd = DMA_CALGO_AES;
-			break;
-		case CRYPTO_ARC4:
-			if (encini->cri_klen != 128)
-				return -EINVAL;
-			ccmd = DMA_CALGO_ARC;
-			break;
-		default:
-			DPRINTF("UNKNOWN encini->cri_alg %d\n",
-				encini->cri_alg);
-			return -EINVAL;
-		}
-	}
-
-	if (macini) {
-		switch (macini->cri_alg) {
-		case CRYPTO_MD5:
-		case CRYPTO_MD5_HMAC:
-			blksz = 16;
-			break;
-		case CRYPTO_SHA1:
-		case CRYPTO_SHA1_HMAC:
-			blksz = 20;
-			break;
-		default:
-			DPRINTF("UNKNOWN macini->cri_alg %d\n",
-				macini->cri_alg);
-			return -EINVAL;
-		}
-		if (((macini->cri_klen + 7) / 8) > blksz) {
-			DPRINTF("key length %d bigger than blksize %d not supported\n",
-				((macini->cri_klen + 7) / 8), blksz);
-			return -EINVAL;
-		}
-	}
-
-	for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
-		if (sc->sc_sessions[sesn] == NULL) {
-			sc->sc_sessions[sesn] = (struct pasemi_session *)
-				kzalloc(sizeof(struct pasemi_session), GFP_ATOMIC);
-			ses = sc->sc_sessions[sesn];
-			break;
-		} else if (sc->sc_sessions[sesn]->used == 0) {
-			ses = sc->sc_sessions[sesn];
-			break;
-		}
-	}
-
-	if (ses == NULL) {
-		sespp = (struct pasemi_session **)
-			kzalloc(sc->sc_nsessions * 2 *
-				sizeof(struct pasemi_session *), GFP_ATOMIC);
-		if (sespp == NULL)
-			return -ENOMEM;
-		memcpy(sespp, sc->sc_sessions,
-		       sc->sc_nsessions * sizeof(struct pasemi_session *));
-		kfree(sc->sc_sessions);
-		sc->sc_sessions = sespp;
-		sesn = sc->sc_nsessions;
-		ses = sc->sc_sessions[sesn] = (struct pasemi_session *)
-			kzalloc(sizeof(struct pasemi_session), GFP_ATOMIC);
-		if (ses == NULL)
-			return -ENOMEM;
-		sc->sc_nsessions *= 2;
-	}
-
-	ses->used = 1;
-
-	ses->dma_addr = pci_map_single(sc->dma_pdev, (void *) ses->civ,
-				       sizeof(struct pasemi_session), DMA_TO_DEVICE);
-
-	/* enter the channel scheduler */
-	spin_lock_irqsave(&sc->sc_chnlock, flags);
-
-	/* ARC4 has to be processed by the even channel */
-	if (encini && (encini->cri_alg == CRYPTO_ARC4))
-		ses->chan = sc->sc_lastchn & ~1;
-	else
-		ses->chan = sc->sc_lastchn;
-	sc->sc_lastchn = (sc->sc_lastchn + 1) % sc->sc_num_channels;
-
-	spin_unlock_irqrestore(&sc->sc_chnlock, flags);
-
-	txring = &sc->tx[ses->chan];
-
-	if (encini) {
-		ses->ccmd = ccmd;
-
-		/* get an IV */
-		/* XXX may read fewer than requested */
-		get_random_bytes(ses->civ, sizeof(ses->civ));
-
-		ses->keysz = (encini->cri_klen - 63) / 64;
-		memcpy(ses->key, encini->cri_key, (ses->keysz + 1) * 8);
-
-		pasemi_desc_start(&init_desc,
-				  XCT_CTRL_HDR(ses->chan, (encini && macini) ? 0x68 : 0x40, DMA_FN_CIV0));
-		pasemi_desc_build(&init_desc,
-				  XCT_FUN_SRC_PTR((encini && macini) ? 0x68 : 0x40, ses->dma_addr));
-	}
-	if (macini) {
-		if (macini->cri_alg == CRYPTO_MD5_HMAC ||
-		    macini->cri_alg == CRYPTO_SHA1_HMAC)
-			memcpy(ses->hkey, macini->cri_key, blksz);
-		else {
-			/* Load initialization constants(RFC 1321, 3174) */
-			ses->hiv[0] = 0x67452301efcdab89ULL;
-			ses->hiv[1] = 0x98badcfe10325476ULL;
-			ses->hiv[2] = 0xc3d2e1f000000000ULL;
-		}
-		ses->hseq = 0ULL;
-	}
-
-	spin_lock_irqsave(&txring->fill_lock, flags);
-
-	if (((txring->next_to_fill + pasemi_desc_size(&init_desc)) -
-	     txring->next_to_clean) > TX_RING_SIZE) {
-		spin_unlock_irqrestore(&txring->fill_lock, flags);
-		return ERESTART;
-	}
-
-	if (encini) {
-		pasemi_ring_add_desc(txring, &init_desc, NULL);
-		pasemi_ring_incr(sc, ses->chan,
-				 pasemi_desc_size(&init_desc));
-	}
-
-	txring->sesn = sesn;
-	spin_unlock_irqrestore(&txring->fill_lock, flags);
-
-	*sidp = PASEMI_SID(sesn);
-	return 0;
-}
-
-/*
- * Deallocate a session.
- */
-static int
-pasemi_freesession(device_t dev, u_int64_t tid)
-{
-	struct pasemi_softc *sc = device_get_softc(dev);
-	int session;
-	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (sc == NULL)
-		return -EINVAL;
-	session = PASEMI_SESSION(sid);
-	if (session >= sc->sc_nsessions || !sc->sc_sessions[session])
-		return -EINVAL;
-
-	pci_unmap_single(sc->dma_pdev,
-			 sc->sc_sessions[session]->dma_addr,
-			 sizeof(struct pasemi_session), DMA_TO_DEVICE);
-	memset(sc->sc_sessions[session], 0,
-	       sizeof(struct pasemi_session));
-
-	return 0;
-}
-
-static int
-pasemi_process(device_t dev, struct cryptop *crp, int hint)
-{
-
-	int err = 0, ivsize, srclen = 0, reinit = 0, reinit_size = 0, chsel;
-	struct pasemi_softc *sc = device_get_softc(dev);
-	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
-	caddr_t ivp;
-	struct pasemi_desc init_desc, work_desc;
-	struct pasemi_session *ses;
-	struct sk_buff *skb;
-	struct uio *uiop;
-	unsigned long flags;
-	struct pasemi_fnu_txring *txring;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (crp == NULL || crp->crp_callback == NULL || sc == NULL)
-		return -EINVAL;
-
-	crp->crp_etype = 0;
-	if (PASEMI_SESSION(crp->crp_sid) >= sc->sc_nsessions)
-		return -EINVAL;
-
-	ses = sc->sc_sessions[PASEMI_SESSION(crp->crp_sid)];
-
-	crd1 = crp->crp_desc;
-	if (crd1 == NULL) {
-		err = -EINVAL;
-		goto errout;
-	}
-	crd2 = crd1->crd_next;
-
-	if (ALG_IS_SIG(crd1->crd_alg)) {
-		maccrd = crd1;
-		if (crd2 == NULL)
-			enccrd = NULL;
-		else if (ALG_IS_CIPHER(crd2->crd_alg) &&
-			 (crd2->crd_flags & CRD_F_ENCRYPT) == 0)
-			enccrd = crd2;
-		else
-			goto erralg;
-	} else if (ALG_IS_CIPHER(crd1->crd_alg)) {
-		enccrd = crd1;
-		if (crd2 == NULL)
-			maccrd = NULL;
-		else if (ALG_IS_SIG(crd2->crd_alg) &&
-			 (crd1->crd_flags & CRD_F_ENCRYPT))
-			maccrd = crd2;
-		else
-			goto erralg;
-	} else
-		goto erralg;
-
-	chsel = ses->chan;
-
-	txring = &sc->tx[chsel];
-
-	if (enccrd && !maccrd) {
-		if (enccrd->crd_alg == CRYPTO_ARC4)
-			reinit = 1;
-		reinit_size = 0x40;
-		srclen = crp->crp_ilen;
-
-		pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I
-				  | XCT_FUN_FUN(chsel));
-		if (enccrd->crd_flags & CRD_F_ENCRYPT)
-			pasemi_desc_hdr(&work_desc, XCT_FUN_CRM_ENC);
-		else
-			pasemi_desc_hdr(&work_desc, XCT_FUN_CRM_DEC);
-	} else if (enccrd && maccrd) {
-		if (enccrd->crd_alg == CRYPTO_ARC4)
-			reinit = 1;
-		reinit_size = 0x68;
-
-		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
-			/* Encrypt -> Authenticate */
-			pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_ENC_SIG
-					  | XCT_FUN_A | XCT_FUN_FUN(chsel));
-			srclen = maccrd->crd_skip + maccrd->crd_len;
-		} else {
-			/* Authenticate -> Decrypt */
-			pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_SIG_DEC
-					  | XCT_FUN_24BRES | XCT_FUN_FUN(chsel));
-			pasemi_desc_build(&work_desc, 0);
-			pasemi_desc_build(&work_desc, 0);
-			pasemi_desc_build(&work_desc, 0);
-			work_desc.postop = PASEMI_CHECK_SIG;
-			srclen = crp->crp_ilen;
-		}
-
-		pasemi_desc_hdr(&work_desc, XCT_FUN_SHL(maccrd->crd_skip / 4));
-		pasemi_desc_hdr(&work_desc, XCT_FUN_CHL(enccrd->crd_skip - maccrd->crd_skip));
-	} else if (!enccrd && maccrd) {
-		srclen = maccrd->crd_len;
-
-		pasemi_desc_start(&init_desc,
-				  XCT_CTRL_HDR(chsel, 0x58, DMA_FN_HKEY0));
-		pasemi_desc_build(&init_desc,
-				  XCT_FUN_SRC_PTR(0x58, ((struct pasemi_session *)ses->dma_addr)->hkey));
-
-		pasemi_desc_start(&work_desc, XCT_FUN_O | XCT_FUN_I | XCT_FUN_CRM_SIG
-				  | XCT_FUN_A | XCT_FUN_FUN(chsel));
-	}
-
-	if (enccrd) {
-		switch (enccrd->crd_alg) {
-		case CRYPTO_3DES_CBC:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_3DES |
-					XCT_FUN_BCM_CBC);
-			ivsize = sizeof(u64);
-			break;
-		case CRYPTO_DES_CBC:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_DES |
-					XCT_FUN_BCM_CBC);
-			ivsize = sizeof(u64);
-			break;
-		case CRYPTO_AES_CBC:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_AES |
-					XCT_FUN_BCM_CBC);
-			ivsize = 2 * sizeof(u64);
-			break;
-		case CRYPTO_ARC4:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_ALG_ARC);
-			ivsize = 0;
-			break;
-		default:
-			printk(DRV_NAME ": unimplemented enccrd->crd_alg %d\n",
-			       enccrd->crd_alg);
-			err = -EINVAL;
-			goto errout;
-		}
-
-		ivp = (ivsize == sizeof(u64)) ? (caddr_t) &ses->civ[1] : (caddr_t) &ses->civ[0];
-		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-				memcpy(ivp, enccrd->crd_iv, ivsize);
-			/* If IV is not present in the buffer already, it has to be copied there */
-			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
-				crypto_copyback(crp->crp_flags, crp->crp_buf,
-						enccrd->crd_inject, ivsize, ivp);
-		} else {
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-				/* IV is provided expicitly in descriptor */
-				memcpy(ivp, enccrd->crd_iv, ivsize);
-			else
-				/* IV is provided in the packet */
-				crypto_copydata(crp->crp_flags, crp->crp_buf,
-						enccrd->crd_inject, ivsize,
-						ivp);
-		}
-	}
-
-	if (maccrd) {
-		switch (maccrd->crd_alg) {
-		case CRYPTO_MD5:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_MD5 |
-					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
-			break;
-		case CRYPTO_SHA1:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_SHA1 |
-					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
-			break;
-		case CRYPTO_MD5_HMAC:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_HMAC_MD5 |
-					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
-			break;
-		case CRYPTO_SHA1_HMAC:
-			pasemi_desc_hdr(&work_desc, XCT_FUN_SIG_HMAC_SHA1 |
-					XCT_FUN_HSZ((crp->crp_ilen - maccrd->crd_inject) / 4));
-			break;
-		default:
-			printk(DRV_NAME ": unimplemented maccrd->crd_alg %d\n",
-			       maccrd->crd_alg);
-			err = -EINVAL;
-			goto errout;
-		}
-	}
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		/* using SKB buffers */
-		skb = (struct sk_buff *)crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags) {
-			printk(DRV_NAME ": skb frags unimplemented\n");
-			err = -EINVAL;
-			goto errout;
-		}
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_DST_PTR(skb->len, pci_map_single(
-						sc->dma_pdev, skb->data,
-						skb->len, DMA_TO_DEVICE)));
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_SRC_PTR(
-				srclen, pci_map_single(
-					sc->dma_pdev, skb->data,
-					srclen, DMA_TO_DEVICE)));
-		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		/* using IOV buffers */
-		uiop = (struct uio *)crp->crp_buf;
-		if (uiop->uio_iovcnt > 1) {
-			printk(DRV_NAME ": iov frags unimplemented\n");
-			err = -EINVAL;
-			goto errout;
-		}
-
-		/* crp_olen is never set; always use crp_ilen */
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_DST_PTR(crp->crp_ilen, pci_map_single(
-						sc->dma_pdev,
-						uiop->uio_iov->iov_base,
-						crp->crp_ilen, DMA_TO_DEVICE)));
-		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
-
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_SRC_PTR(srclen, pci_map_single(
-						sc->dma_pdev,
-						uiop->uio_iov->iov_base,
-						srclen, DMA_TO_DEVICE)));
-	} else {
-		/* using contig buffers */
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_DST_PTR(crp->crp_ilen, pci_map_single(
-						sc->dma_pdev,
-						crp->crp_buf,
-						crp->crp_ilen, DMA_TO_DEVICE)));
-		pasemi_desc_build(
-			&work_desc,
-			XCT_FUN_SRC_PTR(srclen, pci_map_single(
-						sc->dma_pdev,
-						crp->crp_buf, srclen,
-						DMA_TO_DEVICE)));
-		pasemi_desc_hdr(&work_desc, XCT_FUN_LLEN(srclen));
-	}
-
-	spin_lock_irqsave(&txring->fill_lock, flags);
-
-	if (txring->sesn != PASEMI_SESSION(crp->crp_sid)) {
-		txring->sesn = PASEMI_SESSION(crp->crp_sid);
-		reinit = 1;
-	}
-
-	if (enccrd) {
-		pasemi_desc_start(&init_desc,
-				  XCT_CTRL_HDR(chsel, reinit ? reinit_size : 0x10, DMA_FN_CIV0));
-		pasemi_desc_build(&init_desc,
-				  XCT_FUN_SRC_PTR(reinit ? reinit_size : 0x10, ses->dma_addr));
-	}
-
-	if (((txring->next_to_fill + pasemi_desc_size(&init_desc) +
-	      pasemi_desc_size(&work_desc)) -
-	     txring->next_to_clean) > TX_RING_SIZE) {
-		spin_unlock_irqrestore(&txring->fill_lock, flags);
-		err = ERESTART;
-		goto errout;
-	}
-
-	pasemi_ring_add_desc(txring, &init_desc, NULL);
-	pasemi_ring_add_desc(txring, &work_desc, crp);
-
-	pasemi_ring_incr(sc, chsel,
-			 pasemi_desc_size(&init_desc) +
-			 pasemi_desc_size(&work_desc));
-
-	spin_unlock_irqrestore(&txring->fill_lock, flags);
-
-	mod_timer(&txring->crypto_timer, jiffies + TIMER_INTERVAL);
-
-	return 0;
-
-erralg:
-	printk(DRV_NAME ": unsupported algorithm or algorithm order alg1 %d alg2 %d\n",
-	       crd1->crd_alg, crd2->crd_alg);
-	err = -EINVAL;
-
-errout:
-	if (err != ERESTART) {
-		crp->crp_etype = err;
-		crypto_done(crp);
-	}
-	return err;
-}
-
-static int pasemi_clean_tx(struct pasemi_softc *sc, int chan)
-{
-	int i, j, ring_idx;
-	struct pasemi_fnu_txring *ring = &sc->tx[chan];
-	u16 delta_cnt;
-	int flags, loops = 10;
-	int desc_size;
-	struct cryptop *crp;
-
-	spin_lock_irqsave(&ring->clean_lock, flags);
-
-	while ((delta_cnt = (dma_status->tx_sta[sc->base_chan + chan]
-			     & PAS_STATUS_PCNT_M) - ring->total_pktcnt)
-	       && loops--) {
-
-		for (i = 0; i < delta_cnt; i++) {
-			desc_size = TX_DESC_INFO(ring, ring->next_to_clean).desc_size;
-			crp = TX_DESC_INFO(ring, ring->next_to_clean).cf_crp;
-			if (crp) {
-				ring_idx = 2 * (ring->next_to_clean & (TX_RING_SIZE-1));
-				if (TX_DESC_INFO(ring, ring->next_to_clean).desc_postop & PASEMI_CHECK_SIG) {
-					/* Need to make sure signature matched,
-					 * if not - return error */
-					if (!(ring->desc[ring_idx + 1] & (1ULL << 63)))
-						crp->crp_etype = -EINVAL;
-				}
-				crypto_done(TX_DESC_INFO(ring,
-							 ring->next_to_clean).cf_crp);
-				TX_DESC_INFO(ring, ring->next_to_clean).cf_crp = NULL;
-				pci_unmap_single(
-					sc->dma_pdev,
-					XCT_PTR_ADDR_LEN(ring->desc[ring_idx + 1]),
-					PCI_DMA_TODEVICE);
-
-				ring->desc[ring_idx] = ring->desc[ring_idx + 1] = 0;
-
-				ring->next_to_clean++;
-				for (j = 1; j < desc_size; j++) {
-					ring_idx = 2 *
-						(ring->next_to_clean &
-						 (TX_RING_SIZE-1));
-					pci_unmap_single(
-						sc->dma_pdev,
-						XCT_PTR_ADDR_LEN(ring->desc[ring_idx]),
-						PCI_DMA_TODEVICE);
-					if (ring->desc[ring_idx + 1])
-						pci_unmap_single(
-							sc->dma_pdev,
-							XCT_PTR_ADDR_LEN(
-								ring->desc[
-									ring_idx + 1]),
-							PCI_DMA_TODEVICE);
-					ring->desc[ring_idx] =
-						ring->desc[ring_idx + 1] = 0;
-					ring->next_to_clean++;
-				}
-			} else {
-				for (j = 0; j < desc_size; j++) {
-					ring_idx = 2 * (ring->next_to_clean & (TX_RING_SIZE-1));
-					ring->desc[ring_idx] =
-						ring->desc[ring_idx + 1] = 0;
-					ring->next_to_clean++;
-				}
-			}
-		}
-
-		ring->total_pktcnt += delta_cnt;
-	}
-	spin_unlock_irqrestore(&ring->clean_lock, flags);
-
-	return 0;
-}
-
-static void sweepup_tx(struct pasemi_softc *sc)
-{
-	int i;
-
-	for (i = 0; i < sc->sc_num_channels; i++)
-		pasemi_clean_tx(sc, i);
-}
-
-static irqreturn_t pasemi_intr(int irq, void *arg, struct pt_regs *regs)
-{
-	struct pasemi_softc *sc = arg;
-	unsigned int reg;
-	int chan = irq - sc->base_irq;
-	int chan_index = sc->base_chan + chan;
-	u64 stat = dma_status->tx_sta[chan_index];
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (!(stat & PAS_STATUS_CAUSE_M))
-		return IRQ_NONE;
-
-	pasemi_clean_tx(sc, chan);
-
-	stat = dma_status->tx_sta[chan_index];
-
-	reg = PAS_IOB_DMA_TXCH_RESET_PINTC |
-		PAS_IOB_DMA_TXCH_RESET_PCNT(sc->tx[chan].total_pktcnt);
-
-	if (stat & PAS_STATUS_SOFT)
-		reg |= PAS_IOB_DMA_RXCH_RESET_SINTC;
-
-	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_RESET(chan_index), reg);
-
-
-	return IRQ_HANDLED;
-}
-
-static int pasemi_dma_setup_tx_resources(struct pasemi_softc *sc, int chan)
-{
-	u32 val;
-	int chan_index = chan + sc->base_chan;
-	int ret;
-	struct pasemi_fnu_txring *ring;
-
-	ring = &sc->tx[chan];
-
-	spin_lock_init(&ring->fill_lock);
-	spin_lock_init(&ring->clean_lock);
-
-	ring->desc_info = kzalloc(sizeof(struct pasemi_desc_info) *
-				  TX_RING_SIZE, GFP_KERNEL);
-	if (!ring->desc_info)
-		return -ENOMEM;
-
-	/* Allocate descriptors */
-	ring->desc = dma_alloc_coherent(&sc->dma_pdev->dev,
-					TX_RING_SIZE *
-					2 * sizeof(u64),
-					&ring->dma, GFP_KERNEL);
-	if (!ring->desc)
-		return -ENOMEM;
-
-	memset((void *) ring->desc, 0, TX_RING_SIZE * 2 * sizeof(u64));
-
-	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_RESET(chan_index), 0x30);
-
-	ring->total_pktcnt = 0;
-
-	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_BASEL(chan_index),
-		 PAS_DMA_TXCHAN_BASEL_BRBL(ring->dma));
-
-	val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->dma >> 32);
-	val |= PAS_DMA_TXCHAN_BASEU_SIZ(TX_RING_SIZE >> 2);
-
-	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_BASEU(chan_index), val);
-
-	out_le32(sc->dma_regs + PAS_DMA_TXCHAN_CFG(chan_index),
-		 PAS_DMA_TXCHAN_CFG_TY_FUNC |
-		 PAS_DMA_TXCHAN_CFG_TATTR(chan) |
-		 PAS_DMA_TXCHAN_CFG_WT(2));
-
-	/* enable tx channel */
-	out_le32(sc->dma_regs +
-		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
-		 PAS_DMA_TXCHAN_TCMDSTA_EN);
-
-	out_le32(sc->iob_regs + PAS_IOB_DMA_TXCH_CFG(chan_index),
-		 PAS_IOB_DMA_TXCH_CFG_CNTTH(1000));
-
-	ring->next_to_fill = 0;
-	ring->next_to_clean = 0;
-
-	snprintf(ring->irq_name, sizeof(ring->irq_name),
-		 "%s%d", "crypto", chan);
-
-	ring->irq = irq_create_mapping(NULL, sc->base_irq + chan);
-	ret = request_irq(ring->irq, (irq_handler_t)
-			  pasemi_intr, IRQF_DISABLED, ring->irq_name, sc);
-	if (ret) {
-		printk(KERN_ERR DRV_NAME ": failed to hook irq %d ret %d\n",
-		       ring->irq, ret);
-		ring->irq = -1;
-		return ret;
-	}
-
-	setup_timer(&ring->crypto_timer, (void *) sweepup_tx, (unsigned long) sc);
-
-	return 0;
-}
-
-static device_method_t pasemi_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,		pasemi_newsession),
-	DEVMETHOD(cryptodev_freesession,	pasemi_freesession),
-	DEVMETHOD(cryptodev_process,		pasemi_process),
-};
-
-/* Set up the crypto device structure, private data,
- * and anything else we need before we start */
-
-static int __devinit
-pasemi_dma_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-	struct pasemi_softc *sc;
-	int ret, i;
-
-	DPRINTF(KERN_ERR "%s()\n", __FUNCTION__);
-
-	sc = kzalloc(sizeof(*sc), GFP_KERNEL);
-	if (!sc)
-		return -ENOMEM;
-
-	softc_device_init(sc, DRV_NAME, 1, pasemi_methods);
-
-	pci_set_drvdata(pdev, sc);
-
-	spin_lock_init(&sc->sc_chnlock);
-
-	sc->sc_sessions = (struct pasemi_session **)
-		kzalloc(PASEMI_INITIAL_SESSIONS *
-			sizeof(struct pasemi_session *), GFP_ATOMIC);
-	if (sc->sc_sessions == NULL) {
-		ret = -ENOMEM;
-		goto out;
-	}
-
-	sc->sc_nsessions = PASEMI_INITIAL_SESSIONS;
-	sc->sc_lastchn = 0;
-	sc->base_irq = pdev->irq + 6;
-	sc->base_chan = 6;
-	sc->sc_cid = -1;
-	sc->dma_pdev = pdev;
-
-	sc->iob_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa001, NULL);
-	if (!sc->iob_pdev) {
-		dev_err(&pdev->dev, "Can't find I/O Bridge\n");
-		ret = -ENODEV;
-		goto out;
-	}
-
-	/* This is hardcoded and ugly, but we have some firmware versions
-	 * who don't provide the register space in the device tree. Luckily
-	 * they are at well-known locations so we can just do the math here.
-	 */
-	sc->dma_regs =
-		ioremap(0xe0000000 + (sc->dma_pdev->devfn << 12), 0x2000);
-	sc->iob_regs =
-		ioremap(0xe0000000 + (sc->iob_pdev->devfn << 12), 0x2000);
-	if (!sc->dma_regs || !sc->iob_regs) {
-		dev_err(&pdev->dev, "Can't map registers\n");
-		ret = -ENODEV;
-		goto out;
-	}
-
-	dma_status = __ioremap(0xfd800000, 0x1000, 0);
-	if (!dma_status) {
-		ret = -ENODEV;
-		dev_err(&pdev->dev, "Can't map dmastatus space\n");
-		goto out;
-	}
-
-	sc->tx = (struct pasemi_fnu_txring *)
-		kzalloc(sizeof(struct pasemi_fnu_txring)
-			* 8, GFP_KERNEL);
-	if (!sc->tx) {
-		ret = -ENOMEM;
-		goto out;
-	}
-
-	/* Initialize the h/w */
-	out_le32(sc->dma_regs + PAS_DMA_COM_CFG,
-		 (in_le32(sc->dma_regs + PAS_DMA_COM_CFG) |
-		  PAS_DMA_COM_CFG_FWF));
-	out_le32(sc->dma_regs + PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
-
-	for (i = 0; i < PASEMI_FNU_CHANNELS; i++) {
-		sc->sc_num_channels++;
-		ret = pasemi_dma_setup_tx_resources(sc, i);
-		if (ret)
-			goto out;
-	}
-
-	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),
-					 CRYPTOCAP_F_HARDWARE);
-	if (sc->sc_cid < 0) {
-		printk(KERN_ERR DRV_NAME ": could not get crypto driver id\n");
-		ret = -ENXIO;
-		goto out;
-	}
-
-	/* register algorithms with the framework */
-	printk(DRV_NAME ":");
-
-	crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_ARC4, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
-
-	return 0;
-
-out:
-	pasemi_dma_remove(pdev);
-	return ret;
-}
-
-#define MAX_RETRIES 5000
-
-static void pasemi_free_tx_resources(struct pasemi_softc *sc, int chan)
-{
-	struct pasemi_fnu_txring *ring = &sc->tx[chan];
-	int chan_index = chan + sc->base_chan;
-	int retries;
-	u32 stat;
-
-	/* Stop the channel */
-	out_le32(sc->dma_regs +
-		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
-		 PAS_DMA_TXCHAN_TCMDSTA_ST);
-
-	for (retries = 0; retries < MAX_RETRIES; retries++) {
-		stat = in_le32(sc->dma_regs +
-			       PAS_DMA_TXCHAN_TCMDSTA(chan_index));
-		if (!(stat & PAS_DMA_TXCHAN_TCMDSTA_ACT))
-			break;
-		cond_resched();
-	}
-
-	if (stat & PAS_DMA_TXCHAN_TCMDSTA_ACT)
-		dev_err(&sc->dma_pdev->dev, "Failed to stop tx channel %d\n",
-			chan_index);
-
-	/* Disable the channel */
-	out_le32(sc->dma_regs +
-		 PAS_DMA_TXCHAN_TCMDSTA(chan_index),
-		 0);
-
-	if (ring->desc_info)
-		kfree((void *) ring->desc_info);
-	if (ring->desc)
-		dma_free_coherent(&sc->dma_pdev->dev,
-				  TX_RING_SIZE *
-				  2 * sizeof(u64),
-				  (void *) ring->desc, ring->dma);
-	if (ring->irq != -1)
-		free_irq(ring->irq, sc);
-
-	del_timer(&ring->crypto_timer);
-}
-
-static void __devexit pasemi_dma_remove(struct pci_dev *pdev)
-{
-	struct pasemi_softc *sc = pci_get_drvdata(pdev);
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (sc->sc_cid >= 0) {
-		crypto_unregister_all(sc->sc_cid);
-	}
-
-	if (sc->tx) {
-		for (i = 0; i < sc->sc_num_channels; i++)
-			pasemi_free_tx_resources(sc, i);
-
-		kfree(sc->tx);
-	}
-	if (sc->sc_sessions) {
-		for (i = 0; i < sc->sc_nsessions; i++)
-			kfree(sc->sc_sessions[i]);
-		kfree(sc->sc_sessions);
-	}
-	if (sc->iob_pdev)
-		pci_dev_put(sc->iob_pdev);
-	if (sc->dma_regs)
-		iounmap(sc->dma_regs);
-	if (sc->iob_regs)
-		iounmap(sc->iob_regs);
-	kfree(sc);
-}
-
-static struct pci_device_id pasemi_dma_pci_tbl[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa007) },
-};
-
-MODULE_DEVICE_TABLE(pci, pasemi_dma_pci_tbl);
-
-static struct pci_driver pasemi_dma_driver = {
-	.name		= "pasemi_dma",
-	.id_table	= pasemi_dma_pci_tbl,
-	.probe		= pasemi_dma_probe,
-	.remove		= __devexit_p(pasemi_dma_remove),
-};
-
-static void __exit pasemi_dma_cleanup_module(void)
-{
-	pci_unregister_driver(&pasemi_dma_driver);
-	__iounmap(dma_status);
-	dma_status = NULL;
-}
-
-int pasemi_dma_init_module(void)
-{
-	return pci_register_driver(&pasemi_dma_driver);
-}
-
-module_init(pasemi_dma_init_module);
-module_exit(pasemi_dma_cleanup_module);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("Egor Martovetsky egor@pasemi.com");
-MODULE_DESCRIPTION("OCF driver for PA Semi PWRficient DMA Crypto Engine");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi_fnu.h b/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi_fnu.h
deleted file mode 100644
index 1a0dcc8bbd..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/pasemi/pasemi_fnu.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Copyright (C) 2007 PA Semi, Inc
- *
- * Driver for the PA Semi PWRficient DMA Crypto Engine, soft state and
- * hardware register layouts.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#ifndef PASEMI_FNU_H
-#define PASEMI_FNU_H
-
-#include <linux/spinlock.h>
-
-#define	PASEMI_SESSION(sid)	((sid) & 0xffffffff)
-#define	PASEMI_SID(sesn)	((sesn) & 0xffffffff)
-#define	DPRINTF(a...)	if (debug) { printk(DRV_NAME ": " a); }
-
-/* Must be a power of two */
-#define RX_RING_SIZE 512
-#define TX_RING_SIZE 512
-#define TX_DESC(ring, num)	((ring)->desc[2 * (num & (TX_RING_SIZE-1))])
-#define TX_DESC_INFO(ring, num)	((ring)->desc_info[(num) & (TX_RING_SIZE-1)])
-#define MAX_DESC_SIZE 8
-#define PASEMI_INITIAL_SESSIONS 10
-#define PASEMI_FNU_CHANNELS 8
-
-/* DMA descriptor */
-struct pasemi_desc {
-	u64 quad[2*MAX_DESC_SIZE];
-	int quad_cnt;
-	int size;
-	int postop;
-};
-
-/*
- * Holds per descriptor data
- */
-struct pasemi_desc_info {
-	int			desc_size;
-	int			desc_postop;
-#define PASEMI_CHECK_SIG 0x1
-
-	struct cryptop          *cf_crp;
-};
-
-/*
- * Holds per channel data
- */
-struct pasemi_fnu_txring {
-	volatile u64		*desc;
-	volatile struct
-	pasemi_desc_info	*desc_info;
-	dma_addr_t		dma;
-	struct timer_list       crypto_timer;
-	spinlock_t		fill_lock;
-	spinlock_t		clean_lock;
-	unsigned int		next_to_fill;
-	unsigned int		next_to_clean;
-	u16			total_pktcnt;
-	int			irq;
-	int			sesn;
-	char			irq_name[10];
-};
-
-/*
- * Holds data specific to a single pasemi device.
- */
-struct pasemi_softc {
-	softc_device_decl	sc_cdev;
-	struct pci_dev		*dma_pdev;	/* device backpointer */
-	struct pci_dev		*iob_pdev;	/* device backpointer */
-	void __iomem		*dma_regs;
-	void __iomem		*iob_regs;
-	int			base_irq;
-	int			base_chan;
-	int32_t			sc_cid;		/* crypto tag */
-	int			sc_nsessions;
-	struct pasemi_session	**sc_sessions;
-	int			sc_num_channels;/* number of crypto channels */
-
-	/* pointer to the array of txring datastructures, one txring per channel */
-	struct pasemi_fnu_txring *tx;
-
-	/*
-	 * mutual exclusion for the channel scheduler
-	 */
-	spinlock_t		sc_chnlock;
-	/* last channel used, for now use round-robin to allocate channels */
-	int			sc_lastchn;
-};
-
-struct pasemi_session {
-	u64 civ[2];
-	u64 keysz;
-	u64 key[4];
-	u64 ccmd;
-	u64 hkey[4];
-	u64 hseq;
-	u64 giv[2];
-	u64 hiv[4];
-
-	int used;
-	dma_addr_t	dma_addr;
-	int chan;
-};
-
-/* status register layout in IOB region, at 0xfd800000 */
-struct pasdma_status {
-	u64 rx_sta[64];
-	u64 tx_sta[20];
-};
-
-#define ALG_IS_CIPHER(alg) ((alg == CRYPTO_DES_CBC)		|| \
-				(alg == CRYPTO_3DES_CBC)	|| \
-				(alg == CRYPTO_AES_CBC)		|| \
-				(alg == CRYPTO_ARC4)		|| \
-				(alg == CRYPTO_NULL_CBC))
-
-#define ALG_IS_SIG(alg) ((alg == CRYPTO_MD5)			|| \
-				(alg == CRYPTO_MD5_HMAC)	|| \
-				(alg == CRYPTO_SHA1)		|| \
-				(alg == CRYPTO_SHA1_HMAC)	|| \
-				(alg == CRYPTO_NULL_HMAC))
-
-enum {
-	PAS_DMA_COM_TXCMD = 0x100,	/* Transmit Command Register  */
-	PAS_DMA_COM_TXSTA = 0x104,	/* Transmit Status Register   */
-	PAS_DMA_COM_RXCMD = 0x108,	/* Receive Command Register   */
-	PAS_DMA_COM_RXSTA = 0x10c,	/* Receive Status Register    */
-	PAS_DMA_COM_CFG   = 0x114,	/* DMA Configuration Register */
-};
-
-/* All these registers live in the PCI configuration space for the DMA PCI
- * device. Use the normal PCI config access functions for them.
- */
-
-#define PAS_DMA_COM_CFG_FWF	0x18000000
-
-#define PAS_DMA_COM_TXCMD_EN	0x00000001 /* enable */
-#define PAS_DMA_COM_TXSTA_ACT	0x00000001 /* active */
-#define PAS_DMA_COM_RXCMD_EN	0x00000001 /* enable */
-#define PAS_DMA_COM_RXSTA_ACT	0x00000001 /* active */
-
-#define _PAS_DMA_TXCHAN_STRIDE	0x20    /* Size per channel		*/
-#define _PAS_DMA_TXCHAN_TCMDSTA	0x300	/* Command / Status		*/
-#define _PAS_DMA_TXCHAN_CFG	0x304	/* Configuration		*/
-#define _PAS_DMA_TXCHAN_DSCRBU	0x308	/* Descriptor BU Allocation	*/
-#define _PAS_DMA_TXCHAN_INCR	0x310	/* Descriptor increment		*/
-#define _PAS_DMA_TXCHAN_CNT	0x314	/* Descriptor count/offset	*/
-#define _PAS_DMA_TXCHAN_BASEL	0x318	/* Descriptor ring base (low)	*/
-#define _PAS_DMA_TXCHAN_BASEU	0x31c	/*			(high)	*/
-#define PAS_DMA_TXCHAN_TCMDSTA(c) (0x300+(c)*_PAS_DMA_TXCHAN_STRIDE)
-#define    PAS_DMA_TXCHAN_TCMDSTA_EN	0x00000001	/* Enabled */
-#define    PAS_DMA_TXCHAN_TCMDSTA_ST	0x00000002	/* Stop interface */
-#define    PAS_DMA_TXCHAN_TCMDSTA_ACT	0x00010000	/* Active */
-#define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
-#define    PAS_DMA_TXCHAN_CFG_TY_FUNC	0x00000002	/* Type = interface */
-#define    PAS_DMA_TXCHAN_CFG_TY_IFACE	0x00000000	/* Type = interface */
-#define    PAS_DMA_TXCHAN_CFG_TATTR_M	0x0000003c
-#define    PAS_DMA_TXCHAN_CFG_TATTR_S	2
-#define    PAS_DMA_TXCHAN_CFG_TATTR(x)	(((x) << PAS_DMA_TXCHAN_CFG_TATTR_S) & \
-					 PAS_DMA_TXCHAN_CFG_TATTR_M)
-#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000001c0
-#define    PAS_DMA_TXCHAN_CFG_WT_S	6
-#define    PAS_DMA_TXCHAN_CFG_WT(x)	(((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
-					 PAS_DMA_TXCHAN_CFG_WT_M)
-#define    PAS_DMA_TXCHAN_CFG_LPSQ_FAST	0x00000400
-#define    PAS_DMA_TXCHAN_CFG_LPDQ_FAST	0x00000800
-#define    PAS_DMA_TXCHAN_CFG_CF	0x00001000	/* Clean first line */
-#define    PAS_DMA_TXCHAN_CFG_CL	0x00002000	/* Clean last line */
-#define    PAS_DMA_TXCHAN_CFG_UP	0x00004000	/* update tx descr when sent */
-#define PAS_DMA_TXCHAN_INCR(c)    (0x310+(c)*_PAS_DMA_TXCHAN_STRIDE)
-#define PAS_DMA_TXCHAN_BASEL(c)   (0x318+(c)*_PAS_DMA_TXCHAN_STRIDE)
-#define    PAS_DMA_TXCHAN_BASEL_BRBL_M	0xffffffc0
-#define    PAS_DMA_TXCHAN_BASEL_BRBL_S	0
-#define    PAS_DMA_TXCHAN_BASEL_BRBL(x)	(((x) << PAS_DMA_TXCHAN_BASEL_BRBL_S) & \
-					 PAS_DMA_TXCHAN_BASEL_BRBL_M)
-#define PAS_DMA_TXCHAN_BASEU(c)   (0x31c+(c)*_PAS_DMA_TXCHAN_STRIDE)
-#define    PAS_DMA_TXCHAN_BASEU_BRBH_M	0x00000fff
-#define    PAS_DMA_TXCHAN_BASEU_BRBH_S	0
-#define    PAS_DMA_TXCHAN_BASEU_BRBH(x)	(((x) << PAS_DMA_TXCHAN_BASEU_BRBH_S) & \
-					 PAS_DMA_TXCHAN_BASEU_BRBH_M)
-/* # of cache lines worth of buffer ring */
-#define    PAS_DMA_TXCHAN_BASEU_SIZ_M	0x3fff0000
-#define    PAS_DMA_TXCHAN_BASEU_SIZ_S	16		/* 0 = 16K */
-#define    PAS_DMA_TXCHAN_BASEU_SIZ(x)	(((x) << PAS_DMA_TXCHAN_BASEU_SIZ_S) & \
-					 PAS_DMA_TXCHAN_BASEU_SIZ_M)
-
-#define    PAS_STATUS_PCNT_M		0x000000000000ffffull
-#define    PAS_STATUS_PCNT_S		0
-#define    PAS_STATUS_DCNT_M		0x00000000ffff0000ull
-#define    PAS_STATUS_DCNT_S		16
-#define    PAS_STATUS_BPCNT_M		0x0000ffff00000000ull
-#define    PAS_STATUS_BPCNT_S		32
-#define    PAS_STATUS_CAUSE_M		0xf000000000000000ull
-#define    PAS_STATUS_TIMER		0x1000000000000000ull
-#define    PAS_STATUS_ERROR		0x2000000000000000ull
-#define    PAS_STATUS_SOFT		0x4000000000000000ull
-#define    PAS_STATUS_INT		0x8000000000000000ull
-
-#define PAS_IOB_DMA_RXCH_CFG(i)		(0x1100 + (i)*4)
-#define    PAS_IOB_DMA_RXCH_CFG_CNTTH_M		0x00000fff
-#define    PAS_IOB_DMA_RXCH_CFG_CNTTH_S		0
-#define    PAS_IOB_DMA_RXCH_CFG_CNTTH(x)	(((x) << PAS_IOB_DMA_RXCH_CFG_CNTTH_S) & \
-						 PAS_IOB_DMA_RXCH_CFG_CNTTH_M)
-#define PAS_IOB_DMA_TXCH_CFG(i)		(0x1200 + (i)*4)
-#define    PAS_IOB_DMA_TXCH_CFG_CNTTH_M		0x00000fff
-#define    PAS_IOB_DMA_TXCH_CFG_CNTTH_S		0
-#define    PAS_IOB_DMA_TXCH_CFG_CNTTH(x)	(((x) << PAS_IOB_DMA_TXCH_CFG_CNTTH_S) & \
-						 PAS_IOB_DMA_TXCH_CFG_CNTTH_M)
-#define PAS_IOB_DMA_RXCH_STAT(i)	(0x1300 + (i)*4)
-#define    PAS_IOB_DMA_RXCH_STAT_INTGEN	0x00001000
-#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL_M	0x00000fff
-#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL_S	0
-#define    PAS_IOB_DMA_RXCH_STAT_CNTDEL(x)	(((x) << PAS_IOB_DMA_RXCH_STAT_CNTDEL_S) &\
-						 PAS_IOB_DMA_RXCH_STAT_CNTDEL_M)
-#define PAS_IOB_DMA_TXCH_STAT(i)	(0x1400 + (i)*4)
-#define    PAS_IOB_DMA_TXCH_STAT_INTGEN	0x00001000
-#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL_M	0x00000fff
-#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL_S	0
-#define    PAS_IOB_DMA_TXCH_STAT_CNTDEL(x)	(((x) << PAS_IOB_DMA_TXCH_STAT_CNTDEL_S) &\
-						 PAS_IOB_DMA_TXCH_STAT_CNTDEL_M)
-#define PAS_IOB_DMA_RXCH_RESET(i)	(0x1500 + (i)*4)
-#define    PAS_IOB_DMA_RXCH_RESET_PCNT_M	0xffff0000
-#define    PAS_IOB_DMA_RXCH_RESET_PCNT_S	16
-#define    PAS_IOB_DMA_RXCH_RESET_PCNT(x)	(((x) << PAS_IOB_DMA_RXCH_RESET_PCNT_S) & \
-						 PAS_IOB_DMA_RXCH_RESET_PCNT_M)
-#define    PAS_IOB_DMA_RXCH_RESET_PCNTRST	0x00000020
-#define    PAS_IOB_DMA_RXCH_RESET_DCNTRST	0x00000010
-#define    PAS_IOB_DMA_RXCH_RESET_TINTC		0x00000008
-#define    PAS_IOB_DMA_RXCH_RESET_DINTC		0x00000004
-#define    PAS_IOB_DMA_RXCH_RESET_SINTC		0x00000002
-#define    PAS_IOB_DMA_RXCH_RESET_PINTC		0x00000001
-#define PAS_IOB_DMA_TXCH_RESET(i)	(0x1600 + (i)*4)
-#define    PAS_IOB_DMA_TXCH_RESET_PCNT_M	0xffff0000
-#define    PAS_IOB_DMA_TXCH_RESET_PCNT_S	16
-#define    PAS_IOB_DMA_TXCH_RESET_PCNT(x)	(((x) << PAS_IOB_DMA_TXCH_RESET_PCNT_S) & \
-						 PAS_IOB_DMA_TXCH_RESET_PCNT_M)
-#define    PAS_IOB_DMA_TXCH_RESET_PCNTRST	0x00000020
-#define    PAS_IOB_DMA_TXCH_RESET_DCNTRST	0x00000010
-#define    PAS_IOB_DMA_TXCH_RESET_TINTC		0x00000008
-#define    PAS_IOB_DMA_TXCH_RESET_DINTC		0x00000004
-#define    PAS_IOB_DMA_TXCH_RESET_SINTC		0x00000002
-#define    PAS_IOB_DMA_TXCH_RESET_PINTC		0x00000001
-
-#define PAS_IOB_DMA_COM_TIMEOUTCFG		0x1700
-#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_M	0x00ffffff
-#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_S	0
-#define    PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(x)	(((x) << PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_S) & \
-						 PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT_M)
-
-/* Transmit descriptor fields */
-#define	XCT_MACTX_T		0x8000000000000000ull
-#define	XCT_MACTX_ST		0x4000000000000000ull
-#define XCT_MACTX_NORES		0x0000000000000000ull
-#define XCT_MACTX_8BRES		0x1000000000000000ull
-#define XCT_MACTX_24BRES	0x2000000000000000ull
-#define XCT_MACTX_40BRES	0x3000000000000000ull
-#define XCT_MACTX_I		0x0800000000000000ull
-#define XCT_MACTX_O		0x0400000000000000ull
-#define XCT_MACTX_E		0x0200000000000000ull
-#define XCT_MACTX_VLAN_M	0x0180000000000000ull
-#define XCT_MACTX_VLAN_NOP	0x0000000000000000ull
-#define XCT_MACTX_VLAN_REMOVE	0x0080000000000000ull
-#define XCT_MACTX_VLAN_INSERT   0x0100000000000000ull
-#define XCT_MACTX_VLAN_REPLACE  0x0180000000000000ull
-#define XCT_MACTX_CRC_M		0x0060000000000000ull
-#define XCT_MACTX_CRC_NOP	0x0000000000000000ull
-#define XCT_MACTX_CRC_INSERT	0x0020000000000000ull
-#define XCT_MACTX_CRC_PAD	0x0040000000000000ull
-#define XCT_MACTX_CRC_REPLACE	0x0060000000000000ull
-#define XCT_MACTX_SS		0x0010000000000000ull
-#define XCT_MACTX_LLEN_M	0x00007fff00000000ull
-#define XCT_MACTX_LLEN_S	32ull
-#define XCT_MACTX_LLEN(x)	((((long)(x)) << XCT_MACTX_LLEN_S) & \
-				 XCT_MACTX_LLEN_M)
-#define XCT_MACTX_IPH_M		0x00000000f8000000ull
-#define XCT_MACTX_IPH_S		27ull
-#define XCT_MACTX_IPH(x)	((((long)(x)) << XCT_MACTX_IPH_S) & \
-				 XCT_MACTX_IPH_M)
-#define XCT_MACTX_IPO_M		0x0000000007c00000ull
-#define XCT_MACTX_IPO_S		22ull
-#define XCT_MACTX_IPO(x)	((((long)(x)) << XCT_MACTX_IPO_S) & \
-				 XCT_MACTX_IPO_M)
-#define XCT_MACTX_CSUM_M	0x0000000000000060ull
-#define XCT_MACTX_CSUM_NOP	0x0000000000000000ull
-#define XCT_MACTX_CSUM_TCP	0x0000000000000040ull
-#define XCT_MACTX_CSUM_UDP	0x0000000000000060ull
-#define XCT_MACTX_V6		0x0000000000000010ull
-#define XCT_MACTX_C		0x0000000000000004ull
-#define XCT_MACTX_AL2		0x0000000000000002ull
-
-#define XCT_PTR_T		0x8000000000000000ull
-#define XCT_PTR_LEN_M		0x7ffff00000000000ull
-#define XCT_PTR_LEN_S		44
-#define XCT_PTR_LEN(x)		((((long)(x)) << XCT_PTR_LEN_S) & \
-				 XCT_PTR_LEN_M)
-#define XCT_PTR_ADDR_M		0x00000fffffffffffull
-#define XCT_PTR_ADDR_S		0
-#define XCT_PTR_ADDR(x)		((((long)(x)) << XCT_PTR_ADDR_S) & \
-				 XCT_PTR_ADDR_M)
-
-/* Function descriptor fields */
-#define	XCT_FUN_T		0x8000000000000000ull
-#define	XCT_FUN_ST		0x4000000000000000ull
-#define XCT_FUN_NORES		0x0000000000000000ull
-#define XCT_FUN_8BRES		0x1000000000000000ull
-#define XCT_FUN_24BRES		0x2000000000000000ull
-#define XCT_FUN_40BRES		0x3000000000000000ull
-#define XCT_FUN_I		0x0800000000000000ull
-#define XCT_FUN_O		0x0400000000000000ull
-#define XCT_FUN_E		0x0200000000000000ull
-#define XCT_FUN_FUN_S		54
-#define XCT_FUN_FUN_M		0x01c0000000000000ull
-#define XCT_FUN_FUN(num)	((((long)(num)) << XCT_FUN_FUN_S) & \
-				XCT_FUN_FUN_M)
-#define XCT_FUN_CRM_NOP		0x0000000000000000ull
-#define XCT_FUN_CRM_SIG		0x0008000000000000ull
-#define XCT_FUN_CRM_ENC		0x0010000000000000ull
-#define XCT_FUN_CRM_DEC		0x0018000000000000ull
-#define XCT_FUN_CRM_SIG_ENC	0x0020000000000000ull
-#define XCT_FUN_CRM_ENC_SIG	0x0028000000000000ull
-#define XCT_FUN_CRM_SIG_DEC	0x0030000000000000ull
-#define XCT_FUN_CRM_DEC_SIG	0x0038000000000000ull
-#define XCT_FUN_LLEN_M		0x0007ffff00000000ull
-#define XCT_FUN_LLEN_S		32ULL
-#define XCT_FUN_LLEN(x)		((((long)(x)) << XCT_FUN_LLEN_S) & \
-				 XCT_FUN_LLEN_M)
-#define XCT_FUN_SHL_M		0x00000000f8000000ull
-#define XCT_FUN_SHL_S		27ull
-#define XCT_FUN_SHL(x)		((((long)(x)) << XCT_FUN_SHL_S) & \
-				 XCT_FUN_SHL_M)
-#define XCT_FUN_CHL_M		0x0000000007c00000ull
-#define XCT_FUN_CHL_S		22ull
-#define XCT_FUN_CHL(x)		((((long)(x)) << XCT_FUN_CHL_S) & \
-				 XCT_FUN_CHL_M)
-#define XCT_FUN_HSZ_M		0x00000000003c0000ull
-#define XCT_FUN_HSZ_S		18ull
-#define XCT_FUN_HSZ(x)		((((long)(x)) << XCT_FUN_HSZ_S) & \
-				 XCT_FUN_HSZ_M)
-#define XCT_FUN_ALG_DES		0x0000000000000000ull
-#define XCT_FUN_ALG_3DES	0x0000000000008000ull
-#define XCT_FUN_ALG_AES		0x0000000000010000ull
-#define XCT_FUN_ALG_ARC		0x0000000000018000ull
-#define XCT_FUN_ALG_KASUMI	0x0000000000020000ull
-#define XCT_FUN_BCM_ECB		0x0000000000000000ull
-#define XCT_FUN_BCM_CBC		0x0000000000001000ull
-#define XCT_FUN_BCM_CFB		0x0000000000002000ull
-#define XCT_FUN_BCM_OFB		0x0000000000003000ull
-#define XCT_FUN_BCM_CNT		0x0000000000003800ull
-#define XCT_FUN_BCM_KAS_F8	0x0000000000002800ull
-#define XCT_FUN_BCM_KAS_F9	0x0000000000001800ull
-#define XCT_FUN_BCP_NO_PAD	0x0000000000000000ull
-#define XCT_FUN_BCP_ZRO		0x0000000000000200ull
-#define XCT_FUN_BCP_PL		0x0000000000000400ull
-#define XCT_FUN_BCP_INCR	0x0000000000000600ull
-#define XCT_FUN_SIG_MD5		(0ull << 4)
-#define XCT_FUN_SIG_SHA1	(2ull << 4)
-#define XCT_FUN_SIG_HMAC_MD5	(8ull << 4)
-#define XCT_FUN_SIG_HMAC_SHA1	(10ull << 4)
-#define XCT_FUN_A		0x0000000000000008ull
-#define XCT_FUN_C		0x0000000000000004ull
-#define XCT_FUN_AL2		0x0000000000000002ull
-#define XCT_FUN_SE		0x0000000000000001ull
-
-#define XCT_FUN_SRC_PTR(len, addr)	(XCT_PTR_LEN(len) | XCT_PTR_ADDR(addr))
-#define XCT_FUN_DST_PTR(len, addr)	(XCT_FUN_SRC_PTR(len, addr) | \
-					0x8000000000000000ull)
-
-#define XCT_CTRL_HDR_FUN_NUM_M		0x01c0000000000000ull
-#define XCT_CTRL_HDR_FUN_NUM_S		54
-#define XCT_CTRL_HDR_LEN_M		0x0007ffff00000000ull
-#define XCT_CTRL_HDR_LEN_S		32
-#define XCT_CTRL_HDR_REG_M		0x00000000000000ffull
-#define XCT_CTRL_HDR_REG_S		0
-
-#define XCT_CTRL_HDR(funcN,len,reg)	(0x9400000000000000ull | \
-			((((long)(funcN)) << XCT_CTRL_HDR_FUN_NUM_S) \
-			& XCT_CTRL_HDR_FUN_NUM_M) | \
-			((((long)(len)) << \
-			XCT_CTRL_HDR_LEN_S) & XCT_CTRL_HDR_LEN_M) | \
-			((((long)(reg)) << \
-			XCT_CTRL_HDR_REG_S) & XCT_CTRL_HDR_REG_M))
-
-/* Function config command options */
-#define	DMA_CALGO_DES			0x00
-#define	DMA_CALGO_3DES			0x01
-#define	DMA_CALGO_AES			0x02
-#define	DMA_CALGO_ARC			0x03
-
-#define DMA_FN_CIV0			0x02
-#define DMA_FN_CIV1			0x03
-#define DMA_FN_HKEY0			0x0a
-
-#define XCT_PTR_ADDR_LEN(ptr)		((ptr) & XCT_PTR_ADDR_M), \
-			(((ptr) & XCT_PTR_LEN_M) >> XCT_PTR_LEN_S)
-
-#endif /* PASEMI_FNU_H */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/random.c b/target/linux/generic-2.6/files/crypto/ocf/random.c
deleted file mode 100644
index 38dad13d77..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/random.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * A system independant way of adding entropy to the kernels pool
- * this way the drivers can focus on the real work and we can take
- * care of pushing it to the appropriate place in the kernel.
- *
- * This should be fast and callable from timers/interrupts
- *
- * Written by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/version.h>
-#include <linux/unistd.h>
-#include <linux/poll.h>
-#include <linux/random.h>
-#include <cryptodev.h>
-
-#ifdef CONFIG_OCF_FIPS
-#include "rndtest.h"
-#endif
-
-#ifndef HAS_RANDOM_INPUT_WAIT
-#error "Please do not enable OCF_RANDOMHARVEST unless you have applied patches"
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-#include <linux/sched.h>
-#define	kill_proc(p,s,v)	send_sig(s,find_task_by_vpid(p),0)
-#endif
-
-/*
- * a hack to access the debug levels from the crypto driver
- */
-extern int crypto_debug;
-#define debug crypto_debug
-
-/*
- * a list of all registered random providers
- */
-static LIST_HEAD(random_ops);
-static int started = 0;
-static int initted = 0;
-
-struct random_op {
-	struct list_head random_list;
-	u_int32_t driverid;
-	int (*read_random)(void *arg, u_int32_t *buf, int len);
-	void *arg;
-};
-
-static int random_proc(void *arg);
-
-static pid_t		randomproc = (pid_t) -1;
-static spinlock_t	random_lock;
-
-/*
- * just init the spin locks
- */
-static int
-crypto_random_init(void)
-{
-	spin_lock_init(&random_lock);
-	initted = 1;
-	return(0);
-}
-
-/*
- * Add the given random reader to our list (if not present)
- * and start the thread (if not already started)
- *
- * we have to assume that driver id is ok for now
- */
-int
-crypto_rregister(
-	u_int32_t driverid,
-	int (*read_random)(void *arg, u_int32_t *buf, int len),
-	void *arg)
-{
-	unsigned long flags;
-	int ret = 0;
-	struct random_op	*rops, *tmp;
-
-	dprintk("%s,%d: %s(0x%x, %p, %p)\n", __FILE__, __LINE__,
-			__FUNCTION__, driverid, read_random, arg);
-
-	if (!initted)
-		crypto_random_init();
-
-#if 0
-	struct cryptocap	*cap;
-
-	cap = crypto_checkdriver(driverid);
-	if (!cap)
-		return EINVAL;
-#endif
-
-	list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
-		if (rops->driverid == driverid && rops->read_random == read_random)
-			return EEXIST;
-	}
-
-	rops = (struct random_op *) kmalloc(sizeof(*rops), GFP_KERNEL);
-	if (!rops)
-		return ENOMEM;
-
-	rops->driverid    = driverid;
-	rops->read_random = read_random;
-	rops->arg = arg;
-
-	spin_lock_irqsave(&random_lock, flags);
-	list_add_tail(&rops->random_list, &random_ops);
-	if (!started) {
-		randomproc = kernel_thread(random_proc, NULL, CLONE_FS|CLONE_FILES);
-		if (randomproc < 0) {
-			ret = randomproc;
-			printk("crypto: crypto_rregister cannot start random thread; "
-					"error %d", ret);
-		} else
-			started = 1;
-	}
-	spin_unlock_irqrestore(&random_lock, flags);
-
-	return ret;
-}
-EXPORT_SYMBOL(crypto_rregister);
-
-int
-crypto_runregister_all(u_int32_t driverid)
-{
-	struct random_op *rops, *tmp;
-	unsigned long flags;
-
-	dprintk("%s,%d: %s(0x%x)\n", __FILE__, __LINE__, __FUNCTION__, driverid);
-
-	list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
-		if (rops->driverid == driverid) {
-			list_del(&rops->random_list);
-			kfree(rops);
-		}
-	}
-
-	spin_lock_irqsave(&random_lock, flags);
-	if (list_empty(&random_ops) && started)
-		kill_proc(randomproc, SIGKILL, 1);
-	spin_unlock_irqrestore(&random_lock, flags);
-	return(0);
-}
-EXPORT_SYMBOL(crypto_runregister_all);
-
-/*
- * while we can add entropy to random.c continue to read random data from
- * the drivers and push it to random.
- */
-static int
-random_proc(void *arg)
-{
-	int n;
-	int wantcnt;
-	int bufcnt = 0;
-	int retval = 0;
-	int *buf = NULL;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-	daemonize();
-	spin_lock_irq(&current->sigmask_lock);
-	sigemptyset(&current->blocked);
-	recalc_sigpending(current);
-	spin_unlock_irq(&current->sigmask_lock);
-	sprintf(current->comm, "ocf-random");
-#else
-	daemonize("ocf-random");
-	allow_signal(SIGKILL);
-#endif
-
-	(void) get_fs();
-	set_fs(get_ds());
-
-#ifdef CONFIG_OCF_FIPS
-#define NUM_INT (RNDTEST_NBYTES/sizeof(int))
-#else
-#define NUM_INT 32
-#endif
-
-	/*
-	 * some devices can transferr their RNG data direct into memory,
-	 * so make sure it is device friendly
-	 */
-	buf = kmalloc(NUM_INT * sizeof(int), GFP_DMA);
-	if (NULL == buf) {
-		printk("crypto: RNG could not allocate memory\n");
-		retval = -ENOMEM;
-		goto bad_alloc;
-	}
-
-	wantcnt = NUM_INT;   /* start by adding some entropy */
-
-	/*
-	 * its possible due to errors or driver removal that we no longer
-	 * have anything to do,  if so exit or we will consume all the CPU
-	 * doing nothing
-	 */
-	while (!list_empty(&random_ops)) {
-		struct random_op	*rops, *tmp;
-
-#ifdef CONFIG_OCF_FIPS
-		if (wantcnt)
-			wantcnt = NUM_INT; /* FIPs mode can do 20000 bits or none */
-#endif
-
-		/* see if we can get enough entropy to make the world
-		 * a better place.
-		 */
-		while (bufcnt < wantcnt && bufcnt < NUM_INT) {
-			list_for_each_entry_safe(rops, tmp, &random_ops, random_list) {
-
-				n = (*rops->read_random)(rops->arg, &buf[bufcnt],
-							 NUM_INT - bufcnt);
-
-				/* on failure remove the random number generator */
-				if (n == -1) {
-					list_del(&rops->random_list);
-					printk("crypto: RNG (driverid=0x%x) failed, disabling\n",
-							rops->driverid);
-					kfree(rops);
-				} else if (n > 0)
-					bufcnt += n;
-			}
-			/* give up CPU for a bit, just in case as this is a loop */
-			schedule();
-		}
-
-
-#ifdef CONFIG_OCF_FIPS
-		if (bufcnt > 0 && rndtest_buf((unsigned char *) &buf[0])) {
-			dprintk("crypto: buffer had fips errors, discarding\n");
-			bufcnt = 0;
-		}
-#endif
-
-		/*
-		 * if we have a certified buffer,  we can send some data
-		 * to /dev/random and move along
-		 */
-		if (bufcnt > 0) {
-			/* add what we have */
-			random_input_words(buf, bufcnt, bufcnt*sizeof(int)*8);
-			bufcnt = 0;
-		}
-
-		/* give up CPU for a bit so we don't hog while filling */
-		schedule();
-
-		/* wait for needing more */
-		wantcnt = random_input_wait();
-
-		if (wantcnt <= 0)
-			wantcnt = 0; /* try to get some info again */
-		else
-		 	/* round up to one word or we can loop forever */
-			wantcnt = (wantcnt + (sizeof(int)*8)) / (sizeof(int)*8);
-		if (wantcnt > NUM_INT) {
-			wantcnt = NUM_INT;
-		}
-
-		if (signal_pending(current)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-			spin_lock_irq(&current->sigmask_lock);
-#endif
-			flush_signals(current);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-			spin_unlock_irq(&current->sigmask_lock);
-#endif
-		}
-	}
-	
-	kfree(buf);
-
-bad_alloc:
-	spin_lock_irq(&random_lock);
-	randomproc = (pid_t) -1;
-	started = 0;
-	spin_unlock_irq(&random_lock);
-
-	return retval;
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/rndtest.c b/target/linux/generic-2.6/files/crypto/ocf/rndtest.c
deleted file mode 100644
index b31e1a666d..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/rndtest.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*	$OpenBSD$	*/
-
-/*
- * OCF/Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- * The license and original author are listed below.
- *
- * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jason L. Wright
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/list.h>
-#include <linux/wait.h>
-#include <linux/time.h>
-#include <linux/version.h>
-#include <linux/unistd.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/time.h>
-#include <cryptodev.h>
-#include "rndtest.h"
-
-static struct rndtest_stats rndstats;
-
-static	void rndtest_test(struct rndtest_state *);
-
-/* The tests themselves */
-static	int rndtest_monobit(struct rndtest_state *);
-static	int rndtest_runs(struct rndtest_state *);
-static	int rndtest_longruns(struct rndtest_state *);
-static	int rndtest_chi_4(struct rndtest_state *);
-
-static	int rndtest_runs_check(struct rndtest_state *, int, int *);
-static	void rndtest_runs_record(struct rndtest_state *, int, int *);
-
-static const struct rndtest_testfunc {
-	int (*test)(struct rndtest_state *);
-} rndtest_funcs[] = {
-	{ rndtest_monobit },
-	{ rndtest_runs },
-	{ rndtest_chi_4 },
-	{ rndtest_longruns },
-};
-
-#define	RNDTEST_NTESTS	(sizeof(rndtest_funcs)/sizeof(rndtest_funcs[0]))
-
-static void
-rndtest_test(struct rndtest_state *rsp)
-{
-	int i, rv = 0;
-
-	rndstats.rst_tests++;
-	for (i = 0; i < RNDTEST_NTESTS; i++)
-		rv |= (*rndtest_funcs[i].test)(rsp);
-	rsp->rs_discard = (rv != 0);
-}
-
-
-extern int crypto_debug;
-#define rndtest_verbose 2
-#define rndtest_report(rsp, failure, fmt, a...) \
-	{ if (failure || crypto_debug) { printk("rng_test: " fmt "\n", a); } else; }
-
-#define	RNDTEST_MONOBIT_MINONES	9725
-#define	RNDTEST_MONOBIT_MAXONES	10275
-
-static int
-rndtest_monobit(struct rndtest_state *rsp)
-{
-	int i, ones = 0, j;
-	u_int8_t r;
-
-	for (i = 0; i < RNDTEST_NBYTES; i++) {
-		r = rsp->rs_buf[i];
-		for (j = 0; j < 8; j++, r <<= 1)
-			if (r & 0x80)
-				ones++;
-	}
-	if (ones > RNDTEST_MONOBIT_MINONES &&
-	    ones < RNDTEST_MONOBIT_MAXONES) {
-		if (rndtest_verbose > 1)
-			rndtest_report(rsp, 0, "monobit pass (%d < %d < %d)",
-			    RNDTEST_MONOBIT_MINONES, ones,
-			    RNDTEST_MONOBIT_MAXONES);
-		return (0);
-	} else {
-		if (rndtest_verbose)
-			rndtest_report(rsp, 1,
-			    "monobit failed (%d ones)", ones);
-		rndstats.rst_monobit++;
-		return (-1);
-	}
-}
-
-#define	RNDTEST_RUNS_NINTERVAL	6
-
-static const struct rndtest_runs_tabs {
-	u_int16_t min, max;
-} rndtest_runs_tab[] = {
-	{ 2343, 2657 },
-	{ 1135, 1365 },
-	{ 542, 708 },
-	{ 251, 373 },
-	{ 111, 201 },
-	{ 111, 201 },
-};
-
-static int
-rndtest_runs(struct rndtest_state *rsp)
-{
-	int i, j, ones, zeros, rv = 0;
-	int onei[RNDTEST_RUNS_NINTERVAL], zeroi[RNDTEST_RUNS_NINTERVAL];
-	u_int8_t c;
-
-	bzero(onei, sizeof(onei));
-	bzero(zeroi, sizeof(zeroi));
-	ones = zeros = 0;
-	for (i = 0; i < RNDTEST_NBYTES; i++) {
-		c = rsp->rs_buf[i];
-		for (j = 0; j < 8; j++, c <<= 1) {
-			if (c & 0x80) {
-				ones++;
-				rndtest_runs_record(rsp, zeros, zeroi);
-				zeros = 0;
-			} else {
-				zeros++;
-				rndtest_runs_record(rsp, ones, onei);
-				ones = 0;
-			}
-		}
-	}
-	rndtest_runs_record(rsp, ones, onei);
-	rndtest_runs_record(rsp, zeros, zeroi);
-
-	rv |= rndtest_runs_check(rsp, 0, zeroi);
-	rv |= rndtest_runs_check(rsp, 1, onei);
-
-	if (rv)
-		rndstats.rst_runs++;
-
-	return (rv);
-}
-
-static void
-rndtest_runs_record(struct rndtest_state *rsp, int len, int *intrv)
-{
-	if (len == 0)
-		return;
-	if (len > RNDTEST_RUNS_NINTERVAL)
-		len = RNDTEST_RUNS_NINTERVAL;
-	len -= 1;
-	intrv[len]++;
-}
-
-static int
-rndtest_runs_check(struct rndtest_state *rsp, int val, int *src)
-{
-	int i, rv = 0;
-
-	for (i = 0; i < RNDTEST_RUNS_NINTERVAL; i++) {
-		if (src[i] < rndtest_runs_tab[i].min ||
-		    src[i] > rndtest_runs_tab[i].max) {
-			rndtest_report(rsp, 1,
-			    "%s interval %d failed (%d, %d-%d)",
-			    val ? "ones" : "zeros",
-			    i + 1, src[i], rndtest_runs_tab[i].min,
-			    rndtest_runs_tab[i].max);
-			rv = -1;
-		} else {
-			rndtest_report(rsp, 0,
-			    "runs pass %s interval %d (%d < %d < %d)",
-			    val ? "ones" : "zeros",
-			    i + 1, rndtest_runs_tab[i].min, src[i],
-			    rndtest_runs_tab[i].max);
-		}
-	}
-	return (rv);
-}
-
-static int
-rndtest_longruns(struct rndtest_state *rsp)
-{
-	int i, j, ones = 0, zeros = 0, maxones = 0, maxzeros = 0;
-	u_int8_t c;
-
-	for (i = 0; i < RNDTEST_NBYTES; i++) {
-		c = rsp->rs_buf[i];
-		for (j = 0; j < 8; j++, c <<= 1) {
-			if (c & 0x80) {
-				zeros = 0;
-				ones++;
-				if (ones > maxones)
-					maxones = ones;
-			} else {
-				ones = 0;
-				zeros++;
-				if (zeros > maxzeros)
-					maxzeros = zeros;
-			}
-		}
-	}
-
-	if (maxones < 26 && maxzeros < 26) {
-		rndtest_report(rsp, 0, "longruns pass (%d ones, %d zeros)",
-			maxones, maxzeros);
-		return (0);
-	} else {
-		rndtest_report(rsp, 1, "longruns fail (%d ones, %d zeros)",
-			maxones, maxzeros);
-		rndstats.rst_longruns++;
-		return (-1);
-	}
-}
-
-/*
- * chi^2 test over 4 bits: (this is called the poker test in FIPS 140-2,
- * but it is really the chi^2 test over 4 bits (the poker test as described
- * by Knuth vol 2 is something different, and I take him as authoritative
- * on nomenclature over NIST).
- */
-#define	RNDTEST_CHI4_K	16
-#define	RNDTEST_CHI4_K_MASK	(RNDTEST_CHI4_K - 1)
-
-/*
- * The unnormalized values are used so that we don't have to worry about
- * fractional precision.  The "real" value is found by:
- *	(V - 1562500) * (16 / 5000) = Vn   (where V is the unnormalized value)
- */
-#define	RNDTEST_CHI4_VMIN	1563181		/* 2.1792 */
-#define	RNDTEST_CHI4_VMAX	1576929		/* 46.1728 */
-
-static int
-rndtest_chi_4(struct rndtest_state *rsp)
-{
-	unsigned int freq[RNDTEST_CHI4_K], i, sum;
-
-	for (i = 0; i < RNDTEST_CHI4_K; i++)
-		freq[i] = 0;
-
-	/* Get number of occurances of each 4 bit pattern */
-	for (i = 0; i < RNDTEST_NBYTES; i++) {
-		freq[(rsp->rs_buf[i] >> 4) & RNDTEST_CHI4_K_MASK]++;
-		freq[(rsp->rs_buf[i] >> 0) & RNDTEST_CHI4_K_MASK]++;
-	}
-
-	for (i = 0, sum = 0; i < RNDTEST_CHI4_K; i++)
-		sum += freq[i] * freq[i];
-
-	if (sum >= 1563181 && sum <= 1576929) {
-		rndtest_report(rsp, 0, "chi^2(4): pass (sum %u)", sum);
-		return (0);
-	} else {
-		rndtest_report(rsp, 1, "chi^2(4): failed (sum %u)", sum);
-		rndstats.rst_chi++;
-		return (-1);
-	}
-}
-
-int
-rndtest_buf(unsigned char *buf)
-{
-	struct rndtest_state rsp;
-
-	memset(&rsp, 0, sizeof(rsp));
-	rsp.rs_buf = buf;
-	rndtest_test(&rsp);
-	return(rsp.rs_discard);
-}
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/rndtest.h b/target/linux/generic-2.6/files/crypto/ocf/rndtest.h
deleted file mode 100644
index e9d8ec8d39..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/rndtest.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$FreeBSD: src/sys/dev/rndtest/rndtest.h,v 1.1 2003/03/11 22:54:44 sam Exp $	*/
-/*	$OpenBSD$	*/
-
-/*
- * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jason L. Wright
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-/* Some of the tests depend on these values */
-#define	RNDTEST_NBYTES	2500
-#define	RNDTEST_NBITS	(8 * RNDTEST_NBYTES)
-
-struct rndtest_state {
-	int		rs_discard;	/* discard/accept random data */
-	u_int8_t	*rs_buf;
-};
-
-struct rndtest_stats {
-	u_int32_t	rst_discard;	/* number of bytes discarded */
-	u_int32_t	rst_tests;	/* number of test runs */
-	u_int32_t	rst_monobit;	/* monobit test failures */
-	u_int32_t	rst_runs;	/* 0/1 runs failures */
-	u_int32_t	rst_longruns;	/* longruns failures */
-	u_int32_t	rst_chi;	/* chi^2 failures */
-};
-
-extern int rndtest_buf(unsigned char *buf);
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/Makefile b/target/linux/generic-2.6/files/crypto/ocf/safe/Makefile
deleted file mode 100644
index 9a36b081e5..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_SAFE) += safe.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/md5.c b/target/linux/generic-2.6/files/crypto/ocf/safe/md5.c
deleted file mode 100644
index 077c42e787..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/md5.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*	$KAME: md5.c,v 1.5 2000/11/08 06:13:08 itojun Exp $	*/
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/md5.c,v 1.9 2004/01/27 19:49:19 des Exp $");
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <sys/systm.h>
-#include <crypto/md5.h>
-#endif
-
-#define SHIFT(X, s) (((X) << (s)) | ((X) >> (32 - (s))))
-
-#define F(X, Y, Z) (((X) & (Y)) | ((~X) & (Z)))
-#define G(X, Y, Z) (((X) & (Z)) | ((Y) & (~Z)))
-#define H(X, Y, Z) ((X) ^ (Y) ^ (Z))
-#define I(X, Y, Z) ((Y) ^ ((X) | (~Z)))
-
-#define ROUND1(a, b, c, d, k, s, i) { \
-	(a) = (a) + F((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-}
-
-#define ROUND2(a, b, c, d, k, s, i) { \
-	(a) = (a) + G((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-}
-
-#define ROUND3(a, b, c, d, k, s, i) { \
-	(a) = (a) + H((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-}
-
-#define ROUND4(a, b, c, d, k, s, i) { \
-	(a) = (a) + I((b), (c), (d)) + X[(k)] + T[(i)]; \
-	(a) = SHIFT((a), (s)); \
-	(a) = (b) + (a); \
-}
-
-#define Sa	 7
-#define Sb	12
-#define Sc	17
-#define Sd	22
-
-#define Se	 5
-#define Sf	 9
-#define Sg	14
-#define Sh	20
-
-#define Si	 4
-#define Sj	11
-#define Sk	16
-#define Sl	23
-
-#define Sm	 6
-#define Sn	10
-#define So	15
-#define Sp	21
-
-#define MD5_A0	0x67452301
-#define MD5_B0	0xefcdab89
-#define MD5_C0	0x98badcfe
-#define MD5_D0	0x10325476
-
-/* Integer part of 4294967296 times abs(sin(i)), where i is in radians. */
-static const u_int32_t T[65] = {
-	0,
-	0xd76aa478, 	0xe8c7b756,	0x242070db,	0xc1bdceee,
-	0xf57c0faf,	0x4787c62a, 	0xa8304613,	0xfd469501,
-	0x698098d8,	0x8b44f7af,	0xffff5bb1,	0x895cd7be,
-	0x6b901122, 	0xfd987193, 	0xa679438e,	0x49b40821,
-
-	0xf61e2562,	0xc040b340, 	0x265e5a51, 	0xe9b6c7aa,
-	0xd62f105d,	0x2441453,	0xd8a1e681,	0xe7d3fbc8,
-	0x21e1cde6,	0xc33707d6, 	0xf4d50d87, 	0x455a14ed,
-	0xa9e3e905,	0xfcefa3f8, 	0x676f02d9, 	0x8d2a4c8a,
-
-	0xfffa3942,	0x8771f681, 	0x6d9d6122, 	0xfde5380c,
-	0xa4beea44, 	0x4bdecfa9, 	0xf6bb4b60, 	0xbebfbc70,
-	0x289b7ec6, 	0xeaa127fa, 	0xd4ef3085,	0x4881d05,
-	0xd9d4d039, 	0xe6db99e5, 	0x1fa27cf8, 	0xc4ac5665,
-
-	0xf4292244, 	0x432aff97, 	0xab9423a7, 	0xfc93a039,
-	0x655b59c3, 	0x8f0ccc92, 	0xffeff47d, 	0x85845dd1,
-	0x6fa87e4f, 	0xfe2ce6e0, 	0xa3014314, 	0x4e0811a1,
-	0xf7537e82, 	0xbd3af235, 	0x2ad7d2bb, 	0xeb86d391,
-};
-
-static const u_int8_t md5_paddat[MD5_BUFLEN] = {
-	0x80,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,
-	0,	0,	0,	0,	0,	0,	0,	0,	
-};
-
-static void md5_calc(u_int8_t *, md5_ctxt *);
-
-void md5_init(ctxt)
-	md5_ctxt *ctxt;
-{
-	ctxt->md5_n = 0;
-	ctxt->md5_i = 0;
-	ctxt->md5_sta = MD5_A0;
-	ctxt->md5_stb = MD5_B0;
-	ctxt->md5_stc = MD5_C0;
-	ctxt->md5_std = MD5_D0;
-	bzero(ctxt->md5_buf, sizeof(ctxt->md5_buf));
-}
-
-void md5_loop(ctxt, input, len)
-	md5_ctxt *ctxt;
-	u_int8_t *input;
-	u_int len; /* number of bytes */
-{
-	u_int gap, i;
-
-	ctxt->md5_n += len * 8; /* byte to bit */
-	gap = MD5_BUFLEN - ctxt->md5_i;
-
-	if (len >= gap) {
-		bcopy((void *)input, (void *)(ctxt->md5_buf + ctxt->md5_i),
-			gap);
-		md5_calc(ctxt->md5_buf, ctxt);
-
-		for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN) {
-			md5_calc((u_int8_t *)(input + i), ctxt);
-		}
-		
-		ctxt->md5_i = len - i;
-		bcopy((void *)(input + i), (void *)ctxt->md5_buf, ctxt->md5_i);
-	} else {
-		bcopy((void *)input, (void *)(ctxt->md5_buf + ctxt->md5_i),
-			len);
-		ctxt->md5_i += len;
-	}
-}
-
-void md5_pad(ctxt)
-	md5_ctxt *ctxt;
-{
-	u_int gap;
-
-	/* Don't count up padding. Keep md5_n. */	
-	gap = MD5_BUFLEN - ctxt->md5_i;
-	if (gap > 8) {
-		bcopy(md5_paddat,
-		      (void *)(ctxt->md5_buf + ctxt->md5_i),
-		      gap - sizeof(ctxt->md5_n));
-	} else {
-		/* including gap == 8 */
-		bcopy(md5_paddat, (void *)(ctxt->md5_buf + ctxt->md5_i),
-			gap);
-		md5_calc(ctxt->md5_buf, ctxt);
-		bcopy((md5_paddat + gap),
-		      (void *)ctxt->md5_buf,
-		      MD5_BUFLEN - sizeof(ctxt->md5_n));
-	}
-
-	/* 8 byte word */	
-#if BYTE_ORDER == LITTLE_ENDIAN
-	bcopy(&ctxt->md5_n8[0], &ctxt->md5_buf[56], 8);
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	ctxt->md5_buf[56] = ctxt->md5_n8[7];
-	ctxt->md5_buf[57] = ctxt->md5_n8[6];
-	ctxt->md5_buf[58] = ctxt->md5_n8[5];
-	ctxt->md5_buf[59] = ctxt->md5_n8[4];
-	ctxt->md5_buf[60] = ctxt->md5_n8[3];
-	ctxt->md5_buf[61] = ctxt->md5_n8[2];
-	ctxt->md5_buf[62] = ctxt->md5_n8[1];
-	ctxt->md5_buf[63] = ctxt->md5_n8[0];
-#endif
-
-	md5_calc(ctxt->md5_buf, ctxt);
-}
-
-void md5_result(digest, ctxt)
-	u_int8_t *digest;
-	md5_ctxt *ctxt;
-{
-	/* 4 byte words */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	bcopy(&ctxt->md5_st8[0], digest, 16);
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	digest[ 0] = ctxt->md5_st8[ 3]; digest[ 1] = ctxt->md5_st8[ 2];
-	digest[ 2] = ctxt->md5_st8[ 1]; digest[ 3] = ctxt->md5_st8[ 0];
-	digest[ 4] = ctxt->md5_st8[ 7]; digest[ 5] = ctxt->md5_st8[ 6];
-	digest[ 6] = ctxt->md5_st8[ 5]; digest[ 7] = ctxt->md5_st8[ 4];
-	digest[ 8] = ctxt->md5_st8[11]; digest[ 9] = ctxt->md5_st8[10];
-	digest[10] = ctxt->md5_st8[ 9]; digest[11] = ctxt->md5_st8[ 8];
-	digest[12] = ctxt->md5_st8[15]; digest[13] = ctxt->md5_st8[14];
-	digest[14] = ctxt->md5_st8[13]; digest[15] = ctxt->md5_st8[12];
-#endif
-}
-
-static void md5_calc(b64, ctxt)
-	u_int8_t *b64;
-	md5_ctxt *ctxt;
-{
-	u_int32_t A = ctxt->md5_sta;
-	u_int32_t B = ctxt->md5_stb;
-	u_int32_t C = ctxt->md5_stc;
-	u_int32_t D = ctxt->md5_std;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int32_t *X = (u_int32_t *)b64;
-#endif	
-#if BYTE_ORDER == BIG_ENDIAN
-	/* 4 byte words */
-	/* what a brute force but fast! */
-	u_int32_t X[16];
-	u_int8_t *y = (u_int8_t *)X;
-	y[ 0] = b64[ 3]; y[ 1] = b64[ 2]; y[ 2] = b64[ 1]; y[ 3] = b64[ 0];
-	y[ 4] = b64[ 7]; y[ 5] = b64[ 6]; y[ 6] = b64[ 5]; y[ 7] = b64[ 4];
-	y[ 8] = b64[11]; y[ 9] = b64[10]; y[10] = b64[ 9]; y[11] = b64[ 8];
-	y[12] = b64[15]; y[13] = b64[14]; y[14] = b64[13]; y[15] = b64[12];
-	y[16] = b64[19]; y[17] = b64[18]; y[18] = b64[17]; y[19] = b64[16];
-	y[20] = b64[23]; y[21] = b64[22]; y[22] = b64[21]; y[23] = b64[20];
-	y[24] = b64[27]; y[25] = b64[26]; y[26] = b64[25]; y[27] = b64[24];
-	y[28] = b64[31]; y[29] = b64[30]; y[30] = b64[29]; y[31] = b64[28];
-	y[32] = b64[35]; y[33] = b64[34]; y[34] = b64[33]; y[35] = b64[32];
-	y[36] = b64[39]; y[37] = b64[38]; y[38] = b64[37]; y[39] = b64[36];
-	y[40] = b64[43]; y[41] = b64[42]; y[42] = b64[41]; y[43] = b64[40];
-	y[44] = b64[47]; y[45] = b64[46]; y[46] = b64[45]; y[47] = b64[44];
-	y[48] = b64[51]; y[49] = b64[50]; y[50] = b64[49]; y[51] = b64[48];
-	y[52] = b64[55]; y[53] = b64[54]; y[54] = b64[53]; y[55] = b64[52];
-	y[56] = b64[59]; y[57] = b64[58]; y[58] = b64[57]; y[59] = b64[56];
-	y[60] = b64[63]; y[61] = b64[62]; y[62] = b64[61]; y[63] = b64[60];
-#endif
-
-	ROUND1(A, B, C, D,  0, Sa,  1); ROUND1(D, A, B, C,  1, Sb,  2);
-	ROUND1(C, D, A, B,  2, Sc,  3); ROUND1(B, C, D, A,  3, Sd,  4);
-	ROUND1(A, B, C, D,  4, Sa,  5); ROUND1(D, A, B, C,  5, Sb,  6);
-	ROUND1(C, D, A, B,  6, Sc,  7); ROUND1(B, C, D, A,  7, Sd,  8);
-	ROUND1(A, B, C, D,  8, Sa,  9); ROUND1(D, A, B, C,  9, Sb, 10);
-	ROUND1(C, D, A, B, 10, Sc, 11); ROUND1(B, C, D, A, 11, Sd, 12);
-	ROUND1(A, B, C, D, 12, Sa, 13); ROUND1(D, A, B, C, 13, Sb, 14);
-	ROUND1(C, D, A, B, 14, Sc, 15); ROUND1(B, C, D, A, 15, Sd, 16);
-	
-	ROUND2(A, B, C, D,  1, Se, 17); ROUND2(D, A, B, C,  6, Sf, 18);
-	ROUND2(C, D, A, B, 11, Sg, 19); ROUND2(B, C, D, A,  0, Sh, 20);
-	ROUND2(A, B, C, D,  5, Se, 21); ROUND2(D, A, B, C, 10, Sf, 22);
-	ROUND2(C, D, A, B, 15, Sg, 23); ROUND2(B, C, D, A,  4, Sh, 24);
-	ROUND2(A, B, C, D,  9, Se, 25); ROUND2(D, A, B, C, 14, Sf, 26);
-	ROUND2(C, D, A, B,  3, Sg, 27); ROUND2(B, C, D, A,  8, Sh, 28);
-	ROUND2(A, B, C, D, 13, Se, 29); ROUND2(D, A, B, C,  2, Sf, 30);
-	ROUND2(C, D, A, B,  7, Sg, 31); ROUND2(B, C, D, A, 12, Sh, 32);
-
-	ROUND3(A, B, C, D,  5, Si, 33); ROUND3(D, A, B, C,  8, Sj, 34);
-	ROUND3(C, D, A, B, 11, Sk, 35); ROUND3(B, C, D, A, 14, Sl, 36);
-	ROUND3(A, B, C, D,  1, Si, 37); ROUND3(D, A, B, C,  4, Sj, 38);
-	ROUND3(C, D, A, B,  7, Sk, 39); ROUND3(B, C, D, A, 10, Sl, 40);
-	ROUND3(A, B, C, D, 13, Si, 41); ROUND3(D, A, B, C,  0, Sj, 42);
-	ROUND3(C, D, A, B,  3, Sk, 43); ROUND3(B, C, D, A,  6, Sl, 44);
-	ROUND3(A, B, C, D,  9, Si, 45); ROUND3(D, A, B, C, 12, Sj, 46);
-	ROUND3(C, D, A, B, 15, Sk, 47); ROUND3(B, C, D, A,  2, Sl, 48);
-	
-	ROUND4(A, B, C, D,  0, Sm, 49); ROUND4(D, A, B, C,  7, Sn, 50);	
-	ROUND4(C, D, A, B, 14, So, 51); ROUND4(B, C, D, A,  5, Sp, 52);	
-	ROUND4(A, B, C, D, 12, Sm, 53); ROUND4(D, A, B, C,  3, Sn, 54);	
-	ROUND4(C, D, A, B, 10, So, 55); ROUND4(B, C, D, A,  1, Sp, 56);	
-	ROUND4(A, B, C, D,  8, Sm, 57); ROUND4(D, A, B, C, 15, Sn, 58);	
-	ROUND4(C, D, A, B,  6, So, 59); ROUND4(B, C, D, A, 13, Sp, 60);	
-	ROUND4(A, B, C, D,  4, Sm, 61); ROUND4(D, A, B, C, 11, Sn, 62);	
-	ROUND4(C, D, A, B,  2, So, 63); ROUND4(B, C, D, A,  9, Sp, 64);
-
-	ctxt->md5_sta += A;
-	ctxt->md5_stb += B;
-	ctxt->md5_stc += C;
-	ctxt->md5_std += D;
-}
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/md5.h b/target/linux/generic-2.6/files/crypto/ocf/safe/md5.h
deleted file mode 100644
index 690f5bfc11..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/md5.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$FreeBSD: src/sys/crypto/md5.h,v 1.4 2002/03/20 05:13:50 alfred Exp $	*/
-/*	$KAME: md5.h,v 1.4 2000/03/27 04:36:22 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_MD5_H_
-#define _NETINET6_MD5_H_
-
-#define MD5_BUFLEN	64
-
-typedef struct {
-	union {
-		u_int32_t	md5_state32[4];
-		u_int8_t	md5_state8[16];
-	} md5_st;
-
-#define md5_sta		md5_st.md5_state32[0]
-#define md5_stb		md5_st.md5_state32[1]
-#define md5_stc		md5_st.md5_state32[2]
-#define md5_std		md5_st.md5_state32[3]
-#define md5_st8		md5_st.md5_state8
-
-	union {
-		u_int64_t	md5_count64;
-		u_int8_t	md5_count8[8];
-	} md5_count;
-#define md5_n	md5_count.md5_count64
-#define md5_n8	md5_count.md5_count8
-
-	u_int	md5_i;
-	u_int8_t	md5_buf[MD5_BUFLEN];
-} md5_ctxt;
-
-extern void md5_init(md5_ctxt *);
-extern void md5_loop(md5_ctxt *, u_int8_t *, u_int);
-extern void md5_pad(md5_ctxt *);
-extern void md5_result(u_int8_t *, md5_ctxt *);
-
-/* compatibility */
-#define MD5_CTX		md5_ctxt
-#define MD5Init(x)	md5_init((x))
-#define MD5Update(x, y, z)	md5_loop((x), (y), (z))
-#define MD5Final(x, y) \
-do {				\
-	md5_pad((y));		\
-	md5_result((x), (y));	\
-} while (0)
-
-#endif /* ! _NETINET6_MD5_H_*/
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/safe.c b/target/linux/generic-2.6/files/crypto/ocf/safe/safe.c
deleted file mode 100644
index 7e65101769..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/safe.c
+++ /dev/null
@@ -1,2288 +0,0 @@
-/*-
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2004-2010 David McCullough
- * The license and original author are listed below.
- *
- * Copyright (c) 2003 Sam Leffler, Errno Consulting
- * Copyright (c) 2003 Global Technology Associates, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
-__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $");
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/skbuff.h>
-#include <asm/io.h>
-
-/*
- * SafeNet SafeXcel-1141 hardware crypto accelerator
- */
-
-#include <cryptodev.h>
-#include <uio.h>
-#include <safe/safereg.h>
-#include <safe/safevar.h>
-
-#if 1
-#define	DPRINTF(a)	do { \
-						if (debug) { \
-							printk("%s: ", sc ? \
-								device_get_nameunit(sc->sc_dev) : "safe"); \
-							printk a; \
-						} \
-					} while (0)
-#else
-#define	DPRINTF(a)
-#endif
-
-/*
- * until we find a cleaner way, include the BSD md5/sha1 code
- * here
- */
-#define HMAC_HACK 1
-#ifdef HMAC_HACK
-#define LITTLE_ENDIAN 1234
-#define BIG_ENDIAN 4321
-#ifdef __LITTLE_ENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#ifdef __BIG_ENDIAN
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#include <safe/md5.h>
-#include <safe/md5.c>
-#include <safe/sha1.h>
-#include <safe/sha1.c>
-
-u_int8_t hmac_ipad_buffer[64] = {
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36
-};
-
-u_int8_t hmac_opad_buffer[64] = {
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
-    0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C
-};
-#endif /* HMAC_HACK */
-
-/* add proc entry for this */
-struct safe_stats safestats;
-
-#define debug safe_debug
-int safe_debug = 0;
-module_param(safe_debug, int, 0644);
-MODULE_PARM_DESC(safe_debug, "Enable debug");
-
-static	void safe_callback(struct safe_softc *, struct safe_ringentry *);
-static	void safe_feed(struct safe_softc *, struct safe_ringentry *);
-#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
-static	void safe_rng_init(struct safe_softc *);
-int safe_rngbufsize = 8;		/* 32 bytes each read  */
-module_param(safe_rngbufsize, int, 0644);
-MODULE_PARM_DESC(safe_rngbufsize, "RNG polling buffer size (32-bit words)");
-int safe_rngmaxalarm = 8;		/* max alarms before reset */
-module_param(safe_rngmaxalarm, int, 0644);
-MODULE_PARM_DESC(safe_rngmaxalarm, "RNG max alarms before reset");
-#endif /* SAFE_NO_RNG */
-
-static void safe_totalreset(struct safe_softc *sc);
-static int safe_dmamap_aligned(struct safe_softc *sc, const struct safe_operand *op);
-static int safe_dmamap_uniform(struct safe_softc *sc, const struct safe_operand *op);
-static int safe_free_entry(struct safe_softc *sc, struct safe_ringentry *re);
-static int safe_kprocess(device_t dev, struct cryptkop *krp, int hint);
-static int safe_kstart(struct safe_softc *sc);
-static int safe_ksigbits(struct safe_softc *sc, struct crparam *cr);
-static void safe_kfeed(struct safe_softc *sc);
-static void safe_kpoll(unsigned long arg);
-static void safe_kload_reg(struct safe_softc *sc, u_int32_t off,
-								u_int32_t len, struct crparam *n);
-
-static	int safe_newsession(device_t, u_int32_t *, struct cryptoini *);
-static	int safe_freesession(device_t, u_int64_t);
-static	int safe_process(device_t, struct cryptop *, int);
-
-static device_method_t safe_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	safe_newsession),
-	DEVMETHOD(cryptodev_freesession,safe_freesession),
-	DEVMETHOD(cryptodev_process,	safe_process),
-	DEVMETHOD(cryptodev_kprocess,	safe_kprocess),
-};
-
-#define	READ_REG(sc,r)			readl((sc)->sc_base_addr + (r))
-#define WRITE_REG(sc,r,val)		writel((val), (sc)->sc_base_addr + (r))
-
-#define SAFE_MAX_CHIPS 8
-static struct safe_softc *safe_chip_idx[SAFE_MAX_CHIPS];
-
-/*
- * split our buffers up into safe DMAable byte fragments to avoid lockup
- * bug in 1141 HW on rev 1.0.
- */
-
-static int
-pci_map_linear(
-	struct safe_softc *sc,
-	struct safe_operand *buf,
-	void *addr,
-	int len)
-{
-	dma_addr_t tmp;
-	int chunk, tlen = len;
-
-	tmp = pci_map_single(sc->sc_pcidev, addr, len, PCI_DMA_BIDIRECTIONAL);
-
-	buf->mapsize += len;
-	while (len > 0) {
-		chunk = (len > sc->sc_max_dsize) ? sc->sc_max_dsize : len;
-		buf->segs[buf->nsegs].ds_addr = tmp;
-		buf->segs[buf->nsegs].ds_len  = chunk;
-		buf->segs[buf->nsegs].ds_tlen = tlen;
-		buf->nsegs++;
-		tmp  += chunk;
-		len  -= chunk;
-		tlen = 0;
-	}
-	return 0;
-}
-
-/*
- * map in a given uio buffer (great on some arches :-)
- */
-
-static int
-pci_map_uio(struct safe_softc *sc, struct safe_operand *buf, struct uio *uio)
-{
-	struct iovec *iov = uio->uio_iov;
-	int n;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	buf->mapsize = 0;
-	buf->nsegs = 0;
-
-	for (n = 0; n < uio->uio_iovcnt; n++) {
-		pci_map_linear(sc, buf, iov->iov_base, iov->iov_len);
-		iov++;
-	}
-
-	/* identify this buffer by the first segment */
-	buf->map = (void *) buf->segs[0].ds_addr;
-	return(0);
-}
-
-/*
- * map in a given sk_buff
- */
-
-static int
-pci_map_skb(struct safe_softc *sc,struct safe_operand *buf,struct sk_buff *skb)
-{
-	int i;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	buf->mapsize = 0;
-	buf->nsegs = 0;
-
-	pci_map_linear(sc, buf, skb->data, skb_headlen(skb));
-
-	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-		pci_map_linear(sc, buf,
-				page_address(skb_shinfo(skb)->frags[i].page) +
-				                        skb_shinfo(skb)->frags[i].page_offset,
-				skb_shinfo(skb)->frags[i].size);
-	}
-
-	/* identify this buffer by the first segment */
-	buf->map = (void *) buf->segs[0].ds_addr;
-	return(0);
-}
-
-
-#if 0 /* not needed at this time */
-static void
-pci_sync_operand(struct safe_softc *sc, struct safe_operand *buf)
-{
-	int i;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-	for (i = 0; i < buf->nsegs; i++)
-		pci_dma_sync_single_for_cpu(sc->sc_pcidev, buf->segs[i].ds_addr,
-				buf->segs[i].ds_len, PCI_DMA_BIDIRECTIONAL);
-}
-#endif
-
-static void
-pci_unmap_operand(struct safe_softc *sc, struct safe_operand *buf)
-{
-	int i;
-	DPRINTF(("%s()\n", __FUNCTION__));
-	for (i = 0; i < buf->nsegs; i++) {
-		if (buf->segs[i].ds_tlen) {
-			DPRINTF(("%s - unmap %d 0x%x %d\n", __FUNCTION__, i, buf->segs[i].ds_addr, buf->segs[i].ds_tlen));
-			pci_unmap_single(sc->sc_pcidev, buf->segs[i].ds_addr,
-					buf->segs[i].ds_tlen, PCI_DMA_BIDIRECTIONAL);
-			DPRINTF(("%s - unmap %d 0x%x %d done\n", __FUNCTION__, i, buf->segs[i].ds_addr, buf->segs[i].ds_tlen));
-		}
-		buf->segs[i].ds_addr = 0;
-		buf->segs[i].ds_len = 0;
-		buf->segs[i].ds_tlen = 0;
-	}
-	buf->nsegs = 0;
-	buf->mapsize = 0;
-	buf->map = 0;
-}
-
-
-/*
- * SafeXcel Interrupt routine
- */
-static irqreturn_t
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-safe_intr(int irq, void *arg)
-#else
-safe_intr(int irq, void *arg, struct pt_regs *regs)
-#endif
-{
-	struct safe_softc *sc = arg;
-	int stat;
-	unsigned long flags;
-
-	stat = READ_REG(sc, SAFE_HM_STAT);
-
-	DPRINTF(("%s(stat=0x%x)\n", __FUNCTION__, stat));
-
-	if (stat == 0)		/* shared irq, not for us */
-		return IRQ_NONE;
-
-	WRITE_REG(sc, SAFE_HI_CLR, stat);	/* IACK */
-
-	if ((stat & SAFE_INT_PE_DDONE)) {
-		/*
-		 * Descriptor(s) done; scan the ring and
-		 * process completed operations.
-		 */
-		spin_lock_irqsave(&sc->sc_ringmtx, flags);
-		while (sc->sc_back != sc->sc_front) {
-			struct safe_ringentry *re = sc->sc_back;
-
-#ifdef SAFE_DEBUG
-			if (debug) {
-				safe_dump_ringstate(sc, __func__);
-				safe_dump_request(sc, __func__, re);
-			}
-#endif
-			/*
-			 * safe_process marks ring entries that were allocated
-			 * but not used with a csr of zero.  This insures the
-			 * ring front pointer never needs to be set backwards
-			 * in the event that an entry is allocated but not used
-			 * because of a setup error.
-			 */
-			DPRINTF(("%s re->re_desc.d_csr=0x%x\n", __FUNCTION__, re->re_desc.d_csr));
-			if (re->re_desc.d_csr != 0) {
-				if (!SAFE_PE_CSR_IS_DONE(re->re_desc.d_csr)) {
-					DPRINTF(("%s !CSR_IS_DONE\n", __FUNCTION__));
-					break;
-				}
-				if (!SAFE_PE_LEN_IS_DONE(re->re_desc.d_len)) {
-					DPRINTF(("%s !LEN_IS_DONE\n", __FUNCTION__));
-					break;
-				}
-				sc->sc_nqchip--;
-				safe_callback(sc, re);
-			}
-			if (++(sc->sc_back) == sc->sc_ringtop)
-				sc->sc_back = sc->sc_ring;
-		}
-		spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
-	}
-
-	/*
-	 * Check to see if we got any DMA Error
-	 */
-	if (stat & SAFE_INT_PE_ERROR) {
-		printk("%s: dmaerr dmastat %08x\n", device_get_nameunit(sc->sc_dev),
-				(int)READ_REG(sc, SAFE_PE_DMASTAT));
-		safestats.st_dmaerr++;
-		safe_totalreset(sc);
-#if 0
-		safe_feed(sc);
-#endif
-	}
-
-	if (sc->sc_needwakeup) {		/* XXX check high watermark */
-		int wakeup = sc->sc_needwakeup & (CRYPTO_SYMQ|CRYPTO_ASYMQ);
-		DPRINTF(("%s: wakeup crypto %x\n", __func__,
-			sc->sc_needwakeup));
-		sc->sc_needwakeup &= ~wakeup;
-		crypto_unblock(sc->sc_cid, wakeup);
-	}
-	
-	return IRQ_HANDLED;
-}
-
-/*
- * safe_feed() - post a request to chip
- */
-static void
-safe_feed(struct safe_softc *sc, struct safe_ringentry *re)
-{
-	DPRINTF(("%s()\n", __FUNCTION__));
-#ifdef SAFE_DEBUG
-	if (debug) {
-		safe_dump_ringstate(sc, __func__);
-		safe_dump_request(sc, __func__, re);
-	}
-#endif
-	sc->sc_nqchip++;
-	if (sc->sc_nqchip > safestats.st_maxqchip)
-		safestats.st_maxqchip = sc->sc_nqchip;
-	/* poke h/w to check descriptor ring, any value can be written */
-	WRITE_REG(sc, SAFE_HI_RD_DESCR, 0);
-}
-
-#define	N(a)	(sizeof(a) / sizeof (a[0]))
-static void
-safe_setup_enckey(struct safe_session *ses, caddr_t key)
-{
-	int i;
-
-	bcopy(key, ses->ses_key, ses->ses_klen / 8);
-
-	/* PE is little-endian, insure proper byte order */
-	for (i = 0; i < N(ses->ses_key); i++)
-		ses->ses_key[i] = htole32(ses->ses_key[i]);
-}
-
-static void
-safe_setup_mackey(struct safe_session *ses, int algo, caddr_t key, int klen)
-{
-#ifdef HMAC_HACK
-	MD5_CTX md5ctx;
-	SHA1_CTX sha1ctx;
-	int i;
-
-
-	for (i = 0; i < klen; i++)
-		key[i] ^= HMAC_IPAD_VAL;
-
-	if (algo == CRYPTO_MD5_HMAC) {
-		MD5Init(&md5ctx);
-		MD5Update(&md5ctx, key, klen);
-		MD5Update(&md5ctx, hmac_ipad_buffer, MD5_HMAC_BLOCK_LEN - klen);
-		bcopy(md5ctx.md5_st8, ses->ses_hminner, sizeof(md5ctx.md5_st8));
-	} else {
-		SHA1Init(&sha1ctx);
-		SHA1Update(&sha1ctx, key, klen);
-		SHA1Update(&sha1ctx, hmac_ipad_buffer,
-		    SHA1_HMAC_BLOCK_LEN - klen);
-		bcopy(sha1ctx.h.b32, ses->ses_hminner, sizeof(sha1ctx.h.b32));
-	}
-
-	for (i = 0; i < klen; i++)
-		key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL);
-
-	if (algo == CRYPTO_MD5_HMAC) {
-		MD5Init(&md5ctx);
-		MD5Update(&md5ctx, key, klen);
-		MD5Update(&md5ctx, hmac_opad_buffer, MD5_HMAC_BLOCK_LEN - klen);
-		bcopy(md5ctx.md5_st8, ses->ses_hmouter, sizeof(md5ctx.md5_st8));
-	} else {
-		SHA1Init(&sha1ctx);
-		SHA1Update(&sha1ctx, key, klen);
-		SHA1Update(&sha1ctx, hmac_opad_buffer,
-		    SHA1_HMAC_BLOCK_LEN - klen);
-		bcopy(sha1ctx.h.b32, ses->ses_hmouter, sizeof(sha1ctx.h.b32));
-	}
-
-	for (i = 0; i < klen; i++)
-		key[i] ^= HMAC_OPAD_VAL;
-
-#if 0
-	/*
-	 * this code prevents SHA working on a BE host,
-	 * so it is obviously wrong.  I think the byte
-	 * swap setup we do with the chip fixes this for us
-	 */
-
-	/* PE is little-endian, insure proper byte order */
-	for (i = 0; i < N(ses->ses_hminner); i++) {
-		ses->ses_hminner[i] = htole32(ses->ses_hminner[i]);
-		ses->ses_hmouter[i] = htole32(ses->ses_hmouter[i]);
-	}
-#endif
-#else /* HMAC_HACK */
-	printk("safe: md5/sha not implemented\n");
-#endif /* HMAC_HACK */
-}
-#undef N
-
-/*
- * Allocate a new 'session' and return an encoded session id.  'sidp'
- * contains our registration id, and should contain an encoded session
- * id on successful allocation.
- */
-static int
-safe_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
-{
-	struct safe_softc *sc = device_get_softc(dev);
-	struct cryptoini *c, *encini = NULL, *macini = NULL;
-	struct safe_session *ses = NULL;
-	int sesn;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (sidp == NULL || cri == NULL || sc == NULL)
-		return (EINVAL);
-
-	for (c = cri; c != NULL; c = c->cri_next) {
-		if (c->cri_alg == CRYPTO_MD5_HMAC ||
-		    c->cri_alg == CRYPTO_SHA1_HMAC ||
-		    c->cri_alg == CRYPTO_NULL_HMAC) {
-			if (macini)
-				return (EINVAL);
-			macini = c;
-		} else if (c->cri_alg == CRYPTO_DES_CBC ||
-		    c->cri_alg == CRYPTO_3DES_CBC ||
-		    c->cri_alg == CRYPTO_AES_CBC ||
-		    c->cri_alg == CRYPTO_NULL_CBC) {
-			if (encini)
-				return (EINVAL);
-			encini = c;
-		} else
-			return (EINVAL);
-	}
-	if (encini == NULL && macini == NULL)
-		return (EINVAL);
-	if (encini) {			/* validate key length */
-		switch (encini->cri_alg) {
-		case CRYPTO_DES_CBC:
-			if (encini->cri_klen != 64)
-				return (EINVAL);
-			break;
-		case CRYPTO_3DES_CBC:
-			if (encini->cri_klen != 192)
-				return (EINVAL);
-			break;
-		case CRYPTO_AES_CBC:
-			if (encini->cri_klen != 128 &&
-			    encini->cri_klen != 192 &&
-			    encini->cri_klen != 256)
-				return (EINVAL);
-			break;
-		}
-	}
-
-	if (sc->sc_sessions == NULL) {
-		ses = sc->sc_sessions = (struct safe_session *)
-			kmalloc(sizeof(struct safe_session), SLAB_ATOMIC);
-		if (ses == NULL)
-			return (ENOMEM);
-		memset(ses, 0, sizeof(struct safe_session));
-		sesn = 0;
-		sc->sc_nsessions = 1;
-	} else {
-		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
-			if (sc->sc_sessions[sesn].ses_used == 0) {
-				ses = &sc->sc_sessions[sesn];
-				break;
-			}
-		}
-
-		if (ses == NULL) {
-			sesn = sc->sc_nsessions;
-			ses = (struct safe_session *)
-				kmalloc((sesn + 1) * sizeof(struct safe_session), SLAB_ATOMIC);
-			if (ses == NULL)
-				return (ENOMEM);
-			memset(ses, 0, (sesn + 1) * sizeof(struct safe_session));
-			bcopy(sc->sc_sessions, ses, sesn *
-			    sizeof(struct safe_session));
-			bzero(sc->sc_sessions, sesn *
-			    sizeof(struct safe_session));
-			kfree(sc->sc_sessions);
-			sc->sc_sessions = ses;
-			ses = &sc->sc_sessions[sesn];
-			sc->sc_nsessions++;
-		}
-	}
-
-	bzero(ses, sizeof(struct safe_session));
-	ses->ses_used = 1;
-
-	if (encini) {
-		/* get an IV */
-		/* XXX may read fewer than requested */
-		read_random(ses->ses_iv, sizeof(ses->ses_iv));
-
-		ses->ses_klen = encini->cri_klen;
-		if (encini->cri_key != NULL)
-			safe_setup_enckey(ses, encini->cri_key);
-	}
-
-	if (macini) {
-		ses->ses_mlen = macini->cri_mlen;
-		if (ses->ses_mlen == 0) {
-			if (macini->cri_alg == CRYPTO_MD5_HMAC)
-				ses->ses_mlen = MD5_HASH_LEN;
-			else
-				ses->ses_mlen = SHA1_HASH_LEN;
-		}
-
-		if (macini->cri_key != NULL) {
-			safe_setup_mackey(ses, macini->cri_alg, macini->cri_key,
-			    macini->cri_klen / 8);
-		}
-	}
-
-	*sidp = SAFE_SID(device_get_unit(sc->sc_dev), sesn);
-	return (0);
-}
-
-/*
- * Deallocate a session.
- */
-static int
-safe_freesession(device_t dev, u_int64_t tid)
-{
-	struct safe_softc *sc = device_get_softc(dev);
-	int session, ret;
-	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (sc == NULL)
-		return (EINVAL);
-
-	session = SAFE_SESSION(sid);
-	if (session < sc->sc_nsessions) {
-		bzero(&sc->sc_sessions[session], sizeof(sc->sc_sessions[session]));
-		ret = 0;
-	} else
-		ret = EINVAL;
-	return (ret);
-}
-
-
-static int
-safe_process(device_t dev, struct cryptop *crp, int hint)
-{
-	struct safe_softc *sc = device_get_softc(dev);
-	int err = 0, i, nicealign, uniform;
-	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
-	int bypass, oplen, ivsize;
-	caddr_t iv;
-	int16_t coffset;
-	struct safe_session *ses;
-	struct safe_ringentry *re;
-	struct safe_sarec *sa;
-	struct safe_pdesc *pd;
-	u_int32_t cmd0, cmd1, staterec;
-	unsigned long flags;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (crp == NULL || crp->crp_callback == NULL || sc == NULL) {
-		safestats.st_invalid++;
-		return (EINVAL);
-	}
-	if (SAFE_SESSION(crp->crp_sid) >= sc->sc_nsessions) {
-		safestats.st_badsession++;
-		return (EINVAL);
-	}
-
-	spin_lock_irqsave(&sc->sc_ringmtx, flags);
-	if (sc->sc_front == sc->sc_back && sc->sc_nqchip != 0) {
-		safestats.st_ringfull++;
-		sc->sc_needwakeup |= CRYPTO_SYMQ;
-		spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
-		return (ERESTART);
-	}
-	re = sc->sc_front;
-
-	staterec = re->re_sa.sa_staterec;	/* save */
-	/* NB: zero everything but the PE descriptor */
-	bzero(&re->re_sa, sizeof(struct safe_ringentry) - sizeof(re->re_desc));
-	re->re_sa.sa_staterec = staterec;	/* restore */
-
-	re->re_crp = crp;
-	re->re_sesn = SAFE_SESSION(crp->crp_sid);
-
-	re->re_src.nsegs = 0;
-	re->re_dst.nsegs = 0;
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		re->re_src_skb = (struct sk_buff *)crp->crp_buf;
-		re->re_dst_skb = (struct sk_buff *)crp->crp_buf;
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		re->re_src_io = (struct uio *)crp->crp_buf;
-		re->re_dst_io = (struct uio *)crp->crp_buf;
-	} else {
-		safestats.st_badflags++;
-		err = EINVAL;
-		goto errout;	/* XXX we don't handle contiguous blocks! */
-	}
-
-	sa = &re->re_sa;
-	ses = &sc->sc_sessions[re->re_sesn];
-
-	crd1 = crp->crp_desc;
-	if (crd1 == NULL) {
-		safestats.st_nodesc++;
-		err = EINVAL;
-		goto errout;
-	}
-	crd2 = crd1->crd_next;
-
-	cmd0 = SAFE_SA_CMD0_BASIC;		/* basic group operation */
-	cmd1 = 0;
-	if (crd2 == NULL) {
-		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-		    crd1->crd_alg == CRYPTO_NULL_HMAC) {
-			maccrd = crd1;
-			enccrd = NULL;
-			cmd0 |= SAFE_SA_CMD0_OP_HASH;
-		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
-		    crd1->crd_alg == CRYPTO_3DES_CBC ||
-		    crd1->crd_alg == CRYPTO_AES_CBC ||
-		    crd1->crd_alg == CRYPTO_NULL_CBC) {
-			maccrd = NULL;
-			enccrd = crd1;
-			cmd0 |= SAFE_SA_CMD0_OP_CRYPT;
-		} else {
-			safestats.st_badalg++;
-			err = EINVAL;
-			goto errout;
-		}
-	} else {
-		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-		    crd1->crd_alg == CRYPTO_NULL_HMAC) &&
-		    (crd2->crd_alg == CRYPTO_DES_CBC ||
-			crd2->crd_alg == CRYPTO_3DES_CBC ||
-		        crd2->crd_alg == CRYPTO_AES_CBC ||
-		        crd2->crd_alg == CRYPTO_NULL_CBC) &&
-		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
-			maccrd = crd1;
-			enccrd = crd2;
-		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
-		    crd1->crd_alg == CRYPTO_3DES_CBC ||
-		    crd1->crd_alg == CRYPTO_AES_CBC ||
-		    crd1->crd_alg == CRYPTO_NULL_CBC) &&
-		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
-			crd2->crd_alg == CRYPTO_SHA1_HMAC ||
-			crd2->crd_alg == CRYPTO_NULL_HMAC) &&
-		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
-			enccrd = crd1;
-			maccrd = crd2;
-		} else {
-			safestats.st_badalg++;
-			err = EINVAL;
-			goto errout;
-		}
-		cmd0 |= SAFE_SA_CMD0_OP_BOTH;
-	}
-
-	if (enccrd) {
-		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT)
-			safe_setup_enckey(ses, enccrd->crd_key);
-
-		if (enccrd->crd_alg == CRYPTO_DES_CBC) {
-			cmd0 |= SAFE_SA_CMD0_DES;
-			cmd1 |= SAFE_SA_CMD1_CBC;
-			ivsize = 2*sizeof(u_int32_t);
-		} else if (enccrd->crd_alg == CRYPTO_3DES_CBC) {
-			cmd0 |= SAFE_SA_CMD0_3DES;
-			cmd1 |= SAFE_SA_CMD1_CBC;
-			ivsize = 2*sizeof(u_int32_t);
-		} else if (enccrd->crd_alg == CRYPTO_AES_CBC) {
-			cmd0 |= SAFE_SA_CMD0_AES;
-			cmd1 |= SAFE_SA_CMD1_CBC;
-			if (ses->ses_klen == 128)
-			     cmd1 |=  SAFE_SA_CMD1_AES128;
-			else if (ses->ses_klen == 192)
-			     cmd1 |=  SAFE_SA_CMD1_AES192;
-			else
-			     cmd1 |=  SAFE_SA_CMD1_AES256;
-			ivsize = 4*sizeof(u_int32_t);
-		} else {
-			cmd0 |= SAFE_SA_CMD0_CRYPT_NULL;
-			ivsize = 0;
-		}
-
-		/*
-		 * Setup encrypt/decrypt state.  When using basic ops
-		 * we can't use an inline IV because hash/crypt offset
-		 * must be from the end of the IV to the start of the
-		 * crypt data and this leaves out the preceding header
-		 * from the hash calculation.  Instead we place the IV
-		 * in the state record and set the hash/crypt offset to
-		 * copy both the header+IV.
-		 */
-		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
-			cmd0 |= SAFE_SA_CMD0_OUTBOUND;
-
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-				iv = enccrd->crd_iv;
-			else
-				iv = (caddr_t) ses->ses_iv;
-			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-				crypto_copyback(crp->crp_flags, crp->crp_buf,
-				    enccrd->crd_inject, ivsize, iv);
-			}
-			bcopy(iv, re->re_sastate.sa_saved_iv, ivsize);
-			/* make iv LE */
-			for (i = 0; i < ivsize/sizeof(re->re_sastate.sa_saved_iv[0]); i++)
-				re->re_sastate.sa_saved_iv[i] =
-					cpu_to_le32(re->re_sastate.sa_saved_iv[i]);
-			cmd0 |= SAFE_SA_CMD0_IVLD_STATE | SAFE_SA_CMD0_SAVEIV;
-			re->re_flags |= SAFE_QFLAGS_COPYOUTIV;
-		} else {
-			cmd0 |= SAFE_SA_CMD0_INBOUND;
-
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
-				bcopy(enccrd->crd_iv,
-					re->re_sastate.sa_saved_iv, ivsize);
-			} else {
-				crypto_copydata(crp->crp_flags, crp->crp_buf,
-				    enccrd->crd_inject, ivsize,
-				    (caddr_t)re->re_sastate.sa_saved_iv);
-			}
-			/* make iv LE */
-			for (i = 0; i < ivsize/sizeof(re->re_sastate.sa_saved_iv[0]); i++)
-				re->re_sastate.sa_saved_iv[i] =
-					cpu_to_le32(re->re_sastate.sa_saved_iv[i]);
-			cmd0 |= SAFE_SA_CMD0_IVLD_STATE;
-		}
-		/*
-		 * For basic encryption use the zero pad algorithm.
-		 * This pads results to an 8-byte boundary and
-		 * suppresses padding verification for inbound (i.e.
-		 * decrypt) operations.
-		 *
-		 * NB: Not sure if the 8-byte pad boundary is a problem.
-		 */
-		cmd0 |= SAFE_SA_CMD0_PAD_ZERO;
-
-		/* XXX assert key bufs have the same size */
-		bcopy(ses->ses_key, sa->sa_key, sizeof(sa->sa_key));
-	}
-
-	if (maccrd) {
-		if (maccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			safe_setup_mackey(ses, maccrd->crd_alg,
-			    maccrd->crd_key, maccrd->crd_klen / 8);
-		}
-
-		if (maccrd->crd_alg == CRYPTO_MD5_HMAC) {
-			cmd0 |= SAFE_SA_CMD0_MD5;
-			cmd1 |= SAFE_SA_CMD1_HMAC;	/* NB: enable HMAC */
-		} else if (maccrd->crd_alg == CRYPTO_SHA1_HMAC) {
-			cmd0 |= SAFE_SA_CMD0_SHA1;
-			cmd1 |= SAFE_SA_CMD1_HMAC;	/* NB: enable HMAC */
-		} else {
-			cmd0 |= SAFE_SA_CMD0_HASH_NULL;
-		}
-		/*
-		 * Digest data is loaded from the SA and the hash
-		 * result is saved to the state block where we
-		 * retrieve it for return to the caller.
-		 */
-		/* XXX assert digest bufs have the same size */
-		bcopy(ses->ses_hminner, sa->sa_indigest,
-			sizeof(sa->sa_indigest));
-		bcopy(ses->ses_hmouter, sa->sa_outdigest,
-			sizeof(sa->sa_outdigest));
-
-		cmd0 |= SAFE_SA_CMD0_HSLD_SA | SAFE_SA_CMD0_SAVEHASH;
-		re->re_flags |= SAFE_QFLAGS_COPYOUTICV;
-	}
-
-	if (enccrd && maccrd) {
-		/*
-		 * The offset from hash data to the start of
-		 * crypt data is the difference in the skips.
-		 */
-		bypass = maccrd->crd_skip;
-		coffset = enccrd->crd_skip - maccrd->crd_skip;
-		if (coffset < 0) {
-			DPRINTF(("%s: hash does not precede crypt; "
-				"mac skip %u enc skip %u\n",
-				__func__, maccrd->crd_skip, enccrd->crd_skip));
-			safestats.st_skipmismatch++;
-			err = EINVAL;
-			goto errout;
-		}
-		oplen = enccrd->crd_skip + enccrd->crd_len;
-		if (maccrd->crd_skip + maccrd->crd_len != oplen) {
-			DPRINTF(("%s: hash amount %u != crypt amount %u\n",
-				__func__, maccrd->crd_skip + maccrd->crd_len,
-				oplen));
-			safestats.st_lenmismatch++;
-			err = EINVAL;
-			goto errout;
-		}
-#ifdef SAFE_DEBUG
-		if (debug) {
-			printf("mac: skip %d, len %d, inject %d\n",
-			    maccrd->crd_skip, maccrd->crd_len,
-			    maccrd->crd_inject);
-			printf("enc: skip %d, len %d, inject %d\n",
-			    enccrd->crd_skip, enccrd->crd_len,
-			    enccrd->crd_inject);
-			printf("bypass %d coffset %d oplen %d\n",
-				bypass, coffset, oplen);
-		}
-#endif
-		if (coffset & 3) {	/* offset must be 32-bit aligned */
-			DPRINTF(("%s: coffset %u misaligned\n",
-				__func__, coffset));
-			safestats.st_coffmisaligned++;
-			err = EINVAL;
-			goto errout;
-		}
-		coffset >>= 2;
-		if (coffset > 255) {	/* offset must be <256 dwords */
-			DPRINTF(("%s: coffset %u too big\n",
-				__func__, coffset));
-			safestats.st_cofftoobig++;
-			err = EINVAL;
-			goto errout;
-		}
-		/*
-		 * Tell the hardware to copy the header to the output.
-		 * The header is defined as the data from the end of
-		 * the bypass to the start of data to be encrypted. 
-		 * Typically this is the inline IV.  Note that you need
-		 * to do this even if src+dst are the same; it appears
-		 * that w/o this bit the crypted data is written
-		 * immediately after the bypass data.
-		 */
-		cmd1 |= SAFE_SA_CMD1_HDRCOPY;
-		/*
-		 * Disable IP header mutable bit handling.  This is
-		 * needed to get correct HMAC calculations.
-		 */
-		cmd1 |= SAFE_SA_CMD1_MUTABLE;
-	} else {
-		if (enccrd) {
-			bypass = enccrd->crd_skip;
-			oplen = bypass + enccrd->crd_len;
-		} else {
-			bypass = maccrd->crd_skip;
-			oplen = bypass + maccrd->crd_len;
-		}
-		coffset = 0;
-	}
-	/* XXX verify multiple of 4 when using s/g */
-	if (bypass > 96) {		/* bypass offset must be <= 96 bytes */
-		DPRINTF(("%s: bypass %u too big\n", __func__, bypass));
-		safestats.st_bypasstoobig++;
-		err = EINVAL;
-		goto errout;
-	}
-
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		if (pci_map_skb(sc, &re->re_src, re->re_src_skb)) {
-			safestats.st_noload++;
-			err = ENOMEM;
-			goto errout;
-		}
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		if (pci_map_uio(sc, &re->re_src, re->re_src_io)) {
-			safestats.st_noload++;
-			err = ENOMEM;
-			goto errout;
-		}
-	}
-	nicealign = safe_dmamap_aligned(sc, &re->re_src);
-	uniform = safe_dmamap_uniform(sc, &re->re_src);
-
-	DPRINTF(("src nicealign %u uniform %u nsegs %u\n",
-		nicealign, uniform, re->re_src.nsegs));
-	if (re->re_src.nsegs > 1) {
-		re->re_desc.d_src = sc->sc_spalloc.dma_paddr +
-			((caddr_t) sc->sc_spfree - (caddr_t) sc->sc_spring);
-		for (i = 0; i < re->re_src_nsegs; i++) {
-			/* NB: no need to check if there's space */
-			pd = sc->sc_spfree;
-			if (++(sc->sc_spfree) == sc->sc_springtop)
-				sc->sc_spfree = sc->sc_spring;
-
-			KASSERT((pd->pd_flags&3) == 0 ||
-				(pd->pd_flags&3) == SAFE_PD_DONE,
-				("bogus source particle descriptor; flags %x",
-				pd->pd_flags));
-			pd->pd_addr = re->re_src_segs[i].ds_addr;
-			pd->pd_size = re->re_src_segs[i].ds_len;
-			pd->pd_flags = SAFE_PD_READY;
-		}
-		cmd0 |= SAFE_SA_CMD0_IGATHER;
-	} else {
-		/*
-		 * No need for gather, reference the operand directly.
-		 */
-		re->re_desc.d_src = re->re_src_segs[0].ds_addr;
-	}
-
-	if (enccrd == NULL && maccrd != NULL) {
-		/*
-		 * Hash op; no destination needed.
-		 */
-	} else {
-		if (crp->crp_flags & (CRYPTO_F_IOV|CRYPTO_F_SKBUF)) {
-			if (!nicealign) {
-				safestats.st_iovmisaligned++;
-				err = EINVAL;
-				goto errout;
-			}
-			if (uniform != 1) {
-				device_printf(sc->sc_dev, "!uniform source\n");
-				if (!uniform) {
-					/*
-					 * There's no way to handle the DMA
-					 * requirements with this uio.  We
-					 * could create a separate DMA area for
-					 * the result and then copy it back,
-					 * but for now we just bail and return
-					 * an error.  Note that uio requests
-					 * > SAFE_MAX_DSIZE are handled because
-					 * the DMA map and segment list for the
-					 * destination wil result in a
-					 * destination particle list that does
-					 * the necessary scatter DMA.
-					 */ 
-					safestats.st_iovnotuniform++;
-					err = EINVAL;
-					goto errout;
-				}
-			} else
-				re->re_dst = re->re_src;
-		} else {
-			safestats.st_badflags++;
-			err = EINVAL;
-			goto errout;
-		}
-
-		if (re->re_dst.nsegs > 1) {
-			re->re_desc.d_dst = sc->sc_dpalloc.dma_paddr +
-			    ((caddr_t) sc->sc_dpfree - (caddr_t) sc->sc_dpring);
-			for (i = 0; i < re->re_dst_nsegs; i++) {
-				pd = sc->sc_dpfree;
-				KASSERT((pd->pd_flags&3) == 0 ||
-					(pd->pd_flags&3) == SAFE_PD_DONE,
-					("bogus dest particle descriptor; flags %x",
-						pd->pd_flags));
-				if (++(sc->sc_dpfree) == sc->sc_dpringtop)
-					sc->sc_dpfree = sc->sc_dpring;
-				pd->pd_addr = re->re_dst_segs[i].ds_addr;
-				pd->pd_flags = SAFE_PD_READY;
-			}
-			cmd0 |= SAFE_SA_CMD0_OSCATTER;
-		} else {
-			/*
-			 * No need for scatter, reference the operand directly.
-			 */
-			re->re_desc.d_dst = re->re_dst_segs[0].ds_addr;
-		}
-	}
-
-	/*
-	 * All done with setup; fillin the SA command words
-	 * and the packet engine descriptor.  The operation
-	 * is now ready for submission to the hardware.
-	 */
-	sa->sa_cmd0 = cmd0 | SAFE_SA_CMD0_IPCI | SAFE_SA_CMD0_OPCI;
-	sa->sa_cmd1 = cmd1
-		    | (coffset << SAFE_SA_CMD1_OFFSET_S)
-		    | SAFE_SA_CMD1_SAREV1	/* Rev 1 SA data structure */
-		    | SAFE_SA_CMD1_SRPCI
-		    ;
-	/*
-	 * NB: the order of writes is important here.  In case the
-	 * chip is scanning the ring because of an outstanding request
-	 * it might nab this one too.  In that case we need to make
-	 * sure the setup is complete before we write the length
-	 * field of the descriptor as it signals the descriptor is
-	 * ready for processing.
-	 */
-	re->re_desc.d_csr = SAFE_PE_CSR_READY | SAFE_PE_CSR_SAPCI;
-	if (maccrd)
-		re->re_desc.d_csr |= SAFE_PE_CSR_LOADSA | SAFE_PE_CSR_HASHFINAL;
-	wmb();
-	re->re_desc.d_len = oplen
-			  | SAFE_PE_LEN_READY
-			  | (bypass << SAFE_PE_LEN_BYPASS_S)
-			  ;
-
-	safestats.st_ipackets++;
-	safestats.st_ibytes += oplen;
-
-	if (++(sc->sc_front) == sc->sc_ringtop)
-		sc->sc_front = sc->sc_ring;
-
-	/* XXX honor batching */
-	safe_feed(sc, re);
-	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
-	return (0);
-
-errout:
-	if (re->re_src.map != re->re_dst.map)
-		pci_unmap_operand(sc, &re->re_dst);
-	if (re->re_src.map)
-		pci_unmap_operand(sc, &re->re_src);
-	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
-	if (err != ERESTART) {
-		crp->crp_etype = err;
-		crypto_done(crp);
-	} else {
-		sc->sc_needwakeup |= CRYPTO_SYMQ;
-	}
-	return (err);
-}
-
-static void
-safe_callback(struct safe_softc *sc, struct safe_ringentry *re)
-{
-	struct cryptop *crp = (struct cryptop *)re->re_crp;
-	struct cryptodesc *crd;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	safestats.st_opackets++;
-	safestats.st_obytes += re->re_dst.mapsize;
-
-	if (re->re_desc.d_csr & SAFE_PE_CSR_STATUS) {
-		device_printf(sc->sc_dev, "csr 0x%x cmd0 0x%x cmd1 0x%x\n",
-			re->re_desc.d_csr,
-			re->re_sa.sa_cmd0, re->re_sa.sa_cmd1);
-		safestats.st_peoperr++;
-		crp->crp_etype = EIO;		/* something more meaningful? */
-	}
-
-	if (re->re_dst.map != NULL && re->re_dst.map != re->re_src.map)
-		pci_unmap_operand(sc, &re->re_dst);
-	pci_unmap_operand(sc, &re->re_src);
-
-	/* 
-	 * If result was written to a differet mbuf chain, swap
-	 * it in as the return value and reclaim the original.
-	 */
-	if ((crp->crp_flags & CRYPTO_F_SKBUF) && re->re_src_skb != re->re_dst_skb) {
-		device_printf(sc->sc_dev, "no CRYPTO_F_SKBUF swapping support\n");
-		/* kfree_skb(skb) */
-		/* crp->crp_buf = (caddr_t)re->re_dst_skb */
-		return;
-	}
-
-	if (re->re_flags & SAFE_QFLAGS_COPYOUTIV) {
-		/* copy out IV for future use */
-		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-			int i;
-			int ivsize;
-
-			if (crd->crd_alg == CRYPTO_DES_CBC ||
-			    crd->crd_alg == CRYPTO_3DES_CBC) {
-				ivsize = 2*sizeof(u_int32_t);
-			} else if (crd->crd_alg == CRYPTO_AES_CBC) {
-				ivsize = 4*sizeof(u_int32_t);
-			} else
-				continue;
-			crypto_copydata(crp->crp_flags, crp->crp_buf,
-			    crd->crd_skip + crd->crd_len - ivsize, ivsize,
-			    (caddr_t)sc->sc_sessions[re->re_sesn].ses_iv);
-			for (i = 0;
-					i < ivsize/sizeof(sc->sc_sessions[re->re_sesn].ses_iv[0]);
-					i++)
-				sc->sc_sessions[re->re_sesn].ses_iv[i] =
-					cpu_to_le32(sc->sc_sessions[re->re_sesn].ses_iv[i]);
-			break;
-		}
-	}
-
-	if (re->re_flags & SAFE_QFLAGS_COPYOUTICV) {
-		/* copy out ICV result */
-		for (crd = crp->crp_desc; crd; crd = crd->crd_next) {
-			if (!(crd->crd_alg == CRYPTO_MD5_HMAC ||
-			    crd->crd_alg == CRYPTO_SHA1_HMAC ||
-			    crd->crd_alg == CRYPTO_NULL_HMAC))
-				continue;
-			if (crd->crd_alg == CRYPTO_SHA1_HMAC) {
-				/*
-				 * SHA-1 ICV's are byte-swapped; fix 'em up
-				 * before copy them to their destination.
-				 */
-				re->re_sastate.sa_saved_indigest[0] =
-					cpu_to_be32(re->re_sastate.sa_saved_indigest[0]);
-				re->re_sastate.sa_saved_indigest[1] = 
-					cpu_to_be32(re->re_sastate.sa_saved_indigest[1]);
-				re->re_sastate.sa_saved_indigest[2] =
-					cpu_to_be32(re->re_sastate.sa_saved_indigest[2]);
-			} else {
-				re->re_sastate.sa_saved_indigest[0] =
-					cpu_to_le32(re->re_sastate.sa_saved_indigest[0]);
-				re->re_sastate.sa_saved_indigest[1] = 
-					cpu_to_le32(re->re_sastate.sa_saved_indigest[1]);
-				re->re_sastate.sa_saved_indigest[2] =
-					cpu_to_le32(re->re_sastate.sa_saved_indigest[2]);
-			}
-			crypto_copyback(crp->crp_flags, crp->crp_buf,
-			    crd->crd_inject,
-			    sc->sc_sessions[re->re_sesn].ses_mlen,
-			    (caddr_t)re->re_sastate.sa_saved_indigest);
-			break;
-		}
-	}
-	crypto_done(crp);
-}
-
-
-#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
-#define	SAFE_RNG_MAXWAIT	1000
-
-static void
-safe_rng_init(struct safe_softc *sc)
-{
-	u_int32_t w, v;
-	int i;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	WRITE_REG(sc, SAFE_RNG_CTRL, 0);
-	/* use default value according to the manual */
-	WRITE_REG(sc, SAFE_RNG_CNFG, 0x834);	/* magic from SafeNet */
-	WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
-
-	/*
-	 * There is a bug in rev 1.0 of the 1140 that when the RNG
-	 * is brought out of reset the ready status flag does not
-	 * work until the RNG has finished its internal initialization.
-	 *
-	 * So in order to determine the device is through its
-	 * initialization we must read the data register, using the
-	 * status reg in the read in case it is initialized.  Then read
-	 * the data register until it changes from the first read.
-	 * Once it changes read the data register until it changes
-	 * again.  At this time the RNG is considered initialized. 
-	 * This could take between 750ms - 1000ms in time.
-	 */
-	i = 0;
-	w = READ_REG(sc, SAFE_RNG_OUT);
-	do {
-		v = READ_REG(sc, SAFE_RNG_OUT);
-		if (v != w) {
-			w = v;
-			break;
-		}
-		DELAY(10);
-	} while (++i < SAFE_RNG_MAXWAIT);
-
-	/* Wait Until data changes again */
-	i = 0;
-	do {
-		v = READ_REG(sc, SAFE_RNG_OUT);
-		if (v != w)
-			break;
-		DELAY(10);
-	} while (++i < SAFE_RNG_MAXWAIT);
-}
-
-static __inline void
-safe_rng_disable_short_cycle(struct safe_softc *sc)
-{
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	WRITE_REG(sc, SAFE_RNG_CTRL,
-		READ_REG(sc, SAFE_RNG_CTRL) &~ SAFE_RNG_CTRL_SHORTEN);
-}
-
-static __inline void
-safe_rng_enable_short_cycle(struct safe_softc *sc)
-{
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	WRITE_REG(sc, SAFE_RNG_CTRL, 
-		READ_REG(sc, SAFE_RNG_CTRL) | SAFE_RNG_CTRL_SHORTEN);
-}
-
-static __inline u_int32_t
-safe_rng_read(struct safe_softc *sc)
-{
-	int i;
-
-	i = 0;
-	while (READ_REG(sc, SAFE_RNG_STAT) != 0 && ++i < SAFE_RNG_MAXWAIT)
-		;
-	return READ_REG(sc, SAFE_RNG_OUT);
-}
-
-static int
-safe_read_random(void *arg, u_int32_t *buf, int maxwords)
-{
-	struct safe_softc *sc = (struct safe_softc *) arg;
-	int i, rc;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-	
-	safestats.st_rng++;
-	/*
-	 * Fetch the next block of data.
-	 */
-	if (maxwords > safe_rngbufsize)
-		maxwords = safe_rngbufsize;
-	if (maxwords > SAFE_RNG_MAXBUFSIZ)
-		maxwords = SAFE_RNG_MAXBUFSIZ;
-retry:
-	/* read as much as we can */
-	for (rc = 0; rc < maxwords; rc++) {
-		if (READ_REG(sc, SAFE_RNG_STAT) != 0)
-			break;
-		buf[rc] = READ_REG(sc, SAFE_RNG_OUT);
-	}
-	if (rc == 0)
-		return 0;
-	/*
-	 * Check the comparator alarm count and reset the h/w if
-	 * it exceeds our threshold.  This guards against the
-	 * hardware oscillators resonating with external signals.
-	 */
-	if (READ_REG(sc, SAFE_RNG_ALM_CNT) > safe_rngmaxalarm) {
-		u_int32_t freq_inc, w;
-
-		DPRINTF(("%s: alarm count %u exceeds threshold %u\n", __func__,
-			(unsigned)READ_REG(sc, SAFE_RNG_ALM_CNT), safe_rngmaxalarm));
-		safestats.st_rngalarm++;
-		safe_rng_enable_short_cycle(sc);
-		freq_inc = 18;
-		for (i = 0; i < 64; i++) {
-			w = READ_REG(sc, SAFE_RNG_CNFG);
-			freq_inc = ((w + freq_inc) & 0x3fL);
-			w = ((w & ~0x3fL) | freq_inc);
-			WRITE_REG(sc, SAFE_RNG_CNFG, w);
-
-			WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
-
-			(void) safe_rng_read(sc);
-			DELAY(25);
-
-			if (READ_REG(sc, SAFE_RNG_ALM_CNT) == 0) {
-				safe_rng_disable_short_cycle(sc);
-				goto retry;
-			}
-			freq_inc = 1;
-		}
-		safe_rng_disable_short_cycle(sc);
-	} else
-		WRITE_REG(sc, SAFE_RNG_ALM_CNT, 0);
-
-	return(rc);
-}
-#endif /* defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG) */
-
-
-/*
- * Resets the board.  Values in the regesters are left as is
- * from the reset (i.e. initial values are assigned elsewhere).
- */
-static void
-safe_reset_board(struct safe_softc *sc)
-{
-	u_int32_t v;
-	/*
-	 * Reset the device.  The manual says no delay
-	 * is needed between marking and clearing reset.
-	 */
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	v = READ_REG(sc, SAFE_PE_DMACFG) &~
-		(SAFE_PE_DMACFG_PERESET | SAFE_PE_DMACFG_PDRRESET |
-		 SAFE_PE_DMACFG_SGRESET);
-	WRITE_REG(sc, SAFE_PE_DMACFG, v
-				    | SAFE_PE_DMACFG_PERESET
-				    | SAFE_PE_DMACFG_PDRRESET
-				    | SAFE_PE_DMACFG_SGRESET);
-	WRITE_REG(sc, SAFE_PE_DMACFG, v);
-}
-
-/*
- * Initialize registers we need to touch only once.
- */
-static void
-safe_init_board(struct safe_softc *sc)
-{
-	u_int32_t v, dwords;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	v = READ_REG(sc, SAFE_PE_DMACFG);
-	v &=~ (   SAFE_PE_DMACFG_PEMODE
-			| SAFE_PE_DMACFG_FSENA		/* failsafe enable */
-			| SAFE_PE_DMACFG_GPRPCI		/* gather ring on PCI */
-			| SAFE_PE_DMACFG_SPRPCI		/* scatter ring on PCI */
-			| SAFE_PE_DMACFG_ESDESC		/* endian-swap descriptors */
-			| SAFE_PE_DMACFG_ESPDESC	/* endian-swap part. desc's */
-			| SAFE_PE_DMACFG_ESSA		/* endian-swap SA's */
-			| SAFE_PE_DMACFG_ESPACKET	/* swap the packet data */
-		  );
-	v |= SAFE_PE_DMACFG_FSENA		/* failsafe enable */
-	  |  SAFE_PE_DMACFG_GPRPCI		/* gather ring on PCI */
-	  |  SAFE_PE_DMACFG_SPRPCI		/* scatter ring on PCI */
-	  |  SAFE_PE_DMACFG_ESDESC		/* endian-swap descriptors */
-	  |  SAFE_PE_DMACFG_ESPDESC		/* endian-swap part. desc's */
-	  |  SAFE_PE_DMACFG_ESSA		/* endian-swap SA's */
-#if 0
-	  |  SAFE_PE_DMACFG_ESPACKET    /* swap the packet data */
-#endif
-	  ;
-	WRITE_REG(sc, SAFE_PE_DMACFG, v);
-
-#ifdef __BIG_ENDIAN
-	/* tell the safenet that we are 4321 and not 1234 */
-	WRITE_REG(sc, SAFE_ENDIAN, 0xe4e41b1b);
-#endif
-
-	if (sc->sc_chiprev == SAFE_REV(1,0)) {
-		/*
-		 * Avoid large PCI DMA transfers.  Rev 1.0 has a bug where
-		 * "target mode transfers" done while the chip is DMA'ing
-		 * >1020 bytes cause the hardware to lockup.  To avoid this
-		 * we reduce the max PCI transfer size and use small source
-		 * particle descriptors (<= 256 bytes).
-		 */
-		WRITE_REG(sc, SAFE_DMA_CFG, 256);
-		device_printf(sc->sc_dev,
-			"Reduce max DMA size to %u words for rev %u.%u WAR\n",
-			(unsigned) ((READ_REG(sc, SAFE_DMA_CFG)>>2) & 0xff),
-			(unsigned) SAFE_REV_MAJ(sc->sc_chiprev),
-			(unsigned) SAFE_REV_MIN(sc->sc_chiprev));
-		sc->sc_max_dsize = 256;
-	} else {
-		sc->sc_max_dsize = SAFE_MAX_DSIZE;
-	}
-
-	/* NB: operands+results are overlaid */
-	WRITE_REG(sc, SAFE_PE_PDRBASE, sc->sc_ringalloc.dma_paddr);
-	WRITE_REG(sc, SAFE_PE_RDRBASE, sc->sc_ringalloc.dma_paddr);
-	/*
-	 * Configure ring entry size and number of items in the ring.
-	 */
-	KASSERT((sizeof(struct safe_ringentry) % sizeof(u_int32_t)) == 0,
-		("PE ring entry not 32-bit aligned!"));
-	dwords = sizeof(struct safe_ringentry) / sizeof(u_int32_t);
-	WRITE_REG(sc, SAFE_PE_RINGCFG,
-		(dwords << SAFE_PE_RINGCFG_OFFSET_S) | SAFE_MAX_NQUEUE);
-	WRITE_REG(sc, SAFE_PE_RINGPOLL, 0);	/* disable polling */
-
-	WRITE_REG(sc, SAFE_PE_GRNGBASE, sc->sc_spalloc.dma_paddr);
-	WRITE_REG(sc, SAFE_PE_SRNGBASE, sc->sc_dpalloc.dma_paddr);
-	WRITE_REG(sc, SAFE_PE_PARTSIZE,
-		(SAFE_TOTAL_DPART<<16) | SAFE_TOTAL_SPART);
-	/*
-	 * NB: destination particles are fixed size.  We use
-	 *     an mbuf cluster and require all results go to
-	 *     clusters or smaller.
-	 */
-	WRITE_REG(sc, SAFE_PE_PARTCFG, sc->sc_max_dsize);
-
-	/* it's now safe to enable PE mode, do it */
-	WRITE_REG(sc, SAFE_PE_DMACFG, v | SAFE_PE_DMACFG_PEMODE);
-
-	/*
-	 * Configure hardware to use level-triggered interrupts and
-	 * to interrupt after each descriptor is processed.
-	 */
-	WRITE_REG(sc, SAFE_HI_CFG, SAFE_HI_CFG_LEVEL);
-	WRITE_REG(sc, SAFE_HI_CLR, 0xffffffff);
-	WRITE_REG(sc, SAFE_HI_DESC_CNT, 1);
-	WRITE_REG(sc, SAFE_HI_MASK, SAFE_INT_PE_DDONE | SAFE_INT_PE_ERROR);
-}
-
-
-/*
- * Clean up after a chip crash.
- * It is assumed that the caller in splimp()
- */
-static void
-safe_cleanchip(struct safe_softc *sc)
-{
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (sc->sc_nqchip != 0) {
-		struct safe_ringentry *re = sc->sc_back;
-
-		while (re != sc->sc_front) {
-			if (re->re_desc.d_csr != 0)
-				safe_free_entry(sc, re);
-			if (++re == sc->sc_ringtop)
-				re = sc->sc_ring;
-		}
-		sc->sc_back = re;
-		sc->sc_nqchip = 0;
-	}
-}
-
-/*
- * free a safe_q
- * It is assumed that the caller is within splimp().
- */
-static int
-safe_free_entry(struct safe_softc *sc, struct safe_ringentry *re)
-{
-	struct cryptop *crp;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	/*
-	 * Free header MCR
-	 */
-	if ((re->re_dst_skb != NULL) && (re->re_src_skb != re->re_dst_skb))
-#ifdef NOTYET
-		m_freem(re->re_dst_m);
-#else
-		printk("%s,%d: SKB not supported\n", __FILE__, __LINE__);
-#endif
-
-	crp = (struct cryptop *)re->re_crp;
-	
-	re->re_desc.d_csr = 0;
-	
-	crp->crp_etype = EFAULT;
-	crypto_done(crp);
-	return(0);
-}
-
-/*
- * Routine to reset the chip and clean up.
- * It is assumed that the caller is in splimp()
- */
-static void
-safe_totalreset(struct safe_softc *sc)
-{
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	safe_reset_board(sc);
-	safe_init_board(sc);
-	safe_cleanchip(sc);
-}
-
-/*
- * Is the operand suitable aligned for direct DMA.  Each
- * segment must be aligned on a 32-bit boundary and all
- * but the last segment must be a multiple of 4 bytes.
- */
-static int
-safe_dmamap_aligned(struct safe_softc *sc, const struct safe_operand *op)
-{
-	int i;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	for (i = 0; i < op->nsegs; i++) {
-		if (op->segs[i].ds_addr & 3)
-			return (0);
-		if (i != (op->nsegs - 1) && (op->segs[i].ds_len & 3))
-			return (0);
-	}
-	return (1);
-}
-
-/*
- * Is the operand suitable for direct DMA as the destination
- * of an operation.  The hardware requires that each ``particle''
- * but the last in an operation result have the same size.  We
- * fix that size at SAFE_MAX_DSIZE bytes.  This routine returns
- * 0 if some segment is not a multiple of of this size, 1 if all
- * segments are exactly this size, or 2 if segments are at worst
- * a multple of this size.
- */
-static int
-safe_dmamap_uniform(struct safe_softc *sc, const struct safe_operand *op)
-{
-	int result = 1;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (op->nsegs > 0) {
-		int i;
-
-		for (i = 0; i < op->nsegs-1; i++) {
-			if (op->segs[i].ds_len % sc->sc_max_dsize)
-				return (0);
-			if (op->segs[i].ds_len != sc->sc_max_dsize)
-				result = 2;
-		}
-	}
-	return (result);
-}
-
-static int
-safe_kprocess(device_t dev, struct cryptkop *krp, int hint)
-{
-	struct safe_softc *sc = device_get_softc(dev);
-	struct safe_pkq *q;
-	unsigned long flags;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (sc == NULL) {
-		krp->krp_status = EINVAL;
-		goto err;
-	}
-
-	if (krp->krp_op != CRK_MOD_EXP) {
-		krp->krp_status = EOPNOTSUPP;
-		goto err;
-	}
-
-	q = (struct safe_pkq *) kmalloc(sizeof(*q), GFP_KERNEL);
-	if (q == NULL) {
-		krp->krp_status = ENOMEM;
-		goto err;
-	}
-	memset(q, 0, sizeof(*q));
-	q->pkq_krp = krp;
-	INIT_LIST_HEAD(&q->pkq_list);
-
-	spin_lock_irqsave(&sc->sc_pkmtx, flags);
-	list_add_tail(&q->pkq_list, &sc->sc_pkq);
-	safe_kfeed(sc);
-	spin_unlock_irqrestore(&sc->sc_pkmtx, flags);
-	return (0);
-
-err:
-	crypto_kdone(krp);
-	return (0);
-}
-
-#define	SAFE_CRK_PARAM_BASE	0
-#define	SAFE_CRK_PARAM_EXP	1
-#define	SAFE_CRK_PARAM_MOD	2
-
-static int
-safe_kstart(struct safe_softc *sc)
-{
-	struct cryptkop *krp = sc->sc_pkq_cur->pkq_krp;
-	int exp_bits, mod_bits, base_bits;
-	u_int32_t op, a_off, b_off, c_off, d_off;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (krp->krp_iparams < 3 || krp->krp_oparams != 1) {
-		krp->krp_status = EINVAL;
-		return (1);
-	}
-
-	base_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_BASE]);
-	if (base_bits > 2048)
-		goto too_big;
-	if (base_bits <= 0)		/* 5. base not zero */
-		goto too_small;
-
-	exp_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_EXP]);
-	if (exp_bits > 2048)
-		goto too_big;
-	if (exp_bits <= 0)		/* 1. exponent word length > 0 */
-		goto too_small;		/* 4. exponent not zero */
-
-	mod_bits = safe_ksigbits(sc, &krp->krp_param[SAFE_CRK_PARAM_MOD]);
-	if (mod_bits > 2048)
-		goto too_big;
-	if (mod_bits <= 32)		/* 2. modulus word length > 1 */
-		goto too_small;		/* 8. MSW of modulus != zero */
-	if (mod_bits < exp_bits)	/* 3 modulus len >= exponent len */
-		goto too_small;
-	if ((krp->krp_param[SAFE_CRK_PARAM_MOD].crp_p[0] & 1) == 0)
-		goto bad_domain;	/* 6. modulus is odd */
-	if (mod_bits > krp->krp_param[krp->krp_iparams].crp_nbits)
-		goto too_small;		/* make sure result will fit */
-
-	/* 7. modulus > base */
-	if (mod_bits < base_bits)
-		goto too_small;
-	if (mod_bits == base_bits) {
-		u_int8_t *basep, *modp;
-		int i;
-
-		basep = krp->krp_param[SAFE_CRK_PARAM_BASE].crp_p +
-		    ((base_bits + 7) / 8) - 1;
-		modp = krp->krp_param[SAFE_CRK_PARAM_MOD].crp_p +
-		    ((mod_bits + 7) / 8) - 1;
-		
-		for (i = 0; i < (mod_bits + 7) / 8; i++, basep--, modp--) {
-			if (*modp < *basep)
-				goto too_small;
-			if (*modp > *basep)
-				break;
-		}
-	}
-
-	/* And on the 9th step, he rested. */
-
-	WRITE_REG(sc, SAFE_PK_A_LEN, (exp_bits + 31) / 32);
-	WRITE_REG(sc, SAFE_PK_B_LEN, (mod_bits + 31) / 32);
-	if (mod_bits > 1024) {
-		op = SAFE_PK_FUNC_EXP4;
-		a_off = 0x000;
-		b_off = 0x100;
-		c_off = 0x200;
-		d_off = 0x300;
-	} else {
-		op = SAFE_PK_FUNC_EXP16;
-		a_off = 0x000;
-		b_off = 0x080;
-		c_off = 0x100;
-		d_off = 0x180;
-	}
-	sc->sc_pk_reslen = b_off - a_off;
-	sc->sc_pk_resoff = d_off;
-
-	/* A is exponent, B is modulus, C is base, D is result */
-	safe_kload_reg(sc, a_off, b_off - a_off,
-	    &krp->krp_param[SAFE_CRK_PARAM_EXP]);
-	WRITE_REG(sc, SAFE_PK_A_ADDR, a_off >> 2);
-	safe_kload_reg(sc, b_off, b_off - a_off,
-	    &krp->krp_param[SAFE_CRK_PARAM_MOD]);
-	WRITE_REG(sc, SAFE_PK_B_ADDR, b_off >> 2);
-	safe_kload_reg(sc, c_off, b_off - a_off,
-	    &krp->krp_param[SAFE_CRK_PARAM_BASE]);
-	WRITE_REG(sc, SAFE_PK_C_ADDR, c_off >> 2);
-	WRITE_REG(sc, SAFE_PK_D_ADDR, d_off >> 2);
-
-	WRITE_REG(sc, SAFE_PK_FUNC, op | SAFE_PK_FUNC_RUN);
-
-	return (0);
-
-too_big:
-	krp->krp_status = E2BIG;
-	return (1);
-too_small:
-	krp->krp_status = ERANGE;
-	return (1);
-bad_domain:
-	krp->krp_status = EDOM;
-	return (1);
-}
-
-static int
-safe_ksigbits(struct safe_softc *sc, struct crparam *cr)
-{
-	u_int plen = (cr->crp_nbits + 7) / 8;
-	int i, sig = plen * 8;
-	u_int8_t c, *p = cr->crp_p;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	for (i = plen - 1; i >= 0; i--) {
-		c = p[i];
-		if (c != 0) {
-			while ((c & 0x80) == 0) {
-				sig--;
-				c <<= 1;
-			}
-			break;
-		}
-		sig -= 8;
-	}
-	return (sig);
-}
-
-static void
-safe_kfeed(struct safe_softc *sc)
-{
-	struct safe_pkq *q, *tmp;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (list_empty(&sc->sc_pkq) && sc->sc_pkq_cur == NULL)
-		return;
-	if (sc->sc_pkq_cur != NULL)
-		return;
-	list_for_each_entry_safe(q, tmp, &sc->sc_pkq, pkq_list) {
-		sc->sc_pkq_cur = q;
-		list_del(&q->pkq_list);
-		if (safe_kstart(sc) != 0) {
-			crypto_kdone(q->pkq_krp);
-			kfree(q);
-			sc->sc_pkq_cur = NULL;
-		} else {
-			/* op started, start polling */
-			mod_timer(&sc->sc_pkto, jiffies + 1);
-			break;
-		}
-	}
-}
-
-static void
-safe_kpoll(unsigned long arg)
-{
-	struct safe_softc *sc = NULL;
-	struct safe_pkq *q;
-	struct crparam *res;
-	int i;
-	u_int32_t buf[64];
-	unsigned long flags;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (arg >= SAFE_MAX_CHIPS)
-		return;
-	sc = safe_chip_idx[arg];
-	if (!sc) {
-		DPRINTF(("%s() - bad callback\n", __FUNCTION__));
-		return;
-	}
-
-	spin_lock_irqsave(&sc->sc_pkmtx, flags);
-	if (sc->sc_pkq_cur == NULL)
-		goto out;
-	if (READ_REG(sc, SAFE_PK_FUNC) & SAFE_PK_FUNC_RUN) {
-		/* still running, check back later */
-		mod_timer(&sc->sc_pkto, jiffies + 1);
-		goto out;
-	}
-
-	q = sc->sc_pkq_cur;
-	res = &q->pkq_krp->krp_param[q->pkq_krp->krp_iparams];
-	bzero(buf, sizeof(buf));
-	bzero(res->crp_p, (res->crp_nbits + 7) / 8);
-	for (i = 0; i < sc->sc_pk_reslen >> 2; i++)
-		buf[i] = le32_to_cpu(READ_REG(sc, SAFE_PK_RAM_START +
-		    sc->sc_pk_resoff + (i << 2)));
-	bcopy(buf, res->crp_p, (res->crp_nbits + 7) / 8);
-	/*
-	 * reduce the bits that need copying if possible
-	 */
-	res->crp_nbits = min(res->crp_nbits,sc->sc_pk_reslen * 8);
-	res->crp_nbits = safe_ksigbits(sc, res);
-
-	for (i = SAFE_PK_RAM_START; i < SAFE_PK_RAM_END; i += 4)
-		WRITE_REG(sc, i, 0);
-
-	crypto_kdone(q->pkq_krp);
-	kfree(q);
-	sc->sc_pkq_cur = NULL;
-
-	safe_kfeed(sc);
-out:
-	spin_unlock_irqrestore(&sc->sc_pkmtx, flags);
-}
-
-static void
-safe_kload_reg(struct safe_softc *sc, u_int32_t off, u_int32_t len,
-    struct crparam *n)
-{
-	u_int32_t buf[64], i;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	bzero(buf, sizeof(buf));
-	bcopy(n->crp_p, buf, (n->crp_nbits + 7) / 8);
-
-	for (i = 0; i < len >> 2; i++)
-		WRITE_REG(sc, SAFE_PK_RAM_START + off + (i << 2),
-		    cpu_to_le32(buf[i]));
-}
-
-#ifdef SAFE_DEBUG
-static void
-safe_dump_dmastatus(struct safe_softc *sc, const char *tag)
-{
-	printf("%s: ENDIAN 0x%x SRC 0x%x DST 0x%x STAT 0x%x\n"
-		, tag
-		, READ_REG(sc, SAFE_DMA_ENDIAN)
-		, READ_REG(sc, SAFE_DMA_SRCADDR)
-		, READ_REG(sc, SAFE_DMA_DSTADDR)
-		, READ_REG(sc, SAFE_DMA_STAT)
-	);
-}
-
-static void
-safe_dump_intrstate(struct safe_softc *sc, const char *tag)
-{
-	printf("%s: HI_CFG 0x%x HI_MASK 0x%x HI_DESC_CNT 0x%x HU_STAT 0x%x HM_STAT 0x%x\n"
-		, tag
-		, READ_REG(sc, SAFE_HI_CFG)
-		, READ_REG(sc, SAFE_HI_MASK)
-		, READ_REG(sc, SAFE_HI_DESC_CNT)
-		, READ_REG(sc, SAFE_HU_STAT)
-		, READ_REG(sc, SAFE_HM_STAT)
-	);
-}
-
-static void
-safe_dump_ringstate(struct safe_softc *sc, const char *tag)
-{
-	u_int32_t estat = READ_REG(sc, SAFE_PE_ERNGSTAT);
-
-	/* NB: assume caller has lock on ring */
-	printf("%s: ERNGSTAT %x (next %u) back %lu front %lu\n",
-		tag,
-		estat, (estat >> SAFE_PE_ERNGSTAT_NEXT_S),
-		(unsigned long)(sc->sc_back - sc->sc_ring),
-		(unsigned long)(sc->sc_front - sc->sc_ring));
-}
-
-static void
-safe_dump_request(struct safe_softc *sc, const char* tag, struct safe_ringentry *re)
-{
-	int ix, nsegs;
-
-	ix = re - sc->sc_ring;
-	printf("%s: %p (%u): csr %x src %x dst %x sa %x len %x\n"
-		, tag
-		, re, ix
-		, re->re_desc.d_csr
-		, re->re_desc.d_src
-		, re->re_desc.d_dst
-		, re->re_desc.d_sa
-		, re->re_desc.d_len
-	);
-	if (re->re_src.nsegs > 1) {
-		ix = (re->re_desc.d_src - sc->sc_spalloc.dma_paddr) /
-			sizeof(struct safe_pdesc);
-		for (nsegs = re->re_src.nsegs; nsegs; nsegs--) {
-			printf(" spd[%u] %p: %p size %u flags %x"
-				, ix, &sc->sc_spring[ix]
-				, (caddr_t)(uintptr_t) sc->sc_spring[ix].pd_addr
-				, sc->sc_spring[ix].pd_size
-				, sc->sc_spring[ix].pd_flags
-			);
-			if (sc->sc_spring[ix].pd_size == 0)
-				printf(" (zero!)");
-			printf("\n");
-			if (++ix == SAFE_TOTAL_SPART)
-				ix = 0;
-		}
-	}
-	if (re->re_dst.nsegs > 1) {
-		ix = (re->re_desc.d_dst - sc->sc_dpalloc.dma_paddr) /
-			sizeof(struct safe_pdesc);
-		for (nsegs = re->re_dst.nsegs; nsegs; nsegs--) {
-			printf(" dpd[%u] %p: %p flags %x\n"
-				, ix, &sc->sc_dpring[ix]
-				, (caddr_t)(uintptr_t) sc->sc_dpring[ix].pd_addr
-				, sc->sc_dpring[ix].pd_flags
-			);
-			if (++ix == SAFE_TOTAL_DPART)
-				ix = 0;
-		}
-	}
-	printf("sa: cmd0 %08x cmd1 %08x staterec %x\n",
-		re->re_sa.sa_cmd0, re->re_sa.sa_cmd1, re->re_sa.sa_staterec);
-	printf("sa: key %x %x %x %x %x %x %x %x\n"
-		, re->re_sa.sa_key[0]
-		, re->re_sa.sa_key[1]
-		, re->re_sa.sa_key[2]
-		, re->re_sa.sa_key[3]
-		, re->re_sa.sa_key[4]
-		, re->re_sa.sa_key[5]
-		, re->re_sa.sa_key[6]
-		, re->re_sa.sa_key[7]
-	);
-	printf("sa: indigest %x %x %x %x %x\n"
-		, re->re_sa.sa_indigest[0]
-		, re->re_sa.sa_indigest[1]
-		, re->re_sa.sa_indigest[2]
-		, re->re_sa.sa_indigest[3]
-		, re->re_sa.sa_indigest[4]
-	);
-	printf("sa: outdigest %x %x %x %x %x\n"
-		, re->re_sa.sa_outdigest[0]
-		, re->re_sa.sa_outdigest[1]
-		, re->re_sa.sa_outdigest[2]
-		, re->re_sa.sa_outdigest[3]
-		, re->re_sa.sa_outdigest[4]
-	);
-	printf("sr: iv %x %x %x %x\n"
-		, re->re_sastate.sa_saved_iv[0]
-		, re->re_sastate.sa_saved_iv[1]
-		, re->re_sastate.sa_saved_iv[2]
-		, re->re_sastate.sa_saved_iv[3]
-	);
-	printf("sr: hashbc %u indigest %x %x %x %x %x\n"
-		, re->re_sastate.sa_saved_hashbc
-		, re->re_sastate.sa_saved_indigest[0]
-		, re->re_sastate.sa_saved_indigest[1]
-		, re->re_sastate.sa_saved_indigest[2]
-		, re->re_sastate.sa_saved_indigest[3]
-		, re->re_sastate.sa_saved_indigest[4]
-	);
-}
-
-static void
-safe_dump_ring(struct safe_softc *sc, const char *tag)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&sc->sc_ringmtx, flags);
-	printf("\nSafeNet Ring State:\n");
-	safe_dump_intrstate(sc, tag);
-	safe_dump_dmastatus(sc, tag);
-	safe_dump_ringstate(sc, tag);
-	if (sc->sc_nqchip) {
-		struct safe_ringentry *re = sc->sc_back;
-		do {
-			safe_dump_request(sc, tag, re);
-			if (++re == sc->sc_ringtop)
-				re = sc->sc_ring;
-		} while (re != sc->sc_front);
-	}
-	spin_unlock_irqrestore(&sc->sc_ringmtx, flags);
-}
-#endif /* SAFE_DEBUG */
-
-
-static int safe_probe(struct pci_dev *dev, const struct pci_device_id *ent)
-{
-	struct safe_softc *sc = NULL;
-	u32 mem_start, mem_len, cmd;
-	int i, rc, devinfo;
-	dma_addr_t raddr;
-	static int num_chips = 0;
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	if (pci_enable_device(dev) < 0)
-		return(-ENODEV);
-
-	if (!dev->irq) {
-		printk("safe: found device with no IRQ assigned. check BIOS settings!");
-		pci_disable_device(dev);
-		return(-ENODEV);
-	}
-
-	if (pci_set_mwi(dev)) {
-		printk("safe: pci_set_mwi failed!");
-		return(-ENODEV);
-	}
-
-	sc = (struct safe_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
-	if (!sc)
-		return(-ENOMEM);
-	memset(sc, 0, sizeof(*sc));
-
-	softc_device_init(sc, "safe", num_chips, safe_methods);
-
-	sc->sc_irq = -1;
-	sc->sc_cid = -1;
-	sc->sc_pcidev = dev;
-	if (num_chips < SAFE_MAX_CHIPS) {
-		safe_chip_idx[device_get_unit(sc->sc_dev)] = sc;
-		num_chips++;
-	}
-
-	INIT_LIST_HEAD(&sc->sc_pkq);
-	spin_lock_init(&sc->sc_pkmtx);
-
-	pci_set_drvdata(sc->sc_pcidev, sc);
-
-	/* we read its hardware registers as memory */
-	mem_start = pci_resource_start(sc->sc_pcidev, 0);
-	mem_len   = pci_resource_len(sc->sc_pcidev, 0);
-
-	sc->sc_base_addr = (ocf_iomem_t) ioremap(mem_start, mem_len);
-	if (!sc->sc_base_addr) {
-		device_printf(sc->sc_dev, "failed to ioremap 0x%x-0x%x\n",
-				mem_start, mem_start + mem_len - 1);
-		goto out;
-	}
-
-	/* fix up the bus size */
-	if (pci_set_dma_mask(sc->sc_pcidev, DMA_32BIT_MASK)) {
-		device_printf(sc->sc_dev, "No usable DMA configuration, aborting.\n");
-		goto out;
-	}
-	if (pci_set_consistent_dma_mask(sc->sc_pcidev, DMA_32BIT_MASK)) {
-		device_printf(sc->sc_dev, "No usable consistent DMA configuration, aborting.\n");
-		goto out;
-	}
-
-	pci_set_master(sc->sc_pcidev);
-
-	pci_read_config_dword(sc->sc_pcidev, PCI_COMMAND, &cmd);
-
-	if (!(cmd & PCI_COMMAND_MEMORY)) {
-		device_printf(sc->sc_dev, "failed to enable memory mapping\n");
-		goto out;
-	}
-
-	if (!(cmd & PCI_COMMAND_MASTER)) {
-		device_printf(sc->sc_dev, "failed to enable bus mastering\n");
-		goto out;
-	}
-
-	rc = request_irq(dev->irq, safe_intr, IRQF_SHARED, "safe", sc);
-	if (rc) {
-		device_printf(sc->sc_dev, "failed to hook irq %d\n", sc->sc_irq);
-		goto out;
-	}
-	sc->sc_irq = dev->irq;
-
-	sc->sc_chiprev = READ_REG(sc, SAFE_DEVINFO) &
-			(SAFE_DEVINFO_REV_MAJ | SAFE_DEVINFO_REV_MIN);
-
-	/*
-	 * Allocate packet engine descriptors.
-	 */
-	sc->sc_ringalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
-			SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
-			&sc->sc_ringalloc.dma_paddr);
-	if (!sc->sc_ringalloc.dma_vaddr) {
-		device_printf(sc->sc_dev, "cannot allocate PE descriptor ring\n");
-		goto out;
-	}
-
-	/*
-	 * Hookup the static portion of all our data structures.
-	 */
-	sc->sc_ring = (struct safe_ringentry *) sc->sc_ringalloc.dma_vaddr;
-	sc->sc_ringtop = sc->sc_ring + SAFE_MAX_NQUEUE;
-	sc->sc_front = sc->sc_ring;
-	sc->sc_back = sc->sc_ring;
-	raddr = sc->sc_ringalloc.dma_paddr;
-	bzero(sc->sc_ring, SAFE_MAX_NQUEUE * sizeof(struct safe_ringentry));
-	for (i = 0; i < SAFE_MAX_NQUEUE; i++) {
-		struct safe_ringentry *re = &sc->sc_ring[i];
-
-		re->re_desc.d_sa = raddr +
-			offsetof(struct safe_ringentry, re_sa);
-		re->re_sa.sa_staterec = raddr +
-			offsetof(struct safe_ringentry, re_sastate);
-
-		raddr += sizeof (struct safe_ringentry);
-	}
-	spin_lock_init(&sc->sc_ringmtx);
-
-	/*
-	 * Allocate scatter and gather particle descriptors.
-	 */
-	sc->sc_spalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
-			SAFE_TOTAL_SPART * sizeof (struct safe_pdesc),
-			&sc->sc_spalloc.dma_paddr);
-	if (!sc->sc_spalloc.dma_vaddr) {
-		device_printf(sc->sc_dev, "cannot allocate source particle descriptor ring\n");
-		goto out;
-	}
-	sc->sc_spring = (struct safe_pdesc *) sc->sc_spalloc.dma_vaddr;
-	sc->sc_springtop = sc->sc_spring + SAFE_TOTAL_SPART;
-	sc->sc_spfree = sc->sc_spring;
-	bzero(sc->sc_spring, SAFE_TOTAL_SPART * sizeof(struct safe_pdesc));
-
-	sc->sc_dpalloc.dma_vaddr = pci_alloc_consistent(sc->sc_pcidev,
-			SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
-			&sc->sc_dpalloc.dma_paddr);
-	if (!sc->sc_dpalloc.dma_vaddr) {
-		device_printf(sc->sc_dev, "cannot allocate destination particle descriptor ring\n");
-		goto out;
-	}
-	sc->sc_dpring = (struct safe_pdesc *) sc->sc_dpalloc.dma_vaddr;
-	sc->sc_dpringtop = sc->sc_dpring + SAFE_TOTAL_DPART;
-	sc->sc_dpfree = sc->sc_dpring;
-	bzero(sc->sc_dpring, SAFE_TOTAL_DPART * sizeof(struct safe_pdesc));
-
-	sc->sc_cid = crypto_get_driverid(softc_get_device(sc), CRYPTOCAP_F_HARDWARE);
-	if (sc->sc_cid < 0) {
-		device_printf(sc->sc_dev, "could not get crypto driver id\n");
-		goto out;
-	}
-
-	printf("%s:", device_get_nameunit(sc->sc_dev));
-
-	devinfo = READ_REG(sc, SAFE_DEVINFO);
-	if (devinfo & SAFE_DEVINFO_RNG) {
-		sc->sc_flags |= SAFE_FLAGS_RNG;
-		printf(" rng");
-	}
-	if (devinfo & SAFE_DEVINFO_PKEY) {
-		printf(" key");
-		sc->sc_flags |= SAFE_FLAGS_KEY;
-		crypto_kregister(sc->sc_cid, CRK_MOD_EXP, 0);
-#if 0
-		crypto_kregister(sc->sc_cid, CRK_MOD_EXP_CRT, 0);
-#endif
-		init_timer(&sc->sc_pkto);
-		sc->sc_pkto.function = safe_kpoll;
-		sc->sc_pkto.data = (unsigned long) device_get_unit(sc->sc_dev);
-	}
-	if (devinfo & SAFE_DEVINFO_DES) {
-		printf(" des/3des");
-		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
-	}
-	if (devinfo & SAFE_DEVINFO_AES) {
-		printf(" aes");
-		crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
-	}
-	if (devinfo & SAFE_DEVINFO_MD5) {
-		printf(" md5");
-		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
-	}
-	if (devinfo & SAFE_DEVINFO_SHA1) {
-		printf(" sha1");
-		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
-	}
-	printf(" null");
-	crypto_register(sc->sc_cid, CRYPTO_NULL_CBC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_NULL_HMAC, 0, 0);
-	/* XXX other supported algorithms */
-	printf("\n");
-
-	safe_reset_board(sc);		/* reset h/w */
-	safe_init_board(sc);		/* init h/w */
-
-#if defined(CONFIG_OCF_RANDOMHARVEST) && !defined(SAFE_NO_RNG)
-	if (sc->sc_flags & SAFE_FLAGS_RNG) {
-		safe_rng_init(sc);
-		crypto_rregister(sc->sc_cid, safe_read_random, sc);
-	}
-#endif /* SAFE_NO_RNG */
-
-	return (0);
-
-out:
-	if (sc->sc_cid >= 0)
-		crypto_unregister_all(sc->sc_cid);
-	if (sc->sc_irq != -1)
-		free_irq(sc->sc_irq, sc);
-	if (sc->sc_ringalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
-				sc->sc_ringalloc.dma_vaddr, sc->sc_ringalloc.dma_paddr);
-	if (sc->sc_spalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
-				sc->sc_spalloc.dma_vaddr, sc->sc_spalloc.dma_paddr);
-	if (sc->sc_dpalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
-				sc->sc_dpalloc.dma_vaddr, sc->sc_dpalloc.dma_paddr);
-	kfree(sc);
-	return(-ENODEV);
-}
-
-static void safe_remove(struct pci_dev *dev)
-{
-	struct safe_softc *sc = pci_get_drvdata(dev);
-
-	DPRINTF(("%s()\n", __FUNCTION__));
-
-	/* XXX wait/abort active ops */
-
-	WRITE_REG(sc, SAFE_HI_MASK, 0);		/* disable interrupts */
-
-	del_timer_sync(&sc->sc_pkto);
-
-	crypto_unregister_all(sc->sc_cid);
-
-	safe_cleanchip(sc);
-
-	if (sc->sc_irq != -1)
-		free_irq(sc->sc_irq, sc);
-	if (sc->sc_ringalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_MAX_NQUEUE * sizeof (struct safe_ringentry),
-				sc->sc_ringalloc.dma_vaddr, sc->sc_ringalloc.dma_paddr);
-	if (sc->sc_spalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
-				sc->sc_spalloc.dma_vaddr, sc->sc_spalloc.dma_paddr);
-	if (sc->sc_dpalloc.dma_vaddr)
-		pci_free_consistent(sc->sc_pcidev,
-				SAFE_TOTAL_DPART * sizeof (struct safe_pdesc),
-				sc->sc_dpalloc.dma_vaddr, sc->sc_dpalloc.dma_paddr);
-	sc->sc_irq = -1;
-	sc->sc_ringalloc.dma_vaddr = NULL;
-	sc->sc_spalloc.dma_vaddr = NULL;
-	sc->sc_dpalloc.dma_vaddr = NULL;
-}
-
-static struct pci_device_id safe_pci_tbl[] = {
-	{ PCI_VENDOR_SAFENET, PCI_PRODUCT_SAFEXCEL,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ },
-};
-MODULE_DEVICE_TABLE(pci, safe_pci_tbl);
-
-static struct pci_driver safe_driver = {
-	.name         = "safe",
-	.id_table     = safe_pci_tbl,
-	.probe        =	safe_probe,
-	.remove       = safe_remove,
-	/* add PM stuff here one day */
-};
-
-static int __init safe_init (void)
-{
-	struct safe_softc *sc = NULL;
-	int rc;
-
-	DPRINTF(("%s(%p)\n", __FUNCTION__, safe_init));
-
-	rc = pci_register_driver(&safe_driver);
-	pci_register_driver_compat(&safe_driver, rc);
-
-	return rc;
-}
-
-static void __exit safe_exit (void)
-{
-	pci_unregister_driver(&safe_driver);
-}
-
-module_init(safe_init);
-module_exit(safe_exit);
-
-MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
-MODULE_DESCRIPTION("OCF driver for safenet PCI crypto devices");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/safereg.h b/target/linux/generic-2.6/files/crypto/ocf/safe/safereg.h
deleted file mode 100644
index dbaf98fe78..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/safereg.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*-
- * Copyright (c) 2003 Sam Leffler, Errno Consulting
- * Copyright (c) 2003 Global Technology Associates, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/dev/safe/safereg.h,v 1.1 2003/07/21 21:46:07 sam Exp $
- */
-#ifndef _SAFE_SAFEREG_H_
-#define	_SAFE_SAFEREG_H_
-
-/*
- * Register definitions for SafeNet SafeXcel-1141 crypto device.
- * Definitions from revision 1.3 (Nov 6 2002) of the User's Manual.
- */
-
-#define BS_BAR			0x10	/* DMA base address register */
-#define	BS_TRDY_TIMEOUT		0x40	/* TRDY timeout */
-#define	BS_RETRY_TIMEOUT	0x41	/* DMA retry timeout */
-
-#define	PCI_VENDOR_SAFENET	0x16ae		/* SafeNet, Inc. */
-
-/* SafeNet */
-#define	PCI_PRODUCT_SAFEXCEL	0x1141		/* 1141 */
-
-#define	SAFE_PE_CSR		0x0000	/* Packet Enginge Ctrl/Status */
-#define	SAFE_PE_SRC		0x0004	/* Packet Engine Source */
-#define	SAFE_PE_DST		0x0008	/* Packet Engine Destination */
-#define	SAFE_PE_SA		0x000c	/* Packet Engine SA */
-#define	SAFE_PE_LEN		0x0010	/* Packet Engine Length */
-#define	SAFE_PE_DMACFG		0x0040	/* Packet Engine DMA Configuration */
-#define	SAFE_PE_DMASTAT		0x0044	/* Packet Engine DMA Status */
-#define	SAFE_PE_PDRBASE		0x0048	/* Packet Engine Descriptor Ring Base */
-#define	SAFE_PE_RDRBASE		0x004c	/* Packet Engine Result Ring Base */
-#define	SAFE_PE_RINGCFG		0x0050	/* Packet Engine Ring Configuration */
-#define	SAFE_PE_RINGPOLL	0x0054	/* Packet Engine Ring Poll */
-#define	SAFE_PE_IRNGSTAT	0x0058	/* Packet Engine Internal Ring Status */
-#define	SAFE_PE_ERNGSTAT	0x005c	/* Packet Engine External Ring Status */
-#define	SAFE_PE_IOTHRESH	0x0060	/* Packet Engine I/O Threshold */
-#define	SAFE_PE_GRNGBASE	0x0064	/* Packet Engine Gather Ring Base */
-#define	SAFE_PE_SRNGBASE	0x0068	/* Packet Engine Scatter Ring Base */
-#define	SAFE_PE_PARTSIZE	0x006c	/* Packet Engine Particlar Ring Size */
-#define	SAFE_PE_PARTCFG		0x0070	/* Packet Engine Particle Ring Config */
-#define	SAFE_CRYPTO_CTRL	0x0080	/* Crypto Control */
-#define	SAFE_DEVID		0x0084	/* Device ID */
-#define	SAFE_DEVINFO		0x0088	/* Device Info */
-#define	SAFE_HU_STAT		0x00a0	/* Host Unmasked Status */
-#define	SAFE_HM_STAT		0x00a4	/* Host Masked Status (read-only) */
-#define	SAFE_HI_CLR		0x00a4	/* Host Clear Interrupt (write-only) */
-#define	SAFE_HI_MASK		0x00a8	/* Host Mask Control */
-#define	SAFE_HI_CFG		0x00ac	/* Interrupt Configuration */
-#define	SAFE_HI_RD_DESCR	0x00b4	/* Force Descriptor Read */
-#define	SAFE_HI_DESC_CNT	0x00b8	/* Host Descriptor Done Count */
-#define	SAFE_DMA_ENDIAN		0x00c0	/* Master Endian Status */
-#define	SAFE_DMA_SRCADDR	0x00c4	/* DMA Source Address Status */
-#define	SAFE_DMA_DSTADDR	0x00c8	/* DMA Destination Address Status */
-#define	SAFE_DMA_STAT		0x00cc	/* DMA Current Status */
-#define	SAFE_DMA_CFG		0x00d4	/* DMA Configuration/Status */
-#define	SAFE_ENDIAN		0x00e0	/* Endian Configuration */
-#define	SAFE_PK_A_ADDR		0x0800	/* Public Key A Address */
-#define	SAFE_PK_B_ADDR		0x0804	/* Public Key B Address */
-#define	SAFE_PK_C_ADDR		0x0808	/* Public Key C Address */
-#define	SAFE_PK_D_ADDR		0x080c	/* Public Key D Address */
-#define	SAFE_PK_A_LEN		0x0810	/* Public Key A Length */
-#define	SAFE_PK_B_LEN		0x0814	/* Public Key B Length */
-#define	SAFE_PK_SHIFT		0x0818	/* Public Key Shift */
-#define	SAFE_PK_FUNC		0x081c	/* Public Key Function */
-#define SAFE_PK_RAM_START	0x1000	/* Public Key RAM start address */
-#define SAFE_PK_RAM_END		0x1fff	/* Public Key RAM end address */
-
-#define	SAFE_RNG_OUT		0x0100	/* RNG Output */
-#define	SAFE_RNG_STAT		0x0104	/* RNG Status */
-#define	SAFE_RNG_CTRL		0x0108	/* RNG Control */
-#define	SAFE_RNG_A		0x010c	/* RNG A */
-#define	SAFE_RNG_B		0x0110	/* RNG B */
-#define	SAFE_RNG_X_LO		0x0114	/* RNG X [31:0] */
-#define	SAFE_RNG_X_MID		0x0118	/* RNG X [63:32] */
-#define	SAFE_RNG_X_HI		0x011c	/* RNG X [80:64] */
-#define	SAFE_RNG_X_CNTR		0x0120	/* RNG Counter */
-#define	SAFE_RNG_ALM_CNT	0x0124	/* RNG Alarm Count */
-#define	SAFE_RNG_CNFG		0x0128	/* RNG Configuration */
-#define	SAFE_RNG_LFSR1_LO	0x012c	/* RNG LFSR1 [31:0] */
-#define	SAFE_RNG_LFSR1_HI	0x0130	/* RNG LFSR1 [47:32] */
-#define	SAFE_RNG_LFSR2_LO	0x0134	/* RNG LFSR1 [31:0] */
-#define	SAFE_RNG_LFSR2_HI	0x0138	/* RNG LFSR1 [47:32] */
-
-#define	SAFE_PE_CSR_READY	0x00000001	/* ready for processing */
-#define	SAFE_PE_CSR_DONE	0x00000002	/* h/w completed processing */
-#define	SAFE_PE_CSR_LOADSA	0x00000004	/* load SA digests */
-#define	SAFE_PE_CSR_HASHFINAL	0x00000010	/* do hash pad & write result */
-#define	SAFE_PE_CSR_SABUSID	0x000000c0	/* bus id for SA */
-#define	SAFE_PE_CSR_SAPCI	0x00000040	/* PCI bus id for SA */
-#define	SAFE_PE_CSR_NXTHDR	0x0000ff00	/* next hdr value for IPsec */
-#define	SAFE_PE_CSR_FPAD	0x0000ff00	/* fixed pad for basic ops */
-#define	SAFE_PE_CSR_STATUS	0x00ff0000	/* operation result status */
-#define	SAFE_PE_CSR_AUTH_FAIL	0x00010000	/* ICV mismatch (inbound) */
-#define	SAFE_PE_CSR_PAD_FAIL	0x00020000	/* pad verify fail (inbound) */
-#define	SAFE_PE_CSR_SEQ_FAIL	0x00040000	/* sequence number (inbound) */
-#define	SAFE_PE_CSR_XERROR	0x00080000	/* extended error follows */
-#define	SAFE_PE_CSR_XECODE	0x00f00000	/* extended error code */
-#define	SAFE_PE_CSR_XECODE_S	20
-#define	SAFE_PE_CSR_XECODE_BADCMD	0	/* invalid command */
-#define	SAFE_PE_CSR_XECODE_BADALG	1	/* invalid algorithm */
-#define	SAFE_PE_CSR_XECODE_ALGDIS	2	/* algorithm disabled */
-#define	SAFE_PE_CSR_XECODE_ZEROLEN	3	/* zero packet length */
-#define	SAFE_PE_CSR_XECODE_DMAERR	4	/* bus DMA error */
-#define	SAFE_PE_CSR_XECODE_PIPEABORT	5	/* secondary bus DMA error */
-#define	SAFE_PE_CSR_XECODE_BADSPI	6	/* IPsec SPI mismatch */
-#define	SAFE_PE_CSR_XECODE_TIMEOUT	10	/* failsafe timeout */
-#define	SAFE_PE_CSR_PAD		0xff000000	/* ESP padding control/status */
-#define	SAFE_PE_CSR_PAD_MIN	0x00000000	/* minimum IPsec padding */
-#define	SAFE_PE_CSR_PAD_16	0x08000000	/* pad to 16-byte boundary */
-#define	SAFE_PE_CSR_PAD_32	0x10000000	/* pad to 32-byte boundary */
-#define	SAFE_PE_CSR_PAD_64	0x20000000	/* pad to 64-byte boundary */
-#define	SAFE_PE_CSR_PAD_128	0x40000000	/* pad to 128-byte boundary */
-#define	SAFE_PE_CSR_PAD_256	0x80000000	/* pad to 256-byte boundary */
-
-/*
- * Check the CSR to see if the PE has returned ownership to
- * the host.  Note that before processing a descriptor this
- * must be done followed by a check of the SAFE_PE_LEN register
- * status bits to avoid premature processing of a descriptor
- * on its way back to the host.
- */
-#define	SAFE_PE_CSR_IS_DONE(_csr) \
-    (((_csr) & (SAFE_PE_CSR_READY | SAFE_PE_CSR_DONE)) == SAFE_PE_CSR_DONE)
-
-#define	SAFE_PE_LEN_LENGTH	0x000fffff	/* total length (bytes) */
-#define	SAFE_PE_LEN_READY	0x00400000	/* ready for processing */
-#define	SAFE_PE_LEN_DONE	0x00800000	/* h/w completed processing */
-#define	SAFE_PE_LEN_BYPASS	0xff000000	/* bypass offset (bytes) */
-#define	SAFE_PE_LEN_BYPASS_S	24
-
-#define	SAFE_PE_LEN_IS_DONE(_len) \
-    (((_len) & (SAFE_PE_LEN_READY | SAFE_PE_LEN_DONE)) == SAFE_PE_LEN_DONE)
-
-/* NB: these apply to HU_STAT, HM_STAT, HI_CLR, and HI_MASK */
-#define	SAFE_INT_PE_CDONE	0x00000002	/* PE context done */
-#define	SAFE_INT_PE_DDONE	0x00000008	/* PE descriptor done */
-#define	SAFE_INT_PE_ERROR	0x00000010	/* PE error */
-#define	SAFE_INT_PE_ODONE	0x00000020	/* PE operation done */
-
-#define	SAFE_HI_CFG_PULSE	0x00000001	/* use pulse interrupt */
-#define	SAFE_HI_CFG_LEVEL	0x00000000	/* use level interrupt */
-#define	SAFE_HI_CFG_AUTOCLR	0x00000002	/* auto-clear pulse interrupt */
-
-#define	SAFE_ENDIAN_PASS	0x000000e4	/* straight pass-thru */
-#define	SAFE_ENDIAN_SWAB	0x0000001b	/* swap bytes in 32-bit word */
-
-#define	SAFE_PE_DMACFG_PERESET	0x00000001	/* reset packet engine */
-#define	SAFE_PE_DMACFG_PDRRESET	0x00000002	/* reset PDR counters/ptrs */
-#define	SAFE_PE_DMACFG_SGRESET	0x00000004	/* reset scatter/gather cache */
-#define	SAFE_PE_DMACFG_FSENA	0x00000008	/* enable failsafe reset */
-#define	SAFE_PE_DMACFG_PEMODE	0x00000100	/* packet engine mode */
-#define	SAFE_PE_DMACFG_SAPREC	0x00000200	/* SA precedes packet */
-#define	SAFE_PE_DMACFG_PKFOLL	0x00000400	/* packet follows descriptor */
-#define	SAFE_PE_DMACFG_GPRBID	0x00003000	/* gather particle ring busid */
-#define	SAFE_PE_DMACFG_GPRPCI	0x00001000	/* PCI gather particle ring */
-#define	SAFE_PE_DMACFG_SPRBID	0x0000c000	/* scatter part. ring busid */
-#define	SAFE_PE_DMACFG_SPRPCI	0x00004000	/* PCI scatter part. ring */
-#define	SAFE_PE_DMACFG_ESDESC	0x00010000	/* endian swap descriptors */
-#define	SAFE_PE_DMACFG_ESSA	0x00020000	/* endian swap SA data */
-#define	SAFE_PE_DMACFG_ESPACKET	0x00040000	/* endian swap packet data */
-#define	SAFE_PE_DMACFG_ESPDESC	0x00080000	/* endian swap particle desc. */
-#define	SAFE_PE_DMACFG_NOPDRUP	0x00100000	/* supp. PDR ownership update */
-#define	SAFE_PD_EDMACFG_PCIMODE	0x01000000	/* PCI target mode */
-
-#define	SAFE_PE_DMASTAT_PEIDONE	0x00000001	/* PE core input done */
-#define	SAFE_PE_DMASTAT_PEODONE	0x00000002	/* PE core output done */
-#define	SAFE_PE_DMASTAT_ENCDONE	0x00000004	/* encryption done */
-#define	SAFE_PE_DMASTAT_IHDONE	0x00000008	/* inner hash done */
-#define	SAFE_PE_DMASTAT_OHDONE	0x00000010	/* outer hash (HMAC) done */
-#define	SAFE_PE_DMASTAT_PADFLT	0x00000020	/* crypto pad fault */
-#define	SAFE_PE_DMASTAT_ICVFLT	0x00000040	/* ICV fault */
-#define	SAFE_PE_DMASTAT_SPIMIS	0x00000080	/* SPI mismatch */
-#define	SAFE_PE_DMASTAT_CRYPTO	0x00000100	/* crypto engine timeout */
-#define	SAFE_PE_DMASTAT_CQACT	0x00000200	/* command queue active */
-#define	SAFE_PE_DMASTAT_IRACT	0x00000400	/* input request active */
-#define	SAFE_PE_DMASTAT_ORACT	0x00000800	/* output request active */
-#define	SAFE_PE_DMASTAT_PEISIZE	0x003ff000	/* PE input size:32-bit words */
-#define	SAFE_PE_DMASTAT_PEOSIZE	0xffc00000	/* PE out. size:32-bit words */
-
-#define	SAFE_PE_RINGCFG_SIZE	0x000003ff	/* ring size (descriptors) */
-#define	SAFE_PE_RINGCFG_OFFSET	0xffff0000	/* offset btw desc's (dwords) */
-#define	SAFE_PE_RINGCFG_OFFSET_S	16
-
-#define	SAFE_PE_RINGPOLL_POLL	0x00000fff	/* polling frequency/divisor */
-#define	SAFE_PE_RINGPOLL_RETRY	0x03ff0000	/* polling frequency/divisor */
-#define	SAFE_PE_RINGPOLL_CONT	0x80000000	/* continuously poll */
-
-#define	SAFE_PE_IRNGSTAT_CQAVAIL 0x00000001	/* command queue available */
-
-#define	SAFE_PE_ERNGSTAT_NEXT	0x03ff0000	/* index of next packet desc. */
-#define	SAFE_PE_ERNGSTAT_NEXT_S	16
-
-#define	SAFE_PE_IOTHRESH_INPUT	0x000003ff	/* input threshold (dwords) */
-#define	SAFE_PE_IOTHRESH_OUTPUT	0x03ff0000	/* output threshold (dwords) */
-
-#define	SAFE_PE_PARTCFG_SIZE	0x0000ffff	/* scatter particle size */
-#define	SAFE_PE_PARTCFG_GBURST	0x00030000	/* gather particle burst */
-#define	SAFE_PE_PARTCFG_GBURST_2	0x00000000
-#define	SAFE_PE_PARTCFG_GBURST_4	0x00010000
-#define	SAFE_PE_PARTCFG_GBURST_8	0x00020000
-#define	SAFE_PE_PARTCFG_GBURST_16	0x00030000
-#define	SAFE_PE_PARTCFG_SBURST	0x000c0000	/* scatter particle burst */
-#define	SAFE_PE_PARTCFG_SBURST_2	0x00000000
-#define	SAFE_PE_PARTCFG_SBURST_4	0x00040000
-#define	SAFE_PE_PARTCFG_SBURST_8	0x00080000
-#define	SAFE_PE_PARTCFG_SBURST_16	0x000c0000
-
-#define	SAFE_PE_PARTSIZE_SCAT	0xffff0000	/* scatter particle ring size */
-#define	SAFE_PE_PARTSIZE_GATH	0x0000ffff	/* gather particle ring size */
-
-#define	SAFE_CRYPTO_CTRL_3DES	0x00000001	/* enable 3DES support */
-#define	SAFE_CRYPTO_CTRL_PKEY	0x00010000	/* enable public key support */
-#define	SAFE_CRYPTO_CTRL_RNG	0x00020000	/* enable RNG support */
-
-#define	SAFE_DEVINFO_REV_MIN	0x0000000f	/* minor rev for chip */
-#define	SAFE_DEVINFO_REV_MAJ	0x000000f0	/* major rev for chip */
-#define	SAFE_DEVINFO_REV_MAJ_S	4
-#define	SAFE_DEVINFO_DES	0x00000100	/* DES/3DES support present */
-#define	SAFE_DEVINFO_ARC4	0x00000200	/* ARC4 support present */
-#define	SAFE_DEVINFO_AES	0x00000400	/* AES support present */
-#define	SAFE_DEVINFO_MD5	0x00001000	/* MD5 support present */
-#define	SAFE_DEVINFO_SHA1	0x00002000	/* SHA-1 support present */
-#define	SAFE_DEVINFO_RIPEMD	0x00004000	/* RIPEMD support present */
-#define	SAFE_DEVINFO_DEFLATE	0x00010000	/* Deflate support present */
-#define	SAFE_DEVINFO_SARAM	0x00100000	/* on-chip SA RAM present */
-#define	SAFE_DEVINFO_EMIBUS	0x00200000	/* EMI bus present */
-#define	SAFE_DEVINFO_PKEY	0x00400000	/* public key support present */
-#define	SAFE_DEVINFO_RNG	0x00800000	/* RNG present */
-
-#define	SAFE_REV(_maj, _min)	(((_maj) << SAFE_DEVINFO_REV_MAJ_S) | (_min))
-#define	SAFE_REV_MAJ(_chiprev) \
-	(((_chiprev) & SAFE_DEVINFO_REV_MAJ) >> SAFE_DEVINFO_REV_MAJ_S)
-#define	SAFE_REV_MIN(_chiprev)	((_chiprev) & SAFE_DEVINFO_REV_MIN)
-
-#define	SAFE_PK_FUNC_MULT	0x00000001	/* Multiply function */
-#define	SAFE_PK_FUNC_SQUARE	0x00000004	/* Square function */
-#define	SAFE_PK_FUNC_ADD	0x00000010	/* Add function */
-#define	SAFE_PK_FUNC_SUB	0x00000020	/* Subtract function */
-#define	SAFE_PK_FUNC_LSHIFT	0x00000040	/* Left-shift function */
-#define	SAFE_PK_FUNC_RSHIFT	0x00000080	/* Right-shift function */
-#define	SAFE_PK_FUNC_DIV	0x00000100	/* Divide function */
-#define	SAFE_PK_FUNC_CMP	0x00000400	/* Compare function */
-#define	SAFE_PK_FUNC_COPY	0x00000800	/* Copy function */
-#define	SAFE_PK_FUNC_EXP16	0x00002000	/* Exponentiate (4-bit ACT) */
-#define	SAFE_PK_FUNC_EXP4	0x00004000	/* Exponentiate (2-bit ACT) */
-#define	SAFE_PK_FUNC_RUN	0x00008000	/* start/status */
-
-#define	SAFE_RNG_STAT_BUSY	0x00000001	/* busy, data not valid */
-
-#define	SAFE_RNG_CTRL_PRE_LFSR	0x00000001	/* enable output pre-LFSR */
-#define	SAFE_RNG_CTRL_TST_MODE	0x00000002	/* enable test mode */
-#define	SAFE_RNG_CTRL_TST_RUN	0x00000004	/* start test state machine */
-#define	SAFE_RNG_CTRL_ENA_RING1	0x00000008	/* test entropy oscillator #1 */
-#define	SAFE_RNG_CTRL_ENA_RING2	0x00000010	/* test entropy oscillator #2 */
-#define	SAFE_RNG_CTRL_DIS_ALARM	0x00000020	/* disable RNG alarm reports */
-#define	SAFE_RNG_CTRL_TST_CLOCK	0x00000040	/* enable test clock */
-#define	SAFE_RNG_CTRL_SHORTEN	0x00000080	/* shorten state timers */
-#define	SAFE_RNG_CTRL_TST_ALARM	0x00000100	/* simulate alarm state */
-#define	SAFE_RNG_CTRL_RST_LFSR	0x00000200	/* reset LFSR */
-
-/*
- * Packet engine descriptor.  Note that d_csr is a copy of the
- * SAFE_PE_CSR register and all definitions apply, and d_len
- * is a copy of the SAFE_PE_LEN register and all definitions apply.
- * d_src and d_len may point directly to contiguous data or to a
- * list of ``particle descriptors'' when using scatter/gather i/o.
- */
-struct safe_desc {
-	u_int32_t	d_csr;			/* per-packet control/status */
-	u_int32_t	d_src;			/* source address */
-	u_int32_t	d_dst;			/* destination address */
-	u_int32_t	d_sa;			/* SA address */
-	u_int32_t	d_len;			/* length, bypass, status */
-};
-
-/*
- * Scatter/Gather particle descriptor.
- *
- * NB: scatter descriptors do not specify a size; this is fixed
- *     by the setting of the SAFE_PE_PARTCFG register.
- */
-struct safe_pdesc {
-	u_int32_t	pd_addr;		/* particle address */
-#ifdef __BIG_ENDIAN
-	u_int16_t	pd_flags;		/* control word */
-	u_int16_t	pd_size;		/* particle size (bytes) */
-#else
-	u_int16_t	pd_flags;		/* control word */
-	u_int16_t	pd_size;		/* particle size (bytes) */
-#endif
-};
-
-#define	SAFE_PD_READY	0x0001			/* ready for processing */
-#define	SAFE_PD_DONE	0x0002			/* h/w completed processing */
-
-/*
- * Security Association (SA) Record (Rev 1).  One of these is
- * required for each operation processed by the packet engine.
- */
-struct safe_sarec {
-	u_int32_t	sa_cmd0;
-	u_int32_t	sa_cmd1;
-	u_int32_t	sa_resv0;
-	u_int32_t	sa_resv1;
-	u_int32_t	sa_key[8];		/* DES/3DES/AES key */
-	u_int32_t	sa_indigest[5];		/* inner digest */
-	u_int32_t	sa_outdigest[5];	/* outer digest */
-	u_int32_t	sa_spi;			/* SPI */
-	u_int32_t	sa_seqnum;		/* sequence number */
-	u_int32_t	sa_seqmask[2];		/* sequence number mask */
-	u_int32_t	sa_resv2;
-	u_int32_t	sa_staterec;		/* address of state record */
-	u_int32_t	sa_resv3[2];
-	u_int32_t	sa_samgmt0;		/* SA management field 0 */
-	u_int32_t	sa_samgmt1;		/* SA management field 0 */
-};
-
-#define	SAFE_SA_CMD0_OP		0x00000007	/* operation code */
-#define	SAFE_SA_CMD0_OP_CRYPT	0x00000000	/* encrypt/decrypt (basic) */
-#define	SAFE_SA_CMD0_OP_BOTH	0x00000001	/* encrypt-hash/hash-decrypto */
-#define	SAFE_SA_CMD0_OP_HASH	0x00000003	/* hash (outbound-only) */
-#define	SAFE_SA_CMD0_OP_ESP	0x00000000	/* ESP in/out (proto) */
-#define	SAFE_SA_CMD0_OP_AH	0x00000001	/* AH in/out (proto) */
-#define	SAFE_SA_CMD0_INBOUND	0x00000008	/* inbound operation */
-#define	SAFE_SA_CMD0_OUTBOUND	0x00000000	/* outbound operation */
-#define	SAFE_SA_CMD0_GROUP	0x00000030	/* operation group */
-#define	SAFE_SA_CMD0_BASIC	0x00000000	/* basic operation */
-#define	SAFE_SA_CMD0_PROTO	0x00000010	/* protocol/packet operation */
-#define	SAFE_SA_CMD0_BUNDLE	0x00000020	/* bundled operation (resvd) */
-#define	SAFE_SA_CMD0_PAD	0x000000c0	/* crypto pad method */
-#define	SAFE_SA_CMD0_PAD_IPSEC	0x00000000	/* IPsec padding */
-#define	SAFE_SA_CMD0_PAD_PKCS7	0x00000040	/* PKCS#7 padding */
-#define	SAFE_SA_CMD0_PAD_CONS	0x00000080	/* constant padding */
-#define	SAFE_SA_CMD0_PAD_ZERO	0x000000c0	/* zero padding */
-#define	SAFE_SA_CMD0_CRYPT_ALG	0x00000f00	/* symmetric crypto algorithm */
-#define	SAFE_SA_CMD0_DES	0x00000000	/* DES crypto algorithm */
-#define	SAFE_SA_CMD0_3DES	0x00000100	/* 3DES crypto algorithm */
-#define	SAFE_SA_CMD0_AES	0x00000300	/* AES crypto algorithm */
-#define	SAFE_SA_CMD0_CRYPT_NULL	0x00000f00	/* null crypto algorithm */
-#define	SAFE_SA_CMD0_HASH_ALG	0x0000f000	/* hash algorithm */
-#define	SAFE_SA_CMD0_MD5	0x00000000	/* MD5 hash algorithm */
-#define	SAFE_SA_CMD0_SHA1	0x00001000	/* SHA-1 hash algorithm */
-#define	SAFE_SA_CMD0_HASH_NULL	0x0000f000	/* null hash algorithm */
-#define	SAFE_SA_CMD0_HDR_PROC	0x00080000	/* header processing */
-#define	SAFE_SA_CMD0_IBUSID	0x00300000	/* input bus id */
-#define	SAFE_SA_CMD0_IPCI	0x00100000	/* PCI input bus id */
-#define	SAFE_SA_CMD0_OBUSID	0x00c00000	/* output bus id */
-#define	SAFE_SA_CMD0_OPCI	0x00400000	/* PCI output bus id */
-#define	SAFE_SA_CMD0_IVLD	0x03000000	/* IV loading */
-#define	SAFE_SA_CMD0_IVLD_NONE	0x00000000	/* IV no load (reuse) */
-#define	SAFE_SA_CMD0_IVLD_IBUF	0x01000000	/* IV load from input buffer */
-#define	SAFE_SA_CMD0_IVLD_STATE	0x02000000	/* IV load from state */
-#define	SAFE_SA_CMD0_HSLD	0x0c000000	/* hash state loading */
-#define	SAFE_SA_CMD0_HSLD_SA	0x00000000	/* hash state load from SA */
-#define	SAFE_SA_CMD0_HSLD_STATE	0x08000000	/* hash state load from state */
-#define	SAFE_SA_CMD0_HSLD_NONE	0x0c000000	/* hash state no load */
-#define	SAFE_SA_CMD0_SAVEIV	0x10000000	/* save IV */
-#define	SAFE_SA_CMD0_SAVEHASH	0x20000000	/* save hash state */
-#define	SAFE_SA_CMD0_IGATHER	0x40000000	/* input gather */
-#define	SAFE_SA_CMD0_OSCATTER	0x80000000	/* output scatter */
-
-#define	SAFE_SA_CMD1_HDRCOPY	0x00000002	/* copy header to output */
-#define	SAFE_SA_CMD1_PAYCOPY	0x00000004	/* copy payload to output */
-#define	SAFE_SA_CMD1_PADCOPY	0x00000008	/* copy pad to output */
-#define	SAFE_SA_CMD1_IPV4	0x00000000	/* IPv4 protocol */
-#define	SAFE_SA_CMD1_IPV6	0x00000010	/* IPv6 protocol */
-#define	SAFE_SA_CMD1_MUTABLE	0x00000020	/* mutable bit processing */
-#define	SAFE_SA_CMD1_SRBUSID	0x000000c0	/* state record bus id */
-#define	SAFE_SA_CMD1_SRPCI	0x00000040	/* state record from PCI */
-#define	SAFE_SA_CMD1_CRMODE	0x00000300	/* crypto mode */
-#define	SAFE_SA_CMD1_ECB	0x00000000	/* ECB crypto mode */
-#define	SAFE_SA_CMD1_CBC	0x00000100	/* CBC crypto mode */
-#define	SAFE_SA_CMD1_OFB	0x00000200	/* OFB crypto mode */
-#define	SAFE_SA_CMD1_CFB	0x00000300	/* CFB crypto mode */
-#define	SAFE_SA_CMD1_CRFEEDBACK	0x00000c00	/* crypto feedback mode */
-#define	SAFE_SA_CMD1_64BIT	0x00000000	/* 64-bit crypto feedback */
-#define	SAFE_SA_CMD1_8BIT	0x00000400	/* 8-bit crypto feedback */
-#define	SAFE_SA_CMD1_1BIT	0x00000800	/* 1-bit crypto feedback */
-#define	SAFE_SA_CMD1_128BIT	0x00000c00	/* 128-bit crypto feedback */
-#define	SAFE_SA_CMD1_OPTIONS	0x00001000	/* HMAC/options mutable bit */
-#define	SAFE_SA_CMD1_HMAC	SAFE_SA_CMD1_OPTIONS
-#define	SAFE_SA_CMD1_SAREV1	0x00008000	/* SA Revision 1 */
-#define	SAFE_SA_CMD1_OFFSET	0x00ff0000	/* hash/crypto offset(dwords) */
-#define	SAFE_SA_CMD1_OFFSET_S	16
-#define	SAFE_SA_CMD1_AESKEYLEN	0x0f000000	/* AES key length */
-#define	SAFE_SA_CMD1_AES128	0x02000000	/* 128-bit AES key */
-#define	SAFE_SA_CMD1_AES192	0x03000000	/* 192-bit AES key */
-#define	SAFE_SA_CMD1_AES256	0x04000000	/* 256-bit AES key */
-
-/* 
- * Security Associate State Record (Rev 1).
- */
-struct safe_sastate {
-	u_int32_t	sa_saved_iv[4];		/* saved IV (DES/3DES/AES) */
-	u_int32_t	sa_saved_hashbc;	/* saved hash byte count */
-	u_int32_t	sa_saved_indigest[5];	/* saved inner digest */
-};
-#endif /* _SAFE_SAFEREG_H_ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/safevar.h b/target/linux/generic-2.6/files/crypto/ocf/safe/safevar.h
deleted file mode 100644
index 9039a5d31b..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/safevar.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * The linux port of this code done by David McCullough
- * Copyright (C) 2004-2010 David McCullough <david_mccullough@mcafee.com>
- * The license and original author are listed below.
- *
- * Copyright (c) 2003 Sam Leffler, Errno Consulting
- * Copyright (c) 2003 Global Technology Associates, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/dev/safe/safevar.h,v 1.2 2006/05/17 18:34:26 pjd Exp $
- */
-#ifndef _SAFE_SAFEVAR_H_
-#define	_SAFE_SAFEVAR_H_
-
-/* Maximum queue length */
-#ifndef SAFE_MAX_NQUEUE
-#define SAFE_MAX_NQUEUE	60
-#endif
-
-#define	SAFE_MAX_PART		64	/* Maximum scatter/gather depth */
-#define	SAFE_DMA_BOUNDARY	0	/* No boundary for source DMA ops */
-#define	SAFE_MAX_DSIZE		2048 /* MCLBYTES Fixed scatter particle size */
-#define	SAFE_MAX_SSIZE		0x0ffff	/* Maximum gather particle size */
-#define	SAFE_MAX_DMA		0xfffff	/* Maximum PE operand size (20 bits) */
-/* total src+dst particle descriptors */
-#define	SAFE_TOTAL_DPART	(SAFE_MAX_NQUEUE * SAFE_MAX_PART)
-#define	SAFE_TOTAL_SPART	(SAFE_MAX_NQUEUE * SAFE_MAX_PART)
-
-#define	SAFE_RNG_MAXBUFSIZ	128	/* 32-bit words */
-
-#define	SAFE_CARD(sid)		(((sid) & 0xf0000000) >> 28)
-#define	SAFE_SESSION(sid)	( (sid) & 0x0fffffff)
-#define	SAFE_SID(crd, sesn)	(((crd) << 28) | ((sesn) & 0x0fffffff))
-
-#define SAFE_DEF_RTY		0xff	/* PCI Retry Timeout */
-#define SAFE_DEF_TOUT		0xff	/* PCI TRDY Timeout */
-#define SAFE_DEF_CACHELINE	0x01	/* Cache Line setting */
-
-#ifdef __KERNEL__
-/*
- * State associated with the allocation of each chunk
- * of memory setup for DMA.
- */
-struct safe_dma_alloc {
-	dma_addr_t		dma_paddr;
-	void			*dma_vaddr;
-};
-
-/*
- * Cryptographic operand state.  One of these exists for each
- * source and destination operand passed in from the crypto
- * subsystem.  When possible source and destination operands
- * refer to the same memory.  More often they are distinct.
- * We track the virtual address of each operand as well as
- * where each is mapped for DMA.
- */
-struct safe_operand {
-	union {
-		struct sk_buff *skb;
-		struct uio *io;
-	} u;
-	void			*map;
-	int				mapsize;	/* total number of bytes in segs */
-	struct {
-		dma_addr_t	ds_addr;
-		int			ds_len;
-		int			ds_tlen;
-	} segs[SAFE_MAX_PART];
-	int				nsegs;
-};
-
-/*
- * Packet engine ring entry and cryptographic operation state.
- * The packet engine requires a ring of descriptors that contain
- * pointers to various cryptographic state.  However the ring
- * configuration register allows you to specify an arbitrary size
- * for ring entries.  We use this feature to collect most of the
- * state for each cryptographic request into one spot.  Other than
- * ring entries only the ``particle descriptors'' (scatter/gather
- * lists) and the actual operand data are kept separate.  The
- * particle descriptors must also be organized in rings.  The
- * operand data can be located aribtrarily (modulo alignment constraints).
- *
- * Note that the descriptor ring is mapped onto the PCI bus so
- * the hardware can DMA data.  This means the entire ring must be
- * contiguous.
- */
-struct safe_ringentry {
-	struct safe_desc	re_desc;	/* command descriptor */
-	struct safe_sarec	re_sa;		/* SA record */
-	struct safe_sastate	re_sastate;	/* SA state record */
-
-	struct cryptop		*re_crp;	/* crypto operation */
-
-	struct safe_operand	re_src;		/* source operand */
-	struct safe_operand	re_dst;		/* destination operand */
-
-	int			re_sesn;	/* crypto session ID */
-	int			re_flags;
-#define	SAFE_QFLAGS_COPYOUTIV	0x1		/* copy back on completion */
-#define	SAFE_QFLAGS_COPYOUTICV	0x2		/* copy back on completion */
-};
-
-#define	re_src_skb	re_src.u.skb
-#define	re_src_io	re_src.u.io
-#define	re_src_map	re_src.map
-#define	re_src_nsegs	re_src.nsegs
-#define	re_src_segs	re_src.segs
-#define	re_src_mapsize	re_src.mapsize
-
-#define	re_dst_skb	re_dst.u.skb
-#define	re_dst_io	re_dst.u.io
-#define	re_dst_map	re_dst.map
-#define	re_dst_nsegs	re_dst.nsegs
-#define	re_dst_segs	re_dst.segs
-#define	re_dst_mapsize	re_dst.mapsize
-
-struct rndstate_test;
-
-struct safe_session {
-	u_int32_t	ses_used;
-	u_int32_t	ses_klen;		/* key length in bits */
-	u_int32_t	ses_key[8];		/* DES/3DES/AES key */
-	u_int32_t	ses_mlen;		/* hmac length in bytes */
-	u_int32_t	ses_hminner[5];		/* hmac inner state */
-	u_int32_t	ses_hmouter[5];		/* hmac outer state */
-	u_int32_t	ses_iv[4];		/* DES/3DES/AES iv */
-};
-
-struct safe_pkq {
-	struct list_head	pkq_list;
-	struct cryptkop		*pkq_krp;
-};
-
-struct safe_softc {
-	softc_device_decl	sc_dev;
-	u32			sc_irq;
-
-	struct pci_dev		*sc_pcidev;
-	ocf_iomem_t		sc_base_addr;
-
-	u_int			sc_chiprev;	/* major/minor chip revision */
-	int			sc_flags;	/* device specific flags */
-#define	SAFE_FLAGS_KEY		0x01		/* has key accelerator */
-#define	SAFE_FLAGS_RNG		0x02		/* hardware rng */
-	int			sc_suspended;
-	int			sc_needwakeup;	/* notify crypto layer */
-	int32_t			sc_cid;		/* crypto tag */
-
-	struct safe_dma_alloc	sc_ringalloc;	/* PE ring allocation state */
-	struct safe_ringentry	*sc_ring;	/* PE ring */
-	struct safe_ringentry	*sc_ringtop;	/* PE ring top */
-	struct safe_ringentry	*sc_front;	/* next free entry */
-	struct safe_ringentry	*sc_back;	/* next pending entry */
-	int			sc_nqchip;	/* # passed to chip */
-	spinlock_t		sc_ringmtx;	/* PE ring lock */
-	struct safe_pdesc	*sc_spring;	/* src particle ring */
-	struct safe_pdesc	*sc_springtop;	/* src particle ring top */
-	struct safe_pdesc	*sc_spfree;	/* next free src particle */
-	struct safe_dma_alloc	sc_spalloc;	/* src particle ring state */
-	struct safe_pdesc	*sc_dpring;	/* dest particle ring */
-	struct safe_pdesc	*sc_dpringtop;	/* dest particle ring top */
-	struct safe_pdesc	*sc_dpfree;	/* next free dest particle */
-	struct safe_dma_alloc	sc_dpalloc;	/* dst particle ring state */
-	int			sc_nsessions;	/* # of sessions */
-	struct safe_session	*sc_sessions;	/* sessions */
-
-	struct timer_list	sc_pkto;	/* PK polling */
-	spinlock_t		sc_pkmtx;	/* PK lock */
-	struct list_head	sc_pkq;		/* queue of PK requests */
-	struct safe_pkq		*sc_pkq_cur;	/* current processing request */
-	u_int32_t		sc_pk_reslen, sc_pk_resoff;
-
-	int			sc_max_dsize;	/* maximum safe DMA size */
-};
-#endif /* __KERNEL__ */
-
-struct safe_stats {
-	u_int64_t st_ibytes;
-	u_int64_t st_obytes;
-	u_int32_t st_ipackets;
-	u_int32_t st_opackets;
-	u_int32_t st_invalid;		/* invalid argument */
-	u_int32_t st_badsession;	/* invalid session id */
-	u_int32_t st_badflags;		/* flags indicate !(mbuf | uio) */
-	u_int32_t st_nodesc;		/* op submitted w/o descriptors */
-	u_int32_t st_badalg;		/* unsupported algorithm */
-	u_int32_t st_ringfull;		/* PE descriptor ring full */
-	u_int32_t st_peoperr;		/* PE marked error */
-	u_int32_t st_dmaerr;		/* PE DMA error */
-	u_int32_t st_bypasstoobig;	/* bypass > 96 bytes */
-	u_int32_t st_skipmismatch;	/* enc part begins before auth part */
-	u_int32_t st_lenmismatch;	/* enc length different auth length */
-	u_int32_t st_coffmisaligned;	/* crypto offset not 32-bit aligned */
-	u_int32_t st_cofftoobig;	/* crypto offset > 255 words */
-	u_int32_t st_iovmisaligned;	/* iov op not aligned */
-	u_int32_t st_iovnotuniform;	/* iov op not suitable */
-	u_int32_t st_unaligned;		/* unaligned src caused copy */
-	u_int32_t st_notuniform;	/* non-uniform src caused copy */
-	u_int32_t st_nomap;		/* bus_dmamap_create failed */
-	u_int32_t st_noload;		/* bus_dmamap_load_* failed */
-	u_int32_t st_nombuf;		/* MGET* failed */
-	u_int32_t st_nomcl;		/* MCLGET* failed */
-	u_int32_t st_maxqchip;		/* max mcr1 ops out for processing */
-	u_int32_t st_rng;		/* RNG requests */
-	u_int32_t st_rngalarm;		/* RNG alarm requests */
-	u_int32_t st_noicvcopy;		/* ICV data copies suppressed */
-};
-#endif /* _SAFE_SAFEVAR_H_ */
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.c b/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.c
deleted file mode 100644
index 4e360e20db..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*	$KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $	*/
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/sha1.c,v 1.9 2003/06/10 21:36:57 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <sys/systm.h>
-
-#include <crypto/sha1.h>
-#endif
-
-/* sanity check */
-#if BYTE_ORDER != BIG_ENDIAN
-# if BYTE_ORDER != LITTLE_ENDIAN
-#  define unsupported 1
-# endif
-#endif
-
-#ifndef unsupported
-
-/* constant table */
-static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
-#define	K(t)	_K[(t) / 20]
-
-#define	F0(b, c, d)	(((b) & (c)) | ((~(b)) & (d)))
-#define	F1(b, c, d)	(((b) ^ (c)) ^ (d))
-#define	F2(b, c, d)	(((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define	F3(b, c, d)	(((b) ^ (c)) ^ (d))
-
-#define	S(n, x)		(((x) << (n)) | ((x) >> (32 - n)))
-
-#undef H
-#define	H(n)	(ctxt->h.b32[(n)])
-#define	COUNT	(ctxt->count)
-#define	BCOUNT	(ctxt->c.b64[0] / 8)
-#define	W(n)	(ctxt->m.b32[(n)])
-
-#define	PUTBYTE(x)	{ \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	ctxt->c.b64[0] += 8;			\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-     }
-
-#define	PUTPAD(x)	{ \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-     }
-
-static void sha1_step(struct sha1_ctxt *);
-
-static void
-sha1_step(ctxt)
-	struct sha1_ctxt *ctxt;
-{
-	u_int32_t	a, b, c, d, e;
-	size_t t, s;
-	u_int32_t	tmp;
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-	struct sha1_ctxt tctxt;
-	bcopy(&ctxt->m.b8[0], &tctxt.m.b8[0], 64);
-	ctxt->m.b8[0] = tctxt.m.b8[3]; ctxt->m.b8[1] = tctxt.m.b8[2];
-	ctxt->m.b8[2] = tctxt.m.b8[1]; ctxt->m.b8[3] = tctxt.m.b8[0];
-	ctxt->m.b8[4] = tctxt.m.b8[7]; ctxt->m.b8[5] = tctxt.m.b8[6];
-	ctxt->m.b8[6] = tctxt.m.b8[5]; ctxt->m.b8[7] = tctxt.m.b8[4];
-	ctxt->m.b8[8] = tctxt.m.b8[11]; ctxt->m.b8[9] = tctxt.m.b8[10];
-	ctxt->m.b8[10] = tctxt.m.b8[9]; ctxt->m.b8[11] = tctxt.m.b8[8];
-	ctxt->m.b8[12] = tctxt.m.b8[15]; ctxt->m.b8[13] = tctxt.m.b8[14];
-	ctxt->m.b8[14] = tctxt.m.b8[13]; ctxt->m.b8[15] = tctxt.m.b8[12];
-	ctxt->m.b8[16] = tctxt.m.b8[19]; ctxt->m.b8[17] = tctxt.m.b8[18];
-	ctxt->m.b8[18] = tctxt.m.b8[17]; ctxt->m.b8[19] = tctxt.m.b8[16];
-	ctxt->m.b8[20] = tctxt.m.b8[23]; ctxt->m.b8[21] = tctxt.m.b8[22];
-	ctxt->m.b8[22] = tctxt.m.b8[21]; ctxt->m.b8[23] = tctxt.m.b8[20];
-	ctxt->m.b8[24] = tctxt.m.b8[27]; ctxt->m.b8[25] = tctxt.m.b8[26];
-	ctxt->m.b8[26] = tctxt.m.b8[25]; ctxt->m.b8[27] = tctxt.m.b8[24];
-	ctxt->m.b8[28] = tctxt.m.b8[31]; ctxt->m.b8[29] = tctxt.m.b8[30];
-	ctxt->m.b8[30] = tctxt.m.b8[29]; ctxt->m.b8[31] = tctxt.m.b8[28];
-	ctxt->m.b8[32] = tctxt.m.b8[35]; ctxt->m.b8[33] = tctxt.m.b8[34];
-	ctxt->m.b8[34] = tctxt.m.b8[33]; ctxt->m.b8[35] = tctxt.m.b8[32];
-	ctxt->m.b8[36] = tctxt.m.b8[39]; ctxt->m.b8[37] = tctxt.m.b8[38];
-	ctxt->m.b8[38] = tctxt.m.b8[37]; ctxt->m.b8[39] = tctxt.m.b8[36];
-	ctxt->m.b8[40] = tctxt.m.b8[43]; ctxt->m.b8[41] = tctxt.m.b8[42];
-	ctxt->m.b8[42] = tctxt.m.b8[41]; ctxt->m.b8[43] = tctxt.m.b8[40];
-	ctxt->m.b8[44] = tctxt.m.b8[47]; ctxt->m.b8[45] = tctxt.m.b8[46];
-	ctxt->m.b8[46] = tctxt.m.b8[45]; ctxt->m.b8[47] = tctxt.m.b8[44];
-	ctxt->m.b8[48] = tctxt.m.b8[51]; ctxt->m.b8[49] = tctxt.m.b8[50];
-	ctxt->m.b8[50] = tctxt.m.b8[49]; ctxt->m.b8[51] = tctxt.m.b8[48];
-	ctxt->m.b8[52] = tctxt.m.b8[55]; ctxt->m.b8[53] = tctxt.m.b8[54];
-	ctxt->m.b8[54] = tctxt.m.b8[53]; ctxt->m.b8[55] = tctxt.m.b8[52];
-	ctxt->m.b8[56] = tctxt.m.b8[59]; ctxt->m.b8[57] = tctxt.m.b8[58];
-	ctxt->m.b8[58] = tctxt.m.b8[57]; ctxt->m.b8[59] = tctxt.m.b8[56];
-	ctxt->m.b8[60] = tctxt.m.b8[63]; ctxt->m.b8[61] = tctxt.m.b8[62];
-	ctxt->m.b8[62] = tctxt.m.b8[61]; ctxt->m.b8[63] = tctxt.m.b8[60];
-#endif
-
-	a = H(0); b = H(1); c = H(2); d = H(3); e = H(4);
-
-	for (t = 0; t < 20; t++) {
-		s = t & 0x0f;
-		if (t >= 16) {
-			W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
-		}
-		tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
-		e = d; d = c; c = S(30, b); b = a; a = tmp;
-	}
-	for (t = 20; t < 40; t++) {
-		s = t & 0x0f;
-		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
-		e = d; d = c; c = S(30, b); b = a; a = tmp;
-	}
-	for (t = 40; t < 60; t++) {
-		s = t & 0x0f;
-		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
-		e = d; d = c; c = S(30, b); b = a; a = tmp;
-	}
-	for (t = 60; t < 80; t++) {
-		s = t & 0x0f;
-		W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ W((s+2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
-		e = d; d = c; c = S(30, b); b = a; a = tmp;
-	}
-
-	H(0) = H(0) + a;
-	H(1) = H(1) + b;
-	H(2) = H(2) + c;
-	H(3) = H(3) + d;
-	H(4) = H(4) + e;
-
-	bzero(&ctxt->m.b8[0], 64);
-}
-
-/*------------------------------------------------------------*/
-
-void
-sha1_init(ctxt)
-	struct sha1_ctxt *ctxt;
-{
-	bzero(ctxt, sizeof(struct sha1_ctxt));
-	H(0) = 0x67452301;
-	H(1) = 0xefcdab89;
-	H(2) = 0x98badcfe;
-	H(3) = 0x10325476;
-	H(4) = 0xc3d2e1f0;
-}
-
-void
-sha1_pad(ctxt)
-	struct sha1_ctxt *ctxt;
-{
-	size_t padlen;		/*pad length in bytes*/
-	size_t padstart;
-
-	PUTPAD(0x80);
-
-	padstart = COUNT % 64;
-	padlen = 64 - padstart;
-	if (padlen < 8) {
-		bzero(&ctxt->m.b8[padstart], padlen);
-		COUNT += padlen;
-		COUNT %= 64;
-		sha1_step(ctxt);
-		padstart = COUNT % 64;	/* should be 0 */
-		padlen = 64 - padstart;	/* should be 64 */
-	}
-	bzero(&ctxt->m.b8[padstart], padlen - 8);
-	COUNT += (padlen - 8);
-	COUNT %= 64;
-#if BYTE_ORDER == BIG_ENDIAN
-	PUTPAD(ctxt->c.b8[0]); PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[2]); PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[4]); PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[6]); PUTPAD(ctxt->c.b8[7]);
-#else
-	PUTPAD(ctxt->c.b8[7]); PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[5]); PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[3]); PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[1]); PUTPAD(ctxt->c.b8[0]);
-#endif
-}
-
-void
-sha1_loop(ctxt, input, len)
-	struct sha1_ctxt *ctxt;
-	const u_int8_t *input;
-	size_t len;
-{
-	size_t gaplen;
-	size_t gapstart;
-	size_t off;
-	size_t copysiz;
-
-	off = 0;
-
-	while (off < len) {
-		gapstart = COUNT % 64;
-		gaplen = 64 - gapstart;
-
-		copysiz = (gaplen < len - off) ? gaplen : len - off;
-		bcopy(&input[off], &ctxt->m.b8[gapstart], copysiz);
-		COUNT += copysiz;
-		COUNT %= 64;
-		ctxt->c.b64[0] += copysiz * 8;
-		if (COUNT % 64 == 0)
-			sha1_step(ctxt);
-		off += copysiz;
-	}
-}
-
-void
-sha1_result(ctxt, digest0)
-	struct sha1_ctxt *ctxt;
-	caddr_t digest0;
-{
-	u_int8_t *digest;
-
-	digest = (u_int8_t *)digest0;
-	sha1_pad(ctxt);
-#if BYTE_ORDER == BIG_ENDIAN
-	bcopy(&ctxt->h.b8[0], digest, 20);
-#else
-	digest[0] = ctxt->h.b8[3]; digest[1] = ctxt->h.b8[2];
-	digest[2] = ctxt->h.b8[1]; digest[3] = ctxt->h.b8[0];
-	digest[4] = ctxt->h.b8[7]; digest[5] = ctxt->h.b8[6];
-	digest[6] = ctxt->h.b8[5]; digest[7] = ctxt->h.b8[4];
-	digest[8] = ctxt->h.b8[11]; digest[9] = ctxt->h.b8[10];
-	digest[10] = ctxt->h.b8[9]; digest[11] = ctxt->h.b8[8];
-	digest[12] = ctxt->h.b8[15]; digest[13] = ctxt->h.b8[14];
-	digest[14] = ctxt->h.b8[13]; digest[15] = ctxt->h.b8[12];
-	digest[16] = ctxt->h.b8[19]; digest[17] = ctxt->h.b8[18];
-	digest[18] = ctxt->h.b8[17]; digest[19] = ctxt->h.b8[16];
-#endif
-}
-
-#endif /*unsupported*/
diff --git a/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.h b/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.h
deleted file mode 100644
index 0e19d9071f..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/safe/sha1.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$FreeBSD: src/sys/crypto/sha1.h,v 1.8 2002/03/20 05:13:50 alfred Exp $	*/
-/*	$KAME: sha1.h,v 1.5 2000/03/27 04:36:23 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://csrc.nist.gov/fips/fip180-1.txt
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#ifndef _NETINET6_SHA1_H_
-#define _NETINET6_SHA1_H_
-
-struct sha1_ctxt {
-	union {
-		u_int8_t	b8[20];
-		u_int32_t	b32[5];
-	} h;
-	union {
-		u_int8_t	b8[8];
-		u_int64_t	b64[1];
-	} c;
-	union {
-		u_int8_t	b8[64];
-		u_int32_t	b32[16];
-	} m;
-	u_int8_t	count;
-};
-
-#ifdef __KERNEL__
-extern void sha1_init(struct sha1_ctxt *);
-extern void sha1_pad(struct sha1_ctxt *);
-extern void sha1_loop(struct sha1_ctxt *, const u_int8_t *, size_t);
-extern void sha1_result(struct sha1_ctxt *, caddr_t);
-
-/* compatibilty with other SHA1 source codes */
-typedef struct sha1_ctxt SHA1_CTX;
-#define SHA1Init(x)		sha1_init((x))
-#define SHA1Update(x, y, z)	sha1_loop((x), (y), (z))
-#define SHA1Final(x, y)		sha1_result((y), (x))
-#endif /* __KERNEL__ */
-
-#define	SHA1_RESULTLEN	(160/8)
-
-#endif /*_NETINET6_SHA1_H_*/
diff --git a/target/linux/generic-2.6/files/crypto/ocf/talitos/Makefile b/target/linux/generic-2.6/files/crypto/ocf/talitos/Makefile
deleted file mode 100644
index 2591b8aef5..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/talitos/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# for SGlinux builds
--include $(ROOTDIR)/modules/.config
-
-obj-$(CONFIG_OCF_TALITOS) += talitos.o
-
-obj ?= .
-EXTRA_CFLAGS += -I$(obj)/.. -I$(obj)/
-
-ifdef TOPDIR
--include $(TOPDIR)/Rules.make
-endif
-
diff --git a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos.c b/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos.c
deleted file mode 100644
index 94046343ef..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos.c
+++ /dev/null
@@ -1,1359 +0,0 @@
-/*
- * crypto/ocf/talitos/talitos.c
- *
- * An OCF-Linux module that uses Freescale's SEC to do the crypto.
- * Based on crypto/ocf/hifn and crypto/ocf/safe OCF drivers
- *
- * Copyright (c) 2006 Freescale Semiconductor, Inc.
- *
- * This code written by Kim A. B. Phillips <kim.phillips@freescale.com>
- * some code copied from files with the following:
- * Copyright (C) 2004-2007 David McCullough <david_mccullough@mcafee.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---------------------------------------------------------------------------
- *
- * NOTES:
- *
- * The Freescale SEC (also known as 'talitos') resides on the
- * internal bus, and runs asynchronous to the processor core.  It has
- * a wide gamut of cryptographic acceleration features, including single-
- * pass IPsec (also known as algorithm chaining).  To properly utilize 
- * all of the SEC's performance enhancing features, further reworking 
- * of higher level code (framework, applications) will be necessary.
- *
- * The following table shows which SEC version is present in which devices:
- * 
- * Devices       SEC version
- *
- * 8272, 8248    SEC 1.0
- * 885, 875      SEC 1.2
- * 8555E, 8541E  SEC 2.0
- * 8349E         SEC 2.01
- * 8548E         SEC 2.1
- *
- * The following table shows the features offered by each SEC version:
- *
- * 	                       Max.   chan-
- * version  Bus I/F       Clock  nels  DEU AESU AFEU MDEU PKEU RNG KEU
- *
- * SEC 1.0  internal 64b  100MHz   4     1    1    1    1    1   1   0
- * SEC 1.2  internal 32b   66MHz   1     1    1    0    1    0   0   0
- * SEC 2.0  internal 64b  166MHz   4     1    1    1    1    1   1   0
- * SEC 2.01 internal 64b  166MHz   4     1    1    1    1    1   1   0
- * SEC 2.1  internal 64b  333MHz   4     1    1    1    1    1   1   1
- *
- * Each execution unit in the SEC has two modes of execution; channel and
- * slave/debug.  This driver employs the channel infrastructure in the
- * device for convenience.  Only the RNG is directly accessed due to the
- * convenience of its random fifo pool.  The relationship between the
- * channels and execution units is depicted in the following diagram:
- *
- *    -------   ------------
- * ---| ch0 |---|          |
- *    -------   |          |
- *              |          |------+-------+-------+-------+------------
- *    -------   |          |      |       |       |       |           |
- * ---| ch1 |---|          |      |       |       |       |           |
- *    -------   |          |   ------  ------  ------  ------      ------
- *              |controller|   |DEU |  |AESU|  |MDEU|  |PKEU| ...  |RNG |
- *    -------   |          |   ------  ------  ------  ------      ------
- * ---| ch2 |---|          |      |       |       |       |           |
- *    -------   |          |      |       |       |       |           |
- *              |          |------+-------+-------+-------+------------
- *    -------   |          |
- * ---| ch3 |---|          |
- *    -------   ------------
- *
- * Channel ch0 may drive an aes operation to the aes unit (AESU),
- * and, at the same time, ch1 may drive a message digest operation
- * to the mdeu. Each channel has an input descriptor FIFO, and the 
- * FIFO can contain, e.g. on the 8541E, up to 24 entries, before a
- * a buffer overrun error is triggered. The controller is responsible
- * for fetching the data from descriptor pointers, and passing the 
- * data to the appropriate EUs. The controller also writes the 
- * cryptographic operation's result to memory. The SEC notifies 
- * completion by triggering an interrupt and/or setting the 1st byte 
- * of the hdr field to 0xff.
- *
- * TODO:
- * o support more algorithms
- * o support more versions of the SEC
- * o add support for linux 2.4
- * o scatter-gather (sg) support
- * o add support for public key ops (PKEU)
- * o add statistics
- */
-
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/spinlock.h>
-#include <linux/random.h>
-#include <linux/skbuff.h>
-#include <asm/scatterlist.h>
-#include <linux/dma-mapping.h>  /* dma_map_single() */
-#include <linux/moduleparam.h>
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-#include <linux/platform_device.h>
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-#include <linux/of_platform.h>
-#endif
-
-#include <cryptodev.h>
-#include <uio.h>
-
-#define DRV_NAME "talitos" 
-
-#include "talitos_dev.h"
-#include "talitos_soft.h"
-
-#define read_random(p,l) get_random_bytes(p,l)
-
-const char talitos_driver_name[] = "Talitos OCF";
-const char talitos_driver_version[] = "0.2";
-
-static int talitos_newsession(device_t dev, u_int32_t *sidp,
-								struct cryptoini *cri);
-static int talitos_freesession(device_t dev, u_int64_t tid);
-static int talitos_process(device_t dev, struct cryptop *crp, int hint);
-static void dump_talitos_status(struct talitos_softc *sc);
-static int talitos_submit(struct talitos_softc *sc, struct talitos_desc *td, 
-								int chsel);
-static void talitos_doneprocessing(struct talitos_softc *sc);
-static void talitos_init_device(struct talitos_softc *sc);
-static void talitos_reset_device_master(struct talitos_softc *sc);
-static void talitos_reset_device(struct talitos_softc *sc);
-static void talitos_errorprocessing(struct talitos_softc *sc);
-#ifdef CONFIG_PPC_MERGE
-static int talitos_probe(struct of_device *ofdev, const struct of_device_id *match);
-static int talitos_remove(struct of_device *ofdev);
-#else
-static int talitos_probe(struct platform_device *pdev);
-static int talitos_remove(struct platform_device *pdev);
-#endif
-#ifdef CONFIG_OCF_RANDOMHARVEST
-static int talitos_read_random(void *arg, u_int32_t *buf, int maxwords);
-static void talitos_rng_init(struct talitos_softc *sc);
-#endif
-
-static device_method_t talitos_methods = {
-	/* crypto device methods */
-	DEVMETHOD(cryptodev_newsession,	talitos_newsession),
-	DEVMETHOD(cryptodev_freesession,talitos_freesession),
-	DEVMETHOD(cryptodev_process,	talitos_process),
-};
-
-#define debug talitos_debug
-int talitos_debug = 0;
-module_param(talitos_debug, int, 0644);
-MODULE_PARM_DESC(talitos_debug, "Enable debug");
-
-static inline void talitos_write(volatile unsigned *addr, u32 val)
-{
-        out_be32(addr, val);
-}
-
-static inline u32 talitos_read(volatile unsigned *addr)
-{
-        u32 val;
-        val = in_be32(addr);
-        return val;
-}
-
-static void dump_talitos_status(struct talitos_softc *sc)
-{
-	unsigned int v, v_hi, i, *ptr;
-	v = talitos_read(sc->sc_base_addr + TALITOS_MCR);
-	v_hi = talitos_read(sc->sc_base_addr + TALITOS_MCR_HI);
-	printk(KERN_INFO "%s: MCR          0x%08x_%08x\n",
-			device_get_nameunit(sc->sc_cdev), v, v_hi);
-	v = talitos_read(sc->sc_base_addr + TALITOS_IMR);
-	v_hi = talitos_read(sc->sc_base_addr + TALITOS_IMR_HI);
-	printk(KERN_INFO "%s: IMR          0x%08x_%08x\n",
-			device_get_nameunit(sc->sc_cdev), v, v_hi);
-	v = talitos_read(sc->sc_base_addr + TALITOS_ISR);
-	v_hi = talitos_read(sc->sc_base_addr + TALITOS_ISR_HI);
-	printk(KERN_INFO "%s: ISR          0x%08x_%08x\n",
-			device_get_nameunit(sc->sc_cdev), v, v_hi);
-	for (i = 0; i < sc->sc_num_channels; i++) { 
-		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
-			TALITOS_CH_CDPR);
-		v_hi = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
-			TALITOS_CH_CDPR_HI);
-		printk(KERN_INFO "%s: CDPR     ch%d 0x%08x_%08x\n", 
-				device_get_nameunit(sc->sc_cdev), i, v, v_hi);
-	}
-	for (i = 0; i < sc->sc_num_channels; i++) { 
-		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
-			TALITOS_CH_CCPSR);
-		v_hi = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET + 
-			TALITOS_CH_CCPSR_HI);
-		printk(KERN_INFO "%s: CCPSR    ch%d 0x%08x_%08x\n", 
-				device_get_nameunit(sc->sc_cdev), i, v, v_hi);
-	}
-	ptr = sc->sc_base_addr + TALITOS_CH_DESCBUF;
-	for (i = 0; i < 16; i++) { 
-		v = talitos_read(ptr++); v_hi = talitos_read(ptr++);
-		printk(KERN_INFO "%s: DESCBUF  ch0 0x%08x_%08x (tdp%02d)\n", 
-				device_get_nameunit(sc->sc_cdev), v, v_hi, i);
-	}
-	return;
-}
-
-
-#ifdef CONFIG_OCF_RANDOMHARVEST
-/* 
- * pull random numbers off the RNG FIFO, not exceeding amount available
- */
-static int
-talitos_read_random(void *arg, u_int32_t *buf, int maxwords)
-{
-	struct talitos_softc *sc = (struct talitos_softc *) arg;
-	int rc;
-	u_int32_t v;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/* check for things like FIFO underflow */
-	v = talitos_read(sc->sc_base_addr + TALITOS_RNGISR_HI);
-	if (unlikely(v)) {
-		printk(KERN_ERR "%s: RNGISR_HI error %08x\n",
-				device_get_nameunit(sc->sc_cdev), v);
-		return 0;
-	}
-	/*
-	 * OFL is number of available 64-bit words, 
-	 * shift and convert to a 32-bit word count
-	 */
-	v = talitos_read(sc->sc_base_addr + TALITOS_RNGSR_HI);
-	v = (v & TALITOS_RNGSR_HI_OFL) >> (16 - 1);
-	if (maxwords > v)
-		maxwords = v;
-	for (rc = 0; rc < maxwords; rc++) {
-		buf[rc] = talitos_read(sc->sc_base_addr + 
-			TALITOS_RNG_FIFO + rc*sizeof(u_int32_t));
-	}
-	if (maxwords & 1) {
-		/* 
-		 * RNG will complain with an AE in the RNGISR
-		 * if we don't complete the pairs of 32-bit reads
-		 * to its 64-bit register based FIFO
-		 */
-		v = talitos_read(sc->sc_base_addr + 
-			TALITOS_RNG_FIFO + rc*sizeof(u_int32_t));
-	}
-
-	return rc;
-}
-
-static void
-talitos_rng_init(struct talitos_softc *sc)
-{
-	u_int32_t v;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	/* reset RNG EU */
-	v = talitos_read(sc->sc_base_addr + TALITOS_RNGRCR_HI);
-	v |= TALITOS_RNGRCR_HI_SR;
-	talitos_write(sc->sc_base_addr + TALITOS_RNGRCR_HI, v);
-	while ((talitos_read(sc->sc_base_addr + TALITOS_RNGSR_HI) 
-		& TALITOS_RNGSR_HI_RD) == 0)
-			cpu_relax();
-	/*
-	 * we tell the RNG to start filling the RNG FIFO
-	 * by writing the RNGDSR 
-	 */
-	v = talitos_read(sc->sc_base_addr + TALITOS_RNGDSR_HI);
-	talitos_write(sc->sc_base_addr + TALITOS_RNGDSR_HI, v);
-	/*
-	 * 64 bits of data will be pushed onto the FIFO every 
-	 * 256 SEC cycles until the FIFO is full.  The RNG then 
-	 * attempts to keep the FIFO full.
-	 */
-	v = talitos_read(sc->sc_base_addr + TALITOS_RNGISR_HI);
-	if (v) {
-		printk(KERN_ERR "%s: RNGISR_HI error %08x\n",
-			device_get_nameunit(sc->sc_cdev), v);
-		return;
-	}
-	/*
-	 * n.b. we need to add a FIPS test here - if the RNG is going 
-	 * to fail, it's going to fail at reset time
-	 */
-	return;
-}
-#endif /* CONFIG_OCF_RANDOMHARVEST */
-
-/*
- * Generate a new software session.
- */
-static int
-talitos_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
-{
-	struct cryptoini *c, *encini = NULL, *macini = NULL;
-	struct talitos_softc *sc = device_get_softc(dev);
-	struct talitos_session *ses = NULL;
-	int sesn;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	if (sidp == NULL || cri == NULL || sc == NULL) {
-		DPRINTF("%s,%d - EINVAL\n", __FILE__, __LINE__);
-		return EINVAL;
-	}
-	for (c = cri; c != NULL; c = c->cri_next) {
-		if (c->cri_alg == CRYPTO_MD5 ||
-		    c->cri_alg == CRYPTO_MD5_HMAC ||
-		    c->cri_alg == CRYPTO_SHA1 ||
-		    c->cri_alg == CRYPTO_SHA1_HMAC ||
-		    c->cri_alg == CRYPTO_NULL_HMAC) {
-			if (macini)
-				return EINVAL;
-			macini = c;
-		} else if (c->cri_alg == CRYPTO_DES_CBC ||
-		    c->cri_alg == CRYPTO_3DES_CBC ||
-		    c->cri_alg == CRYPTO_AES_CBC ||
-		    c->cri_alg == CRYPTO_NULL_CBC) {
-			if (encini)
-				return EINVAL;
-			encini = c;
-		} else {
-			DPRINTF("UNKNOWN c->cri_alg %d\n", encini->cri_alg);
-			return EINVAL;
-		}
-	}
-	if (encini == NULL && macini == NULL)
-		return EINVAL;
-	if (encini) {	
-		/* validate key length */
-		switch (encini->cri_alg) {
-		case CRYPTO_DES_CBC:
-			if (encini->cri_klen != 64)
-				return EINVAL;
-			break;
-		case CRYPTO_3DES_CBC:
-			if (encini->cri_klen != 192) {
-				return EINVAL;
-			}
-			break;
-		case CRYPTO_AES_CBC:
-			if (encini->cri_klen != 128 &&
-			    encini->cri_klen != 192 &&
-			    encini->cri_klen != 256)
-				return EINVAL;
-			break;
-		default:
-			DPRINTF("UNKNOWN encini->cri_alg %d\n", 
-				encini->cri_alg);
-			return EINVAL;
-		}
-	}
-
-	if (sc->sc_sessions == NULL) {
-		ses = sc->sc_sessions = (struct talitos_session *)
-			kmalloc(sizeof(struct talitos_session), SLAB_ATOMIC);
-		if (ses == NULL)
-			return ENOMEM;
-		memset(ses, 0, sizeof(struct talitos_session));
-		sesn = 0;
-		sc->sc_nsessions = 1;
-	} else {
-		for (sesn = 0; sesn < sc->sc_nsessions; sesn++) {
-			if (sc->sc_sessions[sesn].ses_used == 0) {
-				ses = &sc->sc_sessions[sesn];
-				break;
-			}
-		}
-
-		if (ses == NULL) {
-			/* allocating session */
-			sesn = sc->sc_nsessions;
-			ses = (struct talitos_session *) kmalloc(
-				(sesn + 1) * sizeof(struct talitos_session), 
-				SLAB_ATOMIC);
-			if (ses == NULL)
-				return ENOMEM;
-			memset(ses, 0,
-				(sesn + 1) * sizeof(struct talitos_session));
-			memcpy(ses, sc->sc_sessions, 
-				sesn * sizeof(struct talitos_session));
-			memset(sc->sc_sessions, 0,
-				sesn * sizeof(struct talitos_session));
-			kfree(sc->sc_sessions);
-			sc->sc_sessions = ses;
-			ses = &sc->sc_sessions[sesn];
-			sc->sc_nsessions++;
-		}
-	}
-
-	ses->ses_used = 1;
-
-	if (encini) {
-		/* get an IV */
-		/* XXX may read fewer than requested */
-		read_random(ses->ses_iv, sizeof(ses->ses_iv));
-
-		ses->ses_klen = (encini->cri_klen + 7) / 8;
-		memcpy(ses->ses_key, encini->cri_key, ses->ses_klen);
-		if (macini) {
-			/* doing hash on top of cipher */
-			ses->ses_hmac_len = (macini->cri_klen + 7) / 8;
-			memcpy(ses->ses_hmac, macini->cri_key,
-				ses->ses_hmac_len);
-		}
-	} else if (macini) {
-		/* doing hash */
-		ses->ses_klen = (macini->cri_klen + 7) / 8;
-		memcpy(ses->ses_key, macini->cri_key, ses->ses_klen);
-	}
-
-	/* back compat way of determining MSC result len */
-	if (macini) {
-		ses->ses_mlen = macini->cri_mlen;
-		if (ses->ses_mlen == 0) {
-			if (macini->cri_alg == CRYPTO_MD5_HMAC)
-				ses->ses_mlen = MD5_HASH_LEN;
-			else
-				ses->ses_mlen = SHA1_HASH_LEN;
-		}
-	}
-
-	/* really should make up a template td here, 
-	 * and only fill things like i/o and direction in process() */
-
-	/* assign session ID */
-	*sidp = TALITOS_SID(sc->sc_num, sesn);
-	return 0;
-}
-
-/*
- * Deallocate a session.
- */
-static int
-talitos_freesession(device_t dev, u_int64_t tid)
-{
-	struct talitos_softc *sc = device_get_softc(dev);
-	int session, ret;
-	u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
-
-	if (sc == NULL)
-		return EINVAL;
-	session = TALITOS_SESSION(sid);
-	if (session < sc->sc_nsessions) {
-		memset(&sc->sc_sessions[session], 0,
-			sizeof(sc->sc_sessions[session]));
-		ret = 0;
-	} else
-		ret = EINVAL;
-	return ret;
-}
-
-/*
- * launch device processing - it will come back with done notification 
- * in the form of an interrupt and/or HDR_DONE_BITS in header 
- */
-static int 
-talitos_submit(
-	struct talitos_softc *sc,
-	struct talitos_desc *td,
-	int chsel)
-{
-	u_int32_t v;
-
-	v = dma_map_single(NULL, td, sizeof(*td), DMA_TO_DEVICE);
-	talitos_write(sc->sc_base_addr + 
-		chsel*TALITOS_CH_OFFSET + TALITOS_CH_FF, 0);
-	talitos_write(sc->sc_base_addr + 
-		chsel*TALITOS_CH_OFFSET + TALITOS_CH_FF_HI, v);
-	return 0;
-}
-
-static int
-talitos_process(device_t dev, struct cryptop *crp, int hint)
-{
-	int i, err = 0, ivsize;
-	struct talitos_softc *sc = device_get_softc(dev);
-	struct cryptodesc *crd1, *crd2, *maccrd, *enccrd;
-	caddr_t iv;
-	struct talitos_session *ses;
-	struct talitos_desc *td;
-	unsigned long flags;
-	/* descriptor mappings */
-	int hmac_key, hmac_data, cipher_iv, cipher_key, 
-		in_fifo, out_fifo, cipher_iv_out;
-	static int chsel = -1;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	if (crp == NULL || crp->crp_callback == NULL || sc == NULL) {
-		return EINVAL;
-	}
-	crp->crp_etype = 0;
-	if (TALITOS_SESSION(crp->crp_sid) >= sc->sc_nsessions) {
-		return EINVAL;
-	}
-
-	ses = &sc->sc_sessions[TALITOS_SESSION(crp->crp_sid)];
-
-        /* enter the channel scheduler */ 
-	spin_lock_irqsave(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
-
-	/* reuse channel that already had/has requests for the required EU */
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		if (sc->sc_chnlastalg[i] == crp->crp_desc->crd_alg)
-			break;
-	}
-	if (i == sc->sc_num_channels) {
-		/*
-		 * haven't seen this algo the last sc_num_channels or more
-		 * use round robin in this case
-	 	 * nb: sc->sc_num_channels must be power of 2 
-		 */
-		chsel = (chsel + 1) & (sc->sc_num_channels - 1);
-	} else {
-		/*
-		 * matches channel with same target execution unit; 
-		 * use same channel in this case
-		 */
-		chsel = i;
-	}
-	sc->sc_chnlastalg[chsel] = crp->crp_desc->crd_alg;
-
-        /* release the channel scheduler lock */ 
-	spin_unlock_irqrestore(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
-
-	/* acquire the selected channel fifo lock */
-	spin_lock_irqsave(&sc->sc_chnfifolock[chsel], flags);
-
-	/* find and reserve next available descriptor-cryptop pair */
-	for (i = 0; i < sc->sc_chfifo_len; i++) {
-		if (sc->sc_chnfifo[chsel][i].cf_desc.hdr == 0) {
-			/* 
-			 * ensure correct descriptor formation by
-			 * avoiding inadvertently setting "optional" entries
-			 * e.g. not using "optional" dptr2 for MD/HMAC descs
-			 */
-			memset(&sc->sc_chnfifo[chsel][i].cf_desc,
-				0, sizeof(*td));
-			/* reserve it with done notification request bit */
-			sc->sc_chnfifo[chsel][i].cf_desc.hdr |= 
-				TALITOS_DONE_NOTIFY;
-			break;
-		}
-	}
-	spin_unlock_irqrestore(&sc->sc_chnfifolock[chsel], flags);
-
-	if (i == sc->sc_chfifo_len) {
-		/* fifo full */
-		err = ERESTART;
-		goto errout;
-	}
-	
-	td = &sc->sc_chnfifo[chsel][i].cf_desc;
-	sc->sc_chnfifo[chsel][i].cf_crp = crp;
-
-	crd1 = crp->crp_desc;
-	if (crd1 == NULL) {
-		err = EINVAL;
-		goto errout;
-	}
-	crd2 = crd1->crd_next;
-	/* prevent compiler warning */
-	hmac_key = 0;
-	hmac_data = 0;
-	if (crd2 == NULL) {
-		td->hdr |= TD_TYPE_COMMON_NONSNOOP_NO_AFEU;
-		/* assign descriptor dword ptr mappings for this desc. type */
-		cipher_iv = 1;
-		cipher_key = 2;
-		in_fifo = 3;
-		cipher_iv_out = 5;
-		if (crd1->crd_alg == CRYPTO_MD5_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-		    crd1->crd_alg == CRYPTO_SHA1 ||
-		    crd1->crd_alg == CRYPTO_MD5) {
-			out_fifo = 5;
-			maccrd = crd1;
-			enccrd = NULL;
-		} else if (crd1->crd_alg == CRYPTO_DES_CBC ||
-		    crd1->crd_alg == CRYPTO_3DES_CBC ||
-		    crd1->crd_alg == CRYPTO_AES_CBC ||
-		    crd1->crd_alg == CRYPTO_ARC4) {
-			out_fifo = 4;
-			maccrd = NULL;
-			enccrd = crd1;
-		} else {
-			DPRINTF("UNKNOWN crd1->crd_alg %d\n", crd1->crd_alg);
-			err = EINVAL;
-			goto errout;
-		}
-	} else {
-		if (sc->sc_desc_types & TALITOS_HAS_DT_IPSEC_ESP) {
-			td->hdr |= TD_TYPE_IPSEC_ESP;
-		} else {
-			DPRINTF("unimplemented: multiple descriptor ipsec\n");
-			err = EINVAL;
-			goto errout;
-		}
-		/* assign descriptor dword ptr mappings for this desc. type */
-		hmac_key = 0;
-		hmac_data = 1;
-		cipher_iv = 2;
-		cipher_key = 3;
-		in_fifo = 4;
-		out_fifo = 5;
-		cipher_iv_out = 6;
-		if ((crd1->crd_alg == CRYPTO_MD5_HMAC ||
-                     crd1->crd_alg == CRYPTO_SHA1_HMAC ||
-                     crd1->crd_alg == CRYPTO_MD5 ||
-                     crd1->crd_alg == CRYPTO_SHA1) &&
-		    (crd2->crd_alg == CRYPTO_DES_CBC ||
-		     crd2->crd_alg == CRYPTO_3DES_CBC ||
-		     crd2->crd_alg == CRYPTO_AES_CBC ||
-		     crd2->crd_alg == CRYPTO_ARC4) &&
-		    ((crd2->crd_flags & CRD_F_ENCRYPT) == 0)) {
-			maccrd = crd1;
-			enccrd = crd2;
-		} else if ((crd1->crd_alg == CRYPTO_DES_CBC ||
-		     crd1->crd_alg == CRYPTO_ARC4 ||
-		     crd1->crd_alg == CRYPTO_3DES_CBC ||
-		     crd1->crd_alg == CRYPTO_AES_CBC) &&
-		    (crd2->crd_alg == CRYPTO_MD5_HMAC ||
-                     crd2->crd_alg == CRYPTO_SHA1_HMAC ||
-                     crd2->crd_alg == CRYPTO_MD5 ||
-                     crd2->crd_alg == CRYPTO_SHA1) &&
-		    (crd1->crd_flags & CRD_F_ENCRYPT)) {
-			enccrd = crd1;
-			maccrd = crd2;
-		} else {
-			/* We cannot order the SEC as requested */
-			printk("%s: cannot do the order\n",
-					device_get_nameunit(sc->sc_cdev));
-			err = EINVAL;
-			goto errout;
-		}
-	}
-	/* assign in_fifo and out_fifo based on input/output struct type */
-	if (crp->crp_flags & CRYPTO_F_SKBUF) {
-		/* using SKB buffers */
-		struct sk_buff *skb = (struct sk_buff *)crp->crp_buf;
-		if (skb_shinfo(skb)->nr_frags) {
-			printk("%s: skb frags unimplemented\n",
-					device_get_nameunit(sc->sc_cdev));
-			err = EINVAL;
-			goto errout;
-		}
-		td->ptr[in_fifo].ptr = dma_map_single(NULL, skb->data, 
-			skb->len, DMA_TO_DEVICE);
-		td->ptr[in_fifo].len = skb->len;
-		td->ptr[out_fifo].ptr = dma_map_single(NULL, skb->data, 
-			skb->len, DMA_TO_DEVICE);
-		td->ptr[out_fifo].len = skb->len;
-		td->ptr[hmac_data].ptr = dma_map_single(NULL, skb->data,
-			skb->len, DMA_TO_DEVICE);
-	} else if (crp->crp_flags & CRYPTO_F_IOV) {
-		/* using IOV buffers */
-		struct uio *uiop = (struct uio *)crp->crp_buf;
-		if (uiop->uio_iovcnt > 1) {
-			printk("%s: iov frags unimplemented\n",
-					device_get_nameunit(sc->sc_cdev));
-			err = EINVAL;
-			goto errout;
-		}
-		td->ptr[in_fifo].ptr = dma_map_single(NULL,
-			uiop->uio_iov->iov_base, crp->crp_ilen, DMA_TO_DEVICE);
-		td->ptr[in_fifo].len = crp->crp_ilen;
-		/* crp_olen is never set; always use crp_ilen */
-		td->ptr[out_fifo].ptr = dma_map_single(NULL,
-			uiop->uio_iov->iov_base,
-			crp->crp_ilen, DMA_TO_DEVICE);
-		td->ptr[out_fifo].len = crp->crp_ilen;
-	} else {
-		/* using contig buffers */
-		td->ptr[in_fifo].ptr = dma_map_single(NULL,
-			crp->crp_buf, crp->crp_ilen, DMA_TO_DEVICE);
-		td->ptr[in_fifo].len = crp->crp_ilen;
-		td->ptr[out_fifo].ptr = dma_map_single(NULL,
-			crp->crp_buf, crp->crp_ilen, DMA_TO_DEVICE);
-		td->ptr[out_fifo].len = crp->crp_ilen;
-	}
-	if (enccrd) {
-		switch (enccrd->crd_alg) {
-		case CRYPTO_3DES_CBC:
-			td->hdr |= TALITOS_MODE0_DEU_3DES;
-			/* FALLTHROUGH */
-		case CRYPTO_DES_CBC:
-			td->hdr |= TALITOS_SEL0_DEU
-				|  TALITOS_MODE0_DEU_CBC;
-			if (enccrd->crd_flags & CRD_F_ENCRYPT)
-				td->hdr |= TALITOS_MODE0_DEU_ENC;
-			ivsize = 2*sizeof(u_int32_t);
-			DPRINTF("%cDES ses %d ch %d len %d\n",
-				(td->hdr & TALITOS_MODE0_DEU_3DES)?'3':'1',
-				(u32)TALITOS_SESSION(crp->crp_sid),
-				chsel, td->ptr[in_fifo].len);
-			break;
-		case CRYPTO_AES_CBC:
-			td->hdr |= TALITOS_SEL0_AESU
-				|  TALITOS_MODE0_AESU_CBC;
-			if (enccrd->crd_flags & CRD_F_ENCRYPT)
-				td->hdr |= TALITOS_MODE0_AESU_ENC;
-			ivsize = 4*sizeof(u_int32_t);
-			DPRINTF("AES  ses %d ch %d len %d\n",
-				(u32)TALITOS_SESSION(crp->crp_sid),
-				chsel, td->ptr[in_fifo].len);
-			break;
-		default:
-			printk("%s: unimplemented enccrd->crd_alg %d\n",
-					device_get_nameunit(sc->sc_cdev), enccrd->crd_alg);
-			err = EINVAL;
-			goto errout;
-		}
-		/*
-		 * Setup encrypt/decrypt state.  When using basic ops
-		 * we can't use an inline IV because hash/crypt offset
-		 * must be from the end of the IV to the start of the
-		 * crypt data and this leaves out the preceding header
-		 * from the hash calculation.  Instead we place the IV
-		 * in the state record and set the hash/crypt offset to
-		 * copy both the header+IV.
-		 */
-		if (enccrd->crd_flags & CRD_F_ENCRYPT) {
-			td->hdr |= TALITOS_DIR_OUTBOUND; 
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT)
-				iv = enccrd->crd_iv;
-			else
-				iv = (caddr_t) ses->ses_iv;
-			if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) {
-				crypto_copyback(crp->crp_flags, crp->crp_buf,
-				    enccrd->crd_inject, ivsize, iv);
-			}
-		} else {
-			td->hdr |= TALITOS_DIR_INBOUND; 
-			if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) {
-				iv = enccrd->crd_iv;
-				bcopy(enccrd->crd_iv, iv, ivsize);
-			} else {
-				iv = (caddr_t) ses->ses_iv;
-				crypto_copydata(crp->crp_flags, crp->crp_buf,
-				    enccrd->crd_inject, ivsize, iv);
-			}
-		}
-		td->ptr[cipher_iv].ptr = dma_map_single(NULL, iv, ivsize, 
-			DMA_TO_DEVICE);
-		td->ptr[cipher_iv].len = ivsize;
-		/*
-		 * we don't need the cipher iv out length/pointer
-		 * field to do ESP IPsec. Therefore we set the len field as 0,
-		 * which tells the SEC not to do anything with this len/ptr
-		 * field. Previously, when length/pointer as pointing to iv,
-		 * it gave us corruption of packets.
-		 */
-		td->ptr[cipher_iv_out].len = 0;
-	}
-	if (enccrd && maccrd) {
-		/* this is ipsec only for now */
-		td->hdr |= TALITOS_SEL1_MDEU
-			|  TALITOS_MODE1_MDEU_INIT
-			|  TALITOS_MODE1_MDEU_PAD;
-		switch (maccrd->crd_alg) {
-			case	CRYPTO_MD5:	
-				td->hdr |= TALITOS_MODE1_MDEU_MD5;
-				break;
-			case	CRYPTO_MD5_HMAC:	
-				td->hdr |= TALITOS_MODE1_MDEU_MD5_HMAC;
-				break;
-			case	CRYPTO_SHA1:	
-				td->hdr |= TALITOS_MODE1_MDEU_SHA1;
-				break;
-			case	CRYPTO_SHA1_HMAC:	
-				td->hdr |= TALITOS_MODE1_MDEU_SHA1_HMAC;
-				break;
-			default:
-				/* We cannot order the SEC as requested */
-				printk("%s: cannot do the order\n",
-						device_get_nameunit(sc->sc_cdev));
-				err = EINVAL;
-				goto errout;
-		}
-		if ((maccrd->crd_alg == CRYPTO_MD5_HMAC) ||
-		   (maccrd->crd_alg == CRYPTO_SHA1_HMAC)) {
-			/*
-			 * The offset from hash data to the start of
-			 * crypt data is the difference in the skips.
-			 */
-			/* ipsec only for now */
-			td->ptr[hmac_key].ptr = dma_map_single(NULL, 
-				ses->ses_hmac, ses->ses_hmac_len, DMA_TO_DEVICE);
-			td->ptr[hmac_key].len = ses->ses_hmac_len;
-			td->ptr[in_fifo].ptr  += enccrd->crd_skip;
-			td->ptr[in_fifo].len  =  enccrd->crd_len;
-			td->ptr[out_fifo].ptr += enccrd->crd_skip;
-			td->ptr[out_fifo].len =  enccrd->crd_len;
-			/* bytes of HMAC to postpend to ciphertext */
-			td->ptr[out_fifo].extent =  ses->ses_mlen;
-			td->ptr[hmac_data].ptr += maccrd->crd_skip; 
-			td->ptr[hmac_data].len = enccrd->crd_skip - maccrd->crd_skip;
-		}
-		if (enccrd->crd_flags & CRD_F_KEY_EXPLICIT) {
-			printk("%s: CRD_F_KEY_EXPLICIT unimplemented\n",
-					device_get_nameunit(sc->sc_cdev));
-		}
-	}
-	if (!enccrd && maccrd) {
-		/* single MD5 or SHA */
-		td->hdr |= TALITOS_SEL0_MDEU
-				|  TALITOS_MODE0_MDEU_INIT
-				|  TALITOS_MODE0_MDEU_PAD;
-		switch (maccrd->crd_alg) {
-			case	CRYPTO_MD5:	
-				td->hdr |= TALITOS_MODE0_MDEU_MD5;
-				DPRINTF("MD5  ses %d ch %d len %d\n",
-					(u32)TALITOS_SESSION(crp->crp_sid), 
-					chsel, td->ptr[in_fifo].len);
-				break;
-			case	CRYPTO_MD5_HMAC:	
-				td->hdr |= TALITOS_MODE0_MDEU_MD5_HMAC;
-				break;
-			case	CRYPTO_SHA1:	
-				td->hdr |= TALITOS_MODE0_MDEU_SHA1;
-				DPRINTF("SHA1 ses %d ch %d len %d\n",
-					(u32)TALITOS_SESSION(crp->crp_sid), 
-					chsel, td->ptr[in_fifo].len);
-				break;
-			case	CRYPTO_SHA1_HMAC:	
-				td->hdr |= TALITOS_MODE0_MDEU_SHA1_HMAC;
-				break;
-			default:
-				/* We cannot order the SEC as requested */
-				DPRINTF("cannot do the order\n");
-				err = EINVAL;
-				goto errout;
-		}
-
-		if (crp->crp_flags & CRYPTO_F_IOV)
-			td->ptr[out_fifo].ptr += maccrd->crd_inject;
-
-		if ((maccrd->crd_alg == CRYPTO_MD5_HMAC) ||
-		   (maccrd->crd_alg == CRYPTO_SHA1_HMAC)) {
-			td->ptr[hmac_key].ptr = dma_map_single(NULL, 
-				ses->ses_hmac, ses->ses_hmac_len, 
-				DMA_TO_DEVICE);
-			td->ptr[hmac_key].len = ses->ses_hmac_len;
-		}
-	} 
-	else {
-		/* using process key (session data has duplicate) */
-		td->ptr[cipher_key].ptr = dma_map_single(NULL, 
-			enccrd->crd_key, (enccrd->crd_klen + 7) / 8, 
-			DMA_TO_DEVICE);
-		td->ptr[cipher_key].len = (enccrd->crd_klen + 7) / 8;
-	}
-	/* descriptor complete - GO! */
-	return talitos_submit(sc, td, chsel);
-
-errout:
-	if (err != ERESTART) {
-		crp->crp_etype = err;
-		crypto_done(crp);
-	}
-	return err;
-}
-
-/* go through all channels descriptors, notifying OCF what has 
- * _and_hasn't_ successfully completed and reset the device 
- * (otherwise it's up to decoding desc hdrs!)
- */
-static void talitos_errorprocessing(struct talitos_softc *sc)
-{
-	unsigned long flags;
-	int i, j;
-
-	/* disable further scheduling until under control */
-	spin_lock_irqsave(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
-
-	if (debug) dump_talitos_status(sc);
-	/* go through descriptors, try and salvage those successfully done, 
-	 * and EIO those that weren't
-	 */
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		spin_lock_irqsave(&sc->sc_chnfifolock[i], flags);
-		for (j = 0; j < sc->sc_chfifo_len; j++) {
-			if (sc->sc_chnfifo[i][j].cf_desc.hdr) {
-				if ((sc->sc_chnfifo[i][j].cf_desc.hdr 
-					& TALITOS_HDR_DONE_BITS) 
-					!= TALITOS_HDR_DONE_BITS) {
-					/* this one didn't finish */
-					/* signify in crp->etype */
-					sc->sc_chnfifo[i][j].cf_crp->crp_etype 
-						= EIO;
-				}
-			} else
-				continue; /* free entry */
-			/* either way, notify ocf */
-			crypto_done(sc->sc_chnfifo[i][j].cf_crp);
-			/* and tag it available again
-			 *
-			 * memset to ensure correct descriptor formation by
-			 * avoiding inadvertently setting "optional" entries
-			 * e.g. not using "optional" dptr2 MD/HMAC processing
-			 */
-			memset(&sc->sc_chnfifo[i][j].cf_desc,
-				0, sizeof(struct talitos_desc));
-		}
-		spin_unlock_irqrestore(&sc->sc_chnfifolock[i], flags);
-	}
-	/* reset and initialize the SEC h/w device */
-	talitos_reset_device(sc);
-	talitos_init_device(sc);
-#ifdef CONFIG_OCF_RANDOMHARVEST
-	if (sc->sc_exec_units & TALITOS_HAS_EU_RNG)
-		talitos_rng_init(sc);
-#endif
-
-	/* Okay. Stand by. */
-	spin_unlock_irqrestore(&sc->sc_chnfifolock[sc->sc_num_channels], flags);
-
-	return;
-}
-
-/* go through all channels descriptors, notifying OCF what's been done */
-static void talitos_doneprocessing(struct talitos_softc *sc)
-{
-	unsigned long flags;
-	int i, j;
-
-	/* go through descriptors looking for done bits */
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		spin_lock_irqsave(&sc->sc_chnfifolock[i], flags);
-		for (j = 0; j < sc->sc_chfifo_len; j++) {
-			/* descriptor has done bits set? */
-			if ((sc->sc_chnfifo[i][j].cf_desc.hdr 
-				& TALITOS_HDR_DONE_BITS) 
-				== TALITOS_HDR_DONE_BITS) {
-				/* notify ocf */
-				crypto_done(sc->sc_chnfifo[i][j].cf_crp);
-				/* and tag it available again
-				 *
-				 * memset to ensure correct descriptor formation by
-				 * avoiding inadvertently setting "optional" entries
-				 * e.g. not using "optional" dptr2 MD/HMAC processing
-				 */
-				memset(&sc->sc_chnfifo[i][j].cf_desc,
-					0, sizeof(struct talitos_desc));
-			}
-		}
-		spin_unlock_irqrestore(&sc->sc_chnfifolock[i], flags);
-	}
-	return;
-}
-
-static irqreturn_t
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-talitos_intr(int irq, void *arg)
-#else
-talitos_intr(int irq, void *arg, struct pt_regs *regs)
-#endif
-{
-	struct talitos_softc *sc = arg;
-	u_int32_t v, v_hi;
-	
-	/* ack */
-	v = talitos_read(sc->sc_base_addr + TALITOS_ISR);
-	v_hi = talitos_read(sc->sc_base_addr + TALITOS_ISR_HI);
-	talitos_write(sc->sc_base_addr + TALITOS_ICR, v);
-	talitos_write(sc->sc_base_addr + TALITOS_ICR_HI, v_hi);
-
-	if (unlikely(v & TALITOS_ISR_ERROR)) {
-		/* Okay, Houston, we've had a problem here. */
-		printk(KERN_DEBUG "%s: got error interrupt - ISR 0x%08x_%08x\n",
-				device_get_nameunit(sc->sc_cdev), v, v_hi);
-		talitos_errorprocessing(sc);
-	} else
-	if (likely(v & TALITOS_ISR_DONE)) {
-		talitos_doneprocessing(sc);
-	}
-	return IRQ_HANDLED;
-}
-
-/*
- * Initialize registers we need to touch only once.
- */
-static void
-talitos_init_device(struct talitos_softc *sc)
-{
-	u_int32_t v;
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/* init all channels */
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		v = talitos_read(sc->sc_base_addr + 
-			i*TALITOS_CH_OFFSET + TALITOS_CH_CCCR_HI);
-		v |= TALITOS_CH_CCCR_HI_CDWE
-		  |  TALITOS_CH_CCCR_HI_CDIE;  /* invoke interrupt if done */
-		talitos_write(sc->sc_base_addr + 
-			i*TALITOS_CH_OFFSET + TALITOS_CH_CCCR_HI, v);
-	}
-	/* enable all interrupts */
-	v = talitos_read(sc->sc_base_addr + TALITOS_IMR);
-	v |= TALITOS_IMR_ALL;
-	talitos_write(sc->sc_base_addr + TALITOS_IMR, v);
-	v = talitos_read(sc->sc_base_addr + TALITOS_IMR_HI);
-	v |= TALITOS_IMR_HI_ERRONLY;
-	talitos_write(sc->sc_base_addr + TALITOS_IMR_HI, v);
-	return;
-}
-
-/*
- * set the master reset bit on the device.
- */
-static void
-talitos_reset_device_master(struct talitos_softc *sc)
-{
-	u_int32_t v;
-
-	/* Reset the device by writing 1 to MCR:SWR and waiting 'til cleared */
-	v = talitos_read(sc->sc_base_addr + TALITOS_MCR);
-	talitos_write(sc->sc_base_addr + TALITOS_MCR, v | TALITOS_MCR_SWR);
-
-	while (talitos_read(sc->sc_base_addr + TALITOS_MCR) & TALITOS_MCR_SWR)
-		cpu_relax();
-
-	return;
-}
-
-/*
- * Resets the device.  Values in the registers are left as is
- * from the reset (i.e. initial values are assigned elsewhere).
- */
-static void
-talitos_reset_device(struct talitos_softc *sc)
-{
-	u_int32_t v;
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	/*
-	 * Master reset
-	 * errata documentation: warning: certain SEC interrupts 
-	 * are not fully cleared by writing the MCR:SWR bit, 
-	 * set bit twice to completely reset 
-	 */
-	talitos_reset_device_master(sc);	/* once */
-	talitos_reset_device_master(sc);	/* and once again */
-	
-	/* reset all channels */
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		v = talitos_read(sc->sc_base_addr + i*TALITOS_CH_OFFSET +
-			TALITOS_CH_CCCR);
-		talitos_write(sc->sc_base_addr + i*TALITOS_CH_OFFSET +
-			TALITOS_CH_CCCR, v | TALITOS_CH_CCCR_RESET);
-	}
-}
-
-/* Set up the crypto device structure, private data,
- * and anything else we need before we start */
-#ifdef CONFIG_PPC_MERGE
-static int talitos_probe(struct of_device *ofdev, const struct of_device_id *match)
-#else
-static int talitos_probe(struct platform_device *pdev)
-#endif
-{
-	struct talitos_softc *sc = NULL;
-	struct resource *r;
-#ifdef CONFIG_PPC_MERGE
-	struct device *device = &ofdev->dev;
-	struct device_node *np = ofdev->node;
-	const unsigned int *prop;
-	int err;
-	struct resource res;
-#endif
-	static int num_chips = 0;
-	int rc;
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-
-	sc = (struct talitos_softc *) kmalloc(sizeof(*sc), GFP_KERNEL);
-	if (!sc)
-		return -ENOMEM;
-	memset(sc, 0, sizeof(*sc));
-
-	softc_device_init(sc, DRV_NAME, num_chips, talitos_methods);
-
-	sc->sc_irq = -1;
-	sc->sc_cid = -1;
-#ifndef CONFIG_PPC_MERGE
-	sc->sc_dev = pdev;
-#endif
-	sc->sc_num = num_chips++;
-
-#ifdef CONFIG_PPC_MERGE
-	dev_set_drvdata(device, sc);
-#else
-	platform_set_drvdata(sc->sc_dev, sc);
-#endif
-
-	/* get the irq line */
-#ifdef CONFIG_PPC_MERGE
-	err = of_address_to_resource(np, 0, &res);
-	if (err)
-		return -EINVAL;
-	r = &res;
-
-	sc->sc_irq = irq_of_parse_and_map(np, 0);
-#else
-	/* get a pointer to the register memory */
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-	sc->sc_irq = platform_get_irq(pdev, 0);
-#endif
-	rc = request_irq(sc->sc_irq, talitos_intr, 0,
-			device_get_nameunit(sc->sc_cdev), sc);
-	if (rc) {
-		printk(KERN_ERR "%s: failed to hook irq %d\n", 
-				device_get_nameunit(sc->sc_cdev), sc->sc_irq);
-		sc->sc_irq = -1;
-		goto out;
-	}
-
-	sc->sc_base_addr = (ocf_iomem_t) ioremap(r->start, (r->end - r->start));
-	if (!sc->sc_base_addr) {
-		printk(KERN_ERR "%s: failed to ioremap\n",
-				device_get_nameunit(sc->sc_cdev));
-		goto out;
-	}
-
-	/* figure out our SEC's properties and capabilities */
-	sc->sc_chiprev = (u64)talitos_read(sc->sc_base_addr + TALITOS_ID) << 32
-		 | talitos_read(sc->sc_base_addr + TALITOS_ID_HI);
-	DPRINTF("sec id 0x%llx\n", sc->sc_chiprev);
-
-#ifdef CONFIG_PPC_MERGE
-	/* get SEC properties from device tree, defaulting to SEC 2.0 */
-
-	prop = of_get_property(np, "num-channels", NULL);
-	sc->sc_num_channels = prop ? *prop : TALITOS_NCHANNELS_SEC_2_0;
-
-	prop = of_get_property(np, "channel-fifo-len", NULL);
-	sc->sc_chfifo_len = prop ? *prop : TALITOS_CHFIFOLEN_SEC_2_0;
-
-	prop = of_get_property(np, "exec-units-mask", NULL);
-	sc->sc_exec_units = prop ? *prop : TALITOS_HAS_EUS_SEC_2_0;
-
-	prop = of_get_property(np, "descriptor-types-mask", NULL);
-	sc->sc_desc_types = prop ? *prop : TALITOS_HAS_DESCTYPES_SEC_2_0;
-#else
-	/* bulk should go away with openfirmware flat device tree support */
-	if (sc->sc_chiprev & TALITOS_ID_SEC_2_0) {
-		sc->sc_num_channels = TALITOS_NCHANNELS_SEC_2_0;
-		sc->sc_chfifo_len = TALITOS_CHFIFOLEN_SEC_2_0;
-		sc->sc_exec_units = TALITOS_HAS_EUS_SEC_2_0;
-		sc->sc_desc_types = TALITOS_HAS_DESCTYPES_SEC_2_0;
-	} else {
-		printk(KERN_ERR "%s: failed to id device\n",
-				device_get_nameunit(sc->sc_cdev));
-		goto out;
-	}
-#endif
-
-	/* + 1 is for the meta-channel lock used by the channel scheduler */
-	sc->sc_chnfifolock = (spinlock_t *) kmalloc(
-		(sc->sc_num_channels + 1) * sizeof(spinlock_t), GFP_KERNEL);
-	if (!sc->sc_chnfifolock)
-		goto out;
-	for (i = 0; i < sc->sc_num_channels + 1; i++) {
-		spin_lock_init(&sc->sc_chnfifolock[i]);
-	}
-
-	sc->sc_chnlastalg = (int *) kmalloc(
-		sc->sc_num_channels * sizeof(int), GFP_KERNEL);
-	if (!sc->sc_chnlastalg)
-		goto out;
-	memset(sc->sc_chnlastalg, 0, sc->sc_num_channels * sizeof(int));
-
-	sc->sc_chnfifo = (struct desc_cryptop_pair **) kmalloc(
-		sc->sc_num_channels * sizeof(struct desc_cryptop_pair *), 
-		GFP_KERNEL);
-	if (!sc->sc_chnfifo)
-		goto out;
-	for (i = 0; i < sc->sc_num_channels; i++) {
-		sc->sc_chnfifo[i] = (struct desc_cryptop_pair *) kmalloc(
-			sc->sc_chfifo_len * sizeof(struct desc_cryptop_pair), 
-			GFP_KERNEL);
-		if (!sc->sc_chnfifo[i])
-			goto out;
-		memset(sc->sc_chnfifo[i], 0, 
-			sc->sc_chfifo_len * sizeof(struct desc_cryptop_pair));
-	}
-
-	/* reset and initialize the SEC h/w device */
-	talitos_reset_device(sc);
-	talitos_init_device(sc);
-
-	sc->sc_cid = crypto_get_driverid(softc_get_device(sc),CRYPTOCAP_F_HARDWARE);
-	if (sc->sc_cid < 0) {
-		printk(KERN_ERR "%s: could not get crypto driver id\n",
-				device_get_nameunit(sc->sc_cdev));
-		goto out;
-	}
-
-	/* register algorithms with the framework */
-	printk("%s:", device_get_nameunit(sc->sc_cdev));
-
-	if (sc->sc_exec_units & TALITOS_HAS_EU_RNG)  {
-		printk(" rng");
-#ifdef CONFIG_OCF_RANDOMHARVEST
-		talitos_rng_init(sc);
-		crypto_rregister(sc->sc_cid, talitos_read_random, sc);
-#endif
-	}
-	if (sc->sc_exec_units & TALITOS_HAS_EU_DEU) {
-		printk(" des/3des");
-		crypto_register(sc->sc_cid, CRYPTO_3DES_CBC, 0, 0);
-		crypto_register(sc->sc_cid, CRYPTO_DES_CBC, 0, 0);
-	}
-	if (sc->sc_exec_units & TALITOS_HAS_EU_AESU) {
-		printk(" aes");
-		crypto_register(sc->sc_cid, CRYPTO_AES_CBC, 0, 0);
-	}
-	if (sc->sc_exec_units & TALITOS_HAS_EU_MDEU) {
-		printk(" md5");
-		crypto_register(sc->sc_cid, CRYPTO_MD5, 0, 0);
-		/* HMAC support only with IPsec for now */
-		crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
-		printk(" sha1");
-		crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
-		/* HMAC support only with IPsec for now */
-		crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
-	}
-	printk("\n");
-	return 0;
-
-out:
-#ifndef CONFIG_PPC_MERGE
-	talitos_remove(pdev);
-#endif
-	return -ENOMEM;
-}
-
-#ifdef CONFIG_PPC_MERGE
-static int talitos_remove(struct of_device *ofdev)
-#else
-static int talitos_remove(struct platform_device *pdev)
-#endif
-{
-#ifdef CONFIG_PPC_MERGE
-	struct talitos_softc *sc = dev_get_drvdata(&ofdev->dev);
-#else
-	struct talitos_softc *sc = platform_get_drvdata(pdev);
-#endif
-	int i;
-
-	DPRINTF("%s()\n", __FUNCTION__);
-	if (sc->sc_cid >= 0)
-		crypto_unregister_all(sc->sc_cid);
-	if (sc->sc_chnfifo) {
-		for (i = 0; i < sc->sc_num_channels; i++)
-			if (sc->sc_chnfifo[i])
-				kfree(sc->sc_chnfifo[i]);
-		kfree(sc->sc_chnfifo);
-	}
-	if (sc->sc_chnlastalg)
-		kfree(sc->sc_chnlastalg);
-	if (sc->sc_chnfifolock)
-		kfree(sc->sc_chnfifolock);
-	if (sc->sc_irq != -1)
-		free_irq(sc->sc_irq, sc);
-	if (sc->sc_base_addr)
-		iounmap((void *) sc->sc_base_addr);
-	kfree(sc);
-	return 0;
-}
-
-#ifdef CONFIG_PPC_MERGE
-static struct of_device_id talitos_match[] = {
-	{
-		.type = "crypto",
-		.compatible = "talitos",
-	},
-	{},
-};
-
-MODULE_DEVICE_TABLE(of, talitos_match);
-
-static struct of_platform_driver talitos_driver = {
-	.name		= DRV_NAME,
-	.match_table	= talitos_match,
-	.probe		= talitos_probe,
-	.remove		= talitos_remove,
-};
-
-static int __init talitos_init(void)
-{
-	return of_register_platform_driver(&talitos_driver);
-}
-
-static void __exit talitos_exit(void)
-{
-	of_unregister_platform_driver(&talitos_driver);
-}
-#else
-/* Structure for a platform device driver */
-static struct platform_driver talitos_driver = {
-	.probe = talitos_probe,
-	.remove = talitos_remove,
-	.driver = {
-		.name = "fsl-sec2",
-	}
-};
-
-static int __init talitos_init(void)
-{
-	return platform_driver_register(&talitos_driver);
-}
-
-static void __exit talitos_exit(void)
-{
-	platform_driver_unregister(&talitos_driver);
-}
-#endif
-
-module_init(talitos_init);
-module_exit(talitos_exit);
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_AUTHOR("kim.phillips@freescale.com");
-MODULE_DESCRIPTION("OCF driver for Freescale SEC (talitos)");
diff --git a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_dev.h b/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_dev.h
deleted file mode 100644
index a8b04799fa..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_dev.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Freescale SEC (talitos) device dependent data structures
- *
- * Copyright (c) 2006 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/* device ID register values */
-#define TALITOS_ID_SEC_2_0	0x40
-#define TALITOS_ID_SEC_2_1	0x40 /* cross ref with IP block revision reg */
-
-/*
- * following num_channels, channel-fifo-depth, exec-unit-mask, and 
- * descriptor-types-mask are for forward-compatibility with openfirmware
- * flat device trees
- */
-
-/*
- *  num_channels : the number of channels available in each SEC version.
- */
-
-/* n.b. this driver requires these values be a power of 2 */
-#define TALITOS_NCHANNELS_SEC_1_0	4
-#define TALITOS_NCHANNELS_SEC_1_2	1
-#define TALITOS_NCHANNELS_SEC_2_0	4
-#define TALITOS_NCHANNELS_SEC_2_01	4
-#define TALITOS_NCHANNELS_SEC_2_1	4
-#define TALITOS_NCHANNELS_SEC_2_4	4
-
-/*
- *  channel-fifo-depth : The number of descriptor
- *  pointers a channel fetch fifo can hold.
- */
-#define TALITOS_CHFIFOLEN_SEC_1_0	1
-#define TALITOS_CHFIFOLEN_SEC_1_2	1
-#define TALITOS_CHFIFOLEN_SEC_2_0	24
-#define TALITOS_CHFIFOLEN_SEC_2_01	24
-#define TALITOS_CHFIFOLEN_SEC_2_1	24
-#define TALITOS_CHFIFOLEN_SEC_2_4	24
-
-/* 
- *  exec-unit-mask : The bitmask representing what Execution Units (EUs)
- *  are available. EU information should be encoded following the SEC's 
- *  EU_SEL0 bitfield documentation, i.e. as follows:
- * 
- *    bit 31 = set if SEC permits no-EU selection (should be always set)
- *    bit 30 = set if SEC has the ARC4 EU (AFEU)
- *    bit 29 = set if SEC has the des/3des EU (DEU)
- *    bit 28 = set if SEC has the message digest EU (MDEU)
- *    bit 27 = set if SEC has the random number generator EU (RNG)
- *    bit 26 = set if SEC has the public key EU (PKEU)
- *    bit 25 = set if SEC has the aes EU (AESU)
- *    bit 24 = set if SEC has the Kasumi EU (KEU)
- * 
- */
-#define TALITOS_HAS_EU_NONE		(1<<0)
-#define TALITOS_HAS_EU_AFEU		(1<<1)
-#define TALITOS_HAS_EU_DEU		(1<<2)
-#define TALITOS_HAS_EU_MDEU		(1<<3)
-#define TALITOS_HAS_EU_RNG		(1<<4)
-#define TALITOS_HAS_EU_PKEU		(1<<5)
-#define TALITOS_HAS_EU_AESU		(1<<6)
-#define TALITOS_HAS_EU_KEU		(1<<7)
-
-/* the corresponding masks for each SEC version */
-#define TALITOS_HAS_EUS_SEC_1_0		0x7f
-#define TALITOS_HAS_EUS_SEC_1_2		0x4d
-#define TALITOS_HAS_EUS_SEC_2_0		0x7f
-#define TALITOS_HAS_EUS_SEC_2_01	0x7f
-#define TALITOS_HAS_EUS_SEC_2_1		0xff
-#define TALITOS_HAS_EUS_SEC_2_4		0x7f
-
-/*
- *  descriptor-types-mask : The bitmask representing what descriptors
- *  are available. Descriptor type information should be encoded 
- *  following the SEC's Descriptor Header Dword DESC_TYPE field 
- *  documentation, i.e. as follows:
- *
- *    bit 0  = set if SEC supports the aesu_ctr_nonsnoop desc. type
- *    bit 1  = set if SEC supports the ipsec_esp descriptor type
- *    bit 2  = set if SEC supports the common_nonsnoop desc. type
- *    bit 3  = set if SEC supports the 802.11i AES ccmp desc. type
- *    bit 4  = set if SEC supports the hmac_snoop_no_afeu desc. type
- *    bit 5  = set if SEC supports the srtp descriptor type
- *    bit 6  = set if SEC supports the non_hmac_snoop_no_afeu desc.type
- *    bit 7  = set if SEC supports the pkeu_assemble descriptor type
- *    bit 8  = set if SEC supports the aesu_key_expand_output desc.type
- *    bit 9  = set if SEC supports the pkeu_ptmul descriptor type
- *    bit 10 = set if SEC supports the common_nonsnoop_afeu desc. type
- *    bit 11 = set if SEC supports the pkeu_ptadd_dbl descriptor type
- *
- *  ..and so on and so forth.
- */
-#define TALITOS_HAS_DT_AESU_CTR_NONSNOOP	(1<<0)
-#define TALITOS_HAS_DT_IPSEC_ESP		(1<<1)
-#define TALITOS_HAS_DT_COMMON_NONSNOOP		(1<<2)
-
-/* the corresponding masks for each SEC version */
-#define TALITOS_HAS_DESCTYPES_SEC_2_0	0x01010ebf
-#define TALITOS_HAS_DESCTYPES_SEC_2_1	0x012b0ebf
-
-/* 
- * a TALITOS_xxx_HI address points to the low data bits (32-63) of the register
- */
-
-/* global register offset addresses */
-#define TALITOS_ID		0x1020
-#define TALITOS_ID_HI		0x1024
-#define TALITOS_MCR		0x1030		/* master control register */
-#define TALITOS_MCR_HI		0x1038		/* master control register */
-#define TALITOS_MCR_SWR		0x1
-#define TALITOS_IMR		0x1008		/* interrupt mask register */
-#define TALITOS_IMR_ALL		0x00010fff	/* enable all interrupts mask */
-#define TALITOS_IMR_ERRONLY	0x00010aaa	/* enable error interrupts */
-#define TALITOS_IMR_HI		0x100C		/* interrupt mask register */
-#define TALITOS_IMR_HI_ALL	0x00323333	/* enable all interrupts mask */
-#define TALITOS_IMR_HI_ERRONLY	0x00222222	/* enable error interrupts */
-#define TALITOS_ISR		0x1010		/* interrupt status register */
-#define TALITOS_ISR_ERROR	0x00010faa	/* errors mask */
-#define TALITOS_ISR_DONE	0x00000055	/* channel(s) done mask */
-#define TALITOS_ISR_HI		0x1014		/* interrupt status register */
-#define TALITOS_ICR		0x1018		/* interrupt clear register */
-#define TALITOS_ICR_HI		0x101C		/* interrupt clear register */
-
-/* channel register address stride */
-#define TALITOS_CH_OFFSET	0x100
-
-/* channel register offset addresses and bits */
-#define TALITOS_CH_CCCR		0x1108	/* Crypto-Channel Config Register */
-#define TALITOS_CH_CCCR_RESET	0x1	/* Channel Reset bit */
-#define TALITOS_CH_CCCR_HI	0x110c	/* Crypto-Channel Config Register */
-#define TALITOS_CH_CCCR_HI_CDWE	0x10	/* Channel done writeback enable bit */
-#define TALITOS_CH_CCCR_HI_NT	0x4	/* Notification type bit */
-#define TALITOS_CH_CCCR_HI_CDIE	0x2	/* Channel Done Interrupt Enable bit */
-#define TALITOS_CH_CCPSR	0x1110	/* Crypto-Channel Pointer Status Reg */
-#define TALITOS_CH_CCPSR_HI	0x1114	/* Crypto-Channel Pointer Status Reg */
-#define TALITOS_CH_FF		0x1148	/* Fetch FIFO */
-#define TALITOS_CH_FF_HI	0x114c	/* Fetch FIFO's FETCH_ADRS */
-#define TALITOS_CH_CDPR		0x1140	/* Crypto-Channel Pointer Status Reg */
-#define TALITOS_CH_CDPR_HI	0x1144	/* Crypto-Channel Pointer Status Reg */
-#define TALITOS_CH_DESCBUF	0x1180	/* (thru 11bf) Crypto-Channel 
-					 * Descriptor Buffer (debug) */
-
-/* execution unit register offset addresses and bits */
-#define TALITOS_DEUSR		0x2028	/* DEU status register */
-#define TALITOS_DEUSR_HI	0x202c	/* DEU status register */
-#define TALITOS_DEUISR		0x2030	/* DEU interrupt status register */
-#define TALITOS_DEUISR_HI	0x2034	/* DEU interrupt status register */
-#define TALITOS_DEUICR		0x2038	/* DEU interrupt control register */
-#define TALITOS_DEUICR_HI	0x203c	/* DEU interrupt control register */
-#define TALITOS_AESUISR		0x4030	/* AESU interrupt status register */
-#define TALITOS_AESUISR_HI	0x4034	/* AESU interrupt status register */
-#define TALITOS_AESUICR		0x4038	/* AESU interrupt control register */
-#define TALITOS_AESUICR_HI	0x403c	/* AESU interrupt control register */
-#define TALITOS_MDEUISR		0x6030	/* MDEU interrupt status register */
-#define TALITOS_MDEUISR_HI	0x6034	/* MDEU interrupt status register */
-#define TALITOS_RNGSR		0xa028	/* RNG status register */
-#define TALITOS_RNGSR_HI	0xa02c	/* RNG status register */
-#define TALITOS_RNGSR_HI_RD	0x1	/* RNG Reset done */
-#define TALITOS_RNGSR_HI_OFL	0xff0000/* number of dwords in RNG output FIFO*/
-#define TALITOS_RNGDSR		0xa010	/* RNG data size register */
-#define TALITOS_RNGDSR_HI	0xa014	/* RNG data size register */
-#define TALITOS_RNG_FIFO	0xa800	/* RNG FIFO - pool of random numbers */
-#define TALITOS_RNGISR		0xa030	/* RNG Interrupt status register */
-#define TALITOS_RNGISR_HI	0xa034	/* RNG Interrupt status register */
-#define TALITOS_RNGRCR		0xa018	/* RNG Reset control register */
-#define TALITOS_RNGRCR_HI	0xa01c	/* RNG Reset control register */
-#define TALITOS_RNGRCR_HI_SR	0x1	/* RNG RNGRCR:Software Reset */
-
-/* descriptor pointer entry */
-struct talitos_desc_ptr {
-	u16	len;		/* length */
-	u8	extent;		/* jump (to s/g link table) and extent */
-	u8	res;		/* reserved */
-	u32	ptr;		/* pointer */
-};
-
-/* descriptor */
-struct talitos_desc {
-	u32	hdr;				/* header */
-	u32	res;				/* reserved */
-	struct talitos_desc_ptr		ptr[7];	/* ptr/len pair array */
-};
-
-/* talitos descriptor header (hdr) bits */
-
-/* primary execution unit select */
-#define	TALITOS_SEL0_AFEU	0x10000000
-#define	TALITOS_SEL0_DEU	0x20000000
-#define	TALITOS_SEL0_MDEU	0x30000000
-#define	TALITOS_SEL0_RNG	0x40000000
-#define	TALITOS_SEL0_PKEU	0x50000000
-#define	TALITOS_SEL0_AESU	0x60000000
-
-/* primary execution unit mode (MODE0) and derivatives */
-#define	TALITOS_MODE0_AESU_CBC		0x00200000
-#define	TALITOS_MODE0_AESU_ENC		0x00100000
-#define	TALITOS_MODE0_DEU_CBC		0x00400000
-#define	TALITOS_MODE0_DEU_3DES		0x00200000
-#define	TALITOS_MODE0_DEU_ENC		0x00100000
-#define	TALITOS_MODE0_MDEU_INIT		0x01000000	/* init starting regs */
-#define	TALITOS_MODE0_MDEU_HMAC		0x00800000
-#define	TALITOS_MODE0_MDEU_PAD		0x00400000	/* PD */
-#define	TALITOS_MODE0_MDEU_MD5		0x00200000
-#define	TALITOS_MODE0_MDEU_SHA256	0x00100000
-#define	TALITOS_MODE0_MDEU_SHA1		0x00000000	/* SHA-160 */
-#define	TALITOS_MODE0_MDEU_MD5_HMAC	\
-		(TALITOS_MODE0_MDEU_MD5 | TALITOS_MODE0_MDEU_HMAC)
-#define	TALITOS_MODE0_MDEU_SHA256_HMAC	\
-		(TALITOS_MODE0_MDEU_SHA256 | TALITOS_MODE0_MDEU_HMAC)
-#define	TALITOS_MODE0_MDEU_SHA1_HMAC	\
-		(TALITOS_MODE0_MDEU_SHA1 | TALITOS_MODE0_MDEU_HMAC)
-
-/* secondary execution unit select (SEL1) */
-/* it's MDEU or nothing */
-#define	TALITOS_SEL1_MDEU	0x00030000
-
-/* secondary execution unit mode (MODE1) and derivatives */
-#define	TALITOS_MODE1_MDEU_INIT		0x00001000	/* init starting regs */
-#define	TALITOS_MODE1_MDEU_HMAC		0x00000800
-#define	TALITOS_MODE1_MDEU_PAD		0x00000400	/* PD */
-#define	TALITOS_MODE1_MDEU_MD5		0x00000200
-#define	TALITOS_MODE1_MDEU_SHA256	0x00000100
-#define	TALITOS_MODE1_MDEU_SHA1		0x00000000	/* SHA-160 */
-#define	TALITOS_MODE1_MDEU_MD5_HMAC	\
-	(TALITOS_MODE1_MDEU_MD5 | TALITOS_MODE1_MDEU_HMAC)
-#define	TALITOS_MODE1_MDEU_SHA256_HMAC	\
-	(TALITOS_MODE1_MDEU_SHA256 | TALITOS_MODE1_MDEU_HMAC)
-#define	TALITOS_MODE1_MDEU_SHA1_HMAC	\
-	(TALITOS_MODE1_MDEU_SHA1 | TALITOS_MODE1_MDEU_HMAC)
-
-/* direction of overall data flow (DIR) */
-#define	TALITOS_DIR_OUTBOUND	0x00000000
-#define	TALITOS_DIR_INBOUND	0x00000002
-
-/* done notification (DN) */
-#define	TALITOS_DONE_NOTIFY	0x00000001
-
-/* descriptor types */
-/* odd numbers here are valid on SEC2 and greater only (e.g. ipsec_esp) */
-#define TD_TYPE_AESU_CTR_NONSNOOP	(0 << 3)
-#define TD_TYPE_IPSEC_ESP		(1 << 3)
-#define TD_TYPE_COMMON_NONSNOOP_NO_AFEU	(2 << 3)
-#define TD_TYPE_HMAC_SNOOP_NO_AFEU	(4 << 3)
-
-#define TALITOS_HDR_DONE_BITS	0xff000000
-
-#define	DPRINTF(a...)	do { \
-						if (debug) { \
-							printk("%s: ", sc ? \
-								device_get_nameunit(sc->sc_cdev) : "talitos"); \
-							printk(a); \
-						} \
-					} while (0)
diff --git a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_soft.h b/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_soft.h
deleted file mode 100644
index 79efdbd314..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/talitos/talitos_soft.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Freescale SEC data structures for integration with ocf-linux
- *
- * Copyright (c) 2006 Freescale Semiconductor, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * paired descriptor and associated crypto operation
- */
-struct desc_cryptop_pair {
-	struct talitos_desc	cf_desc;	/* descriptor ptr */
-	struct cryptop		*cf_crp;	/* cryptop ptr */
-};
-
-/*
- * Holds data specific to a single talitos device.
- */
-struct talitos_softc {
-	softc_device_decl	sc_cdev;
-	struct platform_device	*sc_dev;	/* device backpointer */
-	ocf_iomem_t		sc_base_addr;
-	int			sc_irq;
-	int			sc_num;		/* if we have multiple chips */
-	int32_t			sc_cid;		/* crypto tag */
-	u64			sc_chiprev;	/* major/minor chip revision */
-	int			sc_nsessions;
-	struct talitos_session	*sc_sessions;
-	int			sc_num_channels;/* number of crypto channels */
-	int			sc_chfifo_len;	/* channel fetch fifo len */
-	int			sc_exec_units;	/* execution units mask */
-	int			sc_desc_types;	/* descriptor types mask */
-	/*
-	 * mutual exclusion for intra-channel resources, e.g. fetch fifos
-	 * the last entry is a meta-channel lock used by the channel scheduler
-	 */
-	spinlock_t		*sc_chnfifolock;
-	/* sc_chnlastalgo contains last algorithm for that channel */
-	int			*sc_chnlastalg;
-	/* sc_chnfifo holds pending descriptor--crypto operation pairs */
-	struct desc_cryptop_pair	**sc_chnfifo;
-};
-
-struct talitos_session {
-	u_int32_t	ses_used;
-	u_int32_t	ses_klen;		/* key length in bits */
-	u_int32_t	ses_key[8];		/* DES/3DES/AES key */
-	u_int32_t	ses_hmac[5];		/* hmac inner state */
-	u_int32_t	ses_hmac_len;		/* hmac length */
-	u_int32_t	ses_iv[4];		/* DES/3DES/AES iv */
-	u_int32_t	ses_mlen;		/* desired hash result len (12=ipsec or 16) */
-};
-
-#define	TALITOS_SESSION(sid)	((sid) & 0x0fffffff)
-#define	TALITOS_SID(crd, sesn)	(((crd) << 28) | ((sesn) & 0x0fffffff))
diff --git a/target/linux/generic-2.6/files/crypto/ocf/uio.h b/target/linux/generic-2.6/files/crypto/ocf/uio.h
deleted file mode 100644
index 03a62491fa..0000000000
--- a/target/linux/generic-2.6/files/crypto/ocf/uio.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _OCF_UIO_H_
-#define _OCF_UIO_H_
-
-#include <linux/uio.h>
-
-/*
- * The linux uio.h doesn't have all we need.  To be fully api compatible
- * with the BSD cryptodev,  we need to keep this around.  Perhaps this can
- * be moved back into the linux/uio.h
- *
- * Linux port done by David McCullough <david_mccullough@mcafee.com>
- * Copyright (C) 2006-2010 David McCullough
- * Copyright (C) 2004-2005 Intel Corporation.
- *
- * LICENSE TERMS
- *
- * The free distribution and use of this software in both source and binary
- * form is allowed (with or without changes) provided that:
- *
- *   1. distributions of this source code include the above copyright
- *      notice, this list of conditions and the following disclaimer;
- *
- *   2. distributions in binary form include the above copyright
- *      notice, this list of conditions and the following disclaimer
- *      in the documentation and/or other associated materials;
- *
- *   3. the copyright holder's name is not used to endorse products
- *      built using this software without specific written permission.
- *
- * ALTERNATIVELY, provided that this notice is retained in full, this product
- * may be distributed under the terms of the GNU General Public License (GPL),
- * in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- * DISCLAIMER
- *
- * This software is provided 'as is' with no explicit or implied warranties
- * in respect of its properties, including, but not limited to, correctness
- * and/or fitness for purpose.
- * ---------------------------------------------------------------------------
- */
-
-struct uio {
-	struct	iovec *uio_iov;
-	int		uio_iovcnt;
-	off_t	uio_offset;
-	int		uio_resid;
-#if 0
-	enum	uio_seg uio_segflg;
-	enum	uio_rw uio_rw;
-	struct  thread *uio_td;
-#endif
-};
-
-#endif
diff --git a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
deleted file mode 100644
index e6d5b1d05e..0000000000
--- a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * character device wrapper for generic gpio layer
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
- *
- * Feedback, Bugs...  blogic@openwrt.org
- *
- * dpg 20100106
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/atomic.h>
-#include <linux/init.h>
-#include <linux/genhd.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/gpio_dev.h>
-
-#define DRVNAME		"gpiodev"
-#define DEVNAME		"gpio"
-
-static int dev_major;
-static struct class *gpiodev_class;
-
-
-/* third argument of user space ioctl ('arg' here) contains the <pin> */
-static int
-gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
-	   unsigned long arg)
-{
-	int retval = 0;
-
-	switch (cmd)
-	{
-	case GPIO_GET:
-		retval = gpio_get_value(arg);
-		break;
-	case GPIO_SET:
-		gpio_set_value(arg, 1);
-		break;
-	case GPIO_CLEAR:
-		gpio_set_value(arg, 0);
-		break;
-	case GPIO_DIR_IN:
-		retval = gpio_direction_input(arg);
-		break;
-	case GPIO_DIR_OUT:
-		retval = gpio_direction_output(arg, 0);
-		break;
-	case GPIO_DIR_HIGH:
-		retval = gpio_direction_output(arg, 1);
-		break;
-	case GPIO_REQUEST:
-		/* should be first ioctl operation on <pin> */
-		retval = gpio_request(arg, DRVNAME);
-		break;
-	case GPIO_FREE:
-		/* should be last ioctl operation on <pin> */
-		/* may be needed first if previous user missed this ioctl */
-		gpio_free(arg);
-		break;
-	case GPIO_CAN_SLEEP:
-		retval = gpio_cansleep(arg);
-		break;
-	default:
-		retval = -EINVAL;
-		/* = -ENOTTY; // correct return but ... */
-		break;
-	}
-	return retval;
-}
-
-/* Allow co-incident opens */
-static int
-gpio_open(struct inode *inode, struct file *file)
-{
-	int result = 0;
-	unsigned int dev_minor = MINOR(inode->i_rdev);
-
-	if (dev_minor != 0)
-	{
-		printk(KERN_ERR DRVNAME ": trying to access unknown minor device -> %d\n", dev_minor);
-		result = -ENODEV;
-		goto out;
-	}
-out:
-	return result;
-}
-
-static int
-gpio_close(struct inode * inode, struct file * file)
-{
-	/* could track all <pin>s requested by this fd and gpio_free()
-         * them here
-	 */
-	return 0;
-}
-
-struct file_operations gpio_fops = {
-	ioctl:		gpio_ioctl,
-	open:		gpio_open,
-	release:	gpio_close
-};
-
-static int
-gpio_probe(struct platform_device *dev)
-{
-	int result = 0;
-
-	dev_major = register_chrdev(0, DEVNAME, &gpio_fops);
-	if (!dev_major)
-	{
-		printk(KERN_ERR DRVNAME ": Error whilst opening %s \n", DEVNAME);
-		result = -ENODEV;
-		goto out;
-	}
-	gpiodev_class = class_create(THIS_MODULE, DRVNAME);
-	device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME);
-	printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major);
-out:
-	return result;
-}
-
-static int
-gpio_remove(struct platform_device *dev)
-{
-	unregister_chrdev(dev_major, DEVNAME);
-	return 0;
-}
-
-static struct
-platform_driver gpio_driver = {
-	.probe = gpio_probe,
-	.remove = gpio_remove,
-	.driver = {
-		.name = "GPIODEV",
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __init
-gpio_mod_init(void)
-{
-	int ret = platform_driver_register(&gpio_driver);
-	if (ret)
-		printk(KERN_INFO DRVNAME ": Error registering platfom driver!\n");
-
-	return ret;
-}
-
-static void __exit
-gpio_mod_exit(void)
-{
-	platform_driver_unregister(&gpio_driver);
-}
-
-module_init (gpio_mod_init);
-module_exit (gpio_mod_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("John Crispin / OpenWrt +");
-MODULE_DESCRIPTION("Character device for for generic gpio api");
diff --git a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
deleted file mode 100644
index eb0e30161d..0000000000
--- a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *  Driver for buttons on GPIO lines not capable of generating interrupts
- *
- *  Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2010 Nuno Goncalves <nunojpg@gmail.com>
- *
- *  This file was based on: /drivers/input/misc/cobalt_btns.c
- *	Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
- *
- *  also was based on: /drivers/input/keyboard/gpio_keys.c
- *	Copyright 2005 Phil Blundell
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-
-#include <linux/input.h>
-#include <linux/input-polldev.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-
-#include <linux/gpio_buttons.h>
-
-#include <asm/gpio.h>
-
-#define DRV_NAME	"gpio-buttons"
-#define DRV_VERSION	"0.1.2"
-#define PFX		DRV_NAME ": "
-
-struct gpio_button_data {
-	int last_state;
-	int count;
-};
-
-struct gpio_buttons_dev {
-	struct input_polled_dev *poll_dev;
-	struct gpio_buttons_platform_data *pdata;
-	struct gpio_button_data *data;
-};
-
-static void gpio_buttons_poll(struct input_polled_dev *dev)
-{
-	struct gpio_buttons_dev *bdev = dev->private;
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	struct input_dev *input = dev->input;
-	int i;
-
-	for (i = 0; i < bdev->pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int type = button->type ?: EV_KEY;
-		int state;
-
-		if (bdev->data[i].count < button->threshold) {
-			bdev->data[i].count++;
-			continue;
-		}
-
-		state = gpio_get_value(button->gpio) ? 1 : 0;
-		if (state != bdev->data[i].last_state) {
-			input_event(input, type, button->code,
-				    !!(state ^ button->active_low));
-			input_sync(input);
-			bdev->data[i].count = 0;
-			bdev->data[i].last_state = state;
-		}
-	}
-}
-
-static int __devinit gpio_buttons_probe(struct platform_device *pdev)
-{
-	struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data;
-	struct gpio_buttons_dev *bdev;
-	struct input_polled_dev *poll_dev;
-	struct input_dev *input;
-	int error, i;
-
-	if (!pdata)
-		return -ENXIO;
-
-	bdev = kzalloc(sizeof(struct gpio_buttons_dev) +
-		       sizeof(struct gpio_button_data) * pdata->nbuttons,
-		       GFP_KERNEL);
-	if (!bdev) {
-		printk(KERN_ERR DRV_NAME "no memory for device\n");
-		return -ENOMEM;
-	}
-
-	bdev->data = (struct gpio_button_data *) &bdev[1];
-
-	poll_dev = input_allocate_polled_device();
-	if (!poll_dev) {
-		printk(KERN_ERR DRV_NAME "no memory for polled device\n");
-		error = -ENOMEM;
-		goto err_free_bdev;
-	}
-
-	poll_dev->private = bdev;
-	poll_dev->poll = gpio_buttons_poll;
-	poll_dev->poll_interval = pdata->poll_interval;
-
-	input = poll_dev->input;
-
-	input->evbit[0] = BIT(EV_KEY);
-	input->name = pdev->name;
-	input->phys = "gpio-buttons/input0";
-	input->dev.parent = &pdev->dev;
-
-	input->id.bustype = BUS_HOST;
-	input->id.vendor = 0x0001;
-	input->id.product = 0x0001;
-	input->id.version = 0x0100;
-
-	for (i = 0; i < pdata->nbuttons; i++) {
-		struct gpio_button *button = &pdata->buttons[i];
-		unsigned int gpio = button->gpio;
-		unsigned int type = button->type ?: EV_KEY;
-
-		error = gpio_request(gpio, button->desc ?
-				button->desc : DRV_NAME);
-		if (error) {
-			printk(KERN_ERR PFX "unable to claim gpio %u, "
-				"error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		error = gpio_direction_input(gpio);
-		if (error) {
-			printk(KERN_ERR PFX "unable to set direction on "
-				"gpio %u, error %d\n", gpio, error);
-			goto err_free_gpio;
-		}
-
-		input_set_capability(input, type, button->code);
-		bdev->data[i].last_state = gpio_get_value(button->gpio) ? 1 : 0;
-	}
-
-	bdev->poll_dev = poll_dev;
-	bdev->pdata = pdata;
-	platform_set_drvdata(pdev, bdev);
-
-	error = input_register_polled_device(poll_dev);
-	if (error) {
-		printk(KERN_ERR PFX "unable to register polled device, "
-			"error %d\n", error);
-		goto err_free_gpio;
-	}
-
-	return 0;
-
-err_free_gpio:
-	for (i = i - 1; i >= 0; i--)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(poll_dev);
-
-err_free_bdev:
-	kfree(bdev);
-
-	platform_set_drvdata(pdev, NULL);
-	return error;
-}
-
-static int __devexit gpio_buttons_remove(struct platform_device *pdev)
-{
-	struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev);
-	struct gpio_buttons_platform_data *pdata = bdev->pdata;
-	int i;
-
-	input_unregister_polled_device(bdev->poll_dev);
-
-	for (i = 0; i < pdata->nbuttons; i++)
-		gpio_free(pdata->buttons[i].gpio);
-
-	input_free_polled_device(bdev->poll_dev);
-
-	kfree(bdev);
-	platform_set_drvdata(pdev, NULL);
-
-	return 0;
-}
-
-static struct platform_driver gpio_buttons_driver = {
-	.probe	= gpio_buttons_probe,
-	.remove	= __devexit_p(gpio_buttons_remove),
-	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
-	},
-};
-
-static int __init gpio_buttons_init(void)
-{
-	printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n");
-	return platform_driver_register(&gpio_buttons_driver);
-}
-
-static void __exit gpio_buttons_exit(void)
-{
-	platform_driver_unregister(&gpio_buttons_driver);
-}
-
-module_init(gpio_buttons_init);
-module_exit(gpio_buttons_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_VERSION(DRV_VERSION);
-MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs");
-
diff --git a/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c
deleted file mode 100644
index bc58afe4c6..0000000000
--- a/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  LED Morse Trigger
- *
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: drivers/led/ledtrig-timer.c
- *	Copyright 2005-2006 Openedhand Ltd.
- *	Author: Richard Purdie <rpurdie@openedhand.com>
- *
- *  also based on the patch '[PATCH] 2.5.59 morse code panics' posted
- *  in the LKML by Tomas Szepe at Thu, 30 Jan 2003
- *	Copyright (C) 2002 Andrew Rodland <arodland@noln.com>
- *	Copyright (C) 2003 Tomas Szepe <szepe@pinerecords.com>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-#include <linux/slab.h>
-
-#include "leds.h"
-
-#define MORSE_DELAY_BASE	(HZ/2)
-
-#define MORSE_STATE_BLINK_START	0
-#define MORSE_STATE_BLINK_STOP	1
-
-#define MORSE_DIT_LEN	1
-#define MORSE_DAH_LEN	3
-#define MORSE_SPACE_LEN	7
-
-struct morse_trig_data {
-	unsigned long delay;
-	char *msg;
-
-	unsigned char morse;
-	unsigned char state;
-	char *msgpos;
-	struct timer_list timer;
-};
-
-const unsigned char morsetable[] = {
-	0122, 0, 0310, 0, 0, 0163,				/* "#$%&' */
-	055, 0155, 0, 0, 0163, 0141, 0152, 0051, 		/* ()*+,-./ */
-	077, 076, 074, 070, 060, 040, 041, 043, 047, 057,	/* 0-9 */
-	0107, 0125, 0, 0061, 0, 0114, 0, 			/* :;<=>?@ */
-	006, 021, 025, 011, 002, 024, 013, 020, 004,		/* A-I */
-	036, 015, 022, 007, 005, 017, 026, 033, 012,		/* J-R */
-	010, 003, 014, 030, 016, 031, 035, 023,			/* S-Z */
-	0, 0, 0, 0, 0154					/* [\]^_ */
-};
-
-static inline unsigned char tomorse(char c) {
-	if (c >= 'a' && c <= 'z')
-		c = c - 'a' + 'A';
-	if (c >= '"' && c <= '_') {
-		return morsetable[c - '"'];
-	} else
-		return 0;
-}
-
-static inline unsigned long dit_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DIT_LEN*morse_data->delay;
-}
-
-static inline unsigned long dah_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_DAH_LEN*morse_data->delay;
-}
-
-static inline unsigned long space_len(struct morse_trig_data *morse_data)
-{
-	return MORSE_SPACE_LEN*morse_data->delay;
-}
-
-static void morse_timer_function(unsigned long data)
-{
-	struct led_classdev *led_cdev = (struct led_classdev *)data;
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	unsigned long brightness = LED_OFF;
-	unsigned long delay = 0;
-
-	if (!morse_data->msg)
-		goto set_led;
-
-	switch (morse_data->state) {
-	case MORSE_STATE_BLINK_START:
-		/* Starting a new blink.  We have a valid code in morse. */
-		delay = (morse_data->morse & 001) ? dah_len(morse_data):
-			dit_len(morse_data);
-		brightness = LED_FULL;
-		morse_data->state = MORSE_STATE_BLINK_STOP;
-		morse_data->morse >>= 1;
-		break;
-	case MORSE_STATE_BLINK_STOP:
-		/* Coming off of a blink. */
-		morse_data->state = MORSE_STATE_BLINK_START;
-
-		if (morse_data->morse > 1) {
-			/* Not done yet, just a one-dit pause. */
-			delay = dit_len(morse_data);
-			break;
-		}
-
-		/* Get a new char, figure out how much space. */
-		/* First time through */
-		if (!morse_data->msgpos)
-			morse_data->msgpos = (char *)morse_data->msg;
-
-		if (!*morse_data->msgpos) {
-			/* Repeating */
-			morse_data->msgpos = (char *)morse_data->msg;
-			delay = space_len(morse_data);
-		} else {
-			/* Inter-letter space */
-			delay = dah_len(morse_data);
-		}
-
-		if (!(morse_data->morse = tomorse(*morse_data->msgpos))) {
-			delay = space_len(morse_data);
-			/* And get us back here */
-			morse_data->state = MORSE_STATE_BLINK_STOP;
-		}
-		morse_data->msgpos++;
-		break;
-	}
-
-	mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay));
-
-set_led:
-	led_set_brightness(led_cdev, brightness);
-}
-
-static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	sprintf(buf, "%lu\n", morse_data->delay);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_delay_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *after;
-	unsigned long state = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-	int ret = -EINVAL;
-
-	if (*after && isspace(*after))
-		count++;
-
-	if (count == size) {
-		morse_data->delay = state;
-		mod_timer(&morse_data->timer, jiffies + 1);
-		ret = count;
-	}
-
-	return ret;
-}
-
-static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data->msg)
-		sprintf(buf, "<none>\n");
-	else
-		sprintf(buf, "%s\n", morse_data->msg);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t _morse_msg_store(struct led_classdev *led_cdev,
-		const char *buf, size_t size)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-	char *m;
-
-	m = kmalloc(size, GFP_KERNEL);
-	if (!m)
-		return -ENOMEM;
-
-	memcpy(m,buf,size);
-	m[size]='\0';
-
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	morse_data->msg = m;
-	morse_data->msgpos = NULL;
-	morse_data->state = MORSE_STATE_BLINK_STOP;
-
-	mod_timer(&morse_data->timer, jiffies + 1);
-
-	return size;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-static ssize_t morse_delay_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	device_create_file(leddev->dev, &dev_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	device_remove_file(leddev->dev, &dev_attr_ ## attr)
-
-#else
-static ssize_t morse_delay_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct class_device *dev, const char *buf,
-		size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct class_device *dev, char *buf)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct class_device *dev, const char *buf,
-				size_t size)
-{
-	struct led_classdev *led_cdev = class_get_devdata(dev);
-
-	return _morse_msg_store(led_cdev, buf, size);
-}
-
-static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-	class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-	class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr)
-
-#endif
-
-static void morse_trig_activate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data;
-	int rc;
-
-	morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL);
-	if (!morse_data)
-		return;
-
-	morse_data->delay = MORSE_DELAY_BASE;
-	init_timer(&morse_data->timer);
-	morse_data->timer.function = morse_timer_function;
-	morse_data->timer.data = (unsigned long)led_cdev;
-
-	rc = led_device_create_file(led_cdev, delay);
-	if (rc) goto err;
-
-	rc = led_device_create_file(led_cdev, message);
-	if (rc) goto err_delay;
-
-	led_cdev->trigger_data = morse_data;
-
-	return;
-
-err_delay:
-	led_device_remove_file(led_cdev, delay);
-err:
-	kfree(morse_data);
-}
-
-static void morse_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-	if (!morse_data)
-		return;
-
-	led_device_remove_file(led_cdev, message);
-	led_device_remove_file(led_cdev, delay);
-
-	del_timer_sync(&morse_data->timer);
-	if (morse_data->msg)
-		kfree(morse_data->msg);
-
-	kfree(morse_data);
-}
-
-static struct led_trigger morse_led_trigger = {
-	.name		= "morse",
-	.activate	= morse_trig_activate,
-	.deactivate	= morse_trig_deactivate,
-};
-
-static int __init morse_trig_init(void)
-{
-	return led_trigger_register(&morse_led_trigger);
-}
-
-static void __exit morse_trig_exit(void)
-{
-	led_trigger_unregister(&morse_led_trigger);
-}
-
-module_init(morse_trig_init);
-module_exit(morse_trig_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION("Morse LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c
deleted file mode 100644
index 8dba8e654d..0000000000
--- a/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * LED Kernel Netdev Trigger
- *
- * Toggles the LED to reflect the link and traffic state of a named net device
- *
- * Copyright 2007 Oliver Jowett <oliver@opencloud.com>
- *
- * Derived from ledtrig-timer.c which is:
- *  Copyright 2005-2006 Openedhand Ltd.
- *  Author: Richard Purdie <rpurdie@openedhand.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/netdevice.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-#include <net/net_namespace.h>
-#endif
-
-#include "leds.h"
-
-/*
- * Configurable sysfs attributes:
- *
- * device_name - network device name to monitor
- *
- * interval - duration of LED blink, in milliseconds
- *
- * mode - either "none" (LED is off) or a space separated list of one or more of:
- *   link: LED's normal state reflects whether the link is up (has carrier) or not
- *   tx:   LED blinks on transmitted data
- *   rx:   LED blinks on receive data
- *
- * Some suggestions:
- *
- *  Simple link status LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo link >someled/mode
- *
- *  Ethernet-style link/activity LED:
- *  $ echo netdev >someled/trigger
- *  $ echo eth0 >someled/device_name
- *  $ echo "link tx rx" >someled/mode
- *
- *  Modem-style tx/rx LEDs:
- *  $ echo netdev >led1/trigger
- *  $ echo ppp0 >led1/device_name
- *  $ echo tx >led1/mode
- *  $ echo netdev >led2/trigger
- *  $ echo ppp0 >led2/device_name
- *  $ echo rx >led2/mode
- *
- */
-
-#define MODE_LINK 1
-#define MODE_TX   2
-#define MODE_RX   4
-
-struct led_netdev_data {
-	rwlock_t lock;
-
-	struct timer_list timer;
-	struct notifier_block notifier;
-
-	struct led_classdev *led_cdev;
-	struct net_device *net_dev;
-
-	char device_name[IFNAMSIZ];
-	unsigned interval;
-	unsigned mode;
-	unsigned link_up;
-	unsigned last_activity;
-};
-
-static void set_baseline_state(struct led_netdev_data *trigger_data)
-{
-	if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up)
-		led_set_brightness(trigger_data->led_cdev, LED_FULL);
-	else
-		led_set_brightness(trigger_data->led_cdev, LED_OFF);
-
-	if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up)
-		mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-	else
-		del_timer(&trigger_data->timer);
-}
-
-static ssize_t led_device_name_show(struct device *dev,
-				    struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%s\n", trigger_data->device_name);
-	read_unlock(&trigger_data->lock);
-
-	return strlen(buf) + 1;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
-extern struct net init_net;
-#endif
-
-static ssize_t led_device_name_store(struct device *dev,
-				     struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	if (size < 0 || size >= IFNAMSIZ)
-		return -EINVAL;
-
-	write_lock(&trigger_data->lock);
-
-	strcpy(trigger_data->device_name, buf);
-	if (size > 0 && trigger_data->device_name[size-1] == '\n')
-		trigger_data->device_name[size-1] = 0;
-
-	if (trigger_data->device_name[0] != 0) {
-		/* check for existing device to update from */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-		trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name);
-#else
-		trigger_data->net_dev = dev_get_by_name(trigger_data->device_name);
-#endif
-		if (trigger_data->net_dev != NULL)
-			trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
-		set_baseline_state(trigger_data); /* updates LEDs, may start timers */
-	}
-
-	write_unlock(&trigger_data->lock);
-	return size;
-}
-
-static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store);
-
-static ssize_t led_mode_show(struct device *dev,
-			     struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	read_lock(&trigger_data->lock);
-
-	if (trigger_data->mode == 0) {
-		strcpy(buf, "none\n");
-	} else {
-		if (trigger_data->mode & MODE_LINK)
-			strcat(buf, "link ");
-		if (trigger_data->mode & MODE_TX)
-			strcat(buf, "tx ");
-		if (trigger_data->mode & MODE_RX)
-			strcat(buf, "rx ");
-		strcat(buf, "\n");
-	}
-
-	read_unlock(&trigger_data->lock);
-
-	return strlen(buf)+1;
-}
-
-static ssize_t led_mode_store(struct device *dev,
-			      struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	char copybuf[1024];
-	int new_mode = -1;
-	char *p, *token;
-
-	/* take a copy since we don't want to trash the inbound buffer when using strsep */
-	strncpy(copybuf, buf, sizeof(copybuf));
-	copybuf[1023] = 0;
-	p = copybuf;
-
-	while ((token = strsep(&p, " \t\n")) != NULL) {
-		if (!*token)
-			continue;
-
-		if (new_mode == -1)
-			new_mode = 0;
-
-		if (!strcmp(token, "none"))
-			new_mode = 0;
-		else if (!strcmp(token, "tx"))
-			new_mode |= MODE_TX;
-		else if (!strcmp(token, "rx"))
-			new_mode |= MODE_RX;
-		else if (!strcmp(token, "link"))
-			new_mode |= MODE_LINK;
-		else
-			return -EINVAL;
-	}
-
-	if (new_mode == -1)
-		return -EINVAL;
-
-	write_lock(&trigger_data->lock);
-	trigger_data->mode = new_mode;
-	set_baseline_state(trigger_data);
-	write_unlock(&trigger_data->lock);
-
-	return size;
-}
-
-static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store);
-
-static ssize_t led_interval_show(struct device *dev,
-				 struct device_attribute *attr, char *buf)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	read_lock(&trigger_data->lock);
-	sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval));
-	read_unlock(&trigger_data->lock);
-
-	return strlen(buf) + 1;
-}
-
-static ssize_t led_interval_store(struct device *dev,
-				  struct device_attribute *attr, const char *buf, size_t size)
-{
-	struct led_classdev *led_cdev = dev_get_drvdata(dev);
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-	int ret = -EINVAL;
-	char *after;
-	unsigned long value = simple_strtoul(buf, &after, 10);
-	size_t count = after - buf;
-
-	if (*after && isspace(*after))
-		count++;
-
-	/* impose some basic bounds on the timer interval */
-	if (count == size && value >= 5 && value <= 10000) {
-		write_lock(&trigger_data->lock);
-		trigger_data->interval = msecs_to_jiffies(value);
-		set_baseline_state(trigger_data); // resets timer
-		write_unlock(&trigger_data->lock);
-		ret = count;
-	}
-
-	return ret;
-}
-
-static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store);
-
-static int netdev_trig_notify(struct notifier_block *nb,
-			      unsigned long evt,
-			      void *dv)
-{
-	struct net_device *dev = dv;
-	struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
-
-	if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
-		return NOTIFY_DONE;
-
-	write_lock(&trigger_data->lock);
-
-	if (strcmp(dev->name, trigger_data->device_name))
-		goto done;
-
-	if (evt == NETDEV_REGISTER) {
-		if (trigger_data->net_dev != NULL)
-			dev_put(trigger_data->net_dev);
-		dev_hold(dev);
-		trigger_data->net_dev = dev;
-		trigger_data->link_up = 0;
-		goto done;
-	}
-
-	if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) {
-		dev_put(trigger_data->net_dev);
-		trigger_data->net_dev = NULL;
-		goto done;
-	}
-
-	/* UP / DOWN / CHANGE */
-
-	trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev));
-	set_baseline_state(trigger_data);
-
-done:
-	write_unlock(&trigger_data->lock);
-	return NOTIFY_DONE;
-}
-
-/* here's the real work! */
-static void netdev_trig_timer(unsigned long arg)
-{
-	struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
-	const struct net_device_stats *dev_stats;
-	unsigned new_activity;
-
-	write_lock(&trigger_data->lock);
-
-	if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) {
-		/* we don't need to do timer work, just reflect link state. */
-		led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
-		goto no_restart;
-	}
-
-	dev_stats = dev_get_stats(trigger_data->net_dev);
-	new_activity =
-		((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
-		((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
-
-	if (trigger_data->mode & MODE_LINK) {
-		/* base state is ON (link present) */
-		/* if there's no link, we don't get this far and the LED is off */
-
-		/* OFF -> ON always */
-		/* ON -> OFF on activity */
-		if (trigger_data->led_cdev->brightness == LED_OFF) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		}
-	} else {
-		/* base state is OFF */
-		/* ON -> OFF always */
-		/* OFF -> ON on activity */
-		if (trigger_data->led_cdev->brightness == LED_FULL) {
-			led_set_brightness(trigger_data->led_cdev, LED_OFF);
-		} else if (trigger_data->last_activity != new_activity) {
-			led_set_brightness(trigger_data->led_cdev, LED_FULL);
-		}
-	}
-
-	trigger_data->last_activity = new_activity;
-	mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
-
-no_restart:
-	write_unlock(&trigger_data->lock);
-}
-
-static void netdev_trig_activate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data;
-	int rc;
-
-	trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
-	if (!trigger_data)
-		return;
-
-	rwlock_init(&trigger_data->lock);
-
-	trigger_data->notifier.notifier_call = netdev_trig_notify;
-	trigger_data->notifier.priority = 10;
-
-	setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data);
-
-	trigger_data->led_cdev = led_cdev;
-	trigger_data->net_dev = NULL;
-	trigger_data->device_name[0] = 0;
-
-	trigger_data->mode = 0;
-	trigger_data->interval = msecs_to_jiffies(50);
-	trigger_data->link_up = 0;
-	trigger_data->last_activity = 0;
-
-	led_cdev->trigger_data = trigger_data;
-
-	rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
-	if (rc)
-		goto err_out;
-	rc = device_create_file(led_cdev->dev, &dev_attr_mode);
-	if (rc)
-		goto err_out_device_name;
-	rc = device_create_file(led_cdev->dev, &dev_attr_interval);
-	if (rc)
-		goto err_out_mode;
-
-	register_netdevice_notifier(&trigger_data->notifier);
-	return;
-
-err_out_mode:
-	device_remove_file(led_cdev->dev, &dev_attr_mode);
-err_out_device_name:
-	device_remove_file(led_cdev->dev, &dev_attr_device_name);
-err_out:
-	led_cdev->trigger_data = NULL;
-	kfree(trigger_data);
-}
-
-static void netdev_trig_deactivate(struct led_classdev *led_cdev)
-{
-	struct led_netdev_data *trigger_data = led_cdev->trigger_data;
-
-	if (trigger_data) {
-		unregister_netdevice_notifier(&trigger_data->notifier);
-
-		device_remove_file(led_cdev->dev, &dev_attr_device_name);
-		device_remove_file(led_cdev->dev, &dev_attr_mode);
-		device_remove_file(led_cdev->dev, &dev_attr_interval);
-
-		write_lock(&trigger_data->lock);
-
-		if (trigger_data->net_dev) {
-			dev_put(trigger_data->net_dev);
-			trigger_data->net_dev = NULL;
-		}
-
-		write_unlock(&trigger_data->lock);
-
-		del_timer_sync(&trigger_data->timer);
-
-		kfree(trigger_data);
-	}
-}
-
-static struct led_trigger netdev_led_trigger = {
-	.name     = "netdev",
-	.activate = netdev_trig_activate,
-	.deactivate = netdev_trig_deactivate,
-};
-
-static int __init netdev_trig_init(void)
-{
-	return led_trigger_register(&netdev_led_trigger);
-}
-
-static void __exit netdev_trig_exit(void)
-{
-	led_trigger_unregister(&netdev_led_trigger);
-}
-
-module_init(netdev_trig_init);
-module_exit(netdev_trig_exit);
-
-MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
-MODULE_DESCRIPTION("Netdev LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files/drivers/mtd/myloader.c b/target/linux/generic-2.6/files/drivers/mtd/myloader.c
deleted file mode 100644
index 51c037459f..0000000000
--- a/target/linux/generic-2.6/files/drivers/mtd/myloader.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  Parse MyLoader-style flash partition tables and produce a Linux partition
- *  array to match.
- *
- *  Copyright (C) 2007-2009 Gabor Juhos <juhosg@openwrt.org>
- *
- *  This file was based on drivers/mtd/redboot.c
- *  Author: Red Hat, Inc. - David Woodhouse <dwmw2@cambridge.redhat.com>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/vmalloc.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/byteorder/generic.h>
-#include <linux/myloader.h>
-
-#define BLOCK_LEN_MIN		0x10000
-#define PART_NAME_LEN		32
-
-struct part_data {
-	struct mylo_partition_table	tab;
-	char names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
-};
-
-int myloader_parse_partitions(struct mtd_info *master,
-			struct mtd_partition **pparts,
-			unsigned long origin)
-{
-	struct part_data *buf;
-	struct mylo_partition_table *tab;
-	struct mylo_partition *part;
-	struct mtd_partition *mtd_parts;
-	struct mtd_partition *mtd_part;
-	int num_parts;
-	int ret, i;
-	size_t retlen;
-	char *names;
-	unsigned long offset;
-	unsigned long blocklen;
-
-	buf = vmalloc(sizeof(*buf));
-	if (!buf) {
-		return -ENOMEM;
-		goto out;
-	}
-	tab = &buf->tab;
-
-	blocklen = master->erasesize;
-	if (blocklen < BLOCK_LEN_MIN)
-		blocklen = BLOCK_LEN_MIN;
-
-	offset = blocklen;
-
-	/* Find the partition table */
-	for (i = 0; i < 4; i++, offset += blocklen) {
-		printk(KERN_DEBUG "%s: searching for MyLoader partition table"
-				" at offset 0x%lx\n", master->name, offset);
-
-		ret = master->read(master, offset, sizeof(*buf), &retlen,
-					(void *)buf);
-		if (ret)
-			goto out_free_buf;
-
-		if (retlen != sizeof(*buf)) {
-			ret = -EIO;
-			goto out_free_buf;
-		}
-
-		/* Check for Partition Table magic number */
-		if (tab->magic == le32_to_cpu(MYLO_MAGIC_PARTITIONS))
-			break;
-
-	}
-
-	if (tab->magic != le32_to_cpu(MYLO_MAGIC_PARTITIONS)) {
-		printk(KERN_DEBUG "%s: no MyLoader partition table found\n",
-			master->name);
-		ret = 0;
-		goto out_free_buf;
-	}
-
-	/* The MyLoader and the Partition Table is always present */
-	num_parts = 2;
-
-	/* Detect number of used partitions */
-	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
-		part = &tab->partitions[i];
-
-		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
-			continue;
-
-		num_parts++;
-	}
-
-	mtd_parts = kzalloc((num_parts * sizeof(*mtd_part) +
-				num_parts * PART_NAME_LEN), GFP_KERNEL);
-
-	if (!mtd_parts) {
-		ret = -ENOMEM;
-		goto out_free_buf;
-	}
-
-	mtd_part = mtd_parts;
-	names = (char *)&mtd_parts[num_parts];
-
-	strncpy(names, "myloader", PART_NAME_LEN);
-	mtd_part->name = names;
-	mtd_part->offset = 0;
-	mtd_part->size = offset;
-	mtd_part->mask_flags = MTD_WRITEABLE;
-	mtd_part++;
-	names += PART_NAME_LEN;
-
-	strncpy(names, "partition_table", PART_NAME_LEN);
-	mtd_part->name = names;
-	mtd_part->offset = offset;
-	mtd_part->size = blocklen;
-	mtd_part->mask_flags = MTD_WRITEABLE;
-	mtd_part++;
-	names += PART_NAME_LEN;
-
-	for (i = 0; i < MYLO_MAX_PARTITIONS; i++) {
-		part = &tab->partitions[i];
-
-		if (le16_to_cpu(part->type) == PARTITION_TYPE_FREE)
-			continue;
-
-		if ((buf->names[i][0]) && (buf->names[i][0] != '\xff'))
-			strncpy(names, buf->names[i], PART_NAME_LEN);
-		else
-			snprintf(names, PART_NAME_LEN, "partition%d", i);
-
-		mtd_part->offset = le32_to_cpu(part->addr);
-		mtd_part->size = le32_to_cpu(part->size);
-		mtd_part->name = names;
-		mtd_part++;
-		names += PART_NAME_LEN;
-	}
-
-	*pparts = mtd_parts;
-	ret = num_parts;
-
- out_free_buf:
-	vfree(buf);
- out:
-	return ret;
-}
-
-static struct mtd_part_parser myloader_mtd_parser = {
-	.owner		= THIS_MODULE,
-	.parse_fn	= myloader_parse_partitions,
-	.name		= "MyLoader",
-};
-
-static int __init myloader_mtd_parser_init(void)
-{
-	return register_mtd_parser(&myloader_mtd_parser);
-}
-
-static void __exit myloader_mtd_parser_exit(void)
-{
-	deregister_mtd_parser(&myloader_mtd_parser);
-}
-
-module_init(myloader_mtd_parser_init);
-module_exit(myloader_mtd_parser_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_DESCRIPTION("Parsing code for MyLoader partition tables");
-MODULE_LICENSE("GPL v2");
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c b/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
deleted file mode 100644
index bc40be067a..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "adm6996.h"
-
-MODULE_DESCRIPTION("Infineon ADM6996 Switch");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-struct adm6996_priv {
-	/* use abstraction for regops, we want to add gpio support in the future */
-	u16 (*read)(struct phy_device *phydev, enum admreg reg);
-	void (*write)(struct phy_device *phydev, enum admreg reg, u16 val);
-};
-
-#define to_adm(_phy) ((struct adm6996_priv *) (_phy)->priv)
-
-
-static inline u16
-r16(struct phy_device *pdev, enum admreg reg)
-{
-	return to_adm(pdev)->read(pdev, reg);
-}
-
-static inline void
-w16(struct phy_device *pdev, enum admreg reg, u16 val)
-{
-	to_adm(pdev)->write(pdev, reg, val);
-}
-
-
-static u16
-adm6996_read_mii_reg(struct phy_device *phydev, enum admreg reg)
-{
-	return phydev->bus->read(phydev->bus, PHYADDR(reg));
-}
-
-static void
-adm6996_write_mii_reg(struct phy_device *phydev, enum admreg reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, PHYADDR(reg), val);
-}
-
-
-static int adm6996_config_init(struct phy_device *pdev)
-{
-	int i;
-
-	printk("%s: ADM6996 PHY driver attached.\n", pdev->attached_dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-
-	/* initialize port and vlan settings */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, adm_portcfg[i], ADM_PORTCFG_INIT |
-			ADM_PORTCFG_PVID((i == ADM_WAN_PORT) ? 1 : 0));
-	}
-	w16(pdev, adm_portcfg[5], ADM_PORTCFG_CPU);
-
-	/* reset all ports */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, ADM_PHY_PORT(i), ADM_PHYCFG_INIT);
-	}
-
-	return 0;
-}
-
-static int adm6996_read_status(struct phy_device *phydev)
-{
-	phydev->speed = SPEED_100;
-	phydev->duplex = DUPLEX_FULL;
-	phydev->link = 1;
-	return 0;
-}
-
-static int adm6996_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static int adm6996_fixup(struct phy_device *dev)
-{
-	struct mii_bus *bus = dev->bus;
-	u16 reg;
-
-	/* look for the switch on the bus */
-	reg = bus->read(bus, PHYADDR(ADM_SIG0)) & ADM_SIG0_MASK;
-	if (reg != ADM_SIG0_VAL)
-		return 0;
-
-	reg = bus->read(bus, PHYADDR(ADM_SIG1)) & ADM_SIG1_MASK;
-	if (reg != ADM_SIG1_VAL)
-		return 0;
-
-	dev->phy_id = (ADM_SIG0_VAL << 16) | ADM_SIG1_VAL;
-	return 0;
-}
-
-static int adm6996_probe(struct phy_device *pdev)
-{
-	struct adm6996_priv *priv;
-
-	priv = kzalloc(sizeof(struct adm6996_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	priv->read = adm6996_read_mii_reg;
-	priv->write = adm6996_write_mii_reg;
-	pdev->priv = priv;
-	return 0;
-}
-
-static void adm6996_remove(struct phy_device *pdev)
-{
-	kfree(pdev->priv);
-}
-
-
-static struct phy_driver adm6996_driver = {
-	.name		= "Infineon ADM6996",
-	.phy_id		= (ADM_SIG0_VAL << 16) | ADM_SIG1_VAL,
-	.phy_id_mask	= 0xffffffff,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= adm6996_probe,
-	.remove		= adm6996_remove,
-	.config_init	= &adm6996_config_init,
-	.config_aneg	= &adm6996_config_aneg,
-	.read_status	= &adm6996_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init adm6996_init(void)
-{
-	phy_register_fixup_for_id(PHY_ANY_ID, adm6996_fixup);
-	return phy_driver_register(&adm6996_driver);
-}
-
-static void __exit adm6996_exit(void)
-{
-	phy_driver_unregister(&adm6996_driver);
-}
-
-module_init(adm6996_init);
-module_exit(adm6996_exit);
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.h b/target/linux/generic-2.6/files/drivers/net/phy/adm6996.h
deleted file mode 100644
index e074901517..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __ADM6996_H
-#define __ADM6996_H
-
-#define ADM_PHY_PORTS	5
-#define ADM_CPU_PORT	5
-#define ADM_WAN_PORT	0 /* FIXME: dynamic ? */
-
-enum admreg {
-	ADM_EEPROM_BASE		= 0x0,
-		ADM_P0_CFG		= ADM_EEPROM_BASE + 1,
-		ADM_P1_CFG		= ADM_EEPROM_BASE + 3,
-		ADM_P2_CFG		= ADM_EEPROM_BASE + 5,
-		ADM_P3_CFG		= ADM_EEPROM_BASE + 7,
-		ADM_P4_CFG		= ADM_EEPROM_BASE + 8,
-		ADM_P5_CFG		= ADM_EEPROM_BASE + 9,
-	ADM_EEPROM_EXT_BASE	= 0x40,
-	ADM_COUNTER_BASE	= 0xa0,
-		ADM_SIG0		= ADM_COUNTER_BASE + 0,
-		ADM_SIG1		= ADM_COUNTER_BASE + 1,
-	ADM_PHY_BASE		= 0x200,
-#define ADM_PHY_PORT(n) (ADM_PHY_BASE + (0x20 * n))
-};
-
-/* Chip identification patterns */
-#define	ADM_SIG0_MASK	0xfff0
-#define ADM_SIG0_VAL	0x1020
-#define ADM_SIG1_MASK	0xffff
-#define ADM_SIG1_VAL	0x0007
-
-enum {
-	ADM_PHYCFG_COLTST     = (1 << 7),	/* Enable collision test */
-	ADM_PHYCFG_DPLX       = (1 << 8),	/* Enable full duplex */
-	ADM_PHYCFG_ANEN_RST   = (1 << 9),	/* Restart auto negotiation (self clear) */
-	ADM_PHYCFG_ISO        = (1 << 10),	/* Isolate PHY */
-	ADM_PHYCFG_PDN        = (1 << 11),	/* Power down PHY */
-	ADM_PHYCFG_ANEN       = (1 << 12),	/* Enable auto negotiation */
-	ADM_PHYCFG_SPEED_100  = (1 << 13),	/* Enable 100 Mbit/s */
-	ADM_PHYCFG_LPBK       = (1 << 14),	/* Enable loopback operation */
-	ADM_PHYCFG_RST        = (1 << 15),	/* Reset the port (self clear) */
-	ADM_PHYCFG_INIT = (
-		ADM_PHYCFG_RST |
-		ADM_PHYCFG_SPEED_100 |
-		ADM_PHYCFG_ANEN |
-		ADM_PHYCFG_ANEN_RST
-	)
-};
-
-enum {
-	ADM_PORTCFG_FC        = (1 << 0),	/* Enable 802.x flow control */
-	ADM_PORTCFG_AN        = (1 << 1),	/* Enable auto-negotiation */
-	ADM_PORTCFG_SPEED_100 = (1 << 2),	/* Enable 100 Mbit/s */
-	ADM_PORTCFG_DPLX      = (1 << 3),	/* Enable full duplex */
-	ADM_PORTCFG_OT        = (1 << 4),	/* Output tagged packets */
-	ADM_PORTCFG_PD        = (1 << 5),	/* Port disable */
-	ADM_PORTCFG_TV_PRIO   = (1 << 6),	/* 0 = VLAN based priority
-	                                 	 * 1 = TOS based priority */
-	ADM_PORTCFG_PPE       = (1 << 7),	/* Port based priority enable */
-	ADM_PORTCFG_PP_S      = (1 << 8),	/* Port based priority, 2 bits */
-	ADM_PORTCFG_PVID_BASE = (1 << 10),	/* Primary VLAN id, 4 bits */
-	ADM_PORTCFG_FSE	      = (1 << 14),	/* Fx select enable */
-	ADM_PORTCFG_CAM       = (1 << 15),	/* Crossover Auto MDIX */
-
-	ADM_PORTCFG_INIT = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_AN |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_DPLX |
-		ADM_PORTCFG_CAM
-	),
-	ADM_PORTCFG_CPU = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_OT |
-		ADM_PORTCFG_DPLX
-	),
-};
-
-#define ADM_PORTCFG_PPID(N) ((n & 0x3) << 8)
-#define ADM_PORTCFG_PVID(n) ((n & 0xf) << 10)
-
-static const u8 adm_portcfg[] = {
-	[0] = ADM_P0_CFG,
-	[1] = ADM_P1_CFG,
-	[2] = ADM_P2_CFG,
-	[3] = ADM_P3_CFG,
-	[4] = ADM_P4_CFG,
-	[5] = ADM_P5_CFG,
-};
-
-/*
- * Split the register address in phy id and register
- * it will get combined again by the mdio bus op
- */
-#define PHYADDR(_reg)	((_reg >> 5) & 0xff), (_reg & 0x1f)
-
-#endif
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
deleted file mode 100644
index 4ae61da233..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
+++ /dev/null
@@ -1,839 +0,0 @@
-/*
- * ar8216.c: AR8216 switch driver
- *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/if.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/if_ether.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/netlink.h>
-#include <linux/bitops.h>
-#include <net/genetlink.h>
-#include <linux/switch.h>
-#include <linux/delay.h>
-#include <linux/phy.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include "ar8216.h"
-
-/* size of the vlan table */
-#define AR8X16_MAX_VLANS	128
-#define AR8X16_PROBE_RETRIES	10
-
-struct ar8216_priv {
-	struct switch_dev dev;
-	struct phy_device *phy;
-	u32 (*read)(struct ar8216_priv *priv, int reg);
-	void (*write)(struct ar8216_priv *priv, int reg, u32 val);
-	const struct net_device_ops *ndo_old;
-	struct net_device_ops ndo;
-	struct mutex reg_mutex;
-	int chip;
-
-	/* all fields below are cleared on reset */
-	bool vlan;
-	u16 vlan_id[AR8X16_MAX_VLANS];
-	u8 vlan_table[AR8X16_MAX_VLANS];
-	u8 vlan_tagged;
-	u16 pvid[AR8216_NUM_PORTS];
-};
-static struct switch_dev athdev;
-
-#define to_ar8216(_dev) container_of(_dev, struct ar8216_priv, dev)
-
-static inline void
-split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
-{
-	regaddr >>= 1;
-	*r1 = regaddr & 0x1e;
-
-	regaddr >>= 5;
-	*r2 = regaddr & 0x7;
-
-	regaddr >>= 3;
-	*page = regaddr & 0x1ff;
-}
-
-static u32
-ar8216_mii_read(struct ar8216_priv *priv, int reg)
-{
-	struct phy_device *phy = priv->phy;
-	u16 r1, r2, page;
-	u16 lo, hi;
-
-	split_addr((u32) reg, &r1, &r2, &page);
-	phy->bus->write(phy->bus, 0x18, 0, page);
-	msleep(1); /* wait for the page switch to propagate */
-	lo = phy->bus->read(phy->bus, 0x10 | r2, r1);
-	hi = phy->bus->read(phy->bus, 0x10 | r2, r1 + 1);
-
-	return (hi << 16) | lo;
-}
-
-static void
-ar8216_mii_write(struct ar8216_priv *priv, int reg, u32 val)
-{
-	struct phy_device *phy = priv->phy;
-	u16 r1, r2, r3;
-	u16 lo, hi;
-
-	split_addr((u32) reg, &r1, &r2, &r3);
-	phy->bus->write(phy->bus, 0x18, 0, r3);
-	msleep(1); /* wait for the page switch to propagate */
-
-	lo = val & 0xffff;
-	hi = (u16) (val >> 16);
-	phy->bus->write(phy->bus, 0x10 | r2, r1 + 1, hi);
-	phy->bus->write(phy->bus, 0x10 | r2, r1, lo);
-}
-
-static u32
-ar8216_rmw(struct ar8216_priv *priv, int reg, u32 mask, u32 val)
-{
-	u32 v;
-
-	v = priv->read(priv, reg);
-	v &= ~mask;
-	v |= val;
-	priv->write(priv, reg, v);
-
-	return v;
-}
-
-static inline int
-ar8216_id_chip(struct ar8216_priv *priv)
-{
-	u32 val;
-	u16 id;
-	int i;
-
-	val = ar8216_mii_read(priv, AR8216_REG_CTRL);
-	if (val == ~0)
-		return UNKNOWN;
-
-	id = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
-	for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
-		u16 t;
-
-		val = ar8216_mii_read(priv, AR8216_REG_CTRL);
-		if (val == ~0)
-			return UNKNOWN;
-
-		t = val & (AR8216_CTRL_REVISION | AR8216_CTRL_VERSION);
-		if (t != id)
-			return UNKNOWN;
-	}
-
-	switch (id) {
-	case 0x0101:
-		return AR8216;
-	case 0x1001:
-		return AR8316;
-	default:
-		printk(KERN_DEBUG
-			"ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n",
-			(int)(id >> AR8216_CTRL_VERSION_S),
-			(int)(id & AR8216_CTRL_REVISION),
-			priv->phy->bus->read(priv->phy->bus, priv->phy->addr, 2),
-			priv->phy->bus->read(priv->phy->bus, priv->phy->addr, 3));
-
-		return UNKNOWN;
-	}
-}
-
-static int
-ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	priv->vlan = !!val->value.i;
-	return 0;
-}
-
-static int
-ar8216_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	val->value.i = priv->vlan;
-	return 0;
-}
-
-
-static int
-ar8216_set_pvid(struct switch_dev *dev, int port, int vlan)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-
-	/* make sure no invalid PVIDs get set */
-
-	if (vlan >= dev->vlans)
-		return -EINVAL;
-
-	priv->pvid[port] = vlan;
-	return 0;
-}
-
-static int
-ar8216_get_pvid(struct switch_dev *dev, int port, int *vlan)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	*vlan = priv->pvid[port];
-	return 0;
-}
-
-static int
-ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	priv->vlan_id[val->port_vlan] = val->value.i;
-	return 0;
-}
-
-static int
-ar8216_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
-                struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	val->value.i = priv->vlan_id[val->port_vlan];
-	return 0;
-}
-
-
-static int
-ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev)
-{
-	struct ar8216_priv *priv = dev->phy_ptr;
-	unsigned char *buf;
-
-    if (unlikely(!priv))
-        goto error;
-
-	if (!priv->vlan)
-		goto send;
-
-	if (unlikely(skb_headroom(skb) < 2)) {
-		if (pskb_expand_head(skb, 2, 0, GFP_ATOMIC) < 0)
-			goto error;
-	}
-
-	buf = skb_push(skb, 2);
-	buf[0] = 0x10;
-	buf[1] = 0x80;
-
-send:
-	return priv->ndo_old->ndo_start_xmit(skb, dev);
-
-error:
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-static int
-ar8216_mangle_rx(struct sk_buff *skb, int napi)
-{
-	struct ar8216_priv *priv;
-	struct net_device *dev;
-	unsigned char *buf;
-	int port, vlan;
-
-	dev = skb->dev;
-	if (!dev)
-		goto error;
-
-	priv = dev->phy_ptr;
-	if (!priv)
-		goto error;
-
-	/* don't strip the header if vlan mode is disabled */
-	if (!priv->vlan)
-		goto recv;
-
-	/* strip header, get vlan id */
-	buf = skb->data;
-	skb_pull(skb, 2);
-
-	/* check for vlan header presence */
-	if ((buf[12 + 2] != 0x81) || (buf[13 + 2] != 0x00))
-		goto recv;
-
-	port = buf[0] & 0xf;
-
-	/* no need to fix up packets coming from a tagged source */
-	if (priv->vlan_tagged & (1 << port))
-		goto recv;
-
-	/* lookup port vid from local table, the switch passes an invalid vlan id */
-	vlan = priv->vlan_id[priv->pvid[port]];
-
-	buf[14 + 2] &= 0xf0;
-	buf[14 + 2] |= vlan >> 8;
-	buf[15 + 2] = vlan & 0xff;
-
-recv:
-	skb->protocol = eth_type_trans(skb, skb->dev);
-
-	if (napi)
-		return netif_receive_skb(skb);
-	else
-		return netif_rx(skb);
-
-error:
-	/* no vlan? eat the packet! */
-	dev_kfree_skb_any(skb);
-	return NET_RX_DROP;
-}
-
-static int
-ar8216_netif_rx(struct sk_buff *skb)
-{
-	return ar8216_mangle_rx(skb, 0);
-}
-
-static int
-ar8216_netif_receive_skb(struct sk_buff *skb)
-{
-	return ar8216_mangle_rx(skb, 1);
-}
-
-
-static struct switch_attr ar8216_globals[] = {
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan",
-		.description = "Enable VLAN mode",
-		.set = ar8216_set_vlan,
-		.get = ar8216_get_vlan,
-		.max = 1
-	},
-};
-
-static struct switch_attr ar8216_port[] = {
-};
-
-static struct switch_attr ar8216_vlan[] = {
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "pvid",
-		.description = "VLAN ID",
-		.set = ar8216_set_vid,
-		.get = ar8216_get_vid,
-		.max = 4094,
-	},
-};
-
-
-static int
-ar8216_get_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	u8 ports = priv->vlan_table[val->port_vlan];
-	int i;
-
-	val->len = 0;
-	for (i = 0; i < AR8216_NUM_PORTS; i++) {
-		struct switch_port *p;
-
-		if (!(ports & (1 << i)))
-			continue;
-
-		p = &val->value.ports[val->len++];
-		p->id = i;
-		if (priv->vlan_tagged & (1 << i))
-			p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
-		else
-			p->flags = 0;
-	}
-	return 0;
-}
-
-static int
-ar8216_set_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	u8 *vt = &priv->vlan_table[val->port_vlan];
-	int i, j;
-
-	*vt = 0;
-	for (i = 0; i < val->len; i++) {
-		struct switch_port *p = &val->value.ports[i];
-
-		if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
-			priv->vlan_tagged |= (1 << p->id);
-		else {
-			priv->vlan_tagged &= ~(1 << p->id);
-			priv->pvid[p->id] = val->port_vlan;
-
-			/* make sure that an untagged port does not
-			 * appear in other vlans */
-			for (j = 0; j < AR8X16_MAX_VLANS; j++) {
-				if (j == val->port_vlan)
-					continue;
-				priv->vlan_table[j] &= ~(1 << p->id);
-			}
-		}
-
-		*vt |= 1 << p->id;
-	}
-	return 0;
-}
-
-static int
-ar8216_wait_bit(struct ar8216_priv *priv, int reg, u32 mask, u32 val)
-{
-	int timeout = 20;
-
-	while ((priv->read(priv, reg) & mask) != val) {
-		if (timeout-- <= 0) {
-			printk(KERN_ERR "ar8216: timeout waiting for operation to complete\n");
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static void
-ar8216_vtu_op(struct ar8216_priv *priv, u32 op, u32 val)
-{
-	if (ar8216_wait_bit(priv, AR8216_REG_VTU, AR8216_VTU_ACTIVE, 0))
-		return;
-	if ((op & AR8216_VTU_OP) == AR8216_VTU_OP_LOAD) {
-		val &= AR8216_VTUDATA_MEMBER;
-		val |= AR8216_VTUDATA_VALID;
-		priv->write(priv, AR8216_REG_VTU_DATA, val);
-	}
-	op |= AR8216_VTU_ACTIVE;
-	priv->write(priv, AR8216_REG_VTU, op);
-}
-
-static int
-ar8216_hw_apply(struct switch_dev *dev)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	u8 portmask[AR8216_NUM_PORTS];
-	int i, j;
-
-	mutex_lock(&priv->reg_mutex);
-	/* flush all vlan translation unit entries */
-	ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
-
-	memset(portmask, 0, sizeof(portmask));
-	if (priv->vlan) {
-		/* calculate the port destination masks and load vlans
-		 * into the vlan translation unit */
-		for (j = 0; j < AR8X16_MAX_VLANS; j++) {
-			u8 vp = priv->vlan_table[j];
-
-			if (!vp)
-				continue;
-
-			for (i = 0; i < AR8216_NUM_PORTS; i++) {
-				u8 mask = (1 << i);
-				if (vp & mask)
-					portmask[i] |= vp & ~mask;
-			}
-
-			ar8216_vtu_op(priv,
-				AR8216_VTU_OP_LOAD |
-				(priv->vlan_id[j] << AR8216_VTU_VID_S),
-				priv->vlan_table[j]);
-		}
-	} else {
-		/* vlan disabled:
-		 * isolate all ports, but connect them to the cpu port */
-		for (i = 0; i < AR8216_NUM_PORTS; i++) {
-			if (i == AR8216_PORT_CPU)
-				continue;
-
-			portmask[i] = 1 << AR8216_PORT_CPU;
-			portmask[AR8216_PORT_CPU] |= (1 << i);
-		}
-	}
-
-	/* update the port destination mask registers and tag settings */
-	for (i = 0; i < AR8216_NUM_PORTS; i++) {
-		int egress, ingress;
-		int pvid;
-
-		if (priv->vlan) {
-			pvid = priv->vlan_id[priv->pvid[i]];
-		} else {
-			pvid = i;
-		}
-
-		if (priv->vlan && (priv->vlan_tagged & (1 << i))) {
-			egress = AR8216_OUT_ADD_VLAN;
-		} else {
-			egress = AR8216_OUT_STRIP_VLAN;
-		}
-		if (priv->vlan) {
-			ingress = AR8216_IN_SECURE;
-		} else {
-			ingress = AR8216_IN_PORT_ONLY;
-		}
-
-		ar8216_rmw(priv, AR8216_REG_PORT_CTRL(i),
-			AR8216_PORT_CTRL_LEARN | AR8216_PORT_CTRL_VLAN_MODE |
-			AR8216_PORT_CTRL_SINGLE_VLAN | AR8216_PORT_CTRL_STATE |
-			AR8216_PORT_CTRL_HEADER | AR8216_PORT_CTRL_LEARN_LOCK,
-			AR8216_PORT_CTRL_LEARN |
-			  (priv->vlan && i == AR8216_PORT_CPU && (priv->chip == AR8216) ?
-			   AR8216_PORT_CTRL_HEADER : 0) |
-			  (egress << AR8216_PORT_CTRL_VLAN_MODE_S) |
-			  (AR8216_PORT_STATE_FORWARD << AR8216_PORT_CTRL_STATE_S));
-
-		ar8216_rmw(priv, AR8216_REG_PORT_VLAN(i),
-			AR8216_PORT_VLAN_DEST_PORTS | AR8216_PORT_VLAN_MODE |
-			  AR8216_PORT_VLAN_DEFAULT_ID,
-			(portmask[i] << AR8216_PORT_VLAN_DEST_PORTS_S) |
-			  (ingress << AR8216_PORT_VLAN_MODE_S) |
-			  (pvid << AR8216_PORT_VLAN_DEFAULT_ID_S));
-	}
-	mutex_unlock(&priv->reg_mutex);
-	return 0;
-}
-
-static int
-ar8316_hw_init(struct ar8216_priv *priv) {
-	static int initialized;
-	int i;
-	u32 val;
-	struct mii_bus *bus;
-
-	if (initialized)
-		return 0;
-
-	val = priv->read(priv, 0x8);
-
-	if (priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
-		/* value taken from Ubiquiti RouterStation Pro */
-		if (val == 0x81461bea) {
-			/* switch already intialized by bootloader */
-			initialized = true;
-			return 0;
-		}
-		priv->write(priv, 0x8, 0x81461bea);
-	} else if (priv->phy->interface == PHY_INTERFACE_MODE_GMII) {
-		/* value taken from AVM Fritz!Box 7390 sources */
-		if (val == 0x010e5b71) {
-			/* switch already initialized by bootloader */
-			initialized = true;
-			return 0;
-		}
-		priv->write(priv, 0x8, 0x010e5b71);
-	} else {
-		/* no known value for phy interface */
-		printk(KERN_ERR "ar8316: unsupported mii mode: %d.\n",
-			priv->phy->interface);
-		return -EINVAL;
-	}
-
-	/* standard atheros magic */
-	priv->write(priv, 0x38, 0xc000050e);
-
-	/* Initialize the ports */
-	bus = priv->phy->bus;
-	for (i = 0; i < 5; i++) {
-		if ((i == 4) &&
-			priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
-			/* work around for phy4 rgmii mode */
-			bus->write(bus, i, MII_ATH_DBG_ADDR, 0x12);
-			bus->write(bus, i, MII_ATH_DBG_DATA, 0x480c);
-			/* rx delay */
-			bus->write(bus, i, MII_ATH_DBG_ADDR, 0x0);
-			bus->write(bus, i, MII_ATH_DBG_DATA, 0x824e);
-			/* tx delay */
-			bus->write(bus, i, MII_ATH_DBG_ADDR, 0x5);
-			bus->write(bus, i, MII_ATH_DBG_DATA, 0x3d47);
-			msleep(1000);
-		}
-
-		/* initialize the port itself */
-		bus->write(bus, i, MII_ADVERTISE,
-			ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-		bus->write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-		bus->write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-		msleep(1000);
-	}
-	initialized = true;
-	return 0;
-}
-
-static int
-ar8216_reset_switch(struct switch_dev *dev)
-{
-	struct ar8216_priv *priv = to_ar8216(dev);
-	int i;
-
-	mutex_lock(&priv->reg_mutex);
-	memset(&priv->vlan, 0, sizeof(struct ar8216_priv) -
-		offsetof(struct ar8216_priv, vlan));
-	for (i = 0; i < AR8X16_MAX_VLANS; i++) {
-		priv->vlan_id[i] = i;
-	}
-	for (i = 0; i < AR8216_NUM_PORTS; i++) {
-		/* Enable port learning and tx */
-		priv->write(priv, AR8216_REG_PORT_CTRL(i),
-			AR8216_PORT_CTRL_LEARN |
-			(4 << AR8216_PORT_CTRL_STATE_S));
-
-		priv->write(priv, AR8216_REG_PORT_VLAN(i), 0);
-
-		/* Configure all PHYs */
-		if (i == AR8216_PORT_CPU) {
-			priv->write(priv, AR8216_REG_PORT_STATUS(i),
-				AR8216_PORT_STATUS_LINK_UP |
-				((priv->chip == AR8316) ?
-					AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
-				AR8216_PORT_STATUS_TXMAC |
-				AR8216_PORT_STATUS_RXMAC |
-				((priv->chip == AR8316) ? AR8216_PORT_STATUS_RXFLOW : 0) |
-				((priv->chip == AR8316) ? AR8216_PORT_STATUS_TXFLOW : 0) |
-				AR8216_PORT_STATUS_DUPLEX);
-		} else {
-			priv->write(priv, AR8216_REG_PORT_STATUS(i),
-				AR8216_PORT_STATUS_LINK_AUTO);
-		}
-	}
-	/* XXX: undocumented magic from atheros, required! */
-	priv->write(priv, 0x38, 0xc000050e);
-
-	if (priv->chip == AR8216) {
-		ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-			AR8216_GCTRL_MTU, 1518 + 8 + 2);
-	} else if (priv->chip == AR8316) {
-		/* enable jumbo frames */
-		ar8216_rmw(priv, AR8216_REG_GLOBAL_CTRL,
-			AR8316_GCTRL_MTU, 9018 + 8 + 2);
-	}
-
-	if (priv->chip == AR8316) {
-		/* enable cpu port to receive multicast and broadcast frames */
-		priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
-	}
-	mutex_unlock(&priv->reg_mutex);
-	return ar8216_hw_apply(dev);
-}
-
-static int
-ar8216_config_init(struct phy_device *pdev)
-{
-	struct ar8216_priv *priv;
-	struct net_device *dev = pdev->attached_dev;
-	int ret;
-
-	priv = kzalloc(sizeof(struct ar8216_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	priv->phy = pdev;
-
-	priv->chip = ar8216_id_chip(priv);
-
-	if (pdev->addr == 0)
-		printk(KERN_INFO "%s: AR%d switch driver attached.\n",
-			pdev->attached_dev->name, priv->chip);
-
-
-	if (pdev->addr != 0) {
-		if (priv->chip == AR8316) {
-			pdev->supported |= SUPPORTED_1000baseT_Full;
-			pdev->advertising |= ADVERTISED_1000baseT_Full;
-		}
-		kfree(priv);
-		return 0;
-	}
-
-	pdev->supported = priv->chip == AR8316 ?
-		SUPPORTED_1000baseT_Full : SUPPORTED_100baseT_Full;
-	pdev->advertising = pdev->supported;
-
-	mutex_init(&priv->reg_mutex);
-	priv->read = ar8216_mii_read;
-	priv->write = ar8216_mii_write;
-	memcpy(&priv->dev, &athdev, sizeof(struct switch_dev));
-	pdev->priv = priv;
-
-	if (priv->chip == AR8316) {
-		priv->dev.name = "Atheros AR8316";
-		priv->dev.vlans = AR8X16_MAX_VLANS;
-		/* port 5 connected to the other mac, therefore unusable */
-		priv->dev.ports = (AR8216_NUM_PORTS - 1);
-	}
-
-	if ((ret = register_switch(&priv->dev, pdev->attached_dev)) < 0) {
-		kfree(priv);
-		goto done;
-	}
-
-	if (priv->chip == AR8316) {
-		ret = ar8316_hw_init(priv);
-		if (ret) {
-			kfree(priv);
-			goto done;
-		}
-	}
-
-	ret = ar8216_reset_switch(&priv->dev);
-	if (ret) {
-		kfree(priv);
-		goto done;
-	}
-
-	dev->phy_ptr = priv;
-
-	/* VID fixup only needed on ar8216 */
-	if (pdev->addr == 0 && priv->chip == AR8216) {
-		pdev->pkt_align = 2;
-		pdev->netif_receive_skb = ar8216_netif_receive_skb;
-		pdev->netif_rx = ar8216_netif_rx;
-		priv->ndo_old = dev->netdev_ops;
-		memcpy(&priv->ndo, priv->ndo_old, sizeof(struct net_device_ops));
-		priv->ndo.ndo_start_xmit = ar8216_mangle_tx;
-		dev->netdev_ops = &priv->ndo;
-	}
-
-done:
-	return ret;
-}
-
-static int
-ar8216_read_status(struct phy_device *phydev)
-{
-	struct ar8216_priv *priv = phydev->priv;
-	int ret;
-	if (phydev->addr != 0) {
-		return genphy_read_status(phydev);
-	}
-
-	phydev->speed = priv->chip == AR8316 ? SPEED_1000 : SPEED_100;
-	phydev->duplex = DUPLEX_FULL;
-	phydev->link = 1;
-
-	/* flush the address translation unit */
-	mutex_lock(&priv->reg_mutex);
-	ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
-
-	if (!ret)
-		priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
-	else
-		ret = -ETIMEDOUT;
-	mutex_unlock(&priv->reg_mutex);
-
-	phydev->state = PHY_RUNNING;
-	netif_carrier_on(phydev->attached_dev);
-	phydev->adjust_link(phydev->attached_dev);
-
-	return ret;
-}
-
-static int
-ar8216_config_aneg(struct phy_device *phydev)
-{
-	if (phydev->addr == 0)
-		return 0;
-
-	return genphy_config_aneg(phydev);
-}
-
-static int
-ar8216_probe(struct phy_device *pdev)
-{
-	struct ar8216_priv priv;
-	u16 chip;
-
-	priv.phy = pdev;
-	chip = ar8216_id_chip(&priv);
-	if (chip == UNKNOWN)
-		return -ENODEV;
-
-	return 0;
-}
-
-static void
-ar8216_remove(struct phy_device *pdev)
-{
-	struct ar8216_priv *priv = pdev->priv;
-	struct net_device *dev = pdev->attached_dev;
-
-	if (!priv)
-		return;
-
-	if (priv->ndo_old && dev)
-		dev->netdev_ops = priv->ndo_old;
-	if (pdev->addr == 0)
-		unregister_switch(&priv->dev);
-	kfree(priv);
-}
-
-/* template */
-static struct switch_dev athdev = {
-	.name = "Atheros AR8216",
-	.cpu_port = AR8216_PORT_CPU,
-	.ports = AR8216_NUM_PORTS,
-	.vlans = AR8216_NUM_VLANS,
-	.attr_global = {
-		.attr = ar8216_globals,
-		.n_attr = ARRAY_SIZE(ar8216_globals),
-	},
-	.attr_port = {
-		.attr = ar8216_port,
-		.n_attr = ARRAY_SIZE(ar8216_port),
-	},
-	.attr_vlan = {
-		.attr = ar8216_vlan,
-		.n_attr = ARRAY_SIZE(ar8216_vlan),
-	},
-	.get_port_pvid = ar8216_get_pvid,
-	.set_port_pvid = ar8216_set_pvid,
-	.get_vlan_ports = ar8216_get_ports,
-	.set_vlan_ports = ar8216_set_ports,
-	.apply_config = ar8216_hw_apply,
-	.reset_switch = ar8216_reset_switch,
-};
-
-static struct phy_driver ar8216_driver = {
-	.phy_id		= 0x004d0000,
-	.name		= "Atheros AR8216/AR8316",
-	.phy_id_mask	= 0xffff0000,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= ar8216_probe,
-	.remove		= ar8216_remove,
-	.config_init	= &ar8216_config_init,
-	.config_aneg	= &ar8216_config_aneg,
-	.read_status	= &ar8216_read_status,
-	.driver		= { .owner = THIS_MODULE },
-};
-
-int __init
-ar8216_init(void)
-{
-	return phy_driver_register(&ar8216_driver);
-}
-
-void __exit
-ar8216_exit(void)
-{
-	phy_driver_unregister(&ar8216_driver);
-}
-
-module_init(ar8216_init);
-module_exit(ar8216_exit);
-MODULE_LICENSE("GPL");
-
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.h b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.h
deleted file mode 100644
index 5a8fa3c003..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * ar8216.h: AR8216 switch driver
- *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __AR8216_H
-#define __AR8216_H
-
-#define BITS(_s, _n)	(((1UL << (_n)) - 1) << _s)
-
-#define AR8216_PORT_CPU	0
-#define AR8216_NUM_PORTS	6
-#define AR8216_NUM_VLANS	16
-#define AR8316_NUM_VLANS	4096
-
-/* Atheros specific MII registers */
-#define MII_ATH_DBG_ADDR		0x1d
-#define MII_ATH_DBG_DATA		0x1e
-
-#define AR8216_REG_CTRL			0x0000
-#define   AR8216_CTRL_REVISION		BITS(0, 8)
-#define   AR8216_CTRL_REVISION_S	0
-#define   AR8216_CTRL_VERSION		BITS(8, 8)
-#define   AR8216_CTRL_VERSION_S		8
-#define   AR8216_CTRL_RESET		BIT(31)
-
-#define AR8216_REG_FLOOD_MASK		0x002C
-#define   AR8216_FM_UNI_DEST_PORTS	BITS(0, 6)
-#define   AR8216_FM_MULTI_DEST_PORTS	BITS(16, 6)
-
-#define AR8216_REG_GLOBAL_CTRL		0x0030
-#define   AR8216_GCTRL_MTU		BITS(0, 11)
-#define   AR8316_GCTRL_MTU		BITS(0, 14)
-
-#define AR8216_REG_VTU			0x0040
-#define   AR8216_VTU_OP			BITS(0, 3)
-#define   AR8216_VTU_OP_NOOP		0x0
-#define   AR8216_VTU_OP_FLUSH		0x1
-#define   AR8216_VTU_OP_LOAD		0x2
-#define   AR8216_VTU_OP_PURGE		0x3
-#define   AR8216_VTU_OP_REMOVE_PORT	0x4
-#define   AR8216_VTU_ACTIVE		BIT(3)
-#define   AR8216_VTU_FULL		BIT(4)
-#define   AR8216_VTU_PORT		BITS(8, 4)
-#define   AR8216_VTU_PORT_S		8
-#define   AR8216_VTU_VID		BITS(16, 12)
-#define   AR8216_VTU_VID_S		16
-#define   AR8216_VTU_PRIO		BITS(28, 3)
-#define   AR8216_VTU_PRIO_S		28
-#define   AR8216_VTU_PRIO_EN		BIT(31)
-
-#define AR8216_REG_VTU_DATA		0x0044
-#define   AR8216_VTUDATA_MEMBER		BITS(0, 10)
-#define   AR8216_VTUDATA_VALID		BIT(11)
-
-#define AR8216_REG_ATU			0x0050
-#define   AR8216_ATU_OP			BITS(0, 3)
-#define   AR8216_ATU_OP_NOOP		0x0
-#define   AR8216_ATU_OP_FLUSH		0x1
-#define   AR8216_ATU_OP_LOAD		0x2
-#define   AR8216_ATU_OP_PURGE		0x3
-#define   AR8216_ATU_OP_FLUSH_LOCKED	0x4
-#define   AR8216_ATU_OP_FLUSH_UNICAST	0x5
-#define   AR8216_ATU_OP_GET_NEXT	0x6
-#define   AR8216_ATU_ACTIVE		BIT(3)
-#define   AR8216_ATU_PORT_NUM		BITS(8, 4)
-#define   AR8216_ATU_FULL_VIO		BIT(12)
-#define   AR8216_ATU_ADDR4		BITS(16, 8)
-#define   AR8216_ATU_ADDR5		BITS(24, 8)
-
-#define AR8216_REG_ATU_DATA		0x0054
-#define   AR8216_ATU_ADDR3		BITS(0, 8)
-#define   AR8216_ATU_ADDR2		BITS(8, 8)
-#define   AR8216_ATU_ADDR1		BITS(16, 8)
-#define   AR8216_ATU_ADDR0		BITS(24, 8)
-
-#define AR8216_REG_ATU_CTRL		0x005C
-#define   AR8216_ATU_CTRL_AGE_EN	BIT(17)
-#define   AR8216_ATU_CTRL_AGE_TIME	BITS(0, 16)
-#define   AR8216_ATU_CTRL_AGE_TIME_S	0
-
-#define AR8216_PORT_OFFSET(_i)		(0x0100 * (_i + 1))
-#define AR8216_REG_PORT_STATUS(_i)	(AR8216_PORT_OFFSET(_i) + 0x0000)
-#define   AR8216_PORT_STATUS_SPEED	BITS(0,2)
-#define   AR8216_PORT_STATUS_SPEED_S	0
-#define   AR8216_PORT_STATUS_TXMAC	BIT(2)
-#define   AR8216_PORT_STATUS_RXMAC	BIT(3)
-#define   AR8216_PORT_STATUS_TXFLOW	BIT(4)
-#define   AR8216_PORT_STATUS_RXFLOW	BIT(5)
-#define   AR8216_PORT_STATUS_DUPLEX	BIT(6)
-#define   AR8216_PORT_STATUS_LINK_UP	BIT(8)
-#define   AR8216_PORT_STATUS_LINK_AUTO	BIT(9)
-#define   AR8216_PORT_STATUS_LINK_PAUSE	BIT(10)
-
-#define AR8216_REG_PORT_CTRL(_i)	(AR8216_PORT_OFFSET(_i) + 0x0004)
-
-/* port forwarding state */
-#define   AR8216_PORT_CTRL_STATE	BITS(0, 3)
-#define   AR8216_PORT_CTRL_STATE_S	0
-
-#define   AR8216_PORT_CTRL_LEARN_LOCK	BIT(7)
-
-/* egress 802.1q mode */
-#define   AR8216_PORT_CTRL_VLAN_MODE	BITS(8, 2)
-#define   AR8216_PORT_CTRL_VLAN_MODE_S	8
-
-#define   AR8216_PORT_CTRL_IGMP_SNOOP	BIT(10)
-#define   AR8216_PORT_CTRL_HEADER	BIT(11)
-#define   AR8216_PORT_CTRL_MAC_LOOP	BIT(12)
-#define   AR8216_PORT_CTRL_SINGLE_VLAN	BIT(13)
-#define   AR8216_PORT_CTRL_LEARN	BIT(14)
-#define   AR8216_PORT_CTRL_MIRROR_TX	BIT(16)
-#define   AR8216_PORT_CTRL_MIRROR_RX	BIT(17)
-
-#define AR8216_REG_PORT_VLAN(_i)	(AR8216_PORT_OFFSET(_i) + 0x0008)
-
-#define   AR8216_PORT_VLAN_DEFAULT_ID	BITS(0, 12)
-#define   AR8216_PORT_VLAN_DEFAULT_ID_S	0
-
-#define   AR8216_PORT_VLAN_DEST_PORTS	BITS(16, 9)
-#define   AR8216_PORT_VLAN_DEST_PORTS_S	16
-
-/* bit0 added to the priority field of egress frames */
-#define   AR8216_PORT_VLAN_TX_PRIO	BIT(27)
-
-/* port default priority */
-#define   AR8216_PORT_VLAN_PRIORITY	BITS(28, 2)
-#define   AR8216_PORT_VLAN_PRIORITY_S	28
-
-/* ingress 802.1q mode */
-#define   AR8216_PORT_VLAN_MODE		BITS(30, 2)
-#define   AR8216_PORT_VLAN_MODE_S	30
-
-#define AR8216_REG_PORT_RATE(_i)	(AR8216_PORT_OFFSET(_i) + 0x000c)
-#define AR8216_REG_PORT_PRIO(_i)	(AR8216_PORT_OFFSET(_i) + 0x0010)
-
-/* port speed */
-enum {
-        AR8216_PORT_SPEED_10M = 0,
-        AR8216_PORT_SPEED_100M = 1,
-        AR8216_PORT_SPEED_1000M = 2,
-        AR8216_PORT_SPEED_ERR = 3,
-};
-
-/* ingress 802.1q mode */
-enum {
-	AR8216_IN_PORT_ONLY = 0,
-	AR8216_IN_PORT_FALLBACK = 1,
-	AR8216_IN_VLAN_ONLY = 2,
-	AR8216_IN_SECURE = 3
-};
-
-/* egress 802.1q mode */
-enum {
-	AR8216_OUT_KEEP = 0,
-	AR8216_OUT_STRIP_VLAN = 1,
-	AR8216_OUT_ADD_VLAN = 2
-};
-
-/* port forwarding state */
-enum {
-	AR8216_PORT_STATE_DISABLED = 0,
-	AR8216_PORT_STATE_BLOCK = 1,
-	AR8216_PORT_STATE_LISTEN = 2,
-	AR8216_PORT_STATE_LEARN = 3,
-	AR8216_PORT_STATE_FORWARD = 4
-};
-
-/* device */
-enum {
-  UNKNOWN = 0,
-  AR8216 = 8216,
-  AR8316 = 8316
-};
-
-#endif
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c b/target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c
deleted file mode 100644
index 262123a57f..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/ip17xx.c
+++ /dev/null
@@ -1,1399 +0,0 @@
-/*
- * ip17xx.c: Swconfig configuration for IC+ IP17xx switch family
- *
- * Copyright (C) 2008 Patrick Horn <patrick.horn@gmail.com>
- * Copyright (C) 2008, 2010 Martin Mares <mj@ucw.cz>
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
- * GNU General Public License for more details.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/skbuff.h>
-#include <linux/mii.h>
-#include <linux/phy.h>
-#include <linux/delay.h>
-#include <linux/switch.h>
-#include <linux/device.h>
-
-#define MAX_VLANS 16
-#define MAX_PORTS 9
-#undef DUMP_MII_IO
-
-typedef struct ip17xx_reg {
-	u16 p;			// phy
-	u16 m;			// mii
-} reg;
-typedef char bitnum;
-
-#define NOTSUPPORTED {-1,-1}
-
-#define REG_SUPP(x) (((x).m != ((u16)-1)) && ((x).p != (u16)-1))
-
-struct ip17xx_state;
-
-/*********** CONSTANTS ***********/
-struct register_mappings {
-	char *NAME;
-	u16 MODEL_NO;			// Compare to bits 4-9 of MII register 0,3.
-	bitnum NUM_PORTS;
-	bitnum CPU_PORT;
-
-/* The default VLAN for each port.
-	 Default: 0x0001 for Ports 0,1,2,3
-		  0x0002 for Ports 4,5 */
-	reg VLAN_DEFAULT_TAG_REG[MAX_PORTS];
-
-/* These ports are tagged.
-	 Default: 0x00 */
-	reg ADD_TAG_REG;
-	reg REMOVE_TAG_REG;
-	bitnum ADD_TAG_BIT[MAX_PORTS];
-/* These ports are untagged.
-	 Default: 0x00 (i.e. do not alter any VLAN tags...)
-	 Maybe set to 0 if user disables VLANs. */
-	bitnum REMOVE_TAG_BIT[MAX_PORTS];
-
-/* Port M and Port N are on the same VLAN.
-	 Default: All ports on all VLANs. */
-// Use register {29, 19+N/2}
-	reg VLAN_LOOKUP_REG;
-// Port 5 uses register {30, 18} but same as odd bits.
-	reg VLAN_LOOKUP_REG_5;		// in a different register on IP175C.
-	bitnum VLAN_LOOKUP_EVEN_BIT[MAX_PORTS];
-	bitnum VLAN_LOOKUP_ODD_BIT[MAX_PORTS];
-
-/* This VLAN corresponds to which ports.
-	 Default: 0x2f,0x30,0x3f,0x3f... */
-	reg TAG_VLAN_MASK_REG;
-	bitnum TAG_VLAN_MASK_EVEN_BIT[MAX_PORTS];
-	bitnum TAG_VLAN_MASK_ODD_BIT[MAX_PORTS];
-
-	int RESET_VAL;
-	reg RESET_REG;
-
-	reg MODE_REG;
-	int MODE_VAL;
-
-/* General flags */
-	reg ROUTER_CONTROL_REG;
-	reg VLAN_CONTROL_REG;
-	bitnum TAG_VLAN_BIT;
-	bitnum ROUTER_EN_BIT;
-	bitnum NUMLAN_GROUPS_MAX;
-	bitnum NUMLAN_GROUPS_BIT;
-
-	reg MII_REGISTER_EN;
-	bitnum MII_REGISTER_EN_BIT;
-
-	// set to 1 for 178C, 0 for 175C.
-	bitnum SIMPLE_VLAN_REGISTERS;	// 175C has two vlans per register but 178C has only one.
-
-	// Pointers to functions which manipulate hardware state
-	int (*update_state)(struct ip17xx_state *state);
-	int (*set_vlan_mode)(struct ip17xx_state *state);
-	int (*reset)(struct ip17xx_state *state);
-};
-
-static int ip175c_update_state(struct ip17xx_state *state);
-static int ip175c_set_vlan_mode(struct ip17xx_state *state);
-static int ip175c_reset(struct ip17xx_state *state);
-
-static const struct register_mappings IP178C = {
-	.NAME = "IP178C",
-	.MODEL_NO = 0x18,
-	.VLAN_DEFAULT_TAG_REG = {
-		{30,3},{30,4},{30,5},{30,6},{30,7},{30,8},
-		{30,9},{30,10},{30,11},
-	},
-
-	.ADD_TAG_REG = {30,12},
-	.ADD_TAG_BIT = {0,1,2,3,4,5,6,7,8},
-	.REMOVE_TAG_REG = {30,13},
-	.REMOVE_TAG_BIT = {4,5,6,7,8,9,10,11,12},
-
-	.SIMPLE_VLAN_REGISTERS = 1,
-
-	.VLAN_LOOKUP_REG = {31,0},// +N
-	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED, // not used with SIMPLE_VLAN_REGISTERS
-	.VLAN_LOOKUP_EVEN_BIT = {0,1,2,3,4,5,6,7,8},
-	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,5,6,7,8},
-
-	.TAG_VLAN_MASK_REG = {30,14}, // +N
-	.TAG_VLAN_MASK_EVEN_BIT = {0,1,2,3,4,5,6,7,8},
-	.TAG_VLAN_MASK_ODD_BIT = {0,1,2,3,4,5,6,7,8},
-
-	.RESET_VAL = 0x55AA,
-	.RESET_REG = {30,0},
-	.MODE_VAL = 0,
-	.MODE_REG = NOTSUPPORTED,
-
-	.ROUTER_CONTROL_REG = {30,30},
-	.ROUTER_EN_BIT = 11,
-	.NUMLAN_GROUPS_MAX = 8,
-	.NUMLAN_GROUPS_BIT = 8, // {0-2}
-
-	.VLAN_CONTROL_REG = {30,13},
-	.TAG_VLAN_BIT = 3,
-
-	.CPU_PORT = 8,
-	.NUM_PORTS = 9,
-
-	.MII_REGISTER_EN = NOTSUPPORTED,
-
-	.update_state = ip175c_update_state,
-	.set_vlan_mode = ip175c_set_vlan_mode,
-	.reset = ip175c_reset,
-};
-
-static const struct register_mappings IP175C = {
-	.NAME = "IP175C",
-	.MODEL_NO = 0x18,
-	.VLAN_DEFAULT_TAG_REG = {
-		{29,24},{29,25},{29,26},{29,27},{29,28},{29,30},
-		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED
-	},
-
-	.ADD_TAG_REG = {29,23},
-	.REMOVE_TAG_REG = {29,23},
-	.ADD_TAG_BIT = {11,12,13,14,15,1,-1,-1,-1},
-	.REMOVE_TAG_BIT = {6,7,8,9,10,0,-1,-1,-1},
-
-	.SIMPLE_VLAN_REGISTERS = 0,
-
-	.VLAN_LOOKUP_REG = {29,19},// +N/2
-	.VLAN_LOOKUP_REG_5 = {30,18},
-	.VLAN_LOOKUP_EVEN_BIT = {8,9,10,11,12,15,-1,-1,-1},
-	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,7,-1,-1,-1},
-
-	.TAG_VLAN_MASK_REG = {30,1}, // +N/2
-	.TAG_VLAN_MASK_EVEN_BIT = {0,1,2,3,4,5,-1,-1,-1},
-	.TAG_VLAN_MASK_ODD_BIT = {8,9,10,11,12,13,-1,-1,-1},
-
-	.RESET_VAL = 0x175C,
-	.RESET_REG = {30,0},
-	.MODE_VAL = 0x175C,
-	.MODE_REG = {29,31},
-
-	.ROUTER_CONTROL_REG = {30,9},
-	.ROUTER_EN_BIT = 3,
-	.NUMLAN_GROUPS_MAX = 8,
-	.NUMLAN_GROUPS_BIT = 0, // {0-2}
-
-	.VLAN_CONTROL_REG = {30,9},
-	.TAG_VLAN_BIT = 7,
-
-	.NUM_PORTS = 6,
-	.CPU_PORT = 5,
-
-	.MII_REGISTER_EN = NOTSUPPORTED,
-
-	.update_state = ip175c_update_state,
-	.set_vlan_mode = ip175c_set_vlan_mode,
-	.reset = ip175c_reset,
-};
-
-static const struct register_mappings IP175A = {
-	.NAME = "IP175A",
-	.MODEL_NO = 0x05,
-	.VLAN_DEFAULT_TAG_REG = {
-		{0,24},{0,25},{0,26},{0,27},{0,28},NOTSUPPORTED,
-		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED
-	},
-
-	.ADD_TAG_REG = {0,23},
-	.REMOVE_TAG_REG = {0,23},
-	.ADD_TAG_BIT = {11,12,13,14,15,-1,-1,-1,-1},
-	.REMOVE_TAG_BIT = {6,7,8,9,10,-1,-1,-1,-1},
-
-	.SIMPLE_VLAN_REGISTERS = 0,
-
-	// Only programmable via EEPROM
-	.VLAN_LOOKUP_REG = NOTSUPPORTED,// +N/2
-	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED,
-	.VLAN_LOOKUP_EVEN_BIT = {8,9,10,11,12,-1,-1,-1,-1},
-	.VLAN_LOOKUP_ODD_BIT = {0,1,2,3,4,-1,-1,-1,-1},
-
-	.TAG_VLAN_MASK_REG = NOTSUPPORTED, // +N/2,
-	.TAG_VLAN_MASK_EVEN_BIT = {-1,-1,-1,-1,-1,-1,-1,-1,-1},
-	.TAG_VLAN_MASK_ODD_BIT = {-1,-1,-1,-1,-1,-1,-1,-1,-1},
-
-	.RESET_VAL = -1,
-	.RESET_REG = NOTSUPPORTED,
-	.MODE_VAL = 0,
-	.MODE_REG = NOTSUPPORTED,
-
-	.ROUTER_CONTROL_REG = NOTSUPPORTED,
-	.VLAN_CONTROL_REG = NOTSUPPORTED,
-	.TAG_VLAN_BIT = -1,
-	.ROUTER_EN_BIT = -1,
-	.NUMLAN_GROUPS_MAX = -1,
-	.NUMLAN_GROUPS_BIT = -1, // {0-2}
-
-	.NUM_PORTS = 5,
-	.CPU_PORT = 4,
-
-	.MII_REGISTER_EN = {0, 18},
-	.MII_REGISTER_EN_BIT = 7,
-
-	.update_state = ip175c_update_state,
-	.set_vlan_mode = ip175c_set_vlan_mode,
-	.reset = ip175c_reset,
-};
-
-
-static int ip175d_update_state(struct ip17xx_state *state);
-static int ip175d_set_vlan_mode(struct ip17xx_state *state);
-static int ip175d_reset(struct ip17xx_state *state);
-
-static const struct register_mappings IP175D = {
-	.NAME = "IP175D",
-	.MODEL_NO = 0x18,
-
-	// The IP175D has a completely different interface, so we leave most
-	// of the registers undefined and switch to different code paths.
-
-	.VLAN_DEFAULT_TAG_REG = {
-		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,
-		NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,NOTSUPPORTED,
-	},
-
-	.ADD_TAG_REG = NOTSUPPORTED,
-	.REMOVE_TAG_REG = NOTSUPPORTED,
-
-	.SIMPLE_VLAN_REGISTERS = 0,
-
-	.VLAN_LOOKUP_REG = NOTSUPPORTED,
-	.VLAN_LOOKUP_REG_5 = NOTSUPPORTED,
-	.TAG_VLAN_MASK_REG = NOTSUPPORTED,
-
-	.RESET_VAL = 0x175D,
-	.RESET_REG = {20,2},
-	.MODE_REG = NOTSUPPORTED,
-
-	.ROUTER_CONTROL_REG = NOTSUPPORTED,
-	.ROUTER_EN_BIT = -1,
-	.NUMLAN_GROUPS_BIT = -1,
-
-	.VLAN_CONTROL_REG = NOTSUPPORTED,
-	.TAG_VLAN_BIT = -1,
-
-	.NUM_PORTS = 6,
-	.CPU_PORT = 5,
-
-	.MII_REGISTER_EN = NOTSUPPORTED,
-
-	.update_state = ip175d_update_state,
-	.set_vlan_mode = ip175d_set_vlan_mode,
-	.reset = ip175d_reset,
-};
-
-struct ip17xx_state {
-	struct switch_dev dev;
-	struct mii_bus *mii_bus;
-	bool registered;
-
-	int router_mode;		// ROUTER_EN
-	int vlan_enabled;		// TAG_VLAN_EN
-	struct port_state {
-		u16 pvid;
-		unsigned int shareports;
-	} ports[MAX_PORTS];
-	unsigned int add_tag;
-	unsigned int remove_tag;
-	int num_vlans;
-	struct vlan_state {
-		unsigned int ports;
-		unsigned int tag;	// VLAN tag (IP175D only)
-	} vlans[MAX_VLANS];
-	const struct register_mappings *regs;
-	reg proc_mii; 	// phy/reg for the low level register access via swconfig
-
-	char buf[80];
-};
-
-
-static int ip_phy_read(struct ip17xx_state *state, int port, int reg)
-{
-	int val = mdiobus_read(state->mii_bus, port, reg);
-	if (val < 0)
-		pr_warning("IP17xx: Unable to get MII register %d,%d: error %d\n", port, reg, -val);
-#ifdef DUMP_MII_IO
-	else
-		pr_debug("IP17xx: Read MII(%d,%d) -> %04x\n", port, reg, val);
-#endif
-	return val;
-}
-
-static int ip_phy_write(struct ip17xx_state *state, int port, int reg, u16 val)
-{
-	int err;
-
-#ifdef DUMP_MII_IO
-	pr_debug("IP17xx: Write MII(%d,%d) <- %04x\n", port, reg, val);
-#endif
-	err = mdiobus_write(state->mii_bus, port, reg, val);
-	if (err < 0)
-		pr_warning("IP17xx: Unable to write MII register %d,%d: error %d\n", port, reg, -err);
-	return err;
-}
-
-static int ip_phy_write_masked(struct ip17xx_state *state, int port, int reg, unsigned int mask, unsigned int data)
-{
-	int val = ip_phy_read(state, port, reg);
-	if (val < 0)
-		return 0;
-	return ip_phy_write(state, port, reg, (val & ~mask) | data);
-}
-
-static int getPhy(struct ip17xx_state *state, reg mii)
-{
-	if (!REG_SUPP(mii))
-		return -EFAULT;
-	return ip_phy_read(state, mii.p, mii.m);
-}
-
-static int setPhy(struct ip17xx_state *state, reg mii, u16 value)
-{
-	int err;
-
-	if (!REG_SUPP(mii))
-		return -EFAULT;
-	err = ip_phy_write(state, mii.p, mii.m, value);
-	if (err < 0)
-		return err;
-	getPhy(state, mii);
-	return 0;
-}
-
-
-/**
- * These two macros are to simplify the mapping of logical bits to the bits in hardware.
- * NOTE: these macros will return if there is an error!
- */
-
-#define GET_PORT_BITS(state, bits, addr, bit_lookup)		\
-	do {							\
-		int i, val = getPhy((state), (addr));		\
-		if (val < 0)					\
-			return val;				\
-		(bits) = 0;					\
-		for (i = 0; i < MAX_PORTS; i++) {		\
-			if ((bit_lookup)[i] == -1) continue;	\
-			if (val & (1<<(bit_lookup)[i]))		\
-				(bits) |= (1<<i);		\
-		}						\
-	} while (0)
-
-#define SET_PORT_BITS(state, bits, addr, bit_lookup)		\
-	do {							\
-		int i, val = getPhy((state), (addr));		\
-		if (val < 0)					\
-			return val;				\
-		for (i = 0; i < MAX_PORTS; i++) {		\
-			unsigned int newmask = ((bits)&(1<<i));	\
-			if ((bit_lookup)[i] == -1) continue;	\
-			val &= ~(1<<(bit_lookup)[i]);		\
-			val |= ((newmask>>i)<<(bit_lookup)[i]);	\
-		}						\
-		val = setPhy((state), (addr), val);		\
-		if (val < 0)					\
-			return val;				\
-	} while (0)
-
-
-static int get_model(struct ip17xx_state *state)
-{
-	int id1, id2;
-	int oui_id, model_no, rev_no, chip_no;
-
-	id1 = ip_phy_read(state, 0, 2);
-	id2 = ip_phy_read(state, 0, 3);
-	oui_id = (id1 << 6) | ((id2 >> 10) & 0x3f);
-	model_no = (id2 >> 4) & 0x3f;
-	rev_no = id2 & 0xf;
-	pr_debug("IP17xx: Identified oui=%06x model=%02x rev=%X\n", oui_id, model_no, rev_no);
-
-	if (oui_id != 0x0090c3)  // No other oui_id should have reached us anyway
-		return -ENODEV;
-
-	if (model_no == IP175A.MODEL_NO) {
-		state->regs = &IP175A;
-	} else if (model_no == IP175C.MODEL_NO) {
-		/*
-		 *  Several models share the same model_no:
-		 *  178C has more PHYs, so we try whether the device responds to a read from PHY5
-		 *  175D has a new chip ID register
-		 *  175C has neither
-		 */
-		if (ip_phy_read(state, 5, 2) == 0x0243) {
-			state->regs = &IP178C;
-		} else {
-			chip_no = ip_phy_read(state, 20, 0);
-			pr_debug("IP17xx: Chip ID register reads %04x\n", chip_no);
-			if (chip_no == 0x175d) {
-				state->regs = &IP175D;
-			} else {
-				state->regs = &IP175C;
-			}
-		}
-	} else {
-		pr_warning("IP17xx: Found an unknown IC+ switch with model number %02x, revision %X.\n", model_no, rev_no);
-		return -EPERM;
-	}
-	return 0;
-}
-
-/*** Low-level functions for the older models ***/
-
-/** Only set vlan and router flags in the switch **/
-static int ip175c_set_flags(struct ip17xx_state *state)
-{
-	int val;
-
-	if (!REG_SUPP(state->regs->ROUTER_CONTROL_REG)) {
-		return 0;
-	}
-
-	val = getPhy(state, state->regs->ROUTER_CONTROL_REG);
-	if (val < 0) {
-		return val;
-	}
-	if (state->regs->ROUTER_EN_BIT >= 0) {
-		if (state->router_mode) {
-			val |= (1<<state->regs->ROUTER_EN_BIT);
-		} else {
-			val &= (~(1<<state->regs->ROUTER_EN_BIT));
-		}
-	}
-	if (state->regs->TAG_VLAN_BIT >= 0) {
-		if (state->vlan_enabled) {
-			val |= (1<<state->regs->TAG_VLAN_BIT);
-		} else {
-			val &= (~(1<<state->regs->TAG_VLAN_BIT));
-		}
-	}
-	if (state->regs->NUMLAN_GROUPS_BIT >= 0) {
-		val &= (~((state->regs->NUMLAN_GROUPS_MAX-1)<<state->regs->NUMLAN_GROUPS_BIT));
-		if (state->num_vlans > state->regs->NUMLAN_GROUPS_MAX) {
-			val |= state->regs->NUMLAN_GROUPS_MAX << state->regs->NUMLAN_GROUPS_BIT;
-		} else if (state->num_vlans >= 1) {
-			val |= (state->num_vlans-1) << state->regs->NUMLAN_GROUPS_BIT;
-		}
-	}
-	return setPhy(state, state->regs->ROUTER_CONTROL_REG, val);
-}
-
-/** Set all VLAN and port state.  Usually you should call "correct_vlan_state" first. **/
-static int ip175c_set_state(struct ip17xx_state *state)
-{
-	int j;
-	int i;
-	SET_PORT_BITS(state, state->add_tag,
-				  state->regs->ADD_TAG_REG, state->regs->ADD_TAG_BIT);
-	SET_PORT_BITS(state, state->remove_tag,
-				  state->regs->REMOVE_TAG_REG, state->regs->REMOVE_TAG_BIT);
-
-	if (REG_SUPP(state->regs->VLAN_LOOKUP_REG)) {
-		for (j=0; j<state->regs->NUM_PORTS; j++) {
-			reg addr;
-			const bitnum *bit_lookup = (j%2==0)?
-				state->regs->VLAN_LOOKUP_EVEN_BIT:
-				state->regs->VLAN_LOOKUP_ODD_BIT;
-
-			addr = state->regs->VLAN_LOOKUP_REG;
-			if (state->regs->SIMPLE_VLAN_REGISTERS) {
-				addr.m += j;
-			} else {
-				switch (j) {
-				case 0:
-				case 1:
-					break;
-				case 2:
-				case 3:
-					addr.m+=1;
-					break;
-				case 4:
-					addr.m+=2;
-					break;
-				case 5:
-					addr = state->regs->VLAN_LOOKUP_REG_5;
-					break;
-				default:
-					addr.m = -1; // shouldn't get here, but...
-					break;
-				}
-			}
-			//printf("shareports for %d is %02X\n",j,state->ports[j].shareports);
-			if (REG_SUPP(addr)) {
-				SET_PORT_BITS(state, state->ports[j].shareports, addr, bit_lookup);
-			}
-		}
-	}
-	if (REG_SUPP(state->regs->TAG_VLAN_MASK_REG)) {
-		for (j=0; j<MAX_VLANS; j++) {
-			reg addr = state->regs->TAG_VLAN_MASK_REG;
-			const bitnum *bit_lookup = (j%2==0)?
-				state->regs->TAG_VLAN_MASK_EVEN_BIT:
-				state->regs->TAG_VLAN_MASK_ODD_BIT;
-			unsigned int vlan_mask;
-			if (state->regs->SIMPLE_VLAN_REGISTERS) {
-				addr.m += j;
-			} else {
-				addr.m += j/2;
-			}
-			vlan_mask = state->vlans[j].ports;
-			SET_PORT_BITS(state, vlan_mask, addr, bit_lookup);
-		}
-	}
-
-	for (i=0; i<MAX_PORTS; i++) {
-		if (REG_SUPP(state->regs->VLAN_DEFAULT_TAG_REG[i])) {
-			int err = setPhy(state, state->regs->VLAN_DEFAULT_TAG_REG[i],
-					state->ports[i].pvid);
-			if (err < 0) {
-				return err;
-			}
-		}
-	}
-
-	return ip175c_set_flags(state);
-}
-
-/**
- *  Uses only the VLAN port mask and the add tag mask to generate the other fields:
- *  which ports are part of the same VLAN, removing vlan tags, and VLAN tag ids.
- */
-static void ip175c_correct_vlan_state(struct ip17xx_state *state)
-{
-	int i, j;
-	state->num_vlans = 0;
-	for (i=0; i<MAX_VLANS; i++) {
-		if (state->vlans[i].ports != 0) {
-			state->num_vlans = i+1; // Hack -- we need to store the "set" vlans somewhere...
-		}
-	}
-
-	for (i=0; i<state->regs->NUM_PORTS; i++) {
-		unsigned int portmask = (1<<i);
-		if (!state->vlan_enabled) {
-			// Share with everybody!
-			state->ports[i].shareports = (1<<state->regs->NUM_PORTS)-1;
-			continue;
-		}
-		state->ports[i].shareports = portmask;
-		for (j=0; j<MAX_VLANS; j++) {
-			if (state->vlans[j].ports & portmask)
-				state->ports[i].shareports |= state->vlans[j].ports;
-		}
-	}
-}
-
-static int ip175c_update_state(struct ip17xx_state *state)
-{
-	ip175c_correct_vlan_state(state);
-	return ip175c_set_state(state);
-}
-
-static int ip175c_set_vlan_mode(struct ip17xx_state *state)
-{
-	return ip175c_update_state(state);
-}
-
-static int ip175c_reset(struct ip17xx_state *state)
-{
-	int err;
-
-	if (REG_SUPP(state->regs->MODE_REG)) {
-		err = setPhy(state, state->regs->MODE_REG, state->regs->MODE_VAL);
-		if (err < 0)
-			return err;
-		err = getPhy(state, state->regs->MODE_REG);
-		if (err < 0)
-			return err;
-	}
-
-	return ip175c_update_state(state);
-}
-
-/*** Low-level functions for IP175D ***/
-
-static int ip175d_update_state(struct ip17xx_state *state)
-{
-	unsigned int filter_mask = 0;
-	unsigned int ports[16], add[16], rem[16];
-	int i, j;
-	int err = 0;
-
-	for (i = 0; i < 16; i++) {
-		ports[i] = 0;
-		add[i] = 0;
-		rem[i] = 0;
-		if (!state->vlan_enabled) {
-			err |= ip_phy_write(state, 22, 14+i, i+1);	// default tags
-			ports[i] = 0x3f;
-			continue;
-		}
-		if (!state->vlans[i].tag) {
-			// Reset the filter
-			err |= ip_phy_write(state, 22, 14+i, 0);	// tag
-			continue;
-		}
-		filter_mask |= 1 << i;
-		err |= ip_phy_write(state, 22, 14+i, state->vlans[i].tag);
-		ports[i] = state->vlans[i].ports;
-		for (j = 0; j < 6; j++) {
-			if (ports[i] & (1 << j)) {
-				if (state->add_tag & (1 << j))
-					add[i] |= 1 << j;
-				if (state->remove_tag & (1 << j))
-					rem[i] |= 1 << j;
-			}
-		}
-	}
-
-	// Port masks, tag adds and removals
-	for (i = 0; i < 8; i++) {
-		err |= ip_phy_write(state, 23, i, ports[2*i] | (ports[2*i+1] << 8));
-		err |= ip_phy_write(state, 23, 8+i, add[2*i] | (add[2*i+1] << 8));
-		err |= ip_phy_write(state, 23, 16+i, rem[2*i] | (rem[2*i+1] << 8));
-	}
-	err |= ip_phy_write(state, 22, 10, filter_mask);
-
-	// Default VLAN tag for each port
-	for (i = 0; i < 6; i++)
-		err |= ip_phy_write(state, 22, 4+i, state->vlans[state->ports[i].pvid].tag);
-
-	return (err ? -EIO : 0);
-}
-
-static int ip175d_set_vlan_mode(struct ip17xx_state *state)
-{
-	int i;
-	int err = 0;
-
-	if (state->vlan_enabled) {
-		// VLAN classification rules: tag-based VLANs, use VID to classify,
-		// drop packets that cannot be classified.
-		err |= ip_phy_write_masked(state, 22, 0, 0x3fff, 0x003f);
-
-		// Ingress rules: CFI=1 dropped, null VID is untagged, VID=1 passed,
-		// VID=0xfff discarded, admin both tagged and untagged, ingress
-		// filters enabled.
-		err |= ip_phy_write_masked(state, 22, 1, 0x0fff, 0x0c3f);
-
-		// Egress rules: IGMP processing off, keep VLAN header off
-		err |= ip_phy_write_masked(state, 22, 2, 0x0fff, 0x0000);
-	} else {
-		// VLAN classification rules: everything off & clear table
-		err |= ip_phy_write_masked(state, 22, 0, 0xbfff, 0x8000);
-
-		// Ingress and egress rules: set to defaults
-		err |= ip_phy_write_masked(state, 22, 1, 0x0fff, 0x0c3f);
-		err |= ip_phy_write_masked(state, 22, 2, 0x0fff, 0x0000);
-	}
-
-	// Reset default VLAN for each port to 0
-	for (i = 0; i < 6; i++)
-		state->ports[i].pvid = 0;
-
-	err |= ip175d_update_state(state);
-
-	return (err ? -EIO : 0);
-}
-
-static int ip175d_reset(struct ip17xx_state *state)
-{
-	int err = 0;
-
-	// Disable the special tagging mode
-	err |= ip_phy_write_masked(state, 21, 22, 0x0003, 0x0000);
-
-	// Set 802.1q protocol type
-	err |= ip_phy_write(state, 22, 3, 0x8100);
-
-	state->vlan_enabled = 0;
-	err |= ip175d_set_vlan_mode(state);
-
-	return (err ? -EIO : 0);
-}
-
-/*** High-level functions ***/
-
-static int ip17xx_get_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	val->value.i = state->vlan_enabled;
-	return 0;
-}
-
-static void ip17xx_reset_vlan_config(struct ip17xx_state *state)
-{
-	int i;
-
-	state->remove_tag = (state->vlan_enabled ? ((1<<state->regs->NUM_PORTS)-1) : 0x0000);
-	state->add_tag = 0x0000;
-	for (i = 0; i < MAX_VLANS; i++) {
-		state->vlans[i].ports = 0x0000;
-		state->vlans[i].tag = (i ? i : 16);
-	}
-	for (i = 0; i < MAX_PORTS; i++)
-		state->ports[i].pvid = 0;
-}
-
-static int ip17xx_set_enable_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int enable;
-
-	enable = val->value.i;
-	if (state->vlan_enabled == enable) {
-		// Do not change any state.
-		return 0;
-	}
-	state->vlan_enabled = enable;
-
-	// Otherwise, if we are switching state, set fields to a known default.
-	ip17xx_reset_vlan_config(state);
-
-	return state->regs->set_vlan_mode(state);
-}
-
-static int ip17xx_get_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int b;
-	int ind;
-	unsigned int ports;
-
-	if (val->port_vlan >= dev->vlans || val->port_vlan < 0)
-		return -EINVAL;
-
-	ports = state->vlans[val->port_vlan].ports;
-	b = 0;
-	ind = 0;
-	while (b < MAX_PORTS) {
-		if (ports&1) {
-			int istagged = ((state->add_tag >> b) & 1);
-			val->value.ports[ind].id = b;
-			val->value.ports[ind].flags = (istagged << SWITCH_PORT_FLAG_TAGGED);
-			ind++;
-		}
-		b++;
-		ports >>= 1;
-	}
-	val->len = ind;
-
-	return 0;
-}
-
-static int ip17xx_set_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int i;
-
-	if (val->port_vlan >= dev->vlans || val->port_vlan < 0)
-		return -EINVAL;
-
-	state->vlans[val->port_vlan].ports = 0;
-	for (i = 0; i < val->len; i++) {
-		unsigned int bitmask = (1<<val->value.ports[i].id);
-		state->vlans[val->port_vlan].ports |= bitmask;
-		if (val->value.ports[i].flags & (1<<SWITCH_PORT_FLAG_TAGGED)) {
-			state->add_tag |= bitmask;
-			state->remove_tag &= (~bitmask);
-		} else {
-			state->add_tag &= (~bitmask);
-			state->remove_tag |= bitmask;
-		}
-	}
-
-	return state->regs->update_state(state);
-}
-
-static int ip17xx_apply(struct switch_dev *dev)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	if (REG_SUPP(state->regs->MII_REGISTER_EN)) {
-		int val = getPhy(state, state->regs->MII_REGISTER_EN);
-		if (val < 0) {
-			return val;
-		}
-		val |= (1<<state->regs->MII_REGISTER_EN_BIT);
-		return setPhy(state, state->regs->MII_REGISTER_EN, val);
-	}
-	return 0;
-}
-
-static int ip17xx_reset(struct switch_dev *dev)
-{
-	struct ip17xx_state *state = dev->priv;
-	int i, err;
-
-	if (REG_SUPP(state->regs->RESET_REG)) {
-		err = setPhy(state, state->regs->RESET_REG, state->regs->RESET_VAL);
-		if (err < 0)
-			return err;
-		err = getPhy(state, state->regs->RESET_REG);
-
-		/*
-		 *  Data sheet specifies reset period to be 2 msec.
-		 *  (I don't see any mention of the 2ms delay in the IP178C spec, only
-		 *  in IP175C, but it can't hurt.)
-		 */
-		mdelay(2);
-	}
-
-	/* reset switch ports */
-	for (i = 0; i < state->regs->NUM_PORTS-1; i++) {
-		err = ip_phy_write(state, i, MII_BMCR, BMCR_RESET);
-		if (err < 0)
-			return err;
-	}
-
-	state->router_mode = 0;
-	state->vlan_enabled = 0;
-	ip17xx_reset_vlan_config(state);
-
-	return state->regs->reset(state);
-}
-
-static int ip17xx_get_tagged(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	if (state->add_tag & (1<<val->port_vlan)) {
-		if (state->remove_tag & (1<<val->port_vlan))
-			val->value.i = 3; // shouldn't ever happen.
-		else
-			val->value.i = 1;
-	} else {
-		if (state->remove_tag & (1<<val->port_vlan))
-			val->value.i = 0;
-		else
-			val->value.i = 2;
-	}
-	return 0;
-}
-
-static int ip17xx_set_tagged(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	state->add_tag &= ~(1<<val->port_vlan);
-	state->remove_tag &= ~(1<<val->port_vlan);
-
-	if (val->value.i == 0)
-		state->remove_tag |= (1<<val->port_vlan);
-	if (val->value.i == 1)
-		state->add_tag |= (1<<val->port_vlan);
-
-	return state->regs->update_state(state);
-}
-
-/** Get the current phy address */
-static int ip17xx_get_phy(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	val->value.i = state->proc_mii.p;
-	return 0;
-}
-
-/** Set a new phy address for low level access to registers */
-static int ip17xx_set_phy(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int new_reg = val->value.i;
-
-	if (new_reg < 0 || new_reg > 31)
-		state->proc_mii.p = (u16)-1;
-	else
-		state->proc_mii.p = (u16)new_reg;
-	return 0;
-}
-
-/** Get the current register number */
-static int ip17xx_get_reg(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	val->value.i = state->proc_mii.m;
-	return 0;
-}
-
-/** Set a new register address for low level access to registers */
-static int ip17xx_set_reg(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int new_reg = val->value.i;
-
-	if (new_reg < 0 || new_reg > 31)
-		state->proc_mii.m = (u16)-1;
-	else
-		state->proc_mii.m = (u16)new_reg;
-	return 0;
-}
-
-/** Get the register content of state->proc_mii */
-static int ip17xx_get_val(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int retval = -EINVAL;
-	if (REG_SUPP(state->proc_mii))
-		retval = getPhy(state, state->proc_mii);
-
-	if (retval < 0) {
-		return retval;
-	} else {
-		val->value.i = retval;
-		return 0;
-	}
-}
-
-/** Write a value to the register defined by phy/reg above */
-static int ip17xx_set_val(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int myval, err = -EINVAL;
-
-	myval = val->value.i;
-	if (myval <= 0xffff && myval >= 0 && REG_SUPP(state->proc_mii)) {
-		err = setPhy(state, state->proc_mii, (u16)myval);
-	}
-	return err;
-}
-
-static int ip17xx_read_name(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	val->value.s = state->regs->NAME; // Just a const pointer, won't be freed by swconfig.
-	return 0;
-}
-
-static int ip17xx_get_tag(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int vlan = val->port_vlan;
-
-	if (vlan < 0 || vlan >= MAX_VLANS)
-		return -EINVAL;
-
-	val->value.i = state->vlans[vlan].tag;
-	return 0;
-}
-
-static int ip17xx_set_tag(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int vlan = val->port_vlan;
-	int tag = val->value.i;
-
-	if (vlan < 0 || vlan >= MAX_VLANS)
-		return -EINVAL;
-
-	if (tag < 0 || tag > 4095)
-		return -EINVAL;
-
-	state->vlans[vlan].tag = tag;
-	return state->regs->update_state(state);
-}
-
-static int ip17xx_set_port_speed(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int nr = val->port_vlan;
-	int ctrl;
-	int autoneg;
-	int speed;
-	if (val->value.i == 100) {
-		speed = 1;
-		autoneg = 0;
-	} else if (val->value.i == 10) {
-		speed = 0;
-		autoneg = 0;
-	} else {
-		autoneg = 1;
-		speed = 1;
-	}
-
-	/* Can't set speed for cpu port */
-	if (nr == state->regs->CPU_PORT)
-		return -EINVAL;
-
-	if (nr >= dev->ports || nr < 0)
-		return -EINVAL;
-
-	ctrl = ip_phy_read(state, nr, 0);
-	if (ctrl < 0)
-		return -EIO;
-
-	ctrl &= (~(1<<12));
-	ctrl &= (~(1<<13));
-	ctrl |= (autoneg<<12);
-	ctrl |= (speed<<13);
-
-	return ip_phy_write(state, nr, 0, ctrl);
-}
-
-static int ip17xx_get_port_speed(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int nr = val->port_vlan;
-	int speed, status;
-
-	if (nr == state->regs->CPU_PORT) {
-		val->value.i = 100;
-		return 0;
-	}
-
-	if (nr >= dev->ports || nr < 0)
-		return -EINVAL;
-
-	status = ip_phy_read(state, nr, 1);
-	speed = ip_phy_read(state, nr, 18);
-	if (status < 0 || speed < 0)
-		return -EIO;
-
-	if (status & 4)
-		val->value.i = ((speed & (1<<11)) ? 100 : 10);
-	else
-		val->value.i = 0;
-
-	return 0;
-}
-
-static int ip17xx_get_port_status(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct ip17xx_state *state = dev->priv;
-	int ctrl, speed, status;
-	int nr = val->port_vlan;
-	int len;
-	char *buf = state->buf; // fixed-length at 80.
-
-	if (nr == state->regs->CPU_PORT) {
-		sprintf(buf, "up, 100 Mbps, cpu port");
-		val->value.s = buf;
-		return 0;
-	}
-
-	if (nr >= dev->ports || nr < 0)
-		return -EINVAL;
-
-	ctrl = ip_phy_read(state, nr, 0);
-	status = ip_phy_read(state, nr, 1);
-	speed = ip_phy_read(state, nr, 18);
-	if (ctrl < 0 || status < 0 || speed < 0)
-		return -EIO;
-
-	if (status & 4)
-		len = sprintf(buf, "up, %d Mbps, %s duplex",
-			((speed & (1<<11)) ? 100 : 10),
-			((speed & (1<<10)) ? "full" : "half"));
-	else
-		len = sprintf(buf, "down");
-
-	if (ctrl & (1<<12)) {
-		len += sprintf(buf+len, ", auto-negotiate");
-		if (!(status & (1<<5)))
-			len += sprintf(buf+len, " (in progress)");
-	} else {
-		len += sprintf(buf+len, ", fixed speed (%d)",
-			((ctrl & (1<<13)) ? 100 : 10));
-	}
-
-	buf[len] = '\0';
-	val->value.s = buf;
-	return 0;
-}
-
-static int ip17xx_get_pvid(struct switch_dev *dev, int port, int *val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	*val = state->ports[port].pvid;
-	return 0;
-}
-
-static int ip17xx_set_pvid(struct switch_dev *dev, int port, int val)
-{
-	struct ip17xx_state *state = dev->priv;
-
-	if (val < 0 || val >= MAX_VLANS)
-		return -EINVAL;
-
-	state->ports[port].pvid = val;
-	return state->regs->update_state(state);
-}
-
-
-enum Ports {
-	IP17XX_PORT_STATUS,
-	IP17XX_PORT_LINK,
-	IP17XX_PORT_TAGGED,
-	IP17XX_PORT_PVID,
-};
-
-enum Globals {
-	IP17XX_ENABLE_VLAN,
-	IP17XX_GET_NAME,
-	IP17XX_REGISTER_PHY,
-	IP17XX_REGISTER_MII,
-	IP17XX_REGISTER_VALUE,
-	IP17XX_REGISTER_ERRNO,
-};
-
-enum Vlans {
-	IP17XX_VLAN_TAG,
-};
-
-static const struct switch_attr ip17xx_global[] = {
-	[IP17XX_ENABLE_VLAN] = {
-		.id = IP17XX_ENABLE_VLAN,
-		.type = SWITCH_TYPE_INT,
-		.name  = "enable_vlan",
-		.description = "Flag to enable or disable VLANs and tagging",
-		.get  = ip17xx_get_enable_vlan,
-		.set = ip17xx_set_enable_vlan,
-	},
-	[IP17XX_GET_NAME] = {
-		.id = IP17XX_GET_NAME,
-		.type = SWITCH_TYPE_STRING,
-		.description = "Returns the type of IC+ chip.",
-		.name  = "name",
-		.get  = ip17xx_read_name,
-		.set = NULL,
-	},
-	/* jal: added for low level debugging etc. */
-	[IP17XX_REGISTER_PHY] = {
-		.id = IP17XX_REGISTER_PHY,
-		.type = SWITCH_TYPE_INT,
-		.description = "Direct register access: set PHY (0-4, or 29,30,31)",
-		.name  = "phy",
-		.get  = ip17xx_get_phy,
-		.set = ip17xx_set_phy,
-	},
-	[IP17XX_REGISTER_MII] = {
-		.id = IP17XX_REGISTER_MII,
-		.type = SWITCH_TYPE_INT,
-		.description = "Direct register access: set MII register number (0-31)",
-		.name  = "reg",
-		.get  = ip17xx_get_reg,
-		.set = ip17xx_set_reg,
-	},
-	[IP17XX_REGISTER_VALUE] = {
-		.id = IP17XX_REGISTER_VALUE,
-		.type = SWITCH_TYPE_INT,
-		.description = "Direct register access: read/write to register (0-65535)",
-		.name  = "val",
-		.get  = ip17xx_get_val,
-		.set = ip17xx_set_val,
-	},
-};
-
-static const struct switch_attr ip17xx_vlan[] = {
-	[IP17XX_VLAN_TAG] = {
-		.id = IP17XX_VLAN_TAG,
-		.type = SWITCH_TYPE_INT,
-		.description = "VLAN tag (0-4095) [IP175D only]",
-		.name = "tag",
-		.get = ip17xx_get_tag,
-		.set = ip17xx_set_tag,
-	}
-};
-
-static const struct switch_attr ip17xx_port[] = {
-	[IP17XX_PORT_STATUS] = {
-		.id = IP17XX_PORT_STATUS,
-		.type = SWITCH_TYPE_STRING,
-		.description = "Returns Detailed port status",
-		.name  = "status",
-		.get  = ip17xx_get_port_status,
-		.set = NULL,
-	},
-	[IP17XX_PORT_LINK] = {
-		.id = IP17XX_PORT_LINK,
-		.type = SWITCH_TYPE_INT,
-		.description = "Link speed. Can write 0 for auto-negotiate, or 10 or 100",
-		.name  = "link",
-		.get  = ip17xx_get_port_speed,
-		.set = ip17xx_set_port_speed,
-	},
-	[IP17XX_PORT_TAGGED] = {
-		.id = IP17XX_PORT_LINK,
-		.type = SWITCH_TYPE_INT,
-		.description = "0 = untag, 1 = add tags, 2 = do not alter (This value is reset if vlans are altered)",
-		.name  = "tagged",
-		.get  = ip17xx_get_tagged,
-		.set = ip17xx_set_tagged,
-	},
-};
-
-static int ip17xx_probe(struct phy_device *pdev)
-{
-	struct ip17xx_state *state;
-	struct switch_dev *dev;
-	int err;
-
-	/* We only attach to PHY 0, but use all available PHYs */
-	if (pdev->addr != 0)
-		return -ENODEV;
-
-	state = kzalloc(sizeof(*state), GFP_KERNEL);
-	if (!state)
-		return -ENOMEM;
-
-	dev = &state->dev;
-	dev->attr_global.attr = ip17xx_global;
-	dev->attr_global.n_attr = ARRAY_SIZE(ip17xx_global);
-	dev->attr_port.attr = ip17xx_port;
-	dev->attr_port.n_attr = ARRAY_SIZE(ip17xx_port);
-	dev->attr_vlan.attr = ip17xx_vlan;
-	dev->attr_vlan.n_attr = ARRAY_SIZE(ip17xx_vlan);
-
-	dev->get_port_pvid = ip17xx_get_pvid;
-	dev->set_port_pvid = ip17xx_set_pvid;
-	dev->get_vlan_ports = ip17xx_get_ports;
-	dev->set_vlan_ports = ip17xx_set_ports;
-	dev->apply_config = ip17xx_apply;
-	dev->reset_switch = ip17xx_reset;
-
-	dev->priv = state;
-	pdev->priv = state;
-	state->mii_bus = pdev->bus;
-
-	err = get_model(state);
-	if (err < 0)
-		goto error;
-
-	dev->vlans = MAX_VLANS;
-	dev->cpu_port = state->regs->CPU_PORT;
-	dev->ports = state->regs->NUM_PORTS;
-	dev->name = state->regs->NAME;
-
-	pr_info("IP17xx: Found %s at %s\n", dev->name, dev_name(&pdev->dev));
-	return 0;
-
-error:
-	kfree(state);
-	return err;
-}
-
-static int ip17xx_config_init(struct phy_device *pdev)
-{
-	struct ip17xx_state *state = pdev->priv;
-	struct net_device *dev = pdev->attached_dev;
-	int err;
-
-	err = register_switch(&state->dev, dev);
-	if (err < 0)
-		return err;
-
-	state->registered = true;
-	ip17xx_reset(&state->dev);
-	return 0;
-}
-
-static void ip17xx_remove(struct phy_device *pdev)
-{
-	struct ip17xx_state *state = pdev->priv;
-
-	if (state->registered)
-		unregister_switch(&state->dev);
-	kfree(state);
-}
-
-static int ip17xx_config_aneg(struct phy_device *pdev)
-{
-	return 0;
-}
-
-static int ip17xx_aneg_done(struct phy_device *pdev)
-{
-	return BMSR_ANEGCOMPLETE;
-}
-
-static int ip17xx_update_link(struct phy_device *pdev)
-{
-	pdev->link = 1;
-	return 0;
-}
-
-static int ip17xx_read_status(struct phy_device *pdev)
-{
-	pdev->speed = SPEED_100;
-	pdev->duplex = DUPLEX_FULL;
-	pdev->pause = pdev->asym_pause = 0;
-	pdev->link = 1;
-
-	return 0;
-}
-
-static struct phy_driver ip17xx_driver = {
-	.name		= "IC+ IP17xx",
-	.phy_id		= 0x02430c00,
-	.phy_id_mask	= 0x0ffffc00,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= ip17xx_probe,
-	.remove		= ip17xx_remove,
-	.config_init	= ip17xx_config_init,
-	.config_aneg	= ip17xx_config_aneg,
-	.aneg_done	= ip17xx_aneg_done,
-	.update_link	= ip17xx_update_link,
-	.read_status	= ip17xx_read_status,
-	.driver		= { .owner = THIS_MODULE },
-};
-
-static struct phy_driver ip175a_driver = {
-	.name		= "IC+ IP175A",
-	.phy_id		= 0x02430c50,
-	.phy_id_mask	= 0x0ffffff0,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= ip17xx_probe,
-	.remove		= ip17xx_remove,
-	.config_init	= ip17xx_config_init,
-	.config_aneg	= ip17xx_config_aneg,
-	.aneg_done	= ip17xx_aneg_done,
-	.update_link	= ip17xx_update_link,
-	.read_status	= ip17xx_read_status,
-	.driver		= { .owner = THIS_MODULE },
-};
-
-
-int __init ip17xx_init(void)
-{
-	int ret;
-
-	ret = phy_driver_register(&ip175a_driver);
-	if (ret < 0)
-		return ret;
-
-	return phy_driver_register(&ip17xx_driver);
-}
-
-void __exit ip17xx_exit(void)
-{
-	phy_driver_unregister(&ip17xx_driver);
-	phy_driver_unregister(&ip175a_driver);
-}
-
-MODULE_AUTHOR("Patrick Horn <patrick.horn@gmail.com>");
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
-MODULE_AUTHOR("Martin Mares <mj@ucw.cz>");
-MODULE_LICENSE("GPL");
-
-module_init(ip17xx_init);
-module_exit(ip17xx_exit);
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
deleted file mode 100644
index c2f3245720..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-#include <linux/if_vlan.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "mvswitch.h"
-
-/* Undefine this to use trailer mode instead.
- * I don't know if header mode works with all chips */
-#define HEADER_MODE	1
-
-MODULE_DESCRIPTION("Marvell 88E6060 Switch driver");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-#define MVSWITCH_MAGIC 0x88E6060
-
-struct mvswitch_priv {
-	const struct net_device_ops *ndo_old;
-	struct net_device_ops ndo;
-	struct vlan_group *grp;
-	u8 vlans[16];
-};
-
-#define to_mvsw(_phy) ((struct mvswitch_priv *) (_phy)->priv)
-
-static inline u16
-r16(struct phy_device *phydev, int addr, int reg)
-{
-	return phydev->bus->read(phydev->bus, addr, reg);
-}
-
-static inline void
-w16(struct phy_device *phydev, int addr, int reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, addr, reg, val);
-}
-
-
-static int
-mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev)
-{
-	struct mvswitch_priv *priv;
-	char *buf = NULL;
-	u16 vid;
-
-	priv = dev->phy_ptr;
-	if (unlikely(!priv))
-		goto error;
-
-	if (unlikely(skb->len < 16))
-		goto error;
-
-#ifdef HEADER_MODE
-	if (__vlan_hwaccel_get_tag(skb, &vid))
-		goto error;
-
-	if (skb_cloned(skb) || (skb->len <= 62) || (skb_headroom(skb) < MV_HEADER_SIZE)) {
-		if (pskb_expand_head(skb, MV_HEADER_SIZE, (skb->len < 62 ? 62 - skb->len : 0), GFP_ATOMIC))
-			goto error_expand;
-		if (skb->len < 62)
-			skb->len = 62;
-	}
-	buf = skb_push(skb, MV_HEADER_SIZE);
-#else
-	if (__vlan_get_tag(skb, &vid))
-		goto error;
-
-	if (unlikely((vid > 15 || !priv->vlans[vid])))
-		goto error;
-
-	if (skb->len <= 64) {
-		if (pskb_expand_head(skb, 0, 64 + MV_TRAILER_SIZE - skb->len, GFP_ATOMIC))
-			goto error_expand;
-
-		buf = skb->data + 64;
-		skb->len = 64 + MV_TRAILER_SIZE;
-	} else {
-		if (skb_cloned(skb) || unlikely(skb_tailroom(skb) < 4)) {
-			if (pskb_expand_head(skb, 0, 4, GFP_ATOMIC))
-				goto error_expand;
-		}
-		buf = skb_put(skb, 4);
-	}
-
-	/* move the ethernet header 4 bytes forward, overwriting the vlan tag */
-	memmove(skb->data + 4, skb->data, 12);
-	skb->data += 4;
-	skb->len -= 4;
-	skb->mac_header += 4;
-#endif
-
-	if (!buf)
-		goto error;
-
-
-#ifdef HEADER_MODE
-	/* prepend the tag */
-	*((__be16 *) buf) = cpu_to_be16(
-		((vid << MV_HEADER_VLAN_S) & MV_HEADER_VLAN_M) |
-		((priv->vlans[vid] << MV_HEADER_PORTS_S) & MV_HEADER_PORTS_M)
-	);
-#else
-	/* append the tag */
-	*((__be32 *) buf) = cpu_to_be32((
-		(MV_TRAILER_OVERRIDE << MV_TRAILER_FLAGS_S) |
-		((priv->vlans[vid] & MV_TRAILER_PORTS_M) << MV_TRAILER_PORTS_S)
-	));
-#endif
-
-	return priv->ndo_old->ndo_start_xmit(skb, dev);
-
-error_expand:
-	if (net_ratelimit())
-		printk("%s: failed to expand/update skb for the switch\n", dev->name);
-
-error:
-	/* any errors? drop the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-static int
-mvswitch_mangle_rx(struct sk_buff *skb, int napi)
-{
-	struct mvswitch_priv *priv;
-	struct net_device *dev;
-	int vlan = -1;
-	unsigned char *buf;
-	int i;
-
-	dev = skb->dev;
-	if (!dev)
-		goto error;
-
-	priv = dev->phy_ptr;
-	if (!priv)
-		goto error;
-
-	if (!priv->grp)
-		goto error;
-
-#ifdef HEADER_MODE
-	buf = skb->data;
-	skb_pull(skb, MV_HEADER_SIZE);
-#else
-	buf = skb->data + skb->len - MV_TRAILER_SIZE;
-	if (buf[0] != 0x80)
-		goto error;
-#endif
-
-	/* look for the vlan matching the incoming port */
-	for (i = 0; i < ARRAY_SIZE(priv->vlans); i++) {
-		if ((1 << buf[1]) & priv->vlans[i])
-			vlan = i;
-	}
-
-	if (vlan == -1)
-		goto error;
-
-	skb->protocol = eth_type_trans(skb, skb->dev);
-
-	if (napi)
-		return vlan_hwaccel_receive_skb(skb, priv->grp, vlan);
-	else
-		return vlan_hwaccel_rx(skb, priv->grp, vlan);
-
-error:
-	/* no vlan? eat the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-
-static int
-mvswitch_netif_rx(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 0);
-}
-
-static int
-mvswitch_netif_receive_skb(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 1);
-}
-
-
-static void
-mvswitch_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-	struct mvswitch_priv *priv = dev->phy_ptr;
-	priv->grp = grp;
-}
-
-
-static int
-mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
-{
-	int i = 100;
-	u16 r;
-
-	do {
-		r = r16(pdev, addr, reg) & mask;
-		if (r == val)
-			return 0;
-	} while(--i > 0);
-	return -ETIMEDOUT;
-}
-
-static int
-mvswitch_config_init(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-	u8 vlmap = 0;
-	int i;
-
-	if (!dev)
-		return -EINVAL;
-
-	printk("%s: Marvell 88E6060 PHY driver attached.\n", dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-	dev->phy_ptr = priv;
-	dev->irq = PHY_POLL;
-#ifdef HEADER_MODE
-	dev->flags |= IFF_PROMISC;
-#endif
-
-	/* initialize default vlans */
-	for (i = 0; i < MV_PORTS; i++)
-		priv->vlans[(i == MV_WANPORT ? 2 : 1)] |= (1 << i);
-
-	/* before entering reset, disable all ports */
-	for (i = 0; i < MV_PORTS; i++)
-		w16(pdev, MV_PORTREG(CONTROL, i), 0x00);
-
-	msleep(2); /* wait for the status change to settle in */
-
-	/* put the ATU in reset */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET);
-
-	i = mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET, 0);
-	if (i < 0) {
-		printk("%s: Timeout waiting for the switch to reset.\n", dev->name);
-		return i;
-	}
-
-	/* set the ATU flags */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL),
-		MV_ATUCTL_NO_LEARN |
-		MV_ATUCTL_ATU_1K |
-		MV_ATUCTL_AGETIME(MV_ATUCTL_AGETIME_MIN) /* minimum without disabling ageing */
-	);
-
-	/* initialize the cpu port */
-	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
-#ifdef HEADER_MODE
-		MV_PORTCTRL_HEADER |
-#else
-		MV_PORTCTRL_RXTR |
-		MV_PORTCTRL_TXTR |
-#endif
-		MV_PORTCTRL_ENABLED
-	);
-	/* wait for the phy change to settle in */
-	msleep(2);
-	for (i = 0; i < MV_PORTS; i++) {
-		u8 pvid = 0;
-		int j;
-
-		vlmap = 0;
-
-		/* look for the matching vlan */
-		for (j = 0; j < ARRAY_SIZE(priv->vlans); j++) {
-			if (priv->vlans[j] & (1 << i)) {
-				vlmap = priv->vlans[j];
-				pvid = j;
-			}
-		}
-		/* leave port unconfigured if it's not part of a vlan */
-		if (!vlmap)
-			continue;
-
-		/* add the cpu port to the allowed destinations list */
-		vlmap |= (1 << MV_CPUPORT);
-
-		/* take port out of its own vlan destination map */
-		vlmap &= ~(1 << i);
-
-		/* apply vlan settings */
-		w16(pdev, MV_PORTREG(VLANMAP, i),
-			MV_PORTVLAN_PORTS(vlmap) |
-			MV_PORTVLAN_ID(i)
-		);
-
-		/* re-enable port */
-		w16(pdev, MV_PORTREG(CONTROL, i),
-			MV_PORTCTRL_ENABLED
-		);
-	}
-
-	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
-		MV_PORTVLAN_ID(MV_CPUPORT)
-	);
-
-	/* set the port association vector */
-	for (i = 0; i <= MV_PORTS; i++) {
-		w16(pdev, MV_PORTREG(ASSOC, i),
-			MV_PORTASSOC_PORTS(1 << i)
-		);
-	}
-
-	/* init switch control */
-	w16(pdev, MV_SWITCHREG(CTRL),
-		MV_SWITCHCTL_MSIZE |
-		MV_SWITCHCTL_DROP
-	);
-
-	/* hook into the tx function */
-	priv->ndo_old = dev->netdev_ops;
-	memcpy(&priv->ndo, priv->ndo_old, sizeof(struct net_device_ops));
-	priv->ndo.ndo_start_xmit = mvswitch_mangle_tx;
-	priv->ndo.ndo_vlan_rx_register = mvswitch_vlan_rx_register;
-	dev->netdev_ops = &priv->ndo;
-
-	pdev->pkt_align = 2;
-	pdev->netif_receive_skb = mvswitch_netif_receive_skb;
-	pdev->netif_rx = mvswitch_netif_rx;
-#ifdef HEADER_MODE
-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
-#else
-	dev->features |= NETIF_F_HW_VLAN_RX;
-#endif
-
-	return 0;
-}
-
-static int
-mvswitch_read_status(struct phy_device *pdev)
-{
-	pdev->speed = SPEED_100;
-	pdev->duplex = DUPLEX_FULL;
-	pdev->link = 1;
-
-	/* XXX ugly workaround: we can't force the switch
-	 * to gracefully handle hosts moving from one port to another,
-	 * so we have to regularly clear the ATU database */
-
-	/* wait for the ATU to become available */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	/* flush the ATU */
-	w16(pdev, MV_SWITCHREG(ATU_OP),
-		MV_ATUOP_INPROGRESS |
-		MV_ATUOP_FLUSH_ALL
-	);
-
-	/* wait for operation to complete */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	return 0;
-}
-
-static int
-mvswitch_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static void
-mvswitch_remove(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-
-	/* restore old netdev ops */
-	if (priv->ndo_old && dev)
-		dev->netdev_ops = priv->ndo_old;
-	dev->phy_ptr = NULL;
-	dev->features &= ~NETIF_F_HW_VLAN_RX;
-	kfree(priv);
-}
-
-static int
-mvswitch_probe(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv;
-
-	priv = kzalloc(sizeof(struct mvswitch_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	pdev->priv = priv;
-
-	return 0;
-}
-
-static int
-mvswitch_fixup(struct phy_device *dev)
-{
-	u16 reg;
-
-	if (dev->addr != 0x10)
-		return 0;
-
-	reg = dev->bus->read(dev->bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
-	if (reg != MV_IDENT_VALUE)
-		return 0;
-
-	dev->phy_id = MVSWITCH_MAGIC;
-	return 0;
-}
-
-
-static struct phy_driver mvswitch_driver = {
-	.name		= "Marvell 88E6060",
-	.phy_id		= MVSWITCH_MAGIC,
-	.phy_id_mask	= 0xffffffff,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= &mvswitch_probe,
-	.remove		= &mvswitch_remove,
-	.config_init	= &mvswitch_config_init,
-	.config_aneg	= &mvswitch_config_aneg,
-	.read_status	= &mvswitch_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init
-mvswitch_init(void)
-{
-	phy_register_fixup_for_id(PHY_ANY_ID, mvswitch_fixup);
-	return phy_driver_register(&mvswitch_driver);
-}
-
-static void __exit
-mvswitch_exit(void)
-{
-	phy_driver_unregister(&mvswitch_driver);
-}
-
-module_init(mvswitch_init);
-module_exit(mvswitch_exit);
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.h b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.h
deleted file mode 100644
index 1563eec4d5..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __MVSWITCH_H
-#define __MVSWITCH_H
-
-#define MV_HEADER_SIZE	2
-#define MV_HEADER_PORTS_M	0x001f
-#define MV_HEADER_PORTS_S	0
-#define MV_HEADER_VLAN_M	0xf000
-#define MV_HEADER_VLAN_S	12
-
-#define MV_TRAILER_SIZE	4
-#define MV_TRAILER_PORTS_M	0x1f
-#define MV_TRAILER_PORTS_S	16
-#define MV_TRAILER_FLAGS_S	24
-#define MV_TRAILER_OVERRIDE	0x80
-
-
-#define MV_PORTS	5
-#define MV_WANPORT	4
-#define MV_CPUPORT	5
-
-#define MV_BASE		0x10
-
-#define MV_PHYPORT_BASE		(MV_BASE + 0x0)
-#define MV_PHYPORT(_n)		(MV_PHYPORT_BASE + (_n))
-#define MV_SWITCHPORT_BASE	(MV_BASE + 0x8)
-#define MV_SWITCHPORT(_n)	(MV_SWITCHPORT_BASE + (_n))
-#define MV_SWITCHREGS		(MV_BASE + 0xf)
-
-enum {
-	MV_PHY_CONTROL      = 0x00,
-	MV_PHY_STATUS       = 0x01,
-	MV_PHY_IDENT0       = 0x02,
-	MV_PHY_IDENT1       = 0x03,
-	MV_PHY_ANEG         = 0x04,
-	MV_PHY_LINK_ABILITY = 0x05,
-	MV_PHY_ANEG_EXPAND  = 0x06,
-	MV_PHY_XMIT_NEXTP   = 0x07,
-	MV_PHY_LINK_NEXTP   = 0x08,
-	MV_PHY_CONTROL1     = 0x10,
-	MV_PHY_STATUS1      = 0x11,
-	MV_PHY_INTR_EN      = 0x12,
-	MV_PHY_INTR_STATUS  = 0x13,
-	MV_PHY_INTR_PORT    = 0x14,
-	MV_PHY_RECV_COUNTER = 0x16,
-	MV_PHY_LED_PARALLEL = 0x16,
-	MV_PHY_LED_STREAM   = 0x17,
-	MV_PHY_LED_CTRL     = 0x18,
-	MV_PHY_LED_OVERRIDE = 0x19,
-	MV_PHY_VCT_CTRL     = 0x1a,
-	MV_PHY_VCT_STATUS   = 0x1b,
-	MV_PHY_CONTROL2     = 0x1e
-};
-#define MV_PHYREG(_type, _port) MV_PHYPORT(_port), MV_PHY_##_type
-
-enum {
-	MV_PORT_STATUS      = 0x00,
-	MV_PORT_IDENT       = 0x03,
-	MV_PORT_CONTROL     = 0x04,
-	MV_PORT_VLANMAP     = 0x06,
-	MV_PORT_ASSOC       = 0x0b,
-	MV_PORT_RXCOUNT     = 0x10,
-	MV_PORT_TXCOUNT     = 0x11,
-};
-#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
-
-enum {
-	MV_PORTCTRL_BLOCK   =  (1 << 0),
-	MV_PORTCTRL_LEARN   =  (2 << 0),
-	MV_PORTCTRL_ENABLED =  (3 << 0),
-	MV_PORTCTRL_VLANTUN =  (1 << 7),	/* Enforce VLANs on packets */
-	MV_PORTCTRL_RXTR    =  (1 << 8),	/* Enable Marvell packet trailer for ingress */
-	MV_PORTCTRL_HEADER	= (1 << 11),	/* Enable Marvell packet header mode for port */
-	MV_PORTCTRL_TXTR    = (1 << 14),	/* Enable Marvell packet trailer for egress */
-	MV_PORTCTRL_FORCEFL = (1 << 15),	/* force flow control */
-};
-
-#define MV_PORTVLAN_ID(_n) (((_n) & 0xf) << 12)
-#define MV_PORTVLAN_PORTS(_n) ((_n) & 0x3f)
-
-#define MV_PORTASSOC_PORTS(_n) ((_n) & 0x1f)
-#define MV_PORTASSOC_MONITOR	(1 << 15)
-
-enum {
-	MV_SWITCH_MAC0      = 0x01,
-	MV_SWITCH_MAC1      = 0x02,
-	MV_SWITCH_MAC2      = 0x03,
-	MV_SWITCH_CTRL      = 0x04,
-	MV_SWITCH_ATU_CTRL  = 0x0a,
-	MV_SWITCH_ATU_OP    = 0x0b,
-	MV_SWITCH_ATU_DATA  = 0x0c,
-	MV_SWITCH_ATU_MAC0  = 0x0d,
-	MV_SWITCH_ATU_MAC1  = 0x0e,
-	MV_SWITCH_ATU_MAC2  = 0x0f,
-};
-#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
-
-enum {
-	MV_SWITCHCTL_EEIE   =  (1 << 0),	/* EEPROM interrupt enable */
-	MV_SWITCHCTL_PHYIE  =  (1 << 1),	/* PHY interrupt enable */
-	MV_SWITCHCTL_ATUDONE=  (1 << 2),	/* ATU done interrupt enable */
-	MV_SWITCHCTL_ATUIE  =  (1 << 3),	/* ATU interrupt enable */
-	MV_SWITCHCTL_CTRMODE=  (1 << 8),	/* statistics for rx and tx errors */
-	MV_SWITCHCTL_RELOAD =  (1 << 9),	/* reload registers from eeprom */
-	MV_SWITCHCTL_MSIZE  = (1 << 10),	/* increase maximum frame size */
-	MV_SWITCHCTL_DROP   = (1 << 13),	/* discard frames with excessive collisions */
-};
-
-enum {
-#define MV_ATUCTL_AGETIME_MIN	16
-#define MV_ATUCTL_AGETIME_MAX	4080
-#define MV_ATUCTL_AGETIME(_n)	((((_n) / 16) & 0xff) << 4)
-	MV_ATUCTL_ATU_256   = (0 << 12),
-	MV_ATUCTL_ATU_512   = (1 << 12),
-	MV_ATUCTL_ATU_1K	= (2 << 12),
-	MV_ATUCTL_ATUMASK   = (3 << 12),
-	MV_ATUCTL_NO_LEARN  = (1 << 14),
-	MV_ATUCTL_RESET     = (1 << 15),
-};
-
-enum {
-#define MV_ATUOP_DBNUM(_n)	((_n) & 0x0f)
-
-	MV_ATUOP_NOOP       = (0 << 12),
-	MV_ATUOP_FLUSH_ALL  = (1 << 12),
-	MV_ATUOP_FLUSH_U    = (2 << 12),
-	MV_ATUOP_LOAD_DB    = (3 << 12),
-	MV_ATUOP_GET_NEXT   = (4 << 12),
-	MV_ATUOP_FLUSH_DB   = (5 << 12),
-	MV_ATUOP_FLUSH_DB_UU= (6 << 12),
-
-	MV_ATUOP_INPROGRESS = (1 << 15),
-};
-
-#define MV_IDENT_MASK		0xfff0
-#define MV_IDENT_VALUE		0x0600
-
-#endif
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
deleted file mode 100644
index 901b5b2f83..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*
- * rtl8306.c: RTL8306S switch driver
- *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/if.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/if_ether.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/netlink.h>
-#include <net/genetlink.h>
-#include <linux/switch.h>
-#include <linux/delay.h>
-#include <linux/phy.h>
-
-//#define DEBUG 1
-
-/* Global (PHY0) */
-#define RTL8306_REG_PAGE		16
-#define RTL8306_REG_PAGE_LO		(1 << 15)
-#define RTL8306_REG_PAGE_HI		(1 << 1) /* inverted */
-
-#define RTL8306_NUM_VLANS		16
-#define RTL8306_NUM_PORTS		6
-#define RTL8306_PORT_CPU		5
-#define RTL8306_NUM_PAGES		4
-#define RTL8306_NUM_REGS		32
-
-#define RTL_NAME_S          "RTL8306S"
-#define RTL_NAME_SD         "RTL8306SD"
-#define RTL_NAME_SDM        "RTL8306SDM"
-#define RTL_NAME_UNKNOWN    "RTL8306(unknown)"
-
-#define RTL8306_MAGIC	0x8306
-
-static LIST_HEAD(phydevs);
-
-struct rtl_priv {
-	struct list_head list;
-	struct switch_dev dev;
-	int page;
-	int type;
-	int do_cpu;
-	struct mii_bus *bus;
-	char hwname[sizeof(RTL_NAME_UNKNOWN)];
-};
-
-struct rtl_phyregs {
-	int nway;
-	int speed;
-	int duplex;
-};
-
-#define to_rtl(_dev) container_of(_dev, struct rtl_priv, dev)
-
-enum {
-	RTL_TYPE_S,
-	RTL_TYPE_SD,
-	RTL_TYPE_SDM,
-};
-
-struct rtl_reg {
-	int page;
-	int phy;
-	int reg;
-	int bits;
-	int shift;
-	int inverted;
-};
-
-#define RTL_VLAN_REGOFS(name) \
-	(RTL_REG_VLAN1_##name - RTL_REG_VLAN0_##name)
-
-#define RTL_PORT_REGOFS(name) \
-	(RTL_REG_PORT1_##name - RTL_REG_PORT0_##name)
-
-#define RTL_PORT_REG(id, reg) \
-	(RTL_REG_PORT0_##reg + (id * RTL_PORT_REGOFS(reg)))
-
-#define RTL_VLAN_REG(id, reg) \
-	(RTL_REG_VLAN0_##reg + (id * RTL_VLAN_REGOFS(reg)))
-
-#define RTL_GLOBAL_REGATTR(reg) \
-	.id = RTL_REG_##reg, \
-	.type = SWITCH_TYPE_INT, \
-	.ofs = 0, \
-	.set = rtl_attr_set_int, \
-	.get = rtl_attr_get_int
-
-#define RTL_PORT_REGATTR(reg) \
-	.id = RTL_REG_PORT0_##reg, \
-	.type = SWITCH_TYPE_INT, \
-	.ofs = RTL_PORT_REGOFS(reg), \
-	.set = rtl_attr_set_port_int, \
-	.get = rtl_attr_get_port_int
-
-#define RTL_VLAN_REGATTR(reg) \
-	.id = RTL_REG_VLAN0_##reg, \
-	.type = SWITCH_TYPE_INT, \
-	.ofs = RTL_VLAN_REGOFS(reg), \
-	.set = rtl_attr_set_vlan_int, \
-	.get = rtl_attr_get_vlan_int
-
-enum rtl_regidx {
-	RTL_REG_CHIPID,
-	RTL_REG_CHIPVER,
-	RTL_REG_CHIPTYPE,
-	RTL_REG_CPUPORT,
-
-	RTL_REG_EN_CPUPORT,
-	RTL_REG_EN_TAG_OUT,
-	RTL_REG_EN_TAG_CLR,
-	RTL_REG_EN_TAG_IN,
-	RTL_REG_TRAP_CPU,
-	RTL_REG_TRUNK_PORTSEL,
-	RTL_REG_EN_TRUNK,
-	RTL_REG_RESET,
-
-	RTL_REG_VLAN_ENABLE,
-	RTL_REG_VLAN_FILTER,
-	RTL_REG_VLAN_TAG_ONLY,
-	RTL_REG_VLAN_TAG_AWARE,
-#define RTL_VLAN_ENUM(id) \
-	RTL_REG_VLAN##id##_VID, \
-	RTL_REG_VLAN##id##_PORTMASK
-	RTL_VLAN_ENUM(0),
-	RTL_VLAN_ENUM(1),
-	RTL_VLAN_ENUM(2),
-	RTL_VLAN_ENUM(3),
-	RTL_VLAN_ENUM(4),
-	RTL_VLAN_ENUM(5),
-	RTL_VLAN_ENUM(6),
-	RTL_VLAN_ENUM(7),
-	RTL_VLAN_ENUM(8),
-	RTL_VLAN_ENUM(9),
-	RTL_VLAN_ENUM(10),
-	RTL_VLAN_ENUM(11),
-	RTL_VLAN_ENUM(12),
-	RTL_VLAN_ENUM(13),
-	RTL_VLAN_ENUM(14),
-	RTL_VLAN_ENUM(15),
-#define RTL_PORT_ENUM(id) \
-	RTL_REG_PORT##id##_PVID, \
-	RTL_REG_PORT##id##_NULL_VID_REPLACE, \
-	RTL_REG_PORT##id##_NON_PVID_DISCARD, \
-	RTL_REG_PORT##id##_VID_INSERT, \
-	RTL_REG_PORT##id##_TAG_INSERT, \
-	RTL_REG_PORT##id##_LINK, \
-	RTL_REG_PORT##id##_SPEED, \
-	RTL_REG_PORT##id##_NWAY, \
-	RTL_REG_PORT##id##_NRESTART, \
-	RTL_REG_PORT##id##_DUPLEX, \
-	RTL_REG_PORT##id##_RXEN, \
-	RTL_REG_PORT##id##_TXEN
-	RTL_PORT_ENUM(0),
-	RTL_PORT_ENUM(1),
-	RTL_PORT_ENUM(2),
-	RTL_PORT_ENUM(3),
-	RTL_PORT_ENUM(4),
-	RTL_PORT_ENUM(5),
-};
-
-static const struct rtl_reg rtl_regs[] = {
-	[RTL_REG_CHIPID]         = { 0, 4, 30, 16,  0, 0 },
-	[RTL_REG_CHIPVER]        = { 0, 4, 31,  8,  0, 0 },
-	[RTL_REG_CHIPTYPE]       = { 0, 4, 31,  2,  8, 0 },
-
-	/* CPU port number */
-	[RTL_REG_CPUPORT]        = { 2, 4, 21,  3,  0, 0 },
-	/* Enable CPU port function */
-	[RTL_REG_EN_CPUPORT]     = { 3, 2, 21,  1, 15, 1 },
-	/* Enable CPU port tag insertion */
-	[RTL_REG_EN_TAG_OUT]     = { 3, 2, 21,  1, 12, 0 },
-	/* Enable CPU port tag removal */
-	[RTL_REG_EN_TAG_CLR]     = { 3, 2, 21,  1, 11, 0 },
-	/* Enable CPU port tag checking */
-	[RTL_REG_EN_TAG_IN]      = { 0, 4, 21,  1,  7, 0 },
-	[RTL_REG_EN_TRUNK]       = { 0, 0, 19,  1, 11, 1 },
-	[RTL_REG_TRUNK_PORTSEL]  = { 0, 0, 16,  1,  6, 1 },
-	[RTL_REG_RESET]          = { 0, 0, 16,  1, 12, 0 },
-
-	[RTL_REG_TRAP_CPU]       = { 3, 2, 22,  1,  6, 0 },
-
-	[RTL_REG_VLAN_TAG_ONLY]  = { 0, 0, 16,  1,  8, 1 },
-	[RTL_REG_VLAN_FILTER]    = { 0, 0, 16,  1,  9, 1 },
-	[RTL_REG_VLAN_TAG_AWARE] = { 0, 0, 16,  1, 10, 1 },
-	[RTL_REG_VLAN_ENABLE]    = { 0, 0, 18,  1,  8, 1 },
-
-#define RTL_VLAN_REGS(id, phy, page, regofs) \
-	[RTL_REG_VLAN##id##_VID] = { page, phy, 25 + regofs, 12, 0, 0 }, \
-	[RTL_REG_VLAN##id##_PORTMASK] = { page, phy, 24 + regofs, 6, 0, 0 }
-	RTL_VLAN_REGS( 0, 0, 0, 0),
-	RTL_VLAN_REGS( 1, 1, 0, 0),
-	RTL_VLAN_REGS( 2, 2, 0, 0),
-	RTL_VLAN_REGS( 3, 3, 0, 0),
-	RTL_VLAN_REGS( 4, 4, 0, 0),
-	RTL_VLAN_REGS( 5, 0, 1, 2),
-	RTL_VLAN_REGS( 6, 1, 1, 2),
-	RTL_VLAN_REGS( 7, 2, 1, 2),
-	RTL_VLAN_REGS( 8, 3, 1, 2),
-	RTL_VLAN_REGS( 9, 4, 1, 2),
-	RTL_VLAN_REGS(10, 0, 1, 4),
-	RTL_VLAN_REGS(11, 1, 1, 4),
-	RTL_VLAN_REGS(12, 2, 1, 4),
-	RTL_VLAN_REGS(13, 3, 1, 4),
-	RTL_VLAN_REGS(14, 4, 1, 4),
-	RTL_VLAN_REGS(15, 0, 1, 6),
-
-#define REG_PORT_SETTING(port, phy) \
-	[RTL_REG_PORT##port##_SPEED] = { 0, phy, 0, 1, 13, 0 }, \
-	[RTL_REG_PORT##port##_NWAY] = { 0, phy, 0, 1, 12, 0 }, \
-	[RTL_REG_PORT##port##_NRESTART] = { 0, phy, 0, 1, 9, 0 }, \
-	[RTL_REG_PORT##port##_DUPLEX] = { 0, phy, 0, 1, 8, 0 }, \
-	[RTL_REG_PORT##port##_TXEN] = { 0, phy, 24, 1, 11, 0 }, \
-	[RTL_REG_PORT##port##_RXEN] = { 0, phy, 24, 1, 10, 0 }, \
-	[RTL_REG_PORT##port##_LINK] = { 0, phy, 1, 1, 2, 0 }, \
-	[RTL_REG_PORT##port##_NULL_VID_REPLACE] = { 0, phy, 22, 1, 12, 0 }, \
-	[RTL_REG_PORT##port##_NON_PVID_DISCARD] = { 0, phy, 22, 1, 11, 0 }, \
-	[RTL_REG_PORT##port##_VID_INSERT] = { 0, phy, 22, 2, 9, 0 }, \
-	[RTL_REG_PORT##port##_TAG_INSERT] = { 0, phy, 22, 2, 0, 0 }
-
-	REG_PORT_SETTING(0, 0),
-	REG_PORT_SETTING(1, 1),
-	REG_PORT_SETTING(2, 2),
-	REG_PORT_SETTING(3, 3),
-	REG_PORT_SETTING(4, 4),
-	REG_PORT_SETTING(5, 6),
-
-#define REG_PORT_PVID(phy, page, regofs) \
-	{ page, phy, 24 + regofs, 4, 12, 0 }
-	[RTL_REG_PORT0_PVID] = REG_PORT_PVID(0, 0, 0),
-	[RTL_REG_PORT1_PVID] = REG_PORT_PVID(1, 0, 0),
-	[RTL_REG_PORT2_PVID] = REG_PORT_PVID(2, 0, 0),
-	[RTL_REG_PORT3_PVID] = REG_PORT_PVID(3, 0, 0),
-	[RTL_REG_PORT4_PVID] = REG_PORT_PVID(4, 0, 0),
-	[RTL_REG_PORT5_PVID] = REG_PORT_PVID(0, 1, 2),
-};
-
-
-/* IFXMIPS compat stuff - remove after PHY layer migration */
-static struct switch_dev rtldev;
-/* END IFXMIPS compat stuff */
-
-
-static inline void
-rtl_set_page(struct rtl_priv *priv, unsigned int page)
-{
-	struct mii_bus *bus = priv->bus;
-	u16 pgsel;
-
-	if (priv->page == page)
-		return;
-
-	BUG_ON(page > RTL8306_NUM_PAGES);
-	pgsel = bus->read(bus, 0, RTL8306_REG_PAGE);
-	pgsel &= ~(RTL8306_REG_PAGE_LO | RTL8306_REG_PAGE_HI);
-	if (page & (1 << 0))
-		pgsel |= RTL8306_REG_PAGE_LO;
-	if (!(page & (1 << 1))) /* bit is inverted */
-		pgsel |= RTL8306_REG_PAGE_HI;
-	bus->write(bus, 0, RTL8306_REG_PAGE, pgsel);
-}
-
-static inline int
-rtl_w16(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg, u16 val)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	struct mii_bus *bus = priv->bus;
-
-	rtl_set_page(priv, page);
-	bus->write(bus, phy, reg, val);
-	bus->read(bus, phy, reg); /* flush */
-	return 0;
-}
-
-static inline int
-rtl_r16(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	struct mii_bus *bus = priv->bus;
-
-	rtl_set_page(priv, page);
-	return bus->read(bus, phy, reg);
-}
-
-static inline u16
-rtl_rmw(struct switch_dev *dev, unsigned int page, unsigned int phy, unsigned int reg, u16 mask, u16 val)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	struct mii_bus *bus = priv->bus;
-	u16 r;
-
-	rtl_set_page(priv, page);
-	r = bus->read(bus, phy, reg);
-	r &= ~mask;
-	r |= val;
-	bus->write(bus, phy, reg, r);
-	return bus->read(bus, phy, reg); /* flush */
-}
-
-
-static inline int
-rtl_get(struct switch_dev *dev, enum rtl_regidx s)
-{
-	const struct rtl_reg *r = &rtl_regs[s];
-	u16 val;
-
-	BUG_ON(s >= ARRAY_SIZE(rtl_regs));
-	if (r->bits == 0) /* unimplemented */
-		return 0;
-
-	val = rtl_r16(dev, r->page, r->phy, r->reg);
-
-	if (r->shift > 0)
-		val >>= r->shift;
-
-	if (r->inverted)
-		val = ~val;
-
-	val &= (1 << r->bits) - 1;
-
-	return val;
-}
-
-static int
-rtl_set(struct switch_dev *dev, enum rtl_regidx s, unsigned int val)
-{
-	const struct rtl_reg *r = &rtl_regs[s];
-	u16 mask = 0xffff;
-
-	BUG_ON(s >= ARRAY_SIZE(rtl_regs));
-
-	if (r->bits == 0) /* unimplemented */
-		return 0;
-
-	if (r->shift > 0)
-		val <<= r->shift;
-
-	if (r->inverted)
-		val = ~val;
-
-	if (r->bits != 16) {
-		mask = (1 << r->bits) - 1;
-		mask <<= r->shift;
-	}
-	val &= mask;
-	return rtl_rmw(dev, r->page, r->phy, r->reg, mask, val);
-}
-
-static void
-rtl_phy_save(struct switch_dev *dev, int port, struct rtl_phyregs *regs)
-{
-	regs->nway = rtl_get(dev, RTL_PORT_REG(port, NWAY));
-	regs->speed = rtl_get(dev, RTL_PORT_REG(port, SPEED));
-	regs->duplex = rtl_get(dev, RTL_PORT_REG(port, DUPLEX));
-}
-
-static void
-rtl_phy_restore(struct switch_dev *dev, int port, struct rtl_phyregs *regs)
-{
-	rtl_set(dev, RTL_PORT_REG(port, NWAY), regs->nway);
-	rtl_set(dev, RTL_PORT_REG(port, SPEED), regs->speed);
-	rtl_set(dev, RTL_PORT_REG(port, DUPLEX), regs->duplex);
-}
-
-static void
-rtl_port_set_enable(struct switch_dev *dev, int port, int enabled)
-{
-	rtl_set(dev, RTL_PORT_REG(port, RXEN), enabled);
-	rtl_set(dev, RTL_PORT_REG(port, TXEN), enabled);
-
-	if ((port >= 5) || !enabled)
-		return;
-
-	/* restart autonegotiation if enabled */
-	rtl_set(dev, RTL_PORT_REG(port, NRESTART), 1);
-}
-
-static int
-rtl_hw_apply(struct switch_dev *dev)
-{
-	int i;
-	int trunk_en, trunk_psel;
-	struct rtl_phyregs port5;
-
-	rtl_phy_save(dev, 5, &port5);
-
-	/* disable rx/tx from PHYs */
-	for (i = 0; i < RTL8306_NUM_PORTS - 1; i++) {
-		rtl_port_set_enable(dev, i, 0);
-	}
-
-	/* save trunking status */
-	trunk_en = rtl_get(dev, RTL_REG_EN_TRUNK);
-	trunk_psel = rtl_get(dev, RTL_REG_TRUNK_PORTSEL);
-
-	/* trunk port 3 and 4
-	 * XXX: Big WTF, but RealTek seems to do it */
-	rtl_set(dev, RTL_REG_EN_TRUNK, 1);
-	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, 1);
-
-	/* execute the software reset */
-	rtl_set(dev, RTL_REG_RESET, 1);
-
-	/* wait for the reset to complete,
-	 * but don't wait for too long */
-	for (i = 0; i < 10; i++) {
-		if (rtl_get(dev, RTL_REG_RESET) == 0)
-			break;
-
-		msleep(1);
-	}
-
-	/* enable rx/tx from PHYs */
-	for (i = 0; i < RTL8306_NUM_PORTS - 1; i++) {
-		rtl_port_set_enable(dev, i, 1);
-	}
-
-	/* restore trunking settings */
-	rtl_set(dev, RTL_REG_EN_TRUNK, trunk_en);
-	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, trunk_psel);
-	rtl_phy_restore(dev, 5, &port5);
-
-	return 0;
-}
-
-static void
-rtl_hw_init(struct switch_dev *dev)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	int cpu_mask = 1 << dev->cpu_port;
-	int i;
-
-	rtl_set(dev, RTL_REG_VLAN_ENABLE, 0);
-	rtl_set(dev, RTL_REG_VLAN_FILTER, 0);
-	rtl_set(dev, RTL_REG_EN_TRUNK, 0);
-	rtl_set(dev, RTL_REG_TRUNK_PORTSEL, 0);
-
-	/* initialize cpu port settings */
-	if (priv->do_cpu) {
-		rtl_set(dev, RTL_REG_CPUPORT, dev->cpu_port);
-		rtl_set(dev, RTL_REG_EN_CPUPORT, 1);
-	} else {
-		rtl_set(dev, RTL_REG_CPUPORT, 7);
-		rtl_set(dev, RTL_REG_EN_CPUPORT, 0);
-	}
-	rtl_set(dev, RTL_REG_EN_TAG_OUT, 0);
-	rtl_set(dev, RTL_REG_EN_TAG_IN, 0);
-	rtl_set(dev, RTL_REG_EN_TAG_CLR, 0);
-
-	/* reset all vlans */
-	for (i = 0; i < RTL8306_NUM_VLANS; i++) {
-		rtl_set(dev, RTL_VLAN_REG(i, VID), i);
-		rtl_set(dev, RTL_VLAN_REG(i, PORTMASK), 0);
-	}
-
-	/* default to port isolation */
-	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
-		unsigned long mask;
-
-		if ((1 << i) == cpu_mask)
-			mask = ((1 << RTL8306_NUM_PORTS) - 1) & ~cpu_mask; /* all bits set */
-		else
-			mask = cpu_mask | (1 << i);
-
-		rtl_set(dev, RTL_VLAN_REG(i, PORTMASK), mask);
-		rtl_set(dev, RTL_PORT_REG(i, PVID), i);
-		rtl_set(dev, RTL_PORT_REG(i, NULL_VID_REPLACE), 1);
-		rtl_set(dev, RTL_PORT_REG(i, VID_INSERT), 1);
-		rtl_set(dev, RTL_PORT_REG(i, TAG_INSERT), 3);
-	}
-	rtl_hw_apply(dev);
-}
-
-#ifdef DEBUG
-static int
-rtl_set_use_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	priv->do_cpu = val->value.i;
-	rtl_hw_init(dev);
-	return 0;
-}
-
-static int
-rtl_get_use_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	val->value.i = priv->do_cpu;
-	return 0;
-}
-
-static int
-rtl_set_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	dev->cpu_port = val->value.i;
-	rtl_hw_init(dev);
-	return 0;
-}
-
-static int
-rtl_get_cpuport(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	val->value.i = dev->cpu_port;
-	return 0;
-}
-#endif
-
-static int
-rtl_reset(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	rtl_hw_init(dev);
-	return 0;
-}
-
-static int
-rtl_attr_set_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	int idx = attr->id + (val->port_vlan * attr->ofs);
-	struct rtl_phyregs port;
-
-	if (attr->id >= ARRAY_SIZE(rtl_regs))
-		return -EINVAL;
-
-	if ((attr->max > 0) && (val->value.i > attr->max))
-		return -EINVAL;
-
-	/* access to phy register 22 on port 4/5
-	 * needs phy status save/restore */
-	if ((val->port_vlan > 3) &&
-		(rtl_regs[idx].reg == 22) &&
-		(rtl_regs[idx].page == 0)) {
-
-		rtl_phy_save(dev, val->port_vlan, &port);
-		rtl_set(dev, idx, val->value.i);
-		rtl_phy_restore(dev, val->port_vlan, &port);
-	} else {
-		rtl_set(dev, idx, val->value.i);
-	}
-
-	return 0;
-}
-
-static int
-rtl_attr_get_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	int idx = attr->id + (val->port_vlan * attr->ofs);
-
-	if (idx >= ARRAY_SIZE(rtl_regs))
-		return -EINVAL;
-
-	val->value.i = rtl_get(dev, idx);
-	return 0;
-}
-
-static int
-rtl_attr_set_port_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= RTL8306_NUM_PORTS)
-		return -EINVAL;
-
-	return rtl_attr_set_int(dev, attr, val);
-}
-
-static int
-rtl_attr_get_port_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= RTL8306_NUM_PORTS)
-		return -EINVAL;
-	return rtl_attr_get_int(dev, attr, val);
-}
-
-static int
-rtl_attr_set_vlan_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	return rtl_attr_set_int(dev, attr, val);
-}
-
-static int
-rtl_attr_get_vlan_int(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	return rtl_attr_get_int(dev, attr, val);
-}
-
-static int
-rtl_get_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	unsigned int i, mask;
-
-	mask = rtl_get(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK));
-	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
-		struct switch_port *port;
-
-		if (!(mask & (1 << i)))
-			continue;
-
-		port = &val->value.ports[val->len];
-		port->id = i;
-		port->flags = 0;
-		val->len++;
-	}
-
-	return 0;
-}
-
-static int
-rtl_set_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct rtl_priv *priv = to_rtl(dev);
-	struct rtl_phyregs port;
-	int en = val->value.i;
-	int i;
-
-	rtl_set(dev, RTL_REG_EN_TAG_OUT, en && priv->do_cpu);
-	rtl_set(dev, RTL_REG_EN_TAG_IN, en && priv->do_cpu);
-	rtl_set(dev, RTL_REG_EN_TAG_CLR, en && priv->do_cpu);
-	rtl_set(dev, RTL_REG_VLAN_TAG_AWARE, en);
-	if (en)
-		rtl_set(dev, RTL_REG_VLAN_FILTER, en);
-
-	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
-		if (i > 3)
-			rtl_phy_save(dev, val->port_vlan, &port);
-		rtl_set(dev, RTL_PORT_REG(i, NULL_VID_REPLACE), 1);
-		rtl_set(dev, RTL_PORT_REG(i, VID_INSERT), (en ? (i == dev->cpu_port ? 0 : 1) : 1));
-		rtl_set(dev, RTL_PORT_REG(i, TAG_INSERT), (en ? (i == dev->cpu_port ? 2 : 1) : 3));
-		if (i > 3)
-			rtl_phy_restore(dev, val->port_vlan, &port);
-	}
-	rtl_set(dev, RTL_REG_VLAN_ENABLE, en);
-
-	return 0;
-}
-
-static int
-rtl_get_vlan(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	return rtl_get(dev, RTL_REG_VLAN_ENABLE);
-}
-
-static int
-rtl_set_ports(struct switch_dev *dev, struct switch_val *val)
-{
-	unsigned int mask = 0;
-	unsigned int oldmask;
-	int i;
-
-	for(i = 0; i < val->len; i++)
-	{
-		struct switch_port *port = &val->value.ports[i];
-		bool tagged = false;
-
-		mask |= (1 << port->id);
-
-		if (port->id == dev->cpu_port)
-			continue;
-
-		if ((i == dev->cpu_port) ||
-			(port->flags & (1 << SWITCH_PORT_FLAG_TAGGED)))
-			tagged = true;
-
-		/* fix up PVIDs for added ports */
-		if (!tagged)
-			rtl_set(dev, RTL_PORT_REG(port->id, PVID), val->port_vlan);
-
-		rtl_set(dev, RTL_PORT_REG(port->id, NON_PVID_DISCARD), (tagged ? 0 : 1));
-		rtl_set(dev, RTL_PORT_REG(port->id, VID_INSERT), (tagged ? 0 : 1));
-		rtl_set(dev, RTL_PORT_REG(port->id, TAG_INSERT), (tagged ? 2 : 1));
-	}
-
-	oldmask = rtl_get(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK));
-	rtl_set(dev, RTL_VLAN_REG(val->port_vlan, PORTMASK), mask);
-
-	/* fix up PVIDs for removed ports, default to last vlan */
-	oldmask &= ~mask;
-	for (i = 0; i < RTL8306_NUM_PORTS; i++) {
-		if (!(oldmask & (1 << i)))
-			continue;
-
-		if (i == dev->cpu_port)
-			continue;
-
-		if (rtl_get(dev, RTL_PORT_REG(i, PVID)) == val->port_vlan)
-			rtl_set(dev, RTL_PORT_REG(i, PVID), dev->vlans - 1);
-	}
-
-	return 0;
-}
-
-static int
-rtl8306_config_init(struct phy_device *pdev)
-{
-	struct net_device *netdev = pdev->attached_dev;
-	struct rtl_priv *priv = pdev->priv;
-	struct switch_dev *dev = &priv->dev;
-	struct switch_val val;
-	unsigned int chipid, chipver, chiptype;
-	int err;
-
-	/* Only init the switch for the primary PHY */
-	if (pdev->addr != 0)
-		return 0;
-
-	val.value.i = 1;
-	memcpy(&priv->dev, &rtldev, sizeof(struct switch_dev));
-	priv->do_cpu = 0;
-	priv->page = -1;
-	priv->bus = pdev->bus;
-
-	dev->priv = priv;
-
-	chipid = rtl_get(dev, RTL_REG_CHIPID);
-	chipver = rtl_get(dev, RTL_REG_CHIPVER);
-	chiptype = rtl_get(dev, RTL_REG_CHIPTYPE);
-	switch(chiptype) {
-	case 0:
-	case 2:
-		strncpy(priv->hwname, RTL_NAME_S, sizeof(priv->hwname));
-		priv->type = RTL_TYPE_S;
-		break;
-	case 1:
-		strncpy(priv->hwname, RTL_NAME_SD, sizeof(priv->hwname));
-		priv->type = RTL_TYPE_SD;
-		break;
-	case 3:
-		strncpy(priv->hwname, RTL_NAME_SDM, sizeof(priv->hwname));
-		priv->type = RTL_TYPE_SDM;
-		break;
-	default:
-		strncpy(priv->hwname, RTL_NAME_UNKNOWN, sizeof(priv->hwname));
-		break;
-	}
-
-	dev->name = priv->hwname;
-	rtl_hw_init(dev);
-
-	printk(KERN_INFO "Registering %s switch with Chip ID: 0x%04x, version: 0x%04x\n", priv->hwname, chipid, chipver);
-
-	err = register_switch(dev, netdev);
-	if (err < 0) {
-		kfree(priv);
-		return err;
-	}
-
-	return 0;
-}
-
-static struct switch_attr rtl_globals[] = {
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "reset",
-		.description = "Reset the switch",
-		.set = rtl_reset,
-	},
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan",
-		.description = "Enable VLAN mode",
-		.max = 1,
-		.set = rtl_set_vlan,
-		.get = rtl_get_vlan,
-	},
-	{
-		RTL_GLOBAL_REGATTR(EN_TRUNK),
-		.name = "trunk",
-		.description = "Enable port trunking",
-		.max = 1,
-	},
-	{
-		RTL_GLOBAL_REGATTR(TRUNK_PORTSEL),
-		.name = "trunk_sel",
-		.description = "Select ports for trunking (0: 0,1 - 1: 3,4)",
-		.max = 1,
-	},
-#ifdef DEBUG
-	{
-		RTL_GLOBAL_REGATTR(VLAN_FILTER),
-		.name = "vlan_filter",
-		.description = "Filter incoming packets for allowed VLANS",
-		.max = 1,
-	},
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "cpuport",
-		.description = "CPU Port",
-		.set = rtl_set_cpuport,
-		.get = rtl_get_cpuport,
-		.max = RTL8306_NUM_PORTS,
-	},
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "use_cpuport",
-		.description = "CPU Port handling flag",
-		.set = rtl_set_use_cpuport,
-		.get = rtl_get_use_cpuport,
-		.max = RTL8306_NUM_PORTS,
-	},
-	{
-		RTL_GLOBAL_REGATTR(TRAP_CPU),
-		.name = "trap_cpu",
-		.description = "VLAN trap to CPU",
-		.max = 1,
-	},
-	{
-		RTL_GLOBAL_REGATTR(VLAN_TAG_AWARE),
-		.name = "vlan_tag_aware",
-		.description = "Enable VLAN tag awareness",
-		.max = 1,
-	},
-	{
-		RTL_GLOBAL_REGATTR(VLAN_TAG_ONLY),
-		.name = "tag_only",
-		.description = "Only accept tagged packets",
-		.max = 1,
-	},
-#endif
-};
-static struct switch_attr rtl_port[] = {
-	{
-		RTL_PORT_REGATTR(PVID),
-		.name = "pvid",
-		.description = "Port VLAN ID",
-		.max = RTL8306_NUM_VLANS - 1,
-	},
-	{
-		RTL_PORT_REGATTR(LINK),
-		.name = "link",
-		.description = "get the current link state",
-		.max = 1,
-		.set = NULL,
-	},
-#ifdef DEBUG
-	{
-		RTL_PORT_REGATTR(NULL_VID_REPLACE),
-		.name = "null_vid",
-		.description = "NULL VID gets replaced by port default vid",
-		.max = 1,
-	},
-	{
-		RTL_PORT_REGATTR(NON_PVID_DISCARD),
-		.name = "non_pvid_discard",
-		.description = "discard packets with VID != PVID",
-		.max = 1,
-	},
-	{
-		RTL_PORT_REGATTR(VID_INSERT),
-		.name = "vid_insert_remove",
-		.description = "how should the switch insert and remove vids ?",
-		.max = 3,
-	},
-	{
-		RTL_PORT_REGATTR(TAG_INSERT),
-		.name = "tag_insert",
-		.description = "tag insertion handling",
-		.max = 3,
-	},
-#endif
-	{
-		RTL_PORT_REGATTR(SPEED),
-		.name = "speed",
-		.description = "current link speed",
-		.max = 1,
-	},
-	{
-		RTL_PORT_REGATTR(NWAY),
-		.name = "nway",
-		.description = "enable autonegotiation",
-		.max = 1,
-	},
-};
-
-static struct switch_attr rtl_vlan[] = {
-	{
-		RTL_VLAN_REGATTR(VID),
-		.name = "vid",
-		.description = "VLAN ID",
-		.max = 4095,
-	},
-};
-
-/* template */
-static struct switch_dev rtldev = {
-	.cpu_port = RTL8306_PORT_CPU,
-	.ports = RTL8306_NUM_PORTS,
-	.vlans = RTL8306_NUM_VLANS,
-	.attr_global = {
-		.attr = rtl_globals,
-		.n_attr = ARRAY_SIZE(rtl_globals),
-	},
-	.attr_port = {
-		.attr = rtl_port,
-		.n_attr = ARRAY_SIZE(rtl_port),
-	},
-	.attr_vlan = {
-		.attr = rtl_vlan,
-		.n_attr = ARRAY_SIZE(rtl_vlan),
-	},
-
-	.get_vlan_ports = rtl_get_ports,
-	.set_vlan_ports = rtl_set_ports,
-	.apply_config = rtl_hw_apply,
-};
-
-
-static int
-rtl8306_fixup(struct phy_device *pdev)
-{
-	struct rtl_priv priv;
-	u16 chipid;
-
-	/* Attach to primary LAN port and WAN port */
-	if (pdev->addr != 0 && pdev->addr != 4)
-		return 0;
-
-	priv.page = -1;
-	priv.bus = pdev->bus;
-	chipid = rtl_get(&priv.dev, RTL_REG_CHIPID);
-	if (chipid == 0x5988)
-		pdev->phy_id = RTL8306_MAGIC;
-
-	return 0;
-}
-
-static int
-rtl8306_probe(struct phy_device *pdev)
-{
-	struct rtl_priv *priv;
-
-	list_for_each_entry(priv, &phydevs, list) {
-		/*
-		 * share one rtl_priv instance between virtual phy
-		 * devices on the same bus
-		 */
-		if (priv->bus == pdev->bus)
-			goto found;
-	}
-	priv = kzalloc(sizeof(struct rtl_priv), GFP_KERNEL);
-	if (!priv)
-		return -ENOMEM;
-
-	priv->bus = pdev->bus;
-
-found:
-	pdev->priv = priv;
-	return 0;
-}
-
-static void
-rtl8306_remove(struct phy_device *pdev)
-{
-	struct rtl_priv *priv = pdev->priv;
-	unregister_switch(&priv->dev);
-	kfree(priv);
-}
-
-static int
-rtl8306_config_aneg(struct phy_device *pdev)
-{
-	struct rtl_priv *priv = pdev->priv;
-
-	/* Only for WAN */
-	if (pdev->addr == 0)
-		return 0;
-
-	/* Restart autonegotiation */
-	rtl_set(&priv->dev, RTL_PORT_REG(4, NWAY), 1);
-	rtl_set(&priv->dev, RTL_PORT_REG(4, NRESTART), 1);
-
-	return 0;
-}
-
-static int
-rtl8306_read_status(struct phy_device *pdev)
-{
-	struct rtl_priv *priv = pdev->priv;
-	struct switch_dev *dev = &priv->dev;
-
-	if (pdev->addr == 4) {
-		/* WAN */
-		pdev->speed = rtl_get(dev, RTL_PORT_REG(4, SPEED)) ? SPEED_100 : SPEED_10;
-		pdev->duplex = rtl_get(dev, RTL_PORT_REG(4, DUPLEX)) ? DUPLEX_FULL : DUPLEX_HALF;
-		pdev->link = !!rtl_get(dev, RTL_PORT_REG(4, LINK));
-	} else {
-		/* LAN */
-		pdev->speed = SPEED_100;
-		pdev->duplex = DUPLEX_FULL;
-		pdev->link = 1;
-	}
-
-	/*
-	 * Bypass generic PHY status read,
-	 * it doesn't work with this switch
-	 */
-	if (pdev->link) {
-		pdev->state = PHY_RUNNING;
-		netif_carrier_on(pdev->attached_dev);
-		pdev->adjust_link(pdev->attached_dev);
-	} else {
-		pdev->state = PHY_NOLINK;
-		netif_carrier_off(pdev->attached_dev);
-		pdev->adjust_link(pdev->attached_dev);
-	}
-
-	return 0;
-}
-
-
-static struct phy_driver rtl8306_driver = {
-	.name		= "Realtek RTL8306S",
-	.flags		= PHY_HAS_MAGICANEG,
-	.phy_id		= RTL8306_MAGIC,
-	.phy_id_mask	= 0xffffffff,
-	.features	= PHY_BASIC_FEATURES,
-	.probe		= &rtl8306_probe,
-	.remove		= &rtl8306_remove,
-	.config_init	= &rtl8306_config_init,
-	.config_aneg	= &rtl8306_config_aneg,
-	.read_status	= &rtl8306_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-
-static int __init
-rtl_init(void)
-{
-	phy_register_fixup_for_id(PHY_ANY_ID, rtl8306_fixup);
-	return phy_driver_register(&rtl8306_driver);
-}
-
-static void __exit
-rtl_exit(void)
-{
-	phy_driver_unregister(&rtl8306_driver);
-}
-
-module_init(rtl_init);
-module_exit(rtl_exit);
-MODULE_LICENSE("GPL");
-
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c
deleted file mode 100644
index bb2e3ba68f..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Realtek RTL8366 SMI interface driver
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/spinlock.h>
-#include <linux/skbuff.h>
-
-#include "rtl8366_smi.h"
-
-#define RTL8366_SMI_ACK_RETRY_COUNT         5
-#define RTL8366_SMI_CLK_DELAY               10 /* nsec */
-
-static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
-{
-	ndelay(RTL8366_SMI_CLK_DELAY);
-}
-
-static void rtl8366_smi_start(struct rtl8366_smi *smi)
-{
-	unsigned int sda = smi->gpio_sda;
-	unsigned int sck = smi->gpio_sck;
-
-	/*
-	 * Set GPIO pins to output mode, with initial state:
-	 * SCK = 0, SDA = 1
-	 */
-	gpio_direction_output(sck, 0);
-	gpio_direction_output(sda, 1);
-	rtl8366_smi_clk_delay(smi);
-
-	/* CLK 1: 0 -> 1, 1 -> 0 */
-	gpio_set_value(sck, 1);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 0);
-	rtl8366_smi_clk_delay(smi);
-
-	/* CLK 2: */
-	gpio_set_value(sck, 1);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sda, 0);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 0);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sda, 1);
-}
-
-static void rtl8366_smi_stop(struct rtl8366_smi *smi)
-{
-	unsigned int sda = smi->gpio_sda;
-	unsigned int sck = smi->gpio_sck;
-
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sda, 0);
-	gpio_set_value(sck, 1);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sda, 1);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 1);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 0);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 1);
-
-	/* add a click */
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 0);
-	rtl8366_smi_clk_delay(smi);
-	gpio_set_value(sck, 1);
-
-	/* set GPIO pins to input mode */
-	gpio_direction_input(sda);
-	gpio_direction_input(sck);
-}
-
-static void rtl8366_smi_write_bits(struct rtl8366_smi *smi, u32 data, u32 len)
-{
-	unsigned int sda = smi->gpio_sda;
-	unsigned int sck = smi->gpio_sck;
-
-	for (; len > 0; len--) {
-		rtl8366_smi_clk_delay(smi);
-
-		/* prepare data */
-		gpio_set_value(sda, !!(data & ( 1 << (len - 1))));
-		rtl8366_smi_clk_delay(smi);
-
-		/* clocking */
-		gpio_set_value(sck, 1);
-		rtl8366_smi_clk_delay(smi);
-		gpio_set_value(sck, 0);
-	}
-}
-
-static void rtl8366_smi_read_bits(struct rtl8366_smi *smi, u32 len, u32 *data)
-{
-	unsigned int sda = smi->gpio_sda;
-	unsigned int sck = smi->gpio_sck;
-
-	gpio_direction_input(sda);
-
-	for (*data = 0; len > 0; len--) {
-		u32 u;
-
-		rtl8366_smi_clk_delay(smi);
-
-		/* clocking */
-		gpio_set_value(sck, 1);
-		rtl8366_smi_clk_delay(smi);
-		u = !!gpio_get_value(sda);
-		gpio_set_value(sck, 0);
-
-		*data |= (u << (len - 1));
-	}
-
-	gpio_direction_output(sda, 0);
-}
-
-static int rtl8366_smi_wait_for_ack(struct rtl8366_smi *smi)
-{
-	int retry_cnt;
-
-	retry_cnt = 0;
-	do {
-		u32 ack;
-
-		rtl8366_smi_read_bits(smi, 1, &ack);
-		if (ack == 0)
-			break;
-
-		if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT)
-			return -EIO;
-	} while (1);
-
-	return 0;
-}
-
-static int rtl8366_smi_write_byte(struct rtl8366_smi *smi, u8 data)
-{
-	rtl8366_smi_write_bits(smi, data, 8);
-	return rtl8366_smi_wait_for_ack(smi);
-}
-
-static int rtl8366_smi_read_byte0(struct rtl8366_smi *smi, u8 *data)
-{
-	u32 t;
-
-	/* read data */
-	rtl8366_smi_read_bits(smi, 8, &t);
-	*data = (t & 0xff);
-
-	/* send an ACK */
-	rtl8366_smi_write_bits(smi, 0x00, 1);
-
-	return 0;
-}
-
-static int rtl8366_smi_read_byte1(struct rtl8366_smi *smi, u8 *data)
-{
-	u32 t;
-
-	/* read data */
-	rtl8366_smi_read_bits(smi, 8, &t);
-	*data = (t & 0xff);
-
-	/* send an ACK */
-	rtl8366_smi_write_bits(smi, 0x01, 1);
-
-	return 0;
-}
-
-int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
-{
-	unsigned long flags;
-	u8 lo = 0;
-	u8 hi = 0;
-	int ret;
-
-	spin_lock_irqsave(&smi->lock, flags);
-
-	rtl8366_smi_start(smi);
-
-	/* send READ command */
-	ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x01);
-	if (ret)
-		goto out;
-
-	/* set ADDR[7:0] */
-	ret = rtl8366_smi_write_byte(smi, addr & 0xff);
-	if (ret)
-		goto out;
-
-	/* set ADDR[15:8] */
-	ret = rtl8366_smi_write_byte(smi, addr >> 8);
-	if (ret)
-		goto out;
-
-	/* read DATA[7:0] */
-	rtl8366_smi_read_byte0(smi, &lo);
-	/* read DATA[15:8] */
-	rtl8366_smi_read_byte1(smi, &hi);
-
-	*data = ((u32) lo) | (((u32) hi) << 8);
-
-	ret = 0;
-
- out:
-	rtl8366_smi_stop(smi);
-	spin_unlock_irqrestore(&smi->lock, flags);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
-
-int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
-{
-	unsigned long flags;
-	int ret;
-
-	spin_lock_irqsave(&smi->lock, flags);
-
-	rtl8366_smi_start(smi);
-
-	/* send WRITE command */
-	ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x00);
-	if (ret)
-		goto out;
-
-	/* set ADDR[7:0] */
-	ret = rtl8366_smi_write_byte(smi, addr & 0xff);
-	if (ret)
-		goto out;
-
-	/* set ADDR[15:8] */
-	ret = rtl8366_smi_write_byte(smi, addr >> 8);
-	if (ret)
-		goto out;
-
-	/* write DATA[7:0] */
-	ret = rtl8366_smi_write_byte(smi, data & 0xff);
-	if (ret)
-		goto out;
-
-	/* write DATA[15:8] */
-	ret = rtl8366_smi_write_byte(smi, data >> 8);
-	if (ret)
-		goto out;
-
-	ret = 0;
-
- out:
-	rtl8366_smi_stop(smi);
-	spin_unlock_irqrestore(&smi->lock, flags);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
-
-int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
-{
-	u32 t;
-	int err;
-
-	err = rtl8366_smi_read_reg(smi, addr, &t);
-	if (err)
-		return err;
-
-	err = rtl8366_smi_write_reg(smi, addr, (t & ~mask) | data);
-	return err;
-
-}
-EXPORT_SYMBOL_GPL(rtl8366_smi_rmwr);
-
-static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
-{
-	int ret;
-	int i;
-
-	smi->mii_bus = mdiobus_alloc();
-	if (smi->mii_bus == NULL) {
-		ret = -ENOMEM;
-		goto err;
-	}
-
-	smi->mii_bus->priv = (void *) smi;
-	smi->mii_bus->name = dev_name(smi->parent);
-	smi->mii_bus->read = smi->ops->mii_read;
-	smi->mii_bus->write = smi->ops->mii_write;
-	snprintf(smi->mii_bus->id, MII_BUS_ID_SIZE, "%s",
-		 dev_name(smi->parent));
-	smi->mii_bus->parent = smi->parent;
-	smi->mii_bus->phy_mask = ~(0x1f);
-	smi->mii_bus->irq = smi->mii_irq;
-	for (i = 0; i < PHY_MAX_ADDR; i++)
-		smi->mii_irq[i] = PHY_POLL;
-
-	ret = mdiobus_register(smi->mii_bus);
-	if (ret)
-		goto err_free;
-
-	return 0;
-
- err_free:
-	mdiobus_free(smi->mii_bus);
- err:
-	return ret;
-}
-
-static void rtl8366_smi_mii_cleanup(struct rtl8366_smi *smi)
-{
-	mdiobus_unregister(smi->mii_bus);
-	mdiobus_free(smi->mii_bus);
-}
-
-int rtl8366_smi_init(struct rtl8366_smi *smi)
-{
-	int err;
-
-	if (!smi->parent)
-		return -EINVAL;
-
-	if (!smi->ops)
-		return -EINVAL;
-
-	err = gpio_request(smi->gpio_sda, dev_name(smi->parent));
-	if (err) {
-		dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
-			smi->gpio_sda, err);
-		goto err_out;
-	}
-
-	err = gpio_request(smi->gpio_sck, dev_name(smi->parent));
-	if (err) {
-		dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
-			smi->gpio_sck, err);
-		goto err_free_sda;
-	}
-
-	spin_lock_init(&smi->lock);
-
-	dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
-		 smi->gpio_sda, smi->gpio_sck);
-
-	err = smi->ops->detect(smi);
-	if (err) {
-		dev_err(smi->parent, "chip detection failed, err=%d\n", err);
-		goto err_free_sck;
-	}
-
-	err = rtl8366_smi_mii_init(smi);
-	if (err)
-		goto err_free_sck;
-
-	return 0;
-
- err_free_sck:
-	gpio_free(smi->gpio_sck);
- err_free_sda:
-	gpio_free(smi->gpio_sda);
- err_out:
-	return err;
-}
-EXPORT_SYMBOL_GPL(rtl8366_smi_init);
-
-void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
-{
-	rtl8366_smi_mii_cleanup(smi);
-	gpio_free(smi->gpio_sck);
-	gpio_free(smi->gpio_sda);
-}
-EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
-
-MODULE_DESCRIPTION("Realtek RTL8366 SMI interface driver");
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_LICENSE("GPL v2");
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
deleted file mode 100644
index 1afee9b73a..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Realtek RTL8366 SMI interface driver defines
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef _RTL8366_SMI_H
-#define _RTL8366_SMI_H
-
-#include <linux/phy.h>
-
-struct rtl8366_smi_ops;
-struct mii_bus;
-
-struct rtl8366_smi {
-	struct device		*parent;
-	unsigned int		gpio_sda;
-	unsigned int		gpio_sck;
-	spinlock_t		lock;
-	struct mii_bus		*mii_bus;
-	int			mii_irq[PHY_MAX_ADDR];
-
-	struct rtl8366_smi_ops	*ops;
-};
-
-struct rtl8366_smi_ops {
-	int	(*detect)(struct rtl8366_smi *smi);
-
-	int	(*mii_read)(struct mii_bus *bus, int addr, int reg);
-	int	(*mii_write)(struct mii_bus *bus, int addr, int reg, u16 val);
-};
-
-struct rtl8366_vlan_mc {
-	u16	vid;
-	u8	priority;
-	u8	untag;
-	u8	member;
-	u8	fid;
-};
-
-struct rtl8366_vlan_4k {
-	u16	vid;
-	u8	untag;
-	u8	member;
-	u8	fid;
-};
-
-int rtl8366_smi_init(struct rtl8366_smi *smi);
-void rtl8366_smi_cleanup(struct rtl8366_smi *smi);
-int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data);
-int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
-int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
-
-#endif /*  _RTL8366_SMI_H */
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
deleted file mode 100644
index 2105b2bd4e..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
+++ /dev/null
@@ -1,1797 +0,0 @@
-/*
- * Platform driver for the Realtek RTL8366S ethernet switch
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/switch.h>
-#include <linux/rtl8366rb.h>
-
-#include "rtl8366_smi.h"
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
-#define RTL8366S_DRIVER_DESC	"Realtek RTL8366RB ethernet switch driver"
-#define RTL8366S_DRIVER_VER	"0.2.2"
-
-#define RTL8366S_PHY_NO_MAX                 4
-#define RTL8366S_PHY_PAGE_MAX               7
-#define RTL8366S_PHY_ADDR_MAX               31
-
-#define RTL8366_CHIP_GLOBAL_CTRL_REG        0x0000
-#define RTL8366_CHIP_CTRL_VLAN              (1 << 13)
-#define RTL8366_CHIP_CTRL_VLAN_4KTB         (1 << 14)
-
-/* Switch Global Configuration register */
-#define RTL8366_SGCR			0x0000
-#define RTL8366_SGCR_EN_BC_STORM_CTRL	BIT(0)
-#define RTL8366_SGCR_MAX_LENGTH(_x)	(_x << 4)
-#define RTL8366_SGCR_MAX_LENGTH_MASK	RTL8366_SGCR_MAX_LENGTH(0x3)
-#define RTL8366_SGCR_MAX_LENGTH_1522	RTL8366_SGCR_MAX_LENGTH(0x0)
-#define RTL8366_SGCR_MAX_LENGTH_1536	RTL8366_SGCR_MAX_LENGTH(0x1)
-#define RTL8366_SGCR_MAX_LENGTH_1552	RTL8366_SGCR_MAX_LENGTH(0x2)
-#define RTL8366_SGCR_MAX_LENGTH_9216	RTL8366_SGCR_MAX_LENGTH(0x3)
-
-/* Port Enable Control register */
-#define RTL8366_PECR			0x0001
-
-/* Switch Security Control registers */
-#define RTL8366_SSCR0			0x0002
-#define RTL8366_SSCR1			0x0003
-#define RTL8366_SSCR2			0x0004
-#define RTL8366_SSCR2_DROP_UNKNOWN_DA	BIT(0)
-
-#define RTL8366_RESET_CTRL_REG              0x0100
-#define RTL8366_CHIP_CTRL_RESET_HW          1
-#define RTL8366_CHIP_CTRL_RESET_SW          (1 << 1)
-
-#define RTL8366S_CHIP_VERSION_CTRL_REG      0x050A
-#define RTL8366S_CHIP_VERSION_MASK          0xf
-#define RTL8366S_CHIP_ID_REG                0x0509
-#define RTL8366S_CHIP_ID_8366               0x5937
-
-/* PHY registers control */
-#define RTL8366S_PHY_ACCESS_CTRL_REG        0x8000
-#define RTL8366S_PHY_ACCESS_DATA_REG        0x8002
-
-#define RTL8366S_PHY_CTRL_READ              1
-#define RTL8366S_PHY_CTRL_WRITE             0
-
-#define RTL8366S_PHY_REG_MASK               0x1f
-#define RTL8366S_PHY_PAGE_OFFSET            5
-#define RTL8366S_PHY_PAGE_MASK              (0xf << 5)
-#define RTL8366S_PHY_NO_OFFSET              9
-#define RTL8366S_PHY_NO_MASK                (0x1f << 9)
-
-/* LED control registers */
-#define RTL8366_LED_BLINKRATE_REG           0x0430
-#define RTL8366_LED_BLINKRATE_BIT           0
-#define RTL8366_LED_BLINKRATE_MASK          0x0007
-
-#define RTL8366_LED_CTRL_REG                0x0431
-#define RTL8366_LED_0_1_CTRL_REG            0x0432
-#define RTL8366_LED_2_3_CTRL_REG            0x0433
-
-#define RTL8366S_MIB_COUNT                  33
-#define RTL8366S_GLOBAL_MIB_COUNT           1
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET    0x0050
-#define RTL8366S_MIB_COUNTER_BASE           0x1000
-#define RTL8366S_MIB_CTRL_REG               0x13F0
-#define RTL8366S_MIB_CTRL_USER_MASK         0x0FFC
-#define RTL8366S_MIB_CTRL_BUSY_MASK         0x0001
-#define RTL8366S_MIB_CTRL_RESET_MASK        0x0001
-
-#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
-#define RTL8366S_MIB_CTRL_PORT_RESET_BIT    0x0003
-#define RTL8366S_MIB_CTRL_PORT_RESET_MASK   0x01FC
-
-
-#define RTL8366S_PORT_VLAN_CTRL_BASE        0x0063
-#define RTL8366S_PORT_VLAN_CTRL_REG(_p)  \
-		(RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4)
-#define RTL8366S_PORT_VLAN_CTRL_MASK	    0xf
-#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)   (4 * ((_p) % 4))
-
-
-#define RTL8366S_VLAN_TABLE_READ_BASE       0x018C
-#define RTL8366S_VLAN_TABLE_WRITE_BASE      0x0185
-
-
-#define RTL8366S_TABLE_ACCESS_CTRL_REG      0x0180
-#define RTL8366S_TABLE_VLAN_READ_CTRL       0x0E01
-#define RTL8366S_TABLE_VLAN_WRITE_CTRL      0x0F01
-
-#define RTL8366S_VLAN_MEMCONF_BASE          0x0020
-
-
-#define RTL8366S_PORT_LINK_STATUS_BASE      0x0014
-#define RTL8366S_PORT_STATUS_SPEED_MASK     0x0003
-#define RTL8366S_PORT_STATUS_DUPLEX_MASK    0x0004
-#define RTL8366S_PORT_STATUS_LINK_MASK      0x0010
-#define RTL8366S_PORT_STATUS_TXPAUSE_MASK   0x0020
-#define RTL8366S_PORT_STATUS_RXPAUSE_MASK   0x0040
-#define RTL8366S_PORT_STATUS_AN_MASK        0x0080
-
-
-#define RTL8366_PORT_NUM_CPU                5
-#define RTL8366_NUM_PORTS                   6
-#define RTL8366_NUM_VLANS                   16
-#define RTL8366_NUM_LEDGROUPS               4
-#define RTL8366_NUM_VIDS                    4096
-#define RTL8366S_PRIORITYMAX                7
-#define RTL8366S_FIDMAX	                    7
-
-
-#define RTL8366_PORT_1                      (1 << 0) /* In userspace port 0 */
-#define RTL8366_PORT_2                      (1 << 1) /* In userspace port 1 */
-#define RTL8366_PORT_3                      (1 << 2) /* In userspace port 2 */
-#define RTL8366_PORT_4                      (1 << 3) /* In userspace port 3 */
-#define RTL8366_PORT_5                      (1 << 4) /* In userspace port 4 */
-
-#define RTL8366_PORT_CPU                    (1 << 5) /* CPU port */
-
-#define RTL8366_PORT_ALL                    (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4 |       \
-					     RTL8366_PORT_5 |       \
-					     RTL8366_PORT_CPU)
-
-#define RTL8366_PORT_ALL_BUT_CPU            (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4 |       \
-					     RTL8366_PORT_5)
-
-#define RTL8366_PORT_ALL_EXTERNAL           (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4)
-
-#define RTL8366_PORT_ALL_INTERNAL	     RTL8366_PORT_CPU
-
-struct rtl8366rb {
-	struct device		*parent;
-	struct rtl8366_smi	smi;
-	struct switch_dev	dev;
-	char			buf[4096];
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-	struct dentry           *debugfs_root;
-#endif
-};
-
-struct rtl8366rb_vlan_mc {
-	u16	reserved2:1;
-	u16	priority:3;
-	u16	vid:12;
-	u16	untag:8;
-	u16	member:8;
-	u16	stag_mbr:8;
-	u16	stag_idx:3;
-	u16	reserved1:2;
-	u16	fid:3;
-};
-
-struct rtl8366rb_vlan_4k {
-	u16	reserved1:4;
-	u16	vid:12;
-	u16	untag:8;
-	u16	member:8;
-	u16	reserved2:13;
-	u16	fid:3;
-};
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 gl_dbg_reg;
-#endif
-
-struct mib_counter {
-	unsigned	offset;
-	unsigned	length;
-	const char	*name;
-};
-
-static struct mib_counter rtl8366rb_mib_counters[RTL8366S_MIB_COUNT] = {
-	{  0, 4, "IfInOctets"				},
-	{  4, 4, "EtherStatsOctets"			},
-	{  8, 2, "EtherStatsUnderSizePkts"		},
-	{ 10, 2, "EtherFragments"			},
-	{ 12, 2, "EtherStatsPkts64Octets"		},
-	{ 14, 2, "EtherStatsPkts65to127Octets"		},
-	{ 16, 2, "EtherStatsPkts128to255Octets"		},
-	{ 18, 2, "EtherStatsPkts256to511Octets"		},
-	{ 20, 2, "EtherStatsPkts512to1023Octets"	},
-	{ 22, 2, "EtherStatsPkts1024to1518Octets"	},
-	{ 24, 2, "EtherOversizeStats"			},
-	{ 26, 2, "EtherStatsJabbers"			},
-	{ 28, 2, "IfInUcastPkts"			},
-	{ 30, 2, "EtherStatsMulticastPkts"		},
-	{ 32, 2, "EtherStatsBroadcastPkts"		},
-	{ 34, 2, "EtherStatsDropEvents"			},
-	{ 36, 2, "Dot3StatsFCSErrors"			},
-	{ 38, 2, "Dot3StatsSymbolErrors"		},
-	{ 40, 2, "Dot3InPauseFrames"			},
-	{ 42, 2, "Dot3ControlInUnknownOpcodes"		},
-	{ 44, 4, "IfOutOctets"				},
-	{ 48, 2, "Dot3StatsSingleCollisionFrames"	},
-	{ 50, 2, "Dot3StatMultipleCollisionFrames"	},
-	{ 52, 2, "Dot3sDeferredTransmissions"		},
-	{ 54, 2, "Dot3StatsLateCollisions"		},
-	{ 56, 2, "EtherStatsCollisions"			},
-	{ 58, 2, "Dot3StatsExcessiveCollisions"		},
-	{ 60, 2, "Dot3OutPauseFrames"			},
-	{ 62, 2, "Dot1dBasePortDelayExceededDiscards"	},
-	{ 64, 2, "Dot1dTpPortInDiscards"		},
-	{ 66, 2, "IfOutUcastPkts"			},
-	{ 68, 2, "IfOutMulticastPkts"			},
-	{ 70, 2, "IfOutBroadcastPkts"			},
-};
-
-#define REG_WR(_smi, _reg, _val)					\
-	do {								\
-		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
-		if (err)						\
-			return err;					\
-	} while (0)
-
-#define REG_RMW(_smi, _reg, _mask, _val)				\
-	do {								\
-		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
-		if (err)						\
-			return err;					\
-	} while (0)
-
-static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi)
-{
-	return container_of(smi, struct rtl8366rb, smi);
-}
-
-static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
-{
-	return container_of(sw, struct rtl8366rb, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-	struct rtl8366rb *rtl = sw_to_rtl8366rb(sw);
-	return &rtl->smi;
-}
-
-static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
-{
-	int timeout = 10;
-	u32 data;
-
-	rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
-			      RTL8366_CHIP_CTRL_RESET_HW);
-	do {
-		msleep(1);
-		if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
-			return -EIO;
-
-		if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
-			break;
-	} while (--timeout);
-
-	if (!timeout) {
-		printk("Timeout waiting for the switch to reset\n");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
-{
-	int err;
-
-	/* set maximum packet length to 1536 bytes */
-	REG_RMW(smi, RTL8366_SGCR, RTL8366_SGCR_MAX_LENGTH_MASK,
-		RTL8366_SGCR_MAX_LENGTH_1536);
-
-	/* enable all ports */
-	REG_WR(smi, RTL8366_PECR, 0);
-
-	/* disable learning for all ports */
-	REG_WR(smi, RTL8366_SSCR0, RTL8366_PORT_ALL);
-
-	/* disable auto ageing for all ports */
-	REG_WR(smi, RTL8366_SSCR1, RTL8366_PORT_ALL);
-
-	/* don't drop packets whose DA has not been learned */
-	REG_RMW(smi, RTL8366_SSCR2, RTL8366_SSCR2_DROP_UNKNOWN_DA, 0);
-
-	return 0;
-}
-
-static int rtl8366rb_read_phy_reg(struct rtl8366_smi *smi,
-				 u32 phy_no, u32 page, u32 addr, u32 *data)
-{
-	u32 reg;
-	int ret;
-
-	if (phy_no > RTL8366S_PHY_NO_MAX)
-		return -EINVAL;
-
-	if (page > RTL8366S_PHY_PAGE_MAX)
-		return -EINVAL;
-
-	if (addr > RTL8366S_PHY_ADDR_MAX)
-		return -EINVAL;
-
-	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-				    RTL8366S_PHY_CTRL_READ);
-	if (ret)
-		return ret;
-
-	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-	      (addr & RTL8366S_PHY_REG_MASK);
-
-	ret = rtl8366_smi_write_reg(smi, reg, 0);
-	if (ret)
-		return ret;
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_PHY_ACCESS_DATA_REG, data);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi,
-				  u32 phy_no, u32 page, u32 addr, u32 data)
-{
-	u32 reg;
-	int ret;
-
-	if (phy_no > RTL8366S_PHY_NO_MAX)
-		return -EINVAL;
-
-	if (page > RTL8366S_PHY_PAGE_MAX)
-		return -EINVAL;
-
-	if (addr > RTL8366S_PHY_ADDR_MAX)
-		return -EINVAL;
-
-	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-				    RTL8366S_PHY_CTRL_WRITE);
-	if (ret)
-		return ret;
-
-	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-	      (addr & RTL8366S_PHY_REG_MASK);
-
-	ret = rtl8366_smi_write_reg(smi, reg, data);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
-				   int port, unsigned long long *val)
-{
-	int i;
-	int err;
-	u32 addr, data;
-	u64 mibvalue;
-
-	if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
-		return -EINVAL;
-
-	addr = RTL8366S_MIB_COUNTER_BASE +
-	       RTL8366S_MIB_COUNTER_PORT_OFFSET * (port) +
-	       rtl8366rb_mib_counters[counter].offset;
-
-	/*
-	 * Writing access counter address first
-	 * then ASIC will prepare 64bits counter wait for being retrived
-	 */
-	data = 0; /* writing data will be discard by ASIC */
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	/* read MIB control register */
-	err =  rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
-	if (err)
-		return err;
-
-	if (data & RTL8366S_MIB_CTRL_BUSY_MASK)
-		return -EBUSY;
-
-	if (data & RTL8366S_MIB_CTRL_RESET_MASK)
-		return -EIO;
-
-	mibvalue = 0;
-	for (i = rtl8366rb_mib_counters[counter].length; i > 0; i--) {
-		err = rtl8366_smi_read_reg(smi, addr + (i - 1), &data);
-		if (err)
-			return err;
-
-		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
-	}
-
-	*val = mibvalue;
-	return 0;
-}
-
-static int rtl8366rb_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
-				 struct rtl8366_vlan_4k *vlan4k)
-{
-	struct rtl8366rb_vlan_4k vlan4k_priv;
-	int err;
-	u32 data;
-	u16 *tableaddr;
-
-	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
-	vlan4k_priv.vid = vid;
-
-	if (vid >= RTL8366_NUM_VIDS)
-		return -EINVAL;
-
-	tableaddr = (u16 *)&vlan4k_priv;
-
-	/* write VID */
-	data = *tableaddr;
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-	if (err)
-		return err;
-
-	/* write table access control word */
-	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-				    RTL8366S_TABLE_VLAN_READ_CTRL);
-	if (err)
-		return err;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1,
-				   &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 2,
-				   &data);
-	if (err)
-		return err;
-	*tableaddr = data;
-
-	vlan4k->vid = vid;
-	vlan4k->untag = vlan4k_priv.untag;
-	vlan4k->member = vlan4k_priv.member;
-	vlan4k->fid = vlan4k_priv.fid;
-
-	return 0;
-}
-
-static int rtl8366rb_set_vlan_4k(struct rtl8366_smi *smi,
-				 const struct rtl8366_vlan_4k *vlan4k)
-{
-	struct rtl8366rb_vlan_4k vlan4k_priv;
-	int err;
-	u32 data;
-	u16 *tableaddr;
-
-	if (vlan4k->vid >= RTL8366_NUM_VIDS ||
-	    vlan4k->member > RTL8366_PORT_ALL ||
-	    vlan4k->untag > RTL8366_PORT_ALL ||
-	    vlan4k->fid > RTL8366S_FIDMAX)
-		return -EINVAL;
-
-	vlan4k_priv.vid = vlan4k->vid;
-	vlan4k_priv.untag = vlan4k->untag;
-	vlan4k_priv.member = vlan4k->member;
-	vlan4k_priv.fid = vlan4k->fid;
-
-	tableaddr = (u16 *)&vlan4k_priv;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-	if (err)
-		return err;
-
-	tableaddr++;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
-				    data);
-	if (err)
-		return err;
-
-	tableaddr++;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 2,
-				    data);
-	if (err)
-		return err;
-
-	/* write table access control word */
-	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-				    RTL8366S_TABLE_VLAN_WRITE_CTRL);
-
-	return err;
-}
-
-static int rtl8366rb_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
-				 struct rtl8366_vlan_mc *vlanmc)
-{
-	struct rtl8366rb_vlan_mc vlanmc_priv;
-	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
-
-	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
-
-	if (index >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	tableaddr = (u16 *)&vlanmc_priv;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-
-	vlanmc->vid = vlanmc_priv.vid;
-	vlanmc->priority = vlanmc_priv.priority;
-	vlanmc->untag = vlanmc_priv.untag;
-	vlanmc->member = vlanmc_priv.member;
-	vlanmc->fid = vlanmc_priv.fid;
-
-	return 0;
-}
-
-static int rtl8366rb_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
-				 const struct rtl8366_vlan_mc *vlanmc)
-{
-	struct rtl8366rb_vlan_mc vlanmc_priv;
-	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
-
-	if (index >= RTL8366_NUM_VLANS ||
-	    vlanmc->vid >= RTL8366_NUM_VIDS ||
-	    vlanmc->priority > RTL8366S_PRIORITYMAX ||
-	    vlanmc->member > RTL8366_PORT_ALL ||
-	    vlanmc->untag > RTL8366_PORT_ALL ||
-	    vlanmc->fid > RTL8366S_FIDMAX)
-		return -EINVAL;
-
-	vlanmc_priv.vid = vlanmc->vid;
-	vlanmc_priv.priority = vlanmc->priority;
-	vlanmc_priv.untag = vlanmc->untag;
-	vlanmc_priv.member = vlanmc->member;
-	vlanmc_priv.stag_mbr = 0;
-	vlanmc_priv.stag_idx = 0;
-	vlanmc_priv.fid = vlanmc->fid;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + (index * 3);
-
-	tableaddr = (u16 *)&vlanmc_priv;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index * 3);
-
-	tableaddr++;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 2 + (index * 3);
-
-	tableaddr++;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-	return 0;
-}
-
-static int rtl8366rb_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
-{
-	u32 data;
-	int err;
-
-	if (port >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
-				   &data);
-	if (err)
-		return err;
-
-	*val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
-	       RTL8366S_PORT_VLAN_CTRL_MASK;
-
-	return 0;
-
-}
-
-static int rtl8366rb_set_mc_index(struct rtl8366_smi *smi, int port, int index)
-{
-	if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
-				RTL8366S_PORT_VLAN_CTRL_MASK <<
-					RTL8366S_PORT_VLAN_CTRL_SHIFT(port),
-				(index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
-					RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
-}
-
-static int rtl8366rb_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
-			      u32 untag, u32 fid)
-{
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Update the 4K table */
-	err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-	if (err)
-		return err;
-
-	vlan4k.member = member;
-	vlan4k.untag = untag;
-	vlan4k.fid = fid;
-	err = rtl8366rb_set_vlan_4k(smi, &vlan4k);
-	if (err)
-		return err;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		struct rtl8366_vlan_mc vlanmc;
-
-		err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			/* update the MC entry */
-			vlanmc.member = member;
-			vlanmc.untag = untag;
-			vlanmc.fid = fid;
-
-			err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-			break;
-		}
-	}
-
-	return err;
-}
-
-static int rtl8366rb_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int index;
-
-	err = rtl8366rb_get_mc_index(smi, port, &index);
-	if (err)
-		return err;
-
-	err = rtl8366rb_get_vlan_mc(smi, index, &vlanmc);
-	if (err)
-		return err;
-
-	*val = vlanmc.vid;
-	return 0;
-}
-
-static int rtl8366rb_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-				int *used)
-{
-	int err;
-	int i;
-
-	*used = 0;
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		int index = 0;
-
-		err = rtl8366rb_get_mc_index(smi, i, &index);
-		if (err)
-			return err;
-
-		if (mc_index == index) {
-			*used = 1;
-			break;
-		}
-	}
-
-	return 0;
-}
-
-static int rtl8366rb_set_pvid(struct rtl8366_smi *smi, unsigned port,
-			      unsigned vid)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366rb_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* We have no MC entry for this VID, try to find an empty one */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vlanmc.vid == 0 && vlanmc.member == 0) {
-			/* Update the entry from the 4K table */
-			err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366rb_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* MC table is full, try to find an unused entry and replace it */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		int used;
-
-		err = rtl8366rb_mc_is_used(smi, i, &used);
-		if (err)
-			return err;
-
-		if (!used) {
-			/* Update the entry from the 4K table */
-			err = rtl8366rb_get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366rb_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	dev_err(smi->parent,
-		"all VLAN member configurations are in use\n");
-
-	return -ENOSPC;
-}
-
-static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
-{
-	return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-				RTL8366_CHIP_CTRL_VLAN,
-				(enable) ? RTL8366_CHIP_CTRL_VLAN : 0);
-}
-
-static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
-{
-	return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-				RTL8366_CHIP_CTRL_VLAN_4KTB,
-				(enable) ? RTL8366_CHIP_CTRL_VLAN_4KTB : 0);
-}
-
-static int rtl8366rb_reset_vlan(struct rtl8366_smi *smi)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int i;
-
-	/* clear VLAN member configurations */
-	vlanmc.vid = 0;
-	vlanmc.priority = 0;
-	vlanmc.member = 0;
-	vlanmc.untag = 0;
-	vlanmc.fid = 0;
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366rb_set_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-	}
-
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (i == RTL8366_PORT_CPU)
-			continue;
-
-		err = rtl8366rb_set_vlan(smi, (i + 1),
-					 (1 << i) | RTL8366_PORT_CPU,
-					 (1 << i) | RTL8366_PORT_CPU,
-					 0);
-		if (err)
-			return err;
-
-		err = rtl8366rb_set_pvid(smi, i, (i + 1));
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366rb_debugfs_open(struct inode *inode, struct file *file)
-{
-	file->private_data = inode->i_private;
-	return 0;
-}
-
-static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
-					  char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, j, len = 0;
-	char *buf = rtl->buf;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"%-36s %12s %12s %12s %12s %12s %12s\n",
-			"Counter",
-			"Port 0", "Port 1", "Port 2",
-			"Port 3", "Port 4", "Port 5");
-
-	for (i = 0; i < ARRAY_SIZE(rtl8366rb_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
-				rtl8366rb_mib_counters[i].name);
-		for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
-			unsigned long long counter = 0;
-
-			if (!rtl8366_get_mib_counter(smi, i, j, &counter))
-				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
-						"%12llu ", counter);
-			else
-				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
-						"%12s ", "error");
-		}
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-	}
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366rb_read_debugfs_vlan_mc(struct file *file,
-					      char __user *user_buf,
-					      size_t count, loff_t *ppos)
-{
-	struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, len = 0;
-	char *buf = rtl->buf;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"%2s %6s %4s %6s %6s %3s\n",
-			"id", "vid","prio", "member", "untag", "fid");
-
-	for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-		struct rtl8366_vlan_mc vlanmc;
-
-		rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
-				"%2d %6d %4d 0x%04x 0x%04x %3d\n",
-				i, vlanmc.vid, vlanmc.priority,
-				vlanmc.member, vlanmc.untag, vlanmc.fid);
-	}
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366rb_read_debugfs_reg(struct file *file,
-					 char __user *user_buf,
-					 size_t count, loff_t *ppos)
-{
-	struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	u32 t, reg = gl_dbg_reg;
-	int err, len = 0;
-	char *buf = rtl->buf;
-
-	memset(buf, '\0', sizeof(rtl->buf));
-
-	err = rtl8366_smi_read_reg(smi, reg, &t);
-	if (err) {
-		len += snprintf(buf, sizeof(rtl->buf),
-				"Read failed (reg: 0x%04x)\n", reg);
-		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-	}
-
-	len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
-			reg, t);
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366rb_write_debugfs_reg(struct file *file,
-					  const char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	unsigned long data;
-	u32 reg = gl_dbg_reg;
-	int err;
-	size_t len;
-	char *buf = rtl->buf;
-
-	len = min(count, sizeof(rtl->buf) - 1);
-	if (copy_from_user(buf, user_buf, len)) {
-		dev_err(rtl->parent, "copy from user failed\n");
-		return -EFAULT;
-	}
-
-	buf[len] = '\0';
-	if (len > 0 && buf[len - 1] == '\n')
-		buf[len - 1] = '\0';
-
-
-	if (strict_strtoul(buf, 16, &data)) {
-		dev_err(rtl->parent, "Invalid reg value %s\n", buf);
-	} else {
-		err = rtl8366_smi_write_reg(smi, reg, data);
-		if (err) {
-			dev_err(rtl->parent,
-				"writing reg 0x%04x val 0x%04lx failed\n",
-				reg, data);
-		}
-	}
-
-	return count;
-}
-
-static const struct file_operations fops_rtl8366rb_regs = {
-	.read = rtl8366rb_read_debugfs_reg,
-	.write = rtl8366rb_write_debugfs_reg,
-	.open = rtl8366rb_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366rb_vlan_mc = {
-	.read = rtl8366rb_read_debugfs_vlan_mc,
-	.open = rtl8366rb_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366rb_mibs = {
-	.read = rtl8366rb_read_debugfs_mibs,
-	.open = rtl8366rb_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl)
-{
-	struct dentry *node;
-	struct dentry *root;
-
-	if (!rtl->debugfs_root)
-		rtl->debugfs_root = debugfs_create_dir("rtl8366rb", NULL);
-
-	if (!rtl->debugfs_root) {
-		dev_err(rtl->parent, "Unable to create debugfs dir\n");
-		return;
-	}
-	root = rtl->debugfs_root;
-
-	node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &gl_dbg_reg);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"reg");
-		return;
-	}
-
-	node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
-				   &fops_rtl8366rb_regs);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"val");
-		return;
-	}
-
-	node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
-				   &fops_rtl8366rb_vlan_mc);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"vlan_mc");
-		return;
-	}
-
-	node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
-				   &fops_rtl8366rb_mibs);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"mibs");
-		return;
-	}
-}
-
-static void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl)
-{
-	if (rtl->debugfs_root) {
-		debugfs_remove_recursive(rtl->debugfs_root);
-		rtl->debugfs_root = NULL;
-	}
-}
-
-#else
-static inline void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) {}
-static inline void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-
-static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
-				  const struct switch_attr *attr,
-				  struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	int err = 0;
-
-	if (val->value.i == 1)
-		err = rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
-
-	return err;
-}
-
-static int rtl8366rb_sw_get_vlan_enable(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-
-	if (attr->ofs == 1) {
-		rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-		if (data & RTL8366_CHIP_CTRL_VLAN)
-			val->value.i = 1;
-		else
-			val->value.i = 0;
-	} else if (attr->ofs == 2) {
-		rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-		if (data & RTL8366_CHIP_CTRL_VLAN_4KTB)
-			val->value.i = 1;
-		else
-			val->value.i = 0;
-	}
-
-	return 0;
-}
-
-static int rtl8366rb_sw_get_blinkrate(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-
-	rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
-
-	val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
-
-	return 0;
-}
-
-static int rtl8366rb_sw_set_blinkrate(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (val->value.i >= 6)
-		return -EINVAL;
-
-	return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG,
-				RTL8366_LED_BLINKRATE_MASK,
-				val->value.i);
-}
-
-static int rtl8366rb_sw_set_vlan_enable(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (attr->ofs == 1)
-		return rtl8366rb_vlan_set_vlan(smi, val->value.i);
-	else
-		return rtl8366rb_vlan_set_4ktable(smi, val->value.i);
-}
-
-static const char *rtl8366rb_speed_str(unsigned speed)
-{
-	switch (speed) {
-	case 0:
-		return "10baseT";
-	case 1:
-		return "100baseT";
-	case 2:
-		return "1000baseT";
-	}
-
-	return "unknown";
-}
-
-static int rtl8366rb_sw_get_port_link(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	u32 len = 0, data = 0;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	memset(rtl->buf, '\0', sizeof(rtl->buf));
-	rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
-			     (val->port_vlan / 2), &data);
-
-	if (val->port_vlan % 2)
-		data = data >> 8;
-
-	if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-		len = snprintf(rtl->buf, sizeof(rtl->buf),
-				"port:%d link:up speed:%s %s-duplex %s%s%s",
-				val->port_vlan,
-				rtl8366rb_speed_str(data &
-					  RTL8366S_PORT_STATUS_SPEED_MASK),
-				(data & RTL8366S_PORT_STATUS_DUPLEX_MASK) ?
-					"full" : "half",
-				(data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) ?
-					"tx-pause ": "",
-				(data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) ?
-					"rx-pause " : "",
-				(data & RTL8366S_PORT_STATUS_AN_MASK) ?
-					"nway ": "");
-	} else {
-		len = snprintf(rtl->buf, sizeof(rtl->buf), "port:%d link: down",
-				val->port_vlan);
-	}
-
-	val->value.s = rtl->buf;
-	val->len = len;
-
-	return 0;
-}
-
-static int rtl8366rb_sw_get_vlan_info(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	int i;
-	u32 len = 0;
-	struct rtl8366_vlan_4k vlan4k;
-	struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	char *buf = rtl->buf;
-	int err;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	memset(buf, '\0', sizeof(rtl->buf));
-
-	err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-	if (err)
-		return err;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"VLAN %d: Ports: '", vlan4k.vid);
-
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (!(vlan4k.member & (1 << i)))
-			continue;
-
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
-				(vlan4k.untag & (1 << i)) ? "" : "t");
-	}
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"', members=%04x, untag=%04x, fid=%u",
-			vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-	val->value.s = buf;
-	val->len = len;
-
-	return 0;
-}
-
-static int rtl8366rb_sw_set_port_led(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-	u32 mask;
-	u32 reg;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	if (val->port_vlan == RTL8366_PORT_NUM_CPU) {
-		reg = RTL8366_LED_BLINKRATE_REG;
-		mask = 0xF << 4;
-		data = val->value.i << 4;
-	} else {
-		reg = RTL8366_LED_CTRL_REG;
-		mask = 0xF << (val->port_vlan * 4),
-		data = val->value.i << (val->port_vlan * 4);
-	}
-
-	return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG, mask, data);
-}
-
-static int rtl8366rb_sw_get_port_led(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data = 0;
-
-	if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
-		return -EINVAL;
-
-	rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
-	val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
-
-	return 0;
-}
-
-static int rtl8366rb_sw_reset_port_mibs(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG,
-				0, (1 << (val->port_vlan + 3)));
-}
-
-static int rtl8366rb_sw_get_port_mib(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366rb *rtl = sw_to_rtl8366rb(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, len = 0;
-	unsigned long long counter = 0;
-	char *buf = rtl->buf;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"Port %d MIB counters\n",
-			val->port_vlan);
-
-	for (i = 0; i < ARRAY_SIZE(rtl8366rb_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
-				"%-36s: ", rtl8366rb_mib_counters[i].name);
-		if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
-					"%llu\n", counter);
-		else
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
-					"%s\n", "error");
-	}
-
-	val->value.s = buf;
-	val->len = len;
-	return 0;
-}
-
-static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
-				      struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	struct switch_port *port;
-	struct rtl8366_vlan_4k vlan4k;
-	int i;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-
-	port = &val->value.ports[0];
-	val->len = 0;
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (!(vlan4k.member & BIT(i)))
-			continue;
-
-		port->id = i;
-		port->flags = (vlan4k.untag & BIT(i)) ?
-					0 : BIT(SWITCH_PORT_FLAG_TAGGED);
-		val->len++;
-		port++;
-	}
-	return 0;
-}
-
-static int rtl8366rb_sw_set_vlan_ports(struct switch_dev *dev,
-				      struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	struct switch_port *port;
-	u32 member = 0;
-	u32 untag = 0;
-	int i;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	port = &val->value.ports[0];
-	for (i = 0; i < val->len; i++, port++) {
-		member |= BIT(port->id);
-
-		if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
-			untag |= BIT(port->id);
-	}
-
-	return rtl8366rb_set_vlan(smi, val->port_vlan, member, untag, 0);
-}
-
-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366rb_get_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366rb_set_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	int err;
-
-	err = rtl8366rb_reset_chip(smi);
-	if (err)
-		return err;
-
-	err = rtl8366rb_hw_init(smi);
-	if (err)
-		return err;
-
-	return rtl8366rb_reset_vlan(smi);
-}
-
-static struct switch_attr rtl8366rb_globals[] = {
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan",
-		.description = "Enable VLAN mode",
-		.set = rtl8366rb_sw_set_vlan_enable,
-		.get = rtl8366rb_sw_get_vlan_enable,
-		.max = 1,
-		.ofs = 1
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan4k",
-		.description = "Enable VLAN 4K mode",
-		.set = rtl8366rb_sw_set_vlan_enable,
-		.get = rtl8366rb_sw_get_vlan_enable,
-		.max = 1,
-		.ofs = 2
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "reset_mibs",
-		.description = "Reset all MIB counters",
-		.set = rtl8366rb_sw_reset_mibs,
-		.get = NULL,
-		.max = 1
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "blinkrate",
-		.description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
-		" 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
-		.set = rtl8366rb_sw_set_blinkrate,
-		.get = rtl8366rb_sw_get_blinkrate,
-		.max = 5
-	},
-};
-
-static struct switch_attr rtl8366rb_port[] = {
-	{
-		.type = SWITCH_TYPE_STRING,
-		.name = "link",
-		.description = "Get port link information",
-		.max = 1,
-		.set = NULL,
-		.get = rtl8366rb_sw_get_port_link,
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "reset_mib",
-		.description = "Reset single port MIB counters",
-		.max = 1,
-		.set = rtl8366rb_sw_reset_port_mibs,
-		.get = NULL,
-	}, {
-		.type = SWITCH_TYPE_STRING,
-		.name = "mib",
-		.description = "Get MIB counters for port",
-		.max = 33,
-		.set = NULL,
-		.get = rtl8366rb_sw_get_port_mib,
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "led",
-		.description = "Get/Set port group (0 - 3) led mode (0 - 15)",
-		.max = 15,
-		.set = rtl8366rb_sw_set_port_led,
-		.get = rtl8366rb_sw_get_port_led,
-	},
-};
-
-static struct switch_attr rtl8366rb_vlan[] = {
-	{
-		.type = SWITCH_TYPE_STRING,
-		.name = "info",
-		.description = "Get vlan information",
-		.max = 1,
-		.set = NULL,
-		.get = rtl8366rb_sw_get_vlan_info,
-	},
-};
-
-/* template */
-static struct switch_dev rtl8366_switch_dev = {
-	.name = "RTL8366S",
-	.cpu_port = RTL8366_PORT_NUM_CPU,
-	.ports = RTL8366_NUM_PORTS,
-	.vlans = RTL8366_NUM_VLANS,
-	.attr_global = {
-		.attr = rtl8366rb_globals,
-		.n_attr = ARRAY_SIZE(rtl8366rb_globals),
-	},
-	.attr_port = {
-		.attr = rtl8366rb_port,
-		.n_attr = ARRAY_SIZE(rtl8366rb_port),
-	},
-	.attr_vlan = {
-		.attr = rtl8366rb_vlan,
-		.n_attr = ARRAY_SIZE(rtl8366rb_vlan),
-	},
-
-	.get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
-	.set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
-	.get_port_pvid = rtl8366rb_sw_get_port_pvid,
-	.set_port_pvid = rtl8366rb_sw_set_port_pvid,
-	.reset_switch = rtl8366rb_sw_reset_switch,
-};
-
-static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
-{
-	struct switch_dev *dev = &rtl->dev;
-	int err;
-
-	memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-	dev->priv = rtl;
-	dev->devname = dev_name(rtl->parent);
-
-	err = register_switch(dev, NULL);
-	if (err)
-		dev_err(rtl->parent, "switch registration failed\n");
-
-	return err;
-}
-
-static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
-{
-	unregister_switch(&rtl->dev);
-}
-
-static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
-{
-	struct rtl8366_smi *smi = bus->priv;
-	u32 val = 0;
-	int err;
-
-	err = rtl8366rb_read_phy_reg(smi, addr, 0, reg, &val);
-	if (err)
-		return 0xffff;
-
-	return val;
-}
-
-static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
-{
-	struct rtl8366_smi *smi = bus->priv;
-	u32 t;
-	int err;
-
-	err = rtl8366rb_write_phy_reg(smi, addr, 0, reg, val);
-	/* flush write */
-	(void) rtl8366rb_read_phy_reg(smi, addr, 0, reg, &t);
-
-	return err;
-}
-
-static int rtl8366rb_mii_bus_match(struct mii_bus *bus)
-{
-	return (bus->read == rtl8366rb_mii_read &&
-		bus->write == rtl8366rb_mii_write);
-}
-
-static int rtl8366rb_setup(struct rtl8366rb *rtl)
-{
-	struct rtl8366_smi *smi = &rtl->smi;
-	int ret;
-
-	rtl8366rb_debugfs_init(rtl);
-
-	ret = rtl8366rb_reset_chip(smi);
-	if (ret)
-		return ret;
-
-	ret = rtl8366rb_hw_init(smi);
-	return ret;
-}
-
-static int rtl8366rb_detect(struct rtl8366_smi *smi)
-{
-	u32 chip_id = 0;
-	u32 chip_ver = 0;
-	int ret;
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_ID_REG, &chip_id);
-	if (ret) {
-		dev_err(smi->parent, "unable to read chip id\n");
-		return ret;
-	}
-
-	switch (chip_id) {
-	case RTL8366S_CHIP_ID_8366:
-		break;
-	default:
-		dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
-		return -ENODEV;
-	}
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_VERSION_CTRL_REG,
-				   &chip_ver);
-	if (ret) {
-		dev_err(smi->parent, "unable to read chip version\n");
-		return ret;
-	}
-
-	dev_info(smi->parent, "RTL%04x ver. %u chip found\n",
-		 chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK);
-
-	return 0;
-}
-
-static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
-	.detect		= rtl8366rb_detect,
-	.mii_read	= rtl8366rb_mii_read,
-	.mii_write	= rtl8366rb_mii_write,
-};
-
-static int __init rtl8366rb_probe(struct platform_device *pdev)
-{
-	static int rtl8366_smi_version_printed;
-	struct rtl8366rb_platform_data *pdata;
-	struct rtl8366rb *rtl;
-	struct rtl8366_smi *smi;
-	int err;
-
-	if (!rtl8366_smi_version_printed++)
-		printk(KERN_NOTICE RTL8366S_DRIVER_DESC
-		       " version " RTL8366S_DRIVER_VER"\n");
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		dev_err(&pdev->dev, "no platform data specified\n");
-		err = -EINVAL;
-		goto err_out;
-	}
-
-	rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-	if (!rtl) {
-		dev_err(&pdev->dev, "no memory for private data\n");
-		err = -ENOMEM;
-		goto err_out;
-	}
-
-	rtl->parent = &pdev->dev;
-
-	smi = &rtl->smi;
-	smi->parent = &pdev->dev;
-	smi->gpio_sda = pdata->gpio_sda;
-	smi->gpio_sck = pdata->gpio_sck;
-	smi->ops = &rtl8366rb_smi_ops;
-
-	err = rtl8366_smi_init(smi);
-	if (err)
-		goto err_free_rtl;
-
-	platform_set_drvdata(pdev, rtl);
-
-	err = rtl8366rb_setup(rtl);
-	if (err)
-		goto err_clear_drvdata;
-
-	err = rtl8366rb_switch_init(rtl);
-	if (err)
-		goto err_clear_drvdata;
-
-	return 0;
-
- err_clear_drvdata:
-	platform_set_drvdata(pdev, NULL);
-	rtl8366_smi_cleanup(smi);
- err_free_rtl:
-	kfree(rtl);
- err_out:
-	return err;
-}
-
-static int rtl8366rb_phy_config_init(struct phy_device *phydev)
-{
-	if (!rtl8366rb_mii_bus_match(phydev->bus))
-		return -EINVAL;
-
-	return 0;
-}
-
-static int rtl8366rb_phy_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static struct phy_driver rtl8366rb_phy_driver = {
-	.phy_id		= 0x001cc960,
-	.name		= "Realtek RTL8366RB",
-	.phy_id_mask	= 0x1ffffff0,
-	.features	= PHY_GBIT_FEATURES,
-	.config_aneg	= rtl8366rb_phy_config_aneg,
-	.config_init    = rtl8366rb_phy_config_init,
-	.read_status	= genphy_read_status,
-	.driver		= {
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __devexit rtl8366rb_remove(struct platform_device *pdev)
-{
-	struct rtl8366rb *rtl = platform_get_drvdata(pdev);
-
-	if (rtl) {
-		rtl8366rb_switch_cleanup(rtl);
-		rtl8366rb_debugfs_remove(rtl);
-		platform_set_drvdata(pdev, NULL);
-		rtl8366_smi_cleanup(&rtl->smi);
-		kfree(rtl);
-	}
-
-	return 0;
-}
-
-static struct platform_driver rtl8366rb_driver = {
-	.driver = {
-		.name		= RTL8366RB_DRIVER_NAME,
-		.owner		= THIS_MODULE,
-	},
-	.probe		= rtl8366rb_probe,
-	.remove		= __devexit_p(rtl8366rb_remove),
-};
-
-static int __init rtl8366rb_module_init(void)
-{
-	int ret;
-	ret = platform_driver_register(&rtl8366rb_driver);
-	if (ret)
-		return ret;
-
-	ret = phy_driver_register(&rtl8366rb_phy_driver);
-	if (ret)
-		goto err_platform_unregister;
-
-	return 0;
-
- err_platform_unregister:
-	platform_driver_unregister(&rtl8366rb_driver);
-	return ret;
-}
-module_init(rtl8366rb_module_init);
-
-static void __exit rtl8366rb_module_exit(void)
-{
-	phy_driver_unregister(&rtl8366rb_phy_driver);
-	platform_driver_unregister(&rtl8366rb_driver);
-}
-module_exit(rtl8366rb_module_exit);
-
-MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
-MODULE_VERSION(RTL8366S_DRIVER_VER);
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" RTL8366RB_DRIVER_NAME);
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
deleted file mode 100644
index da8fe556c4..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
+++ /dev/null
@@ -1,1785 +0,0 @@
-/*
- * Platform driver for the Realtek RTL8366S ethernet switch
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2010 Antti Seppälä <a.seppala@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/switch.h>
-#include <linux/rtl8366s.h>
-
-#include "rtl8366_smi.h"
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
-#define RTL8366S_DRIVER_DESC	"Realtek RTL8366S ethernet switch driver"
-#define RTL8366S_DRIVER_VER	"0.2.2"
-
-#define RTL8366S_PHY_NO_MAX                 4
-#define RTL8366S_PHY_PAGE_MAX               7
-#define RTL8366S_PHY_ADDR_MAX               31
-
-#define RTL8366_CHIP_GLOBAL_CTRL_REG        0x0000
-#define RTL8366_CHIP_CTRL_VLAN              (1 << 13)
-
-/* Switch Global Configuration register */
-#define RTL8366_SGCR			0x0000
-#define RTL8366_SGCR_EN_BC_STORM_CTRL	BIT(0)
-#define RTL8366_SGCR_MAX_LENGTH(_x)	(_x << 4)
-#define RTL8366_SGCR_MAX_LENGTH_MASK	RTL8366_SGCR_MAX_LENGTH(0x3)
-#define RTL8366_SGCR_MAX_LENGTH_1522	RTL8366_SGCR_MAX_LENGTH(0x0)
-#define RTL8366_SGCR_MAX_LENGTH_1536	RTL8366_SGCR_MAX_LENGTH(0x1)
-#define RTL8366_SGCR_MAX_LENGTH_1552	RTL8366_SGCR_MAX_LENGTH(0x2)
-#define RTL8366_SGCR_MAX_LENGTH_16000	RTL8366_SGCR_MAX_LENGTH(0x3)
-
-/* Port Enable Control register */
-#define RTL8366_PECR			0x0001
-
-/* Switch Security Control registers */
-#define RTL8366_SSCR0			0x0002
-#define RTL8366_SSCR1			0x0003
-#define RTL8366_SSCR2			0x0004
-#define RTL8366_SSCR2_DROP_UNKNOWN_DA	BIT(0)
-
-#define RTL8366_RESET_CTRL_REG              0x0100
-#define RTL8366_CHIP_CTRL_RESET_HW          1
-#define RTL8366_CHIP_CTRL_RESET_SW          (1 << 1)
-
-#define RTL8366S_CHIP_VERSION_CTRL_REG      0x0104
-#define RTL8366S_CHIP_VERSION_MASK          0xf
-#define RTL8366S_CHIP_ID_REG                0x0105
-#define RTL8366S_CHIP_ID_8366               0x8366
-
-/* PHY registers control */
-#define RTL8366S_PHY_ACCESS_CTRL_REG        0x8028
-#define RTL8366S_PHY_ACCESS_DATA_REG        0x8029
-
-#define RTL8366S_PHY_CTRL_READ              1
-#define RTL8366S_PHY_CTRL_WRITE             0
-
-#define RTL8366S_PHY_REG_MASK               0x1f
-#define RTL8366S_PHY_PAGE_OFFSET            5
-#define RTL8366S_PHY_PAGE_MASK              (0x7 << 5)
-#define RTL8366S_PHY_NO_OFFSET              9
-#define RTL8366S_PHY_NO_MASK                (0x1f << 9)
-
-/* LED control registers */
-#define RTL8366_LED_BLINKRATE_REG           0x0420
-#define RTL8366_LED_BLINKRATE_BIT           0
-#define RTL8366_LED_BLINKRATE_MASK          0x0007
-
-#define RTL8366_LED_CTRL_REG                0x0421
-#define RTL8366_LED_0_1_CTRL_REG            0x0422
-#define RTL8366_LED_2_3_CTRL_REG            0x0423
-
-#define RTL8366S_MIB_COUNT                  33
-#define RTL8366S_GLOBAL_MIB_COUNT           1
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET    0x0040
-#define RTL8366S_MIB_COUNTER_BASE           0x1000
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET2   0x0008
-#define RTL8366S_MIB_COUNTER_BASE2          0x1180
-#define RTL8366S_MIB_CTRL_REG               0x11F0
-#define RTL8366S_MIB_CTRL_USER_MASK         0x01FF
-#define RTL8366S_MIB_CTRL_BUSY_MASK         0x0001
-#define RTL8366S_MIB_CTRL_RESET_MASK        0x0002
-
-#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
-#define RTL8366S_MIB_CTRL_PORT_RESET_BIT    0x0003
-#define RTL8366S_MIB_CTRL_PORT_RESET_MASK   0x01FC
-
-
-#define RTL8366S_PORT_VLAN_CTRL_BASE        0x0058
-#define RTL8366S_PORT_VLAN_CTRL_REG(_p)  \
-		(RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4)
-#define RTL8366S_PORT_VLAN_CTRL_MASK	    0xf
-#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)   (4 * ((_p) % 4))
-
-
-#define RTL8366S_VLAN_TABLE_READ_BASE       0x018B
-#define RTL8366S_VLAN_TABLE_WRITE_BASE      0x0185
-
-#define RTL8366S_VLAN_TB_CTRL_REG           0x010F
-
-#define RTL8366S_TABLE_ACCESS_CTRL_REG      0x0180
-#define RTL8366S_TABLE_VLAN_READ_CTRL       0x0E01
-#define RTL8366S_TABLE_VLAN_WRITE_CTRL      0x0F01
-
-#define RTL8366S_VLAN_MEMCONF_BASE          0x0016
-
-
-#define RTL8366S_PORT_LINK_STATUS_BASE      0x0060
-#define RTL8366S_PORT_STATUS_SPEED_MASK     0x0003
-#define RTL8366S_PORT_STATUS_DUPLEX_MASK    0x0004
-#define RTL8366S_PORT_STATUS_LINK_MASK      0x0010
-#define RTL8366S_PORT_STATUS_TXPAUSE_MASK   0x0020
-#define RTL8366S_PORT_STATUS_RXPAUSE_MASK   0x0040
-#define RTL8366S_PORT_STATUS_AN_MASK        0x0080
-
-
-#define RTL8366_PORT_NUM_CPU                5
-#define RTL8366_NUM_PORTS                   6
-#define RTL8366_NUM_VLANS                   16
-#define RTL8366_NUM_LEDGROUPS               4
-#define RTL8366_NUM_VIDS                    4096
-#define RTL8366S_PRIORITYMAX                7
-#define RTL8366S_FIDMAX	                    7
-
-
-#define RTL8366_PORT_1                      (1 << 0) /* In userspace port 0 */
-#define RTL8366_PORT_2                      (1 << 1) /* In userspace port 1 */
-#define RTL8366_PORT_3                      (1 << 2) /* In userspace port 2 */
-#define RTL8366_PORT_4                      (1 << 3) /* In userspace port 3 */
-
-#define RTL8366_PORT_UNKNOWN                (1 << 4) /* No known connection */
-#define RTL8366_PORT_CPU                    (1 << 5) /* CPU port */
-
-#define RTL8366_PORT_ALL                    (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4 |       \
-					     RTL8366_PORT_UNKNOWN | \
-					     RTL8366_PORT_CPU)
-
-#define RTL8366_PORT_ALL_BUT_CPU            (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4 |       \
-					     RTL8366_PORT_UNKNOWN)
-
-#define RTL8366_PORT_ALL_EXTERNAL           (RTL8366_PORT_1 |       \
-					     RTL8366_PORT_2 |       \
-					     RTL8366_PORT_3 |       \
-					     RTL8366_PORT_4)
-
-#define RTL8366_PORT_ALL_INTERNAL           (RTL8366_PORT_UNKNOWN | \
-					     RTL8366_PORT_CPU)
-
-struct rtl8366s {
-	struct device		*parent;
-	struct rtl8366_smi	smi;
-	struct switch_dev	dev;
-	char			buf[4096];
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-	struct dentry           *debugfs_root;
-#endif
-};
-
-struct rtl8366s_vlan_mc {
-	u16 	reserved2:1;
-	u16 	priority:3;
-	u16 	vid:12;
-
-	u16 	reserved1:1;
-	u16 	fid:3;
-	u16 	untag:6;
-	u16 	member:6;
-};
-
-struct rtl8366s_vlan_4k {
-	u16 	reserved1:4;
-	u16 	vid:12;
-
-	u16 	reserved2:1;
-	u16 	fid:3;
-	u16 	untag:6;
-	u16 	member:6;
-};
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
-struct mib_counter {
-	unsigned	base;
-	unsigned	offset;
-	unsigned	length;
-	const char	*name;
-};
-
-static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
-	{ 0,  0, 4, "IfInOctets"				},
-	{ 0,  4, 4, "EtherStatsOctets"				},
-	{ 0,  8, 2, "EtherStatsUnderSizePkts"			},
-	{ 0, 10, 2, "EtherFragments"				},
-	{ 0, 12, 2, "EtherStatsPkts64Octets"			},
-	{ 0, 14, 2, "EtherStatsPkts65to127Octets"		},
-	{ 0, 16, 2, "EtherStatsPkts128to255Octets"		},
-	{ 0, 18, 2, "EtherStatsPkts256to511Octets"		},
-	{ 0, 20, 2, "EtherStatsPkts512to1023Octets"		},
-	{ 0, 22, 2, "EtherStatsPkts1024to1518Octets"		},
-	{ 0, 24, 2, "EtherOversizeStats"			},
-	{ 0, 26, 2, "EtherStatsJabbers"				},
-	{ 0, 28, 2, "IfInUcastPkts"				},
-	{ 0, 30, 2, "EtherStatsMulticastPkts"			},
-	{ 0, 32, 2, "EtherStatsBroadcastPkts"			},
-	{ 0, 34, 2, "EtherStatsDropEvents"			},
-	{ 0, 36, 2, "Dot3StatsFCSErrors"			},
-	{ 0, 38, 2, "Dot3StatsSymbolErrors"			},
-	{ 0, 40, 2, "Dot3InPauseFrames"				},
-	{ 0, 42, 2, "Dot3ControlInUnknownOpcodes"		},
-	{ 0, 44, 4, "IfOutOctets"				},
-	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},
-	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},
-	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},
-	{ 0, 54, 2, "Dot3StatsLateCollisions"			},
-	{ 0, 56, 2, "EtherStatsCollisions"			},
-	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},
-	{ 0, 60, 2, "Dot3OutPauseFrames"			},
-	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},
-
-	/*
-	 * The following counters are accessible at a different
-	 * base address.
-	 */
-	{ 1,  0, 2, "Dot1dTpPortInDiscards"			},
-	{ 1,  2, 2, "IfOutUcastPkts"				},
-	{ 1,  4, 2, "IfOutMulticastPkts"			},
-	{ 1,  6, 2, "IfOutBroadcastPkts"			},
-};
-
-#define REG_WR(_smi, _reg, _val)					\
-	do {								\
-		err = rtl8366_smi_write_reg(_smi, _reg, _val);		\
-		if (err)						\
-			return err;					\
-	} while (0)
-
-#define REG_RMW(_smi, _reg, _mask, _val)				\
-	do {								\
-		err = rtl8366_smi_rmwr(_smi, _reg, _mask, _val);	\
-		if (err)						\
-			return err;					\
-	} while (0)
-
-static inline struct rtl8366s *smi_to_rtl8366s(struct rtl8366_smi *smi)
-{
-	return container_of(smi, struct rtl8366s, smi);
-}
-
-static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw)
-{
-	return container_of(sw, struct rtl8366s, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-	struct rtl8366s *rtl = sw_to_rtl8366s(sw);
-	return &rtl->smi;
-}
-
-static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
-{
-	int timeout = 10;
-	u32 data;
-
-	rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
-			      RTL8366_CHIP_CTRL_RESET_HW);
-	do {
-		msleep(1);
-		if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
-			return -EIO;
-
-		if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
-			break;
-	} while (--timeout);
-
-	if (!timeout) {
-		printk("Timeout waiting for the switch to reset\n");
-		return -EIO;
-	}
-
-	return 0;
-}
-
-static int rtl8366s_hw_init(struct rtl8366_smi *smi)
-{
-	int err;
-
-	/* set maximum packet length to 1536 bytes */
-	REG_RMW(smi, RTL8366_SGCR, RTL8366_SGCR_MAX_LENGTH_MASK,
-		RTL8366_SGCR_MAX_LENGTH_1536);
-
-	/* enable all ports */
-	REG_WR(smi, RTL8366_PECR, 0);
-
-	/* disable learning for all ports */
-	REG_WR(smi, RTL8366_SSCR0, RTL8366_PORT_ALL);
-
-	/* disable auto ageing for all ports */
-	REG_WR(smi, RTL8366_SSCR1, RTL8366_PORT_ALL);
-
-	/* don't drop packets whose DA has not been learned */
-	REG_RMW(smi, RTL8366_SSCR2, RTL8366_SSCR2_DROP_UNKNOWN_DA, 0);
-
-	return 0;
-}
-
-static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
-				 u32 phy_no, u32 page, u32 addr, u32 *data)
-{
-	u32 reg;
-	int ret;
-
-	if (phy_no > RTL8366S_PHY_NO_MAX)
-		return -EINVAL;
-
-	if (page > RTL8366S_PHY_PAGE_MAX)
-		return -EINVAL;
-
-	if (addr > RTL8366S_PHY_ADDR_MAX)
-		return -EINVAL;
-
-	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-				    RTL8366S_PHY_CTRL_READ);
-	if (ret)
-		return ret;
-
-	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-	      (addr & RTL8366S_PHY_REG_MASK);
-
-	ret = rtl8366_smi_write_reg(smi, reg, 0);
-	if (ret)
-		return ret;
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_PHY_ACCESS_DATA_REG, data);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
-				  u32 phy_no, u32 page, u32 addr, u32 data)
-{
-	u32 reg;
-	int ret;
-
-	if (phy_no > RTL8366S_PHY_NO_MAX)
-		return -EINVAL;
-
-	if (page > RTL8366S_PHY_PAGE_MAX)
-		return -EINVAL;
-
-	if (addr > RTL8366S_PHY_ADDR_MAX)
-		return -EINVAL;
-
-	ret = rtl8366_smi_write_reg(smi, RTL8366S_PHY_ACCESS_CTRL_REG,
-				    RTL8366S_PHY_CTRL_WRITE);
-	if (ret)
-		return ret;
-
-	reg = 0x8000 | (1 << (phy_no + RTL8366S_PHY_NO_OFFSET)) |
-	      ((page << RTL8366S_PHY_PAGE_OFFSET) & RTL8366S_PHY_PAGE_MASK) |
-	      (addr & RTL8366S_PHY_REG_MASK);
-
-	ret = rtl8366_smi_write_reg(smi, reg, data);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
-				   int port, unsigned long long *val)
-{
-	int i;
-	int err;
-	u32 addr, data;
-	u64 mibvalue;
-
-	if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
-		return -EINVAL;
-
-	switch (rtl8366s_mib_counters[counter].base) {
-	case 0:
-		addr = RTL8366S_MIB_COUNTER_BASE +
-		       RTL8366S_MIB_COUNTER_PORT_OFFSET * port;
-		break;
-
-	case 1:
-		addr = RTL8366S_MIB_COUNTER_BASE2 +
-			RTL8366S_MIB_COUNTER_PORT_OFFSET2 * port;
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	addr += rtl8366s_mib_counters[counter].offset;
-
-	/*
-	 * Writing access counter address first
-	 * then ASIC will prepare 64bits counter wait for being retrived
-	 */
-	data = 0; /* writing data will be discard by ASIC */
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	/* read MIB control register */
-	err =  rtl8366_smi_read_reg(smi, RTL8366S_MIB_CTRL_REG, &data);
-	if (err)
-		return err;
-
-	if (data & RTL8366S_MIB_CTRL_BUSY_MASK)
-		return -EBUSY;
-
-	if (data & RTL8366S_MIB_CTRL_RESET_MASK)
-		return -EIO;
-
-	mibvalue = 0;
-	for (i = rtl8366s_mib_counters[counter].length; i > 0; i--) {
-		err = rtl8366_smi_read_reg(smi, addr + (i - 1), &data);
-		if (err)
-			return err;
-
-		mibvalue = (mibvalue << 16) | (data & 0xFFFF);
-	}
-
-	*val = mibvalue;
-	return 0;
-}
-
-static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
-				struct rtl8366_vlan_4k *vlan4k)
-{
-	struct rtl8366s_vlan_4k vlan4k_priv;
-	int err;
-	u32 data;
-	u16 *tableaddr;
-
-	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
-	vlan4k_priv.vid = vid;
-
-	if (vid >= RTL8366_NUM_VIDS)
-		return -EINVAL;
-
-	tableaddr = (u16 *)&vlan4k_priv;
-
-	/* write VID */
-	data = *tableaddr;
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-	if (err)
-		return err;
-
-	/* write table access control word */
-	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-				    RTL8366S_TABLE_VLAN_READ_CTRL);
-	if (err)
-		return err;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1,
-				   &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-
-	vlan4k->vid = vid;
-	vlan4k->untag = vlan4k_priv.untag;
-	vlan4k->member = vlan4k_priv.member;
-	vlan4k->fid = vlan4k_priv.fid;
-
-	return 0;
-}
-
-static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
-				const struct rtl8366_vlan_4k *vlan4k)
-{
-	struct rtl8366s_vlan_4k vlan4k_priv;
-	int err;
-	u32 data;
-	u16 *tableaddr;
-
-	if (vlan4k->vid >= RTL8366_NUM_VIDS ||
-	    vlan4k->member > RTL8366_PORT_ALL ||
-	    vlan4k->untag > RTL8366_PORT_ALL ||
-	    vlan4k->fid > RTL8366S_FIDMAX)
-		return -EINVAL;
-
-	vlan4k_priv.vid = vlan4k->vid;
-	vlan4k_priv.untag = vlan4k->untag;
-	vlan4k_priv.member = vlan4k->member;
-	vlan4k_priv.fid = vlan4k->fid;
-
-	tableaddr = (u16 *)&vlan4k_priv;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-	if (err)
-		return err;
-
-	tableaddr++;
-
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
-				    data);
-	if (err)
-		return err;
-
-	/* write table access control word */
-	err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
-				    RTL8366S_TABLE_VLAN_WRITE_CTRL);
-
-	return err;
-}
-
-static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
-				struct rtl8366_vlan_mc *vlanmc)
-{
-	struct rtl8366s_vlan_mc vlanmc_priv;
-	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
-
-	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
-
-	if (index >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	tableaddr = (u16 *)&vlanmc_priv;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-	tableaddr++;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-	err = rtl8366_smi_read_reg(smi, addr, &data);
-	if (err)
-		return err;
-
-	*tableaddr = data;
-
-	vlanmc->vid = vlanmc_priv.vid;
-	vlanmc->priority = vlanmc_priv.priority;
-	vlanmc->untag = vlanmc_priv.untag;
-	vlanmc->member = vlanmc_priv.member;
-	vlanmc->fid = vlanmc_priv.fid;
-
-	return 0;
-}
-
-static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
-				const struct rtl8366_vlan_mc *vlanmc)
-{
-	struct rtl8366s_vlan_mc vlanmc_priv;
-	int err;
-	u32 addr;
-	u32 data;
-	u16 *tableaddr;
-
-	if (index >= RTL8366_NUM_VLANS ||
-	    vlanmc->vid >= RTL8366_NUM_VIDS ||
-	    vlanmc->priority > RTL8366S_PRIORITYMAX ||
-	    vlanmc->member > RTL8366_PORT_ALL ||
-	    vlanmc->untag > RTL8366_PORT_ALL ||
-	    vlanmc->fid > RTL8366S_FIDMAX)
-		return -EINVAL;
-
-	vlanmc_priv.vid = vlanmc->vid;
-	vlanmc_priv.priority = vlanmc->priority;
-	vlanmc_priv.untag = vlanmc->untag;
-	vlanmc_priv.member = vlanmc->member;
-	vlanmc_priv.fid = vlanmc->fid;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-
-	tableaddr = (u16 *)&vlanmc_priv;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-
-	tableaddr++;
-	data = *tableaddr;
-
-	err = rtl8366_smi_write_reg(smi, addr, data);
-	if (err)
-		return err;
-
-	return 0;
-}
-
-static int rtl8366s_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
-{
-	u32 data;
-	int err;
-
-	if (port >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
-				   &data);
-	if (err)
-		return err;
-
-	*val = (data >> RTL8366S_PORT_VLAN_CTRL_SHIFT(port)) &
-	       RTL8366S_PORT_VLAN_CTRL_MASK;
-
-	return 0;
-}
-
-static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
-{
-	if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
-				RTL8366S_PORT_VLAN_CTRL_MASK <<
-					RTL8366S_PORT_VLAN_CTRL_SHIFT(port),
-				(index & RTL8366S_PORT_VLAN_CTRL_MASK) <<
-					RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
-}
-
-static int rtl8366s_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
-			     u32 untag, u32 fid)
-{
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Update the 4K table */
-	err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-	if (err)
-		return err;
-
-	vlan4k.member = member;
-	vlan4k.untag = untag;
-	vlan4k.fid = fid;
-	err = rtl8366s_set_vlan_4k(smi, &vlan4k);
-	if (err)
-		return err;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		struct rtl8366_vlan_mc vlanmc;
-
-		err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			/* update the MC entry */
-			vlanmc.member = member;
-			vlanmc.untag = untag;
-			vlanmc.fid = fid;
-
-			err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-			break;
-		}
-	}
-
-	return err;
-}
-
-static int rtl8366s_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int index;
-
-	err = rtl8366s_get_mc_index(smi, port, &index);
-	if (err)
-		return err;
-
-	err = rtl8366s_get_vlan_mc(smi, index, &vlanmc);
-	if (err)
-		return err;
-
-	*val = vlanmc.vid;
-	return 0;
-}
-
-static int rtl8366s_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-			       int *used)
-{
-	int err;
-	int i;
-
-	*used = 0;
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		int index = 0;
-
-		err = rtl8366s_get_mc_index(smi, i, &index);
-		if (err)
-			return err;
-
-		if (mc_index == index) {
-			*used = 1;
-			break;
-		}
-	}
-
-	return 0;
-}
-
-static int rtl8366s_set_pvid(struct rtl8366_smi *smi, unsigned port,
-			     unsigned vid)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	struct rtl8366_vlan_4k vlan4k;
-	int err;
-	int i;
-
-	/* Try to find an existing MC entry for this VID */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vid == vlanmc.vid) {
-			err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366s_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* We have no MC entry for this VID, try to find an empty one */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-
-		if (vlanmc.vid == 0 && vlanmc.member == 0) {
-			/* Update the entry from the 4K table */
-			err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366s_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	/* MC table is full, try to find an unused entry and replace it */
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		int used;
-
-		err = rtl8366s_mc_is_used(smi, i, &used);
-		if (err)
-			return err;
-
-		if (!used) {
-			/* Update the entry from the 4K table */
-			err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-			if (err)
-				return err;
-
-			vlanmc.vid = vid;
-			vlanmc.member = vlan4k.member;
-			vlanmc.untag = vlan4k.untag;
-			vlanmc.fid = vlan4k.fid;
-			err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-			if (err)
-				return err;
-
-			err = rtl8366s_set_mc_index(smi, port, i);
-			return err;
-		}
-	}
-
-	dev_err(smi->parent,
-		"all VLAN member configurations are in use\n");
-
-	return -ENOSPC;
-}
-
-static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
-{
-	return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-				RTL8366_CHIP_CTRL_VLAN,
-				(enable) ? RTL8366_CHIP_CTRL_VLAN : 0);
-}
-
-static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
-{
-	return rtl8366_smi_rmwr(smi, RTL8366S_VLAN_TB_CTRL_REG,
-				1, (enable) ? 1 : 0);
-}
-
-static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
-{
-	struct rtl8366_vlan_mc vlanmc;
-	int err;
-	int i;
-
-	/* clear VLAN member configurations */
-	vlanmc.vid = 0;
-	vlanmc.priority = 0;
-	vlanmc.member = 0;
-	vlanmc.untag = 0;
-	vlanmc.fid = 0;
-	for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-		err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-		if (err)
-			return err;
-	}
-
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (i == RTL8366_PORT_CPU)
-			continue;
-
-		err = rtl8366s_set_vlan(smi, (i + 1),
-					 (1 << i) | RTL8366_PORT_CPU,
-					 (1 << i) | RTL8366_PORT_CPU,
-					 0);
-		if (err)
-			return err;
-
-		err = rtl8366s_set_pvid(smi, i, (i + 1));
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
-	file->private_data = inode->i_private;
-	return 0;
-}
-
-static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
-					  char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, j, len = 0;
-	char *buf = rtl->buf;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"%-36s %12s %12s %12s %12s %12s %12s\n",
-			"Counter",
-			"Port 0", "Port 1", "Port 2",
-			"Port 3", "Port 4", "Port 5");
-
-	for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
-				rtl8366s_mib_counters[i].name);
-		for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
-			unsigned long long counter = 0;
-
-			if (!rtl8366_get_mib_counter(smi, i, j, &counter))
-				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
-						"%12llu ", counter);
-			else
-				len += snprintf(buf + len,
-						sizeof(rtl->buf) - len,
-						"%12s ", "error");
-		}
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-	}
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
-					     char __user *user_buf,
-					     size_t count, loff_t *ppos)
-{
-	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, len = 0;
-	char *buf = rtl->buf;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"%2s %6s %4s %6s %6s %3s\n",
-			"id", "vid","prio", "member", "untag", "fid");
-
-	for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-		struct rtl8366_vlan_mc vlanmc;
-
-		rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
-				"%2d %6d %4d 0x%04x 0x%04x %3d\n",
-				i, vlanmc.vid, vlanmc.priority,
-				vlanmc.member, vlanmc.untag, vlanmc.fid);
-	}
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_reg(struct file *file,
-					 char __user *user_buf,
-					 size_t count, loff_t *ppos)
-{
-	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	u32 t, reg = g_dbg_reg;
-	int err, len = 0;
-	char *buf = rtl->buf;
-
-	memset(buf, '\0', sizeof(rtl->buf));
-
-	err = rtl8366_smi_read_reg(smi, reg, &t);
-	if (err) {
-		len += snprintf(buf, sizeof(rtl->buf),
-				"Read failed (reg: 0x%04x)\n", reg);
-		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-	}
-
-	len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
-			reg, t);
-
-	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_write_debugfs_reg(struct file *file,
-					  const char __user *user_buf,
-					  size_t count, loff_t *ppos)
-{
-	struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-	struct rtl8366_smi *smi = &rtl->smi;
-	unsigned long data;
-	u32 reg = g_dbg_reg;
-	int err;
-	size_t len;
-	char *buf = rtl->buf;
-
-	len = min(count, sizeof(rtl->buf) - 1);
-	if (copy_from_user(buf, user_buf, len)) {
-		dev_err(rtl->parent, "copy from user failed\n");
-		return -EFAULT;
-	}
-
-	buf[len] = '\0';
-	if (len > 0 && buf[len - 1] == '\n')
-		buf[len - 1] = '\0';
-
-
-	if (strict_strtoul(buf, 16, &data)) {
-		dev_err(rtl->parent, "Invalid reg value %s\n", buf);
-	} else {
-		err = rtl8366_smi_write_reg(smi, reg, data);
-		if (err) {
-			dev_err(rtl->parent,
-				"writing reg 0x%04x val 0x%04lx failed\n",
-				reg, data);
-		}
-	}
-
-	return count;
-}
-
-static const struct file_operations fops_rtl8366s_regs = {
-	.read = rtl8366s_read_debugfs_reg,
-	.write = rtl8366s_write_debugfs_reg,
-	.open = rtl8366s_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_vlan_mc = {
-	.read = rtl8366s_read_debugfs_vlan_mc,
-	.open = rtl8366s_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_mibs = {
-	.read = rtl8366s_read_debugfs_mibs,
-	.open = rtl8366s_debugfs_open,
-	.owner = THIS_MODULE
-};
-
-static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
-{
-	struct dentry *node;
-	struct dentry *root;
-
-	if (!rtl->debugfs_root)
-		rtl->debugfs_root = debugfs_create_dir("rtl8366s", NULL);
-
-	if (!rtl->debugfs_root) {
-		dev_err(rtl->parent, "Unable to create debugfs dir\n");
-		return;
-	}
-	root = rtl->debugfs_root;
-
-	node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &g_dbg_reg);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"reg");
-		return;
-	}
-
-	node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
-				   &fops_rtl8366s_regs);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"val");
-		return;
-	}
-
-	node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
-				   &fops_rtl8366s_vlan_mc);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"vlan_mc");
-		return;
-	}
-
-	node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
-				   &fops_rtl8366s_mibs);
-	if (!node) {
-		dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-			"mibs");
-		return;
-	}
-}
-
-static void rtl8366s_debugfs_remove(struct rtl8366s *rtl)
-{
-	if (rtl->debugfs_root) {
-		debugfs_remove_recursive(rtl->debugfs_root);
-		rtl->debugfs_root = NULL;
-	}
-}
-
-#else
-static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {}
-static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-
-static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
-				  const struct switch_attr *attr,
-				  struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	int err = 0;
-
-	if (val->value.i == 1)
-		err = rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
-
-	return err;
-}
-
-static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-
-	if (attr->ofs == 1) {
-		rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-		if (data & RTL8366_CHIP_CTRL_VLAN)
-			val->value.i = 1;
-		else
-			val->value.i = 0;
-	} else if (attr->ofs == 2) {
-		rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
-
-		if (data & 0x0001)
-			val->value.i = 1;
-		else
-			val->value.i = 0;
-	}
-
-	return 0;
-}
-
-static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-
-	rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
-
-	val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
-
-	return 0;
-}
-
-static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (val->value.i >= 6)
-		return -EINVAL;
-
-	return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG,
-				RTL8366_LED_BLINKRATE_MASK,
-				val->value.i);
-}
-
-static int rtl8366s_sw_set_vlan_enable(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (attr->ofs == 1)
-		return rtl8366s_vlan_set_vlan(smi, val->value.i);
-	else
-		return rtl8366s_vlan_set_4ktable(smi, val->value.i);
-}
-
-static const char *rtl8366s_speed_str(unsigned speed)
-{
-	switch (speed) {
-	case 0:
-		return "10baseT";
-	case 1:
-		return "100baseT";
-	case 2:
-		return "1000baseT";
-	}
-
-	return "unknown";
-}
-
-static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	u32 len = 0, data = 0;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	memset(rtl->buf, '\0', sizeof(rtl->buf));
-	rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
-			     (val->port_vlan / 2), &data);
-
-	if (val->port_vlan % 2)
-		data = data >> 8;
-
-	if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-		len = snprintf(rtl->buf, sizeof(rtl->buf),
-				"port:%d link:up speed:%s %s-duplex %s%s%s",
-				val->port_vlan,
-				rtl8366s_speed_str(data &
-					  RTL8366S_PORT_STATUS_SPEED_MASK),
-				(data & RTL8366S_PORT_STATUS_DUPLEX_MASK) ?
-					"full" : "half",
-				(data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) ?
-					"tx-pause ": "",
-				(data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) ?
-					"rx-pause " : "",
-				(data & RTL8366S_PORT_STATUS_AN_MASK) ?
-					"nway ": "");
-	} else {
-		len = snprintf(rtl->buf, sizeof(rtl->buf), "port:%d link: down",
-				val->port_vlan);
-	}
-
-	val->value.s = rtl->buf;
-	val->len = len;
-
-	return 0;
-}
-
-static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
-				     const struct switch_attr *attr,
-				     struct switch_val *val)
-{
-	int i;
-	u32 len = 0;
-	struct rtl8366_vlan_4k vlan4k;
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	char *buf = rtl->buf;
-	int err;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	memset(buf, '\0', sizeof(rtl->buf));
-
-	err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-	if (err)
-		return err;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"VLAN %d: Ports: '", vlan4k.vid);
-
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (!(vlan4k.member & (1 << i)))
-			continue;
-
-		len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
-				(vlan4k.untag & (1 << i)) ? "" : "t");
-	}
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"', members=%04x, untag=%04x, fid=%u",
-			vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-	val->value.s = buf;
-	val->len = len;
-
-	return 0;
-}
-
-static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data;
-	u32 mask;
-	u32 reg;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS ||
-	    (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN)
-		return -EINVAL;
-
-	if (val->port_vlan == RTL8366_PORT_NUM_CPU) {
-		reg = RTL8366_LED_BLINKRATE_REG;
-		mask = 0xF << 4;
-		data = val->value.i << 4;
-	} else {
-		reg = RTL8366_LED_CTRL_REG;
-		mask = 0xF << (val->port_vlan * 4),
-		data = val->value.i << (val->port_vlan * 4);
-	}
-
-	return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG, mask, data);
-}
-
-static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 data = 0;
-
-	if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
-		return -EINVAL;
-
-	rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
-	val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
-
-	return 0;
-}
-
-static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
-				       const struct switch_attr *attr,
-				       struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-
-	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG,
-				0, (1 << (val->port_vlan + 3)));
-}
-
-static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
-				    const struct switch_attr *attr,
-				    struct switch_val *val)
-{
-	struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-	struct rtl8366_smi *smi = &rtl->smi;
-	int i, len = 0;
-	unsigned long long counter = 0;
-	char *buf = rtl->buf;
-
-	if (val->port_vlan >= RTL8366_NUM_PORTS)
-		return -EINVAL;
-
-	len += snprintf(buf + len, sizeof(rtl->buf) - len,
-			"Port %d MIB counters\n",
-			val->port_vlan);
-
-	for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-		len += snprintf(buf + len, sizeof(rtl->buf) - len,
-				"%-36s: ", rtl8366s_mib_counters[i].name);
-		if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
-					"%llu\n", counter);
-		else
-			len += snprintf(buf + len, sizeof(rtl->buf) - len,
-					"%s\n", "error");
-	}
-
-	val->value.s = buf;
-	val->len = len;
-	return 0;
-}
-
-static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
-				      struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	struct switch_port *port;
-	struct rtl8366_vlan_4k vlan4k;
-	int i;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-
-	port = &val->value.ports[0];
-	val->len = 0;
-	for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-		if (!(vlan4k.member & BIT(i)))
-			continue;
-
-		port->id = i;
-		port->flags = (vlan4k.untag & BIT(i)) ?
-					0 : BIT(SWITCH_PORT_FLAG_TAGGED);
-		val->len++;
-		port++;
-	}
-	return 0;
-}
-
-static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
-				      struct switch_val *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	struct switch_port *port;
-	u32 member = 0;
-	u32 untag = 0;
-	int i;
-
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-		return -EINVAL;
-
-	port = &val->value.ports[0];
-	for (i = 0; i < val->len; i++, port++) {
-		member |= BIT(port->id);
-
-		if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
-			untag |= BIT(port->id);
-	}
-
-	return rtl8366s_set_vlan(smi, val->port_vlan, member, untag, 0);
-}
-
-static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366s_get_pvid(smi, port, val);
-}
-
-static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	return rtl8366s_set_pvid(smi, port, val);
-}
-
-static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
-{
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	int err;
-
-	err = rtl8366s_reset_chip(smi);
-	if (err)
-		return err;
-
-	err = rtl8366s_hw_init(smi);
-	if (err)
-		return err;
-
-	return rtl8366s_reset_vlan(smi);
-}
-
-static struct switch_attr rtl8366s_globals[] = {
-	{
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan",
-		.description = "Enable VLAN mode",
-		.set = rtl8366s_sw_set_vlan_enable,
-		.get = rtl8366s_sw_get_vlan_enable,
-		.max = 1,
-		.ofs = 1
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "enable_vlan4k",
-		.description = "Enable VLAN 4K mode",
-		.set = rtl8366s_sw_set_vlan_enable,
-		.get = rtl8366s_sw_get_vlan_enable,
-		.max = 1,
-		.ofs = 2
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "reset_mibs",
-		.description = "Reset all MIB counters",
-		.set = rtl8366s_sw_reset_mibs,
-		.get = NULL,
-		.max = 1
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "blinkrate",
-		.description = "Get/Set LED blinking rate (0 = 43ms, 1 = 84ms,"
-		" 2 = 120ms, 3 = 170ms, 4 = 340ms, 5 = 670ms)",
-		.set = rtl8366s_sw_set_blinkrate,
-		.get = rtl8366s_sw_get_blinkrate,
-		.max = 5
-	},
-};
-
-static struct switch_attr rtl8366s_port[] = {
-	{
-		.type = SWITCH_TYPE_STRING,
-		.name = "link",
-		.description = "Get port link information",
-		.max = 1,
-		.set = NULL,
-		.get = rtl8366s_sw_get_port_link,
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "reset_mib",
-		.description = "Reset single port MIB counters",
-		.max = 1,
-		.set = rtl8366s_sw_reset_port_mibs,
-		.get = NULL,
-	}, {
-		.type = SWITCH_TYPE_STRING,
-		.name = "mib",
-		.description = "Get MIB counters for port",
-		.max = 33,
-		.set = NULL,
-		.get = rtl8366s_sw_get_port_mib,
-	}, {
-		.type = SWITCH_TYPE_INT,
-		.name = "led",
-		.description = "Get/Set port group (0 - 3) led mode (0 - 15)",
-		.max = 15,
-		.set = rtl8366s_sw_set_port_led,
-		.get = rtl8366s_sw_get_port_led,
-	},
-};
-
-static struct switch_attr rtl8366s_vlan[] = {
-	{
-		.type = SWITCH_TYPE_STRING,
-		.name = "info",
-		.description = "Get vlan information",
-		.max = 1,
-		.set = NULL,
-		.get = rtl8366s_sw_get_vlan_info,
-	},
-};
-
-/* template */
-static struct switch_dev rtl8366_switch_dev = {
-	.name = "RTL8366S",
-	.cpu_port = RTL8366_PORT_NUM_CPU,
-	.ports = RTL8366_NUM_PORTS,
-	.vlans = RTL8366_NUM_VLANS,
-	.attr_global = {
-		.attr = rtl8366s_globals,
-		.n_attr = ARRAY_SIZE(rtl8366s_globals),
-	},
-	.attr_port = {
-		.attr = rtl8366s_port,
-		.n_attr = ARRAY_SIZE(rtl8366s_port),
-	},
-	.attr_vlan = {
-		.attr = rtl8366s_vlan,
-		.n_attr = ARRAY_SIZE(rtl8366s_vlan),
-	},
-
-	.get_vlan_ports = rtl8366s_sw_get_vlan_ports,
-	.set_vlan_ports = rtl8366s_sw_set_vlan_ports,
-	.get_port_pvid = rtl8366s_sw_get_port_pvid,
-	.set_port_pvid = rtl8366s_sw_set_port_pvid,
-	.reset_switch = rtl8366s_sw_reset_switch,
-};
-
-static int rtl8366s_switch_init(struct rtl8366s *rtl)
-{
-	struct switch_dev *dev = &rtl->dev;
-	int err;
-
-	memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-	dev->priv = rtl;
-	dev->devname = dev_name(rtl->parent);
-
-	err = register_switch(dev, NULL);
-	if (err)
-		dev_err(rtl->parent, "switch registration failed\n");
-
-	return err;
-}
-
-static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
-{
-	unregister_switch(&rtl->dev);
-}
-
-static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
-{
-	struct rtl8366_smi *smi = bus->priv;
-	u32 val = 0;
-	int err;
-
-	err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val);
-	if (err)
-		return 0xffff;
-
-	return val;
-}
-
-static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
-{
-	struct rtl8366_smi *smi = bus->priv;
-	u32 t;
-	int err;
-
-	err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val);
-	/* flush write */
-	(void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t);
-
-	return err;
-}
-
-static int rtl8366s_mii_bus_match(struct mii_bus *bus)
-{
-	return (bus->read == rtl8366s_mii_read &&
-		bus->write == rtl8366s_mii_write);
-}
-
-static int rtl8366s_setup(struct rtl8366s *rtl)
-{
-	struct rtl8366_smi *smi = &rtl->smi;
-	int ret;
-
-	rtl8366s_debugfs_init(rtl);
-
-	ret = rtl8366s_reset_chip(smi);
-	if (ret)
-		return ret;
-
-	ret = rtl8366s_hw_init(smi);
-	return ret;
-}
-
-static int rtl8366s_detect(struct rtl8366_smi *smi)
-{
-	u32 chip_id = 0;
-	u32 chip_ver = 0;
-	int ret;
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_ID_REG, &chip_id);
-	if (ret) {
-		dev_err(smi->parent, "unable to read chip id\n");
-		return ret;
-	}
-
-	switch (chip_id) {
-	case RTL8366S_CHIP_ID_8366:
-		break;
-	default:
-		dev_err(smi->parent, "unknown chip id (%04x)\n", chip_id);
-		return -ENODEV;
-	}
-
-	ret = rtl8366_smi_read_reg(smi, RTL8366S_CHIP_VERSION_CTRL_REG,
-				   &chip_ver);
-	if (ret) {
-		dev_err(smi->parent, "unable to read chip version\n");
-		return ret;
-	}
-
-	dev_info(smi->parent, "RTL%04x ver. %u chip found\n",
-		 chip_id, chip_ver & RTL8366S_CHIP_VERSION_MASK);
-
-	return 0;
-}
-
-static struct rtl8366_smi_ops rtl8366s_smi_ops = {
-	.detect		= rtl8366s_detect,
-	.mii_read	= rtl8366s_mii_read,
-	.mii_write	= rtl8366s_mii_write,
-};
-
-static int __init rtl8366s_probe(struct platform_device *pdev)
-{
-	static int rtl8366_smi_version_printed;
-	struct rtl8366s_platform_data *pdata;
-	struct rtl8366s *rtl;
-	struct rtl8366_smi *smi;
-	int err;
-
-	if (!rtl8366_smi_version_printed++)
-		printk(KERN_NOTICE RTL8366S_DRIVER_DESC
-		       " version " RTL8366S_DRIVER_VER"\n");
-
-	pdata = pdev->dev.platform_data;
-	if (!pdata) {
-		dev_err(&pdev->dev, "no platform data specified\n");
-		err = -EINVAL;
-		goto err_out;
-	}
-
-	rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-	if (!rtl) {
-		dev_err(&pdev->dev, "no memory for private data\n");
-		err = -ENOMEM;
-		goto err_out;
-	}
-
-	rtl->parent = &pdev->dev;
-
-	smi = &rtl->smi;
-	smi->parent = &pdev->dev;
-	smi->gpio_sda = pdata->gpio_sda;
-	smi->gpio_sck = pdata->gpio_sck;
-	smi->ops = &rtl8366s_smi_ops;
-
-	err = rtl8366_smi_init(smi);
-	if (err)
-		goto err_free_rtl;
-
-	platform_set_drvdata(pdev, rtl);
-
-	err = rtl8366s_setup(rtl);
-	if (err)
-		goto err_clear_drvdata;
-
-	err = rtl8366s_switch_init(rtl);
-	if (err)
-		goto err_clear_drvdata;
-
-	return 0;
-
- err_clear_drvdata:
-	platform_set_drvdata(pdev, NULL);
-	rtl8366_smi_cleanup(smi);
- err_free_rtl:
-	kfree(rtl);
- err_out:
-	return err;
-}
-
-static int rtl8366s_phy_config_init(struct phy_device *phydev)
-{
-	if (!rtl8366s_mii_bus_match(phydev->bus))
-		return -EINVAL;
-
-	return 0;
-}
-
-static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static struct phy_driver rtl8366s_phy_driver = {
-	.phy_id		= 0x001cc960,
-	.name		= "Realtek RTL8366S",
-	.phy_id_mask	= 0x1ffffff0,
-	.features	= PHY_GBIT_FEATURES,
-	.config_aneg	= rtl8366s_phy_config_aneg,
-	.config_init    = rtl8366s_phy_config_init,
-	.read_status	= genphy_read_status,
-	.driver		= {
-		.owner = THIS_MODULE,
-	},
-};
-
-static int __devexit rtl8366s_remove(struct platform_device *pdev)
-{
-	struct rtl8366s *rtl = platform_get_drvdata(pdev);
-
-	if (rtl) {
-		rtl8366s_switch_cleanup(rtl);
-		rtl8366s_debugfs_remove(rtl);
-		platform_set_drvdata(pdev, NULL);
-		rtl8366_smi_cleanup(&rtl->smi);
-		kfree(rtl);
-	}
-
-	return 0;
-}
-
-static struct platform_driver rtl8366s_driver = {
-	.driver = {
-		.name		= RTL8366S_DRIVER_NAME,
-		.owner		= THIS_MODULE,
-	},
-	.probe		= rtl8366s_probe,
-	.remove		= __devexit_p(rtl8366s_remove),
-};
-
-static int __init rtl8366s_module_init(void)
-{
-	int ret;
-	ret = platform_driver_register(&rtl8366s_driver);
-	if (ret)
-		return ret;
-
-	ret = phy_driver_register(&rtl8366s_phy_driver);
-	if (ret)
-		goto err_platform_unregister;
-
-	return 0;
-
- err_platform_unregister:
-	platform_driver_unregister(&rtl8366s_driver);
-	return ret;
-}
-module_init(rtl8366s_module_init);
-
-static void __exit rtl8366s_module_exit(void)
-{
-	phy_driver_unregister(&rtl8366s_phy_driver);
-	platform_driver_unregister(&rtl8366s_driver);
-}
-module_exit(rtl8366s_module_exit);
-
-MODULE_DESCRIPTION(RTL8366S_DRIVER_DESC);
-MODULE_VERSION(RTL8366S_DRIVER_VER);
-MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_AUTHOR("Antti Seppälä <a.seppala@gmail.com>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:" RTL8366S_DRIVER_NAME);
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
deleted file mode 100644
index dea8e78b79..0000000000
--- a/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
- * swconfig.c: Switch configuration API
- *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/if.h>
-#include <linux/if_ether.h>
-#include <linux/capability.h>
-#include <linux/skbuff.h>
-#include <linux/switch.h>
-
-//#define DEBUG 1
-#ifdef DEBUG
-#define DPRINTF(format, ...) printk("%s: " format, __func__, ##__VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
-MODULE_LICENSE("GPL");
-
-static int swdev_id = 0;
-static struct list_head swdevs;
-static spinlock_t swdevs_lock = SPIN_LOCK_UNLOCKED;
-struct swconfig_callback;
-
-struct swconfig_callback
-{
-	struct sk_buff *msg;
-	struct genlmsghdr *hdr;
-	struct genl_info *info;
-	int cmd;
-
-	/* callback for filling in the message data */
-	int (*fill)(struct swconfig_callback *cb, void *arg);
-
-	/* callback for closing the message before sending it */
-	int (*close)(struct swconfig_callback *cb, void *arg);
-
-	struct nlattr *nest[4];
-	int args[4];
-};
-
-/* defaults */
-
-static int
-swconfig_get_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	int ret;
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	if (!dev->get_vlan_ports)
-		return -EOPNOTSUPP;
-
-	ret = dev->get_vlan_ports(dev, val);
-	return ret;
-}
-
-static int
-swconfig_set_vlan_ports(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	struct switch_port *ports = val->value.ports;
-	int i;
-
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	/* validate ports */
-	if (val->len > dev->ports)
-		return -EINVAL;
-
-	if (!dev->set_vlan_ports)
-		return -EOPNOTSUPP;
-
-	for (i = 0; i < val->len; i++) {
-		if (ports[i].id >= dev->ports)
-			return -EINVAL;
-
-		if (dev->set_port_pvid && !(ports[i].flags & (1 << SWITCH_PORT_FLAG_TAGGED)))
-			dev->set_port_pvid(dev, ports[i].id, val->port_vlan);
-	}
-
-	return dev->set_vlan_ports(dev, val);
-}
-
-static int
-swconfig_set_pvid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= dev->ports)
-		return -EINVAL;
-
-	if (!dev->set_port_pvid)
-		return -EOPNOTSUPP;
-
-	return dev->set_port_pvid(dev, val->port_vlan, val->value.i);
-}
-
-static int
-swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	if (val->port_vlan >= dev->ports)
-		return -EINVAL;
-
-	if (!dev->get_port_pvid)
-		return -EOPNOTSUPP;
-
-	return dev->get_port_pvid(dev, val->port_vlan, &val->value.i);
-}
-
-static int
-swconfig_apply_config(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	/* don't complain if not supported by the switch driver */
-	if (!dev->apply_config)
-		return 0;
-
-	return dev->apply_config(dev);
-}
-
-static int
-swconfig_reset_switch(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val)
-{
-	/* don't complain if not supported by the switch driver */
-	if (!dev->reset_switch)
-		return 0;
-
-	return dev->reset_switch(dev);
-}
-
-enum global_defaults {
-	GLOBAL_APPLY,
-	GLOBAL_RESET,
-};
-
-enum vlan_defaults {
-	VLAN_PORTS,
-};
-
-enum port_defaults {
-	PORT_PVID,
-};
-
-static struct switch_attr default_global[] = {
-	[GLOBAL_APPLY] = {
-		.type = SWITCH_TYPE_NOVAL,
-		.name = "apply",
-		.description = "Activate changes in the hardware",
-		.set = swconfig_apply_config,
-	},
-	[GLOBAL_RESET] = {
-		.type = SWITCH_TYPE_NOVAL,
-		.name = "reset",
-		.description = "Reset the switch",
-		.set = swconfig_reset_switch,
-	}
-};
-
-static struct switch_attr default_port[] = {
-	[PORT_PVID] = {
-		.type = SWITCH_TYPE_INT,
-		.name = "pvid",
-		.description = "Primary VLAN ID",
-		.set = swconfig_set_pvid,
-		.get = swconfig_get_pvid,
-	}
-};
-
-static struct switch_attr default_vlan[] = {
-	[VLAN_PORTS] = {
-		.type = SWITCH_TYPE_PORTS,
-		.name = "ports",
-		.description = "VLAN port mapping",
-		.set = swconfig_set_vlan_ports,
-		.get = swconfig_get_vlan_ports,
-	},
-};
-
-
-static void swconfig_defaults_init(struct switch_dev *dev)
-{
-	dev->def_global = 0;
-	dev->def_vlan = 0;
-	dev->def_port = 0;
-
-	if (dev->get_vlan_ports || dev->set_vlan_ports)
-		set_bit(VLAN_PORTS, &dev->def_vlan);
-
-	if (dev->get_port_pvid || dev->set_port_pvid)
-		set_bit(PORT_PVID, &dev->def_port);
-
-	/* always present, can be no-op */
-	set_bit(GLOBAL_APPLY, &dev->def_global);
-	set_bit(GLOBAL_RESET, &dev->def_global);
-}
-
-
-static struct genl_family switch_fam = {
-	.id = GENL_ID_GENERATE,
-	.name = "switch",
-	.hdrsize = 0,
-	.version = 1,
-	.maxattr = SWITCH_ATTR_MAX,
-};
-
-static const struct nla_policy switch_policy[SWITCH_ATTR_MAX+1] = {
-	[SWITCH_ATTR_ID] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_ID] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_PORT] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VLAN] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VALUE_INT] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VALUE_STR] = { .type = NLA_NUL_STRING },
-	[SWITCH_ATTR_OP_VALUE_PORTS] = { .type = NLA_NESTED },
-	[SWITCH_ATTR_TYPE] = { .type = NLA_U32 },
-};
-
-static const struct nla_policy port_policy[SWITCH_PORT_ATTR_MAX+1] = {
-	[SWITCH_PORT_ID] = { .type = NLA_U32 },
-	[SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
-};
-
-static inline void
-swconfig_lock(void)
-{
-	spin_lock(&swdevs_lock);
-}
-
-static inline void
-swconfig_unlock(void)
-{
-	spin_unlock(&swdevs_lock);
-}
-
-static struct switch_dev *
-swconfig_get_dev(struct genl_info *info)
-{
-	struct switch_dev *dev = NULL;
-	struct switch_dev *p;
-	int id;
-
-	if (!info->attrs[SWITCH_ATTR_ID])
-		goto done;
-
-	id = nla_get_u32(info->attrs[SWITCH_ATTR_ID]);
-	swconfig_lock();
-	list_for_each_entry(p, &swdevs, dev_list) {
-		if (id != p->id)
-			continue;
-
-		dev = p;
-		break;
-	}
-	if (dev)
-		spin_lock(&dev->lock);
-	else
-		DPRINTF("device %d not found\n", id);
-	swconfig_unlock();
-done:
-	return dev;
-}
-
-static inline void
-swconfig_put_dev(struct switch_dev *dev)
-{
-	spin_unlock(&dev->lock);
-}
-
-static int
-swconfig_dump_attr(struct swconfig_callback *cb, void *arg)
-{
-	struct switch_attr *op = arg;
-	struct genl_info *info = cb->info;
-	struct sk_buff *msg = cb->msg;
-	int id = cb->args[0];
-	void *hdr;
-
-	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
-			NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
-	if (IS_ERR(hdr))
-		return -1;
-
-	NLA_PUT_U32(msg, SWITCH_ATTR_OP_ID, id);
-	NLA_PUT_U32(msg, SWITCH_ATTR_OP_TYPE, op->type);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_OP_NAME, op->name);
-	if (op->description)
-		NLA_PUT_STRING(msg, SWITCH_ATTR_OP_DESCRIPTION,
-			op->description);
-
-	return genlmsg_end(msg, hdr);
-nla_put_failure:
-	genlmsg_cancel(msg, hdr);
-	return -EMSGSIZE;
-}
-
-/* spread multipart messages across multiple message buffers */
-static int
-swconfig_send_multipart(struct swconfig_callback *cb, void *arg)
-{
-	struct genl_info *info = cb->info;
-	int restart = 0;
-	int err;
-
-	do {
-		if (!cb->msg) {
-			cb->msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-			if (cb->msg == NULL)
-				goto error;
-		}
-
-		if (!(cb->fill(cb, arg) < 0))
-			break;
-
-		/* fill failed, check if this was already the second attempt */
-		if (restart)
-			goto error;
-
-		/* try again in a new message, send the current one */
-		restart = 1;
-		if (cb->close) {
-			if (cb->close(cb, arg) < 0)
-				goto error;
-		}
-		err = genlmsg_unicast(cb->msg, info->snd_pid);
-		cb->msg = NULL;
-		if (err < 0)
-			goto error;
-
-	} while (restart);
-
-	return 0;
-
-error:
-	if (cb->msg)
-		nlmsg_free(cb->msg);
-	return -1;
-}
-
-static int
-swconfig_list_attrs(struct sk_buff *skb, struct genl_info *info)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	const struct switch_attrlist *alist;
-	struct switch_dev *dev;
-	struct swconfig_callback cb;
-	int err = -EINVAL;
-	int i;
-
-	/* defaults */
-	struct switch_attr *def_list;
-	unsigned long *def_active;
-	int n_def;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	switch(hdr->cmd) {
-	case SWITCH_CMD_LIST_GLOBAL:
-		alist = &dev->attr_global;
-		def_list = default_global;
-		def_active = &dev->def_global;
-		n_def = ARRAY_SIZE(default_global);
-		break;
-	case SWITCH_CMD_LIST_VLAN:
-		alist = &dev->attr_vlan;
-		def_list = default_vlan;
-		def_active = &dev->def_vlan;
-		n_def = ARRAY_SIZE(default_vlan);
-		break;
-	case SWITCH_CMD_LIST_PORT:
-		alist = &dev->attr_port;
-		def_list = default_port;
-		def_active = &dev->def_port;
-		n_def = ARRAY_SIZE(default_port);
-		break;
-	default:
-		WARN_ON(1);
-		goto out;
-	}
-
-	memset(&cb, 0, sizeof(cb));
-	cb.info = info;
-	cb.fill = swconfig_dump_attr;
-	for (i = 0; i < alist->n_attr; i++) {
-		if (alist->attr[i].disabled)
-			continue;
-		cb.args[0] = i;
-		err = swconfig_send_multipart(&cb, (void *) &alist->attr[i]);
-		if (err < 0)
-			goto error;
-	}
-
-	/* defaults */
-	for (i = 0; i < n_def; i++) {
-		if (!test_bit(i, def_active))
-			continue;
-		cb.args[0] = SWITCH_ATTR_DEFAULTS_OFFSET + i;
-		err = swconfig_send_multipart(&cb, (void *) &def_list[i]);
-		if (err < 0)
-			goto error;
-	}
-	swconfig_put_dev(dev);
-
-	if (!cb.msg)
-		return 0;
-
-	return genlmsg_unicast(cb.msg, info->snd_pid);
-
-error:
-	if (cb.msg)
-		nlmsg_free(cb.msg);
-out:
-	swconfig_put_dev(dev);
-	return err;
-}
-
-static const struct switch_attr *
-swconfig_lookup_attr(struct switch_dev *dev, struct genl_info *info,
-		struct switch_val *val)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	const struct switch_attrlist *alist;
-	const struct switch_attr *attr = NULL;
-	int attr_id;
-
-	/* defaults */
-	struct switch_attr *def_list;
-	unsigned long *def_active;
-	int n_def;
-
-	if (!info->attrs[SWITCH_ATTR_OP_ID])
-		goto done;
-
-	switch(hdr->cmd) {
-	case SWITCH_CMD_SET_GLOBAL:
-	case SWITCH_CMD_GET_GLOBAL:
-		alist = &dev->attr_global;
-		def_list = default_global;
-		def_active = &dev->def_global;
-		n_def = ARRAY_SIZE(default_global);
-		break;
-	case SWITCH_CMD_SET_VLAN:
-	case SWITCH_CMD_GET_VLAN:
-		alist = &dev->attr_vlan;
-		def_list = default_vlan;
-		def_active = &dev->def_vlan;
-		n_def = ARRAY_SIZE(default_vlan);
-		if (!info->attrs[SWITCH_ATTR_OP_VLAN])
-			goto done;
-		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_VLAN]);
-		if (val->port_vlan >= dev->vlans)
-			goto done;
-		break;
-	case SWITCH_CMD_SET_PORT:
-	case SWITCH_CMD_GET_PORT:
-		alist = &dev->attr_port;
-		def_list = default_port;
-		def_active = &dev->def_port;
-		n_def = ARRAY_SIZE(default_port);
-		if (!info->attrs[SWITCH_ATTR_OP_PORT])
-			goto done;
-		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_PORT]);
-		if (val->port_vlan >= dev->ports)
-			goto done;
-		break;
-	default:
-		WARN_ON(1);
-		goto done;
-	}
-
-	if (!alist)
-		goto done;
-
-	attr_id = nla_get_u32(info->attrs[SWITCH_ATTR_OP_ID]);
-	if (attr_id >= SWITCH_ATTR_DEFAULTS_OFFSET) {
-		attr_id -= SWITCH_ATTR_DEFAULTS_OFFSET;
-		if (attr_id >= n_def)
-			goto done;
-		if (!test_bit(attr_id, def_active))
-			goto done;
-		attr = &def_list[attr_id];
-	} else {
-		if (attr_id >= alist->n_attr)
-			goto done;
-		attr = &alist->attr[attr_id];
-	}
-
-	if (attr->disabled)
-		attr = NULL;
-
-done:
-	if (!attr)
-		DPRINTF("attribute lookup failed\n");
-	val->attr = attr;
-	return attr;
-}
-
-static int
-swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
-		struct switch_val *val, int max)
-{
-	struct nlattr *nla;
-	int rem;
-
-	val->len = 0;
-	nla_for_each_nested(nla, head, rem) {
-		struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1];
-		struct switch_port *port = &val->value.ports[val->len];
-
-		if (val->len >= max)
-			return -EINVAL;
-
-		if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
-				port_policy))
-			return -EINVAL;
-
-		if (!tb[SWITCH_PORT_ID])
-			return -EINVAL;
-
-		port->id = nla_get_u32(tb[SWITCH_PORT_ID]);
-		if (tb[SWITCH_PORT_FLAG_TAGGED])
-			port->flags |= (1 << SWITCH_PORT_FLAG_TAGGED);
-		val->len++;
-	}
-
-	return 0;
-}
-
-static int
-swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
-{
-	const struct switch_attr *attr;
-	struct switch_dev *dev;
-	struct switch_val val;
-	int err = -EINVAL;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	memset(&val, 0, sizeof(val));
-	attr = swconfig_lookup_attr(dev, info, &val);
-	if (!attr || !attr->set)
-		goto error;
-
-	val.attr = attr;
-	switch(attr->type) {
-	case SWITCH_TYPE_NOVAL:
-		break;
-	case SWITCH_TYPE_INT:
-		if (!info->attrs[SWITCH_ATTR_OP_VALUE_INT])
-			goto error;
-		val.value.i =
-			nla_get_u32(info->attrs[SWITCH_ATTR_OP_VALUE_INT]);
-		break;
-	case SWITCH_TYPE_STRING:
-		if (!info->attrs[SWITCH_ATTR_OP_VALUE_STR])
-			goto error;
-		val.value.s =
-			nla_data(info->attrs[SWITCH_ATTR_OP_VALUE_STR]);
-		break;
-	case SWITCH_TYPE_PORTS:
-		val.value.ports = dev->portbuf;
-		memset(dev->portbuf, 0,
-			sizeof(struct switch_port) * dev->ports);
-
-		/* TODO: implement multipart? */
-		if (info->attrs[SWITCH_ATTR_OP_VALUE_PORTS]) {
-			err = swconfig_parse_ports(skb,
-				info->attrs[SWITCH_ATTR_OP_VALUE_PORTS], &val, dev->ports);
-			if (err < 0)
-				goto error;
-		} else {
-			val.len = 0;
-			err = 0;
-		}
-		break;
-	default:
-		goto error;
-	}
-
-	err = attr->set(dev, attr, &val);
-error:
-	swconfig_put_dev(dev);
-	return err;
-}
-
-static int
-swconfig_close_portlist(struct swconfig_callback *cb, void *arg)
-{
-	if (cb->nest[0])
-		nla_nest_end(cb->msg, cb->nest[0]);
-	return 0;
-}
-
-static int
-swconfig_send_port(struct swconfig_callback *cb, void *arg)
-{
-	const struct switch_port *port = arg;
-	struct nlattr *p = NULL;
-
-	if (!cb->nest[0]) {
-		cb->nest[0] = nla_nest_start(cb->msg, cb->cmd);
-		if (!cb->nest[0])
-			return -1;
-	}
-
-	p = nla_nest_start(cb->msg, SWITCH_ATTR_PORT);
-	if (!p)
-		goto error;
-
-	NLA_PUT_U32(cb->msg, SWITCH_PORT_ID, port->id);
-	if (port->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
-		NLA_PUT_FLAG(cb->msg, SWITCH_PORT_FLAG_TAGGED);
-
-	nla_nest_end(cb->msg, p);
-	return 0;
-
-nla_put_failure:
-		nla_nest_cancel(cb->msg, p);
-error:
-	nla_nest_cancel(cb->msg, cb->nest[0]);
-	return -1;
-}
-
-static int
-swconfig_send_ports(struct sk_buff **msg, struct genl_info *info, int attr,
-		const struct switch_val *val)
-{
-	struct swconfig_callback cb;
-	int err = 0;
-	int i;
-
-	if (!val->value.ports)
-		return -EINVAL;
-
-	memset(&cb, 0, sizeof(cb));
-	cb.cmd = attr;
-	cb.msg = *msg;
-	cb.info = info;
-	cb.fill = swconfig_send_port;
-	cb.close = swconfig_close_portlist;
-
-	cb.nest[0] = nla_nest_start(cb.msg, cb.cmd);
-	for (i = 0; i < val->len; i++) {
-		err = swconfig_send_multipart(&cb, &val->value.ports[i]);
-		if (err)
-			goto done;
-	}
-	err = val->len;
-	swconfig_close_portlist(&cb, NULL);
-	*msg = cb.msg;
-
-done:
-	return err;
-}
-
-static int
-swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	const struct switch_attr *attr;
-	struct switch_dev *dev;
-	struct sk_buff *msg = NULL;
-	struct switch_val val;
-	int err = -EINVAL;
-	int cmd = hdr->cmd;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	memset(&val, 0, sizeof(val));
-	attr = swconfig_lookup_attr(dev, info, &val);
-	if (!attr || !attr->get)
-		goto error;
-
-	if (attr->type == SWITCH_TYPE_PORTS) {
-		val.value.ports = dev->portbuf;
-		memset(dev->portbuf, 0,
-			sizeof(struct switch_port) * dev->ports);
-	}
-
-	err = attr->get(dev, attr, &val);
-	if (err)
-		goto error;
-
-	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-	if (!msg)
-		goto error;
-
-	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
-			0, cmd);
-	if (IS_ERR(hdr))
-		goto nla_put_failure;
-
-	switch(attr->type) {
-	case SWITCH_TYPE_INT:
-		NLA_PUT_U32(msg, SWITCH_ATTR_OP_VALUE_INT, val.value.i);
-		break;
-	case SWITCH_TYPE_STRING:
-		NLA_PUT_STRING(msg, SWITCH_ATTR_OP_VALUE_STR, val.value.s);
-		break;
-	case SWITCH_TYPE_PORTS:
-		err = swconfig_send_ports(&msg, info,
-				SWITCH_ATTR_OP_VALUE_PORTS, &val);
-		if (err < 0)
-			goto nla_put_failure;
-		break;
-	default:
-		DPRINTF("invalid type in attribute\n");
-		err = -EINVAL;
-		goto error;
-	}
-	err = genlmsg_end(msg, hdr);
-	if (err < 0)
-		goto nla_put_failure;
-
-	swconfig_put_dev(dev);
-	return genlmsg_unicast(msg, info->snd_pid);
-
-nla_put_failure:
-	if (msg)
-		nlmsg_free(msg);
-error:
-	swconfig_put_dev(dev);
-	if (!err)
-		err = -ENOMEM;
-	return err;
-}
-
-static int
-swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
-		const struct switch_dev *dev)
-{
-	void *hdr;
-
-	hdr = genlmsg_put(msg, pid, seq, &switch_fam, flags,
-			SWITCH_CMD_NEW_ATTR);
-	if (IS_ERR(hdr))
-		return -1;
-
-	NLA_PUT_U32(msg, SWITCH_ATTR_ID, dev->id);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
-	NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
-	NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
-	NLA_PUT_U32(msg, SWITCH_ATTR_CPU_PORT, dev->cpu_port);
-
-	return genlmsg_end(msg, hdr);
-nla_put_failure:
-	genlmsg_cancel(msg, hdr);
-	return -EMSGSIZE;
-}
-
-static int swconfig_dump_switches(struct sk_buff *skb,
-		struct netlink_callback *cb)
-{
-	struct switch_dev *dev;
-	int start = cb->args[0];
-	int idx = 0;
-
-	swconfig_lock();
-	list_for_each_entry(dev, &swdevs, dev_list) {
-		if (++idx <= start)
-			continue;
-		if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).pid,
-				cb->nlh->nlmsg_seq, NLM_F_MULTI,
-				dev) < 0)
-			break;
-	}
-	swconfig_unlock();
-	cb->args[0] = idx;
-
-	return skb->len;
-}
-
-static int
-swconfig_done(struct netlink_callback *cb)
-{
-	return 0;
-}
-
-static struct genl_ops swconfig_ops[] = {
-	{
-		.cmd = SWITCH_CMD_LIST_GLOBAL,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_LIST_VLAN,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_LIST_PORT,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_GLOBAL,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_VLAN,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_PORT,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_GLOBAL,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_VLAN,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_PORT,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_SWITCH,
-		.dumpit = swconfig_dump_switches,
-		.policy = switch_policy,
-		.done = swconfig_done,
-	}
-};
-
-int
-register_switch(struct switch_dev *dev, struct net_device *netdev)
-{
-	INIT_LIST_HEAD(&dev->dev_list);
-	if (netdev) {
-		dev->netdev = netdev;
-		if (!dev->devname)
-			dev->devname = netdev->name;
-	}
-	BUG_ON(!dev->devname);
-
-	if (dev->ports > 0) {
-		dev->portbuf = kzalloc(sizeof(struct switch_port) * dev->ports,
-				GFP_KERNEL);
-		if (!dev->portbuf)
-			return -ENOMEM;
-	}
-	dev->id = ++swdev_id;
-	swconfig_defaults_init(dev);
-	spin_lock_init(&dev->lock);
-	swconfig_lock();
-	list_add(&dev->dev_list, &swdevs);
-	swconfig_unlock();
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(register_switch);
-
-void
-unregister_switch(struct switch_dev *dev)
-{
-	kfree(dev->portbuf);
-	spin_lock(&dev->lock);
-	swconfig_lock();
-	list_del(&dev->dev_list);
-	swconfig_unlock();
-	spin_unlock(&dev->lock);
-}
-EXPORT_SYMBOL_GPL(unregister_switch);
-
-
-static int __init
-swconfig_init(void)
-{
-	int i, err;
-
-	INIT_LIST_HEAD(&swdevs);
-	err = genl_register_family(&switch_fam);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(swconfig_ops); i++) {
-		err = genl_register_ops(&switch_fam, &swconfig_ops[i]);
-		if (err)
-			goto unregister;
-	}
-
-	return 0;
-
-unregister:
-	genl_unregister_family(&switch_fam);
-	return err;
-}
-
-static void __exit
-swconfig_exit(void)
-{
-	genl_unregister_family(&switch_fam);
-}
-
-module_init(swconfig_init);
-module_exit(swconfig_exit);
-
diff --git a/target/linux/generic-2.6/files/drivers/pwm/Kconfig b/target/linux/generic-2.6/files/drivers/pwm/Kconfig
deleted file mode 100644
index 1c24e11077..0000000000
--- a/target/linux/generic-2.6/files/drivers/pwm/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# PWM infrastructure and devices
-#
-
-menuconfig GENERIC_PWM
-	tristate "PWM Support"
-	depends on SYSFS
-	help
-	  This enables PWM support through the generic PWM library.
-	  If unsure, say N.
-
-if GENERIC_PWM
-
-config ATMEL_PWM
-	tristate "Atmel AT32/AT91 PWM support"
-	depends on AVR32 || ARCH_AT91
-	help
-	  This option enables device driver support for the PWMC
-	  peripheral channels found on certain Atmel processors.
-	  Pulse Width Modulation is used many for purposes, including
-	  software controlled power-efficient backlights on LCD
-	  displays, motor control, and waveform generation.  If
-	  unsure, say N.
-
-config GPIO_PWM
-       tristate "PWM emulation using GPIO"
-       help
-         This option enables a single-channel PWM device using
-	 a kernel interval timer and a GPIO pin.  If unsure, say N.
-
-endif
diff --git a/target/linux/generic-2.6/files/drivers/pwm/Makefile b/target/linux/generic-2.6/files/drivers/pwm/Makefile
deleted file mode 100644
index e8cacc5740..0000000000
--- a/target/linux/generic-2.6/files/drivers/pwm/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for pwm devices
-#
-obj-y := pwm.o
-obj-$(CONFIG_ATMEL_PWM)		+= atmel-pwm.o
-obj-$(CONFIG_GPIO_PWM)		+= gpio.o
diff --git a/target/linux/generic-2.6/files/drivers/pwm/atmel-pwm.c b/target/linux/generic-2.6/files/drivers/pwm/atmel-pwm.c
deleted file mode 100644
index 158bb922c1..0000000000
--- a/target/linux/generic-2.6/files/drivers/pwm/atmel-pwm.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * drivers/pwm/atmel-pwm.c
- *
- * Copyright (C) 2010 Bill Gatliff <bgat@billgatliff.com>
- * Copyright (C) 2007 David Brownell
- *
- * This program is free software; you may redistribute and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/pwm/pwm.h>
-
-enum {
-	/* registers common to the PWMC peripheral */
-	PWMC_MR = 0,
-	PWMC_ENA = 4,
-	PWMC_DIS = 8,
-	PWMC_SR = 0xc,
-	PWMC_IER = 0x10,
-	PWMC_IDR = 0x14,
-	PWMC_IMR = 0x18,
-	PWMC_ISR = 0x1c,
-
-	/* registers per each PWMC channel */
-	PWMC_CMR = 0,
-	PWMC_CDTY = 4,
-	PWMC_CPRD = 8,
-	PWMC_CCNT = 0xc,
-	PWMC_CUPD = 0x10,
-
-	/* how to find each channel */
-	PWMC_CHAN_BASE = 0x200,
-	PWMC_CHAN_STRIDE = 0x20,
-
-	/* CMR bits of interest */
-	PWMC_CMR_CPD = 10,
-	PWMC_CMR_CPOL = 9,
-	PWMC_CMR_CALG = 8,
-	PWMC_CMR_CPRE_MASK = 0xf,
-};
-
-struct atmel_pwm {
-	struct pwm_device pwm;
-	spinlock_t lock;
-	void __iomem *iobase;
-	struct clk *clk;
-	u32 *sync_mask;
-	int irq;
-	u32 ccnt_mask;
-};
-
-static inline struct atmel_pwm *to_atmel_pwm(const struct pwm_channel *p)
-{
-	return container_of(p->pwm, struct atmel_pwm, pwm);
-}
-
-static inline void
-pwmc_writel(const struct atmel_pwm *p,
-	    unsigned offset, u32 val)
-{
-	__raw_writel(val, p->iobase + offset);
-}
-
-static inline u32
-pwmc_readl(const struct atmel_pwm *p,
-	   unsigned offset)
-{
-	return __raw_readl(p->iobase + offset);
-}
-
-static inline void
-pwmc_chan_writel(const struct pwm_channel *p,
-		 u32 offset, u32 val)
-{
-	const struct atmel_pwm *ap = to_atmel_pwm(p);
-
-	if (PWMC_CMR == offset)
-		val &= ((1 << PWMC_CMR_CPD)
-			| (1 << PWMC_CMR_CPOL)
-			| (1 << PWMC_CMR_CALG)
-			| (PWMC_CMR_CPRE_MASK));
-	else
-		val &= ap->ccnt_mask;
-
-	pwmc_writel(ap, offset + PWMC_CHAN_BASE
-		    + (p->chan * PWMC_CHAN_STRIDE), val);
-}
-
-static inline u32
-pwmc_chan_readl(const struct pwm_channel *p,
-		u32 offset)
-{
-	const struct atmel_pwm *ap = to_atmel_pwm(p);
-
-	return pwmc_readl(ap, offset + PWMC_CHAN_BASE
-			  + (p->chan * PWMC_CHAN_STRIDE));
-}
-
-static inline int
-__atmel_pwm_is_on(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	return (pwmc_readl(ap, PWMC_SR) & (1 << p->chan)) ? 1 : 0;
-}
-
-static inline void
-__atmel_pwm_unsynchronize(struct pwm_channel *p,
-			  struct pwm_channel *to_p)
-{
-	const struct atmel_pwm *ap = to_atmel_pwm(p);
-	int wchan;
-
-	if (to_p) {
-		ap->sync_mask[p->chan] &= ~(1 << to_p->chan);
-		ap->sync_mask[to_p->chan] &= ~(1 << p->chan);
-		goto done;
-	}
-
-	ap->sync_mask[p->chan] = 0;
-	for (wchan = 0; wchan < ap->pwm.nchan; wchan++)
-		ap->sync_mask[wchan] &= ~(1 << p->chan);
-done:
-	dev_dbg(p->pwm->dev, "sync_mask %x\n", ap->sync_mask[p->chan]);
-}
-
-static inline void
-__atmel_pwm_synchronize(struct pwm_channel *p,
-			struct pwm_channel *to_p)
-{
-	const struct atmel_pwm *ap = to_atmel_pwm(p);
-
-	if (!to_p)
-		return;
-
-	ap->sync_mask[p->chan] |= (1 << to_p->chan);
-	ap->sync_mask[to_p->chan] |= (1 << p->chan);
-
-	dev_dbg(p->pwm->dev, "sync_mask %x\n", ap->sync_mask[p->chan]);
-}
-
-static inline void
-__atmel_pwm_stop(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	u32 chid = 1 << p->chan;
-
-	pwmc_writel(ap, PWMC_DIS, ap->sync_mask[p->chan] | chid);
-}
-
-static inline void
-__atmel_pwm_start(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	u32 chid = 1 << p->chan;
-
-	pwmc_writel(ap, PWMC_ENA, ap->sync_mask[p->chan] | chid);
-}
-
-static int
-atmel_pwm_synchronize(struct pwm_channel *p,
-		      struct pwm_channel *to_p)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&p->lock, flags);
-	__atmel_pwm_synchronize(p, to_p);
-	spin_unlock_irqrestore(&p->lock, flags);
-	return 0;
-}
-
-static int
-atmel_pwm_unsynchronize(struct pwm_channel *p,
-			struct pwm_channel *from_p)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&p->lock, flags);
-	__atmel_pwm_unsynchronize(p, from_p);
-	spin_unlock_irqrestore(&p->lock, flags);
-	return 0;
-}
-
-static inline int
-__atmel_pwm_config_polarity(struct pwm_channel *p,
-			    struct pwm_channel_config *c)
-{
-	u32 cmr = pwmc_chan_readl(p, PWMC_CMR);
-
-	if (c->polarity)
-		cmr &= ~BIT(PWMC_CMR_CPOL);
-	else
-		cmr |= BIT(PWMC_CMR_CPOL);
-	pwmc_chan_writel(p, PWMC_CMR, cmr);
-	p->active_high = c->polarity ? 1 : 0;
-
-	dev_dbg(p->pwm->dev, "polarity %d\n", c->polarity);
-	return 0;
-}
-
-static inline int
-__atmel_pwm_config_duty_ticks(struct pwm_channel *p,
-			      struct pwm_channel_config *c)
-{
-	u32 cmr, cprd, cpre, cdty;
-
-	cmr = pwmc_chan_readl(p, PWMC_CMR);
-	cprd = pwmc_chan_readl(p, PWMC_CPRD);
-
-	cpre = cmr & PWMC_CMR_CPRE_MASK;
-	cmr &= ~BIT(PWMC_CMR_CPD);
-
-	cdty = cprd - (c->duty_ticks >> cpre);
-
-	p->duty_ticks = c->duty_ticks;
-
-	if (__atmel_pwm_is_on(p)) {
-		pwmc_chan_writel(p, PWMC_CMR, cmr);
-		pwmc_chan_writel(p, PWMC_CUPD, cdty);
-	} else
-		pwmc_chan_writel(p, PWMC_CDTY, cdty);
-
-	dev_dbg(p->pwm->dev, "duty_ticks = %lu cprd = %x"
-		" cdty = %x cpre = %x\n", p->duty_ticks,
-		cprd, cdty, cpre);
-
-	return 0;
-}
-
-static inline int
-__atmel_pwm_config_period_ticks(struct pwm_channel *p,
-				struct pwm_channel_config *c)
-{
-	u32 cmr, cprd, cpre;
-
-	cpre = fls(c->period_ticks);
-	if (cpre < 16)
-		cpre = 0;
-	else {
-		cpre -= 15;
-		if (cpre > 10)
-			return -EINVAL;
-	}
-
-	cmr = pwmc_chan_readl(p, PWMC_CMR);
-	cmr &= ~PWMC_CMR_CPRE_MASK;
-	cmr |= cpre;
-
-	cprd = c->period_ticks >> cpre;
-
-	pwmc_chan_writel(p, PWMC_CMR, cmr);
-	pwmc_chan_writel(p, PWMC_CPRD, cprd);
-	p->period_ticks = c->period_ticks;
-
-	dev_dbg(p->pwm->dev, "period_ticks = %lu cprd = %x cpre = %x\n",
-		 p->period_ticks, cprd, cpre);
-
-	return 0;
-}
-
-static int
-atmel_pwm_config_nosleep(struct pwm_channel *p,
-			 struct pwm_channel_config *c)
-{
-	int ret = 0;
-	unsigned long flags;
-
-	spin_lock_irqsave(&p->lock, flags);
-
-	switch (c->config_mask) {
-
-	case PWM_CONFIG_DUTY_TICKS:
-		__atmel_pwm_config_duty_ticks(p, c);
-		break;
-
-	case PWM_CONFIG_STOP:
-		__atmel_pwm_stop(p);
-		break;
-
-	case PWM_CONFIG_START:
-		__atmel_pwm_start(p);
-		break;
-
-	case PWM_CONFIG_POLARITY:
-		__atmel_pwm_config_polarity(p, c);
-		break;
-
-	default:
-		ret = -EINVAL;
-		break;
-	}
-
-	spin_unlock_irqrestore(&p->lock, flags);
-	return ret;
-}
-
-static int
-atmel_pwm_stop_sync(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = container_of(p->pwm, struct atmel_pwm, pwm);
-	int ret;
-	int was_on = __atmel_pwm_is_on(p);
-
-	if (was_on) {
-		do {
-			init_completion(&p->complete);
-			set_bit(FLAG_STOP, &p->flags);
-			pwmc_writel(ap, PWMC_IER, 1 << p->chan);
-
-			dev_dbg(p->pwm->dev, "waiting on stop_sync completion...\n");
-
-			ret = wait_for_completion_interruptible(&p->complete);
-
-			dev_dbg(p->pwm->dev, "stop_sync complete (%d)\n", ret);
-
-			if (ret)
-				return ret;
-		} while (p->flags & BIT(FLAG_STOP));
-	}
-
-	return was_on;
-}
-
-static int
-atmel_pwm_config(struct pwm_channel *p,
-		 struct pwm_channel_config *c)
-{
-	int was_on = 0;
-
-	if (p->pwm->config_nosleep) {
-		if (!p->pwm->config_nosleep(p, c))
-			return 0;
-	}
-
-	might_sleep();
-
-	dev_dbg(p->pwm->dev, "config_mask %x\n", c->config_mask);
-
-	was_on = atmel_pwm_stop_sync(p);
-	if (was_on < 0)
-		return was_on;
-
-	if (c->config_mask & PWM_CONFIG_PERIOD_TICKS) {
-		__atmel_pwm_config_period_ticks(p, c);
-		if (!(c->config_mask & PWM_CONFIG_DUTY_TICKS)) {
-			struct pwm_channel_config d = {
-				.config_mask = PWM_CONFIG_DUTY_TICKS,
-				.duty_ticks = p->duty_ticks,
-			};
-			__atmel_pwm_config_duty_ticks(p, &d);
-		}
-	}
-
-	if (c->config_mask & PWM_CONFIG_DUTY_TICKS)
-		__atmel_pwm_config_duty_ticks(p, c);
-
-	if (c->config_mask & PWM_CONFIG_POLARITY)
-		__atmel_pwm_config_polarity(p, c);
-
-	if ((c->config_mask & PWM_CONFIG_START)
-	    || (was_on && !(c->config_mask & PWM_CONFIG_STOP)))
-		__atmel_pwm_start(p);
-
-	return 0;
-}
-
-static void
-__atmel_pwm_set_callback(struct pwm_channel *p,
-			 pwm_callback_t callback)
-{
-	struct atmel_pwm *ap = container_of(p->pwm, struct atmel_pwm, pwm);
-
-	p->callback = callback;
-	pwmc_writel(ap, p->callback ? PWMC_IER : PWMC_IDR, 1 << p->chan);
-}
-
-static int
-atmel_pwm_set_callback(struct pwm_channel *p,
-		       pwm_callback_t callback)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	unsigned long flags;
-
-	spin_lock_irqsave(&ap->lock, flags);
-	__atmel_pwm_set_callback(p, callback);
-	spin_unlock_irqrestore(&ap->lock, flags);
-
-	return 0;
-}
-
-static int
-atmel_pwm_request(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	unsigned long flags;
-
-	spin_lock_irqsave(&p->lock, flags);
-	clk_enable(ap->clk);
-	p->tick_hz = clk_get_rate(ap->clk);
-	__atmel_pwm_unsynchronize(p, NULL);
-	__atmel_pwm_stop(p);
-	spin_unlock_irqrestore(&p->lock, flags);
-
-	return 0;
-}
-
-static void
-atmel_pwm_free(struct pwm_channel *p)
-{
-	struct atmel_pwm *ap = to_atmel_pwm(p);
-	clk_disable(ap->clk);
-}
-
-static irqreturn_t
-atmel_pwmc_irq(int irq, void *data)
-{
-	struct atmel_pwm *ap = data;
-	struct pwm_channel *p;
-	u32 isr;
-	int chid;
-	unsigned long flags;
-
-	spin_lock_irqsave(&ap->lock, flags);
-
-	isr = pwmc_readl(ap, PWMC_ISR);
-	for (chid = 0; isr; chid++, isr >>= 1) {
-		p = &ap->pwm.channels[chid];
-		if (isr & 1) {
-			if (p->callback)
-				p->callback(p);
-			if (p->flags & BIT(FLAG_STOP)) {
-				__atmel_pwm_stop(p);
-				clear_bit(FLAG_STOP, &p->flags);
-			}
-			complete_all(&p->complete);
-		}
-	}
-
-	spin_unlock_irqrestore(&ap->lock, flags);
-
-	return IRQ_HANDLED;
-}
-
-static int __devinit
-atmel_pwmc_probe(struct platform_device *pdev)
-{
-	struct atmel_pwm *ap;
-	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	int ret = 0;
-
-	ap = kzalloc(sizeof(*ap), GFP_KERNEL);
-	if (!ap) {
-		ret = -ENOMEM;
-		goto err_atmel_pwm_alloc;
-	}
-
-	spin_lock_init(&ap->lock);
-	platform_set_drvdata(pdev, ap);
-
-	ap->pwm.dev = &pdev->dev;
-	ap->pwm.bus_id = dev_name(&pdev->dev);
-
-	ap->pwm.nchan = 4; /* TODO: true only for SAM9263 and AP7000 */
-	ap->ccnt_mask = 0xffffUL; /* TODO: true only for SAM9263 */
-
-	ap->sync_mask = kzalloc(ap->pwm.nchan * sizeof(u32), GFP_KERNEL);
-	if (!ap->sync_mask) {
-		ret = -ENOMEM;
-		goto err_alloc_sync_masks;
-	}
-
-	ap->pwm.owner = THIS_MODULE;
-	ap->pwm.request = atmel_pwm_request;
-	ap->pwm.free = atmel_pwm_free;
-	ap->pwm.config_nosleep = atmel_pwm_config_nosleep;
-	ap->pwm.config = atmel_pwm_config;
-	ap->pwm.synchronize = atmel_pwm_synchronize;
-	ap->pwm.unsynchronize = atmel_pwm_unsynchronize;
-	ap->pwm.set_callback = atmel_pwm_set_callback;
-
-	ap->clk = clk_get(&pdev->dev, "pwm_clk");
-	if (PTR_ERR(ap->clk)) {
-		ret = -ENODEV;
-		goto err_clk_get;
-	}
-
-	ap->iobase = ioremap_nocache(r->start, r->end - r->start + 1);
-	if (!ap->iobase) {
-		ret = -ENODEV;
-		goto err_ioremap;
-	}
-
-	clk_enable(ap->clk);
-	pwmc_writel(ap, PWMC_DIS, -1);
-	pwmc_writel(ap, PWMC_IDR, -1);
-	clk_disable(ap->clk);
-
-	ap->irq = platform_get_irq(pdev, 0);
-	if (ap->irq != -ENXIO) {
-		ret = request_irq(ap->irq, atmel_pwmc_irq, 0,
-				  ap->pwm.bus_id, ap);
-		if (ret)
-			goto err_request_irq;
-	}
-
-	ret = pwm_register(&ap->pwm);
-	if (ret)
-		goto err_pwm_register;
-
-	return 0;
-
-err_pwm_register:
-	if (ap->irq != -ENXIO)
-		free_irq(ap->irq, ap);
-err_request_irq:
-	iounmap(ap->iobase);
-err_ioremap:
-	clk_put(ap->clk);
-err_clk_get:
-	platform_set_drvdata(pdev, NULL);
-err_alloc_sync_masks:
-	kfree(ap);
-err_atmel_pwm_alloc:
-	return ret;
-}
-
-static int __devexit
-atmel_pwmc_remove(struct platform_device *pdev)
-{
-	struct atmel_pwm *ap = platform_get_drvdata(pdev);
-	int ret;
-
-	/* TODO: what can we do if this fails? */
-	ret = pwm_unregister(&ap->pwm);
-
-	clk_enable(ap->clk);
-	pwmc_writel(ap, PWMC_IDR, -1);
-	pwmc_writel(ap, PWMC_DIS, -1);
-	clk_disable(ap->clk);
-
-	if (ap->irq != -ENXIO)
-		free_irq(ap->irq, ap);
-
-	clk_put(ap->clk);
-	iounmap(ap->iobase);
-
-	kfree(ap);
-
-	return 0;
-}
-
-static struct platform_driver atmel_pwm_driver = {
-	.driver = {
-		.name = "atmel_pwmc",
-		.owner = THIS_MODULE,
-	},
-	.probe = atmel_pwmc_probe,
-	.remove = __devexit_p(atmel_pwmc_remove),
-};
-
-static int __init atmel_pwm_init(void)
-{
-	return platform_driver_register(&atmel_pwm_driver);
-}
-module_init(atmel_pwm_init);
-
-static void __exit atmel_pwm_exit(void)
-{
-	platform_driver_unregister(&atmel_pwm_driver);
-}
-module_exit(atmel_pwm_exit);
-
-MODULE_AUTHOR("Bill Gatliff <bgat@billgatliff.com>");
-MODULE_DESCRIPTION("Driver for Atmel PWMC peripheral");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:atmel_pwmc");
diff --git a/target/linux/generic-2.6/files/drivers/pwm/gpio.c b/target/linux/generic-2.6/files/drivers/pwm/gpio.c
deleted file mode 100644
index dff5d1d627..0000000000
--- a/target/linux/generic-2.6/files/drivers/pwm/gpio.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * drivers/pwm/gpio.c
- *
- * Models a single-channel PWM device using a timer and a GPIO pin.
- *
- * Copyright (C) 2010 Bill Gatliff <bgat@billgatliff.com>
- *
- * This program is free software; you may redistribute and/or modify
- * it under the terms of the GNU General Public License Version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/hrtimer.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/workqueue.h>
-#include <linux/gpio.h>
-#include <linux/slab.h>
-#include <linux/pwm/pwm.h>
-
-struct gpio_pwm {
-	struct pwm_device pwm;
-	struct hrtimer timer;
-	struct work_struct work;
-	pwm_callback_t callback;
-	int gpio;
-	unsigned long polarity : 1;
-	unsigned long active : 1;
-};
-
-static inline struct gpio_pwm *to_gpio_pwm(const struct pwm_channel *p)
-{
-	return container_of(p->pwm, struct gpio_pwm, pwm);
-}
-
-static void
-gpio_pwm_work (struct work_struct *work)
-{
-	struct gpio_pwm *gp = container_of(work, struct gpio_pwm, work);
-
-	if (gp->active)
-		gpio_direction_output(gp->gpio, gp->polarity ? 1 : 0);
-	else
-		gpio_direction_output(gp->gpio, gp->polarity ? 0 : 1);
-}
-
-static enum hrtimer_restart
-gpio_pwm_timeout(struct hrtimer *t)
-{
-	struct gpio_pwm *gp = container_of(t, struct gpio_pwm, timer);
-	ktime_t tnew;
-
-	if (unlikely(gp->pwm.channels[0].duty_ticks == 0))
-		gp->active = 0;
-	else if (unlikely(gp->pwm.channels[0].duty_ticks
-			  == gp->pwm.channels[0].period_ticks))
-		gp->active = 1;
-	else
-		gp->active ^= 1;
-
-	if (gpio_cansleep(gp->gpio))
-		schedule_work(&gp->work);
-	else
-		gpio_pwm_work(&gp->work);
-
-	if (!gp->active && gp->pwm.channels[0].callback)
-		gp->pwm.channels[0].callback(&gp->pwm.channels[0]);
-
-	if (unlikely(!gp->active &&
-		     (gp->pwm.channels[0].flags & BIT(FLAG_STOP)))) {
-		clear_bit(FLAG_STOP, &gp->pwm.channels[0].flags);
-		complete_all(&gp->pwm.channels[0].complete);
-		return HRTIMER_NORESTART;
-	}
-
-	if (gp->active)
-		tnew = ktime_set(0, gp->pwm.channels[0].duty_ticks);
-	else
-		tnew = ktime_set(0, gp->pwm.channels[0].period_ticks
-				 - gp->pwm.channels[0].duty_ticks);
-	hrtimer_start(&gp->timer, tnew, HRTIMER_MODE_REL);
-
-	return HRTIMER_NORESTART;
-}
-
-static void gpio_pwm_start(struct pwm_channel *p)
-{
-	struct gpio_pwm *gp = to_gpio_pwm(p);
-
-	gp->active = 0;
-	gpio_pwm_timeout(&gp->timer);
-}
-
-static int
-gpio_pwm_config_nosleep(struct pwm_channel *p,
-			struct pwm_channel_config *c)
-{
-	struct gpio_pwm *gp = to_gpio_pwm(p);
-	int ret = 0;
-	unsigned long flags;
-
-	spin_lock_irqsave(&p->lock, flags);
-
-	switch (c->config_mask) {
-
-	case PWM_CONFIG_DUTY_TICKS:
-		p->duty_ticks = c->duty_ticks;
-		break;
-
-	case PWM_CONFIG_START:
-		if (!hrtimer_active(&gp->timer)) {
-			gpio_pwm_start(p);
-		}
-		break;
-	default:
-		ret = -EINVAL;
-		break;
-	}
-
-	spin_unlock_irqrestore(&p->lock, flags);
-	return ret;
-}
-
-static int
-gpio_pwm_stop_sync(struct pwm_channel *p)
-{
-	struct gpio_pwm *gp = to_gpio_pwm(p);
-	int ret;
-	int was_on = hrtimer_active(&gp->timer);
-
-	if (was_on) {
-		do {
-			init_completion(&p->complete);
-			set_bit(FLAG_STOP, &p->flags);
-			ret = wait_for_completion_interruptible(&p->complete);
-			if (ret)
-				return ret;
-		} while (p->flags & BIT(FLAG_STOP));
-	}
-
-	return was_on;
-}
-
-static int
-gpio_pwm_config(struct pwm_channel *p,
-		struct pwm_channel_config *c)
-{
-	struct gpio_pwm *gp = to_gpio_pwm(p);
-	int was_on = 0;
-
-	if (p->pwm->config_nosleep) {
-		if (!p->pwm->config_nosleep(p, c))
-			return 0;
-	}
-
-	might_sleep();
-
-	was_on = gpio_pwm_stop_sync(p);
-	if (was_on < 0)
-		return was_on;
-
-	if (c->config_mask & PWM_CONFIG_PERIOD_TICKS)
-		p->period_ticks = c->period_ticks;
-
-	if (c->config_mask & PWM_CONFIG_DUTY_TICKS)
-		p->duty_ticks = c->duty_ticks;
-
-	if (c->config_mask & PWM_CONFIG_POLARITY) {
-		gp->polarity = c->polarity ? 1 : 0;
-		p->active_high = gp->polarity;
-	}
-
-	if ((c->config_mask & PWM_CONFIG_START)
-	    || (was_on && !(c->config_mask & PWM_CONFIG_STOP)))
-		gpio_pwm_start(p);
-
-	return 0;
-}
-
-static int
-gpio_pwm_set_callback(struct pwm_channel *p,
-		      pwm_callback_t callback)
-{
-	struct gpio_pwm *gp = to_gpio_pwm(p);
-	gp->callback = callback;
-	return 0;
-}
-
-static int
-gpio_pwm_request(struct pwm_channel *p)
-{
-	p->tick_hz = 1000000000UL;
-	return 0;
-}
-
-static int __devinit
-gpio_pwm_probe(struct platform_device *pdev)
-{
-	struct gpio_pwm *gp;
-	struct gpio_pwm_platform_data *gpd = pdev->dev.platform_data;
-	int ret = 0;
-
-	/* TODO: create configfs entries, so users can assign GPIOs to
-	 * PWMs at runtime instead of creating a platform_device
-	 * specification and rebuilding their kernel */
-
-	if (!gpd || gpio_request(gpd->gpio, dev_name(&pdev->dev)))
-		return -EINVAL;
-
-	gp = kzalloc(sizeof(*gp), GFP_KERNEL);
-	if (!gp) {
-		ret = -ENOMEM;
-		goto err_alloc;
-	}
-
-	platform_set_drvdata(pdev, gp);
-
-	gp->pwm.dev = &pdev->dev;
-	gp->pwm.bus_id = dev_name(&pdev->dev);
-	gp->pwm.nchan = 1;
-	gp->gpio = gpd->gpio;
-
-	INIT_WORK(&gp->work, gpio_pwm_work);
-
-	hrtimer_init(&gp->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	gp->timer.function = gpio_pwm_timeout;
-
-	gp->pwm.owner = THIS_MODULE;
-	gp->pwm.config_nosleep = gpio_pwm_config_nosleep;
-	gp->pwm.config = gpio_pwm_config;
-	gp->pwm.request = gpio_pwm_request;
-	gp->pwm.set_callback = gpio_pwm_set_callback;
-
-	ret = pwm_register(&gp->pwm);
-	if (ret)
-		goto err_pwm_register;
-
-	return 0;
-
-err_pwm_register:
-	platform_set_drvdata(pdev, 0);
-	kfree(gp);
-err_alloc:
-	return ret;
-}
-
-static int __devexit
-gpio_pwm_remove(struct platform_device *pdev)
-{
-	struct gpio_pwm *gp = platform_get_drvdata(pdev);
-	int ret;
-
-	ret = pwm_unregister(&gp->pwm);
-	hrtimer_cancel(&gp->timer);
-	cancel_work_sync(&gp->work);
-	platform_set_drvdata(pdev, 0);
-	kfree(gp);
-
-	return 0;
-}
-
-static struct platform_driver gpio_pwm_driver = {
-	.driver = {
-		.name = "gpio_pwm",
-		.owner = THIS_MODULE,
-	},
-	.probe = gpio_pwm_probe,
-	.remove = __devexit_p(gpio_pwm_remove),
-};
-
-static int __init gpio_pwm_init(void)
-{
-	return platform_driver_register(&gpio_pwm_driver);
-}
-module_init(gpio_pwm_init);
-
-static void __exit gpio_pwm_exit(void)
-{
-	platform_driver_unregister(&gpio_pwm_driver);
-}
-module_exit(gpio_pwm_exit);
-
-MODULE_AUTHOR("Bill Gatliff <bgat@billgatliff.com>");
-MODULE_DESCRIPTION("PWM output using GPIO and a high-resolution timer");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:gpio_pwm");
diff --git a/target/linux/generic-2.6/files/drivers/pwm/pwm.c b/target/linux/generic-2.6/files/drivers/pwm/pwm.c
deleted file mode 100644
index c1596e9e7e..0000000000
--- a/target/linux/generic-2.6/files/drivers/pwm/pwm.c
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * drivers/pwm/pwm.c
- *
- * Copyright (C) 2010 Bill Gatliff <bgat@billgatliff.com>
- *
- * This program is free software; you may redistribute and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/spinlock.h>
-#include <linux/fs.h>
-#include <linux/completion.h>
-#include <linux/workqueue.h>
-#include <linux/list.h>
-#include <linux/sched.h>
-#include <linux/slab.h>    /*kcalloc, kfree since 2.6.34 */
-#include <linux/pwm/pwm.h>
-
-static int __pwm_create_sysfs(struct pwm_device *pwm);
-
-static const char *REQUEST_SYSFS = "sysfs";
-static LIST_HEAD(pwm_device_list);
-static DEFINE_MUTEX(device_list_mutex);
-static struct class pwm_class;
-static struct workqueue_struct *pwm_handler_workqueue;
-
-int pwm_register(struct pwm_device *pwm)
-{
-	struct pwm_channel *p;
-	int wchan;
-	int ret;
-
-	spin_lock_init(&pwm->list_lock);
-
-	p = kcalloc(pwm->nchan, sizeof(*p), GFP_KERNEL);
-	if (!p)
-		return -ENOMEM;
-
-	for (wchan = 0; wchan < pwm->nchan; wchan++) {
-		spin_lock_init(&p[wchan].lock);
-		init_completion(&p[wchan].complete);
-		p[wchan].chan = wchan;
-		p[wchan].pwm = pwm;
-	}
-
-	pwm->channels = p;
-
-	mutex_lock(&device_list_mutex);
-
-	list_add_tail(&pwm->list, &pwm_device_list);
-	ret = __pwm_create_sysfs(pwm);
-	if (ret) {
-		mutex_unlock(&device_list_mutex);
-		goto err_create_sysfs;
-	}
-
-	mutex_unlock(&device_list_mutex);
-
-	dev_info(pwm->dev, "%d channel%s\n", pwm->nchan,
-		 pwm->nchan > 1 ? "s" : "");
-	return 0;
-
-err_create_sysfs:
-	kfree(p);
-
-	return ret;
-}
-EXPORT_SYMBOL(pwm_register);
-
-static int __match_device(struct device *dev, void *data)
-{
-	return dev_get_drvdata(dev) == data;
-}
-
-int pwm_unregister(struct pwm_device *pwm)
-{
-	int wchan;
-	struct device *dev;
-
-	mutex_lock(&device_list_mutex);
-
-	for (wchan = 0; wchan < pwm->nchan; wchan++) {
-	  if (pwm->channels[wchan].flags & BIT(FLAG_REQUESTED)) {
-			mutex_unlock(&device_list_mutex);
-			return -EBUSY;
-		}
-	}
-
-	for (wchan = 0; wchan < pwm->nchan; wchan++) {
-		dev = class_find_device(&pwm_class, NULL,
-					&pwm->channels[wchan],
-					__match_device);
-		if (dev) {
-			put_device(dev);
-			device_unregister(dev);
-		}
-	}
-
-	kfree(pwm->channels);
-	list_del(&pwm->list);
-	mutex_unlock(&device_list_mutex);
-
-	return 0;
-}
-EXPORT_SYMBOL(pwm_unregister);
-
-static struct pwm_device *
-__pwm_find_device(const char *bus_id)
-{
-	struct pwm_device *p;
-
-	list_for_each_entry(p, &pwm_device_list, list) {
-		if (!strcmp(bus_id, p->bus_id))
-			return p;
-	}
-	return NULL;
-}
-
-static int
-__pwm_request_channel(struct pwm_channel *p,
-		      const char *requester)
-{
-	int ret;
-
-	if (test_and_set_bit(FLAG_REQUESTED, &p->flags))
-		return -EBUSY;
-
-	if (p->pwm->request) {
-		ret = p->pwm->request(p);
-		if (ret) {
-			clear_bit(FLAG_REQUESTED, &p->flags);
-			return ret;
-		}
-	}
-
-	p->requester = requester;
-	if (!strcmp(requester, REQUEST_SYSFS))
-		p->pid = current->pid;
-
-	return 0;
-}
-
-struct pwm_channel *
-pwm_request(const char *bus_id,
-	    int chan,
-	    const char *requester)
-{
-	struct pwm_device *p;
-	int ret;
-
-	mutex_lock(&device_list_mutex);
-
-	p = __pwm_find_device(bus_id);
-	if (!p || chan >= p->nchan)
-		goto err_no_device;
-
-	if (!try_module_get(p->owner))
-		goto err_module_get_failed;
-
-	ret = __pwm_request_channel(&p->channels[chan], requester);
-	if (ret)
-		goto err_request_failed;
-
-	mutex_unlock(&device_list_mutex);
-	return &p->channels[chan];
-
-err_request_failed:
-	module_put(p->owner);
-err_module_get_failed:
-err_no_device:
-	mutex_unlock(&device_list_mutex);
-	return NULL;
-}
-EXPORT_SYMBOL(pwm_request);
-
-void pwm_free(struct pwm_channel *p)
-{
-	mutex_lock(&device_list_mutex);
-
-	if (!test_and_clear_bit(FLAG_REQUESTED, &p->flags))
-		goto done;
-
-	pwm_stop(p);
-	pwm_unsynchronize(p, NULL);
-	pwm_set_handler(p, NULL, NULL);
-
-	if (p->pwm->free)
-		p->pwm->free(p);
-	module_put(p->pwm->owner);
-done:
-	mutex_unlock(&device_list_mutex);
-}
-EXPORT_SYMBOL(pwm_free);
-
-unsigned long pwm_ns_to_ticks(struct pwm_channel *p,
-			      unsigned long nsecs)
-{
-	unsigned long long ticks;
-
-	ticks = nsecs;
-	ticks *= p->tick_hz;
-	do_div(ticks, 1000000000);
-	return ticks;
-}
-EXPORT_SYMBOL(pwm_ns_to_ticks);
-
-unsigned long pwm_ticks_to_ns(struct pwm_channel *p,
-			      unsigned long ticks)
-{
-	unsigned long long ns;
-
-	if (!p->tick_hz)
-		return 0;
-
-	ns = ticks;
-	ns *= 1000000000UL;
-	do_div(ns, p->tick_hz);
-	return ns;
-}
-EXPORT_SYMBOL(pwm_ticks_to_ns);
-
-static void
-pwm_config_ns_to_ticks(struct pwm_channel *p,
-		       struct pwm_channel_config *c)
-{
-	if (c->config_mask & PWM_CONFIG_PERIOD_NS) {
-		c->period_ticks = pwm_ns_to_ticks(p, c->period_ns);
-		c->config_mask &= ~PWM_CONFIG_PERIOD_NS;
-		c->config_mask |= PWM_CONFIG_PERIOD_TICKS;
-	}
-
-	if (c->config_mask & PWM_CONFIG_DUTY_NS) {
-		c->duty_ticks = pwm_ns_to_ticks(p, c->duty_ns);
-		c->config_mask &= ~PWM_CONFIG_DUTY_NS;
-		c->config_mask |= PWM_CONFIG_DUTY_TICKS;
-	}
-}
-
-static void
-pwm_config_percent_to_ticks(struct pwm_channel *p,
-			    struct pwm_channel_config *c)
-{
-	if (c->config_mask & PWM_CONFIG_DUTY_PERCENT) {
-		if (c->config_mask & PWM_CONFIG_PERIOD_TICKS)
-			c->duty_ticks = c->period_ticks;
-		else
-			c->duty_ticks = p->period_ticks;
-
-		c->duty_ticks *= c->duty_percent;
-		c->duty_ticks /= 100;
-		c->config_mask &= ~PWM_CONFIG_DUTY_PERCENT;
-		c->config_mask |= PWM_CONFIG_DUTY_TICKS;
-	}
-}
-
-int pwm_config_nosleep(struct pwm_channel *p,
-		       struct pwm_channel_config *c)
-{
-	if (!p->pwm->config_nosleep)
-		return -EINVAL;
-
-	pwm_config_ns_to_ticks(p, c);
-	pwm_config_percent_to_ticks(p, c);
-
-	return p->pwm->config_nosleep(p, c);
-}
-EXPORT_SYMBOL(pwm_config_nosleep);
-
-int pwm_config(struct pwm_channel *p,
-	       struct pwm_channel_config *c)
-{
-	int ret = 0;
-
-	if (unlikely(!p->pwm->config))
-		return -EINVAL;
-
-	pwm_config_ns_to_ticks(p, c);
-	pwm_config_percent_to_ticks(p, c);
-
-	switch (c->config_mask & (PWM_CONFIG_PERIOD_TICKS
-				  | PWM_CONFIG_DUTY_TICKS)) {
-	case PWM_CONFIG_PERIOD_TICKS:
-		if (p->duty_ticks > c->period_ticks) {
-			ret = -EINVAL;
-			goto err;
-		}
-		break;
-	case PWM_CONFIG_DUTY_TICKS:
-		if (p->period_ticks < c->duty_ticks) {
-			ret = -EINVAL;
-			goto err;
-		}
-		break;
-	case PWM_CONFIG_DUTY_TICKS | PWM_CONFIG_PERIOD_TICKS:
-		if (c->duty_ticks > c->period_ticks) {
-			ret = -EINVAL;
-			goto err;
-		}
-		break;
-	default:
-		break;
-	}
-
-err:
-	dev_dbg(p->pwm->dev, "%s: config_mask %d period_ticks %lu duty_ticks %lu"
-		" polarity %d duty_ns %lu period_ns %lu duty_percent %d\n",
-		__func__, c->config_mask, c->period_ticks, c->duty_ticks,
-		c->polarity, c->duty_ns, c->period_ns, c->duty_percent);
-
-	if (ret)
-		return ret;
-	return p->pwm->config(p, c);
-}
-EXPORT_SYMBOL(pwm_config);
-
-int pwm_set_period_ns(struct pwm_channel *p,
-		      unsigned long period_ns)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_PERIOD_TICKS,
-		.period_ticks = pwm_ns_to_ticks(p, period_ns),
-	};
-
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_set_period_ns);
-
-unsigned long pwm_get_period_ns(struct pwm_channel *p)
-{
-	return pwm_ticks_to_ns(p, p->period_ticks);
-}
-EXPORT_SYMBOL(pwm_get_period_ns);
-
-int pwm_set_duty_ns(struct pwm_channel *p,
-		    unsigned long duty_ns)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_DUTY_TICKS,
-		.duty_ticks = pwm_ns_to_ticks(p, duty_ns),
-	};
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_set_duty_ns);
-
-unsigned long pwm_get_duty_ns(struct pwm_channel *p)
-{
-	return pwm_ticks_to_ns(p, p->duty_ticks);
-}
-EXPORT_SYMBOL(pwm_get_duty_ns);
-
-int pwm_set_duty_percent(struct pwm_channel *p,
-			 int percent)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_DUTY_PERCENT,
-		.duty_percent = percent,
-	};
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_set_duty_percent);
-
-int pwm_set_polarity(struct pwm_channel *p,
-		     int active_high)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_POLARITY,
-		.polarity = active_high,
-	};
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_set_polarity);
-
-int pwm_start(struct pwm_channel *p)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_START,
-	};
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_start);
-
-int pwm_stop(struct pwm_channel *p)
-{
-	struct pwm_channel_config c = {
-		.config_mask = PWM_CONFIG_STOP,
-	};
-	return pwm_config(p, &c);
-}
-EXPORT_SYMBOL(pwm_stop);
-
-int pwm_synchronize(struct pwm_channel *p,
-		    struct pwm_channel *to_p)
-{
-	if (p->pwm != to_p->pwm) {
-		/* TODO: support cross-device synchronization */
-		return -EINVAL;
-	}
-
-	if (!p->pwm->synchronize)
-		return -EINVAL;
-
-	return p->pwm->synchronize(p, to_p);
-}
-EXPORT_SYMBOL(pwm_synchronize);
-
-int pwm_unsynchronize(struct pwm_channel *p,
-		      struct pwm_channel *from_p)
-{
-	if (from_p && (p->pwm != from_p->pwm)) {
-		/* TODO: support cross-device synchronization */
-		return -EINVAL;
-	}
-
-	if (!p->pwm->unsynchronize)
-		return -EINVAL;
-
-	return p->pwm->unsynchronize(p, from_p);
-}
-EXPORT_SYMBOL(pwm_unsynchronize);
-
-static void pwm_handler(struct work_struct *w)
-{
-	struct pwm_channel *p = container_of(w, struct pwm_channel,
-					     handler_work);
-	if (p->handler && p->handler(p, p->handler_data))
-		pwm_stop(p);
-}
-
-static void __pwm_callback(struct pwm_channel *p)
-{
-	queue_work(pwm_handler_workqueue, &p->handler_work);
-	dev_dbg(p->pwm->dev, "handler %p scheduled with data %p\n",
-		p->handler, p->handler_data);
-}
-
-int pwm_set_handler(struct pwm_channel *p,
-		    pwm_handler_t handler,
-		    void *data)
-{
-	if (p->pwm->set_callback) {
-		p->handler_data = data;
-		p->handler = handler;
-		INIT_WORK(&p->handler_work, pwm_handler);
-		return p->pwm->set_callback(p, handler ? __pwm_callback : NULL);
-	}
-	return -EINVAL;
-}
-EXPORT_SYMBOL(pwm_set_handler);
-
-static ssize_t pwm_run_store(struct device *dev,
-			     struct device_attribute *attr,
-			     const char *buf,
-			     size_t len)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	if (sysfs_streq(buf, "1"))
-		pwm_start(p);
-	else if (sysfs_streq(buf, "0"))
-		pwm_stop(p);
-	return len;
-}
-static DEVICE_ATTR(run, 0200, NULL, pwm_run_store);
-
-static ssize_t pwm_duty_ns_show(struct device *dev,
-				struct device_attribute *attr,
-				char *buf)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	return sprintf(buf, "%lu\n", pwm_get_duty_ns(p));
-}
-
-static ssize_t pwm_duty_ns_store(struct device *dev,
-				 struct device_attribute *attr,
-				 const char *buf,
-				 size_t len)
-{
-	unsigned long duty_ns;
-	struct pwm_channel *p = dev_get_drvdata(dev);
-
-	if (1 == sscanf(buf, "%lu", &duty_ns))
-		pwm_set_duty_ns(p, duty_ns);
-	return len;
-}
-static DEVICE_ATTR(duty_ns, 0644, pwm_duty_ns_show, pwm_duty_ns_store);
-
-static ssize_t pwm_period_ns_show(struct device *dev,
-				  struct device_attribute *attr,
-				  char *buf)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	return sprintf(buf, "%lu\n", pwm_get_period_ns(p));
-}
-
-static ssize_t pwm_period_ns_store(struct device *dev,
-				   struct device_attribute *attr,
-				   const char *buf,
-				   size_t len)
-{
-	unsigned long period_ns;
-	struct pwm_channel *p = dev_get_drvdata(dev);
-
-	if (1 == sscanf(buf, "%lu", &period_ns))
-		pwm_set_period_ns(p, period_ns);
-	return len;
-}
-static DEVICE_ATTR(period_ns, 0644, pwm_period_ns_show, pwm_period_ns_store);
-
-static ssize_t pwm_polarity_show(struct device *dev,
-				 struct device_attribute *attr,
-				 char *buf)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	return sprintf(buf, "%d\n", p->active_high ? 1 : 0);
-}
-
-static ssize_t pwm_polarity_store(struct device *dev,
-				  struct device_attribute *attr,
-				  const char *buf,
-				  size_t len)
-{
-	int polarity;
-	struct pwm_channel *p = dev_get_drvdata(dev);
-
-	if (1 == sscanf(buf, "%d", &polarity))
-		pwm_set_polarity(p, polarity);
-	return len;
-}
-static DEVICE_ATTR(polarity, 0644, pwm_polarity_show, pwm_polarity_store);
-
-static ssize_t pwm_request_show(struct device *dev,
-				struct device_attribute *attr,
-				char *buf)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	mutex_lock(&device_list_mutex);
-	__pwm_request_channel(p, REQUEST_SYSFS);
-	mutex_unlock(&device_list_mutex);
-
-	if (p->pid)
-		return sprintf(buf, "%s %d\n", p->requester, p->pid);
-	else
-		return sprintf(buf, "%s\n", p->requester);
-}
-
-static ssize_t pwm_request_store(struct device *dev,
-				 struct device_attribute *attr,
-				 const char *buf,
-				 size_t len)
-{
-	struct pwm_channel *p = dev_get_drvdata(dev);
-	pwm_free(p);
-	return len;
-}
-static DEVICE_ATTR(request, 0644, pwm_request_show, pwm_request_store);
-
-static const struct attribute *pwm_attrs[] =
-{
-	&dev_attr_run.attr,
-	&dev_attr_polarity.attr,
-	&dev_attr_duty_ns.attr,
-	&dev_attr_period_ns.attr,
-	&dev_attr_request.attr,
-	NULL,
-};
-
-static const struct attribute_group pwm_device_attr_group = {
-	.attrs = (struct attribute **)pwm_attrs,
-};
-
-static int __pwm_create_sysfs(struct pwm_device *pwm)
-{
-	int ret = 0;
-	struct device *dev;
-	int wchan;
-
-	for (wchan = 0; wchan < pwm->nchan; wchan++) {
-		dev = device_create(&pwm_class, pwm->dev, MKDEV(0, 0),
-				    pwm->channels + wchan,
-				    "%s:%d", pwm->bus_id, wchan);
-		if (!dev)
-			goto err_dev_create;
-		ret = sysfs_create_group(&dev->kobj, &pwm_device_attr_group);
-		if (ret)
-			goto err_dev_create;
-	}
-
-	return ret;
-
-err_dev_create:
-	for (wchan = 0; wchan < pwm->nchan; wchan++) {
-		dev = class_find_device(&pwm_class, NULL,
-					&pwm->channels[wchan],
-					__match_device);
-		if (dev) {
-			put_device(dev);
-			device_unregister(dev);
-		}
-	}
-
-	return ret;
-}
-
-static struct class_attribute pwm_class_attrs[] = {
-	__ATTR_NULL,
-};
-
-static struct class pwm_class = {
-	.name = "pwm",
-	.owner = THIS_MODULE,
-
-	.class_attrs = pwm_class_attrs,
-};
-
-static int __init pwm_init(void)
-{
-	int ret;
-
-	/* TODO: how to deal with devices that register very early? */
-	pr_err("%s\n", __func__);
-	ret = class_register(&pwm_class);
-	if (ret < 0)
-		return ret;
-
-	pwm_handler_workqueue = create_workqueue("pwmd");
-
-	return 0;
-}
-postcore_initcall(pwm_init);
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/Kconfig b/target/linux/generic-2.6/files/fs/yaffs2/Kconfig
deleted file mode 100644
index 7b6f836cda..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/Kconfig
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# YAFFS file system configurations
-#
-
-config YAFFS_FS
-	tristate "YAFFS2 file system support"
-	default n
-	depends on MTD
-	select YAFFS_YAFFS1
-	select YAFFS_YAFFS2
-	help
-	  YAFFS2, or Yet Another Flash Filing System, is a filing system
-	  optimised for NAND Flash chips.
-
-	  To compile the YAFFS2 file system support as a module, choose M
-	  here: the module will be called yaffs2.
-
-	  If unsure, say N.
-
-	  Further information on YAFFS2 is available at
-	  <http://www.aleph1.co.uk/yaffs/>.
-
-config YAFFS_YAFFS1
-	bool "512 byte / page devices"
-	depends on YAFFS_FS
-	default y
-	help
-	  Enable YAFFS1 support -- yaffs for 512 byte / page devices
-
-	  Not needed for 2K-page devices.
-
-	  If unsure, say Y.
-
-config YAFFS_9BYTE_TAGS
-	bool "Use older-style on-NAND data format with pageStatus byte"
-	depends on YAFFS_YAFFS1
-	default n
-	help
-
-	  Older-style on-NAND data format has a "pageStatus" byte to record
-	  chunk/page state.  This byte is zero when the page is discarded.
-	  Choose this option if you have existing on-NAND data using this
-	  format that you need to continue to support.  New data written
-	  also uses the older-style format.  Note: Use of this option
-	  generally requires that MTD's oob layout be adjusted to use the
-	  older-style format.  See notes on tags formats and MTD versions.
-
-	  If unsure, say N.
-
-config YAFFS_DOES_ECC
-	bool "Lets Yaffs do its own ECC"
-	depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS
-	default n
-	help
-	  This enables Yaffs to use its own ECC functions instead of using
-	  the ones from the generic MTD-NAND driver.
-
-	  If unsure, say N.
-
-config YAFFS_ECC_WRONG_ORDER
-	bool "Use the same ecc byte order as Steven Hill's nand_ecc.c"
-	depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS
-	default n
-	help
-	  This makes yaffs_ecc.c use the same ecc byte order as Steven
-	  Hill's nand_ecc.c. If not set, then you get the same ecc byte
-	  order as SmartMedia.
-
-	  If unsure, say N.
-
-config YAFFS_YAFFS2
-	bool "2048 byte (or larger) / page devices"
-	depends on YAFFS_FS
-	default y
-	help
-	  Enable YAFFS2 support -- yaffs for >= 2K bytes per page devices
-
-	  If unsure, say Y.
-
-config YAFFS_AUTO_YAFFS2
-	bool "Autoselect yaffs2 format"
-	depends on YAFFS_YAFFS2
-	default y
-	help
-	  Without this, you need to explicitely use yaffs2 as the file
-	  system type. With this, you can say "yaffs" and yaffs or yaffs2
-	  will be used depending on the device page size (yaffs on
-	  512-byte page devices, yaffs2 on 2K page devices).
-
-	  If unsure, say Y.
-
-config YAFFS_DISABLE_LAZY_LOAD
-	bool "Disable lazy loading"
-	depends on YAFFS_YAFFS2
-	default n
-	help
-	  "Lazy loading" defers loading file details until they are
-	  required. This saves mount time, but makes the first look-up
-	  a bit longer.
-
-	  Lazy loading will only happen if enabled by this option being 'n'
-	  and if the appropriate tags are available, else yaffs2 will
-	  automatically fall back to immediate loading and do the right
-	  thing.
-
-	  Lazy laoding will be required by checkpointing.
-
-	  Setting this to 'y' will disable lazy loading.
-
-	  If unsure, say N.
-
-config YAFFS_CHECKPOINT_RESERVED_BLOCKS
-	int "Reserved blocks for checkpointing"
-	depends on YAFFS_YAFFS2
-	default 10
-	help
-          Give the number of Blocks to reserve for checkpointing.
-	  Checkpointing saves the state at unmount so that mounting is
-	  much faster as a scan of all the flash to regenerate this state
-	  is not needed.  These Blocks are reserved per partition, so if
-	  you have very small partitions the default (10) may be a mess
-	  for you.  You can set this value to 0, but that does not mean
-	  checkpointing is disabled at all. There only won't be any
-	  specially reserved blocks for checkpointing, so if there is
-	  enough free space on the filesystem, it will be used for
-	  checkpointing.
-
-	  If unsure, leave at default (10), but don't wonder if there are
-	  always 2MB used on your large page device partition (10 x 2k
-	  pagesize). When using small partitions or when being very small
-	  on space, you probably want to set this to zero.
-
-config YAFFS_DISABLE_WIDE_TNODES
-	bool "Turn off wide tnodes"
-	depends on YAFFS_FS
-	default n
-	help
-	  Wide tnodes are only used for NAND arrays >=32MB for 512-byte
-	  page devices and >=128MB for 2k page devices. They use slightly
-	  more RAM but are faster since they eliminate chunk group
-	  searching.
-
-	  Setting this to 'y' will force tnode width to 16 bits and save
-	  memory but make large arrays slower.
-
-	  If unsure, say N.
-
-config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-	bool "Force chunk erase check"
-	depends on YAFFS_FS
-	default n
-	help
-          Normally YAFFS only checks chunks before writing until an erased
-	  chunk is found. This helps to detect any partially written
-	  chunks that might have happened due to power loss.
-
-	  Enabling this forces on the test that chunks are erased in flash
-	  before writing to them. This takes more time but is potentially
-	  a bit more secure.
-
-	  Suggest setting Y during development and ironing out driver
-	  issues etc. Suggest setting to N if you want faster writing.
-
-	  If unsure, say Y.
-
-config YAFFS_SHORT_NAMES_IN_RAM
-	bool "Cache short names in RAM"
-	depends on YAFFS_FS
-	default y
-	help
-	  If this config is set, then short names are stored with the
-	  yaffs_Object.  This costs an extra 16 bytes of RAM per object,
-	  but makes look-ups faster.
-
-	  If unsure, say Y.
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/Makefile b/target/linux/generic-2.6/files/fs/yaffs2/Makefile
deleted file mode 100644
index 73f46583f4..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the linux YAFFS filesystem routines.
-#
-
-obj-$(CONFIG_YAFFS_FS) += yaffs.o
-
-yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
-yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
-yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
-yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/devextras.h b/target/linux/generic-2.6/files/fs/yaffs2/devextras.h
deleted file mode 100644
index fcf2690a56..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/devextras.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
- * This file is just holds extra declarations used during development.
- * Most of these are from kernel includes placed here so we can use them in
- * applications.
- *
- */
-
-#ifndef __EXTRAS_H__
-#define __EXTRAS_H__
-
-#if defined WIN32
-#define __inline__ __inline
-#define new newHack
-#endif
-
-#if !(defined __KERNEL__) || (defined WIN32)
-
-/* User space defines */
-
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned __u32;
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-#define prefetch(x) 1
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-#define INIT_LIST_HEAD(ptr) do { \
-	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-} while (0)
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static __inline__ void __list_add(struct list_head *new,
-				  struct list_head *prev,
-				  struct list_head *next)
-{
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static __inline__ void list_add(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head, head->next);
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static __inline__ void list_add_tail(struct list_head *new,
-				     struct list_head *head)
-{
-	__list_add(new, head->prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static __inline__ void __list_del(struct list_head *prev,
-				  struct list_head *next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static __inline__ void list_del(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static __inline__ void list_del_init(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static __inline__ int list_empty(struct list_head *head)
-{
-	return head->next == head;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static __inline__ void list_splice(struct list_head *list,
-				   struct list_head *head)
-{
-	struct list_head *first = list->next;
-
-	if (first != list) {
-		struct list_head *last = list->prev;
-		struct list_head *at = head->next;
-
-		first->prev = head;
-		head->next = first;
-
-		last->next = at;
-		at->prev = last;
-	}
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-
-/**
- * list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- */
-#define list_for_each(pos, head) \
-	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
-        	pos = pos->next, prefetch(pos->next))
-
-/**
- * list_for_each_safe	-	iterate over a list safe against removal
- *                              of list entry
- * @pos:	the &struct list_head to use as a loop counter.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/*
- * File types
- */
-#define DT_UNKNOWN	0
-#define DT_FIFO		1
-#define DT_CHR		2
-#define DT_DIR		4
-#define DT_BLK		6
-#define DT_REG		8
-#define DT_LNK		10
-#define DT_SOCK		12
-#define DT_WHT		14
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-/*
- * Attribute flags.  These should be or-ed together to figure out what
- * has been changed!
- */
-#define ATTR_MODE	1
-#define ATTR_UID	2
-#define ATTR_GID	4
-#define ATTR_SIZE	8
-#define ATTR_ATIME	16
-#define ATTR_MTIME	32
-#define ATTR_CTIME	64
-#define ATTR_ATIME_SET	128
-#define ATTR_MTIME_SET	256
-#define ATTR_FORCE	512	/* Not a change, but a change it */
-#define ATTR_ATTR_FLAG	1024
-
-struct iattr {
-	unsigned int ia_valid;
-	unsigned ia_mode;
-	unsigned ia_uid;
-	unsigned ia_gid;
-	unsigned ia_size;
-	unsigned ia_atime;
-	unsigned ia_mtime;
-	unsigned ia_ctime;
-	unsigned int ia_attr_flags;
-};
-
-#define KERN_DEBUG
-
-#else
-
-#ifndef WIN32
-#include <linux/types.h>
-#include <linux/list.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-#endif
-
-#endif
-
-#if defined WIN32
-#undef new
-#endif
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/moduleconfig.h b/target/linux/generic-2.6/files/fs/yaffs2/moduleconfig.h
deleted file mode 100644
index 016391ca59..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/moduleconfig.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Martin Fouts <Martin.Fouts@palmsource.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_CONFIG_H__
-#define __YAFFS_CONFIG_H__
-
-#ifdef YAFFS_OUT_OF_TREE
-
-/* DO NOT UNSET THESE THREE. YAFFS2 will not compile if you do. */
-#define CONFIG_YAFFS_FS
-#define CONFIG_YAFFS_YAFFS1
-#define CONFIG_YAFFS_YAFFS2
-
-/* These options are independent of each other.  Select those that matter. */
-
-/* Default: Not selected */
-/* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
-//#define CONFIG_YAFFS_DOES_ECC
-
-/* Default: Not selected */
-/* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
-/*          CONFIG_YAFFS_DOES_ECC is set */
-//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-
-/* Default: Selected */
-/* Meaning: Disables testing whether chunks are erased before writing to them*/
-#define CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK
-
-/* Default: Selected */
-/* Meaning: Cache short names, taking more RAM, but faster look-ups */
-#define CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-
-/* Default: 10 */
-/* Meaning: set the count of blocks to reserve for checkpointing */
-#define CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS 10
-
-/*
-Older-style on-NAND data format has a "pageStatus" byte to record
-chunk/page state.  This byte is zeroed when the page is discarded.
-Choose this option if you have existing on-NAND data in this format
-that you need to continue to support.  New data written also uses the
-older-style format.
-Note: Use of this option generally requires that MTD's oob layout be
-adjusted to use the older-style format.  See notes on tags formats and
-MTD versions.
-*/
-/* Default: Not selected */
-/* Meaning: Use older-style on-NAND data format with pageStatus byte */
-#define CONFIG_YAFFS_9BYTE_TAGS
-
-#endif /* YAFFS_OUT_OF_TREE */
-
-#endif /* __YAFFS_CONFIG_H__ */
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.c
deleted file mode 100644
index 933a33fb8b..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_checkptrw_c_version =
-    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-
-
-#include "yaffs_checkptrw.h"
-
-
-static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
-{
-
-	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
-
-	T(YAFFS_TRACE_CHECKPOINT,
-		(TSTR("checkpt blocks available = %d" TENDSTR),
-		blocksAvailable));
-
-
-	return (blocksAvailable <= 0) ? 0 : 1;
-}
-
-
-static int yaffs_CheckpointErase(yaffs_Device *dev)
-{
-
-	int i;
-
-
-	if(!dev->eraseBlockInNAND)
-		return 0;
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
-		dev->internalStartBlock,dev->internalEndBlock));
-
-	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
-		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
-			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
-			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-				dev->nErasedBlocks++;
-				dev->nFreeChunks += dev->nChunksPerBlock;
-			}
-			else {
-				dev->markNANDBlockBad(dev,i);
-				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-			}
-		}
-	}
-
-	dev->blocksInCheckpoint = 0;
-
-	return 1;
-}
-
-
-static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
-{
-	int  i;
-	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
-	T(YAFFS_TRACE_CHECKPOINT,
-		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
-		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-
-	if(dev->checkpointNextBlock >= 0 &&
-	   dev->checkpointNextBlock <= dev->internalEndBlock &&
-	   blocksAvailable > 0){
-
-		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
-			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-				dev->checkpointNextBlock = i + 1;
-				dev->checkpointCurrentBlock = i;
-				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-				return;
-			}
-		}
-	}
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-
-	dev->checkpointNextBlock = -1;
-	dev->checkpointCurrentBlock = -1;
-}
-
-static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
-{
-	int  i;
-	yaffs_ExtendedTags tags;
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-		dev->blocksInCheckpoint, dev->checkpointNextBlock));
-
-	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-			int chunk = i * dev->nChunksPerBlock;
-			int realignedChunk = chunk - dev->chunkOffset;
-
-			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
-			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-
-			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-				/* Right kind of block */
-				dev->checkpointNextBlock = tags.objectId;
-				dev->checkpointCurrentBlock = i;
-				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
-				dev->blocksInCheckpoint++;
-				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-				return;
-			}
-		}
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-
-	dev->checkpointNextBlock = -1;
-	dev->checkpointCurrentBlock = -1;
-}
-
-
-int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
-{
-
-	/* Got the functions we need? */
-	if (!dev->writeChunkWithTagsToNAND ||
-	    !dev->readChunkWithTagsFromNAND ||
-	    !dev->eraseBlockInNAND ||
-	    !dev->markNANDBlockBad)
-		return 0;
-
-	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-		return 0;
-
-	if(!dev->checkpointBuffer)
-		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
-	if(!dev->checkpointBuffer)
-		return 0;
-
-
-	dev->checkpointPageSequence = 0;
-
-	dev->checkpointOpenForWrite = forWriting;
-
-	dev->checkpointByteCount = 0;
-	dev->checkpointSum = 0;
-	dev->checkpointXor = 0;
-	dev->checkpointCurrentBlock = -1;
-	dev->checkpointCurrentChunk = -1;
-	dev->checkpointNextBlock = dev->internalStartBlock;
-
-	/* Erase all the blocks in the checkpoint area */
-	if(forWriting){
-		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-		dev->checkpointByteOffset = 0;
-		return yaffs_CheckpointErase(dev);
-
-
-	} else {
-		int i;
-		/* Set to a value that will kick off a read */
-		dev->checkpointByteOffset = dev->nDataBytesPerChunk;
-		/* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
-		 * going to be way more than we need */
-		dev->blocksInCheckpoint = 0;
-		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
-		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
-		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-			dev->checkpointBlockList[i] = -1;
-	}
-
-	return 1;
-}
-
-int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum)
-{
-	__u32 compositeSum;
-	compositeSum =  (dev->checkpointSum << 8) | (dev->checkpointXor & 0xFF);
-	*sum = compositeSum;
-	return 1;
-}
-
-static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
-{
-
-	int chunk;
-	int realignedChunk;
-
-	yaffs_ExtendedTags tags;
-
-	if(dev->checkpointCurrentBlock < 0){
-		yaffs_CheckpointFindNextErasedBlock(dev);
-		dev->checkpointCurrentChunk = 0;
-	}
-
-	if(dev->checkpointCurrentBlock < 0)
-		return 0;
-
-	tags.chunkDeleted = 0;
-	tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
-	tags.chunkId = dev->checkpointPageSequence + 1;
-	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
-	tags.byteCount = dev->nDataBytesPerChunk;
-	if(dev->checkpointCurrentChunk == 0){
-		/* First chunk we write for the block? Set block state to
-		   checkpoint */
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
-		dev->blocksInCheckpoint++;
-	}
-
-	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
-
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-
-	realignedChunk = chunk - dev->chunkOffset;
-
-	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-	dev->checkpointByteOffset = 0;
-	dev->checkpointPageSequence++;
-	dev->checkpointCurrentChunk++;
-	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-		dev->checkpointCurrentChunk = 0;
-		dev->checkpointCurrentBlock = -1;
-	}
-	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-
-	return 1;
-}
-
-
-int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-{
-	int i=0;
-	int ok = 1;
-
-
-	__u8 * dataBytes = (__u8 *)data;
-
-
-
-	if(!dev->checkpointBuffer)
-		return 0;
-
-	if(!dev->checkpointOpenForWrite)
-		return -1;
-
-	while(i < nBytes && ok) {
-
-
-
-		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-		dev->checkpointSum += *dataBytes;
-		dev->checkpointXor ^= *dataBytes;
-
-		dev->checkpointByteOffset++;
-		i++;
-		dataBytes++;
-		dev->checkpointByteCount++;
-
-
-		if(dev->checkpointByteOffset < 0 ||
-		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
-			ok = yaffs_CheckpointFlushBuffer(dev);
-
-	}
-
-	return 	i;
-}
-
-int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
-{
-	int i=0;
-	int ok = 1;
-	yaffs_ExtendedTags tags;
-
-
-	int chunk;
-	int realignedChunk;
-
-	__u8 *dataBytes = (__u8 *)data;
-
-	if(!dev->checkpointBuffer)
-		return 0;
-
-	if(dev->checkpointOpenForWrite)
-		return -1;
-
-	while(i < nBytes && ok) {
-
-
-		if(dev->checkpointByteOffset < 0 ||
-		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-
-		   	if(dev->checkpointCurrentBlock < 0){
-				yaffs_CheckpointFindNextCheckpointBlock(dev);
-				dev->checkpointCurrentChunk = 0;
-			}
-
-			if(dev->checkpointCurrentBlock < 0)
-				ok = 0;
-			else {
-
-				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
-				          dev->checkpointCurrentChunk;
-
-				realignedChunk = chunk - dev->chunkOffset;
-
-	   			/* read in the next chunk */
-	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-							       dev->checkpointBuffer,
-							      &tags);
-
-				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
-				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-				   ok = 0;
-
-				dev->checkpointByteOffset = 0;
-				dev->checkpointPageSequence++;
-				dev->checkpointCurrentChunk++;
-
-				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-					dev->checkpointCurrentBlock = -1;
-			}
-		}
-
-		if(ok){
-			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
-			dev->checkpointSum += *dataBytes;
-			dev->checkpointXor ^= *dataBytes;
-			dev->checkpointByteOffset++;
-			i++;
-			dataBytes++;
-			dev->checkpointByteCount++;
-		}
-	}
-
-	return 	i;
-}
-
-int yaffs_CheckpointClose(yaffs_Device *dev)
-{
-
-	if(dev->checkpointOpenForWrite){
-		if(dev->checkpointByteOffset != 0)
-			yaffs_CheckpointFlushBuffer(dev);
-	} else {
-		int i;
-		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
-			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
-			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
-			else {
-				// Todo this looks odd...
-			}
-		}
-		YFREE(dev->checkpointBlockList);
-		dev->checkpointBlockList = NULL;
-	}
-
-	dev->nFreeChunks -= dev->blocksInCheckpoint * dev->nChunksPerBlock;
-	dev->nErasedBlocks -= dev->blocksInCheckpoint;
-
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-			dev->checkpointByteCount));
-
-	if(dev->checkpointBuffer){
-		/* free the buffer */
-		YFREE(dev->checkpointBuffer);
-		dev->checkpointBuffer = NULL;
-		return 1;
-	}
-	else
-		return 0;
-
-}
-
-int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
-{
-	/* Erase the first checksum block */
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-
-	if(!yaffs_CheckpointSpaceOk(dev))
-		return 0;
-
-	return yaffs_CheckpointErase(dev);
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.h
deleted file mode 100644
index d3ff17405f..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_CHECKPTRW_H__
-#define __YAFFS_CHECKPTRW_H__
-
-#include "yaffs_guts.h"
-
-int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
-
-int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-
-int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-
-int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
-
-int yaffs_CheckpointClose(yaffs_Device *dev);
-
-int yaffs_CheckpointInvalidateStream(yaffs_Device *dev);
-
-
-#endif
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.c
deleted file mode 100644
index e2860393d3..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * This code implements the ECC algorithm used in SmartMedia.
- *
- * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
- * The two unused bit are set to 1.
- * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
- * blocks are used on a 512-byte NAND page.
- *
- */
-
-/* Table generated by gen-ecc.c
- * Using a table means we do not have to calculate p1..p4 and p1'..p4'
- * for each byte of data. These are instead provided in a table in bits7..2.
- * Bit 0 of each entry indicates whether the entry has an odd or even parity, and therefore
- * this bytes influence on the line parity.
- */
-
-const char *yaffs_ecc_c_version =
-    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-
-#include "yportenv.h"
-
-#include "yaffs_ecc.h"
-
-static const unsigned char column_parity_table[] = {
-	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-	0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
-	0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
-	0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
-	0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
-	0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
-	0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
-	0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
-	0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
-	0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
-	0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
-	0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
-	0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
-	0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
-	0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
-	0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
-	0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
-};
-
-/* Count the bits in an unsigned char or a U32 */
-
-static int yaffs_CountBits(unsigned char x)
-{
-	int r = 0;
-	while (x) {
-		if (x & 1)
-			r++;
-		x >>= 1;
-	}
-	return r;
-}
-
-static int yaffs_CountBits32(unsigned x)
-{
-	int r = 0;
-	while (x) {
-		if (x & 1)
-			r++;
-		x >>= 1;
-	}
-	return r;
-}
-
-/* Calculate the ECC for a 256-byte block of data */
-void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
-{
-	unsigned int i;
-
-	unsigned char col_parity = 0;
-	unsigned char line_parity = 0;
-	unsigned char line_parity_prime = 0;
-	unsigned char t;
-	unsigned char b;
-
-	for (i = 0; i < 256; i++) {
-		b = column_parity_table[*data++];
-		col_parity ^= b;
-
-		if (b & 0x01)	// odd number of bits in the byte
-		{
-			line_parity ^= i;
-			line_parity_prime ^= ~i;
-		}
-
-	}
-
-	ecc[2] = (~col_parity) | 0x03;
-
-	t = 0;
-	if (line_parity & 0x80)
-		t |= 0x80;
-	if (line_parity_prime & 0x80)
-		t |= 0x40;
-	if (line_parity & 0x40)
-		t |= 0x20;
-	if (line_parity_prime & 0x40)
-		t |= 0x10;
-	if (line_parity & 0x20)
-		t |= 0x08;
-	if (line_parity_prime & 0x20)
-		t |= 0x04;
-	if (line_parity & 0x10)
-		t |= 0x02;
-	if (line_parity_prime & 0x10)
-		t |= 0x01;
-	ecc[1] = ~t;
-
-	t = 0;
-	if (line_parity & 0x08)
-		t |= 0x80;
-	if (line_parity_prime & 0x08)
-		t |= 0x40;
-	if (line_parity & 0x04)
-		t |= 0x20;
-	if (line_parity_prime & 0x04)
-		t |= 0x10;
-	if (line_parity & 0x02)
-		t |= 0x08;
-	if (line_parity_prime & 0x02)
-		t |= 0x04;
-	if (line_parity & 0x01)
-		t |= 0x02;
-	if (line_parity_prime & 0x01)
-		t |= 0x01;
-	ecc[0] = ~t;
-
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-	// Swap the bytes into the wrong order
-	t = ecc[0];
-	ecc[0] = ecc[1];
-	ecc[1] = t;
-#endif
-}
-
-
-/* Correct the ECC on a 256 byte block of data */
-
-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-		     const unsigned char *test_ecc)
-{
-	unsigned char d0, d1, d2;	/* deltas */
-
-	d0 = read_ecc[0] ^ test_ecc[0];
-	d1 = read_ecc[1] ^ test_ecc[1];
-	d2 = read_ecc[2] ^ test_ecc[2];
-
-	if ((d0 | d1 | d2) == 0)
-		return 0; /* no error */
-
-	if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
-	    ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
-	    ((d2 ^ (d2 >> 1)) & 0x54) == 0x54) {
-		/* Single bit (recoverable) error in data */
-
-		unsigned byte;
-		unsigned bit;
-
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-		// swap the bytes to correct for the wrong order
-		unsigned char t;
-
-		t = d0;
-		d0 = d1;
-		d1 = t;
-#endif
-
-		bit = byte = 0;
-
-		if (d1 & 0x80)
-			byte |= 0x80;
-		if (d1 & 0x20)
-			byte |= 0x40;
-		if (d1 & 0x08)
-			byte |= 0x20;
-		if (d1 & 0x02)
-			byte |= 0x10;
-		if (d0 & 0x80)
-			byte |= 0x08;
-		if (d0 & 0x20)
-			byte |= 0x04;
-		if (d0 & 0x08)
-			byte |= 0x02;
-		if (d0 & 0x02)
-			byte |= 0x01;
-
-		if (d2 & 0x80)
-			bit |= 0x04;
-		if (d2 & 0x20)
-			bit |= 0x02;
-		if (d2 & 0x08)
-			bit |= 0x01;
-
-		data[byte] ^= (1 << bit);
-
-		return 1; /* Corrected the error */
-	}
-
-	if ((yaffs_CountBits(d0) +
-	     yaffs_CountBits(d1) +
-	     yaffs_CountBits(d2)) ==  1) {
-		/* Reccoverable error in ecc */
-
-		read_ecc[0] = test_ecc[0];
-		read_ecc[1] = test_ecc[1];
-		read_ecc[2] = test_ecc[2];
-
-		return 1; /* Corrected the error */
-	}
-
-	/* Unrecoverable error */
-
-	return -1;
-
-}
-
-
-/*
- * ECCxxxOther does ECC calcs on arbitrary n bytes of data
- */
-void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-			     yaffs_ECCOther * eccOther)
-{
-	unsigned int i;
-
-	unsigned char col_parity = 0;
-	unsigned line_parity = 0;
-	unsigned line_parity_prime = 0;
-	unsigned char b;
-
-	for (i = 0; i < nBytes; i++) {
-		b = column_parity_table[*data++];
-		col_parity ^= b;
-
-		if (b & 0x01)	 {
-			/* odd number of bits in the byte */
-			line_parity ^= i;
-			line_parity_prime ^= ~i;
-		}
-
-	}
-
-	eccOther->colParity = (col_parity >> 2) & 0x3f;
-	eccOther->lineParity = line_parity;
-	eccOther->lineParityPrime = line_parity_prime;
-}
-
-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-			  yaffs_ECCOther * read_ecc,
-			  const yaffs_ECCOther * test_ecc)
-{
-	unsigned char cDelta;	/* column parity delta */
-	unsigned lDelta;	/* line parity delta */
-	unsigned lDeltaPrime;	/* line parity delta */
-	unsigned bit;
-
-	cDelta = read_ecc->colParity ^ test_ecc->colParity;
-	lDelta = read_ecc->lineParity ^ test_ecc->lineParity;
-	lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
-
-	if ((cDelta | lDelta | lDeltaPrime) == 0)
-		return 0; /* no error */
-
-	if (lDelta == ~lDeltaPrime &&
-	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
-	{
-		/* Single bit (recoverable) error in data */
-
-		bit = 0;
-
-		if (cDelta & 0x20)
-			bit |= 0x04;
-		if (cDelta & 0x08)
-			bit |= 0x02;
-		if (cDelta & 0x02)
-			bit |= 0x01;
-
-		if(lDelta >= nBytes)
-			return -1;
-
-		data[lDelta] ^= (1 << bit);
-
-		return 1; /* corrected */
-	}
-
-	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
-	     yaffs_CountBits(cDelta)) == 1) {
-		/* Reccoverable error in ecc */
-
-		*read_ecc = *test_ecc;
-		return 1; /* corrected */
-	}
-
-	/* Unrecoverable error */
-
-	return -1;
-
-}
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.h
deleted file mode 100644
index 79bc3d1171..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
- /*
-  * This code implements the ECC algorithm used in SmartMedia.
-  *
-  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-  * The two unused bit are set to 1.
-  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-  * blocks are used on a 512-byte NAND page.
-  *
-  */
-
-#ifndef __YAFFS_ECC_H__
-#define __YAFFS_ECC_H__
-
-typedef struct {
-	unsigned char colParity;
-	unsigned lineParity;
-	unsigned lineParityPrime;
-} yaffs_ECCOther;
-
-void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
-		     const unsigned char *test_ecc);
-
-void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-			     yaffs_ECCOther * ecc);
-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-			  yaffs_ECCOther * read_ecc,
-			  const yaffs_ECCOther * test_ecc);
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_fs.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_fs.c
deleted file mode 100644
index 67001b10e6..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_fs.c
+++ /dev/null
@@ -1,2299 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- * Acknowledgements:
- * Luc van OostenRyck for numerous patches.
- * Nick Bane for numerous patches.
- * Nick Bane for 2.5/2.6 integration.
- * Andras Toth for mknod rdev issue.
- * Michael Fischer for finding the problem with inode inconsistency.
- * Some code bodily lifted from JFFS
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- *
- * This is the file system front-end to YAFFS that hooks it up to
- * the VFS.
- *
- * Special notes:
- * >> 2.4: sb->u.generic_sbp points to the yaffs_Device associated with
- *         this superblock
- * >> 2.6: sb->s_fs_info  points to the yaffs_Device associated with this
- *         superblock
- * >> inode->u.generic_ip points to the associated yaffs_Object.
- */
-
-const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-extern const char *yaffs_guts_c_version;
-
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-#include <linux/config.h>
-#endif
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/fs.h>
-#include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
-#include <linux/pagemap.h>
-#include <linux/mtd/mtd.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/ctype.h>
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-
-#include <linux/statfs.h>	/* Added NCB 15-8-2003 */
-#include <asm/statfs.h>
-#define UnlockPage(p) unlock_page(p)
-#define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
-
-/* FIXME: use sb->s_id instead ? */
-#define yaffs_devname(sb, buf)	bdevname(sb->s_bdev, buf)
-
-#else
-
-#include <linux/locks.h>
-#define	BDEVNAME_SIZE		0
-#define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
-#define __user
-#endif
-
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-#define WRITE_SIZE_STR "writesize"
-#define WRITE_SIZE(mtd) (mtd)->writesize
-#else
-#define WRITE_SIZE_STR "oobblock"
-#define WRITE_SIZE(mtd) (mtd)->oobblock
-#endif
-
-#include <asm/uaccess.h>
-
-#include "yportenv.h"
-#include "yaffs_guts.h"
-
-#include <linux/mtd/mtd.h>
-#include "yaffs_mtdif.h"
-#include "yaffs_mtdif1.h"
-#include "yaffs_mtdif2.h"
-
-unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
-unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-
-/* Module Parameters */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-module_param(yaffs_traceMask,uint,0644);
-module_param(yaffs_wr_attempts,uint,0644);
-#else
-MODULE_PARM(yaffs_traceMask,"i");
-MODULE_PARM(yaffs_wr_attempts,"i");
-#endif
-
-/*#define T(x) printk x */
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-#else
-#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-#endif
-
-#define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
-#define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-#define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
-#else
-#define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-#endif
-
-static void yaffs_put_super(struct super_block *sb);
-
-static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-				loff_t * pos);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_file_flush(struct file *file, fl_owner_t id);
-#else
-static int yaffs_file_flush(struct file *file);
-#endif
-
-static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-			     int datasync);
-
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-			struct nameidata *n);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-				   struct nameidata *n);
-#else
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
-#endif
-static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-		      struct dentry *dentry);
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
-static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-			 const char *symname);
-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       dev_t dev);
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       int dev);
-#endif
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-			struct inode *new_dir, struct dentry *new_dentry);
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_sync_fs(struct super_block *sb, int wait);
-static void yaffs_write_super(struct super_block *sb);
-#else
-static int yaffs_sync_fs(struct super_block *sb);
-static int yaffs_write_super(struct super_block *sb);
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
-#else
-static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
-#endif
-static void yaffs_read_inode(struct inode *inode);
-
-static void yaffs_put_inode(struct inode *inode);
-static void yaffs_delete_inode(struct inode *);
-static void yaffs_clear_inode(struct inode *);
-
-static int yaffs_readpage(struct file *file, struct page *page);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
-#else
-static int yaffs_writepage(struct page *page);
-#endif
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-			       unsigned offset, unsigned to);
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-			      unsigned to);
-
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-			  int buflen);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-#else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-#endif
-
-static struct address_space_operations yaffs_file_address_operations = {
-	.readpage = yaffs_readpage,
-	.writepage = yaffs_writepage,
-	.prepare_write = yaffs_prepare_write,
-	.commit_write = yaffs_commit_write,
-};
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
-static struct file_operations yaffs_file_operations = {
-	.read = do_sync_read,
-	.write = do_sync_write,
-	.aio_read = generic_file_aio_read,
-	.aio_write = generic_file_aio_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-	.splice_read = generic_file_splice_read,
-	.splice_write = generic_file_splice_write,
-};
-
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-
-static struct file_operations yaffs_file_operations = {
-	.read = do_sync_read,
-	.write = do_sync_write,
-	.aio_read = generic_file_aio_read,
-	.aio_write = generic_file_aio_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-	.sendfile = generic_file_sendfile,
-};
-
-#else
-
-static struct file_operations yaffs_file_operations = {
-	.read = generic_file_read,
-	.write = generic_file_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-	.sendfile = generic_file_sendfile,
-#endif
-};
-#endif
-
-static struct inode_operations yaffs_file_inode_operations = {
-	.setattr = yaffs_setattr,
-};
-
-static struct inode_operations yaffs_symlink_inode_operations = {
-	.readlink = yaffs_readlink,
-	.follow_link = yaffs_follow_link,
-	.setattr = yaffs_setattr,
-};
-
-static struct inode_operations yaffs_dir_inode_operations = {
-	.create = yaffs_create,
-	.lookup = yaffs_lookup,
-	.link = yaffs_link,
-	.unlink = yaffs_unlink,
-	.symlink = yaffs_symlink,
-	.mkdir = yaffs_mkdir,
-	.rmdir = yaffs_unlink,
-	.mknod = yaffs_mknod,
-	.rename = yaffs_rename,
-	.setattr = yaffs_setattr,
-};
-
-static struct file_operations yaffs_dir_operations = {
-	.read = generic_read_dir,
-	.readdir = yaffs_readdir,
-	.fsync = yaffs_sync_object,
-};
-
-static struct super_operations yaffs_super_ops = {
-	.statfs = yaffs_statfs,
-	.read_inode = yaffs_read_inode,
-	.put_inode = yaffs_put_inode,
-	.put_super = yaffs_put_super,
-	.delete_inode = yaffs_delete_inode,
-	.clear_inode = yaffs_clear_inode,
-	.sync_fs = yaffs_sync_fs,
-	.write_super = yaffs_write_super,
-};
-
-static void yaffs_GrossLock(yaffs_Device * dev)
-{
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
-
-	down(&dev->grossLock);
-}
-
-static void yaffs_GrossUnlock(yaffs_Device * dev)
-{
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-	up(&dev->grossLock);
-
-}
-
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-			  int buflen)
-{
-	unsigned char *alias;
-	int ret;
-
-	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-
-	yaffs_GrossLock(dev);
-
-	alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
-
-	yaffs_GrossUnlock(dev);
-
-	if (!alias)
-		return -ENOMEM;
-
-	ret = vfs_readlink(dentry, buffer, buflen, alias);
-	kfree(alias);
-	return ret;
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-#else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-#endif
-{
-	unsigned char *alias;
-	int ret;
-	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-
-	yaffs_GrossLock(dev);
-
-	alias = yaffs_GetSymlinkAlias(yaffs_DentryToObject(dentry));
-
-	yaffs_GrossUnlock(dev);
-
-	if (!alias)
-        {
-		ret = -ENOMEM;
-		goto out;
-        }
-
-	ret = vfs_follow_link(nd, alias);
-	kfree(alias);
-out:
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-	return ERR_PTR (ret);
-#else
-	return ret;
-#endif
-}
-
-struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-			      yaffs_Object * obj);
-
-/*
- * Lookup is used to find objects in the fs
- */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-				   struct nameidata *n)
-#else
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
-#endif
-{
-	yaffs_Object *obj;
-	struct inode *inode = NULL;	/* NCB 2.5/2.6 needs NULL here */
-
-	yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev;
-
-	yaffs_GrossLock(dev);
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
-	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-
-	obj =
-	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-				   dentry->d_name.name);
-
-	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
-
-	/* Can't hold gross lock when calling yaffs_get_inode() */
-	yaffs_GrossUnlock(dev);
-
-	if (obj) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-
-		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-
-		if (inode) {
-			T(YAFFS_TRACE_OS,
-			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-/* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
- * d_add even if NULL inode */
-#if 0
-			/*dget(dentry); // try to solve directory bug */
-			d_add(dentry, inode);
-
-			/* return dentry; */
-			return NULL;
-#endif
-		}
-
-	} else {
-		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-
-	}
-
-/* added NCB for 2.5/6 compatability - forces add even if inode is
- * NULL which creates dentry hash */
-	d_add(dentry, inode);
-
-	return NULL;
-	/*      return (ERR_PTR(-EIO)); */
-
-}
-
-/* For now put inode is just for debugging
- * Put inode is called when the inode **structure** is put.
- */
-static void yaffs_put_inode(struct inode *inode)
-{
-	T(YAFFS_TRACE_OS,
-	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-	   atomic_read(&inode->i_count)));
-
-}
-
-/* clear is called to tell the fs to release any per-inode data it holds */
-static void yaffs_clear_inode(struct inode *inode)
-{
-	yaffs_Object *obj;
-	yaffs_Device *dev;
-
-	obj = yaffs_InodeToObject(inode);
-
-	T(YAFFS_TRACE_OS,
-	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-	   atomic_read(&inode->i_count),
-	   obj ? "object exists" : "null object"));
-
-	if (obj) {
-		dev = obj->myDev;
-		yaffs_GrossLock(dev);
-
-		/* Clear the association between the inode and
-		 * the yaffs_Object.
-		 */
-		obj->myInode = NULL;
-		yaffs_InodeToObjectLV(inode) = NULL;
-
-		/* If the object freeing was deferred, then the real
-		 * free happens now.
-		 * This should fix the inode inconsistency problem.
-		 */
-
-		yaffs_HandleDeferedFree(obj);
-
-		yaffs_GrossUnlock(dev);
-	}
-
-}
-
-/* delete is called when the link count is zero and the inode
- * is put (ie. nobody wants to know about it anymore, time to
- * delete the file).
- * NB Must call clear_inode()
- */
-static void yaffs_delete_inode(struct inode *inode)
-{
-	yaffs_Object *obj = yaffs_InodeToObject(inode);
-	yaffs_Device *dev;
-
-	T(YAFFS_TRACE_OS,
-	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-	   atomic_read(&inode->i_count),
-	   obj ? "object exists" : "null object"));
-
-	if (obj) {
-		dev = obj->myDev;
-		yaffs_GrossLock(dev);
-		yaffs_DeleteFile(obj);
-		yaffs_GrossUnlock(dev);
-	}
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-        truncate_inode_pages (&inode->i_data, 0);
-#endif
-	clear_inode(inode);
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_file_flush(struct file *file, fl_owner_t id)
-#else
-static int yaffs_file_flush(struct file *file)
-#endif
-{
-	yaffs_Object *obj = yaffs_DentryToObject(file->f_dentry);
-
-	yaffs_Device *dev = obj->myDev;
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
-	   obj->dirty ? "dirty" : "clean"));
-
-	yaffs_GrossLock(dev);
-
-	yaffs_FlushFile(obj, 1);
-
-	yaffs_GrossUnlock(dev);
-
-	return 0;
-}
-
-static int yaffs_readpage_nolock(struct file *f, struct page *pg)
-{
-	/* Lifted from jffs2 */
-
-	yaffs_Object *obj;
-	unsigned char *pg_buf;
-	int ret;
-
-	yaffs_Device *dev;
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
-			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
-			   (unsigned)PAGE_CACHE_SIZE));
-
-	obj = yaffs_DentryToObject(f->f_dentry);
-
-	dev = obj->myDev;
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-	BUG_ON(!PageLocked(pg));
-#else
-	if (!PageLocked(pg))
-		PAGE_BUG(pg);
-#endif
-
-	pg_buf = kmap(pg);
-	/* FIXME: Can kmap fail? */
-
-	yaffs_GrossLock(dev);
-
-	ret =
-	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
-				   PAGE_CACHE_SIZE);
-
-	yaffs_GrossUnlock(dev);
-
-	if (ret >= 0)
-		ret = 0;
-
-	if (ret) {
-		ClearPageUptodate(pg);
-		SetPageError(pg);
-	} else {
-		SetPageUptodate(pg);
-		ClearPageError(pg);
-	}
-
-	flush_dcache_page(pg);
-	kunmap(pg);
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-	return ret;
-}
-
-static int yaffs_readpage_unlock(struct file *f, struct page *pg)
-{
-	int ret = yaffs_readpage_nolock(f, pg);
-	UnlockPage(pg);
-	return ret;
-}
-
-static int yaffs_readpage(struct file *f, struct page *pg)
-{
-	return yaffs_readpage_unlock(f, pg);
-}
-
-/* writepage inspired by/stolen from smbfs */
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
-#else
-static int yaffs_writepage(struct page *page)
-#endif
-{
-	struct address_space *mapping = page->mapping;
-	loff_t offset = (loff_t) page->index << PAGE_CACHE_SHIFT;
-	struct inode *inode;
-	unsigned long end_index;
-	char *buffer;
-	yaffs_Object *obj;
-	int nWritten = 0;
-	unsigned nBytes;
-
-	if (!mapping)
-		BUG();
-	inode = mapping->host;
-	if (!inode)
-		BUG();
-
-	if (offset > inode->i_size) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG
-		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
-		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
-		   (unsigned)inode->i_size));
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "                -> don't care!!\n"));
-		unlock_page(page);
-		return 0;
-	}
-
-	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
-
-	/* easy case */
-	if (page->index < end_index) {
-		nBytes = PAGE_CACHE_SIZE;
-	} else {
-		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
-	}
-
-	get_page(page);
-
-	buffer = kmap(page);
-
-	obj = yaffs_InodeToObject(inode);
-	yaffs_GrossLock(obj->myDev);
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
-	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
-	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-
-	nWritten =
-	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
-				  nBytes, 0);
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
-	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-
-	yaffs_GrossUnlock(obj->myDev);
-
-	kunmap(page);
-	SetPageUptodate(page);
-	UnlockPage(page);
-	put_page(page);
-
-	return (nWritten == nBytes) ? 0 : -ENOSPC;
-}
-
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-			       unsigned offset, unsigned to)
-{
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
-	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-		return yaffs_readpage_nolock(f, pg);
-
-	return 0;
-
-}
-
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-			      unsigned to)
-{
-
-	void *addr = page_address(pg) + offset;
-	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
-	int nBytes = to - offset;
-	int nWritten;
-
-	unsigned spos = pos;
-	unsigned saddr = (unsigned)addr;
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
-	   spos, nBytes));
-
-	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
-
-	if (nWritten != nBytes) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG
-		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-		   nWritten, nBytes));
-		SetPageError(pg);
-		ClearPageUptodate(pg);
-	} else {
-		SetPageUptodate(pg);
-	}
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
-	   nWritten == nBytes ? 0 : nWritten));
-
-	return nWritten == nBytes ? 0 : nWritten;
-
-}
-
-static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-{
-	if (inode && obj) {
-
-
-		/* Check mode against the variant type and attempt to repair if broken. */
- 		__u32 mode = obj->yst_mode;
- 		switch( obj->variantType ){
- 		case YAFFS_OBJECT_TYPE_FILE :
- 		        if( ! S_ISREG(mode) ){
- 			        obj->yst_mode &= ~S_IFMT;
- 			        obj->yst_mode |= S_IFREG;
- 			}
-
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK :
- 		        if( ! S_ISLNK(mode) ){
- 			        obj->yst_mode &= ~S_IFMT;
- 				obj->yst_mode |= S_IFLNK;
- 			}
-
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
- 		        if( ! S_ISDIR(mode) ){
- 			        obj->yst_mode &= ~S_IFMT;
- 			        obj->yst_mode |= S_IFDIR;
- 			}
-
- 			break;
- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
- 		case YAFFS_OBJECT_TYPE_HARDLINK :
- 		case YAFFS_OBJECT_TYPE_SPECIAL :
- 		default:
- 		        /* TODO? */
- 		        break;
- 		}
-
-		inode->i_ino = obj->objectId;
-		inode->i_mode = obj->yst_mode;
-		inode->i_uid = obj->yst_uid;
-		inode->i_gid = obj->yst_gid;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-		inode->i_blksize = inode->i_sb->s_blocksize;
-#endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-
-		inode->i_rdev = old_decode_dev(obj->yst_rdev);
-		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-		inode->i_atime.tv_nsec = 0;
-		inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
-		inode->i_mtime.tv_nsec = 0;
-		inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
-		inode->i_ctime.tv_nsec = 0;
-#else
-		inode->i_rdev = obj->yst_rdev;
-		inode->i_atime = obj->yst_atime;
-		inode->i_mtime = obj->yst_mtime;
-		inode->i_ctime = obj->yst_ctime;
-#endif
-		inode->i_size = yaffs_GetObjectFileLength(obj);
-		inode->i_blocks = (inode->i_size + 511) >> 9;
-
-		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
-
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG
-		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-		   inode->i_mode, inode->i_uid, inode->i_gid,
-		   (int)inode->i_size, atomic_read(&inode->i_count)));
-
-		switch (obj->yst_mode & S_IFMT) {
-		default:	/* fifo, device or socket */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-			init_special_inode(inode, obj->yst_mode,
-					   old_decode_dev(obj->yst_rdev));
-#else
-			init_special_inode(inode, obj->yst_mode,
-					   (dev_t) (obj->yst_rdev));
-#endif
-			break;
-		case S_IFREG:	/* file */
-			inode->i_op = &yaffs_file_inode_operations;
-			inode->i_fop = &yaffs_file_operations;
-			inode->i_mapping->a_ops =
-			    &yaffs_file_address_operations;
-			break;
-		case S_IFDIR:	/* directory */
-			inode->i_op = &yaffs_dir_inode_operations;
-			inode->i_fop = &yaffs_dir_operations;
-			break;
-		case S_IFLNK:	/* symlink */
-			inode->i_op = &yaffs_symlink_inode_operations;
-			break;
-		}
-
-		yaffs_InodeToObjectLV(inode) = obj;
-
-		obj->myInode = inode;
-
-	} else {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-	}
-
-}
-
-struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-			      yaffs_Object * obj)
-{
-	struct inode *inode;
-
-	if (!sb) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-		return NULL;
-
-	}
-
-	if (!obj) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-		return NULL;
-
-	}
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-
-	inode = iget(sb, obj->objectId);
-
-	/* NB Side effect: iget calls back to yaffs_read_inode(). */
-	/* iget also increments the inode's i_count */
-	/* NB You can't be holding grossLock or deadlock will happen! */
-
-	return inode;
-}
-
-static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-				loff_t * pos)
-{
-	yaffs_Object *obj;
-	int nWritten, ipos;
-	struct inode *inode;
-	yaffs_Device *dev;
-
-	obj = yaffs_DentryToObject(f->f_dentry);
-
-	dev = obj->myDev;
-
-	yaffs_GrossLock(dev);
-
-	inode = f->f_dentry->d_inode;
-
-	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-		ipos = inode->i_size;
-	} else {
-		ipos = *pos;
-	}
-
-	if (!obj) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
-	} else {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG
-		   "yaffs_file_write about to write writing %d bytes"
-		   "to object %d at %d\n",
-		   n, obj->objectId, ipos));
-	}
-
-	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
-	   n, nWritten, ipos));
-	if (nWritten > 0) {
-		ipos += nWritten;
-		*pos = ipos;
-		if (ipos > inode->i_size) {
-			inode->i_size = ipos;
-			inode->i_blocks = (ipos + 511) >> 9;
-
-			T(YAFFS_TRACE_OS,
-			  (KERN_DEBUG
-			   "yaffs_file_write size updated to %d bytes, "
-			   "%d blocks\n",
-			   ipos, (int)(inode->i_blocks)));
-		}
-
-	}
-	yaffs_GrossUnlock(dev);
-	return nWritten == 0 ? -ENOSPC : nWritten;
-}
-
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
-{
-	yaffs_Object *obj;
-	yaffs_Device *dev;
-	struct inode *inode = f->f_dentry->d_inode;
-	unsigned long offset, curoffs;
-	struct list_head *i;
-	yaffs_Object *l;
-
-	char name[YAFFS_MAX_NAME_LENGTH + 1];
-
-	obj = yaffs_DentryToObject(f->f_dentry);
-	dev = obj->myDev;
-
-	yaffs_GrossLock(dev);
-
-	offset = f->f_pos;
-
-	T(YAFFS_TRACE_OS, ("yaffs_readdir: starting at %d\n", (int)offset));
-
-	if (offset == 0) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
-		   (int)inode->i_ino));
-		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
-		    < 0) {
-			goto out;
-		}
-		offset++;
-		f->f_pos++;
-	}
-	if (offset == 1) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
-		   (int)f->f_dentry->d_parent->d_inode->i_ino));
-		if (filldir
-		    (dirent, "..", 2, offset,
-		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-			goto out;
-		}
-		offset++;
-		f->f_pos++;
-	}
-
-	curoffs = 1;
-
-	/* If the directory has changed since the open or last call to
-	   readdir, rewind to after the 2 canned entries. */
-
-	if (f->f_version != inode->i_version) {
-		offset = 2;
-		f->f_pos = offset;
-		f->f_version = inode->i_version;
-	}
-
-	list_for_each(i, &obj->variant.directoryVariant.children) {
-		curoffs++;
-		if (curoffs >= offset) {
-			l = list_entry(i, yaffs_Object, siblings);
-
-			yaffs_GetObjectName(l, name,
-					    YAFFS_MAX_NAME_LENGTH + 1);
-			T(YAFFS_TRACE_OS,
-			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-			   yaffs_GetObjectInode(l)));
-
-			if (filldir(dirent,
-				    name,
-				    strlen(name),
-				    offset,
-				    yaffs_GetObjectInode(l),
-				    yaffs_GetObjectType(l))
-			    < 0) {
-				goto up_and_out;
-			}
-
-			offset++;
-			f->f_pos++;
-		}
-	}
-
-      up_and_out:
-      out:
-
-	yaffs_GrossUnlock(dev);
-
-	return 0;
-}
-
-/*
- * File creation. Allocate an inode, and we're done..
- */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       dev_t rdev)
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       int rdev)
-#endif
-{
-	struct inode *inode;
-
-	yaffs_Object *obj = NULL;
-	yaffs_Device *dev;
-
-	yaffs_Object *parent = yaffs_InodeToObject(dir);
-
-	int error = -ENOSPC;
-	uid_t uid = current->fsuid;
-	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-
-	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-		mode |= S_ISGID;
-
-	if (parent) {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
-		   parent->objectId, parent->variantType));
-	} else {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-		return -EPERM;
-	}
-
-	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
-			   "mode %x dev %x\n",
-			   dentry->d_name.name, mode, rdev));
-
-	dev = parent->myDev;
-
-	yaffs_GrossLock(dev);
-
-	switch (mode & S_IFMT) {
-	default:
-		/* Special (socket, fifo, device...) */
-		T(YAFFS_TRACE_OS, (KERN_DEBUG
-				   "yaffs_mknod: making special\n"));
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-		obj =
-		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-				       gid, old_encode_dev(rdev));
-#else
-		obj =
-		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-				       gid, rdev);
-#endif
-		break;
-	case S_IFREG:		/* file          */
-		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-		obj =
-		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-				    gid);
-		break;
-	case S_IFDIR:		/* directory */
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
-		obj =
-		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-					 uid, gid);
-		break;
-	case S_IFLNK:		/* symlink */
-		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-		obj = NULL;	/* Do we ever get here? */
-		break;
-	}
-
-	/* Can not call yaffs_get_inode() with gross lock held */
-	yaffs_GrossUnlock(dev);
-
-	if (obj) {
-		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
-		d_instantiate(dentry, inode);
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
-		   obj->objectId, atomic_read(&inode->i_count)));
-		error = 0;
-	} else {
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-		error = -ENOMEM;
-	}
-
-	return error;
-}
-
-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-{
-	int retVal;
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
-#if 0
-	/* attempt to fix dir bug - didn't work */
-	if (!retVal) {
-		dget(dentry);
-	}
-#endif
-	return retVal;
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-			struct nameidata *n)
-#else
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
-#endif
-{
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
-}
-
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
-{
-	int retVal;
-
-	yaffs_Device *dev;
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-	   dentry->d_name.name));
-
-	dev = yaffs_InodeToObject(dir)->myDev;
-
-	yaffs_GrossLock(dev);
-
-	retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name);
-
-	if (retVal == YAFFS_OK) {
-		dentry->d_inode->i_nlink--;
-		dir->i_version++;
-		yaffs_GrossUnlock(dev);
-		mark_inode_dirty(dentry->d_inode);
-		return 0;
-	}
-	yaffs_GrossUnlock(dev);
-	return -ENOTEMPTY;
-}
-
-/*
- * Create a link...
- */
-static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-		      struct dentry *dentry)
-{
-	struct inode *inode = old_dentry->d_inode;
-	yaffs_Object *obj = NULL;
-	yaffs_Object *link = NULL;
-	yaffs_Device *dev;
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-
-	obj = yaffs_InodeToObject(inode);
-	dev = obj->myDev;
-
-	yaffs_GrossLock(dev);
-
-	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
-	{
-		link =
-		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-			       obj);
-	}
-
-	if (link) {
-		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
-		d_instantiate(dentry, old_dentry->d_inode);
-		atomic_inc(&old_dentry->d_inode->i_count);
-		T(YAFFS_TRACE_OS,
-		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
-		   old_dentry->d_inode->i_nlink,
-		   atomic_read(&old_dentry->d_inode->i_count)));
-
-	}
-
-	yaffs_GrossUnlock(dev);
-
-	if (link) {
-
-		return 0;
-	}
-
-	return -EPERM;
-}
-
-static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-			 const char *symname)
-{
-	yaffs_Object *obj;
-	yaffs_Device *dev;
-	uid_t uid = current->fsuid;
-	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-
-	dev = yaffs_InodeToObject(dir)->myDev;
-	yaffs_GrossLock(dev);
-	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
-				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-	yaffs_GrossUnlock(dev);
-
-	if (obj) {
-
-		struct inode *inode;
-
-		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-		d_instantiate(dentry, inode);
-		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-		return 0;
-	} else {
-		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
-
-	}
-
-	return -ENOMEM;
-}
-
-static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-			     int datasync)
-{
-
-	yaffs_Object *obj;
-	yaffs_Device *dev;
-
-	obj = yaffs_DentryToObject(dentry);
-
-	dev = obj->myDev;
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-	yaffs_GrossLock(dev);
-	yaffs_FlushFile(obj, 1);
-	yaffs_GrossUnlock(dev);
-	return 0;
-}
-
-/*
- * The VFS layer already does all the dentry stuff for rename.
- *
- * NB: POSIX says you can rename an object over an old object of the same name
- */
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-			struct inode *new_dir, struct dentry *new_dentry)
-{
-	yaffs_Device *dev;
-	int retVal = YAFFS_FAIL;
-	yaffs_Object *target;
-
-        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-	dev = yaffs_InodeToObject(old_dir)->myDev;
-
-	yaffs_GrossLock(dev);
-
-	/* Check if the target is an existing directory that is not empty. */
-	target =
-	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-				   new_dentry->d_name.name);
-
-
-
-	if (target &&
-	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-	    !list_empty(&target->variant.directoryVariant.children)) {
-
-	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-
-		retVal = YAFFS_FAIL;
-	} else {
-
-		/* Now does unlinking internally using shadowing mechanism */
-	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
-
-		retVal =
-		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-				       old_dentry->d_name.name,
-				       yaffs_InodeToObject(new_dir),
-				       new_dentry->d_name.name);
-
-	}
-	yaffs_GrossUnlock(dev);
-
-	if (retVal == YAFFS_OK) {
-		if(target) {
-			new_dentry->d_inode->i_nlink--;
-			mark_inode_dirty(new_dentry->d_inode);
-		}
-
-		return 0;
-	} else {
-		return -ENOTEMPTY;
-	}
-
-}
-
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-{
-	struct inode *inode = dentry->d_inode;
-	int error;
-	yaffs_Device *dev;
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_setattr of object %d\n",
-	   yaffs_InodeToObject(inode)->objectId));
-
-	if ((error = inode_change_ok(inode, attr)) == 0) {
-
-		dev = yaffs_InodeToObject(inode)->myDev;
-		yaffs_GrossLock(dev);
-		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
-		    YAFFS_OK) {
-			error = 0;
-		} else {
-			error = -EPERM;
-		}
-		yaffs_GrossUnlock(dev);
-		if (!error)
-			error = inode_setattr(inode, attr);
-	}
-	return error;
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
-{
-	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
-	struct super_block *sb = dentry->d_sb;
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
-{
-	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-#else
-static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
-{
-	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-#endif
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-
-	yaffs_GrossLock(dev);
-
-	buf->f_type = YAFFS_MAGIC;
-	buf->f_bsize = sb->s_blocksize;
-	buf->f_namelen = 255;
-	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-
-		buf->f_blocks =
-		    (dev->endBlock - dev->startBlock +
-		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
-						  dev->nDataBytesPerChunk);
-		buf->f_bfree =
-		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
-							dev->nDataBytesPerChunk);
-	} else {
-
-		buf->f_blocks =
-		    (dev->endBlock - dev->startBlock +
-		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
-						  sb->s_blocksize);
-		buf->f_bfree =
-		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
-							sb->s_blocksize);
-	}
-	buf->f_files = 0;
-	buf->f_ffree = 0;
-	buf->f_bavail = buf->f_bfree;
-
-	yaffs_GrossUnlock(dev);
-	return 0;
-}
-
-
-/**
-static int yaffs_do_sync_fs(struct super_block *sb)
-{
-
-	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-
-	if(sb->s_dirt) {
-		yaffs_GrossLock(dev);
-
-		if(dev)
-			yaffs_CheckpointSave(dev);
-
-		yaffs_GrossUnlock(dev);
-
-		sb->s_dirt = 0;
-	}
-	return 0;
-}
-**/
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static void yaffs_write_super(struct super_block *sb)
-#else
-static int yaffs_write_super(struct super_block *sb)
-#endif
-{
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-	return 0; /* yaffs_do_sync_fs(sb);*/
-#endif
-}
-
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_sync_fs(struct super_block *sb, int wait)
-#else
-static int yaffs_sync_fs(struct super_block *sb)
-#endif
-{
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-
-	return 0; /* yaffs_do_sync_fs(sb);*/
-
-}
-
-
-static void yaffs_read_inode(struct inode *inode)
-{
-	/* NB This is called as a side effect of other functions, but
-	 * we had to release the lock to prevent deadlocks, so
-	 * need to lock again.
-	 */
-
-	yaffs_Object *obj;
-	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
-
-	T(YAFFS_TRACE_OS,
-	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-
-	yaffs_GrossLock(dev);
-
-	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-
-	yaffs_FillInodeFromObject(inode, obj);
-
-	yaffs_GrossUnlock(dev);
-}
-
-static LIST_HEAD(yaffs_dev_list);
-
-#if 0 // not used
-static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
-{
-	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
-
-	if( *flags & MS_RDONLY ) {
-		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
-
-		T(YAFFS_TRACE_OS,
-			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-
-		yaffs_GrossLock(dev);
-
-		yaffs_FlushEntireDeviceCache(dev);
-
-		yaffs_CheckpointSave(dev);
-
-		if (mtd->sync)
-			mtd->sync(mtd);
-
-		yaffs_GrossUnlock(dev);
-	}
-	else {
-		T(YAFFS_TRACE_OS,
-			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-	}
-
-	return 0;
-}
-#endif
-
-static void yaffs_put_super(struct super_block *sb)
-{
-	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-
-	yaffs_GrossLock(dev);
-
-	yaffs_FlushEntireDeviceCache(dev);
-
-	yaffs_CheckpointSave(dev);
-
-	if (dev->putSuperFunc) {
-		dev->putSuperFunc(sb);
-	}
-
-	yaffs_Deinitialise(dev);
-
-	yaffs_GrossUnlock(dev);
-
-	/* we assume this is protected by lock_kernel() in mount/umount */
-	list_del(&dev->devList);
-
-	if(dev->spareBuffer){
-		YFREE(dev->spareBuffer);
-		dev->spareBuffer = NULL;
-	}
-
-	kfree(dev);
-}
-
-
-static void yaffs_MTDPutSuper(struct super_block *sb)
-{
-
-	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
-
-	if (mtd->sync) {
-		mtd->sync(mtd);
-	}
-
-	put_mtd_device(mtd);
-}
-
-
-static void yaffs_MarkSuperBlockDirty(void *vsb)
-{
-	struct super_block *sb = (struct super_block *)vsb;
-
-	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
-//	if(sb)
-//		sb->s_dirt = 1;
-}
-
-typedef struct {
-	int inband_tags;
-	int skip_checkpoint_read;
-	int skip_checkpoint_write;
-	int no_cache;
-} yaffs_options;
-
-#define MAX_OPT_LEN 20
-static int yaffs_parse_options(yaffs_options *options, const char *options_str)
-{
-	char cur_opt[MAX_OPT_LEN+1];
-	int p;
-	int error = 0;
-
-	/* Parse through the options which is a comma seperated list */
-
-	while(options_str && *options_str && !error){
-		memset(cur_opt,0,MAX_OPT_LEN+1);
-		p = 0;
-
-		while(*options_str && *options_str != ','){
-			if(p < MAX_OPT_LEN){
-				cur_opt[p] = *options_str;
-				p++;
-			}
-			options_str++;
-		}
-
-		if(!strcmp(cur_opt,"inband-tags"))
-			options->inband_tags = 1;
-		else if(!strcmp(cur_opt,"no-cache"))
-			options->no_cache = 1;
-		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-			options->skip_checkpoint_read = 1;
-		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-			options->skip_checkpoint_write = 1;
-		else if(!strcmp(cur_opt,"no-checkpoint")){
-			options->skip_checkpoint_read = 1;
-			options->skip_checkpoint_write = 1;
-		} else {
-			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-			error = 1;
-		}
-
-	}
-
-	return error;
-}
-
-static struct super_block *yaffs_internal_read_super(int yaffsVersion,
-						     struct super_block *sb,
-						     void *data, int silent)
-{
-	int nBlocks;
-	struct inode *inode = NULL;
-	struct dentry *root;
-	yaffs_Device *dev = 0;
-	char devname_buf[BDEVNAME_SIZE + 1];
-	struct mtd_info *mtd;
-	int err;
-	char *data_str = (char *)data;
-
-	yaffs_options options;
-
-	sb->s_magic = YAFFS_MAGIC;
-	sb->s_op = &yaffs_super_ops;
-
-	if (!sb)
-		printk(KERN_INFO "yaffs: sb is NULL\n");
-	else if (!sb->s_dev)
-		printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
-	else if (!yaffs_devname(sb, devname_buf))
-		printk(KERN_INFO "yaffs: devname is NULL\n");
-	else
-		printk(KERN_INFO "yaffs: dev is %d name is \"%s\"\n",
-		       sb->s_dev,
-		       yaffs_devname(sb, devname_buf));
-
-	if(!data_str)
-		data_str = "";
-
-	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-
-	memset(&options,0,sizeof(options));
-
-	if(yaffs_parse_options(&options,data_str)){
-		/* Option parsing failed */
-		return NULL;
-	}
-
-
-	sb->s_blocksize = PAGE_CACHE_SIZE;
-	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
-	T(YAFFS_TRACE_OS, ("yaffs_read_super: Using yaffs%d\n", yaffsVersion));
-	T(YAFFS_TRACE_OS,
-	  ("yaffs_read_super: block size %d\n", (int)(sb->s_blocksize)));
-
-#ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
-	T(YAFFS_TRACE_OS,
-	  ("yaffs: Write verification disabled. All guarantees "
-	   "null and void\n"));
-#endif
-
-	T(YAFFS_TRACE_ALWAYS, ("yaffs: Attempting MTD mount on %u.%u, "
-			       "\"%s\"\n",
-			       MAJOR(sb->s_dev), MINOR(sb->s_dev),
-			       yaffs_devname(sb, devname_buf)));
-
-	/* Check it's an mtd device..... */
-	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-		return NULL;	/* This isn't an mtd device */
-	}
-	/* Get the device */
-	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
-	if (!mtd) {
-		T(YAFFS_TRACE_ALWAYS,
-		  ("yaffs: MTD device #%u doesn't appear to exist\n",
-		   MINOR(sb->s_dev)));
-		return NULL;
-	}
-	/* Check it's NAND */
-	if (mtd->type != MTD_NANDFLASH) {
-		T(YAFFS_TRACE_ALWAYS,
-		  ("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
-		return NULL;
-	}
-
-	T(YAFFS_TRACE_OS, (" erase %p\n", mtd->erase));
-	T(YAFFS_TRACE_OS, (" read %p\n", mtd->read));
-	T(YAFFS_TRACE_OS, (" write %p\n", mtd->write));
-	T(YAFFS_TRACE_OS, (" readoob %p\n", mtd->read_oob));
-	T(YAFFS_TRACE_OS, (" writeoob %p\n", mtd->write_oob));
-	T(YAFFS_TRACE_OS, (" block_isbad %p\n", mtd->block_isbad));
-	T(YAFFS_TRACE_OS, (" block_markbad %p\n", mtd->block_markbad));
-	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
-	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
-	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
-	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-
-#ifdef CONFIG_YAFFS_AUTO_YAFFS2
-
-	if (yaffsVersion == 1 &&
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	    mtd->writesize >= 2048) {
-#else
-	    mtd->oobblock >= 2048) {
-#endif
-	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
-	    yaffsVersion = 2;
-	}
-
-	/* Added NCB 26/5/2006 for completeness */
-	if (yaffsVersion == 2 &&
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	    mtd->writesize == 512) {
-#else
-	    mtd->oobblock == 512) {
-#endif
-	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
-	    yaffsVersion = 1;
-	}
-
-#endif
-
-	if (yaffsVersion == 2) {
-		/* Check for version 2 style functions */
-		if (!mtd->erase ||
-		    !mtd->block_isbad ||
-		    !mtd->block_markbad ||
-		    !mtd->read ||
-		    !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-		    !mtd->read_oob || !mtd->write_oob) {
-#else
-		    !mtd->write_ecc ||
-		    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-			T(YAFFS_TRACE_ALWAYS,
-			  ("yaffs: MTD device does not support required "
-			   "functions\n"));;
-			return NULL;
-		}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-#else
-		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-#endif
-		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-			T(YAFFS_TRACE_ALWAYS,
-			  ("yaffs: MTD device does not have the "
-			   "right page sizes\n"));
-			return NULL;
-		}
-	} else {
-		/* Check for V1 style functions */
-		if (!mtd->erase ||
-		    !mtd->read ||
-		    !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-		    !mtd->read_oob || !mtd->write_oob) {
-#else
-		    !mtd->write_ecc ||
-		    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-			T(YAFFS_TRACE_ALWAYS,
-			  ("yaffs: MTD device does not support required "
-			   "functions\n"));;
-			return NULL;
-		}
-
-		if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
-		    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
-			T(YAFFS_TRACE_ALWAYS,
-			  ("yaffs: MTD device does not support have the "
-			   "right page sizes\n"));
-			return NULL;
-		}
-	}
-
-	/* OK, so if we got here, we have an MTD that's NAND and looks
-	 * like it has the right capabilities
-	 * Set the yaffs_Device up for mtd
-	 */
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-#else
-	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-#endif
-	if (!dev) {
-		/* Deep shit could not allocate device structure */
-		T(YAFFS_TRACE_ALWAYS,
-		  ("yaffs_read_super: Failed trying to allocate "
-		   "yaffs_Device. \n"));
-		return NULL;
-	}
-
-	memset(dev, 0, sizeof(yaffs_Device));
-	dev->genericDevice = mtd;
-	dev->name = mtd->name;
-
-	/* Set up the memory size parameters.... */
-
-	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-	dev->startBlock = 0;
-	dev->endBlock = nBlocks - 1;
-	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
-	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-	dev->nReservedBlocks = 5;
-	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-
-	/* ... and the functions. */
-	if (yaffsVersion == 2) {
-		dev->writeChunkWithTagsToNAND =
-		    nandmtd2_WriteChunkWithTagsToNAND;
-		dev->readChunkWithTagsFromNAND =
-		    nandmtd2_ReadChunkWithTagsFromNAND;
-		dev->markNANDBlockBad = nandmtd2_MarkNANDBlockBad;
-		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
-		dev->spareBuffer = YMALLOC(mtd->oobsize);
-		dev->isYaffs2 = 1;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-		dev->nDataBytesPerChunk = mtd->writesize;
-		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
-#else
-		dev->nDataBytesPerChunk = mtd->oobblock;
-		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
-#endif
-		nBlocks = mtd->size / mtd->erasesize;
-
-		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
-		dev->startBlock = 0;
-		dev->endBlock = nBlocks - 1;
-	} else {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-		/* use the MTD interface in yaffs_mtdif1.c */
-		dev->writeChunkWithTagsToNAND =
-			nandmtd1_WriteChunkWithTagsToNAND;
-		dev->readChunkWithTagsFromNAND =
-			nandmtd1_ReadChunkWithTagsFromNAND;
-		dev->markNANDBlockBad = nandmtd1_MarkNANDBlockBad;
-		dev->queryNANDBlock = nandmtd1_QueryNANDBlock;
-#else
-		dev->writeChunkToNAND = nandmtd_WriteChunkToNAND;
-		dev->readChunkFromNAND = nandmtd_ReadChunkFromNAND;
-#endif
-		dev->isYaffs2 = 0;
-	}
-	/* ... and common functions */
-	dev->eraseBlockInNAND = nandmtd_EraseBlockInNAND;
-	dev->initialiseNAND = nandmtd_InitialiseNAND;
-
-	dev->putSuperFunc = yaffs_MTDPutSuper;
-
-	dev->superBlock = (void *)sb;
-	dev->markSuperBlockDirty = yaffs_MarkSuperBlockDirty;
-
-
-#ifndef CONFIG_YAFFS_DOES_ECC
-	dev->useNANDECC = 1;
-#endif
-
-#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
-	dev->wideTnodesDisabled = 1;
-#endif
-
-	dev->skipCheckpointRead = options.skip_checkpoint_read;
-	dev->skipCheckpointWrite = options.skip_checkpoint_write;
-
-	/* we assume this is protected by lock_kernel() in mount/umount */
-	list_add_tail(&dev->devList, &yaffs_dev_list);
-
-	init_MUTEX(&dev->grossLock);
-
-	yaffs_GrossLock(dev);
-
-	err = yaffs_GutsInitialise(dev);
-
-	T(YAFFS_TRACE_OS,
-	  ("yaffs_read_super: guts initialised %s\n",
-	   (err == YAFFS_OK) ? "OK" : "FAILED"));
-
-	/* Release lock before yaffs_get_inode() */
-	yaffs_GrossUnlock(dev);
-
-	/* Create root inode */
-	if (err == YAFFS_OK)
-		inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,
-					yaffs_Root(dev));
-
-	if (!inode)
-		return NULL;
-
-	inode->i_op = &yaffs_dir_inode_operations;
-	inode->i_fop = &yaffs_dir_operations;
-
-	T(YAFFS_TRACE_OS, ("yaffs_read_super: got root inode\n"));
-
-	root = d_alloc_root(inode);
-
-	T(YAFFS_TRACE_OS, ("yaffs_read_super: d_alloc_root done\n"));
-
-	if (!root) {
-		iput(inode);
-		return NULL;
-	}
-	sb->s_root = root;
-
-	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
-	return sb;
-}
-
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
-					 int silent)
-{
-	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs_read_super(struct file_system_type *fs,
-			    int flags, const char *dev_name,
-			    void *data, struct vfsmount *mnt)
-{
-
-	return get_sb_bdev(fs, flags, dev_name, data,
-			   yaffs_internal_read_super_mtd, mnt);
-}
-#else
-static struct super_block *yaffs_read_super(struct file_system_type *fs,
-					    int flags, const char *dev_name,
-					    void *data)
-{
-
-	return get_sb_bdev(fs, flags, dev_name, data,
-			   yaffs_internal_read_super_mtd);
-}
-#endif
-
-static struct file_system_type yaffs_fs_type = {
-	.owner = THIS_MODULE,
-	.name = "yaffs",
-	.get_sb = yaffs_read_super,
-	.kill_sb = kill_block_super,
-	.fs_flags = FS_REQUIRES_DEV,
-};
-#else
-static struct super_block *yaffs_read_super(struct super_block *sb, void *data,
-					    int silent)
-{
-	return yaffs_internal_read_super(1, sb, data, silent);
-}
-
-static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
-		      FS_REQUIRES_DEV);
-#endif
-
-
-#ifdef CONFIG_YAFFS_YAFFS2
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
-					  int silent)
-{
-	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static int yaffs2_read_super(struct file_system_type *fs,
-			int flags, const char *dev_name, void *data,
-			struct vfsmount *mnt)
-{
-	return get_sb_bdev(fs, flags, dev_name, data,
-			yaffs2_internal_read_super_mtd, mnt);
-}
-#else
-static struct super_block *yaffs2_read_super(struct file_system_type *fs,
-					     int flags, const char *dev_name,
-					     void *data)
-{
-
-	return get_sb_bdev(fs, flags, dev_name, data,
-			   yaffs2_internal_read_super_mtd);
-}
-#endif
-
-static struct file_system_type yaffs2_fs_type = {
-	.owner = THIS_MODULE,
-	.name = "yaffs2",
-	.get_sb = yaffs2_read_super,
-	.kill_sb = kill_block_super,
-	.fs_flags = FS_REQUIRES_DEV,
-};
-#else
-static struct super_block *yaffs2_read_super(struct super_block *sb,
-					     void *data, int silent)
-{
-	return yaffs_internal_read_super(2, sb, data, silent);
-}
-
-static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
-		      FS_REQUIRES_DEV);
-#endif
-
-#endif				/* CONFIG_YAFFS_YAFFS2 */
-
-static struct proc_dir_entry *my_proc_entry;
-
-static char *yaffs_dump_dev(char *buf, yaffs_Device * dev)
-{
-	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
-	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
-	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
-	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
-	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
-	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
-	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
-	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
-	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
-	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-	buf += sprintf(buf, "nObjectsCreated.... %d\n", dev->nObjectsCreated);
-	buf += sprintf(buf, "nFreeObjects....... %d\n", dev->nFreeObjects);
-	buf += sprintf(buf, "nFreeChunks........ %d\n", dev->nFreeChunks);
-	buf += sprintf(buf, "nPageWrites........ %d\n", dev->nPageWrites);
-	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
-	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
-	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
-	buf +=
-	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-	buf +=
-	    sprintf(buf, "passiveGCs......... %d\n",
-		    dev->passiveGarbageCollections);
-	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
-	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-	buf += sprintf(buf, "nRetireBlocks...... %d\n", dev->nRetiredBlocks);
-	buf += sprintf(buf, "eccFixed........... %d\n", dev->eccFixed);
-	buf += sprintf(buf, "eccUnfixed......... %d\n", dev->eccUnfixed);
-	buf += sprintf(buf, "tagsEccFixed....... %d\n", dev->tagsEccFixed);
-	buf += sprintf(buf, "tagsEccUnfixed..... %d\n", dev->tagsEccUnfixed);
-	buf += sprintf(buf, "cacheHits.......... %d\n", dev->cacheHits);
-	buf += sprintf(buf, "nDeletedFiles...... %d\n", dev->nDeletedFiles);
-	buf += sprintf(buf, "nUnlinkedFiles..... %d\n", dev->nUnlinkedFiles);
-	buf +=
-	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
-	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
-	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-
-	return buf;
-}
-
-static int yaffs_proc_read(char *page,
-			   char **start,
-			   off_t offset, int count, int *eof, void *data)
-{
-	struct list_head *item;
-	char *buf = page;
-	int step = offset;
-	int n = 0;
-
-	/* Get proc_file_read() to step 'offset' by one on each sucessive call.
-	 * We use 'offset' (*ppos) to indicate where we are in devList.
-	 * This also assumes the user has posted a read buffer large
-	 * enough to hold the complete output; but that's life in /proc.
-	 */
-
-	*(int *)start = 1;
-
-	/* Print header first */
-	if (step == 0) {
-		buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__
-			       "\n%s\n%s\n", yaffs_fs_c_version,
-			       yaffs_guts_c_version);
-	}
-
-	/* hold lock_kernel while traversing yaffs_dev_list */
-	lock_kernel();
-
-	/* Locate and print the Nth entry.  Order N-squared but N is small. */
-	list_for_each(item, &yaffs_dev_list) {
-		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-		if (n < step) {
-			n++;
-			continue;
-		}
-		buf += sprintf(buf, "\nDevice %d \"%s\"\n", n, dev->name);
-		buf = yaffs_dump_dev(buf, dev);
-		break;
-	}
-	unlock_kernel();
-
-	return buf - page < count ? buf - page : count;
-}
-
-/**
- * Set the verbosity of the warnings and error messages.
- *
- * Note that the names can only be a..z or _ with the current code.
- */
-
-static struct {
-	char *mask_name;
-	unsigned mask_bitfield;
-} mask_flags[] = {
-	{"allocate", YAFFS_TRACE_ALLOCATE},
-	{"always", YAFFS_TRACE_ALWAYS},
-	{"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
-	{"buffers", YAFFS_TRACE_BUFFERS},
-	{"bug", YAFFS_TRACE_BUG},
-	{"checkpt", YAFFS_TRACE_CHECKPOINT},
-	{"deletion", YAFFS_TRACE_DELETION},
-	{"erase", YAFFS_TRACE_ERASE},
-	{"error", YAFFS_TRACE_ERROR},
-	{"gc_detail", YAFFS_TRACE_GC_DETAIL},
-	{"gc", YAFFS_TRACE_GC},
-	{"mtd", YAFFS_TRACE_MTD},
-	{"nandaccess", YAFFS_TRACE_NANDACCESS},
-	{"os", YAFFS_TRACE_OS},
-	{"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
-	{"scan", YAFFS_TRACE_SCAN},
-	{"tracing", YAFFS_TRACE_TRACING},
-
-	{"verify", YAFFS_TRACE_VERIFY},
-	{"verify_nand", YAFFS_TRACE_VERIFY_NAND},
-	{"verify_full", YAFFS_TRACE_VERIFY_FULL},
-	{"verify_all", YAFFS_TRACE_VERIFY_ALL},
-
-	{"write", YAFFS_TRACE_WRITE},
-	{"all", 0xffffffff},
-	{"none", 0},
-	{NULL, 0},
-};
-
-#define MAX_MASK_NAME_LENGTH 40
-static int yaffs_proc_write(struct file *file, const char *buf,
-					 unsigned long count, void *data)
-{
-	unsigned rg = 0, mask_bitfield;
-	char *end;
-	char *mask_name;
-	const char *x;
-	char substring[MAX_MASK_NAME_LENGTH+1];
-	int i;
-	int done = 0;
-	int add, len = 0;
-	int pos = 0;
-
-	rg = yaffs_traceMask;
-
-	while (!done && (pos < count)) {
-		done = 1;
-		while ((pos < count) && isspace(buf[pos])) {
-			pos++;
-		}
-
-		switch (buf[pos]) {
-		case '+':
-		case '-':
-		case '=':
-			add = buf[pos];
-			pos++;
-			break;
-
-		default:
-			add = ' ';
-			break;
-		}
-		mask_name = NULL;
-
-		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-		if (end > buf + pos) {
-			mask_name = "numeral";
-			len = end - (buf + pos);
-			pos += len;
-			done = 0;
-		} else {
-			for(x = buf + pos, i = 0;
-			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
-			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-			    substring[i] = *x;
-			substring[i] = '\0';
-
-			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-					mask_name = mask_flags[i].mask_name;
-					mask_bitfield = mask_flags[i].mask_bitfield;
-					done = 0;
-					break;
-				}
-			}
-		}
-
-		if (mask_name != NULL) {
-			done = 0;
-			switch(add) {
-			case '-':
-				rg &= ~mask_bitfield;
-				break;
-			case '+':
-				rg |= mask_bitfield;
-				break;
-			case '=':
-				rg = mask_bitfield;
-				break;
-			default:
-				rg |= mask_bitfield;
-				break;
-			}
-		}
-	}
-
-	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
-
-	printk("new trace = 0x%08X\n",yaffs_traceMask);
-
-	if (rg & YAFFS_TRACE_ALWAYS) {
-		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
-			char flag;
-			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
-			printk("%c%s\n", flag, mask_flags[i].mask_name);
-		}
-	}
-
-	return count;
-}
-
-/* Stuff to handle installation of file systems */
-struct file_system_to_install {
-	struct file_system_type *fst;
-	int installed;
-};
-
-static struct file_system_to_install fs_to_install[] = {
-//#ifdef CONFIG_YAFFS_YAFFS1
-	{&yaffs_fs_type, 0},
-//#endif
-//#ifdef CONFIG_YAFFS_YAFFS2
-	{&yaffs2_fs_type, 0},
-//#endif
-	{NULL, 0}
-};
-
-static int __init init_yaffs_fs(void)
-{
-	int error = 0;
-	struct file_system_to_install *fsinst;
-
-	T(YAFFS_TRACE_ALWAYS,
-	  ("yaffs " __DATE__ " " __TIME__ " Installing. \n"));
-
-	/* Install the proc_fs entry */
-	my_proc_entry = create_proc_entry("yaffs",
-					       S_IRUGO | S_IFREG,
-					       &proc_root);
-
-	if (my_proc_entry) {
-		my_proc_entry->write_proc = yaffs_proc_write;
-		my_proc_entry->read_proc = yaffs_proc_read;
-		my_proc_entry->data = NULL;
-	} else {
-		return -ENOMEM;
-	}
-
-	/* Now add the file system entries */
-
-	fsinst = fs_to_install;
-
-	while (fsinst->fst && !error) {
-		error = register_filesystem(fsinst->fst);
-		if (!error) {
-			fsinst->installed = 1;
-		}
-		fsinst++;
-	}
-
-	/* Any errors? uninstall  */
-	if (error) {
-		fsinst = fs_to_install;
-
-		while (fsinst->fst) {
-			if (fsinst->installed) {
-				unregister_filesystem(fsinst->fst);
-				fsinst->installed = 0;
-			}
-			fsinst++;
-		}
-	}
-
-	return error;
-}
-
-static void __exit exit_yaffs_fs(void)
-{
-
-	struct file_system_to_install *fsinst;
-
-	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
-			       " removing. \n"));
-
-	remove_proc_entry("yaffs", &proc_root);
-
-	fsinst = fs_to_install;
-
-	while (fsinst->fst) {
-		if (fsinst->installed) {
-			unregister_filesystem(fsinst->fst);
-			fsinst->installed = 0;
-		}
-		fsinst++;
-	}
-
-}
-
-module_init(init_yaffs_fs)
-module_exit(exit_yaffs_fs)
-
-MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.c
deleted file mode 100644
index 2ab8146913..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.c
+++ /dev/null
@@ -1,7469 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-
-#include "yportenv.h"
-
-#include "yaffsinterface.h"
-#include "yaffs_guts.h"
-#include "yaffs_tagsvalidity.h"
-
-#include "yaffs_tagscompat.h"
-#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-#include "yaffs_qsort.h"
-#endif
-#include "yaffs_nand.h"
-
-#include "yaffs_checkptrw.h"
-
-#include "yaffs_nand.h"
-#include "yaffs_packedtags2.h"
-
-
-#ifdef CONFIG_YAFFS_WINCE
-void yfsd_LockYAFFS(BOOL fsLockOnly);
-void yfsd_UnlockYAFFS(BOOL fsLockOnly);
-#endif
-
-#define YAFFS_PASSIVE_GC_CHUNKS 2
-
-#include "yaffs_ecc.h"
-
-
-/* Robustification (if it ever comes about...) */
-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-				     const __u8 * data,
-				     const yaffs_ExtendedTags * tags);
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-				    const yaffs_ExtendedTags * tags);
-
-/* Other local prototypes */
-static int yaffs_UnlinkObject( yaffs_Object *obj);
-static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
-
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
-
-static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
-					     const __u8 * buffer,
-					     yaffs_ExtendedTags * tags,
-					     int useReserve);
-static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-				  int chunkInNAND, int inScan);
-
-static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-					   yaffs_ObjectType type);
-static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
-				       yaffs_Object * obj);
-static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
-				    int force, int isShrink, int shadows);
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-static int yaffs_CheckStructures(void);
-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-			      int chunkOffset, int *limit);
-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
-
-static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
-
-static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
-static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-				    int lineNo);
-
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				  int chunkInNAND);
-
-static int yaffs_UnlinkWorker(yaffs_Object * obj);
-static void yaffs_DestroyObject(yaffs_Object * obj);
-
-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-			   int chunkInObject);
-
-loff_t yaffs_GetFileSize(yaffs_Object * obj);
-
-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-
-static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-
-static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
-
-#ifdef YAFFS_PARANOID
-static int yaffs_CheckFileSanity(yaffs_Object * in);
-#else
-#define yaffs_CheckFileSanity(in)
-#endif
-
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
-
-static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
-				 yaffs_ExtendedTags * tags);
-
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
-					  yaffs_FileStructure * fStruct,
-					  __u32 chunkId);
-
-
-/* Function to calculate chunk and offset */
-
-static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-{
-	if(dev->chunkShift){
-		/* Easy-peasy power of 2 case */
-		*chunk  = (__u32)(addr >> dev->chunkShift);
-		*offset = (__u32)(addr & dev->chunkMask);
-	}
-	else if(dev->crumbsPerChunk)
-	{
-		/* Case where we're using "crumbs" */
-		*offset = (__u32)(addr & dev->crumbMask);
-		addr >>= dev->crumbShift;
-		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
-		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-	}
-	else
-		YBUG();
-}
-
-/* Function to return the number of shifts for a power of 2 greater than or equal
- * to the given number
- * Note we don't try to cater for all possible numbers and this does not have to
- * be hellishly efficient.
- */
-
-static __u32 ShiftsGE(__u32 x)
-{
-	int extraBits;
-	int nShifts;
-
-	nShifts = extraBits = 0;
-
-	while(x>1){
-		if(x & 1) extraBits++;
-		x>>=1;
-		nShifts++;
-	}
-
-	if(extraBits)
-		nShifts++;
-
-	return nShifts;
-}
-
-/* Function to return the number of shifts to get a 1 in bit 0
- */
-
-static __u32 ShiftDiv(__u32 x)
-{
-	int nShifts;
-
-	nShifts =  0;
-
-	if(!x) return 0;
-
-	while( !(x&1)){
-		x>>=1;
-		nShifts++;
-	}
-
-	return nShifts;
-}
-
-
-
-/*
- * Temporary buffer manipulations.
- */
-
-static int yaffs_InitialiseTempBuffers(yaffs_Device *dev)
-{
-	int i;
-	__u8 *buf = (__u8 *)1;
-
-	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-
-	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-		dev->tempBuffer[i].line = 0;	/* not in use */
-		dev->tempBuffer[i].buffer = buf =
-		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-	}
-
-	return buf ? YAFFS_OK : YAFFS_FAIL;
-
-}
-
-static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-{
-	int i, j;
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].line == 0) {
-			dev->tempBuffer[i].line = lineNo;
-			if ((i + 1) > dev->maxTemp) {
-				dev->maxTemp = i + 1;
-				for (j = 0; j <= i; j++)
-					dev->tempBuffer[j].maxLine =
-					    dev->tempBuffer[j].line;
-			}
-
-			return dev->tempBuffer[i].buffer;
-		}
-	}
-
-	T(YAFFS_TRACE_BUFFERS,
-	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
-	   lineNo));
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
-	}
-	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
-
-	/*
-	 * If we got here then we have to allocate an unmanaged one
-	 * This is not good.
-	 */
-
-	dev->unmanagedTempAllocations++;
-	return YMALLOC(dev->nDataBytesPerChunk);
-
-}
-
-static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-				    int lineNo)
-{
-	int i;
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer) {
-			dev->tempBuffer[i].line = 0;
-			return;
-		}
-	}
-
-	if (buffer) {
-		/* assume it is an unmanaged one. */
-		T(YAFFS_TRACE_BUFFERS,
-		  (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),
-		   lineNo));
-		YFREE(buffer);
-		dev->unmanagedTempDeallocations++;
-	}
-
-}
-
-/*
- * Determine if we have a managed buffer.
- */
-int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-{
-	int i;
-	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer)
-			return 1;
-
-	}
-
-    for (i = 0; i < dev->nShortOpCaches; i++) {
-        if( dev->srCache[i].data == buffer )
-            return 1;
-
-    }
-
-    if (buffer == dev->checkpointBuffer)
-      return 1;
-
-    T(YAFFS_TRACE_ALWAYS,
-	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-    return 0;
-}
-
-
-
-/*
- * Chunk bitmap manipulations
- */
-
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-{
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-		   blk));
-		YBUG();
-	}
-	return dev->chunkBits +
-	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-}
-
-static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
-{
-	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
-	   T(YAFFS_TRACE_ERROR,
-	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
-	    YBUG();
-	}
-}
-
-static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	memset(blkBits, 0, dev->chunkBitmapStride);
-}
-
-static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	yaffs_VerifyChunkBitId(dev,blk,chunk);
-
-	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
-}
-
-static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-	yaffs_VerifyChunkBitId(dev,blk,chunk);
-
-	blkBits[chunk / 8] |= (1 << (chunk & 7));
-}
-
-static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	yaffs_VerifyChunkBitId(dev,blk,chunk);
-
-	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
-}
-
-static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	int i;
-	for (i = 0; i < dev->chunkBitmapStride; i++) {
-		if (*blkBits)
-			return 1;
-		blkBits++;
-	}
-	return 0;
-}
-
-static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-{
-	__u8 *blkBits = yaffs_BlockBits(dev, blk);
-	int i;
-	int n = 0;
-	for (i = 0; i < dev->chunkBitmapStride; i++) {
-		__u8 x = *blkBits;
-		while(x){
-			if(x & 1)
-				n++;
-			x >>=1;
-		}
-
-		blkBits++;
-	}
-	return n;
-}
-
-/*
- * Verification code
- */
-
-static int yaffs_SkipVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
-}
-
-static int yaffs_SkipFullVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
-}
-
-static int yaffs_SkipNANDVerification(yaffs_Device *dev)
-{
-	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
-}
-
-static const char * blockStateName[] = {
-"Unknown",
-"Needs scanning",
-"Scanning",
-"Empty",
-"Allocating",
-"Full",
-"Dirty",
-"Checkpoint",
-"Collecting",
-"Dead"
-};
-
-static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-{
-	int actuallyUsed;
-	int inUse;
-
-	if(yaffs_SkipVerification(dev))
-		return;
-
-	/* Report illegal runtime states */
-	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-
-	switch(bi->blockState){
-	 case YAFFS_BLOCK_STATE_UNKNOWN:
-	 case YAFFS_BLOCK_STATE_SCANNING:
-	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
-		n,blockStateName[bi->blockState]));
-	}
-
-	/* Check pages in use and soft deletions are legal */
-
-	actuallyUsed = bi->pagesInUse - bi->softDeletions;
-
-	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
-	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
-		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-		n,bi->pagesInUse,bi->softDeletions));
-
-
-	/* Check chunk bitmap legal */
-	inUse = yaffs_CountChunkBits(dev,n);
-	if(inUse != bi->pagesInUse)
-		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-			n,bi->pagesInUse,inUse));
-
-	/* Check that the sequence number is valid.
-	 * Ten million is legal, but is very unlikely
-	 */
-	if(dev->isYaffs2 &&
-	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
-	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
-		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-		n,bi->sequenceNumber));
-
-}
-
-static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-{
-	yaffs_VerifyBlock(dev,bi,n);
-
-	/* After collection the block should be in the erased state */
-	/* TODO: This will need to change if we do partial gc */
-
-	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
-		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-			n,bi->blockState));
-	}
-}
-
-static void yaffs_VerifyBlocks(yaffs_Device *dev)
-{
-	int i;
-	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
-	int nIllegalBlockStates = 0;
-
-
-	if(yaffs_SkipVerification(dev))
-		return;
-
-	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
-
-
-	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
-		yaffs_VerifyBlock(dev,bi,i);
-
-		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-			nBlocksPerState[bi->blockState]++;
-		else
-			nIllegalBlockStates++;
-
-	}
-
-	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-
-	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
-	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-
-	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-		T(YAFFS_TRACE_VERIFY,
-		  (TSTR("%s %d blocks"TENDSTR),
-		  blockStateName[i],nBlocksPerState[i]));
-
-	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
-		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-
-	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
-		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-
-	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-		T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
-		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
-
-	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-
-}
-
-/*
- * Verify the object header. oh must be valid, but obj and tags may be NULL in which
- * case those tests will not be performed.
- */
-static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
-{
-	if(yaffs_SkipVerification(obj->myDev))
-		return;
-
-	if(!(tags && obj && oh)){
-	 	T(YAFFS_TRACE_VERIFY,
-		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-		 		(__u32)tags,(__u32)obj,(__u32)oh));
-		return;
-	}
-
-	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-	   oh->type > YAFFS_OBJECT_TYPE_MAX)
-	 	T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-		 tags->objectId, oh->type));
-
-	if(tags->objectId != obj->objectId)
-	 	T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-		 tags->objectId, obj->objectId));
-
-
-	/*
-	 * Check that the object's parent ids match if parentCheck requested.
-	 *
-	 * Tests do not apply to the root object.
-	 */
-
-	if(parentCheck && tags->objectId > 1 && !obj->parent)
-	 	T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-	 	 tags->objectId, oh->parentObjectId));
-
-
-	if(parentCheck && obj->parent &&
-	   oh->parentObjectId != obj->parent->objectId &&
-	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-	 	T(YAFFS_TRACE_VERIFY,
-		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-
-
-	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d header name is NULL"TENDSTR),
-		 obj->objectId));
-
-	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d header name is 0xFF"TENDSTR),
-		 obj->objectId));
-}
-
-
-
-static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
-				  	__u32 level, int chunkOffset)
-{
-	int i;
-	yaffs_Device *dev = obj->myDev;
-	int ok = 1;
-	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-				if (tn->internal[i]) {
-					ok = yaffs_VerifyTnodeWorker(obj,
-							tn->internal[i],
-							level - 1,
-							(chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-				}
-			}
-		} else if (level == 0) {
-			int i;
-			yaffs_ExtendedTags tags;
-			__u32 objectId = obj->objectId;
-
-			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
-
-			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
-				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-
-				if(theChunk > 0){
-					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
-					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
-					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
-						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-							objectId, chunkOffset, theChunk,
-							tags.objectId, tags.chunkId));
-					}
-				}
-				chunkOffset++;
-			}
-		}
-	}
-
-	return ok;
-
-}
-
-
-static void yaffs_VerifyFile(yaffs_Object *obj)
-{
-	int requiredTallness;
-	int actualTallness;
-	__u32 lastChunk;
-	__u32 x;
-	__u32 i;
-	int ok;
-	yaffs_Device *dev;
-	yaffs_ExtendedTags tags;
-	yaffs_Tnode *tn;
-	__u32 objectId;
-
-	if(obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	dev = obj->myDev;
-	objectId = obj->objectId;
-
-	/* Check file size is consistent with tnode depth */
-	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
-	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (x> 0) {
-		x >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-	actualTallness = obj->variant.fileVariant.topLevel;
-
-	if(requiredTallness > actualTallness )
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
-		 obj->objectId,actualTallness, requiredTallness));
-
-
-	/* Check that the chunks in the tnode tree are all correct.
-	 * We do this by scanning through the tnode tree and
-	 * checking the tags for every chunk match.
-	 */
-
-	if(yaffs_SkipNANDVerification(dev))
-		return;
-
-	for(i = 1; i <= lastChunk; i++){
-		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-
-		if (tn) {
-			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-			if(theChunk > 0){
-				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
-				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
-				if(tags.objectId != objectId || tags.chunkId != i){
-					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-						objectId, i, theChunk,
-						tags.objectId, tags.chunkId));
-				}
-			}
-		}
-
-	}
-
-}
-
-static void yaffs_VerifyDirectory(yaffs_Object *obj)
-{
-	if(obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-}
-
-static void yaffs_VerifyHardLink(yaffs_Object *obj)
-{
-	if(obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	/* Verify sane equivalent object */
-}
-
-static void yaffs_VerifySymlink(yaffs_Object *obj)
-{
-	if(obj && yaffs_SkipVerification(obj->myDev))
-		return;
-
-	/* Verify symlink string */
-}
-
-static void yaffs_VerifySpecial(yaffs_Object *obj)
-{
-	if(obj && yaffs_SkipVerification(obj->myDev))
-		return;
-}
-
-static void yaffs_VerifyObject(yaffs_Object *obj)
-{
-	yaffs_Device *dev;
-
-	__u32 chunkMin;
-	__u32 chunkMax;
-
-	__u32 chunkIdOk;
-	__u32 chunkIsLive;
-
-	if(!obj)
-		return;
-
-	dev = obj->myDev;
-
-	if(yaffs_SkipVerification(dev))
-		return;
-
-	/* Check sane object header chunk */
-
-	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
-	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
-
-	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
-	chunkIsLive = chunkIdOk &&
-			yaffs_CheckChunkBit(dev,
-					    obj->chunkId / dev->nChunksPerBlock,
-					    obj->chunkId % dev->nChunksPerBlock);
-	if(!obj->fake &&
-	    (!chunkIdOk || !chunkIsLive)) {
-	   T(YAFFS_TRACE_VERIFY,
-	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-	   obj->objectId,obj->chunkId,
-	   chunkIdOk ? "" : ",out of range",
-	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-	}
-
-	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-		yaffs_ExtendedTags tags;
-		yaffs_ObjectHeader *oh;
-		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-
-		oh = (yaffs_ObjectHeader *)buffer;
-
-		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-
-		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-
-		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-	}
-
-	/* Verify it has a parent */
-	if(obj && !obj->fake &&
-	   (!obj->parent || obj->parent->myDev != dev)){
-	   T(YAFFS_TRACE_VERIFY,
-	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-	   obj->objectId,obj->parent));
-	}
-
-	/* Verify parent is a directory */
-	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
-	   T(YAFFS_TRACE_VERIFY,
-	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-	   obj->objectId,obj->parent->variantType));
-	}
-
-	switch(obj->variantType){
-	case YAFFS_OBJECT_TYPE_FILE:
-		yaffs_VerifyFile(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		yaffs_VerifySymlink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		yaffs_VerifyDirectory(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		yaffs_VerifyHardLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		yaffs_VerifySpecial(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_UNKNOWN:
-	default:
-		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d has illegaltype %d"TENDSTR),
-		obj->objectId,obj->variantType));
-		break;
-	}
-
-
-}
-
-static void yaffs_VerifyObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	int i;
-	struct list_head *lh;
-
-	if(yaffs_SkipVerification(dev))
-		return;
-
-	/* Iterate through the objects in each hash entry */
-
-	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
-	 	list_for_each(lh, &dev->objectBucket[i].list) {
-			if (lh) {
-				obj = list_entry(lh, yaffs_Object, hashLink);
-				yaffs_VerifyObject(obj);
-			}
-		}
-	 }
-
-}
-
-
-/*
- *  Simple hash function. Needs to have a reasonable spread
- */
-
-static Y_INLINE int yaffs_HashFunction(int n)
-{
-	n = abs(n);
-	return (n % YAFFS_NOBJECT_BUCKETS);
-}
-
-/*
- * Access functions to useful fake objects
- */
-
-yaffs_Object *yaffs_Root(yaffs_Device * dev)
-{
-	return dev->rootDir;
-}
-
-yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-{
-	return dev->lostNFoundDir;
-}
-
-
-/*
- *  Erased NAND checking functions
- */
-
-int yaffs_CheckFF(__u8 * buffer, int nBytes)
-{
-	/* Horrible, slow implementation */
-	while (nBytes--) {
-		if (*buffer != 0xFF)
-			return 0;
-		buffer++;
-	}
-	return 1;
-}
-
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				  int chunkInNAND)
-{
-
-	int retval = YAFFS_OK;
-	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
-	yaffs_ExtendedTags tags;
-	int result;
-
-	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
-
-	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-		retval = YAFFS_FAIL;
-
-
-	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
-		T(YAFFS_TRACE_NANDACCESS,
-		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-		retval = YAFFS_FAIL;
-	}
-
-	yaffs_ReleaseTempBuffer(dev, data, __LINE__);
-
-	return retval;
-
-}
-
-
-static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-					     const __u8 * data,
-					     yaffs_ExtendedTags * tags,
-					     int useReserve)
-{
-	int attempts = 0;
-	int writeOk = 0;
-	int chunk;
-
-	yaffs_InvalidateCheckpoint(dev);
-
-	do {
-		yaffs_BlockInfo *bi = 0;
-		int erasedOk = 0;
-
-		chunk = yaffs_AllocateChunk(dev, useReserve, &bi);
-		if (chunk < 0) {
-			/* no space */
-			break;
-		}
-
-		/* First check this chunk is erased, if it needs
-		 * checking.  The checking policy (unless forced
-		 * always on) is as follows:
-		 *
-		 * Check the first page we try to write in a block.
-		 * If the check passes then we don't need to check any
-		 * more.	If the check fails, we check again...
-		 * If the block has been erased, we don't need to check.
-		 *
-		 * However, if the block has been prioritised for gc,
-		 * then we think there might be something odd about
-		 * this block and stop using it.
-		 *
-		 * Rationale: We should only ever see chunks that have
-		 * not been erased if there was a partially written
-		 * chunk due to power loss.  This checking policy should
-		 * catch that case with very few checks and thus save a
-		 * lot of checks that are most likely not needed.
-		 */
-		if (bi->gcPrioritise) {
-			yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-			/* try another chunk */
-			continue;
-		}
-
-		/* let's give it a try */
-		attempts++;
-
-#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-		bi->skipErasedCheck = 0;
-#endif
-		if (!bi->skipErasedCheck) {
-			erasedOk = yaffs_CheckChunkErased(dev, chunk);
-			if (erasedOk != YAFFS_OK) {
-				T(YAFFS_TRACE_ERROR,
-				(TSTR ("**>> yaffs chunk %d was not erased"
-				TENDSTR), chunk));
-
-				/* try another chunk */
-				continue;
-			}
-			bi->skipErasedCheck = 1;
-		}
-
-		writeOk = yaffs_WriteChunkWithTagsToNAND(dev, chunk,
-				data, tags);
-		if (writeOk != YAFFS_OK) {
-			yaffs_HandleWriteChunkError(dev, chunk, erasedOk);
-			/* try another chunk */
-			continue;
-		}
-
-		/* Copy the data into the robustification buffer */
-		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
-
-	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-
-	if (attempts > 1) {
-		T(YAFFS_TRACE_ERROR,
-			(TSTR("**>> yaffs write required %d attempts" TENDSTR),
-			attempts));
-
-		dev->nRetriedWrites += (attempts - 1);
-	}
-
-	return chunk;
-}
-
-/*
- * Block retiring for handling a broken block.
- */
-
-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-{
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
-
-	yaffs_InvalidateCheckpoint(dev);
-
-	yaffs_MarkBlockBad(dev, blockInNAND);
-
-	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-	bi->gcPrioritise = 0;
-	bi->needsRetiring = 0;
-
-	dev->nRetiredBlocks++;
-}
-
-/*
- * Functions for robustisizing TODO
- *
- */
-
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-				     const __u8 * data,
-				     const yaffs_ExtendedTags * tags)
-{
-}
-
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-				    const yaffs_ExtendedTags * tags)
-{
-}
-
-void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
-{
-	if(!bi->gcPrioritise){
-		bi->gcPrioritise = 1;
-		dev->hasPendingPrioritisedGCs = 1;
-		bi->chunkErrorStrikes ++;
-
-		if(bi->chunkErrorStrikes > 3){
-			bi->needsRetiring = 1; /* Too many stikes, so retire this */
-			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
-
-		}
-
-	}
-}
-
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-{
-
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
-
-	yaffs_HandleChunkError(dev,bi);
-
-
-	if(erasedOk ) {
-		/* Was an actual write failure, so mark the block for retirement  */
-		bi->needsRetiring = 1;
-		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
-
-
-	}
-
-	/* Delete the chunk */
-	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-}
-
-
-/*---------------- Name handling functions ------------*/
-
-static __u16 yaffs_CalcNameSum(const YCHAR * name)
-{
-	__u16 sum = 0;
-	__u16 i = 1;
-
-	YUCHAR *bname = (YUCHAR *) name;
-	if (bname) {
-		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-			sum += yaffs_toupper(*bname) * i;
-#else
-			sum += (*bname) * i;
-#endif
-			i++;
-			bname++;
-		}
-	}
-	return sum;
-}
-
-static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-{
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-		yaffs_strcpy(obj->shortName, name);
-	} else {
-		obj->shortName[0] = _Y('\0');
-	}
-#endif
-	obj->sum = yaffs_CalcNameSum(name);
-}
-
-/*-------------------- TNODES -------------------
-
- * List of spare tnodes
- * The list is hooked together using the first pointer
- * in the tnode.
- */
-
-/* yaffs_CreateTnodes creates a bunch more tnodes and
- * adds them to the tnode free list.
- * Don't use this function directly
- */
-
-static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-{
-	int i;
-	int tnodeSize;
-	yaffs_Tnode *newTnodes;
-	__u8 *mem;
-	yaffs_Tnode *curr;
-	yaffs_Tnode *next;
-	yaffs_TnodeList *tnl;
-
-	if (nTnodes < 1)
-		return YAFFS_OK;
-
-	/* Calculate the tnode size in bytes for variable width tnode support.
-	 * Must be a multiple of 32-bits  */
-	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	/* make these things */
-
-	newTnodes = YMALLOC(nTnodes * tnodeSize);
-	mem = (__u8 *)newTnodes;
-
-	if (!newTnodes) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Hook them into the free list */
-#if 0
-	for (i = 0; i < nTnodes - 1; i++) {
-		newTnodes[i].internal[0] = &newTnodes[i + 1];
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-	}
-
-	newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-	dev->freeTnodes = newTnodes;
-#else
-	/* New hookup for wide tnodes */
-	for(i = 0; i < nTnodes -1; i++) {
-		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
-		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
-		curr->internal[0] = next;
-	}
-
-	curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * tnodeSize];
-	curr->internal[0] = dev->freeTnodes;
-	dev->freeTnodes = (yaffs_Tnode *)mem;
-
-#endif
-
-
-	dev->nFreeTnodes += nTnodes;
-	dev->nTnodesCreated += nTnodes;
-
-	/* Now add this bunch of tnodes to a list for freeing up.
-	 * NB If we can't add this to the management list it isn't fatal
-	 * but it just means we can't free this bunch of tnodes later.
-	 */
-
-	tnl = YMALLOC(sizeof(yaffs_TnodeList));
-	if (!tnl) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
-		   return YAFFS_FAIL;
-
-	} else {
-		tnl->tnodes = newTnodes;
-		tnl->next = dev->allocatedTnodeList;
-		dev->allocatedTnodeList = tnl;
-	}
-
-	T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
-
-	return YAFFS_OK;
-}
-
-/* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
-
-static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-{
-	yaffs_Tnode *tn = NULL;
-
-	/* If there are none left make more */
-	if (!dev->freeTnodes) {
-		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
-	}
-
-	if (dev->freeTnodes) {
-		tn = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) {
-			/* Hoosterman, this thing looks like it isn't in the list */
-			T(YAFFS_TRACE_ALWAYS,
-			  (TSTR("yaffs: Tnode list bug 1" TENDSTR)));
-		}
-#endif
-		dev->freeTnodes = dev->freeTnodes->internal[0];
-		dev->nFreeTnodes--;
-	}
-
-	return tn;
-}
-
-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-{
-	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-
-	if(tn)
-		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-
-	return tn;
-}
-
-/* FreeTnode frees up a tnode and puts it back on the free list */
-static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-{
-	if (tn) {
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-		if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) {
-			/* Hoosterman, this thing looks like it is already in the list */
-			T(YAFFS_TRACE_ALWAYS,
-			  (TSTR("yaffs: Tnode list bug 2" TENDSTR)));
-		}
-		tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-		tn->internal[0] = dev->freeTnodes;
-		dev->freeTnodes = tn;
-		dev->nFreeTnodes++;
-	}
-}
-
-static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-{
-	/* Free the list of allocated tnodes */
-	yaffs_TnodeList *tmp;
-
-	while (dev->allocatedTnodeList) {
-		tmp = dev->allocatedTnodeList->next;
-
-		YFREE(dev->allocatedTnodeList->tnodes);
-		YFREE(dev->allocatedTnodeList);
-		dev->allocatedTnodeList = tmp;
-
-	}
-
-	dev->freeTnodes = NULL;
-	dev->nFreeTnodes = 0;
-}
-
-static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-{
-	dev->allocatedTnodeList = NULL;
-	dev->freeTnodes = NULL;
-	dev->nFreeTnodes = 0;
-	dev->nTnodesCreated = 0;
-
-}
-
-
-void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-{
-  __u32 *map = (__u32 *)tn;
-  __u32 bitInMap;
-  __u32 bitInWord;
-  __u32 wordInMap;
-  __u32 mask;
-
-  pos &= YAFFS_TNODES_LEVEL0_MASK;
-  val >>= dev->chunkGroupBits;
-
-  bitInMap = pos * dev->tnodeWidth;
-  wordInMap = bitInMap /32;
-  bitInWord = bitInMap & (32 -1);
-
-  mask = dev->tnodeMask << bitInWord;
-
-  map[wordInMap] &= ~mask;
-  map[wordInMap] |= (mask & (val << bitInWord));
-
-  if(dev->tnodeWidth > (32-bitInWord)) {
-    bitInWord = (32 - bitInWord);
-    wordInMap++;;
-    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-    map[wordInMap] &= ~mask;
-    map[wordInMap] |= (mask & (val >> bitInWord));
-  }
-}
-
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-{
-  __u32 *map = (__u32 *)tn;
-  __u32 bitInMap;
-  __u32 bitInWord;
-  __u32 wordInMap;
-  __u32 val;
-
-  pos &= YAFFS_TNODES_LEVEL0_MASK;
-
-  bitInMap = pos * dev->tnodeWidth;
-  wordInMap = bitInMap /32;
-  bitInWord = bitInMap & (32 -1);
-
-  val = map[wordInMap] >> bitInWord;
-
-  if(dev->tnodeWidth > (32-bitInWord)) {
-    bitInWord = (32 - bitInWord);
-    wordInMap++;;
-    val |= (map[wordInMap] << bitInWord);
-  }
-
-  val &= dev->tnodeMask;
-  val <<= dev->chunkGroupBits;
-
-  return val;
-}
-
-/* ------------------- End of individual tnode manipulation -----------------*/
-
-/* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
- * The look up tree is represented by the top tnode and the number of topLevel
- * in the tree. 0 means only the level 0 tnode is in the tree.
- */
-
-/* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
-					  yaffs_FileStructure * fStruct,
-					  __u32 chunkId)
-{
-
-	yaffs_Tnode *tn = fStruct->top;
-	__u32 i;
-	int requiredTallness;
-	int level = fStruct->topLevel;
-
-	/* Check sane level and chunk Id */
-	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-		return NULL;
-	}
-
-	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-		return NULL;
-	}
-
-	/* First check we're tall enough (ie enough topLevel) */
-
-	i = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (i) {
-		i >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-	if (requiredTallness > fStruct->topLevel) {
-		/* Not tall enough, so we can't find it, return NULL. */
-		return NULL;
-	}
-
-	/* Traverse down to level 0 */
-	while (level > 0 && tn) {
-		tn = tn->
-		    internal[(chunkId >>
-			       ( YAFFS_TNODES_LEVEL0_BITS +
-			         (level - 1) *
-			         YAFFS_TNODES_INTERNAL_BITS)
-			      ) &
-			     YAFFS_TNODES_INTERNAL_MASK];
-		level--;
-
-	}
-
-	return tn;
-}
-
-/* AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree.
- * This happens in two steps:
- *  1. If the tree isn't tall enough, then make it taller.
- *  2. Scan down the tree towards the level 0 tnode adding tnodes if required.
- *
- * Used when modifying the tree.
- *
- *  If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will
- *  be plugged into the ttree.
- */
-
-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
-					       yaffs_FileStructure * fStruct,
-					       __u32 chunkId,
-					       yaffs_Tnode *passedTn)
-{
-
-	int requiredTallness;
-	int i;
-	int l;
-	yaffs_Tnode *tn;
-
-	__u32 x;
-
-
-	/* Check sane level and page Id */
-	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-		return NULL;
-	}
-
-	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-		return NULL;
-	}
-
-	/* First check we're tall enough (ie enough topLevel) */
-
-	x = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
-	requiredTallness = 0;
-	while (x) {
-		x >>= YAFFS_TNODES_INTERNAL_BITS;
-		requiredTallness++;
-	}
-
-
-	if (requiredTallness > fStruct->topLevel) {
-		/* Not tall enough,gotta make the tree taller */
-		for (i = fStruct->topLevel; i < requiredTallness; i++) {
-
-			tn = yaffs_GetTnode(dev);
-
-			if (tn) {
-				tn->internal[0] = fStruct->top;
-				fStruct->top = tn;
-			} else {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR("yaffs: no more tnodes" TENDSTR)));
-			}
-		}
-
-		fStruct->topLevel = requiredTallness;
-	}
-
-	/* Traverse down to level 0, adding anything we need */
-
-	l = fStruct->topLevel;
-	tn = fStruct->top;
-
-	if(l > 0) {
-		while (l > 0 && tn) {
-			x = (chunkId >>
-			     ( YAFFS_TNODES_LEVEL0_BITS +
-			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
-			    YAFFS_TNODES_INTERNAL_MASK;
-
-
-			if((l>1) && !tn->internal[x]){
-				/* Add missing non-level-zero tnode */
-				tn->internal[x] = yaffs_GetTnode(dev);
-
-			} else if(l == 1) {
-				/* Looking from level 1 at level 0 */
-			 	if (passedTn) {
-					/* If we already have one, then release it.*/
-					if(tn->internal[x])
-						yaffs_FreeTnode(dev,tn->internal[x]);
-					tn->internal[x] = passedTn;
-
-				} else if(!tn->internal[x]) {
-					/* Don't have one, none passed in */
-					tn->internal[x] = yaffs_GetTnode(dev);
-				}
-			}
-
-			tn = tn->internal[x];
-			l--;
-		}
-	} else {
-		/* top is level 0 */
-		if(passedTn) {
-			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-			yaffs_FreeTnode(dev,passedTn);
-		}
-	}
-
-	return tn;
-}
-
-static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
-				  yaffs_ExtendedTags * tags, int objectId,
-				  int chunkInInode)
-{
-	int j;
-
-	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
-		if (yaffs_CheckChunkBit
-		    (dev, theChunk / dev->nChunksPerBlock,
-		     theChunk % dev->nChunksPerBlock)) {
-			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
-							tags);
-			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
-				/* found it; */
-				return theChunk;
-
-			}
-		}
-		theChunk++;
-	}
-	return -1;
-}
-
-
-/* DeleteWorker scans backwards through the tnode tree and deletes all the
- * chunks and tnodes in the file
- * Returns 1 if the tree was deleted.
- * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
- */
-
-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-			      int chunkOffset, int *limit)
-{
-	int i;
-	int chunkInInode;
-	int theChunk;
-	yaffs_ExtendedTags tags;
-	int foundChunk;
-	yaffs_Device *dev = in->myDev;
-
-	int allDone = 1;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-			     i--) {
-				if (tn->internal[i]) {
-					if (limit && (*limit) < 0) {
-						allDone = 0;
-					} else {
-						allDone =
-						    yaffs_DeleteWorker(in,
-								       tn->
-								       internal
-								       [i],
-								       level -
-								       1,
-								       (chunkOffset
-									<<
-									YAFFS_TNODES_INTERNAL_BITS)
-								       + i,
-								       limit);
-					}
-					if (allDone) {
-						yaffs_FreeTnode(dev,
-								tn->
-								internal[i]);
-						tn->internal[i] = NULL;
-					}
-				}
-
-			}
-			return (allDone) ? 1 : 0;
-		} else if (level == 0) {
-			int hitLimit = 0;
-
-			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
-			     i--) {
-			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-				if (theChunk) {
-
-					chunkInInode =
-					    (chunkOffset <<
-					     YAFFS_TNODES_LEVEL0_BITS) + i;
-
-					foundChunk =
-					    yaffs_FindChunkInGroup(dev,
-								   theChunk,
-								   &tags,
-								   in->objectId,
-								   chunkInInode);
-
-					if (foundChunk > 0) {
-						yaffs_DeleteChunk(dev,
-								  foundChunk, 1,
-								  __LINE__);
-						in->nDataChunks--;
-						if (limit) {
-							*limit = *limit - 1;
-							if (*limit <= 0) {
-								hitLimit = 1;
-							}
-						}
-
-					}
-
-					yaffs_PutLevel0Tnode(dev,tn,i,0);
-				}
-
-			}
-			return (i < 0) ? 1 : 0;
-
-		}
-
-	}
-
-	return 1;
-
-}
-
-static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-{
-
-	yaffs_BlockInfo *theBlock;
-
-	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-
-	theBlock = yaffs_GetBlockInfo(dev, chunk / dev->nChunksPerBlock);
-	if (theBlock) {
-		theBlock->softDeletions++;
-		dev->nFreeChunks++;
-	}
-}
-
-/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file.
- * All soft deleting does is increment the block's softdelete count and pulls the chunk out
- * of the tnode.
- * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
- */
-
-static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-				  __u32 level, int chunkOffset)
-{
-	int i;
-	int theChunk;
-	int allDone = 1;
-	yaffs_Device *dev = in->myDev;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-			     i--) {
-				if (tn->internal[i]) {
-					allDone =
-					    yaffs_SoftDeleteWorker(in,
-								   tn->
-								   internal[i],
-								   level - 1,
-								   (chunkOffset
-								    <<
-								    YAFFS_TNODES_INTERNAL_BITS)
-								   + i);
-					if (allDone) {
-						yaffs_FreeTnode(dev,
-								tn->
-								internal[i]);
-						tn->internal[i] = NULL;
-					} else {
-						/* Hoosterman... how could this happen? */
-					}
-				}
-			}
-			return (allDone) ? 1 : 0;
-		} else if (level == 0) {
-
-			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-				if (theChunk) {
-					/* Note this does not find the real chunk, only the chunk group.
-					 * We make an assumption that a chunk group is not larger than
-					 * a block.
-					 */
-					yaffs_SoftDeleteChunk(dev, theChunk);
-					yaffs_PutLevel0Tnode(dev,tn,i,0);
-				}
-
-			}
-			return 1;
-
-		}
-
-	}
-
-	return 1;
-
-}
-
-static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-{
-	if (obj->deleted &&
-	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-		if (obj->nDataChunks <= 0) {
-			/* Empty file with no duplicate object headers, just delete it immediately */
-			yaffs_FreeTnode(obj->myDev,
-					obj->variant.fileVariant.top);
-			obj->variant.fileVariant.top = NULL;
-			T(YAFFS_TRACE_TRACING,
-			  (TSTR("yaffs: Deleting empty file %d" TENDSTR),
-			   obj->objectId));
-			yaffs_DoGenericObjectDeletion(obj);
-		} else {
-			yaffs_SoftDeleteWorker(obj,
-					       obj->variant.fileVariant.top,
-					       obj->variant.fileVariant.
-					       topLevel, 0);
-			obj->softDeleted = 1;
-		}
-	}
-}
-
-/* Pruning removes any part of the file structure tree that is beyond the
- * bounds of the file (ie that does not point to chunks).
- *
- * A file should only get pruned when its size is reduced.
- *
- * Before pruning, the chunks must be pulled from the tree and the
- * level 0 tnode entries must be zeroed out.
- * Could also use this for file deletion, but that's probably better handled
- * by a special case.
- */
-
-static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
-				      __u32 level, int del0)
-{
-	int i;
-	int hasData;
-
-	if (tn) {
-		hasData = 0;
-
-		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-			if (tn->internal[i] && level > 0) {
-				tn->internal[i] =
-				    yaffs_PruneWorker(dev, tn->internal[i],
-						      level - 1,
-						      (i == 0) ? del0 : 1);
-			}
-
-			if (tn->internal[i]) {
-				hasData++;
-			}
-		}
-
-		if (hasData == 0 && del0) {
-			/* Free and return NULL */
-
-			yaffs_FreeTnode(dev, tn);
-			tn = NULL;
-		}
-
-	}
-
-	return tn;
-
-}
-
-static int yaffs_PruneFileStructure(yaffs_Device * dev,
-				    yaffs_FileStructure * fStruct)
-{
-	int i;
-	int hasData;
-	int done = 0;
-	yaffs_Tnode *tn;
-
-	if (fStruct->topLevel > 0) {
-		fStruct->top =
-		    yaffs_PruneWorker(dev, fStruct->top, fStruct->topLevel, 0);
-
-		/* Now we have a tree with all the non-zero branches NULL but the height
-		 * is the same as it was.
-		 * Let's see if we can trim internal tnodes to shorten the tree.
-		 * We can do this if only the 0th element in the tnode is in use
-		 * (ie all the non-zero are NULL)
-		 */
-
-		while (fStruct->topLevel && !done) {
-			tn = fStruct->top;
-
-			hasData = 0;
-			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
-				if (tn->internal[i]) {
-					hasData++;
-				}
-			}
-
-			if (!hasData) {
-				fStruct->top = tn->internal[0];
-				fStruct->topLevel--;
-				yaffs_FreeTnode(dev, tn);
-			} else {
-				done = 1;
-			}
-		}
-	}
-
-	return YAFFS_OK;
-}
-
-/*-------------------- End of File Structure functions.-------------------*/
-
-/* yaffs_CreateFreeObjects creates a bunch more objects and
- * adds them to the object free list.
- */
-static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-{
-	int i;
-	yaffs_Object *newObjects;
-	yaffs_ObjectList *list;
-
-	if (nObjects < 1)
-		return YAFFS_OK;
-
-	/* make these things */
-	newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
-	list = YMALLOC(sizeof(yaffs_ObjectList));
-
-	if (!newObjects || !list) {
-		if(newObjects)
-			YFREE(newObjects);
-		if(list)
-			YFREE(list);
-		T(YAFFS_TRACE_ALLOCATE,
-		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Hook them into the free list */
-	for (i = 0; i < nObjects - 1; i++) {
-		newObjects[i].siblings.next =
-		    (struct list_head *)(&newObjects[i + 1]);
-	}
-
-	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-	dev->freeObjects = newObjects;
-	dev->nFreeObjects += nObjects;
-	dev->nObjectsCreated += nObjects;
-
-	/* Now add this bunch of Objects to a list for freeing up. */
-
-	list->objects = newObjects;
-	list->next = dev->allocatedObjectList;
-	dev->allocatedObjectList = list;
-
-	return YAFFS_OK;
-}
-
-
-/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-{
-	yaffs_Object *tn = NULL;
-
-	/* If there are none left make more */
-	if (!dev->freeObjects) {
-		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
-	}
-
-	if (dev->freeObjects) {
-		tn = dev->freeObjects;
-		dev->freeObjects =
-		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-		dev->nFreeObjects--;
-
-		/* Now sweeten it up... */
-
-		memset(tn, 0, sizeof(yaffs_Object));
-		tn->myDev = dev;
-		tn->chunkId = -1;
-		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-		INIT_LIST_HEAD(&(tn->hardLinks));
-		INIT_LIST_HEAD(&(tn->hashLink));
-		INIT_LIST_HEAD(&tn->siblings);
-
-		/* Add it to the lost and found directory.
-		 * NB Can't put root or lostNFound in lostNFound so
-		 * check if lostNFound exists first
-		 */
-		if (dev->lostNFoundDir) {
-			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
-		}
-	}
-
-	return tn;
-}
-
-static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-					       __u32 mode)
-{
-
-	yaffs_Object *obj =
-	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
-	if (obj) {
-		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
-		obj->unlinkAllowed = 0;	/* ... or unlink it */
-		obj->deleted = 0;
-		obj->unlinked = 0;
-		obj->yst_mode = mode;
-		obj->myDev = dev;
-		obj->chunkId = 0;	/* Not a valid chunk. */
-	}
-
-	return obj;
-
-}
-
-static void yaffs_UnhashObject(yaffs_Object * tn)
-{
-	int bucket;
-	yaffs_Device *dev = tn->myDev;
-
-	/* If it is still linked into the bucket list, free from the list */
-	if (!list_empty(&tn->hashLink)) {
-		list_del_init(&tn->hashLink);
-		bucket = yaffs_HashFunction(tn->objectId);
-		dev->objectBucket[bucket].count--;
-	}
-
-}
-
-/*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_FreeObject(yaffs_Object * tn)
-{
-
-	yaffs_Device *dev = tn->myDev;
-
-#ifdef  __KERNEL__
-	if (tn->myInode) {
-		/* We're still hooked up to a cached inode.
-		 * Don't delete now, but mark for later deletion
-		 */
-		tn->deferedFree = 1;
-		return;
-	}
-#endif
-
-	yaffs_UnhashObject(tn);
-
-	/* Link into the free list. */
-	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-	dev->freeObjects = tn;
-	dev->nFreeObjects++;
-}
-
-#ifdef __KERNEL__
-
-void yaffs_HandleDeferedFree(yaffs_Object * obj)
-{
-	if (obj->deferedFree) {
-		yaffs_FreeObject(obj);
-	}
-}
-
-#endif
-
-static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-{
-	/* Free the list of allocated Objects */
-
-	yaffs_ObjectList *tmp;
-
-	while (dev->allocatedObjectList) {
-		tmp = dev->allocatedObjectList->next;
-		YFREE(dev->allocatedObjectList->objects);
-		YFREE(dev->allocatedObjectList);
-
-		dev->allocatedObjectList = tmp;
-	}
-
-	dev->freeObjects = NULL;
-	dev->nFreeObjects = 0;
-}
-
-static void yaffs_InitialiseObjects(yaffs_Device * dev)
-{
-	int i;
-
-	dev->allocatedObjectList = NULL;
-	dev->freeObjects = NULL;
-	dev->nFreeObjects = 0;
-
-	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-		dev->objectBucket[i].count = 0;
-	}
-
-}
-
-static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-{
-	static int x = 0;
-	int i;
-	int l = 999;
-	int lowest = 999999;
-
-	/* First let's see if we can find one that's empty. */
-
-	for (i = 0; i < 10 && lowest > 0; i++) {
-		x++;
-		x %= YAFFS_NOBJECT_BUCKETS;
-		if (dev->objectBucket[x].count < lowest) {
-			lowest = dev->objectBucket[x].count;
-			l = x;
-		}
-
-	}
-
-	/* If we didn't find an empty list, then try
-	 * looking a bit further for a short one
-	 */
-
-	for (i = 0; i < 10 && lowest > 3; i++) {
-		x++;
-		x %= YAFFS_NOBJECT_BUCKETS;
-		if (dev->objectBucket[x].count < lowest) {
-			lowest = dev->objectBucket[x].count;
-			l = x;
-		}
-
-	}
-
-	return l;
-}
-
-static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-{
-	int bucket = yaffs_FindNiceObjectBucket(dev);
-
-	/* Now find an object value that has not already been taken
-	 * by scanning the list.
-	 */
-
-	int found = 0;
-	struct list_head *i;
-
-	__u32 n = (__u32) bucket;
-
-	/* yaffs_CheckObjectHashSanity();  */
-
-	while (!found) {
-		found = 1;
-		n += YAFFS_NOBJECT_BUCKETS;
-		if (1 || dev->objectBucket[bucket].count > 0) {
-			list_for_each(i, &dev->objectBucket[bucket].list) {
-				/* If there is already one in the list */
-				if (i
-				    && list_entry(i, yaffs_Object,
-						  hashLink)->objectId == n) {
-					found = 0;
-				}
-			}
-		}
-	}
-
-
-	return n;
-}
-
-static void yaffs_HashObject(yaffs_Object * in)
-{
-	int bucket = yaffs_HashFunction(in->objectId);
-	yaffs_Device *dev = in->myDev;
-
-	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-	dev->objectBucket[bucket].count++;
-
-}
-
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-{
-	int bucket = yaffs_HashFunction(number);
-	struct list_head *i;
-	yaffs_Object *in;
-
-	list_for_each(i, &dev->objectBucket[bucket].list) {
-		/* Look if it is in the list */
-		if (i) {
-			in = list_entry(i, yaffs_Object, hashLink);
-			if (in->objectId == number) {
-#ifdef __KERNEL__
-				/* Don't tell the VFS about this one if it is defered free */
-				if (in->deferedFree)
-					return NULL;
-#endif
-
-				return in;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-				    yaffs_ObjectType type)
-{
-
-	yaffs_Object *theObject;
-	yaffs_Tnode *tn;
-
-	if (number < 0) {
-		number = yaffs_CreateNewObjectNumber(dev);
-	}
-
-	theObject = yaffs_AllocateEmptyObject(dev);
-	if(!theObject)
-		return NULL;
-
-	if(type == YAFFS_OBJECT_TYPE_FILE){
-		tn = yaffs_GetTnode(dev);
-		if(!tn){
-			yaffs_FreeObject(theObject);
-			return NULL;
-		}
-	}
-
-
-
-	if (theObject) {
-		theObject->fake = 0;
-		theObject->renameAllowed = 1;
-		theObject->unlinkAllowed = 1;
-		theObject->objectId = number;
-		yaffs_HashObject(theObject);
-		theObject->variantType = type;
-#ifdef CONFIG_YAFFS_WINCE
-		yfsd_WinFileTimeNow(theObject->win_atime);
-		theObject->win_ctime[0] = theObject->win_mtime[0] =
-		    theObject->win_atime[0];
-		theObject->win_ctime[1] = theObject->win_mtime[1] =
-		    theObject->win_atime[1];
-
-#else
-
-		theObject->yst_atime = theObject->yst_mtime =
-		    theObject->yst_ctime = Y_CURRENT_TIME;
-#endif
-		switch (type) {
-		case YAFFS_OBJECT_TYPE_FILE:
-			theObject->variant.fileVariant.fileSize = 0;
-			theObject->variant.fileVariant.scannedFileSize = 0;
-			theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF;	/* max __u32 */
-			theObject->variant.fileVariant.topLevel = 0;
-			theObject->variant.fileVariant.top = tn;
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
-				       children);
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			/* No action required */
-			break;
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* todo this should not happen */
-			break;
-		}
-	}
-
-	return theObject;
-}
-
-static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-						      int number,
-						      yaffs_ObjectType type)
-{
-	yaffs_Object *theObject = NULL;
-
-	if (number > 0) {
-		theObject = yaffs_FindObjectByNumber(dev, number);
-	}
-
-	if (!theObject) {
-		theObject = yaffs_CreateNewObject(dev, number, type);
-	}
-
-	return theObject;
-
-}
-
-
-static YCHAR *yaffs_CloneString(const YCHAR * str)
-{
-	YCHAR *newStr = NULL;
-
-	if (str && *str) {
-		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
-		if(newStr)
-			yaffs_strcpy(newStr, str);
-	}
-
-	return newStr;
-
-}
-
-/*
- * Mknod (create) a new object.
- * equivalentObject only has meaning for a hard link;
- * aliasString only has meaning for a sumlink.
- * rdev only has meaning for devices (a subset of special objects)
- */
-
-static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
-				       yaffs_Object * parent,
-				       const YCHAR * name,
-				       __u32 mode,
-				       __u32 uid,
-				       __u32 gid,
-				       yaffs_Object * equivalentObject,
-				       const YCHAR * aliasString, __u32 rdev)
-{
-	yaffs_Object *in;
-	YCHAR *str;
-
-	yaffs_Device *dev = parent->myDev;
-
-	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
-	if (yaffs_FindObjectByName(parent, name)) {
-		return NULL;
-	}
-
-	in = yaffs_CreateNewObject(dev, -1, type);
-
-	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-		str = yaffs_CloneString(aliasString);
-		if(!str){
-			yaffs_FreeObject(in);
-			return NULL;
-		}
-	}
-
-
-
-	if (in) {
-		in->chunkId = -1;
-		in->valid = 1;
-		in->variantType = type;
-
-		in->yst_mode = mode;
-
-#ifdef CONFIG_YAFFS_WINCE
-		yfsd_WinFileTimeNow(in->win_atime);
-		in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
-		in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1];
-
-#else
-		in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME;
-
-		in->yst_rdev = rdev;
-		in->yst_uid = uid;
-		in->yst_gid = gid;
-#endif
-		in->nDataChunks = 0;
-
-		yaffs_SetObjectName(in, name);
-		in->dirty = 1;
-
-		yaffs_AddObjectToDirectory(parent, in);
-
-		in->myDev = parent->myDev;
-
-		switch (type) {
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			in->variant.symLinkVariant.alias = str;
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-			in->variant.hardLinkVariant.equivalentObject =
-			    equivalentObject;
-			in->variant.hardLinkVariant.equivalentObjectId =
-			    equivalentObject->objectId;
-			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-			break;
-		case YAFFS_OBJECT_TYPE_FILE:
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* do nothing */
-			break;
-		}
-
-		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
-			/* Could not create the object header, fail the creation */
-			yaffs_DestroyObject(in);
-			in = NULL;
-		}
-
-	}
-
-	return in;
-}
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
-			      __u32 mode, __u32 uid, __u32 gid)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
-				 uid, gid, NULL, NULL, 0);
-}
-
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
-				   __u32 mode, __u32 uid, __u32 gid)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-				 mode, uid, gid, NULL, NULL, 0);
-}
-
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-				 uid, gid, NULL, NULL, rdev);
-}
-
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-				 __u32 mode, __u32 uid, __u32 gid,
-				 const YCHAR * alias)
-{
-	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
-				 uid, gid, NULL, alias, 0);
-}
-
-/* yaffs_Link returns the object id of the equivalent object.*/
-yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
-			 yaffs_Object * equivalentObject)
-{
-	/* Get the real object in case we were fed a hard link as an equivalent object */
-	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-
-	if (yaffs_MknodObject
-	    (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-	     equivalentObject, NULL, 0)) {
-		return equivalentObject;
-	} else {
-		return NULL;
-	}
-
-}
-
-static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
-				  const YCHAR * newName, int force, int shadows)
-{
-	int unlinkOp;
-	int deleteOp;
-
-	yaffs_Object *existingTarget;
-
-	if (newDir == NULL) {
-		newDir = obj->parent;	/* use the old directory */
-	}
-
-	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-		    TENDSTR)));
-		YBUG();
-	}
-
-	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-	if (obj->myDev->isYaffs2) {
-		unlinkOp = (newDir == obj->myDev->unlinkedDir);
-	} else {
-		unlinkOp = (newDir == obj->myDev->unlinkedDir
-			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
-	}
-
-	deleteOp = (newDir == obj->myDev->deletedDir);
-
-	existingTarget = yaffs_FindObjectByName(newDir, newName);
-
-	/* If the object is a file going into the unlinked directory,
-	 *   then it is OK to just stuff it in since duplicate names are allowed.
-	 *   else only proceed if the new name does not exist and if we're putting
-	 *   it into a directory.
-	 */
-	if ((unlinkOp ||
-	     deleteOp ||
-	     force ||
-	     (shadows > 0) ||
-	     !existingTarget) &&
-	    newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
-		yaffs_SetObjectName(obj, newName);
-		obj->dirty = 1;
-
-		yaffs_AddObjectToDirectory(newDir, obj);
-
-		if (unlinkOp)
-			obj->unlinked = 1;
-
-		/* If it is a deletion then we mark it as a shrink for gc purposes. */
-		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-			return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-}
-
-int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
-		       yaffs_Object * newDir, const YCHAR * newName)
-{
-	yaffs_Object *obj;
-	yaffs_Object *existingTarget;
-	int force = 0;
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-	/* Special case for case insemsitive systems (eg. WinCE).
-	 * While look-up is case insensitive, the name isn't.
-	 * Therefore we might want to change x.txt to X.txt
-	*/
-	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-		force = 1;
-	}
-#endif
-
-	obj = yaffs_FindObjectByName(oldDir, oldName);
-	/* Check new name to long. */
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
-	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
-	  /* ENAMETOOLONG */
-	  return YAFFS_FAIL;
-	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
-		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-	  /* ENAMETOOLONG */
-	  return YAFFS_FAIL;
-
-	if (obj && obj->renameAllowed) {
-
-		/* Now do the handling for an existing target, if there is one */
-
-		existingTarget = yaffs_FindObjectByName(newDir, newName);
-		if (existingTarget &&
-		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-			/* There is a target that is a non-empty directory, so we fail */
-			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
-		} else if (existingTarget && existingTarget != obj) {
-			/* Nuke the target first, using shadowing,
-			 * but only if it isn't the same object
-			 */
-			yaffs_ChangeObjectName(obj, newDir, newName, force,
-					       existingTarget->objectId);
-			yaffs_UnlinkObject(existingTarget);
-		}
-
-		return yaffs_ChangeObjectName(obj, newDir, newName, 1, 0);
-	}
-	return YAFFS_FAIL;
-}
-
-/*------------------------- Block Management and Page Allocation ----------------*/
-
-static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-{
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-
-	dev->blockInfo = NULL;
-	dev->chunkBits = NULL;
-
-	dev->allocationBlock = -1;	/* force it to get a new one */
-
-	/* If the first allocation strategy fails, thry the alternate one */
-	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
-	if(!dev->blockInfo){
-		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
-		dev->blockInfoAlt = 1;
-	}
-	else
-		dev->blockInfoAlt = 0;
-
-	if(dev->blockInfo){
-
-		/* Set up dynamic blockinfo stuff. */
-		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
-		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
-		if(!dev->chunkBits){
-			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
-			dev->chunkBitsAlt = 1;
-		}
-		else
-			dev->chunkBitsAlt = 0;
-	}
-
-	if (dev->blockInfo && dev->chunkBits) {
-		memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
-		memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
-		return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-
-}
-
-static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-{
-	if(dev->blockInfoAlt && dev->blockInfo)
-		YFREE_ALT(dev->blockInfo);
-	else if(dev->blockInfo)
-		YFREE(dev->blockInfo);
-
-	dev->blockInfoAlt = 0;
-
-	dev->blockInfo = NULL;
-
-	if(dev->chunkBitsAlt && dev->chunkBits)
-		YFREE_ALT(dev->chunkBits);
-	else if(dev->chunkBits)
-		YFREE(dev->chunkBits);
-	dev->chunkBitsAlt = 0;
-	dev->chunkBits = NULL;
-}
-
-static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
-					    yaffs_BlockInfo * bi)
-{
-	int i;
-	__u32 seq;
-	yaffs_BlockInfo *b;
-
-	if (!dev->isYaffs2)
-		return 1;	/* disqualification only applies to yaffs2. */
-
-	if (!bi->hasShrinkHeader)
-		return 1;	/* can gc */
-
-	/* Find the oldest dirty sequence number if we don't know it and save it
-	 * so we don't have to keep recomputing it.
-	 */
-	if (!dev->oldestDirtySequence) {
-		seq = dev->sequenceNumber;
-
-		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
-		     i++) {
-			b = yaffs_GetBlockInfo(dev, i);
-			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
-			    (b->pagesInUse - b->softDeletions) <
-			    dev->nChunksPerBlock && b->sequenceNumber < seq) {
-				seq = b->sequenceNumber;
-			}
-		}
-		dev->oldestDirtySequence = seq;
-	}
-
-	/* Can't do gc of this block if there are any blocks older than this one that have
-	 * discarded pages.
-	 */
-	return (bi->sequenceNumber <= dev->oldestDirtySequence);
-
-}
-
-/* FindDiretiestBlock is used to select the dirtiest block (or close enough)
- * for garbage collection.
- */
-
-static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
-					       int aggressive)
-{
-
-	int b = dev->currentDirtyChecker;
-
-	int i;
-	int iterations;
-	int dirtiest = -1;
-	int pagesInUse = 0;
-	int prioritised=0;
-	yaffs_BlockInfo *bi;
-	int pendingPrioritisedExist = 0;
-
-	/* First let's see if we need to grab a prioritised block */
-	if(dev->hasPendingPrioritisedGCs){
-		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-
-			bi = yaffs_GetBlockInfo(dev, i);
-			//yaffs_VerifyBlock(dev,bi,i);
-
-			if(bi->gcPrioritise) {
-				pendingPrioritisedExist = 1;
-				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-					pagesInUse = (bi->pagesInUse - bi->softDeletions);
-					dirtiest = i;
-					prioritised = 1;
-					aggressive = 1; /* Fool the non-aggressive skip logiv below */
-				}
-			}
-		}
-
-		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-			dev->hasPendingPrioritisedGCs = 0;
-	}
-
-	/* If we're doing aggressive GC then we are happy to take a less-dirty block, and
-	 * search harder.
-	 * else (we're doing a leasurely gc), then we only bother to do this if the
-	 * block has only a few pages in use.
-	 */
-
-	dev->nonAggressiveSkip--;
-
-	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-		return -1;
-	}
-
-	if(!prioritised)
-		pagesInUse =
-	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-
-	if (aggressive) {
-		iterations =
-		    dev->internalEndBlock - dev->internalStartBlock + 1;
-	} else {
-		iterations =
-		    dev->internalEndBlock - dev->internalStartBlock + 1;
-		iterations = iterations / 16;
-		if (iterations > 200) {
-			iterations = 200;
-		}
-	}
-
-	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
-		b++;
-		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-			b = dev->internalStartBlock;
-		}
-
-		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("**>> Block %d is not valid" TENDSTR), b));
-			YBUG();
-		}
-
-		bi = yaffs_GetBlockInfo(dev, b);
-
-#if 0
-		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-			dirtiest = b;
-			pagesInUse = 0;
-		}
-		else
-#endif
-
-		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-			dirtiest = b;
-			pagesInUse = (bi->pagesInUse - bi->softDeletions);
-		}
-	}
-
-	dev->currentDirtyChecker = b;
-
-	if (dirtiest > 0) {
-		T(YAFFS_TRACE_GC,
-		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
-		   dev->nChunksPerBlock - pagesInUse,prioritised));
-	}
-
-	dev->oldestDirtySequence = 0;
-
-	if (dirtiest > 0) {
-		dev->nonAggressiveSkip = 4;
-	}
-
-	return dirtiest;
-}
-
-static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-{
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
-
-	int erasedOk = 0;
-
-	/* If the block is still healthy erase it and mark as clean.
-	 * If the block has had a data failure, then retire it.
-	 */
-
-	T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
-		(TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR),
-		blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
-
-	bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
-
-	if (!bi->needsRetiring) {
-		yaffs_InvalidateCheckpoint(dev);
-		erasedOk = yaffs_EraseBlockInNAND(dev, blockNo);
-		if (!erasedOk) {
-			dev->nErasureFailures++;
-			T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("**>> Erasure failed %d" TENDSTR), blockNo));
-		}
-	}
-
-	if (erasedOk &&
-	    ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) {
-		int i;
-		for (i = 0; i < dev->nChunksPerBlock; i++) {
-			if (!yaffs_CheckChunkErased
-			    (dev, blockNo * dev->nChunksPerBlock + i)) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   (">>Block %d erasure supposedly OK, but chunk %d not erased"
-				    TENDSTR), blockNo, i));
-			}
-		}
-	}
-
-	if (erasedOk) {
-		/* Clean it up... */
-		bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-		dev->nErasedBlocks++;
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-		bi->hasShrinkHeader = 0;
-		bi->skipErasedCheck = 1;  /* This is clean, so no need to check */
-		bi->gcPrioritise = 0;
-		yaffs_ClearChunkBits(dev, blockNo);
-
-		T(YAFFS_TRACE_ERASE,
-		  (TSTR("Erased block %d" TENDSTR), blockNo));
-	} else {
-		dev->nFreeChunks -= dev->nChunksPerBlock;	/* We lost a block of free space */
-
-		yaffs_RetireBlock(dev, blockNo);
-		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d retired" TENDSTR), blockNo));
-	}
-}
-
-static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-{
-	int i;
-
-	yaffs_BlockInfo *bi;
-
-	if (dev->nErasedBlocks < 1) {
-		/* Hoosterman we've got a problem.
-		 * Can't get space to gc
-		 */
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-
-		return -1;
-	}
-
-	/* Find an empty block. */
-
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		dev->allocationBlockFinder++;
-		if (dev->allocationBlockFinder < dev->internalStartBlock
-		    || dev->allocationBlockFinder > dev->internalEndBlock) {
-			dev->allocationBlockFinder = dev->internalStartBlock;
-		}
-
-		bi = yaffs_GetBlockInfo(dev, dev->allocationBlockFinder);
-
-		if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-			bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;
-			dev->sequenceNumber++;
-			bi->sequenceNumber = dev->sequenceNumber;
-			dev->nErasedBlocks--;
-			T(YAFFS_TRACE_ALLOCATE,
-			  (TSTR("Allocated block %d, seq  %d, %d left" TENDSTR),
-			   dev->allocationBlockFinder, dev->sequenceNumber,
-			   dev->nErasedBlocks));
-			return dev->allocationBlockFinder;
-		}
-	}
-
-	T(YAFFS_TRACE_ALWAYS,
-	  (TSTR
-	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-	    TENDSTR), dev->nErasedBlocks));
-
-	return -1;
-}
-
-
-// Check if there's space to allocate...
-// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-{
-	int reservedChunks;
-	int reservedBlocks = dev->nReservedBlocks;
-	int checkpointBlocks;
-
-	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
-	if(checkpointBlocks < 0)
-		checkpointBlocks = 0;
-
-	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
-
-	return (dev->nFreeChunks > reservedChunks);
-}
-
-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-{
-	int retVal;
-	yaffs_BlockInfo *bi;
-
-	if (dev->allocationBlock < 0) {
-		/* Get next block to allocate off */
-		dev->allocationBlock = yaffs_FindBlockForAllocation(dev);
-		dev->allocationPage = 0;
-	}
-
-	if (!useReserve && !yaffs_CheckSpaceForAllocation(dev)) {
-		/* Not enough space to allocate unless we're allowed to use the reserve. */
-		return -1;
-	}
-
-	if (dev->nErasedBlocks < dev->nReservedBlocks
-	    && dev->allocationPage == 0) {
-		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
-	}
-
-	/* Next page please.... */
-	if (dev->allocationBlock >= 0) {
-		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
-
-		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
-		    dev->allocationPage;
-		bi->pagesInUse++;
-		yaffs_SetChunkBit(dev, dev->allocationBlock,
-				  dev->allocationPage);
-
-		dev->allocationPage++;
-
-		dev->nFreeChunks--;
-
-		/* If the block is full set the state to full */
-		if (dev->allocationPage >= dev->nChunksPerBlock) {
-			bi->blockState = YAFFS_BLOCK_STATE_FULL;
-			dev->allocationBlock = -1;
-		}
-
-		if(blockUsedPtr)
-			*blockUsedPtr = bi;
-
-		return retVal;
-	}
-
-	T(YAFFS_TRACE_ERROR,
-	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-
-	return -1;
-}
-
-static int yaffs_GetErasedChunks(yaffs_Device * dev)
-{
-	int n;
-
-	n = dev->nErasedBlocks * dev->nChunksPerBlock;
-
-	if (dev->allocationBlock > 0) {
-		n += (dev->nChunksPerBlock - dev->allocationPage);
-	}
-
-	return n;
-
-}
-
-static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-{
-	int oldChunk;
-	int newChunk;
-	int chunkInBlock;
-	int markNAND;
-	int retVal = YAFFS_OK;
-	int cleanups = 0;
-	int i;
-	int isCheckpointBlock;
-	int matchingChunk;
-
-	int chunksBefore = yaffs_GetErasedChunks(dev);
-	int chunksAfter;
-
-	yaffs_ExtendedTags tags;
-
-	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, block);
-
-	yaffs_Object *object;
-
-	isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
-
-	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
-
-	T(YAFFS_TRACE_TRACING,
-	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
-	   bi->pagesInUse, bi->hasShrinkHeader));
-
-	/*yaffs_VerifyFreeChunks(dev); */
-
-	bi->hasShrinkHeader = 0;	/* clear the flag so that the block can erase */
-
-	/* Take off the number of soft deleted entries because
-	 * they're going to get really deleted during GC.
-	 */
-	dev->nFreeChunks -= bi->softDeletions;
-
-	dev->isDoingGC = 1;
-
-	if (isCheckpointBlock ||
-	    !yaffs_StillSomeChunkBits(dev, block)) {
-		T(YAFFS_TRACE_TRACING,
-		  (TSTR
-		   ("Collecting block %d that has no chunks in use" TENDSTR),
-		   block));
-		yaffs_BlockBecameDirty(dev, block);
-	} else {
-
-		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-		yaffs_VerifyBlock(dev,bi,block);
-
-		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
-		     chunkInBlock < dev->nChunksPerBlock
-		     && yaffs_StillSomeChunkBits(dev, block);
-		     chunkInBlock++, oldChunk++) {
-			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-
-				/* This page is in use and might need to be copied off */
-
-				markNAND = 1;
-
-				yaffs_InitialiseTags(&tags);
-
-				yaffs_ReadChunkWithTagsFromNAND(dev, oldChunk,
-								buffer, &tags);
-
-				object =
-				    yaffs_FindObjectByNumber(dev,
-							     tags.objectId);
-
-				T(YAFFS_TRACE_GC_DETAIL,
-				  (TSTR
-				   ("Collecting page %d, %d %d %d " TENDSTR),
-				   chunkInBlock, tags.objectId, tags.chunkId,
-				   tags.byteCount));
-
-				if(object && !yaffs_SkipVerification(dev)){
-					if(tags.chunkId == 0)
-						matchingChunk = object->chunkId;
-					else if(object->softDeleted)
-						matchingChunk = oldChunk; /* Defeat the test */
-					else
-						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-
-					if(oldChunk != matchingChunk)
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-
-				}
-
-				if (!object) {
-					T(YAFFS_TRACE_ERROR,
-					  (TSTR
-					   ("page %d in gc has no object: %d %d %d "
-					    TENDSTR), oldChunk,
-					    tags.objectId, tags.chunkId, tags.byteCount));
-				}
-
-				if (object && object->deleted
-				    && tags.chunkId != 0) {
-					/* Data chunk in a deleted file, throw it away
-					 * It's a soft deleted data chunk,
-					 * No need to copy this, just forget about it and
-					 * fix up the object.
-					 */
-
-					object->nDataChunks--;
-
-					if (object->nDataChunks <= 0) {
-						/* remeber to clean up the object */
-						dev->gcCleanupList[cleanups] =
-						    tags.objectId;
-						cleanups++;
-					}
-					markNAND = 0;
-				} else if (0
-					   /* Todo object && object->deleted && object->nDataChunks == 0 */
-					   ) {
-					/* Deleted object header with no data chunks.
-					 * Can be discarded and the file deleted.
-					 */
-					object->chunkId = 0;
-					yaffs_FreeTnode(object->myDev,
-							object->variant.
-							fileVariant.top);
-					object->variant.fileVariant.top = NULL;
-					yaffs_DoGenericObjectDeletion(object);
-
-				} else if (object) {
-					/* It's either a data chunk in a live file or
-					 * an ObjectHeader, so we're interested in it.
-					 * NB Need to keep the ObjectHeaders of deleted files
-					 * until the whole file has been deleted off
-					 */
-					tags.serialNumber++;
-
-					dev->nGCCopies++;
-
-					if (tags.chunkId == 0) {
-						/* It is an object Id,
-						 * We need to nuke the shrinkheader flags first
-						 * We no longer want the shrinkHeader flag since its work is done
-						 * and if it is left in place it will mess up scanning.
-						 * Also, clear out any shadowing stuff
-						 */
-
-						yaffs_ObjectHeader *oh;
-						oh = (yaffs_ObjectHeader *)buffer;
-						oh->isShrink = 0;
-						oh->shadowsObject = -1;
-						tags.extraShadows = 0;
-						tags.extraIsShrinkHeader = 0;
-
-						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-					}
-
-					newChunk =
-					    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &tags, 1);
-
-					if (newChunk < 0) {
-						retVal = YAFFS_FAIL;
-					} else {
-
-						/* Ok, now fix up the Tnodes etc. */
-
-						if (tags.chunkId == 0) {
-							/* It's a header */
-							object->chunkId =  newChunk;
-							object->serial =   tags.serialNumber;
-						} else {
-							/* It's a data chunk */
-							yaffs_PutChunkIntoFile
-							    (object,
-							     tags.chunkId,
-							     newChunk, 0);
-						}
-					}
-				}
-
-				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-
-			}
-		}
-
-		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-
-
-		/* Do any required cleanups */
-		for (i = 0; i < cleanups; i++) {
-			/* Time to delete the file too */
-			object =
-			    yaffs_FindObjectByNumber(dev,
-						     dev->gcCleanupList[i]);
-			if (object) {
-				yaffs_FreeTnode(dev,
-						object->variant.fileVariant.
-						top);
-				object->variant.fileVariant.top = NULL;
-				T(YAFFS_TRACE_GC,
-				  (TSTR
-				   ("yaffs: About to finally delete object %d"
-				    TENDSTR), object->objectId));
-				yaffs_DoGenericObjectDeletion(object);
-				object->myDev->nDeletedFiles--;
-			}
-
-		}
-
-	}
-
-	yaffs_VerifyCollectedBlock(dev,bi,block);
-
-	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-		T(YAFFS_TRACE_GC,
-		  (TSTR
-		   ("gc did not increase free chunks before %d after %d"
-		    TENDSTR), chunksBefore, chunksAfter));
-	}
-
-	dev->isDoingGC = 0;
-
-	return YAFFS_OK;
-}
-
-/* New garbage collector
- * If we're very low on erased blocks then we do aggressive garbage collection
- * otherwise we do "leasurely" garbage collection.
- * Aggressive gc looks further (whole array) and will accept less dirty blocks.
- * Passive gc only inspects smaller areas and will only accept more dirty blocks.
- *
- * The idea is to help clear out space in a more spread-out manner.
- * Dunno if it really does anything useful.
- */
-static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-{
-	int block;
-	int aggressive;
-	int gcOk = YAFFS_OK;
-	int maxTries = 0;
-
-	int checkpointBlockAdjust;
-
-	if (dev->isDoingGC) {
-		/* Bail out so we don't get recursive gc */
-		return YAFFS_OK;
-	}
-
-	/* This loop should pass the first time.
-	 * We'll only see looping here if the erase of the collected block fails.
-	 */
-
-	do {
-		maxTries++;
-
-		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
-		if(checkpointBlockAdjust < 0)
-			checkpointBlockAdjust = 0;
-
-		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-			/* We need a block soon...*/
-			aggressive = 1;
-		} else {
-			/* We're in no hurry */
-			aggressive = 0;
-		}
-
-		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-
-		if (block > 0) {
-			dev->garbageCollections++;
-			if (!aggressive) {
-				dev->passiveGarbageCollections++;
-			}
-
-			T(YAFFS_TRACE_GC,
-			  (TSTR
-			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
-			   dev->nErasedBlocks, aggressive));
-
-			gcOk = yaffs_GarbageCollectBlock(dev, block);
-		}
-
-		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-			T(YAFFS_TRACE_GC,
-			  (TSTR
-			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
-			    TENDSTR), dev->nErasedBlocks, maxTries, block));
-		}
-	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
-		 && (maxTries < 2));
-
-	return aggressive ? gcOk : YAFFS_OK;
-}
-
-/*-------------------------  TAGS --------------------------------*/
-
-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-			   int chunkInObject)
-{
-	return (tags->chunkId == chunkInObject &&
-		tags->objectId == objectId && !tags->chunkDeleted) ? 1 : 0;
-
-}
-
-
-/*-------------------- Data file manipulation -----------------*/
-
-static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
-				 yaffs_ExtendedTags * tags)
-{
-	/*Get the Tnode, then get the level 0 offset chunk offset */
-	yaffs_Tnode *tn;
-	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
-	int retVal = -1;
-
-	yaffs_Device *dev = in->myDev;
-
-	if (!tags) {
-		/* Passed a NULL, so use our own tags space */
-		tags = &localTags;
-	}
-
-	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
-
-	if (tn) {
-		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-
-		retVal =
-		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
-	}
-	return retVal;
-}
-
-static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
-					  yaffs_ExtendedTags * tags)
-{
-	/* Get the Tnode, then get the level 0 offset chunk offset */
-	yaffs_Tnode *tn;
-	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
-
-	yaffs_Device *dev = in->myDev;
-	int retVal = -1;
-
-	if (!tags) {
-		/* Passed a NULL, so use our own tags space */
-		tags = &localTags;
-	}
-
-	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
-
-	if (tn) {
-
-		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-
-		retVal =
-		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
-
-		/* Delete the entry in the filestructure (if found) */
-		if (retVal != -1) {
-			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
-		}
-	} else {
-		/*T(("No level 0 found for %d\n", chunkInInode)); */
-	}
-
-	if (retVal == -1) {
-		/* T(("Could not find %d to delete\n",chunkInInode)); */
-	}
-	return retVal;
-}
-
-#ifdef YAFFS_PARANOID
-
-static int yaffs_CheckFileSanity(yaffs_Object * in)
-{
-	int chunk;
-	int nChunks;
-	int fSize;
-	int failed = 0;
-	int objId;
-	yaffs_Tnode *tn;
-	yaffs_Tags localTags;
-	yaffs_Tags *tags = &localTags;
-	int theChunk;
-	int chunkDeleted;
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
-		/* T(("Object not a file\n")); */
-		return YAFFS_FAIL;
-	}
-
-	objId = in->objectId;
-	fSize = in->variant.fileVariant.fileSize;
-	nChunks =
-	    (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
-
-	for (chunk = 1; chunk <= nChunks; chunk++) {
-		tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant,
-					   chunk);
-
-		if (tn) {
-
-			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-
-			if (yaffs_CheckChunkBits
-			    (dev, theChunk / dev->nChunksPerBlock,
-			     theChunk % dev->nChunksPerBlock)) {
-
-				yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk,
-							    tags,
-							    &chunkDeleted);
-				if (yaffs_TagsMatch
-				    (tags, in->objectId, chunk, chunkDeleted)) {
-					/* found it; */
-
-				}
-			} else {
-
-				failed = 1;
-			}
-
-		} else {
-			/* T(("No level 0 found for %d\n", chunk)); */
-		}
-	}
-
-	return failed ? YAFFS_FAIL : YAFFS_OK;
-}
-
-#endif
-
-static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-				  int chunkInNAND, int inScan)
-{
-	/* NB inScan is zero unless scanning.
-	 * For forward scanning, inScan is > 0;
-	 * for backward scanning inScan is < 0
-	 */
-
-	yaffs_Tnode *tn;
-	yaffs_Device *dev = in->myDev;
-	int existingChunk;
-	yaffs_ExtendedTags existingTags;
-	yaffs_ExtendedTags newTags;
-	unsigned existingSerial, newSerial;
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
-		/* Just ignore an attempt at putting a chunk into a non-file during scanning
-		 * If it is not during Scanning then something went wrong!
-		 */
-		if (!inScan) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR
-			   ("yaffs tragedy:attempt to put data chunk into a non-file"
-			    TENDSTR)));
-			YBUG();
-		}
-
-		yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-		return YAFFS_OK;
-	}
-
-	tn = yaffs_AddOrFindLevel0Tnode(dev,
-					&in->variant.fileVariant,
-					chunkInInode,
-					NULL);
-	if (!tn) {
-		return YAFFS_FAIL;
-	}
-
-	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-
-	if (inScan != 0) {
-		/* If we're scanning then we need to test for duplicates
-		 * NB This does not need to be efficient since it should only ever
-		 * happen when the power fails during a write, then only one
-		 * chunk should ever be affected.
-		 *
-		 * Correction for YAFFS2: This could happen quite a lot and we need to think about efficiency! TODO
-		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
-		 */
-
-		if (existingChunk != 0) {
-			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
-			 *    thus we have to do a FindChunkInFile to get the real chunk id.
-			 *
-			 * We have a duplicate now we need to decide which one to use:
-			 *
-			 * Backwards scanning YAFFS2: The old one is what we use, dump the new one.
-			 * Forward scanning YAFFS2: The new one is what we use, dump the old one.
-			 * YAFFS1: Get both sets of tags and compare serial numbers.
-			 */
-
-			if (inScan > 0) {
-				/* Only do this for forward scanning */
-				yaffs_ReadChunkWithTagsFromNAND(dev,
-								chunkInNAND,
-								NULL, &newTags);
-
-				/* Do a proper find */
-				existingChunk =
-				    yaffs_FindChunkInFile(in, chunkInInode,
-							  &existingTags);
-			}
-
-			if (existingChunk <= 0) {
-				/*Hoosterman - how did this happen? */
-
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("yaffs tragedy: existing chunk < 0 in scan"
-				    TENDSTR)));
-
-			}
-
-			/* NB The deleted flags should be false, otherwise the chunks will
-			 * not be loaded during a scan
-			 */
-
-			newSerial = newTags.serialNumber;
-			existingSerial = existingTags.serialNumber;
-
-			if ((inScan > 0) &&
-			    (in->myDev->isYaffs2 ||
-			     existingChunk <= 0 ||
-			     ((existingSerial + 1) & 3) == newSerial)) {
-				/* Forward scanning.
-				 * Use new
-				 * Delete the old one and drop through to update the tnode
-				 */
-				yaffs_DeleteChunk(dev, existingChunk, 1,
-						  __LINE__);
-			} else {
-				/* Backward scanning or we want to use the existing one
-				 * Use existing.
-				 * Delete the new one and return early so that the tnode isn't changed
-				 */
-				yaffs_DeleteChunk(dev, chunkInNAND, 1,
-						  __LINE__);
-				return YAFFS_OK;
-			}
-		}
-
-	}
-
-	if (existingChunk == 0) {
-		in->nDataChunks++;
-	}
-
-	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-
-	return YAFFS_OK;
-}
-
-static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
-					 __u8 * buffer)
-{
-	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
-
-	if (chunkInNAND >= 0) {
-		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
-						       buffer,NULL);
-	} else {
-		T(YAFFS_TRACE_NANDACCESS,
-		  (TSTR("Chunk %d not found zero instead" TENDSTR),
-		   chunkInNAND));
-		/* get sane (zero) data if you read a hole */
-		memset(buffer, 0, in->myDev->nDataBytesPerChunk);
-		return 0;
-	}
-
-}
-
-void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-{
-	int block;
-	int page;
-	yaffs_ExtendedTags tags;
-	yaffs_BlockInfo *bi;
-
-	if (chunkId <= 0)
-		return;
-
-
-	dev->nDeletions++;
-	block = chunkId / dev->nChunksPerBlock;
-	page = chunkId % dev->nChunksPerBlock;
-
-
-	if(!yaffs_CheckChunkBit(dev,block,page))
-		T(YAFFS_TRACE_VERIFY,
-		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
-		 	 chunkId));
-
-	bi = yaffs_GetBlockInfo(dev, block);
-
-	T(YAFFS_TRACE_DELETION,
-	  (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId));
-
-	if (markNAND &&
-	    bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) {
-
-		yaffs_InitialiseTags(&tags);
-
-		tags.chunkDeleted = 1;
-
-		yaffs_WriteChunkWithTagsToNAND(dev, chunkId, NULL, &tags);
-		yaffs_HandleUpdateChunk(dev, chunkId, &tags);
-	} else {
-		dev->nUnmarkedDeletions++;
-	}
-
-	/* Pull out of the management area.
-	 * If the whole block became dirty, this will kick off an erasure.
-	 */
-	if (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_FULL ||
-	    bi->blockState == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) {
-		dev->nFreeChunks++;
-
-		yaffs_ClearChunkBit(dev, block, page);
-
-		bi->pagesInUse--;
-
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING &&
-		    bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			yaffs_BlockBecameDirty(dev, block);
-		}
-
-	} else {
-		/* T(("Bad news deleting chunk %d\n",chunkId)); */
-	}
-
-}
-
-static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
-					const __u8 * buffer, int nBytes,
-					int useReserve)
-{
-	/* Find old chunk Need to do this to get serial number
-	 * Write new one and patch into tree.
-	 * Invalidate old tags.
-	 */
-
-	int prevChunkId;
-	yaffs_ExtendedTags prevTags;
-
-	int newChunkId;
-	yaffs_ExtendedTags newTags;
-
-	yaffs_Device *dev = in->myDev;
-
-	yaffs_CheckGarbageCollection(dev);
-
-	/* Get the previous chunk at this location in the file if it exists */
-	prevChunkId = yaffs_FindChunkInFile(in, chunkInInode, &prevTags);
-
-	/* Set up new tags */
-	yaffs_InitialiseTags(&newTags);
-
-	newTags.chunkId = chunkInInode;
-	newTags.objectId = in->objectId;
-	newTags.serialNumber =
-	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
-	newTags.byteCount = nBytes;
-
-	newChunkId =
-	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-					      useReserve);
-
-	if (newChunkId >= 0) {
-		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
-
-		if (prevChunkId >= 0) {
-			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
-
-		}
-
-		yaffs_CheckFileSanity(in);
-	}
-	return newChunkId;
-
-}
-
-/* UpdateObjectHeader updates the header on NAND for an object.
- * If name is not NULL, then that new name is used.
- */
-int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-			     int isShrink, int shadows)
-{
-
-	yaffs_BlockInfo *bi;
-
-	yaffs_Device *dev = in->myDev;
-
-	int prevChunkId;
-	int retVal = 0;
-	int result = 0;
-
-	int newChunkId;
-	yaffs_ExtendedTags newTags;
-	yaffs_ExtendedTags oldTags;
-
-	__u8 *buffer = NULL;
-	YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1];
-
-	yaffs_ObjectHeader *oh = NULL;
-
-	yaffs_strcpy(oldName,"silly old name");
-
-	if (!in->fake || force) {
-
-		yaffs_CheckGarbageCollection(dev);
-		yaffs_CheckObjectDetailsLoaded(in);
-
-		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
-		oh = (yaffs_ObjectHeader *) buffer;
-
-		prevChunkId = in->chunkId;
-
-		if (prevChunkId >= 0) {
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
-							buffer, &oldTags);
-
-			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-
-			memcpy(oldName, oh->name, sizeof(oh->name));
-		}
-
-		memset(buffer, 0xFF, dev->nDataBytesPerChunk);
-
-		oh->type = in->variantType;
-		oh->yst_mode = in->yst_mode;
-		oh->shadowsObject = shadows;
-
-#ifdef CONFIG_YAFFS_WINCE
-		oh->win_atime[0] = in->win_atime[0];
-		oh->win_ctime[0] = in->win_ctime[0];
-		oh->win_mtime[0] = in->win_mtime[0];
-		oh->win_atime[1] = in->win_atime[1];
-		oh->win_ctime[1] = in->win_ctime[1];
-		oh->win_mtime[1] = in->win_mtime[1];
-#else
-		oh->yst_uid = in->yst_uid;
-		oh->yst_gid = in->yst_gid;
-		oh->yst_atime = in->yst_atime;
-		oh->yst_mtime = in->yst_mtime;
-		oh->yst_ctime = in->yst_ctime;
-		oh->yst_rdev = in->yst_rdev;
-#endif
-		if (in->parent) {
-			oh->parentObjectId = in->parent->objectId;
-		} else {
-			oh->parentObjectId = 0;
-		}
-
-		if (name && *name) {
-			memset(oh->name, 0, sizeof(oh->name));
-			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
-		} else if (prevChunkId>=0) {
-			memcpy(oh->name, oldName, sizeof(oh->name));
-		} else {
-			memset(oh->name, 0, sizeof(oh->name));
-		}
-
-		oh->isShrink = isShrink;
-
-		switch (in->variantType) {
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-			/* Should not happen */
-			break;
-		case YAFFS_OBJECT_TYPE_FILE:
-			oh->fileSize =
-			    (oh->parentObjectId == YAFFS_OBJECTID_DELETED
-			     || oh->parentObjectId ==
-			     YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.
-			    fileVariant.fileSize;
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-			oh->equivalentObjectId =
-			    in->variant.hardLinkVariant.equivalentObjectId;
-			break;
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			/* Do nothing */
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			/* Do nothing */
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			yaffs_strncpy(oh->alias,
-				      in->variant.symLinkVariant.alias,
-				      YAFFS_MAX_ALIAS_LENGTH);
-			oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
-			break;
-		}
-
-		/* Tags */
-		yaffs_InitialiseTags(&newTags);
-		in->serial++;
-		newTags.chunkId = 0;
-		newTags.objectId = in->objectId;
-		newTags.serialNumber = in->serial;
-
-		/* Add extra info for file header */
-
-		newTags.extraHeaderInfoAvailable = 1;
-		newTags.extraParentObjectId = oh->parentObjectId;
-		newTags.extraFileLength = oh->fileSize;
-		newTags.extraIsShrinkHeader = oh->isShrink;
-		newTags.extraEquivalentObjectId = oh->equivalentObjectId;
-		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
-		newTags.extraObjectType = in->variantType;
-
-		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-
-		/* Create new chunk in NAND */
-		newChunkId =
-		    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
-						      (prevChunkId >= 0) ? 1 : 0);
-
-		if (newChunkId >= 0) {
-
-			in->chunkId = newChunkId;
-
-			if (prevChunkId >= 0) {
-				yaffs_DeleteChunk(dev, prevChunkId, 1,
-						  __LINE__);
-			}
-
-			if(!yaffs_ObjectHasCachedWriteData(in))
-				in->dirty = 0;
-
-			/* If this was a shrink, then mark the block that the chunk lives on */
-			if (isShrink) {
-				bi = yaffs_GetBlockInfo(in->myDev,
-							newChunkId /in->myDev->	nChunksPerBlock);
-				bi->hasShrinkHeader = 1;
-			}
-
-		}
-
-		retVal = newChunkId;
-
-	}
-
-	if (buffer)
-		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-
-	return retVal;
-}
-
-/*------------------------ Short Operations Cache ----------------------------------------
- *   In many situations where there is no high level buffering (eg WinCE) a lot of
- *   reads might be short sequential reads, and a lot of writes may be short
- *   sequential writes. eg. scanning/writing a jpeg file.
- *   In these cases, a short read/write cache can provide a huge perfomance benefit
- *   with dumb-as-a-rock code.
- *   In Linux, the page cache provides read buffering aand the short op cache provides write
- *   buffering.
- *
- *   There are a limited number (~10) of cache chunks per device so that we don't
- *   need a very intelligent search.
- */
-
-static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj)
-{
-	yaffs_Device *dev = obj->myDev;
-	int i;
-	yaffs_ChunkCache *cache;
-	int nCaches = obj->myDev->nShortOpCaches;
-
-	for(i = 0; i < nCaches; i++){
-		cache = &dev->srCache[i];
-		if (cache->object == obj &&
-		    cache->dirty)
-			return 1;
-	}
-
-	return 0;
-}
-
-
-static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-{
-	yaffs_Device *dev = obj->myDev;
-	int lowest = -99;	/* Stop compiler whining. */
-	int i;
-	yaffs_ChunkCache *cache;
-	int chunkWritten = 0;
-	int nCaches = obj->myDev->nShortOpCaches;
-
-	if (nCaches > 0) {
-		do {
-			cache = NULL;
-
-			/* Find the dirty cache for this object with the lowest chunk id. */
-			for (i = 0; i < nCaches; i++) {
-				if (dev->srCache[i].object == obj &&
-				    dev->srCache[i].dirty) {
-					if (!cache
-					    || dev->srCache[i].chunkId <
-					    lowest) {
-						cache = &dev->srCache[i];
-						lowest = cache->chunkId;
-					}
-				}
-			}
-
-			if (cache && !cache->locked) {
-				/* Write it out and free it up */
-
-				chunkWritten =
-				    yaffs_WriteChunkDataToObject(cache->object,
-								 cache->chunkId,
-								 cache->data,
-								 cache->nBytes,
-								 1);
-				cache->dirty = 0;
-				cache->object = NULL;
-			}
-
-		} while (cache && chunkWritten > 0);
-
-		if (cache) {
-			/* Hoosterman, disk full while writing cache out. */
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("yaffs tragedy: no space during cache write" TENDSTR)));
-
-		}
-	}
-
-}
-
-/*yaffs_FlushEntireDeviceCache(dev)
- *
- *
- */
-
-void yaffs_FlushEntireDeviceCache(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	int nCaches = dev->nShortOpCaches;
-	int i;
-
-	/* Find a dirty object in the cache and flush it...
-	 * until there are no further dirty objects.
-	 */
-	do {
-		obj = NULL;
-		for( i = 0; i < nCaches && !obj; i++) {
-			if (dev->srCache[i].object &&
-			    dev->srCache[i].dirty)
-				obj = dev->srCache[i].object;
-
-		}
-		if(obj)
-			yaffs_FlushFilesChunkCache(obj);
-
-	} while(obj);
-
-}
-
-
-/* Grab us a cache chunk for use.
- * First look for an empty one.
- * Then look for the least recently used non-dirty one.
- * Then look for the least recently used dirty one...., flush and look again.
- */
-static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-{
-	int i;
-	int usage;
-	int theOne;
-
-	if (dev->nShortOpCaches > 0) {
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (!dev->srCache[i].object)
-				return &dev->srCache[i];
-		}
-
-		return NULL;
-
-		theOne = -1;
-		usage = 0;	/* just to stop the compiler grizzling */
-
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (!dev->srCache[i].dirty &&
-			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
-			     theOne < 0)) {
-				usage = dev->srCache[i].lastUse;
-				theOne = i;
-			}
-		}
-
-
-		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
-	} else {
-		return NULL;
-	}
-
-}
-
-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-{
-	yaffs_ChunkCache *cache;
-	yaffs_Object *theObj;
-	int usage;
-	int i;
-	int pushout;
-
-	if (dev->nShortOpCaches > 0) {
-		/* Try find a non-dirty one... */
-
-		cache = yaffs_GrabChunkCacheWorker(dev);
-
-		if (!cache) {
-			/* They were all dirty, find the last recently used object and flush
-			 * its cache, then  find again.
-			 * NB what's here is not very accurate, we actually flush the object
-			 * the last recently used page.
-			 */
-
-			/* With locking we can't assume we can use entry zero */
-
-			theObj = NULL;
-			usage = -1;
-			cache = NULL;
-			pushout = -1;
-
-			for (i = 0; i < dev->nShortOpCaches; i++) {
-				if (dev->srCache[i].object &&
-				    !dev->srCache[i].locked &&
-				    (dev->srCache[i].lastUse < usage || !cache))
-				{
-					usage = dev->srCache[i].lastUse;
-					theObj = dev->srCache[i].object;
-					cache = &dev->srCache[i];
-					pushout = i;
-				}
-			}
-
-			if (!cache || cache->dirty) {
-				/* Flush and try again */
-				yaffs_FlushFilesChunkCache(theObj);
-				cache = yaffs_GrabChunkCacheWorker(dev);
-			}
-
-		}
-		return cache;
-	} else
-		return NULL;
-
-}
-
-/* Find a cached chunk */
-static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-					      int chunkId)
-{
-	yaffs_Device *dev = obj->myDev;
-	int i;
-	if (dev->nShortOpCaches > 0) {
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (dev->srCache[i].object == obj &&
-			    dev->srCache[i].chunkId == chunkId) {
-				dev->cacheHits++;
-
-				return &dev->srCache[i];
-			}
-		}
-	}
-	return NULL;
-}
-
-/* Mark the chunk for the least recently used algorithym */
-static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-				int isAWrite)
-{
-
-	if (dev->nShortOpCaches > 0) {
-		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
-			/* Reset the cache usages */
-			int i;
-			for (i = 1; i < dev->nShortOpCaches; i++) {
-				dev->srCache[i].lastUse = 0;
-			}
-			dev->srLastUse = 0;
-		}
-
-		dev->srLastUse++;
-
-		cache->lastUse = dev->srLastUse;
-
-		if (isAWrite) {
-			cache->dirty = 1;
-		}
-	}
-}
-
-/* Invalidate a single cache page.
- * Do this when a whole page gets written,
- * ie the short cache for this page is no longer valid.
- */
-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-{
-	if (object->myDev->nShortOpCaches > 0) {
-		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
-
-		if (cache) {
-			cache->object = NULL;
-		}
-	}
-}
-
-/* Invalidate all the cache pages associated with this object
- * Do this whenever ther file is deleted or resized.
- */
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-{
-	int i;
-	yaffs_Device *dev = in->myDev;
-
-	if (dev->nShortOpCaches > 0) {
-		/* Invalidate it. */
-		for (i = 0; i < dev->nShortOpCaches; i++) {
-			if (dev->srCache[i].object == in) {
-				dev->srCache[i].object = NULL;
-			}
-		}
-	}
-}
-
-/*--------------------- Checkpointing --------------------*/
-
-
-static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-{
-	yaffs_CheckpointValidity cp;
-
-	memset(&cp,0,sizeof(cp));
-
-	cp.structType = sizeof(cp);
-	cp.magic = YAFFS_MAGIC;
-	cp.version = YAFFS_CHECKPOINT_VERSION;
-	cp.head = (head) ? 1 : 0;
-
-	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-		1 : 0;
-}
-
-static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
-{
-	yaffs_CheckpointValidity cp;
-	int ok;
-
-	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-
-	if(ok)
-		ok = (cp.structType == sizeof(cp)) &&
-		     (cp.magic == YAFFS_MAGIC) &&
-		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-		     (cp.head == ((head) ? 1 : 0));
-	return ok ? 1 : 0;
-}
-
-static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp,
-					   yaffs_Device *dev)
-{
-	cp->nErasedBlocks = dev->nErasedBlocks;
-	cp->allocationBlock = dev->allocationBlock;
-	cp->allocationPage = dev->allocationPage;
-	cp->nFreeChunks = dev->nFreeChunks;
-
-	cp->nDeletedFiles = dev->nDeletedFiles;
-	cp->nUnlinkedFiles = dev->nUnlinkedFiles;
-	cp->nBackgroundDeletions = dev->nBackgroundDeletions;
-	cp->sequenceNumber = dev->sequenceNumber;
-	cp->oldestDirtySequence = dev->oldestDirtySequence;
-
-}
-
-static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
-					   yaffs_CheckpointDevice *cp)
-{
-	dev->nErasedBlocks = cp->nErasedBlocks;
-	dev->allocationBlock = cp->allocationBlock;
-	dev->allocationPage = cp->allocationPage;
-	dev->nFreeChunks = cp->nFreeChunks;
-
-	dev->nDeletedFiles = cp->nDeletedFiles;
-	dev->nUnlinkedFiles = cp->nUnlinkedFiles;
-	dev->nBackgroundDeletions = cp->nBackgroundDeletions;
-	dev->sequenceNumber = cp->sequenceNumber;
-	dev->oldestDirtySequence = cp->oldestDirtySequence;
-}
-
-
-static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
-{
-	yaffs_CheckpointDevice cp;
-	__u32 nBytes;
-	__u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-
-	int ok;
-
-	/* Write device runtime values*/
-	yaffs_DeviceToCheckpointDevice(&cp,dev);
-	cp.structType = sizeof(cp);
-
-	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-
-	/* Write block info */
-	if(ok) {
-		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-	}
-
-	/* Write chunk bits */
-	if(ok) {
-		nBytes = nBlocks * dev->chunkBitmapStride;
-		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-	}
-	return	 ok ? 1 : 0;
-
-}
-
-static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
-{
-	yaffs_CheckpointDevice cp;
-	__u32 nBytes;
-	__u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
-
-	int ok;
-
-	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-	if(!ok)
-		return 0;
-
-	if(cp.structType != sizeof(cp))
-		return 0;
-
-
-	yaffs_CheckpointDeviceToDevice(dev,&cp);
-
-	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-
-	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-
-	if(!ok)
-		return 0;
-	nBytes = nBlocks * dev->chunkBitmapStride;
-
-	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-
-	return ok ? 1 : 0;
-}
-
-static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
-					   yaffs_Object *obj)
-{
-
-	cp->objectId = obj->objectId;
-	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
-	cp->chunkId = obj->chunkId;
-	cp->variantType = obj->variantType;
-	cp->deleted = obj->deleted;
-	cp->softDeleted = obj->softDeleted;
-	cp->unlinked = obj->unlinked;
-	cp->fake = obj->fake;
-	cp->renameAllowed = obj->renameAllowed;
-	cp->unlinkAllowed = obj->unlinkAllowed;
-	cp->serial = obj->serial;
-	cp->nDataChunks = obj->nDataChunks;
-
-	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
-	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
-}
-
-static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-{
-
-	yaffs_Object *parent;
-
-	obj->objectId = cp->objectId;
-
-	if(cp->parentId)
-		parent = yaffs_FindOrCreateObjectByNumber(
-					obj->myDev,
-					cp->parentId,
-					YAFFS_OBJECT_TYPE_DIRECTORY);
-	else
-		parent = NULL;
-
-	if(parent)
-		yaffs_AddObjectToDirectory(parent, obj);
-
-	obj->chunkId = cp->chunkId;
-	obj->variantType = cp->variantType;
-	obj->deleted = cp->deleted;
-	obj->softDeleted = cp->softDeleted;
-	obj->unlinked = cp->unlinked;
-	obj->fake = cp->fake;
-	obj->renameAllowed = cp->renameAllowed;
-	obj->unlinkAllowed = cp->unlinkAllowed;
-	obj->serial = cp->serial;
-	obj->nDataChunks = cp->nDataChunks;
-
-	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
-	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
-
-	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-		obj->lazyLoaded = 1;
-}
-
-
-
-static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
-				  	__u32 level, int chunkOffset)
-{
-	int i;
-	yaffs_Device *dev = in->myDev;
-	int ok = 1;
-	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-	if (tn) {
-		if (level > 0) {
-
-			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-				if (tn->internal[i]) {
-					ok = yaffs_CheckpointTnodeWorker(in,
-							tn->internal[i],
-							level - 1,
-							(chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-				}
-			}
-		} else if (level == 0) {
-			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
-			/* printf("write tnode at %d\n",baseOffset); */
-			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
-			if(ok)
-				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-		}
-	}
-
-	return ok;
-
-}
-
-static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
-{
-	__u32 endMarker = ~0;
-	int ok = 1;
-
-	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-		ok = yaffs_CheckpointTnodeWorker(obj,
-					    obj->variant.fileVariant.top,
-					    obj->variant.fileVariant.topLevel,
-					    0);
-		if(ok)
-			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-				sizeof(endMarker));
-	}
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
-{
-	__u32 baseChunk;
-	int ok = 1;
-	yaffs_Device *dev = obj->myDev;
-	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
-	yaffs_Tnode *tn;
-	int nread = 0;
-
-	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-
-	while(ok && (~baseChunk)){
-		nread++;
-		/* Read level 0 tnode */
-
-
-		/* printf("read  tnode at %d\n",baseChunk); */
-		tn = yaffs_GetTnodeRaw(dev);
-		if(tn)
-			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
-			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-		else
-			ok = 0;
-
-		if(tn && ok){
-			ok = yaffs_AddOrFindLevel0Tnode(dev,
-					       		fileStructPtr,
-					       		baseChunk,
-					       		tn) ? 1 : 0;
-
-		}
-
-		if(ok)
-			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-
-	}
-
-	T(YAFFS_TRACE_CHECKPOINT,(
-		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
-		nread,baseChunk,ok));
-
-	return ok ? 1 : 0;
-}
-
-
-static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	yaffs_CheckpointObject cp;
-	int i;
-	int ok = 1;
-	struct list_head *lh;
-
-
-	/* Iterate through the objects in each hash entry,
-	 * dumping them to the checkpointing stream.
-	 */
-
-	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
-	 	list_for_each(lh, &dev->objectBucket[i].list) {
-			if (lh) {
-				obj = list_entry(lh, yaffs_Object, hashLink);
-				if (!obj->deferedFree) {
-					yaffs_ObjectToCheckpointObject(&cp,obj);
-					cp.structType = sizeof(cp);
-
-					T(YAFFS_TRACE_CHECKPOINT,(
-						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
-						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-
-					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-
-					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-						ok = yaffs_WriteCheckpointTnodes(obj);
-					}
-				}
-			}
-		}
-	 }
-
-	 /* Dump end of list */
-	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-	cp.structType = sizeof(cp);
-
-	if(ok)
-		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
-{
-	yaffs_Object *obj;
-	yaffs_CheckpointObject cp;
-	int ok = 1;
-	int done = 0;
-	yaffs_Object *hardList = NULL;
-
-	while(ok && !done) {
-		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-		if(cp.structType != sizeof(cp)) {
-			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
-				cp.structType,sizeof(cp),ok));
-			ok = 0;
-		}
-
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-
-		if(ok && cp.objectId == ~0)
-			done = 1;
-		else if(ok){
-			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
-			if(obj) {
-				yaffs_CheckpointObjectToObject(obj,&cp);
-				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-					ok = yaffs_ReadCheckpointTnodes(obj);
-				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-					obj->hardLinks.next =
-						    (struct list_head *)
-						    hardList;
-					hardList = obj;
-				}
-
-			}
-		}
-	}
-
-	if(ok)
-		yaffs_HardlinkFixup(dev,hardList);
-
-	return ok ? 1 : 0;
-}
-
-static int yaffs_WriteCheckpointSum(yaffs_Device *dev)
-{
-	__u32 checkpointSum;
-	int ok;
-
-	yaffs_GetCheckpointSum(dev,&checkpointSum);
-
-	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-
-	if(!ok)
-		return 0;
-
-	return 1;
-}
-
-static int yaffs_ReadCheckpointSum(yaffs_Device *dev)
-{
-	__u32 checkpointSum0;
-	__u32 checkpointSum1;
-	int ok;
-
-	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-
-	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-
-	if(!ok)
-		return 0;
-
-	if(checkpointSum0 != checkpointSum1)
-		return 0;
-
-	return 1;
-}
-
-
-static int yaffs_WriteCheckpointData(yaffs_Device *dev)
-{
-
-	int ok = 1;
-
-	if(dev->skipCheckpointWrite || !dev->isYaffs2){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-		ok = 0;
-	}
-
-	if(ok)
-		ok = yaffs_CheckpointOpen(dev,1);
-
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
-		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-		ok = yaffs_WriteCheckpointDevice(dev);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-		ok = yaffs_WriteCheckpointObjects(dev);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
-		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-	}
-
-	if(ok){
-		ok = yaffs_WriteCheckpointSum(dev);
-	}
-
-
-	if(!yaffs_CheckpointClose(dev))
-		 ok = 0;
-
-	if(ok)
-	    	dev->isCheckpointed = 1;
-	 else
-	 	dev->isCheckpointed = 0;
-
-	return dev->isCheckpointed;
-}
-
-static int yaffs_ReadCheckpointData(yaffs_Device *dev)
-{
-	int ok = 1;
-
-	if(dev->skipCheckpointRead || !dev->isYaffs2){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-		ok = 0;
-	}
-
-	if(ok)
-		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
-		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-		ok = yaffs_ReadCheckpointDevice(dev);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-		ok = yaffs_ReadCheckpointObjects(dev);
-	}
-	if(ok){
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
-		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-	}
-
-	if(ok){
-		ok = yaffs_ReadCheckpointSum(dev);
-		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-	}
-
-	if(!yaffs_CheckpointClose(dev))
-		ok = 0;
-
-	if(ok)
-	    	dev->isCheckpointed = 1;
-	 else
-	 	dev->isCheckpointed = 0;
-
-	return ok ? 1 : 0;
-
-}
-
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
-{
-	if(dev->isCheckpointed ||
-	   dev->blocksInCheckpoint > 0){
-		dev->isCheckpointed = 0;
-		yaffs_CheckpointInvalidateStream(dev);
-		if(dev->superBlock && dev->markSuperBlockDirty)
-			dev->markSuperBlockDirty(dev->superBlock);
-	}
-}
-
-
-int yaffs_CheckpointSave(yaffs_Device *dev)
-{
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
-	yaffs_VerifyObjects(dev);
-	yaffs_VerifyBlocks(dev);
-	yaffs_VerifyFreeChunks(dev);
-
-	if(!dev->isCheckpointed) {
-		yaffs_InvalidateCheckpoint(dev);
-		yaffs_WriteCheckpointData(dev);
-	}
-
-	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
-	return dev->isCheckpointed;
-}
-
-int yaffs_CheckpointRestore(yaffs_Device *dev)
-{
-	int retval;
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
-	retval = yaffs_ReadCheckpointData(dev);
-
-	if(dev->isCheckpointed){
-		yaffs_VerifyObjects(dev);
-		yaffs_VerifyBlocks(dev);
-		yaffs_VerifyFreeChunks(dev);
-	}
-
-	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
-	return retval;
-}
-
-/*--------------------- File read/write ------------------------
- * Read and write have very similar structures.
- * In general the read/write has three parts to it
- * An incomplete chunk to start with (if the read/write is not chunk-aligned)
- * Some complete chunks
- * An incomplete chunk to end off with
- *
- * Curve-balls: the first chunk might also be the last chunk.
- */
-
-int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
-			   int nBytes)
-{
-
-	int chunk;
-	int start;
-	int nToCopy;
-	int n = nBytes;
-	int nDone = 0;
-	yaffs_ChunkCache *cache;
-
-	yaffs_Device *dev;
-
-	dev = in->myDev;
-
-	while (n > 0) {
-		//chunk = offset / dev->nDataBytesPerChunk + 1;
-		//start = offset % dev->nDataBytesPerChunk;
-		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-		chunk++;
-
-		/* OK now check for the curveball where the start and end are in
-		 * the same chunk.
-		 */
-		if ((start + n) < dev->nDataBytesPerChunk) {
-			nToCopy = n;
-		} else {
-			nToCopy = dev->nDataBytesPerChunk - start;
-		}
-
-		cache = yaffs_FindChunkCache(in, chunk);
-
-		/* If the chunk is already in the cache or it is less than a whole chunk
-		 * then use the cache (if there is caching)
-		 * else bypass the cache.
-		 */
-		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-			if (dev->nShortOpCaches > 0) {
-
-				/* If we can't find the data in the cache, then load it up. */
-
-				if (!cache) {
-					cache = yaffs_GrabChunkCache(in->myDev);
-					cache->object = in;
-					cache->chunkId = chunk;
-					cache->dirty = 0;
-					cache->locked = 0;
-					yaffs_ReadChunkDataFromObject(in, chunk,
-								      cache->
-								      data);
-					cache->nBytes = 0;
-				}
-
-				yaffs_UseChunkCache(dev, cache, 0);
-
-				cache->locked = 1;
-
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_UnlockYAFFS(TRUE);
-#endif
-				memcpy(buffer, &cache->data[start], nToCopy);
-
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_LockYAFFS(TRUE);
-#endif
-				cache->locked = 0;
-			} else {
-				/* Read into the local buffer then copy..*/
-
-				__u8 *localBuffer =
-				    yaffs_GetTempBuffer(dev, __LINE__);
-				yaffs_ReadChunkDataFromObject(in, chunk,
-							      localBuffer);
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_UnlockYAFFS(TRUE);
-#endif
-				memcpy(buffer, &localBuffer[start], nToCopy);
-
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_LockYAFFS(TRUE);
-#endif
-				yaffs_ReleaseTempBuffer(dev, localBuffer,
-							__LINE__);
-			}
-
-		} else {
-#ifdef CONFIG_YAFFS_WINCE
-			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-			/* Under WinCE can't do direct transfer. Need to use a local buffer.
-			 * This is because we otherwise screw up WinCE's memory mapper
-			 */
-			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
-
-#ifdef CONFIG_YAFFS_WINCE
-			yfsd_UnlockYAFFS(TRUE);
-#endif
-			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
-
-#ifdef CONFIG_YAFFS_WINCE
-			yfsd_LockYAFFS(TRUE);
-			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-#endif
-
-#else
-			/* A full chunk. Read directly into the supplied buffer. */
-			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
-#endif
-		}
-
-		n -= nToCopy;
-		offset += nToCopy;
-		buffer += nToCopy;
-		nDone += nToCopy;
-
-	}
-
-	return nDone;
-}
-
-int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
-			  int nBytes, int writeThrough)
-{
-
-	int chunk;
-	int start;
-	int nToCopy;
-	int n = nBytes;
-	int nDone = 0;
-	int nToWriteBack;
-	int startOfWrite = offset;
-	int chunkWritten = 0;
-	int nBytesRead;
-
-	yaffs_Device *dev;
-
-	dev = in->myDev;
-
-	while (n > 0 && chunkWritten >= 0) {
-		//chunk = offset / dev->nDataBytesPerChunk + 1;
-		//start = offset % dev->nDataBytesPerChunk;
-		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-		chunk++;
-
-		/* OK now check for the curveball where the start and end are in
-		 * the same chunk.
-		 */
-
-		if ((start + n) < dev->nDataBytesPerChunk) {
-			nToCopy = n;
-
-			/* Now folks, to calculate how many bytes to write back....
-			 * If we're overwriting and not writing to then end of file then
-			 * we need to write back as much as was there before.
-			 */
-
-			nBytesRead =
-			    in->variant.fileVariant.fileSize -
-			    ((chunk - 1) * dev->nDataBytesPerChunk);
-
-			if (nBytesRead > dev->nDataBytesPerChunk) {
-				nBytesRead = dev->nDataBytesPerChunk;
-			}
-
-			nToWriteBack =
-			    (nBytesRead >
-			     (start + n)) ? nBytesRead : (start + n);
-
-		} else {
-			nToCopy = dev->nDataBytesPerChunk - start;
-			nToWriteBack = dev->nDataBytesPerChunk;
-		}
-
-		if (nToCopy != dev->nDataBytesPerChunk) {
-			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-			if (dev->nShortOpCaches > 0) {
-				yaffs_ChunkCache *cache;
-				/* If we can't find the data in the cache, then load the cache */
-				cache = yaffs_FindChunkCache(in, chunk);
-
-				if (!cache
-				    && yaffs_CheckSpaceForAllocation(in->
-								     myDev)) {
-					cache = yaffs_GrabChunkCache(in->myDev);
-					cache->object = in;
-					cache->chunkId = chunk;
-					cache->dirty = 0;
-					cache->locked = 0;
-					yaffs_ReadChunkDataFromObject(in, chunk,
-								      cache->
-								      data);
-				}
-				else if(cache &&
-				        !cache->dirty &&
-					!yaffs_CheckSpaceForAllocation(in->myDev)){
-					/* Drop the cache if it was a read cache item and
-					 * no space check has been made for it.
-					 */
-					 cache = NULL;
-				}
-
-				if (cache) {
-					yaffs_UseChunkCache(dev, cache, 1);
-					cache->locked = 1;
-#ifdef CONFIG_YAFFS_WINCE
-					yfsd_UnlockYAFFS(TRUE);
-#endif
-
-					memcpy(&cache->data[start], buffer,
-					       nToCopy);
-
-#ifdef CONFIG_YAFFS_WINCE
-					yfsd_LockYAFFS(TRUE);
-#endif
-					cache->locked = 0;
-					cache->nBytes = nToWriteBack;
-
-					if (writeThrough) {
-						chunkWritten =
-						    yaffs_WriteChunkDataToObject
-						    (cache->object,
-						     cache->chunkId,
-						     cache->data, cache->nBytes,
-						     1);
-						cache->dirty = 0;
-					}
-
-				} else {
-					chunkWritten = -1;	/* fail the write */
-				}
-			} else {
-				/* An incomplete start or end chunk (or maybe both start and end chunk)
-				 * Read into the local buffer then copy, then copy over and write back.
-				 */
-
-				__u8 *localBuffer =
-				    yaffs_GetTempBuffer(dev, __LINE__);
-
-				yaffs_ReadChunkDataFromObject(in, chunk,
-							      localBuffer);
-
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_UnlockYAFFS(TRUE);
-#endif
-
-				memcpy(&localBuffer[start], buffer, nToCopy);
-
-#ifdef CONFIG_YAFFS_WINCE
-				yfsd_LockYAFFS(TRUE);
-#endif
-				chunkWritten =
-				    yaffs_WriteChunkDataToObject(in, chunk,
-								 localBuffer,
-								 nToWriteBack,
-								 0);
-
-				yaffs_ReleaseTempBuffer(dev, localBuffer,
-							__LINE__);
-
-			}
-
-		} else {
-
-#ifdef CONFIG_YAFFS_WINCE
-			/* Under WinCE can't do direct transfer. Need to use a local buffer.
-			 * This is because we otherwise screw up WinCE's memory mapper
-			 */
-			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
-#ifdef CONFIG_YAFFS_WINCE
-			yfsd_UnlockYAFFS(TRUE);
-#endif
-			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
-#ifdef CONFIG_YAFFS_WINCE
-			yfsd_LockYAFFS(TRUE);
-#endif
-			chunkWritten =
-			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
-							 dev->nDataBytesPerChunk,
-							 0);
-			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-#else
-			/* A full chunk. Write directly from the supplied buffer. */
-			chunkWritten =
-			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
-							 dev->nDataBytesPerChunk,
-							 0);
-#endif
-			/* Since we've overwritten the cached data, we better invalidate it. */
-			yaffs_InvalidateChunkCache(in, chunk);
-		}
-
-		if (chunkWritten >= 0) {
-			n -= nToCopy;
-			offset += nToCopy;
-			buffer += nToCopy;
-			nDone += nToCopy;
-		}
-
-	}
-
-	/* Update file object */
-
-	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
-	}
-
-	in->dirty = 1;
-
-	return nDone;
-}
-
-
-/* ---------------------- File resizing stuff ------------------ */
-
-static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-{
-
-	yaffs_Device *dev = in->myDev;
-	int oldFileSize = in->variant.fileVariant.fileSize;
-
-	int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
-
-	int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
-	    dev->nDataBytesPerChunk;
-	int i;
-	int chunkId;
-
-	/* Delete backwards so that we don't end up with holes if
-	 * power is lost part-way through the operation.
-	 */
-	for (i = lastDel; i >= startDel; i--) {
-		/* NB this could be optimised somewhat,
-		 * eg. could retrieve the tags and write them without
-		 * using yaffs_DeleteChunk
-		 */
-
-		chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL);
-		if (chunkId > 0) {
-			if (chunkId <
-			    (dev->internalStartBlock * dev->nChunksPerBlock)
-			    || chunkId >=
-			    ((dev->internalEndBlock +
-			      1) * dev->nChunksPerBlock)) {
-				T(YAFFS_TRACE_ALWAYS,
-				  (TSTR("Found daft chunkId %d for %d" TENDSTR),
-				   chunkId, i));
-			} else {
-				in->nDataChunks--;
-				yaffs_DeleteChunk(dev, chunkId, 1, __LINE__);
-			}
-		}
-	}
-
-}
-
-int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-{
-
-	int oldFileSize = in->variant.fileVariant.fileSize;
-	int newSizeOfPartialChunk;
-	int newFullChunks;
-
-	yaffs_Device *dev = in->myDev;
-
-	yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
-
-	yaffs_FlushFilesChunkCache(in);
-	yaffs_InvalidateWholeChunkCache(in);
-
-	yaffs_CheckGarbageCollection(dev);
-
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
-		return yaffs_GetFileSize(in);
-	}
-
-	if (newSize == oldFileSize) {
-		return oldFileSize;
-	}
-
-	if (newSize < oldFileSize) {
-
-		yaffs_PruneResizedChunks(in, newSize);
-
-		if (newSizeOfPartialChunk != 0) {
-			int lastChunk = 1 + newFullChunks;
-
-			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-			/* Got to read and rewrite the last chunk with its new size and zero pad */
-			yaffs_ReadChunkDataFromObject(in, lastChunk,
-						      localBuffer);
-
-			memset(localBuffer + newSizeOfPartialChunk, 0,
-			       dev->nDataBytesPerChunk - newSizeOfPartialChunk);
-
-			yaffs_WriteChunkDataToObject(in, lastChunk, localBuffer,
-						     newSizeOfPartialChunk, 1);
-
-			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-		}
-
-		in->variant.fileVariant.fileSize = newSize;
-
-		yaffs_PruneFileStructure(dev, &in->variant.fileVariant);
-	} else {
-		/* newsSize > oldFileSize */
-		in->variant.fileVariant.fileSize = newSize;
-	}
-
-
-
-	/* Write a new object header.
-	 * show we've shrunk the file, if need be
-	 * Do this only if the file is not in the deleted directories.
-	 */
-	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-		yaffs_UpdateObjectHeader(in, NULL, 0,
-					 (newSize < oldFileSize) ? 1 : 0, 0);
-	}
-
-	return newSize;
-}
-
-loff_t yaffs_GetFileSize(yaffs_Object * obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		return obj->variant.fileVariant.fileSize;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		return yaffs_strlen(obj->variant.symLinkVariant.alias);
-	default:
-		return 0;
-	}
-}
-
-
-
-int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-{
-	int retVal;
-	if (in->dirty) {
-		yaffs_FlushFilesChunkCache(in);
-		if (updateTime) {
-#ifdef CONFIG_YAFFS_WINCE
-			yfsd_WinFileTimeNow(in->win_mtime);
-#else
-
-			in->yst_mtime = Y_CURRENT_TIME;
-
-#endif
-		}
-
-		retVal =
-		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-		     0) ? YAFFS_OK : YAFFS_FAIL;
-	} else {
-		retVal = YAFFS_OK;
-	}
-
-	return retVal;
-
-}
-
-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-{
-
-	/* First off, invalidate the file's data in the cache, without flushing. */
-	yaffs_InvalidateWholeChunkCache(in);
-
-	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
-		/* Move to the unlinked directory so we have a record that it was deleted. */
-		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-
-	}
-
-	yaffs_RemoveObjectFromDirectory(in);
-	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
-	in->chunkId = -1;
-
-	yaffs_FreeObject(in);
-	return YAFFS_OK;
-
-}
-
-/* yaffs_DeleteFile deletes the whole file data
- * and the inode associated with the file.
- * It does not delete the links associated with the file.
- */
-static int yaffs_UnlinkFile(yaffs_Object * in)
-{
-
-	int retVal;
-	int immediateDeletion = 0;
-
-	if (1) {
-#ifdef __KERNEL__
-		if (!in->myInode) {
-			immediateDeletion = 1;
-
-		}
-#else
-		if (in->inUse <= 0) {
-			immediateDeletion = 1;
-
-		}
-#endif
-		if (immediateDeletion) {
-			retVal =
-			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-						   "deleted", 0, 0);
-			T(YAFFS_TRACE_TRACING,
-			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-			   in->objectId));
-			in->deleted = 1;
-			in->myDev->nDeletedFiles++;
-			if (0 && in->myDev->isYaffs2) {
-				yaffs_ResizeFile(in, 0);
-			}
-			yaffs_SoftDeleteFile(in);
-		} else {
-			retVal =
-			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-						   "unlinked", 0, 0);
-		}
-
-	}
-	return retVal;
-}
-
-int yaffs_DeleteFile(yaffs_Object * in)
-{
-	int retVal = YAFFS_OK;
-
-	if (in->nDataChunks > 0) {
-		/* Use soft deletion if there is data in the file */
-		if (!in->unlinked) {
-			retVal = yaffs_UnlinkFile(in);
-		}
-		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
-			in->deleted = 1;
-			in->myDev->nDeletedFiles++;
-			yaffs_SoftDeleteFile(in);
-		}
-		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-	} else {
-		/* The file has no data chunks so we toss it immediately */
-		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-		in->variant.fileVariant.top = NULL;
-		yaffs_DoGenericObjectDeletion(in);
-
-		return YAFFS_OK;
-	}
-}
-
-static int yaffs_DeleteDirectory(yaffs_Object * in)
-{
-	/* First check that the directory is empty. */
-	if (list_empty(&in->variant.directoryVariant.children)) {
-		return yaffs_DoGenericObjectDeletion(in);
-	}
-
-	return YAFFS_FAIL;
-
-}
-
-static int yaffs_DeleteSymLink(yaffs_Object * in)
-{
-	YFREE(in->variant.symLinkVariant.alias);
-
-	return yaffs_DoGenericObjectDeletion(in);
-}
-
-static int yaffs_DeleteHardLink(yaffs_Object * in)
-{
-	/* remove this hardlink from the list assocaited with the equivalent
-	 * object
-	 */
-	list_del(&in->hardLinks);
-	return yaffs_DoGenericObjectDeletion(in);
-}
-
-static void yaffs_DestroyObject(yaffs_Object * obj)
-{
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		yaffs_DeleteFile(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		yaffs_DeleteDirectory(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		yaffs_DeleteSymLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		yaffs_DeleteHardLink(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		yaffs_DoGenericObjectDeletion(obj);
-		break;
-	case YAFFS_OBJECT_TYPE_UNKNOWN:
-		break;		/* should not happen. */
-	}
-}
-
-static int yaffs_UnlinkWorker(yaffs_Object * obj)
-{
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-		return yaffs_DeleteHardLink(obj);
-	} else if (!list_empty(&obj->hardLinks)) {
-		/* Curve ball: We're unlinking an object that has a hardlink.
-		 *
-		 * This problem arises because we are not strictly following
-		 * The Linux link/inode model.
-		 *
-		 * We can't really delete the object.
-		 * Instead, we do the following:
-		 * - Select a hardlink.
-		 * - Unhook it from the hard links
-		 * - Unhook it from its parent directory (so that the rename can work)
-		 * - Rename the object to the hardlink's name.
-		 * - Delete the hardlink
-		 */
-
-		yaffs_Object *hl;
-		int retVal;
-		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-
-		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-
-		list_del_init(&hl->hardLinks);
-		list_del_init(&hl->siblings);
-
-		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
-
-		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
-
-		if (retVal == YAFFS_OK) {
-			retVal = yaffs_DoGenericObjectDeletion(hl);
-		}
-		return retVal;
-
-	} else {
-		switch (obj->variantType) {
-		case YAFFS_OBJECT_TYPE_FILE:
-			return yaffs_UnlinkFile(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			return yaffs_DeleteDirectory(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			return yaffs_DeleteSymLink(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-			return yaffs_DoGenericObjectDeletion(obj);
-			break;
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-		default:
-			return YAFFS_FAIL;
-		}
-	}
-}
-
-
-static int yaffs_UnlinkObject( yaffs_Object *obj)
-{
-
-	if (obj && obj->unlinkAllowed) {
-		return yaffs_UnlinkWorker(obj);
-	}
-
-	return YAFFS_FAIL;
-
-}
-int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-{
-	yaffs_Object *obj;
-
-	obj = yaffs_FindObjectByName(dir, name);
-	return yaffs_UnlinkObject(obj);
-}
-
-/*----------------------- Initialisation Scanning ---------------------- */
-
-static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
-				       int backwardScanning)
-{
-	yaffs_Object *obj;
-
-	if (!backwardScanning) {
-		/* Handle YAFFS1 forward scanning case
-		 * For YAFFS1 we always do the deletion
-		 */
-
-	} else {
-		/* Handle YAFFS2 case (backward scanning)
-		 * If the shadowed object exists then ignore.
-		 */
-		if (yaffs_FindObjectByNumber(dev, objId)) {
-			return;
-		}
-	}
-
-	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-	 * We put it in unlinked dir to be cleaned up after the scanning
-	 */
-	obj =
-	    yaffs_FindOrCreateObjectByNumber(dev, objId,
-					     YAFFS_OBJECT_TYPE_FILE);
-	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
-	obj->variant.fileVariant.shrinkSize = 0;
-	obj->valid = 1;		/* So that we don't read any other info for this file */
-
-}
-
-typedef struct {
-	int seq;
-	int block;
-} yaffs_BlockIndex;
-
-
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
-{
-	yaffs_Object *hl;
-	yaffs_Object *in;
-
-	while (hardList) {
-		hl = hardList;
-		hardList = (yaffs_Object *) (hardList->hardLinks.next);
-
-		in = yaffs_FindObjectByNumber(dev,
-					      hl->variant.hardLinkVariant.
-					      equivalentObjectId);
-
-		if (in) {
-			/* Add the hardlink pointers */
-			hl->variant.hardLinkVariant.equivalentObject = in;
-			list_add(&hl->hardLinks, &in->hardLinks);
-		} else {
-			/* Todo Need to report/handle this better.
-			 * Got a problem... hardlink to a non-existant object
-			 */
-			hl->variant.hardLinkVariant.equivalentObject = NULL;
-			INIT_LIST_HEAD(&hl->hardLinks);
-
-		}
-
-	}
-
-}
-
-
-
-
-
-static int ybicmp(const void *a, const void *b){
-    register int aseq = ((yaffs_BlockIndex *)a)->seq;
-    register int bseq = ((yaffs_BlockIndex *)b)->seq;
-    register int ablock = ((yaffs_BlockIndex *)a)->block;
-    register int bblock = ((yaffs_BlockIndex *)b)->block;
-    if( aseq == bseq )
-        return ablock - bblock;
-    else
-        return aseq - bseq;
-
-}
-
-static int yaffs_Scan(yaffs_Device * dev)
-{
-	yaffs_ExtendedTags tags;
-	int blk;
-	int blockIterator;
-	int startIterator;
-	int endIterator;
-	int nBlocksToScan = 0;
-	int result;
-
-	int chunk;
-	int c;
-	int deleted;
-	yaffs_BlockState state;
-	yaffs_Object *hardList = NULL;
-	yaffs_BlockInfo *bi;
-	int sequenceNumber;
-	yaffs_ObjectHeader *oh;
-	yaffs_Object *in;
-	yaffs_Object *parent;
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-
-	int alloc_failed = 0;
-
-
-	__u8 *chunkData;
-
-	yaffs_BlockIndex *blockIndex = NULL;
-
-	if (dev->isYaffs2) {
-		T(YAFFS_TRACE_SCAN,
-		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
-
-	T(YAFFS_TRACE_SCAN,
-	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-	   dev->internalStartBlock, dev->internalEndBlock));
-
-	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-	if (dev->isYaffs2) {
-		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-		if(!blockIndex)
-			return YAFFS_FAIL;
-	}
-
-	/* Scan all the blocks to determine their state */
-	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
-		yaffs_ClearChunkBits(dev, blk);
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-
-		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-		bi->blockState = state;
-		bi->sequenceNumber = sequenceNumber;
-
-		T(YAFFS_TRACE_SCAN_DEBUG,
-		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-		   state, sequenceNumber));
-
-		if (state == YAFFS_BLOCK_STATE_DEAD) {
-			T(YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("block %d is bad" TENDSTR), blk));
-		} else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-			T(YAFFS_TRACE_SCAN_DEBUG,
-			  (TSTR("Block empty " TENDSTR)));
-			dev->nErasedBlocks++;
-			dev->nFreeChunks += dev->nChunksPerBlock;
-		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-
-			/* Determine the highest sequence number */
-			if (dev->isYaffs2 &&
-			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-
-				blockIndex[nBlocksToScan].seq = sequenceNumber;
-				blockIndex[nBlocksToScan].block = blk;
-
-				nBlocksToScan++;
-
-				if (sequenceNumber >= dev->sequenceNumber) {
-					dev->sequenceNumber = sequenceNumber;
-				}
-			} else if (dev->isYaffs2) {
-				/* TODO: Nasty sequence number! */
-				T(YAFFS_TRACE_SCAN,
-				  (TSTR
-				   ("Block scanning block %d has bad sequence number %d"
-				    TENDSTR), blk, sequenceNumber));
-
-			}
-		}
-	}
-
-	/* Sort the blocks
-	 * Dungy old bubble sort for now...
-	 */
-	if (dev->isYaffs2) {
-		yaffs_BlockIndex temp;
-		int i;
-		int j;
-
-		for (i = 0; i < nBlocksToScan; i++)
-			for (j = i + 1; j < nBlocksToScan; j++)
-				if (blockIndex[i].seq > blockIndex[j].seq) {
-					temp = blockIndex[j];
-					blockIndex[j] = blockIndex[i];
-					blockIndex[i] = temp;
-				}
-	}
-
-	/* Now scan the blocks looking at the data. */
-	if (dev->isYaffs2) {
-		startIterator = 0;
-		endIterator = nBlocksToScan - 1;
-		T(YAFFS_TRACE_SCAN_DEBUG,
-		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-	} else {
-		startIterator = dev->internalStartBlock;
-		endIterator = dev->internalEndBlock;
-	}
-
-	/* For each block.... */
-	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
-	     blockIterator++) {
-
-		if (dev->isYaffs2) {
-			/* get the block to scan in the correct order */
-			blk = blockIndex[blockIterator].block;
-		} else {
-			blk = blockIterator;
-		}
-
-		bi = yaffs_GetBlockInfo(dev, blk);
-		state = bi->blockState;
-
-		deleted = 0;
-
-		/* For each chunk in each block that needs scanning....*/
-		for (c = 0; !alloc_failed && c < dev->nChunksPerBlock &&
-		     state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
-			/* Read the tags and decide what to do */
-			chunk = blk * dev->nChunksPerBlock + c;
-
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-							&tags);
-
-			/* Let's have a good look at this chunk... */
-
-			if (!dev->isYaffs2 && tags.chunkDeleted) {
-				/* YAFFS1 only...
-				 * A deleted chunk
-				 */
-				deleted++;
-				dev->nFreeChunks++;
-				/*T((" %d %d deleted\n",blk,c)); */
-			} else if (!tags.chunkUsed) {
-				/* An unassigned chunk in the block
-				 * This means that either the block is empty or
-				 * this is the one being allocated from
-				 */
-
-				if (c == 0) {
-					/* We're looking at the first chunk in the block so the block is unused */
-					state = YAFFS_BLOCK_STATE_EMPTY;
-					dev->nErasedBlocks++;
-				} else {
-					/* this is the block being allocated from */
-					T(YAFFS_TRACE_SCAN,
-					  (TSTR
-					   (" Allocating from %d %d" TENDSTR),
-					   blk, c));
-					state = YAFFS_BLOCK_STATE_ALLOCATING;
-					dev->allocationBlock = blk;
-					dev->allocationPage = c;
-					dev->allocationBlockFinder = blk;
-					/* Set it to here to encourage the allocator to go forth from here. */
-
-					/* Yaffs2 sanity check:
-					 * This should be the one with the highest sequence number
-					 */
-					if (dev->isYaffs2
-					    && (dev->sequenceNumber !=
-						bi->sequenceNumber)) {
-						T(YAFFS_TRACE_ALWAYS,
-						  (TSTR
-						   ("yaffs: Allocation block %d was not highest sequence id:"
-						    " block seq = %d, dev seq = %d"
-						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
-					}
-				}
-
-				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-			} else if (tags.chunkId > 0) {
-				/* chunkId > 0 so it is a data chunk... */
-				unsigned int endpos;
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      YAFFS_OBJECT_TYPE_FILE);
-				/* PutChunkIntoFile checks for a clash (two data chunks with
-				 * the same chunkId).
-				 */
-
-				if(!in)
-					alloc_failed = 1;
-
-				if(in){
-					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-						alloc_failed = 1;
-				}
-
-				endpos =
-				    (tags.chunkId - 1) * dev->nDataBytesPerChunk +
-				    tags.byteCount;
-				if (in &&
-				    in->variantType == YAFFS_OBJECT_TYPE_FILE
-				    && in->variant.fileVariant.scannedFileSize <
-				    endpos) {
-					in->variant.fileVariant.
-					    scannedFileSize = endpos;
-					if (!dev->useHeaderFileSize) {
-						in->variant.fileVariant.
-						    fileSize =
-						    in->variant.fileVariant.
-						    scannedFileSize;
-					}
-
-				}
-				/* T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId));   */
-			} else {
-				/* chunkId == 0, so it is an ObjectHeader.
-				 * Thus, we read in the object header and make the object
-				 */
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk,
-								chunkData,
-								NULL);
-
-				oh = (yaffs_ObjectHeader *) chunkData;
-
-				in = yaffs_FindObjectByNumber(dev,
-							      tags.objectId);
-				if (in && in->variantType != oh->type) {
-					/* This should not happen, but somehow
-					 * Wev'e ended up with an objectId that has been reused but not yet
-					 * deleted, and worse still it has changed type. Delete the old object.
-					 */
-
-					yaffs_DestroyObject(in);
-
-					in = 0;
-				}
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      oh->type);
-
-				if(!in)
-					alloc_failed = 1;
-
-				if (in && oh->shadowsObject > 0) {
-					yaffs_HandleShadowedObject(dev,
-								   oh->
-								   shadowsObject,
-								   0);
-				}
-
-				if (in && in->valid) {
-					/* We have already filled this one. We have a duplicate and need to resolve it. */
-
-					unsigned existingSerial = in->serial;
-					unsigned newSerial = tags.serialNumber;
-
-					if (dev->isYaffs2 ||
-					    ((existingSerial + 1) & 3) ==
-					    newSerial) {
-						/* Use new one - destroy the exisiting one */
-						yaffs_DeleteChunk(dev,
-								  in->chunkId,
-								  1, __LINE__);
-						in->valid = 0;
-					} else {
-						/* Use existing - destroy this one. */
-						yaffs_DeleteChunk(dev, chunk, 1,
-								  __LINE__);
-					}
-				}
-
-				if (in && !in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) {
-					/* We only load some info, don't fiddle with directory structure */
-					in->valid = 1;
-					in->variantType = oh->type;
-
-					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
-					in->chunkId = chunk;
-
-				} else if (in && !in->valid) {
-					/* we need to load this info */
-
-					in->valid = 1;
-					in->variantType = oh->type;
-
-					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
-					in->chunkId = chunk;
-
-					yaffs_SetObjectName(in, oh->name);
-					in->dirty = 0;
-
-					/* directory stuff...
-					 * hook up to parent
-					 */
-
-					parent =
-					    yaffs_FindOrCreateObjectByNumber
-					    (dev, oh->parentObjectId,
-					     YAFFS_OBJECT_TYPE_DIRECTORY);
-					if (parent->variantType ==
-					    YAFFS_OBJECT_TYPE_UNKNOWN) {
-						/* Set up as a directory */
-						parent->variantType =
-						    YAFFS_OBJECT_TYPE_DIRECTORY;
-						INIT_LIST_HEAD(&parent->variant.
-							       directoryVariant.
-							       children);
-					} else if (parent->variantType !=
-						   YAFFS_OBJECT_TYPE_DIRECTORY)
-					{
-						/* Hoosterman, another problem....
-						 * We're trying to use a non-directory as a directory
-						 */
-
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR
-						   ("yaffs tragedy: attempting to use non-directory as"
-						    " a directory in scan. Put in lost+found."
-						    TENDSTR)));
-						parent = dev->lostNFoundDir;
-					}
-
-					yaffs_AddObjectToDirectory(parent, in);
-
-					if (0 && (parent == dev->deletedDir ||
-						  parent == dev->unlinkedDir)) {
-						in->deleted = 1;	/* If it is unlinked at start up then it wants deleting */
-						dev->nDeletedFiles++;
-					}
-					/* Note re hardlinks.
-					 * Since we might scan a hardlink before its equivalent object is scanned
-					 * we put them all in a list.
-					 * After scanning is complete, we should have all the objects, so we run through this
-					 * list and fix up all the chains.
-					 */
-
-					switch (in->variantType) {
-					case YAFFS_OBJECT_TYPE_UNKNOWN:
-						/* Todo got a problem */
-						break;
-					case YAFFS_OBJECT_TYPE_FILE:
-						if (dev->isYaffs2
-						    && oh->isShrink) {
-							/* Prune back the shrunken chunks */
-							yaffs_PruneResizedChunks
-							    (in, oh->fileSize);
-							/* Mark the block as having a shrinkHeader */
-							bi->hasShrinkHeader = 1;
-						}
-
-						if (dev->useHeaderFileSize)
-
-							in->variant.fileVariant.
-							    fileSize =
-							    oh->fileSize;
-
-						break;
-					case YAFFS_OBJECT_TYPE_HARDLINK:
-						in->variant.hardLinkVariant.
-						    equivalentObjectId =
-						    oh->equivalentObjectId;
-						in->hardLinks.next =
-						    (struct list_head *)
-						    hardList;
-						hardList = in;
-						break;
-					case YAFFS_OBJECT_TYPE_DIRECTORY:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SPECIAL:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SYMLINK:
-						in->variant.symLinkVariant.alias =
-						    yaffs_CloneString(oh->alias);
-						if(!in->variant.symLinkVariant.alias)
-							alloc_failed = 1;
-						break;
-					}
-
-					if (parent == dev->deletedDir) {
-						yaffs_DestroyObject(in);
-						bi->hasShrinkHeader = 1;
-					}
-				}
-			}
-		}
-
-		if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			/* If we got this far while scanning, then the block is fully allocated.*/
-			state = YAFFS_BLOCK_STATE_FULL;
-		}
-
-		bi->blockState = state;
-
-		/* Now let's see if it was dirty */
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-			yaffs_BlockBecameDirty(dev, blk);
-		}
-
-	}
-
-	if (blockIndex) {
-		YFREE(blockIndex);
-	}
-
-
-	/* Ok, we've done all the scanning.
-	 * Fix up the hard link chains.
-	 * We should now have scanned all the objects, now it's time to add these
-	 * hardlinks.
-	 */
-
-	yaffs_HardlinkFixup(dev,hardList);
-
-	/* Handle the unlinked files. Since they were left in an unlinked state we should
-	 * just delete them.
-	 */
-	{
-		struct list_head *i;
-		struct list_head *n;
-
-		yaffs_Object *l;
-		/* Soft delete all the unlinked files */
-		list_for_each_safe(i, n,
-				   &dev->unlinkedDir->variant.directoryVariant.
-				   children) {
-			if (i) {
-				l = list_entry(i, yaffs_Object, siblings);
-				yaffs_DestroyObject(l);
-			}
-		}
-	}
-
-	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
-	if(alloc_failed){
-		return YAFFS_FAIL;
-	}
-
-	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-
-
-	return YAFFS_OK;
-}
-
-static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
-{
-	__u8 *chunkData;
-	yaffs_ObjectHeader *oh;
-	yaffs_Device *dev = in->myDev;
-	yaffs_ExtendedTags tags;
-	int result;
-	int alloc_failed = 0;
-
-	if(!in)
-		return;
-
-#if 0
-	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-		in->objectId,
-		in->lazyLoaded ? "not yet" : "already"));
-#endif
-
-	if(in->lazyLoaded){
-		in->lazyLoaded = 0;
-		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-		oh = (yaffs_ObjectHeader *) chunkData;
-
-		in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-		in->win_atime[0] = oh->win_atime[0];
-		in->win_ctime[0] = oh->win_ctime[0];
-		in->win_mtime[0] = oh->win_mtime[0];
-		in->win_atime[1] = oh->win_atime[1];
-		in->win_ctime[1] = oh->win_ctime[1];
-		in->win_mtime[1] = oh->win_mtime[1];
-#else
-		in->yst_uid = oh->yst_uid;
-		in->yst_gid = oh->yst_gid;
-		in->yst_atime = oh->yst_atime;
-		in->yst_mtime = oh->yst_mtime;
-		in->yst_ctime = oh->yst_ctime;
-		in->yst_rdev = oh->yst_rdev;
-
-#endif
-		yaffs_SetObjectName(in, oh->name);
-
-		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
-			 in->variant.symLinkVariant.alias =
-						    yaffs_CloneString(oh->alias);
-			if(!in->variant.symLinkVariant.alias)
-				alloc_failed = 1; /* Not returned to caller */
-		}
-
-		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-	}
-}
-
-static int yaffs_ScanBackwards(yaffs_Device * dev)
-{
-	yaffs_ExtendedTags tags;
-	int blk;
-	int blockIterator;
-	int startIterator;
-	int endIterator;
-	int nBlocksToScan = 0;
-
-	int chunk;
-	int result;
-	int c;
-	int deleted;
-	yaffs_BlockState state;
-	yaffs_Object *hardList = NULL;
-	yaffs_BlockInfo *bi;
-	int sequenceNumber;
-	yaffs_ObjectHeader *oh;
-	yaffs_Object *in;
-	yaffs_Object *parent;
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-	int itsUnlinked;
-	__u8 *chunkData;
-
-	int fileSize;
-	int isShrink;
-	int foundChunksInBlock;
-	int equivalentObjectId;
-	int alloc_failed = 0;
-
-
-	yaffs_BlockIndex *blockIndex = NULL;
-	int altBlockIndex = 0;
-
-	if (!dev->isYaffs2) {
-		T(YAFFS_TRACE_SCAN,
-		  (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	T(YAFFS_TRACE_SCAN,
-	  (TSTR
-	   ("yaffs_ScanBackwards starts  intstartblk %d intendblk %d..."
-	    TENDSTR), dev->internalStartBlock, dev->internalEndBlock));
-
-
-	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-
-	if(!blockIndex) {
-		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
-		altBlockIndex = 1;
-	}
-
-	if(!blockIndex) {
-		T(YAFFS_TRACE_SCAN,
-		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	dev->blocksInCheckpoint = 0;
-
-	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-	/* Scan all the blocks to determine their state */
-	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
-		yaffs_ClearChunkBits(dev, blk);
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-
-		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-		bi->blockState = state;
-		bi->sequenceNumber = sequenceNumber;
-
-		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-
-		T(YAFFS_TRACE_SCAN_DEBUG,
-		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-		   state, sequenceNumber));
-
-
-		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-			dev->blocksInCheckpoint++;
-
-		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-			T(YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("block %d is bad" TENDSTR), blk));
-		} else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-			T(YAFFS_TRACE_SCAN_DEBUG,
-			  (TSTR("Block empty " TENDSTR)));
-			dev->nErasedBlocks++;
-			dev->nFreeChunks += dev->nChunksPerBlock;
-		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-
-			/* Determine the highest sequence number */
-			if (dev->isYaffs2 &&
-			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-
-				blockIndex[nBlocksToScan].seq = sequenceNumber;
-				blockIndex[nBlocksToScan].block = blk;
-
-				nBlocksToScan++;
-
-				if (sequenceNumber >= dev->sequenceNumber) {
-					dev->sequenceNumber = sequenceNumber;
-				}
-			} else if (dev->isYaffs2) {
-				/* TODO: Nasty sequence number! */
-				T(YAFFS_TRACE_SCAN,
-				  (TSTR
-				   ("Block scanning block %d has bad sequence number %d"
-				    TENDSTR), blk, sequenceNumber));
-
-			}
-		}
-	}
-
-	T(YAFFS_TRACE_SCAN,
-	(TSTR("%d blocks to be sorted..." TENDSTR), nBlocksToScan));
-
-
-
-	YYIELD();
-
-	/* Sort the blocks */
-#ifndef CONFIG_YAFFS_USE_OWN_SORT
-	yaffs_qsort(blockIndex, nBlocksToScan,
-		sizeof(yaffs_BlockIndex), ybicmp);
-#else
-	{
-	 	/* Dungy old bubble sort... */
-
-		yaffs_BlockIndex temp;
-		int i;
-		int j;
-
-		for (i = 0; i < nBlocksToScan; i++)
-			for (j = i + 1; j < nBlocksToScan; j++)
-				if (blockIndex[i].seq > blockIndex[j].seq) {
-					temp = blockIndex[j];
-					blockIndex[j] = blockIndex[i];
-					blockIndex[i] = temp;
-				}
-	}
-#endif
-
-	YYIELD();
-
-    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-
-	/* Now scan the blocks looking at the data. */
-	startIterator = 0;
-	endIterator = nBlocksToScan - 1;
-	T(YAFFS_TRACE_SCAN_DEBUG,
-	  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-
-	/* For each block.... backwards */
-	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
-	     blockIterator--) {
-	        /* Cooperative multitasking! This loop can run for so
-		   long that watchdog timers expire. */
-	        YYIELD();
-
-		/* get the block to scan in the correct order */
-		blk = blockIndex[blockIterator].block;
-
-		bi = yaffs_GetBlockInfo(dev, blk);
-
-
-		state = bi->blockState;
-
-		deleted = 0;
-
-		/* For each chunk in each block that needs scanning.... */
-		foundChunksInBlock = 0;
-		for (c = dev->nChunksPerBlock - 1;
-		     !alloc_failed && c >= 0 &&
-		     (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-		      state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
-			/* Scan backwards...
-			 * Read the tags and decide what to do
-			 */
-
-			chunk = blk * dev->nChunksPerBlock + c;
-
-			result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-							&tags);
-
-			/* Let's have a good look at this chunk... */
-
-			if (!tags.chunkUsed) {
-				/* An unassigned chunk in the block.
-				 * If there are used chunks after this one, then
-				 * it is a chunk that was skipped due to failing the erased
-				 * check. Just skip it so that it can be deleted.
-				 * But, more typically, We get here when this is an unallocated
-				 * chunk and his means that either the block is empty or
-				 * this is the one being allocated from
-				 */
-
-				if(foundChunksInBlock)
-				{
-					/* This is a chunk that was skipped due to failing the erased check */
-
-				} else if (c == 0) {
-					/* We're looking at the first chunk in the block so the block is unused */
-					state = YAFFS_BLOCK_STATE_EMPTY;
-					dev->nErasedBlocks++;
-				} else {
-					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
-					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-							/* this is the block being allocated from */
-
-							T(YAFFS_TRACE_SCAN,
-							  (TSTR
-							   (" Allocating from %d %d"
-							    TENDSTR), blk, c));
-
-							state = YAFFS_BLOCK_STATE_ALLOCATING;
-							dev->allocationBlock = blk;
-							dev->allocationPage = c;
-							dev->allocationBlockFinder = blk;
-						}
-						else {
-							/* This is a partially written block that is not
-							 * the current allocation block. This block must have
-							 * had a write failure, so set up for retirement.
-							 */
-
-							 bi->needsRetiring = 1;
-							 bi->gcPrioritise = 1;
-
-							 T(YAFFS_TRACE_ALWAYS,
-							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-							 blk));
-						}
-
-					}
-
-				}
-
-				dev->nFreeChunks++;
-
-			} else if (tags.chunkId > 0) {
-				/* chunkId > 0 so it is a data chunk... */
-				unsigned int endpos;
-				__u32 chunkBase =
-				    (tags.chunkId - 1) * dev->nDataBytesPerChunk;
-
-				foundChunksInBlock = 1;
-
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				in = yaffs_FindOrCreateObjectByNumber(dev,
-								      tags.
-								      objectId,
-								      YAFFS_OBJECT_TYPE_FILE);
-				if(!in){
-					/* Out of memory */
-					alloc_failed = 1;
-				}
-
-				if (in &&
-				    in->variantType == YAFFS_OBJECT_TYPE_FILE
-				    && chunkBase <
-				    in->variant.fileVariant.shrinkSize) {
-					/* This has not been invalidated by a resize */
-					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
-							       chunk, -1)){
-						alloc_failed = 1;
-					}
-
-					/* File size is calculated by looking at the data chunks if we have not
-					 * seen an object header yet. Stop this practice once we find an object header.
-					 */
-					endpos =
-					    (tags.chunkId -
-					     1) * dev->nDataBytesPerChunk +
-					    tags.byteCount;
-
-					if (!in->valid &&	/* have not got an object header yet */
-					    in->variant.fileVariant.
-					    scannedFileSize < endpos) {
-						in->variant.fileVariant.
-						    scannedFileSize = endpos;
-						in->variant.fileVariant.
-						    fileSize =
-						    in->variant.fileVariant.
-						    scannedFileSize;
-					}
-
-				} else if(in) {
-					/* This chunk has been invalidated by a resize, so delete */
-					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-
-				}
-			} else {
-				/* chunkId == 0, so it is an ObjectHeader.
-				 * Thus, we read in the object header and make the object
-				 */
-				foundChunksInBlock = 1;
-
-				yaffs_SetChunkBit(dev, blk, c);
-				bi->pagesInUse++;
-
-				oh = NULL;
-				in = NULL;
-
-				if (tags.extraHeaderInfoAvailable) {
-					in = yaffs_FindOrCreateObjectByNumber
-					    (dev, tags.objectId,
-					     tags.extraObjectType);
-				}
-
-				if (!in ||
-#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
-				    !in->valid ||
-#endif
-				    tags.extraShadows ||
-				    (!in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
-				    ) {
-
-					/* If we don't have  valid info then we need to read the chunk
-					 * TODO In future we can probably defer reading the chunk and
-					 * living with invalid data until needed.
-					 */
-
-					result = yaffs_ReadChunkWithTagsFromNAND(dev,
-									chunk,
-									chunkData,
-									NULL);
-
-					oh = (yaffs_ObjectHeader *) chunkData;
-
-					if (!in)
-						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-
-				}
-
-				if (!in) {
-					/* TODO Hoosterman we have a problem! */
-					T(YAFFS_TRACE_ERROR,
-					  (TSTR
-					   ("yaffs tragedy: Could not make object for object  %d  "
-					    "at chunk %d during scan"
-					    TENDSTR), tags.objectId, chunk));
-
-				}
-
-				if (in->valid) {
-					/* We have already filled this one.
-					 * We have a duplicate that will be discarded, but
-					 * we first have to suck out resize info if it is a file.
-					 */
-
-					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
-					     ((oh &&
-					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-					      (tags.extraHeaderInfoAvailable  &&
-					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
-					    ) {
-						__u32 thisSize =
-						    (oh) ? oh->fileSize : tags.
-						    extraFileLength;
-						__u32 parentObjectId =
-						    (oh) ? oh->
-						    parentObjectId : tags.
-						    extraParentObjectId;
-						unsigned isShrink =
-						    (oh) ? oh->isShrink : tags.
-						    extraIsShrinkHeader;
-
-						/* If it is deleted (unlinked at start also means deleted)
-						 * we treat the file size as being zeroed at this point.
-						 */
-						if (parentObjectId ==
-						    YAFFS_OBJECTID_DELETED
-						    || parentObjectId ==
-						    YAFFS_OBJECTID_UNLINKED) {
-							thisSize = 0;
-							isShrink = 1;
-						}
-
-						if (isShrink &&
-						    in->variant.fileVariant.
-						    shrinkSize > thisSize) {
-							in->variant.fileVariant.
-							    shrinkSize =
-							    thisSize;
-						}
-
-						if (isShrink) {
-							bi->hasShrinkHeader = 1;
-						}
-
-					}
-					/* Use existing - destroy this one. */
-					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
-
-				}
-
-				if (!in->valid &&
-				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-				     tags.objectId ==
-				     YAFFS_OBJECTID_LOSTNFOUND)) {
-					/* We only load some info, don't fiddle with directory structure */
-					in->valid = 1;
-
-					if(oh) {
-						in->variantType = oh->type;
-
-						in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-						in->win_atime[0] = oh->win_atime[0];
-						in->win_ctime[0] = oh->win_ctime[0];
-						in->win_mtime[0] = oh->win_mtime[0];
-						in->win_atime[1] = oh->win_atime[1];
-						in->win_ctime[1] = oh->win_ctime[1];
-						in->win_mtime[1] = oh->win_mtime[1];
-#else
-						in->yst_uid = oh->yst_uid;
-						in->yst_gid = oh->yst_gid;
-						in->yst_atime = oh->yst_atime;
-						in->yst_mtime = oh->yst_mtime;
-						in->yst_ctime = oh->yst_ctime;
-						in->yst_rdev = oh->yst_rdev;
-
-#endif
-					} else {
-						in->variantType = tags.extraObjectType;
-						in->lazyLoaded = 1;
-					}
-
-					in->chunkId = chunk;
-
-				} else if (!in->valid) {
-					/* we need to load this info */
-
-					in->valid = 1;
-					in->chunkId = chunk;
-
-					if(oh) {
-						in->variantType = oh->type;
-
-						in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-						in->win_atime[0] = oh->win_atime[0];
-						in->win_ctime[0] = oh->win_ctime[0];
-						in->win_mtime[0] = oh->win_mtime[0];
-						in->win_atime[1] = oh->win_atime[1];
-						in->win_ctime[1] = oh->win_ctime[1];
-						in->win_mtime[1] = oh->win_mtime[1];
-#else
-						in->yst_uid = oh->yst_uid;
-						in->yst_gid = oh->yst_gid;
-						in->yst_atime = oh->yst_atime;
-						in->yst_mtime = oh->yst_mtime;
-						in->yst_ctime = oh->yst_ctime;
-						in->yst_rdev = oh->yst_rdev;
-#endif
-
-						if (oh->shadowsObject > 0)
-							yaffs_HandleShadowedObject(dev,
-									   oh->
-									   shadowsObject,
-									   1);
-
-
-						yaffs_SetObjectName(in, oh->name);
-						parent =
-						    yaffs_FindOrCreateObjectByNumber
-					    		(dev, oh->parentObjectId,
-					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-
-						 fileSize = oh->fileSize;
- 						 isShrink = oh->isShrink;
-						 equivalentObjectId = oh->equivalentObjectId;
-
-					}
-					else {
-						in->variantType = tags.extraObjectType;
-						parent =
-						    yaffs_FindOrCreateObjectByNumber
-					    		(dev, tags.extraParentObjectId,
-					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-						 fileSize = tags.extraFileLength;
-						 isShrink = tags.extraIsShrinkHeader;
-						 equivalentObjectId = tags.extraEquivalentObjectId;
-						in->lazyLoaded = 1;
-
-					}
-					in->dirty = 0;
-
-					/* directory stuff...
-					 * hook up to parent
-					 */
-
-					if (parent->variantType ==
-					    YAFFS_OBJECT_TYPE_UNKNOWN) {
-						/* Set up as a directory */
-						parent->variantType =
-						    YAFFS_OBJECT_TYPE_DIRECTORY;
-						INIT_LIST_HEAD(&parent->variant.
-							       directoryVariant.
-							       children);
-					} else if (parent->variantType !=
-						   YAFFS_OBJECT_TYPE_DIRECTORY)
-					{
-						/* Hoosterman, another problem....
-						 * We're trying to use a non-directory as a directory
-						 */
-
-						T(YAFFS_TRACE_ERROR,
-						  (TSTR
-						   ("yaffs tragedy: attempting to use non-directory as"
-						    " a directory in scan. Put in lost+found."
-						    TENDSTR)));
-						parent = dev->lostNFoundDir;
-					}
-
-					yaffs_AddObjectToDirectory(parent, in);
-
-					itsUnlinked = (parent == dev->deletedDir) ||
-						      (parent == dev->unlinkedDir);
-
-					if (isShrink) {
-						/* Mark the block as having a shrinkHeader */
-						bi->hasShrinkHeader = 1;
-					}
-
-					/* Note re hardlinks.
-					 * Since we might scan a hardlink before its equivalent object is scanned
-					 * we put them all in a list.
-					 * After scanning is complete, we should have all the objects, so we run
-					 * through this list and fix up all the chains.
-					 */
-
-					switch (in->variantType) {
-					case YAFFS_OBJECT_TYPE_UNKNOWN:
-						/* Todo got a problem */
-						break;
-					case YAFFS_OBJECT_TYPE_FILE:
-
-						if (in->variant.fileVariant.
-						    scannedFileSize < fileSize) {
-							/* This covers the case where the file size is greater
-							 * than where the data is
-							 * This will happen if the file is resized to be larger
-							 * than its current data extents.
-							 */
-							in->variant.fileVariant.fileSize = fileSize;
-							in->variant.fileVariant.scannedFileSize =
-							    in->variant.fileVariant.fileSize;
-						}
-
-						if (isShrink &&
-						    in->variant.fileVariant.shrinkSize > fileSize) {
-							in->variant.fileVariant.shrinkSize = fileSize;
-						}
-
-						break;
-					case YAFFS_OBJECT_TYPE_HARDLINK:
-						if(!itsUnlinked) {
-						  in->variant.hardLinkVariant.equivalentObjectId =
-						    equivalentObjectId;
-						  in->hardLinks.next =
-						    (struct list_head *) hardList;
-						  hardList = in;
-						}
-						break;
-					case YAFFS_OBJECT_TYPE_DIRECTORY:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SPECIAL:
-						/* Do nothing */
-						break;
-					case YAFFS_OBJECT_TYPE_SYMLINK:
-						if(oh){
-						   in->variant.symLinkVariant.alias =
-						    yaffs_CloneString(oh->
-								      alias);
-						   if(!in->variant.symLinkVariant.alias)
-						   	alloc_failed = 1;
-						}
-						break;
-					}
-
-				}
-
-			}
-
-		} /* End of scanning for each chunk */
-
-		if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-			/* If we got this far while scanning, then the block is fully allocated. */
-			state = YAFFS_BLOCK_STATE_FULL;
-		}
-
-		bi->blockState = state;
-
-		/* Now let's see if it was dirty */
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-			yaffs_BlockBecameDirty(dev, blk);
-		}
-
-	}
-
-	if (altBlockIndex)
-		YFREE_ALT(blockIndex);
-	else
-		YFREE(blockIndex);
-
-	/* Ok, we've done all the scanning.
-	 * Fix up the hard link chains.
-	 * We should now have scanned all the objects, now it's time to add these
-	 * hardlinks.
-	 */
-	yaffs_HardlinkFixup(dev,hardList);
-
-
-	/*
-	*  Sort out state of unlinked and deleted objects.
-	*/
-	{
-		struct list_head *i;
-		struct list_head *n;
-
-		yaffs_Object *l;
-
-		/* Soft delete all the unlinked files */
-		list_for_each_safe(i, n,
-				   &dev->unlinkedDir->variant.directoryVariant.
-				   children) {
-			if (i) {
-				l = list_entry(i, yaffs_Object, siblings);
-				yaffs_DestroyObject(l);
-			}
-		}
-
-		/* Soft delete all the deletedDir files */
-		list_for_each_safe(i, n,
-				   &dev->deletedDir->variant.directoryVariant.
-				   children) {
-			if (i) {
-				l = list_entry(i, yaffs_Object, siblings);
-				yaffs_DestroyObject(l);
-
-			}
-		}
-	}
-
-	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
-	if(alloc_failed){
-		return YAFFS_FAIL;
-	}
-
-	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-
-	return YAFFS_OK;
-}
-
-/*------------------------------  Directory Functions ----------------------------- */
-
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-{
-	yaffs_Device *dev = obj->myDev;
-
-	if(dev && dev->removeObjectCallback)
-		dev->removeObjectCallback(obj);
-
-	list_del_init(&obj->siblings);
-	obj->parent = NULL;
-}
-
-
-static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
-				       yaffs_Object * obj)
-{
-
-	if (!directory) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: Trying to add an object to a null pointer directory"
-		    TENDSTR)));
-		YBUG();
-	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: Trying to add an object to a non-directory"
-		    TENDSTR)));
-		YBUG();
-	}
-
-	if (obj->siblings.prev == NULL) {
-		/* Not initialised */
-		INIT_LIST_HEAD(&obj->siblings);
-
-	} else if (!list_empty(&obj->siblings)) {
-		/* If it is holed up somewhere else, un hook it */
-		yaffs_RemoveObjectFromDirectory(obj);
-	}
-	/* Now add it */
-	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-	obj->parent = directory;
-
-	if (directory == obj->myDev->unlinkedDir
-	    || directory == obj->myDev->deletedDir) {
-		obj->unlinked = 1;
-		obj->myDev->nUnlinkedFiles++;
-		obj->renameAllowed = 0;
-	}
-}
-
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
-				     const YCHAR * name)
-{
-	int sum;
-
-	struct list_head *i;
-	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
-
-	yaffs_Object *l;
-
-	if (!name) {
-		return NULL;
-	}
-
-	if (!directory) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
-		    TENDSTR)));
-		YBUG();
-	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-		YBUG();
-	}
-
-	sum = yaffs_CalcNameSum(name);
-
-	list_for_each(i, &directory->variant.directoryVariant.children) {
-		if (i) {
-			l = list_entry(i, yaffs_Object, siblings);
-
-			yaffs_CheckObjectDetailsLoaded(l);
-
-			/* Special case for lost-n-found */
-			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-					return l;
-				}
-			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
-			{
-				/* LostnFound cunk called Objxxx
-				 * Do a real check
-				 */
-				yaffs_GetObjectName(l, buffer,
-						    YAFFS_MAX_NAME_LENGTH);
-				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-					return l;
-				}
-
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
-#if 0
-int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-				   int (*fn) (yaffs_Object *))
-{
-	struct list_head *i;
-	yaffs_Object *l;
-
-	if (!theDir) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
-		    TENDSTR)));
-		YBUG();
-	}
-	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-		YBUG();
-	}
-
-	list_for_each(i, &theDir->variant.directoryVariant.children) {
-		if (i) {
-			l = list_entry(i, yaffs_Object, siblings);
-			if (l && !fn(l)) {
-				return YAFFS_FAIL;
-			}
-		}
-	}
-
-	return YAFFS_OK;
-
-}
-#endif
-
-/* GetEquivalentObject dereferences any hard links to get to the
- * actual object.
- */
-
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-{
-	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-		/* We want the object id of the equivalent object, not this one */
-		obj = obj->variant.hardLinkVariant.equivalentObject;
-		yaffs_CheckObjectDetailsLoaded(obj);
-	}
-	return obj;
-
-}
-
-int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-{
-	memset(name, 0, buffSize * sizeof(YCHAR));
-
-	yaffs_CheckObjectDetailsLoaded(obj);
-
-	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
-	} else if (obj->chunkId <= 0) {
-		YCHAR locName[20];
-		/* make up a name */
-		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
-			      obj->objectId);
-		yaffs_strncpy(name, locName, buffSize - 1);
-
-	}
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	else if (obj->shortName[0]) {
-		yaffs_strcpy(name, obj->shortName);
-	}
-#endif
-	else {
-		int result;
-		__u8 *buffer = yaffs_GetTempBuffer(obj->myDev, __LINE__);
-
-		yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer;
-
-		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
-
-		if (obj->chunkId >= 0) {
-			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
-							obj->chunkId, buffer,
-							NULL);
-		}
-		yaffs_strncpy(name, oh->name, buffSize - 1);
-
-		yaffs_ReleaseTempBuffer(obj->myDev, buffer, __LINE__);
-	}
-
-	return yaffs_strlen(name);
-}
-
-int yaffs_GetObjectFileLength(yaffs_Object * obj)
-{
-
-	/* Dereference any hard linking */
-	obj = yaffs_GetEquivalentObject(obj);
-
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-		return obj->variant.fileVariant.fileSize;
-	}
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-		return yaffs_strlen(obj->variant.symLinkVariant.alias);
-	} else {
-		/* Only a directory should drop through to here */
-		return obj->myDev->nDataBytesPerChunk;
-	}
-}
-
-int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-{
-	int count = 0;
-	struct list_head *i;
-
-	if (!obj->unlinked) {
-		count++;	/* the object itself */
-	}
-	list_for_each(i, &obj->hardLinks) {
-		count++;	/* add the hard links; */
-	}
-	return count;
-
-}
-
-int yaffs_GetObjectInode(yaffs_Object * obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	return obj->objectId;
-}
-
-unsigned yaffs_GetObjectType(yaffs_Object * obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-
-	switch (obj->variantType) {
-	case YAFFS_OBJECT_TYPE_FILE:
-		return DT_REG;
-		break;
-	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		return DT_DIR;
-		break;
-	case YAFFS_OBJECT_TYPE_SYMLINK:
-		return DT_LNK;
-		break;
-	case YAFFS_OBJECT_TYPE_HARDLINK:
-		return DT_REG;
-		break;
-	case YAFFS_OBJECT_TYPE_SPECIAL:
-		if (S_ISFIFO(obj->yst_mode))
-			return DT_FIFO;
-		if (S_ISCHR(obj->yst_mode))
-			return DT_CHR;
-		if (S_ISBLK(obj->yst_mode))
-			return DT_BLK;
-		if (S_ISSOCK(obj->yst_mode))
-			return DT_SOCK;
-	default:
-		return DT_REG;
-		break;
-	}
-}
-
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-{
-	obj = yaffs_GetEquivalentObject(obj);
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
-	} else {
-		return yaffs_CloneString(_Y(""));
-	}
-}
-
-#ifndef CONFIG_YAFFS_WINCE
-
-int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-{
-	unsigned int valid = attr->ia_valid;
-
-	if (valid & ATTR_MODE)
-		obj->yst_mode = attr->ia_mode;
-	if (valid & ATTR_UID)
-		obj->yst_uid = attr->ia_uid;
-	if (valid & ATTR_GID)
-		obj->yst_gid = attr->ia_gid;
-
-	if (valid & ATTR_ATIME)
-		obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
-	if (valid & ATTR_CTIME)
-		obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
-	if (valid & ATTR_MTIME)
-		obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
-
-	if (valid & ATTR_SIZE)
-		yaffs_ResizeFile(obj, attr->ia_size);
-
-	yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-
-	return YAFFS_OK;
-
-}
-int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-{
-	unsigned int valid = 0;
-
-	attr->ia_mode = obj->yst_mode;
-	valid |= ATTR_MODE;
-	attr->ia_uid = obj->yst_uid;
-	valid |= ATTR_UID;
-	attr->ia_gid = obj->yst_gid;
-	valid |= ATTR_GID;
-
-	Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
-	valid |= ATTR_ATIME;
-	Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
-	valid |= ATTR_CTIME;
-	Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
-	valid |= ATTR_MTIME;
-
-	attr->ia_size = yaffs_GetFileSize(obj);
-	valid |= ATTR_SIZE;
-
-	attr->ia_valid = valid;
-
-	return YAFFS_OK;
-
-}
-
-#endif
-
-#if 0
-int yaffs_DumpObject(yaffs_Object * obj)
-{
-	YCHAR name[257];
-
-	yaffs_GetObjectName(obj, name, 256);
-
-	T(YAFFS_TRACE_ALWAYS,
-	  (TSTR
-	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
-	    " chunk %d type %d size %d\n"
-	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
-	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
-
-	return YAFFS_OK;
-}
-#endif
-
-/*---------------------------- Initialisation code -------------------------------------- */
-
-static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-{
-
-	/* Common functions, gotta have */
-	if (!dev->eraseBlockInNAND || !dev->initialiseNAND)
-		return 0;
-
-#ifdef CONFIG_YAFFS_YAFFS2
-
-	/* Can use the "with tags" style interface for yaffs1 or yaffs2 */
-	if (dev->writeChunkWithTagsToNAND &&
-	    dev->readChunkWithTagsFromNAND &&
-	    !dev->writeChunkToNAND &&
-	    !dev->readChunkFromNAND &&
-	    dev->markNANDBlockBad && dev->queryNANDBlock)
-		return 1;
-#endif
-
-	/* Can use the "spare" style interface for yaffs1 */
-	if (!dev->isYaffs2 &&
-	    !dev->writeChunkWithTagsToNAND &&
-	    !dev->readChunkWithTagsFromNAND &&
-	    dev->writeChunkToNAND &&
-	    dev->readChunkFromNAND &&
-	    !dev->markNANDBlockBad && !dev->queryNANDBlock)
-		return 1;
-
-	return 0;		/* bad */
-}
-
-
-static int yaffs_CreateInitialDirectories(yaffs_Device *dev)
-{
-	/* Initialise the unlinked, deleted, root and lost and found directories */
-
-	dev->lostNFoundDir = dev->rootDir =  NULL;
-	dev->unlinkedDir = dev->deletedDir = NULL;
-
-	dev->unlinkedDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
-
-	dev->deletedDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
-
-	dev->rootDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_ROOT,
-				      YAFFS_ROOT_MODE | S_IFDIR);
-	dev->lostNFoundDir =
-	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
-				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
-
-	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
-		return YAFFS_OK;
-	}
-
-	return YAFFS_FAIL;
-}
-
-int yaffs_GutsInitialise(yaffs_Device * dev)
-{
-	int init_failed = 0;
-	unsigned x;
-	int bits;
-
-	T(YAFFS_TRACE_TRACING, (TSTR("yaffs: yaffs_GutsInitialise()" TENDSTR)));
-
-	/* Check stuff that must be set */
-
-	if (!dev) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Need a device" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	dev->internalStartBlock = dev->startBlock;
-	dev->internalEndBlock = dev->endBlock;
-	dev->blockOffset = 0;
-	dev->chunkOffset = 0;
-	dev->nFreeChunks = 0;
-
-	if (dev->startBlock == 0) {
-		dev->internalStartBlock = dev->startBlock + 1;
-		dev->internalEndBlock = dev->endBlock + 1;
-		dev->blockOffset = 1;
-		dev->chunkOffset = dev->nChunksPerBlock;
-	}
-
-	/* Check geometry parameters. */
-
-	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
-	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-	     dev->nChunksPerBlock < 2 ||
-	     dev->nReservedBlocks < 2 ||
-	     dev->internalStartBlock <= 0 ||
-	     dev->internalEndBlock <= 0 ||
-	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
-	    ) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
-		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-		return YAFFS_FAIL;
-	}
-
-	if (yaffs_InitialiseNAND(dev) != YAFFS_OK) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: InitialiseNAND failed" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Got the right mix of functions? */
-	if (!yaffs_CheckDevFunctions(dev)) {
-		/* Function missing */
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR
-		   ("yaffs: device function(s) missing or wrong\n" TENDSTR)));
-
-		return YAFFS_FAIL;
-	}
-
-	/* This is really a compilation check. */
-	if (!yaffs_CheckStructures()) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs_CheckStructures failed\n" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	if (dev->isMounted) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: device already mounted\n" TENDSTR)));
-		return YAFFS_FAIL;
-	}
-
-	/* Finished with most checks. One or two more checks happen later on too. */
-
-	dev->isMounted = 1;
-
-
-
-	/* OK now calculate a few things for the device */
-
-	/*
-	 *  Calculate all the chunk size manipulation numbers:
-	 */
-	 /* Start off assuming it is a power of 2 */
-	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
-	 dev->chunkMask = (1<<dev->chunkShift) - 1;
-
-	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
-	 	/* Yes it is a power of 2, disable crumbs */
-		dev->crumbMask = 0;
-		dev->crumbShift = 0;
-		dev->crumbsPerChunk = 0;
-	 } else {
-	 	/* Not a power of 2, use crumbs instead */
-		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
-		dev->crumbMask = (1<<dev->crumbShift)-1;
-		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
-		dev->chunkShift = 0;
-		dev->chunkMask = 0;
-	}
-
-
-	/*
-	 * Calculate chunkGroupBits.
-	 * We need to find the next power of 2 > than internalEndBlock
-	 */
-
-	x = dev->nChunksPerBlock * (dev->internalEndBlock + 1);
-
-	bits = ShiftsGE(x);
-
-	/* Set up tnode width if wide tnodes are enabled. */
-	if(!dev->wideTnodesDisabled){
-		/* bits must be even so that we end up with 32-bit words */
-		if(bits & 1)
-			bits++;
-		if(bits < 16)
-			dev->tnodeWidth = 16;
-		else
-			dev->tnodeWidth = bits;
-	}
-	else
-		dev->tnodeWidth = 16;
-
-	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-
-	/* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
-	 * so if the bitwidth of the
-	 * chunk range we're using is greater than 16 we need
-	 * to figure out chunk shift and chunkGroupSize
-	 */
-
-	if (bits <= dev->tnodeWidth)
-		dev->chunkGroupBits = 0;
-	else
-		dev->chunkGroupBits = bits - dev->tnodeWidth;
-
-
-	dev->chunkGroupSize = 1 << dev->chunkGroupBits;
-
-	if (dev->nChunksPerBlock < dev->chunkGroupSize) {
-		/* We have a problem because the soft delete won't work if
-		 * the chunk group size > chunks per block.
-		 * This can be remedied by using larger "virtual blocks".
-		 */
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("yaffs: chunk group too large\n" TENDSTR)));
-
-		return YAFFS_FAIL;
-	}
-
-	/* OK, we've finished verifying the device, lets continue with initialisation */
-
-	/* More device initialisation */
-	dev->garbageCollections = 0;
-	dev->passiveGarbageCollections = 0;
-	dev->currentDirtyChecker = 0;
-	dev->bufferedBlock = -1;
-	dev->doingBufferedBlockRewrite = 0;
-	dev->nDeletedFiles = 0;
-	dev->nBackgroundDeletions = 0;
-	dev->nUnlinkedFiles = 0;
-	dev->eccFixed = 0;
-	dev->eccUnfixed = 0;
-	dev->tagsEccFixed = 0;
-	dev->tagsEccUnfixed = 0;
-	dev->nErasureFailures = 0;
-	dev->nErasedBlocks = 0;
-	dev->isDoingGC = 0;
-	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
-
-	/* Initialise temporary buffers and caches. */
-	if(!yaffs_InitialiseTempBuffers(dev))
-		init_failed = 1;
-
-	dev->srCache = NULL;
-	dev->gcCleanupList = NULL;
-
-
-	if (!init_failed &&
-	    dev->nShortOpCaches > 0) {
-		int i;
-		__u8 *buf;
-		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
-
-		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
-		}
-
-		buf = dev->srCache =  YMALLOC(srCacheBytes);
-
-		if(dev->srCache)
-			memset(dev->srCache,0,srCacheBytes);
-
-		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
-			dev->srCache[i].object = NULL;
-			dev->srCache[i].lastUse = 0;
-			dev->srCache[i].dirty = 0;
-			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-		}
-		if(!buf)
-			init_failed = 1;
-
-		dev->srLastUse = 0;
-	}
-
-	dev->cacheHits = 0;
-
-	if(!init_failed){
-		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
-		if(!dev->gcCleanupList)
-			init_failed = 1;
-	}
-
-	if (dev->isYaffs2) {
-		dev->useHeaderFileSize = 1;
-	}
-	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-		init_failed = 1;
-
-	yaffs_InitialiseTnodes(dev);
-	yaffs_InitialiseObjects(dev);
-
-	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-		init_failed = 1;
-
-
-	if(!init_failed){
-		/* Now scan the flash. */
-		if (dev->isYaffs2) {
-			if(yaffs_CheckpointRestore(dev)) {
-				T(YAFFS_TRACE_ALWAYS,
-				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
-			} else {
-
-				/* Clean up the mess caused by an aborted checkpoint load
-				 * and scan backwards.
-				 */
-				yaffs_DeinitialiseBlocks(dev);
-				yaffs_DeinitialiseTnodes(dev);
-				yaffs_DeinitialiseObjects(dev);
-
-
-				dev->nErasedBlocks = 0;
-				dev->nFreeChunks = 0;
-				dev->allocationBlock = -1;
-				dev->allocationPage = -1;
-				dev->nDeletedFiles = 0;
-				dev->nUnlinkedFiles = 0;
-				dev->nBackgroundDeletions = 0;
-				dev->oldestDirtySequence = 0;
-
-				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-					init_failed = 1;
-
-				yaffs_InitialiseTnodes(dev);
-				yaffs_InitialiseObjects(dev);
-
-				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-					init_failed = 1;
-
-				if(!init_failed && !yaffs_ScanBackwards(dev))
-					init_failed = 1;
-			}
-		}else
-			if(!yaffs_Scan(dev))
-				init_failed = 1;
-	}
-
-	if(init_failed){
-		/* Clean up the mess */
-		T(YAFFS_TRACE_TRACING,
-		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-
-		yaffs_Deinitialise(dev);
-		return YAFFS_FAIL;
-	}
-
-	/* Zero out stats */
-	dev->nPageReads = 0;
-	dev->nPageWrites = 0;
-	dev->nBlockErasures = 0;
-	dev->nGCCopies = 0;
-	dev->nRetriedWrites = 0;
-
-	dev->nRetiredBlocks = 0;
-
-	yaffs_VerifyFreeChunks(dev);
-	yaffs_VerifyBlocks(dev);
-
-
-	T(YAFFS_TRACE_TRACING,
-	  (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));
-	return YAFFS_OK;
-
-}
-
-void yaffs_Deinitialise(yaffs_Device * dev)
-{
-	if (dev->isMounted) {
-		int i;
-
-		yaffs_DeinitialiseBlocks(dev);
-		yaffs_DeinitialiseTnodes(dev);
-		yaffs_DeinitialiseObjects(dev);
-		if (dev->nShortOpCaches > 0 &&
-		    dev->srCache) {
-
-			for (i = 0; i < dev->nShortOpCaches; i++) {
-				if(dev->srCache[i].data)
-					YFREE(dev->srCache[i].data);
-				dev->srCache[i].data = NULL;
-			}
-
-			YFREE(dev->srCache);
-			dev->srCache = NULL;
-		}
-
-		YFREE(dev->gcCleanupList);
-
-		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-			YFREE(dev->tempBuffer[i].buffer);
-		}
-
-		dev->isMounted = 0;
-	}
-
-}
-
-static int yaffs_CountFreeChunks(yaffs_Device * dev)
-{
-	int nFree;
-	int b;
-
-	yaffs_BlockInfo *blk;
-
-	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
-	     b++) {
-		blk = yaffs_GetBlockInfo(dev, b);
-
-		switch (blk->blockState) {
-		case YAFFS_BLOCK_STATE_EMPTY:
-		case YAFFS_BLOCK_STATE_ALLOCATING:
-		case YAFFS_BLOCK_STATE_COLLECTING:
-		case YAFFS_BLOCK_STATE_FULL:
-			nFree +=
-			    (dev->nChunksPerBlock - blk->pagesInUse +
-			     blk->softDeletions);
-			break;
-		default:
-			break;
-		}
-
-	}
-
-	return nFree;
-}
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-{
-	/* This is what we report to the outside world */
-
-	int nFree;
-	int nDirtyCacheChunks;
-	int blocksForCheckpoint;
-
-#if 1
-	nFree = dev->nFreeChunks;
-#else
-	nFree = yaffs_CountFreeChunks(dev);
-#endif
-
-	nFree += dev->nDeletedFiles;
-
-	/* Now count the number of dirty chunks in the cache and subtract those */
-
-	{
-		int i;
-		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-			if (dev->srCache[i].dirty)
-				nDirtyCacheChunks++;
-		}
-	}
-
-	nFree -= nDirtyCacheChunks;
-
-	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
-
-	/* Now we figure out how much to reserve for the checkpoint and report that... */
-	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
-	if(blocksForCheckpoint < 0)
-		blocksForCheckpoint = 0;
-
-	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-
-	if (nFree < 0)
-		nFree = 0;
-
-	return nFree;
-
-}
-
-static int yaffs_freeVerificationFailures;
-
-static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-{
-	int counted;
-	int difference;
-
-	if(yaffs_SkipVerification(dev))
-		return;
-
-	counted = yaffs_CountFreeChunks(dev);
-
-	difference = dev->nFreeChunks - counted;
-
-	if (difference) {
-		T(YAFFS_TRACE_ALWAYS,
-		  (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
-		   dev->nFreeChunks, counted, difference));
-		yaffs_freeVerificationFailures++;
-	}
-}
-
-/*---------------------------------------- YAFFS test code ----------------------*/
-
-#define yaffs_CheckStruct(structure,syze, name) \
-           if(sizeof(structure) != syze) \
-	       { \
-	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
-		 name,syze,sizeof(structure))); \
-	         return YAFFS_FAIL; \
-		}
-
-static int yaffs_CheckStructures(void)
-{
-/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
-/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
-/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-#ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-#endif
-	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
-
-	    return YAFFS_OK;
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.h
deleted file mode 100644
index ea06c1a38e..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.h
+++ /dev/null
@@ -1,902 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_GUTS_H__
-#define __YAFFS_GUTS_H__
-
-#include "devextras.h"
-#include "yportenv.h"
-
-#define YAFFS_OK	1
-#define YAFFS_FAIL  0
-
-/* Give us a  Y=0x59,
- * Give us an A=0x41,
- * Give us an FF=0xFF
- * Give us an S=0x53
- * And what have we got...
- */
-#define YAFFS_MAGIC			0x5941FF53
-
-#define YAFFS_NTNODES_LEVEL0	  	16
-#define YAFFS_TNODES_LEVEL0_BITS	4
-#define YAFFS_TNODES_LEVEL0_MASK	0xf
-
-#define YAFFS_NTNODES_INTERNAL 		(YAFFS_NTNODES_LEVEL0 / 2)
-#define YAFFS_TNODES_INTERNAL_BITS 	(YAFFS_TNODES_LEVEL0_BITS - 1)
-#define YAFFS_TNODES_INTERNAL_MASK	0x7
-#define YAFFS_TNODES_MAX_LEVEL		6
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-#define YAFFS_BYTES_PER_SPARE		16
-#define YAFFS_BYTES_PER_CHUNK		512
-#define YAFFS_CHUNK_SIZE_SHIFT		9
-#define YAFFS_CHUNKS_PER_BLOCK		32
-#define YAFFS_BYTES_PER_BLOCK		(YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)
-#endif
-
-#define YAFFS_MIN_YAFFS2_CHUNK_SIZE 	1024
-#define YAFFS_MIN_YAFFS2_SPARE_SIZE	32
-
-#define YAFFS_MAX_CHUNK_ID		0x000FFFFF
-
-#define YAFFS_UNUSED_OBJECT_ID		0x0003FFFF
-
-#define YAFFS_ALLOCATION_NOBJECTS	100
-#define YAFFS_ALLOCATION_NTNODES	100
-#define YAFFS_ALLOCATION_NLINKS		100
-
-#define YAFFS_NOBJECT_BUCKETS		256
-
-
-#define YAFFS_OBJECT_SPACE		0x40000
-
-#define YAFFS_CHECKPOINT_VERSION 	3
-
-#ifdef CONFIG_YAFFS_UNICODE
-#define YAFFS_MAX_NAME_LENGTH		127
-#define YAFFS_MAX_ALIAS_LENGTH		79
-#else
-#define YAFFS_MAX_NAME_LENGTH		255
-#define YAFFS_MAX_ALIAS_LENGTH		159
-#endif
-
-#define YAFFS_SHORT_NAME_LENGTH		15
-
-/* Some special object ids for pseudo objects */
-#define YAFFS_OBJECTID_ROOT		1
-#define YAFFS_OBJECTID_LOSTNFOUND	2
-#define YAFFS_OBJECTID_UNLINKED		3
-#define YAFFS_OBJECTID_DELETED		4
-
-/* Sseudo object ids for checkpointing */
-#define YAFFS_OBJECTID_SB_HEADER	0x10
-#define YAFFS_OBJECTID_CHECKPOINT_DATA	0x20
-#define YAFFS_SEQUENCE_CHECKPOINT_DATA  0x21
-
-/* */
-
-#define YAFFS_MAX_SHORT_OP_CACHES	20
-
-#define YAFFS_N_TEMP_BUFFERS		4
-
-/* We limit the number attempts at sucessfully saving a chunk of data.
- * Small-page devices have 32 pages per block; large-page devices have 64.
- * Default to something in the order of 5 to 10 blocks worth of chunks.
- */
-#define YAFFS_WR_ATTEMPTS		(5*64)
-
-/* Sequence numbers are used in YAFFS2 to determine block allocation order.
- * The range is limited slightly to help distinguish bad numbers from good.
- * This also allows us to perhaps in the future use special numbers for
- * special purposes.
- * EFFFFF00 allows the allocation of 8 blocks per second (~1Mbytes) for 15 years,
- * and is a larger number than the lifetime of a 2GB device.
- */
-#define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
-#define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
-
-/* ChunkCache is used for short read/write operations.*/
-typedef struct {
-	struct yaffs_ObjectStruct *object;
-	int chunkId;
-	int lastUse;
-	int dirty;
-	int nBytes;		/* Only valid if the cache is dirty */
-	int locked;		/* Can't push out or flush while locked. */
-#ifdef CONFIG_YAFFS_YAFFS2
-	__u8 *data;
-#else
-	__u8 data[YAFFS_BYTES_PER_CHUNK];
-#endif
-} yaffs_ChunkCache;
-
-
-
-/* Tags structures in RAM
- * NB This uses bitfield. Bitfields should not straddle a u32 boundary otherwise
- * the structure size will get blown out.
- */
-
-#ifndef CONFIG_YAFFS_NO_YAFFS1
-typedef struct {
-	unsigned chunkId:20;
-	unsigned serialNumber:2;
-	unsigned byteCount:10;
-	unsigned objectId:18;
-	unsigned ecc:12;
-	unsigned unusedStuff:2;
-
-} yaffs_Tags;
-
-typedef union {
-	yaffs_Tags asTags;
-	__u8 asBytes[8];
-} yaffs_TagsUnion;
-
-#endif
-
-/* Stuff used for extended tags in YAFFS2 */
-
-typedef enum {
-	YAFFS_ECC_RESULT_UNKNOWN,
-	YAFFS_ECC_RESULT_NO_ERROR,
-	YAFFS_ECC_RESULT_FIXED,
-	YAFFS_ECC_RESULT_UNFIXED
-} yaffs_ECCResult;
-
-typedef enum {
-	YAFFS_OBJECT_TYPE_UNKNOWN,
-	YAFFS_OBJECT_TYPE_FILE,
-	YAFFS_OBJECT_TYPE_SYMLINK,
-	YAFFS_OBJECT_TYPE_DIRECTORY,
-	YAFFS_OBJECT_TYPE_HARDLINK,
-	YAFFS_OBJECT_TYPE_SPECIAL
-} yaffs_ObjectType;
-
-#define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL
-
-typedef struct {
-
-	unsigned validMarker0;
-	unsigned chunkUsed;	/*  Status of the chunk: used or unused */
-	unsigned objectId;	/* If 0 then this is not part of an object (unused) */
-	unsigned chunkId;	/* If 0 then this is a header, else a data chunk */
-	unsigned byteCount;	/* Only valid for data chunks */
-
-	/* The following stuff only has meaning when we read */
-	yaffs_ECCResult eccResult;
-	unsigned blockBad;
-
-	/* YAFFS 1 stuff */
-	unsigned chunkDeleted;	/* The chunk is marked deleted */
-	unsigned serialNumber;	/* Yaffs1 2-bit serial number */
-
-	/* YAFFS2 stuff */
-	unsigned sequenceNumber;	/* The sequence number of this block */
-
-	/* Extra info if this is an object header (YAFFS2 only) */
-
-	unsigned extraHeaderInfoAvailable;	/* There is extra info available if this is not zero */
-	unsigned extraParentObjectId;	/* The parent object */
-	unsigned extraIsShrinkHeader;	/* Is it a shrink header? */
-	unsigned extraShadows;		/* Does this shadow another object? */
-
-	yaffs_ObjectType extraObjectType;	/* What object type? */
-
-	unsigned extraFileLength;		/* Length if it is a file */
-	unsigned extraEquivalentObjectId;	/* Equivalent object Id if it is a hard link */
-
-	unsigned validMarker1;
-
-} yaffs_ExtendedTags;
-
-/* Spare structure for YAFFS1 */
-typedef struct {
-	__u8 tagByte0;
-	__u8 tagByte1;
-	__u8 tagByte2;
-	__u8 tagByte3;
-	__u8 pageStatus;	/* set to 0 to delete the chunk */
-	__u8 blockStatus;
-	__u8 tagByte4;
-	__u8 tagByte5;
-	__u8 ecc1[3];
-	__u8 tagByte6;
-	__u8 tagByte7;
-	__u8 ecc2[3];
-} yaffs_Spare;
-
-/*Special structure for passing through to mtd */
-struct yaffs_NANDSpare {
-	yaffs_Spare spare;
-	int eccres1;
-	int eccres2;
-};
-
-/* Block data in RAM */
-
-typedef enum {
-	YAFFS_BLOCK_STATE_UNKNOWN = 0,
-
-	YAFFS_BLOCK_STATE_SCANNING,
-	YAFFS_BLOCK_STATE_NEEDS_SCANNING,
-	/* The block might have something on it (ie it is allocating or full, perhaps empty)
-	 * but it needs to be scanned to determine its true state.
-	 * This state is only valid during yaffs_Scan.
-	 * NB We tolerate empty because the pre-scanner might be incapable of deciding
-	 * However, if this state is returned on a YAFFS2 device, then we expect a sequence number
-	 */
-
-	YAFFS_BLOCK_STATE_EMPTY,
-	/* This block is empty */
-
-	YAFFS_BLOCK_STATE_ALLOCATING,
-	/* This block is partially allocated.
-	 * At least one page holds valid data.
-	 * This is the one currently being used for page
-	 * allocation. Should never be more than one of these
-	 */
-
-	YAFFS_BLOCK_STATE_FULL,
-	/* All the pages in this block have been allocated.
-	 */
-
-	YAFFS_BLOCK_STATE_DIRTY,
-	/* All pages have been allocated and deleted.
-	 * Erase me, reuse me.
-	 */
-
-	YAFFS_BLOCK_STATE_CHECKPOINT,
-	/* This block is assigned to holding checkpoint data.
-	 */
-
-	YAFFS_BLOCK_STATE_COLLECTING,
-	/* This block is being garbage collected */
-
-	YAFFS_BLOCK_STATE_DEAD
-	/* This block has failed and is not in use */
-} yaffs_BlockState;
-
-#define	YAFFS_NUMBER_OF_BLOCK_STATES (YAFFS_BLOCK_STATE_DEAD + 1)
-
-
-typedef struct {
-
-	int softDeletions:10;	/* number of soft deleted pages */
-	int pagesInUse:10;	/* number of pages in use */
-	yaffs_BlockState blockState:4;	/* One of the above block states */
-	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
-                        	/* and retire the block. */
-	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
-	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-				   It should be prioritised for GC */
-        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-
-#ifdef CONFIG_YAFFS_YAFFS2
-	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-	__u32 sequenceNumber;	 /* block sequence number for yaffs2 */
-#endif
-
-} yaffs_BlockInfo;
-
-/* -------------------------- Object structure -------------------------------*/
-/* This is the object structure as stored on NAND */
-
-typedef struct {
-	yaffs_ObjectType type;
-
-	/* Apply to everything  */
-	int parentObjectId;
-	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-
-	/* Thes following apply to directories, files, symlinks - not hard links */
-	__u32 yst_mode;		/* protection */
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 notForWinCE[5];
-#else
-	__u32 yst_uid;
-	__u32 yst_gid;
-	__u32 yst_atime;
-	__u32 yst_mtime;
-	__u32 yst_ctime;
-#endif
-
-	/* File size  applies to files only */
-	int fileSize;
-
-	/* Equivalent object id applies to hard links only. */
-	int equivalentObjectId;
-
-	/* Alias is for symlinks only. */
-	YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
-
-	__u32 yst_rdev;		/* device stuff for block and char devices (major/min) */
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 win_ctime[2];
-	__u32 win_atime[2];
-	__u32 win_mtime[2];
-	__u32 roomToGrow[4];
-#else
-	__u32 roomToGrow[10];
-#endif
-
-	int shadowsObject;	/* This object header shadows the specified object if > 0 */
-
-	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-	__u32 isShrink;
-
-} yaffs_ObjectHeader;
-
-/*--------------------------- Tnode -------------------------- */
-
-union yaffs_Tnode_union {
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL + 1];
-#else
-	union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
-#endif
-/*	__u16 level0[YAFFS_NTNODES_LEVEL0]; */
-
-};
-
-typedef union yaffs_Tnode_union yaffs_Tnode;
-
-struct yaffs_TnodeList_struct {
-	struct yaffs_TnodeList_struct *next;
-	yaffs_Tnode *tnodes;
-};
-
-typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
-
-/*------------------------  Object -----------------------------*/
-/* An object can be one of:
- * - a directory (no data, has children links
- * - a regular file (data.... not prunes :->).
- * - a symlink [symbolic link] (the alias).
- * - a hard link
- */
-
-typedef struct {
-	__u32 fileSize;
-	__u32 scannedFileSize;
-	__u32 shrinkSize;
-	int topLevel;
-	yaffs_Tnode *top;
-} yaffs_FileStructure;
-
-typedef struct {
-	struct list_head children;	/* list of child links */
-} yaffs_DirectoryStructure;
-
-typedef struct {
-	YCHAR *alias;
-} yaffs_SymLinkStructure;
-
-typedef struct {
-	struct yaffs_ObjectStruct *equivalentObject;
-	__u32 equivalentObjectId;
-} yaffs_HardLinkStructure;
-
-typedef union {
-	yaffs_FileStructure fileVariant;
-	yaffs_DirectoryStructure directoryVariant;
-	yaffs_SymLinkStructure symLinkVariant;
-	yaffs_HardLinkStructure hardLinkVariant;
-} yaffs_ObjectVariant;
-
-struct yaffs_ObjectStruct {
-	__u8 deleted:1;		/* This should only apply to unlinked files. */
-	__u8 softDeleted:1;	/* it has also been soft deleted */
-	__u8 unlinked:1;	/* An unlinked file. The file should be in the unlinked directory.*/
-	__u8 fake:1;		/* A fake object has no presence on NAND. */
-	__u8 renameAllowed:1;	/* Some objects are not allowed to be renamed. */
-	__u8 unlinkAllowed:1;
-	__u8 dirty:1;		/* the object needs to be written to flash */
-	__u8 valid:1;		/* When the file system is being loaded up, this
-				 * object might be created before the data
-				 * is available (ie. file data records appear before the header).
-				 */
-	__u8 lazyLoaded:1;	/* This object has been lazy loaded and is missing some detail */
-
-	__u8 deferedFree:1;	/* For Linux kernel. Object is removed from NAND, but is
-				 * still in the inode cache. Free of object is defered.
-				 * until the inode is released.
-				 */
-
-	__u8 serial;		/* serial number of chunk in NAND. Cached here */
-	__u16 sum;		/* sum of the name to speed searching */
-
-	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-
-	struct list_head hashLink;	/* list of objects in this hash bucket */
-
-	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-
-	/* directory structure stuff */
-	/* also used for linking up the free list */
-	struct yaffs_ObjectStruct *parent;
-	struct list_head siblings;
-
-	/* Where's my object header in NAND? */
-	int chunkId;
-
-	int nDataChunks;	/* Number of data chunks attached to the file. */
-
-	__u32 objectId;		/* the object id value */
-
-	__u32 yst_mode;
-
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1];
-#endif
-
-#ifndef __KERNEL__
-	__u32 inUse;
-#endif
-
-#ifdef CONFIG_YAFFS_WINCE
-	__u32 win_ctime[2];
-	__u32 win_mtime[2];
-	__u32 win_atime[2];
-#else
-	__u32 yst_uid;
-	__u32 yst_gid;
-	__u32 yst_atime;
-	__u32 yst_mtime;
-	__u32 yst_ctime;
-#endif
-
-	__u32 yst_rdev;
-
-#ifdef __KERNEL__
-	struct inode *myInode;
-
-#endif
-
-	yaffs_ObjectType variantType;
-
-	yaffs_ObjectVariant variant;
-
-};
-
-typedef struct yaffs_ObjectStruct yaffs_Object;
-
-struct yaffs_ObjectList_struct {
-	yaffs_Object *objects;
-	struct yaffs_ObjectList_struct *next;
-};
-
-typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
-
-typedef struct {
-	struct list_head list;
-	int count;
-} yaffs_ObjectBucket;
-
-
-/* yaffs_CheckpointObject holds the definition of an object as dumped
- * by checkpointing.
- */
-
-typedef struct {
-        int structType;
-	__u32 objectId;
-	__u32 parentId;
-	int chunkId;
-
-	yaffs_ObjectType variantType:3;
-	__u8 deleted:1;
-	__u8 softDeleted:1;
-	__u8 unlinked:1;
-	__u8 fake:1;
-	__u8 renameAllowed:1;
-	__u8 unlinkAllowed:1;
-	__u8 serial;
-
-	int nDataChunks;
-	__u32 fileSizeOrEquivalentObjectId;
-
-}yaffs_CheckpointObject;
-
-/*--------------------- Temporary buffers ----------------
- *
- * These are chunk-sized working buffers. Each device has a few
- */
-
-typedef struct {
-	__u8 *buffer;
-	int line;	/* track from whence this buffer was allocated */
-	int maxLine;
-} yaffs_TempBuffer;
-
-/*----------------- Device ---------------------------------*/
-
-struct yaffs_DeviceStruct {
-	struct list_head devList;
-	const char *name;
-
-	/* Entry parameters set up way early. Yaffs sets up the rest.*/
-	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
-	int nChunksPerBlock;	/* does not need to be a power of 2 */
-	int nBytesPerSpare;	/* spare area size */
-	int startBlock;		/* Start block we're allowed to use */
-	int endBlock;		/* End block we're allowed to use */
-	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-				/* reserved blocks on NOR and RAM. */
-
-
-	/* Stuff used by the shared space checkpointing mechanism */
-	/* If this value is zero, then this mechanism is disabled */
-
-	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
-
-
-
-
-	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-				 * the number of short op caches (don't use too many)
-				 */
-
-	int useHeaderFileSize;	/* Flag to determine if we should use file sizes from the header */
-
-	int useNANDECC;		/* Flag to decide whether or not to use NANDECC */
-
-	void *genericDevice;	/* Pointer to device context
-				 * On an mtd this holds the mtd pointer.
-				 */
-        void *superBlock;
-
-	/* NAND access functions (Must be set before calling YAFFS)*/
-
-	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
-				 int chunkInNAND, const __u8 * data,
-				 const yaffs_Spare * spare);
-	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
-				  int chunkInNAND, __u8 * data,
-				  yaffs_Spare * spare);
-	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
-				 int blockInNAND);
-	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-
-#ifdef CONFIG_YAFFS_YAFFS2
-	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
-					 int chunkInNAND, const __u8 * data,
-					 const yaffs_ExtendedTags * tags);
-	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
-					  int chunkInNAND, __u8 * data,
-					  yaffs_ExtendedTags * tags);
-	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
-	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
-			       yaffs_BlockState * state, int *sequenceNumber);
-#endif
-
-	int isYaffs2;
-
-	/* The removeObjectCallback function must be supplied by OS flavours that
-	 * need it. The Linux kernel does not use this, but yaffs direct does use
-	 * it to implement the faster readdir
-	 */
-	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
-
-	/* Callback to mark the superblock dirsty */
-	void (*markSuperBlockDirty)(void * superblock);
-
-	int wideTnodesDisabled; /* Set to disable wide tnodes */
-
-
-	/* End of stuff that must be set before initialisation. */
-
-	/* Checkpoint control. Can be set before or after initialisation */
-	__u8 skipCheckpointRead;
-	__u8 skipCheckpointWrite;
-
-	/* Runtime parameters. Set up by YAFFS. */
-
-	__u16 chunkGroupBits;	/* 0 for devices <= 32MB. else log2(nchunks) - 16 */
-	__u16 chunkGroupSize;	/* == 2^^chunkGroupBits */
-
-	/* Stuff to support wide tnodes */
-	__u32 tnodeWidth;
-	__u32 tnodeMask;
-
-	/* Stuff to support various file offses to chunk/offset translations */
-	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
-	__u32 crumbMask;
-	__u32 crumbShift;
-	__u32 crumbsPerChunk;
-
-	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
-	__u32 chunkShift;
-	__u32 chunkMask;
-
-
-#ifdef __KERNEL__
-
-	struct semaphore sem;	/* Semaphore for waiting on erasure.*/
-	struct semaphore grossLock;	/* Gross locking semaphore */
-	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
-				 * at compile time so we have to allocate it.
-				 */
-	void (*putSuperFunc) (struct super_block * sb);
-#endif
-
-	int isMounted;
-
-	int isCheckpointed;
-
-
-	/* Stuff to support block offsetting to support start block zero */
-	int internalStartBlock;
-	int internalEndBlock;
-	int blockOffset;
-	int chunkOffset;
-
-
-	/* Runtime checkpointing stuff */
-	int checkpointPageSequence;   /* running sequence number of checkpoint pages */
-	int checkpointByteCount;
-	int checkpointByteOffset;
-	__u8 *checkpointBuffer;
-	int checkpointOpenForWrite;
-	int blocksInCheckpoint;
-	int checkpointCurrentChunk;
-	int checkpointCurrentBlock;
-	int checkpointNextBlock;
-	int *checkpointBlockList;
-	int checkpointMaxBlocks;
-	__u32 checkpointSum;
-	__u32 checkpointXor;
-
-	/* Block Info */
-	yaffs_BlockInfo *blockInfo;
-	__u8 *chunkBits;	/* bitmap of chunks in use */
-	unsigned blockInfoAlt:1;	/* was allocated using alternative strategy */
-	unsigned chunkBitsAlt:1;	/* was allocated using alternative strategy */
-	int chunkBitmapStride;	/* Number of bytes of chunkBits per block.
-				 * Must be consistent with nChunksPerBlock.
-				 */
-
-	int nErasedBlocks;
-	int allocationBlock;	/* Current block being allocated off */
-	__u32 allocationPage;
-	int allocationBlockFinder;	/* Used to search for next allocation block */
-
-	/* Runtime state */
-	int nTnodesCreated;
-	yaffs_Tnode *freeTnodes;
-	int nFreeTnodes;
-	yaffs_TnodeList *allocatedTnodeList;
-
-	int isDoingGC;
-
-	int nObjectsCreated;
-	yaffs_Object *freeObjects;
-	int nFreeObjects;
-
-	yaffs_ObjectList *allocatedObjectList;
-
-	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-
-	int nFreeChunks;
-
-	int currentDirtyChecker;	/* Used to find current dirtiest block */
-
-	__u32 *gcCleanupList;	/* objects to delete at the end of a GC. */
-	int nonAggressiveSkip;	/* GC state/mode */
-
-	/* Statistcs */
-	int nPageWrites;
-	int nPageReads;
-	int nBlockErasures;
-	int nErasureFailures;
-	int nGCCopies;
-	int garbageCollections;
-	int passiveGarbageCollections;
-	int nRetriedWrites;
-	int nRetiredBlocks;
-	int eccFixed;
-	int eccUnfixed;
-	int tagsEccFixed;
-	int tagsEccUnfixed;
-	int nDeletions;
-	int nUnmarkedDeletions;
-
-	int hasPendingPrioritisedGCs; /* We think this device might have pending prioritised gcs */
-
-	/* Special directories */
-	yaffs_Object *rootDir;
-	yaffs_Object *lostNFoundDir;
-
-	/* Buffer areas for storing data to recover from write failures TODO
-	 *      __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
-	 *      yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];
-	 */
-
-	int bufferedBlock;	/* Which block is buffered here? */
-	int doingBufferedBlockRewrite;
-
-	yaffs_ChunkCache *srCache;
-	int srLastUse;
-
-	int cacheHits;
-
-	/* Stuff for background deletion and unlinked files.*/
-	yaffs_Object *unlinkedDir;	/* Directory where unlinked and deleted files live. */
-	yaffs_Object *deletedDir;	/* Directory where deleted objects are sent to disappear. */
-	yaffs_Object *unlinkedDeletion;	/* Current file being background deleted.*/
-	int nDeletedFiles;		/* Count of files awaiting deletion;*/
-	int nUnlinkedFiles;		/* Count of unlinked files. */
-	int nBackgroundDeletions;	/* Count of background deletions. */
-
-
-	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
-	int maxTemp;
-	int unmanagedTempAllocations;
-	int unmanagedTempDeallocations;
-
-	/* yaffs2 runtime stuff */
-	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
-
-};
-
-typedef struct yaffs_DeviceStruct yaffs_Device;
-
-/* The static layout of bllock usage etc is stored in the super block header */
-typedef struct {
-        int StructType;
-	int version;
-	int checkpointStartBlock;
-	int checkpointEndBlock;
-	int startBlock;
-	int endBlock;
-	int rfu[100];
-} yaffs_SuperBlockHeader;
-
-/* The CheckpointDevice structure holds the device information that changes at runtime and
- * must be preserved over unmount/mount cycles.
- */
-typedef struct {
-        int structType;
-	int nErasedBlocks;
-	int allocationBlock;	/* Current block being allocated off */
-	__u32 allocationPage;
-	int nFreeChunks;
-
-	int nDeletedFiles;		/* Count of files awaiting deletion;*/
-	int nUnlinkedFiles;		/* Count of unlinked files. */
-	int nBackgroundDeletions;	/* Count of background deletions. */
-
-	/* yaffs2 runtime stuff */
-	unsigned sequenceNumber;	/* Sequence number of currently allocating block */
-	unsigned oldestDirtySequence;
-
-} yaffs_CheckpointDevice;
-
-
-typedef struct {
-    int structType;
-    __u32 magic;
-    __u32 version;
-    __u32 head;
-} yaffs_CheckpointValidity;
-
-/* Function to manipulate block info */
-static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-{
-	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-		   blk));
-		YBUG();
-	}
-	return &dev->blockInfo[blk - dev->internalStartBlock];
-}
-
-/*----------------------- YAFFS Functions -----------------------*/
-
-int yaffs_GutsInitialise(yaffs_Device * dev);
-void yaffs_Deinitialise(yaffs_Device * dev);
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-
-int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
-		       yaffs_Object * newDir, const YCHAR * newName);
-
-int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
-int yaffs_DeleteFile(yaffs_Object * obj);
-
-int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
-int yaffs_GetObjectFileLength(yaffs_Object * obj);
-int yaffs_GetObjectInode(yaffs_Object * obj);
-unsigned yaffs_GetObjectType(yaffs_Object * obj);
-int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-
-int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
-int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-
-/* File operations */
-int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
-			   int nBytes);
-int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
-			  int nBytes, int writeThrough);
-int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
-			      __u32 mode, __u32 uid, __u32 gid);
-int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-
-/* Flushing and checkpointing */
-void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-
-int yaffs_CheckpointSave(yaffs_Device *dev);
-int yaffs_CheckpointRestore(yaffs_Device *dev);
-
-/* Directory operations */
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
-				   __u32 mode, __u32 uid, __u32 gid);
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
-int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-				   int (*fn) (yaffs_Object *));
-
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-
-/* Link operations */
-yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
-			 yaffs_Object * equivalentObject);
-
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-
-/* Symlink operations */
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-				 __u32 mode, __u32 uid, __u32 gid,
-				 const YCHAR * alias);
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-
-/* Special inodes (fifos, sockets and devices) */
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
-
-/* Special directories */
-yaffs_Object *yaffs_Root(yaffs_Device * dev);
-yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-
-#ifdef CONFIG_YAFFS_WINCE
-/* CONFIG_YAFFS_WINCE special stuff */
-void yfsd_WinFileTimeNow(__u32 target[2]);
-#endif
-
-#ifdef __KERNEL__
-
-void yaffs_HandleDeferedFree(yaffs_Object * obj);
-#endif
-
-/* Debug dump  */
-int yaffs_DumpObject(yaffs_Object * obj);
-
-void yaffs_GutsTest(yaffs_Device * dev);
-
-/* A few useful functions */
-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
-void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
-int yaffs_CheckFF(__u8 * buffer, int nBytes);
-void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.c
deleted file mode 100644
index 466e5a44c6..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_mtdif_c_version =
-    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-
-#include "yportenv.h"
-
-
-#include "yaffs_mtdif.h"
-
-#include "linux/mtd/mtd.h"
-#include "linux/types.h"
-#include "linux/time.h"
-#include "linux/mtd/nand.h"
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-static struct nand_oobinfo yaffs_oobinfo = {
-	.useecc = 1,
-	.eccbytes = 6,
-	.eccpos = {8, 9, 10, 13, 14, 15}
-};
-
-static struct nand_oobinfo yaffs_noeccinfo = {
-	.useecc = 0,
-};
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
-{
-	oob[0] = spare->tagByte0;
-	oob[1] = spare->tagByte1;
-	oob[2] = spare->tagByte2;
-	oob[3] = spare->tagByte3;
-	oob[4] = spare->tagByte4;
-	oob[5] = spare->tagByte5 & 0x3f;
-	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
-	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-	oob[6] = spare->tagByte6;
-	oob[7] = spare->tagByte7;
-}
-
-static inline void translate_oob2spare(yaffs_Spare *spare, __u8 *oob)
-{
-	struct yaffs_NANDSpare *nspare = (struct yaffs_NANDSpare *)spare;
-	spare->tagByte0 = oob[0];
-	spare->tagByte1 = oob[1];
-	spare->tagByte2 = oob[2];
-	spare->tagByte3 = oob[3];
-	spare->tagByte4 = oob[4];
-	spare->tagByte5 = oob[5] == 0xff ? 0xff : oob[5] & 0x3f;
-	spare->blockStatus = oob[5] & 0x80 ? 0xff : 'Y';
-	spare->pageStatus = oob[5] & 0x40 ? 0xff : 0;
-	spare->ecc1[0] = spare->ecc1[1] = spare->ecc1[2] = 0xff;
-	spare->tagByte6 = oob[6];
-	spare->tagByte7 = oob[7];
-	spare->ecc2[0] = spare->ecc2[1] = spare->ecc2[2] = 0xff;
-
-	nspare->eccres1 = nspare->eccres2 = 0; /* FIXME */
-}
-#endif
-
-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
-			     const __u8 * data, const yaffs_Spare * spare)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	struct mtd_oob_ops ops;
-#endif
-	size_t dummy;
-	int retval = 0;
-
-	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	__u8 spareAsBytes[8]; /* OOB */
-
-	if (data && !spare)
-		retval = mtd->write(mtd, addr, dev->nDataBytesPerChunk,
-				&dummy, data);
-	else if (spare) {
-		if (dev->useNANDECC) {
-			translate_spare2oob(spare, spareAsBytes);
-			ops.mode = MTD_OOB_AUTO;
-			ops.ooblen = 8; /* temp hack */
-		} else {
-			ops.mode = MTD_OOB_RAW;
-			ops.ooblen = YAFFS_BYTES_PER_SPARE;
-		}
-		ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
-		ops.datbuf = (u8 *)data;
-		ops.ooboffs = 0;
-		ops.oobbuf = spareAsBytes;
-		retval = mtd->write_oob(mtd, addr, &ops);
-	}
-#else
-	__u8 *spareAsBytes = (__u8 *) spare;
-
-	if (data && spare) {
-		if (dev->useNANDECC)
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					   &dummy, data, spareAsBytes,
-					   &yaffs_oobinfo);
-		else
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					   &dummy, data, spareAsBytes,
-					   &yaffs_noeccinfo);
-	} else {
-		if (data)
-			retval =
-			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-				       data);
-		if (spare)
-			retval =
-			    mtd->write_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-					   &dummy, spareAsBytes);
-	}
-#endif
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
-			      yaffs_Spare * spare)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	struct mtd_oob_ops ops;
-#endif
-	size_t dummy;
-	int retval = 0;
-
-	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	__u8 spareAsBytes[8]; /* OOB */
-
-	if (data && !spare)
-		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-				&dummy, data);
-	else if (spare) {
-		if (dev->useNANDECC) {
-			ops.mode = MTD_OOB_AUTO;
-			ops.ooblen = 8; /* temp hack */
-		} else {
-			ops.mode = MTD_OOB_RAW;
-			ops.ooblen = YAFFS_BYTES_PER_SPARE;
-		}
-		ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
-		ops.datbuf = data;
-		ops.ooboffs = 0;
-		ops.oobbuf = spareAsBytes;
-		retval = mtd->read_oob(mtd, addr, &ops);
-		if (dev->useNANDECC)
-			translate_oob2spare(spare, spareAsBytes);
-	}
-#else
-	__u8 *spareAsBytes = (__u8 *) spare;
-
-	if (data && spare) {
-		if (dev->useNANDECC) {
-			/* Careful, this call adds 2 ints */
-			/* to the end of the spare data.  Calling function */
-			/* should allocate enough memory for spare, */
-			/* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					  &dummy, data, spareAsBytes,
-					  &yaffs_oobinfo);
-		} else {
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					  &dummy, data, spareAsBytes,
-					  &yaffs_noeccinfo);
-		}
-	} else {
-		if (data)
-			retval =
-			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-				      data);
-		if (spare)
-			retval =
-			    mtd->read_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-					  &dummy, spareAsBytes);
-	}
-#endif
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	__u32 addr =
-	    ((loff_t) blockNumber) * dev->nDataBytesPerChunk
-		* dev->nChunksPerBlock;
-	struct erase_info ei;
-	int retval = 0;
-
-	ei.mtd = mtd;
-	ei.addr = addr;
-	ei.len = dev->nDataBytesPerChunk * dev->nChunksPerBlock;
-	ei.time = 1000;
-	ei.retries = 2;
-	ei.callback = NULL;
-	ei.priv = (u_long) dev;
-
-	/* Todo finish off the ei if required */
-
-	sema_init(&dev->sem, 0);
-
-	retval = mtd->erase(mtd, &ei);
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
-int nandmtd_InitialiseNAND(yaffs_Device * dev)
-{
-	return YAFFS_OK;
-}
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.h
deleted file mode 100644
index 317600cac9..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_MTDIF_H__
-#define __YAFFS_MTDIF_H__
-
-#include "yaffs_guts.h"
-
-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
-			     const __u8 * data, const yaffs_Spare * spare);
-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
-			      yaffs_Spare * spare);
-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
-int nandmtd_InitialiseNAND(yaffs_Device * dev);
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1-compat.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1-compat.c
deleted file mode 100644
index 6a376f1f72..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1-compat.c
+++ /dev/null
@@ -1,434 +0,0 @@
-From ian@brightstareng.com Fri May 18 15:06:49 2007
-From ian@brightstareng.com Fri May 18 15:08:21 2007
-Received: from 206.173.66.57.ptr.us.xo.net ([206.173.66.57] helo=zebra.brightstareng.com)
-	by apollo.linkchoose.co.uk with esmtp (Exim 4.60)
-	(envelope-from <ian@brightstareng.com>)
-	id 1Hp380-00011e-T6
-	for david.goodenough@linkchoose.co.uk; Fri, 18 May 2007 15:08:21 +0100
-Received: from localhost (localhost.localdomain [127.0.0.1])
-	by zebra.brightstareng.com (Postfix) with ESMTP
-	id 4819F28C004; Fri, 18 May 2007 10:07:49 -0400 (EDT)
-Received: from zebra.brightstareng.com ([127.0.0.1])
- by localhost (zebra [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
- id 05328-06; Fri, 18 May 2007 10:07:16 -0400 (EDT)
-Received: from pippin (unknown [192.168.1.25])
-	by zebra.brightstareng.com (Postfix) with ESMTP
-	id 8BEF528C1BC; Fri, 18 May 2007 10:06:53 -0400 (EDT)
-From: Ian McDonnell <ian@brightstareng.com>
-To: David Goodenough <david.goodenough@linkchoose.co.uk>
-Subject: Re: something tested this time -- yaffs_mtdif1-compat.c
-Date: Fri, 18 May 2007 10:06:49 -0400
-User-Agent: KMail/1.9.1
-References: <200705142207.06909.ian@brightstareng.com> <200705171131.53536.ian@brightstareng.com> <200705181334.32166.david.goodenough@linkchoose.co.uk>
-In-Reply-To: <200705181334.32166.david.goodenough@linkchoose.co.uk>
-Cc: Andrea Conti <alyf@alyf.net>,
- Charles Manning <manningc2@actrix.gen.nz>
-MIME-Version: 1.0
-Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=_5LbTGmt62YoutxM"
-Message-Id: <200705181006.49860.ian@brightstareng.com>
-X-Virus-Scanned: by amavisd-new at brightstareng.com
-Status: R
-X-Status: NT
-X-KMail-EncryptionState:
-X-KMail-SignatureState:
-X-KMail-MDN-Sent:
-
---Boundary-00=_5LbTGmt62YoutxM
-Content-Type: text/plain;
-  charset="iso-8859-15"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-David, Andrea,
-
-On Friday 18 May 2007 08:34, you wrote:
-> Yea team.  With this fix in place (I put it in the wrong place
-> at first) I can now mount and ls the Yaffs partition without
-> an error messages!
-
-Good news!
-
-Attached is a newer yaffs_mtdif1.c with a bandaid to help the
-2.6.18 and 2.6.19 versions of MTD not trip on the oob read.
-See the LINUX_VERSION_CODE conditional in
-nandmtd1_ReadChunkWithTagsFromNAND.
-
--imcd
-
---Boundary-00=_5LbTGmt62YoutxM
-Content-Type: text/x-csrc;
-  charset="iso-8859-15";
-  name="yaffs_mtdif1.c"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-	filename="yaffs_mtdif1.c"
-
-/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffs_mtdif1.c  NAND mtd interface functions for small-page NAND.
- *
- * Copyright (C) 2002 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * This module provides the interface between yaffs_nand.c and the
- * MTD API.  This version is used when the MTD interface supports the
- * 'mtd_oob_ops' style calls to read_oob and write_oob, circa 2.6.17,
- * and we have small-page NAND device.
- *
- * These functions are invoked via function pointers in yaffs_nand.c.
- * This replaces functionality provided by functions in yaffs_mtdif.c
- * and the yaffs_TagsCompatability functions in yaffs_tagscompat.c that are
- * called in yaffs_mtdif.c when the function pointers are NULL.
- * We assume the MTD layer is performing ECC (useNANDECC is true).
- */
-
-#include "yportenv.h"
-#include "yaffs_guts.h"
-#include "yaffs_packedtags1.h"
-#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-
-#include "linux/kernel.h"
-#include "linux/version.h"
-#include "linux/types.h"
-#include "linux/mtd/mtd.h"
-
-/* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-
-const char *yaffs_mtdif1_c_version = "$Id$";
-
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-# define YTAG1_SIZE 8
-#else
-# define YTAG1_SIZE 9
-#endif
-
-#if 0
-/* Use the following nand_ecclayout with MTD when using
- * CONFIG_YAFFS_9BYTE_TAGS and the older on-NAND tags layout.
- * If you have existing Yaffs images and the byte order differs from this,
- * adjust 'oobfree' to match your existing Yaffs data.
- *
- * This nand_ecclayout scatters/gathers to/from the old-yaffs layout with the
- * pageStatus byte (at NAND spare offset 4) scattered/gathered from/to
- * the 9th byte.
- *
- * Old-style on-NAND format: T0,T1,T2,T3,P,B,T4,T5,E0,E1,E2,T6,T7,E3,E4,E5
- * We have/need PackedTags1 plus pageStatus: T0,T1,T2,T3,T4,T5,T6,T7,P
- * where Tn are the tag bytes, En are MTD's ECC bytes, P is the pageStatus
- * byte and B is the small-page bad-block indicator byte.
- */
-static struct nand_ecclayout nand_oob_16 = {
-	.eccbytes = 6,
-	.eccpos = { 8, 9, 10, 13, 14, 15 },
-	.oobavail = 9,
-	.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-};
-#endif
-
-/* Write a chunk (page) of data to NAND.
- *
- * Caller always provides ExtendedTags data which are converted to a more
- * compact (packed) form for storage in NAND.  A mini-ECC runs over the
- * contents of the tags meta-data; used to valid the tags when read.
- *
- *  - Pack ExtendedTags to PackedTags1 form
- *  - Compute mini-ECC for PackedTags1
- *  - Write data and packed tags to NAND.
- *
- * Note: Due to the use of the PackedTags1 meta-data which does not include
- * a full sequence number (as found in the larger PackedTags2 form) it is
- * necessary for Yaffs to re-write a chunk/page (just once) to mark it as
- * discarded and dirty.  This is not ideal: newer NAND parts are supposed
- * to be written just once.  When Yaffs performs this operation, this
- * function is called with a NULL data pointer -- calling MTD write_oob
- * without data is valid usage (2.6.17).
- *
- * Any underlying MTD error results in YAFFS_FAIL.
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkBytes = dev->nDataBytesPerChunk;
-	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
-	struct mtd_oob_ops ops;
-	yaffs_PackedTags1 pt1;
-	int retval;
-
-	/* we assume that PackedTags1 and yaffs_Tags are compatible */
-	compile_time_assertion(sizeof(yaffs_PackedTags1) == 12);
-	compile_time_assertion(sizeof(yaffs_Tags) == 8);
-
-	yaffs_PackTags1(&pt1, etags);
-	yaffs_CalcTagsECC((yaffs_Tags *)&pt1);
-
-	/* When deleting a chunk, the upper layer provides only skeletal
-	 * etags, one with chunkDeleted set.  However, we need to update the
-	 * tags, not erase them completely.  So we use the NAND write property
-	 * that only zeroed-bits stick and set tag bytes to all-ones and
-	 * zero just the (not) deleted bit.
-	 */
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-	if (etags->chunkDeleted) {
-		memset(&pt1, 0xff, 8);
-		/* clear delete status bit to indicate deleted */
-		pt1.deleted = 0;
-	}
-#else
-	((__u8 *)&pt1)[8] = 0xff;
-	if (etags->chunkDeleted) {
-		memset(&pt1, 0xff, 8);
-		/* zero pageStatus byte to indicate deleted */
-		((__u8 *)&pt1)[8] = 0;
-	}
-#endif
-
-	memset(&ops, 0, sizeof(ops));
-	ops.mode = MTD_OOB_AUTO;
-	ops.len = (data) ? chunkBytes : 0;
-	ops.ooblen = YTAG1_SIZE;
-	ops.datbuf = (__u8 *)data;
-	ops.oobbuf = (__u8 *)&pt1;
-
-	retval = mtd->write_oob(mtd, addr, &ops);
-	if (retval) {
-		yaffs_trace(YAFFS_TRACE_MTD,
-			"write_oob failed, chunk %d, mtd error %d\n",
-			chunkInNAND, retval);
-	}
-	return retval ? YAFFS_FAIL : YAFFS_OK;
-}
-
-/* Return with empty ExtendedTags but add eccResult.
- */
-static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-{
-	if (etags) {
-		memset(etags, 0, sizeof(*etags));
-		etags->eccResult = eccResult;
-	}
-	return retval;
-}
-
-/* Read a chunk (page) from NAND.
- *
- * Caller expects ExtendedTags data to be usable even on error; that is,
- * all members except eccResult and blockBad are zeroed.
- *
- *  - Check ECC results for data (if applicable)
- *  - Check for blank/erased block (return empty ExtendedTags if blank)
- *  - Check the PackedTags1 mini-ECC (correct if necessary/possible)
- *  - Convert PackedTags1 to ExtendedTags
- *  - Update eccResult and blockBad members to refect state.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
-	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkBytes = dev->nDataBytesPerChunk;
-	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
-	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-	struct mtd_oob_ops ops;
-	yaffs_PackedTags1 pt1;
-	int retval;
-	int deleted;
-
-	memset(&ops, 0, sizeof(ops));
-	ops.mode = MTD_OOB_AUTO;
-	ops.len = (data) ? chunkBytes : 0;
-	ops.ooblen = YTAG1_SIZE;
-	ops.datbuf = data;
-	ops.oobbuf = (__u8 *)&pt1;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
-	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
-	 */
-	ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
-#endif
-	/* Read page and oob using MTD.
-	 * Check status and determine ECC result.
-	 */
-	retval = mtd->read_oob(mtd, addr, &ops);
-	if (retval) {
-		yaffs_trace(YAFFS_TRACE_MTD,
-			"read_oob failed, chunk %d, mtd error %d\n",
-			chunkInNAND, retval);
-	}
-
-	switch (retval) {
-	case 0:
-		/* no error */
-		break;
-
-	case -EUCLEAN:
-		/* MTD's ECC fixed the data */
-		eccres = YAFFS_ECC_RESULT_FIXED;
-		dev->eccFixed++;
-		break;
-
-	case -EBADMSG:
-		/* MTD's ECC could not fix the data */
-		dev->eccUnfixed++;
-		/* fall into... */
-	default:
-		rettags(etags, YAFFS_ECC_RESULT_UNFIXED, 0);
-		etags->blockBad = (mtd->block_isbad)(mtd, addr);
-		return YAFFS_FAIL;
-	}
-
-	/* Check for a blank/erased chunk.
-	 */
-	if (yaffs_CheckFF((__u8 *)&pt1, 8)) {
-		/* when blank, upper layers want eccResult to be <= NO_ERROR */
-		return rettags(etags, YAFFS_ECC_RESULT_NO_ERROR, YAFFS_OK);
-	}
-
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-	/* Read deleted status (bit) then return it to it's non-deleted
-	 * state before performing tags mini-ECC check. pt1.deleted is
-	 * inverted.
-	 */
-	deleted = !pt1.deleted;
-	pt1.deleted = 1;
-#else
-	(void) deleted; /* not used */
-#endif
-
-	/* Check the packed tags mini-ECC and correct if necessary/possible.
-	 */
-	retval = yaffs_CheckECCOnTags((yaffs_Tags *)&pt1);
-	switch (retval) {
-	case 0:
-		/* no tags error, use MTD result */
-		break;
-	case 1:
-		/* recovered tags-ECC error */
-		dev->tagsEccFixed++;
-		eccres = YAFFS_ECC_RESULT_FIXED;
-		break;
-	default:
-		/* unrecovered tags-ECC error */
-		dev->tagsEccUnfixed++;
-		return rettags(etags, YAFFS_ECC_RESULT_UNFIXED, YAFFS_FAIL);
-	}
-
-	/* Unpack the tags to extended form and set ECC result.
-	 * [set shouldBeFF just to keep yaffs_UnpackTags1 happy]
-	 */
-	pt1.shouldBeFF = 0xFFFFFFFF;
-	yaffs_UnpackTags1(etags, &pt1);
-	etags->eccResult = eccres;
-
-	/* Set deleted state.
-	 */
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-	etags->chunkDeleted = deleted;
-#else
-	etags->chunkDeleted = (yaffs_CountBits(((__u8 *)&pt1)[8]) < 7);
-#endif
-	return YAFFS_OK;
-}
-
-/* Mark a block bad.
- *
- * This is a persistant state.
- * Use of this function should be rare.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
-	int retval;
-
-	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-
-	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
-	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-}
-
-/* Check any MTD prerequists.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-{
-	/* 2.6.18 has mtd->ecclayout->oobavail */
-	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-	int oobavail = mtd->ecclayout->oobavail;
-
-	if (oobavail < YTAG1_SIZE) {
-		yaffs_trace(YAFFS_TRACE_ERROR,
-			"mtd device has only %d bytes for tags, need %d",
-			oobavail, YTAG1_SIZE);
-		return YAFFS_FAIL;
-	}
-	return YAFFS_OK;
-}
-
-/* Query for the current state of a specific block.
- *
- * Examine the tags of the first chunk of the block and return the state:
- *  - YAFFS_BLOCK_STATE_DEAD, the block is marked bad
- *  - YAFFS_BLOCK_STATE_NEEDS_SCANNING, the block is in use
- *  - YAFFS_BLOCK_STATE_EMPTY, the block is clean
- *
- * Always returns YAFFS_OK.
- */
-int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-	yaffs_BlockState * pState, int *pSequenceNumber)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkNo = blockNo * dev->nChunksPerBlock;
-	yaffs_ExtendedTags etags;
-	int state = YAFFS_BLOCK_STATE_DEAD;
-	int seqnum = 0;
-	int retval;
-
-	/* We don't yet have a good place to test for MTD config prerequists.
-	 * Do it here as we are called during the initial scan.
-	 */
-	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-		return YAFFS_FAIL;
-	}
-
-	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-	if (etags.blockBad) {
-		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-			"block %d is marked bad", blockNo);
-		state = YAFFS_BLOCK_STATE_DEAD;
-	}
-	else if (etags.chunkUsed) {
-		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-		seqnum = etags.sequenceNumber;
-	}
-	else {
-		state = YAFFS_BLOCK_STATE_EMPTY;
-	}
-
-	*pState = state;
-	*pSequenceNumber = seqnum;
-
-	/* query always succeeds */
-	return YAFFS_OK;
-}
-
-#endif /*KERNEL_VERSION*/
-
---Boundary-00=_5LbTGmt62YoutxM--
-
-
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.c
deleted file mode 100644
index 36d5adec5c..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffs_mtdif1.c  NAND mtd interface functions for small-page NAND.
- *
- * Copyright (C) 2002 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * This module provides the interface between yaffs_nand.c and the
- * MTD API.  This version is used when the MTD interface supports the
- * 'mtd_oob_ops' style calls to read_oob and write_oob, circa 2.6.17,
- * and we have small-page NAND device.
- *
- * These functions are invoked via function pointers in yaffs_nand.c.
- * This replaces functionality provided by functions in yaffs_mtdif.c
- * and the yaffs_TagsCompatability functions in yaffs_tagscompat.c that are
- * called in yaffs_mtdif.c when the function pointers are NULL.
- * We assume the MTD layer is performing ECC (useNANDECC is true).
- */
-
-#include "yportenv.h"
-#include "yaffs_guts.h"
-#include "yaffs_packedtags1.h"
-#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-
-#include "linux/kernel.h"
-#include "linux/version.h"
-#include "linux/types.h"
-#include "linux/mtd/mtd.h"
-
-/* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-
-const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-# define YTAG1_SIZE 8
-#else
-# define YTAG1_SIZE 9
-#endif
-
-#if 0
-/* Use the following nand_ecclayout with MTD when using
- * CONFIG_YAFFS_9BYTE_TAGS and the older on-NAND tags layout.
- * If you have existing Yaffs images and the byte order differs from this,
- * adjust 'oobfree' to match your existing Yaffs data.
- *
- * This nand_ecclayout scatters/gathers to/from the old-yaffs layout with the
- * pageStatus byte (at NAND spare offset 4) scattered/gathered from/to
- * the 9th byte.
- *
- * Old-style on-NAND format: T0,T1,T2,T3,P,B,T4,T5,E0,E1,E2,T6,T7,E3,E4,E5
- * We have/need PackedTags1 plus pageStatus: T0,T1,T2,T3,T4,T5,T6,T7,P
- * where Tn are the tag bytes, En are MTD's ECC bytes, P is the pageStatus
- * byte and B is the small-page bad-block indicator byte.
- */
-static struct nand_ecclayout nand_oob_16 = {
-	.eccbytes = 6,
-	.eccpos = { 8, 9, 10, 13, 14, 15 },
-	.oobavail = 9,
-	.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-};
-#endif
-
-/* Write a chunk (page) of data to NAND.
- *
- * Caller always provides ExtendedTags data which are converted to a more
- * compact (packed) form for storage in NAND.  A mini-ECC runs over the
- * contents of the tags meta-data; used to valid the tags when read.
- *
- *  - Pack ExtendedTags to PackedTags1 form
- *  - Compute mini-ECC for PackedTags1
- *  - Write data and packed tags to NAND.
- *
- * Note: Due to the use of the PackedTags1 meta-data which does not include
- * a full sequence number (as found in the larger PackedTags2 form) it is
- * necessary for Yaffs to re-write a chunk/page (just once) to mark it as
- * discarded and dirty.  This is not ideal: newer NAND parts are supposed
- * to be written just once.  When Yaffs performs this operation, this
- * function is called with a NULL data pointer -- calling MTD write_oob
- * without data is valid usage (2.6.17).
- *
- * Any underlying MTD error results in YAFFS_FAIL.
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkBytes = dev->nDataBytesPerChunk;
-	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
-	struct mtd_oob_ops ops;
-	yaffs_PackedTags1 pt1;
-	int retval;
-
-	/* we assume that PackedTags1 and yaffs_Tags are compatible */
-	compile_time_assertion(sizeof(yaffs_PackedTags1) == 12);
-	compile_time_assertion(sizeof(yaffs_Tags) == 8);
-
-	dev->nPageWrites++;
-
-	yaffs_PackTags1(&pt1, etags);
-	yaffs_CalcTagsECC((yaffs_Tags *)&pt1);
-
-	/* When deleting a chunk, the upper layer provides only skeletal
-	 * etags, one with chunkDeleted set.  However, we need to update the
-	 * tags, not erase them completely.  So we use the NAND write property
-	 * that only zeroed-bits stick and set tag bytes to all-ones and
-	 * zero just the (not) deleted bit.
-	 */
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-	if (etags->chunkDeleted) {
-		memset(&pt1, 0xff, 8);
-		/* clear delete status bit to indicate deleted */
-		pt1.deleted = 0;
-	}
-#else
-	((__u8 *)&pt1)[8] = 0xff;
-	if (etags->chunkDeleted) {
-		memset(&pt1, 0xff, 8);
-		/* zero pageStatus byte to indicate deleted */
-		((__u8 *)&pt1)[8] = 0;
-	}
-#endif
-
-	memset(&ops, 0, sizeof(ops));
-	ops.mode = MTD_OOB_AUTO;
-	ops.len = (data) ? chunkBytes : 0;
-	ops.ooblen = YTAG1_SIZE;
-	ops.datbuf = (__u8 *)data;
-	ops.oobbuf = (__u8 *)&pt1;
-
-	retval = mtd->write_oob(mtd, addr, &ops);
-	if (retval) {
-		yaffs_trace(YAFFS_TRACE_MTD,
-			"write_oob failed, chunk %d, mtd error %d\n",
-			chunkInNAND, retval);
-	}
-	return retval ? YAFFS_FAIL : YAFFS_OK;
-}
-
-/* Return with empty ExtendedTags but add eccResult.
- */
-static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-{
-	if (etags) {
-		memset(etags, 0, sizeof(*etags));
-		etags->eccResult = eccResult;
-	}
-	return retval;
-}
-
-/* Read a chunk (page) from NAND.
- *
- * Caller expects ExtendedTags data to be usable even on error; that is,
- * all members except eccResult and blockBad are zeroed.
- *
- *  - Check ECC results for data (if applicable)
- *  - Check for blank/erased block (return empty ExtendedTags if blank)
- *  - Check the PackedTags1 mini-ECC (correct if necessary/possible)
- *  - Convert PackedTags1 to ExtendedTags
- *  - Update eccResult and blockBad members to refect state.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
-	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkBytes = dev->nDataBytesPerChunk;
-	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
-	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-	struct mtd_oob_ops ops;
-	yaffs_PackedTags1 pt1;
-	int retval;
-	int deleted;
-
-	dev->nPageReads++;
-
-	memset(&ops, 0, sizeof(ops));
-	ops.mode = MTD_OOB_AUTO;
-	ops.len = (data) ? chunkBytes : 0;
-	ops.ooblen = YTAG1_SIZE;
-	ops.datbuf = data;
-	ops.oobbuf = (__u8 *)&pt1;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
-	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
-	 */
-	ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
-#endif
-	/* Read page and oob using MTD.
-	 * Check status and determine ECC result.
-	 */
-	retval = mtd->read_oob(mtd, addr, &ops);
-	if (retval) {
-		yaffs_trace(YAFFS_TRACE_MTD,
-			"read_oob failed, chunk %d, mtd error %d\n",
-			chunkInNAND, retval);
-	}
-
-	switch (retval) {
-	case 0:
-		/* no error */
-		break;
-
-	case -EUCLEAN:
-		/* MTD's ECC fixed the data */
-		eccres = YAFFS_ECC_RESULT_FIXED;
-		dev->eccFixed++;
-		break;
-
-	case -EBADMSG:
-		/* MTD's ECC could not fix the data */
-		dev->eccUnfixed++;
-		/* fall into... */
-	default:
-		rettags(etags, YAFFS_ECC_RESULT_UNFIXED, 0);
-		etags->blockBad = (mtd->block_isbad)(mtd, addr);
-		return YAFFS_FAIL;
-	}
-
-	/* Check for a blank/erased chunk.
-	 */
-	if (yaffs_CheckFF((__u8 *)&pt1, 8)) {
-		/* when blank, upper layers want eccResult to be <= NO_ERROR */
-		return rettags(etags, YAFFS_ECC_RESULT_NO_ERROR, YAFFS_OK);
-	}
-
-#ifndef CONFIG_YAFFS_9BYTE_TAGS
-	/* Read deleted status (bit) then return it to it's non-deleted
-	 * state before performing tags mini-ECC check. pt1.deleted is
-	 * inverted.
-	 */
-	deleted = !pt1.deleted;
-	pt1.deleted = 1;
-#else
-	deleted = (yaffs_CountBits(((__u8 *)&pt1)[8]) < 7);
-#endif
-
-	/* Check the packed tags mini-ECC and correct if necessary/possible.
-	 */
-	retval = yaffs_CheckECCOnTags((yaffs_Tags *)&pt1);
-	switch (retval) {
-	case 0:
-		/* no tags error, use MTD result */
-		break;
-	case 1:
-		/* recovered tags-ECC error */
-		dev->tagsEccFixed++;
-		if (eccres == YAFFS_ECC_RESULT_NO_ERROR)
-			eccres = YAFFS_ECC_RESULT_FIXED;
-		break;
-	default:
-		/* unrecovered tags-ECC error */
-		dev->tagsEccUnfixed++;
-		return rettags(etags, YAFFS_ECC_RESULT_UNFIXED, YAFFS_FAIL);
-	}
-
-	/* Unpack the tags to extended form and set ECC result.
-	 * [set shouldBeFF just to keep yaffs_UnpackTags1 happy]
-	 */
-	pt1.shouldBeFF = 0xFFFFFFFF;
-	yaffs_UnpackTags1(etags, &pt1);
-	etags->eccResult = eccres;
-
-	/* Set deleted state */
-	etags->chunkDeleted = deleted;
-	return YAFFS_OK;
-}
-
-/* Mark a block bad.
- *
- * This is a persistant state.
- * Use of this function should be rare.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
-	int retval;
-
-	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-
-	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
-	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-}
-
-/* Check any MTD prerequists.
- *
- * Returns YAFFS_OK or YAFFS_FAIL.
- */
-static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-{
-	/* 2.6.18 has mtd->ecclayout->oobavail */
-	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-	int oobavail = mtd->ecclayout->oobavail;
-
-	if (oobavail < YTAG1_SIZE) {
-		yaffs_trace(YAFFS_TRACE_ERROR,
-			"mtd device has only %d bytes for tags, need %d\n",
-			oobavail, YTAG1_SIZE);
-		return YAFFS_FAIL;
-	}
-	return YAFFS_OK;
-}
-
-/* Query for the current state of a specific block.
- *
- * Examine the tags of the first chunk of the block and return the state:
- *  - YAFFS_BLOCK_STATE_DEAD, the block is marked bad
- *  - YAFFS_BLOCK_STATE_NEEDS_SCANNING, the block is in use
- *  - YAFFS_BLOCK_STATE_EMPTY, the block is clean
- *
- * Always returns YAFFS_OK.
- */
-int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-	yaffs_BlockState * pState, int *pSequenceNumber)
-{
-	struct mtd_info * mtd = dev->genericDevice;
-	int chunkNo = blockNo * dev->nChunksPerBlock;
-	yaffs_ExtendedTags etags;
-	int state = YAFFS_BLOCK_STATE_DEAD;
-	int seqnum = 0;
-	int retval;
-
-	/* We don't yet have a good place to test for MTD config prerequists.
-	 * Do it here as we are called during the initial scan.
-	 */
-	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-		return YAFFS_FAIL;
-	}
-
-	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-	if (etags.blockBad) {
-		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-			"block %d is marked bad", blockNo);
-		state = YAFFS_BLOCK_STATE_DEAD;
-	}
-	else if (etags.chunkUsed) {
-		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-		seqnum = etags.sequenceNumber;
-	}
-	else {
-		state = YAFFS_BLOCK_STATE_EMPTY;
-	}
-
-	*pState = state;
-	*pSequenceNumber = seqnum;
-
-	/* query always succeeds */
-	return YAFFS_OK;
-}
-
-#endif /*KERNEL_VERSION*/
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.h
deleted file mode 100644
index c4f6197d68..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_MTDIF1_H__
-#define __YAFFS_MTDIF1_H__
-
-int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
-	const __u8 * data, const yaffs_ExtendedTags * tags);
-
-int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-	__u8 * data, yaffs_ExtendedTags * tags);
-
-int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
-
-int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-	yaffs_BlockState * state, int *sequenceNumber);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.c
deleted file mode 100644
index cdad0734bf..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/* mtd interface for YAFFS2 */
-
-const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-
-#include "yportenv.h"
-
-
-#include "yaffs_mtdif2.h"
-
-#include "linux/mtd/mtd.h"
-#include "linux/types.h"
-#include "linux/time.h"
-
-#include "yaffs_packedtags2.h"
-
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
-				      const __u8 * data,
-				      const yaffs_ExtendedTags * tags)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	struct mtd_oob_ops ops;
-#else
-	size_t dummy;
-#endif
-	int retval = 0;
-
-	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-
-	yaffs_PackedTags2 pt;
-
-	T(YAFFS_TRACE_MTD,
-	  (TSTR
-	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
-	    TENDSTR), chunkInNAND, data, tags));
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	if (tags)
-		yaffs_PackTags2(&pt, tags);
-	else
-		BUG(); /* both tags and data should always be present */
-
-	if (data) {
-		ops.mode = MTD_OOB_AUTO;
-		ops.ooblen = sizeof(pt);
-		ops.len = dev->nDataBytesPerChunk;
-		ops.ooboffs = 0;
-		ops.datbuf = (__u8 *)data;
-		ops.oobbuf = (void *)&pt;
-		retval = mtd->write_oob(mtd, addr, &ops);
-	} else
-		BUG(); /* both tags and data should always be present */
-#else
-	if (tags) {
-		yaffs_PackTags2(&pt, tags);
-	}
-
-	if (data && tags) {
-		if (dev->useNANDECC)
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					   &dummy, data, (__u8 *) & pt, NULL);
-		else
-			retval =
-			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					   &dummy, data, (__u8 *) & pt, NULL);
-	} else {
-		if (data)
-			retval =
-			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-				       data);
-		if (tags)
-			retval =
-			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
-					   (__u8 *) & pt);
-
-	}
-#endif
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-				       __u8 * data, yaffs_ExtendedTags * tags)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	struct mtd_oob_ops ops;
-#endif
-	size_t dummy;
-	int retval = 0;
-
-	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-
-	yaffs_PackedTags2 pt;
-
-	T(YAFFS_TRACE_MTD,
-	  (TSTR
-	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
-	    TENDSTR), chunkInNAND, data, tags));
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-	if (data && !tags)
-		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-				&dummy, data);
-	else if (tags) {
-		ops.mode = MTD_OOB_AUTO;
-		ops.ooblen = sizeof(pt);
-		ops.len = data ? dev->nDataBytesPerChunk : sizeof(pt);
-		ops.ooboffs = 0;
-		ops.datbuf = data;
-		ops.oobbuf = dev->spareBuffer;
-		retval = mtd->read_oob(mtd, addr, &ops);
-	}
-#else
-	if (data && tags) {
-		if (dev->useNANDECC) {
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					  &dummy, data, dev->spareBuffer,
-					  NULL);
-		} else {
-			retval =
-			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-					  &dummy, data, dev->spareBuffer,
-					  NULL);
-		}
-	} else {
-		if (data)
-			retval =
-			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-				      data);
-		if (tags)
-			retval =
-			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
-					  dev->spareBuffer);
-	}
-#endif
-
-	memcpy(&pt, dev->spareBuffer, sizeof(pt));
-
-	if (tags)
-		yaffs_UnpackTags2(tags, &pt);
-
-	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
-int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	int retval;
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
-
-	retval =
-	    mtd->block_markbad(mtd,
-			       blockNo * dev->nChunksPerBlock *
-			       dev->nDataBytesPerChunk);
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-
-}
-
-int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-			    yaffs_BlockState * state, int *sequenceNumber)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	int retval;
-
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
-	retval =
-	    mtd->block_isbad(mtd,
-			     blockNo * dev->nChunksPerBlock *
-			     dev->nDataBytesPerChunk);
-
-	if (retval) {
-		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
-
-		*state = YAFFS_BLOCK_STATE_DEAD;
-		*sequenceNumber = 0;
-	} else {
-		yaffs_ExtendedTags t;
-		nandmtd2_ReadChunkWithTagsFromNAND(dev,
-						   blockNo *
-						   dev->nChunksPerBlock, NULL,
-						   &t);
-
-		if (t.chunkUsed) {
-			*sequenceNumber = t.sequenceNumber;
-			*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-		} else {
-			*sequenceNumber = 0;
-			*state = YAFFS_BLOCK_STATE_EMPTY;
-		}
-	}
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,
-	   *state));
-
-	if (retval == 0)
-		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
-}
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.h
deleted file mode 100644
index b67ba52aa4..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_MTDIF2_H__
-#define __YAFFS_MTDIF2_H__
-
-#include "yaffs_guts.h"
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
-				      const __u8 * data,
-				      const yaffs_ExtendedTags * tags);
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-				       __u8 * data, yaffs_ExtendedTags * tags);
-int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
-int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-			    yaffs_BlockState * state, int *sequenceNumber);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
deleted file mode 100644
index 4e250338d7..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-
-#include "yaffs_nand.h"
-#include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
-
-
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-					   __u8 * buffer,
-					   yaffs_ExtendedTags * tags)
-{
-	int result;
-	yaffs_ExtendedTags localTags;
-
-	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
-
-	/* If there are no tags provided, use local tags to get prioritised gc working */
-	if(!tags)
-		tags = &localTags;
-
-	if (dev->readChunkWithTagsFromNAND)
-		result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
-						      tags);
-	else
-		result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
-									realignedChunkInNAND,
-									buffer,
-									tags);
-	if(tags &&
-	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-
-		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-                yaffs_HandleChunkError(dev,bi);
-	}
-
-	return result;
-}
-
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-						   int chunkInNAND,
-						   const __u8 * buffer,
-						   yaffs_ExtendedTags * tags)
-{
-	chunkInNAND -= dev->chunkOffset;
-
-
-	if (tags) {
-		tags->sequenceNumber = dev->sequenceNumber;
-		tags->chunkUsed = 1;
-		if (!yaffs_ValidateTags(tags)) {
-			T(YAFFS_TRACE_ERROR,
-			  (TSTR("Writing uninitialised tags" TENDSTR)));
-			YBUG();
-		}
-		T(YAFFS_TRACE_WRITE,
-		  (TSTR("Writing chunk %d tags %d %d" TENDSTR), chunkInNAND,
-		   tags->objectId, tags->chunkId));
-	} else {
-		T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
-		YBUG();
-	}
-
-	if (dev->writeChunkWithTagsToNAND)
-		return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
-						     tags);
-	else
-		return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
-								       chunkInNAND,
-								       buffer,
-								       tags);
-}
-
-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-{
-	blockNo -= dev->blockOffset;
-
-;
-	if (dev->markNANDBlockBad)
-		return dev->markNANDBlockBad(dev, blockNo);
-	else
-		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
-}
-
-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-						 int blockNo,
-						 yaffs_BlockState * state,
-						 unsigned *sequenceNumber)
-{
-	blockNo -= dev->blockOffset;
-
-	if (dev->queryNANDBlock)
-		return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
-	else
-		return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
-							     state,
-							     sequenceNumber);
-}
-
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				  int blockInNAND)
-{
-	int result;
-
-	blockInNAND -= dev->blockOffset;
-
-
-	dev->nBlockErasures++;
-	result = dev->eraseBlockInNAND(dev, blockInNAND);
-
-	return result;
-}
-
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
-{
-	return dev->initialiseNAND(dev);
-}
-
-
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.h
deleted file mode 100644
index 5fa334bdc9..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_NAND_H__
-#define __YAFFS_NAND_H__
-#include "yaffs_guts.h"
-
-
-
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-					   __u8 * buffer,
-					   yaffs_ExtendedTags * tags);
-
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-						   int chunkInNAND,
-						   const __u8 * buffer,
-						   yaffs_ExtendedTags * tags);
-
-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
-
-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-						 int blockNo,
-						 yaffs_BlockState * state,
-						 unsigned *sequenceNumber);
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				  int blockInNAND);
-
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev);
-
-#endif
-
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nandemul2k.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nandemul2k.h
deleted file mode 100644
index cd2e96f7ae..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nandemul2k.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/* Interface to emulated NAND functions (2k page size) */
-
-#ifndef __YAFFS_NANDEMUL2K_H__
-#define __YAFFS_NANDEMUL2K_H__
-
-#include "yaffs_guts.h"
-
-int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-					int chunkInNAND, const __u8 * data,
-					yaffs_ExtendedTags * tags);
-int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
-					 int chunkInNAND, __u8 * data,
-					 yaffs_ExtendedTags * tags);
-int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
-int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-			      yaffs_BlockState * state, int *sequenceNumber);
-int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				int blockInNAND);
-int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
-int nandemul2k_GetBytesPerChunk(void);
-int nandemul2k_GetChunksPerBlock(void);
-int nandemul2k_GetNumberOfBlocks(void);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.c
deleted file mode 100644
index f480bf1df1..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_packedtags1.h"
-#include "yportenv.h"
-
-void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-{
-	pt->chunkId = t->chunkId;
-	pt->serialNumber = t->serialNumber;
-	pt->byteCount = t->byteCount;
-	pt->objectId = t->objectId;
-	pt->ecc = 0;
-	pt->deleted = (t->chunkDeleted) ? 0 : 1;
-	pt->unusedStuff = 0;
-	pt->shouldBeFF = 0xFFFFFFFF;
-
-}
-
-void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-{
-	static const __u8 allFF[] =
-	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff };
-
-	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
-		t->blockBad = 0;
-		if (pt->shouldBeFF != 0xFFFFFFFF) {
-			t->blockBad = 1;
-		}
-		t->chunkUsed = 1;
-		t->objectId = pt->objectId;
-		t->chunkId = pt->chunkId;
-		t->byteCount = pt->byteCount;
-		t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		t->chunkDeleted = (pt->deleted) ? 0 : 1;
-		t->serialNumber = pt->serialNumber;
-	} else {
-		memset(t, 0, sizeof(yaffs_ExtendedTags));
-
-	}
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.h
deleted file mode 100644
index 776c5c256c..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/* This is used to pack YAFFS1 tags, not YAFFS2 tags. */
-
-#ifndef __YAFFS_PACKEDTAGS1_H__
-#define __YAFFS_PACKEDTAGS1_H__
-
-#include "yaffs_guts.h"
-
-typedef struct {
-	unsigned chunkId:20;
-	unsigned serialNumber:2;
-	unsigned byteCount:10;
-	unsigned objectId:18;
-	unsigned ecc:12;
-	unsigned deleted:1;
-	unsigned unusedStuff:1;
-	unsigned shouldBeFF;
-
-} yaffs_PackedTags1;
-
-void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
-void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.c
deleted file mode 100644
index e420f95da1..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_packedtags2.h"
-#include "yportenv.h"
-#include "yaffs_tagsvalidity.h"
-
-/* This code packs a set of extended tags into a binary structure for
- * NAND storage
- */
-
-/* Some of the information is "extra" struff which can be packed in to
- * speed scanning
- * This is defined by having the EXTRA_HEADER_INFO_FLAG set.
- */
-
-/* Extra flags applied to chunkId */
-
-#define EXTRA_HEADER_INFO_FLAG	0x80000000
-#define EXTRA_SHRINK_FLAG	0x40000000
-#define EXTRA_SHADOWS_FLAG	0x20000000
-#define EXTRA_SPARE_FLAGS	0x10000000
-
-#define ALL_EXTRA_FLAGS		0xF0000000
-
-/* Also, the top 4 bits of the object Id are set to the object type. */
-#define EXTRA_OBJECT_TYPE_SHIFT (28)
-#define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
-
-static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-{
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
-	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
-	   pt->t.sequenceNumber));
-}
-
-static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-{
-	T(YAFFS_TRACE_MTD,
-	  (TSTR
-	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
-	    "%d del %d ser %d seq %d"
-	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
-	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
-	   t->sequenceNumber));
-
-}
-
-void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-{
-	pt->t.chunkId = t->chunkId;
-	pt->t.sequenceNumber = t->sequenceNumber;
-	pt->t.byteCount = t->byteCount;
-	pt->t.objectId = t->objectId;
-
-	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
-		/* Store the extra header info instead */
-		/* We save the parent object in the chunkId */
-		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-			| t->extraParentObjectId;
-		if (t->extraIsShrinkHeader) {
-			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
-		}
-		if (t->extraShadows) {
-			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
-		}
-
-		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-		pt->t.objectId |=
-		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
-
-		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
-			pt->t.byteCount = t->extraEquivalentObjectId;
-		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
-			pt->t.byteCount = t->extraFileLength;
-		} else {
-			pt->t.byteCount = 0;
-		}
-	}
-
-	yaffs_DumpPackedTags2(pt);
-	yaffs_DumpTags2(t);
-
-#ifndef YAFFS_IGNORE_TAGS_ECC
-	{
-		yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-					sizeof(yaffs_PackedTags2TagsPart),
-					&pt->ecc);
-	}
-#endif
-}
-
-void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-{
-
-	memset(t, 0, sizeof(yaffs_ExtendedTags));
-
-	yaffs_InitialiseTags(t);
-
-	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-		/* Page is in use */
-#ifdef YAFFS_IGNORE_TAGS_ECC
-		{
-			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		}
-#else
-		{
-			yaffs_ECCOther ecc;
-			int result;
-			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-						sizeof
-						(yaffs_PackedTags2TagsPart),
-						&ecc);
-			result =
-			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-						  sizeof
-						  (yaffs_PackedTags2TagsPart),
-						  &pt->ecc, &ecc);
-			switch(result){
-				case 0:
-					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-					break;
-				case 1:
-					t->eccResult = YAFFS_ECC_RESULT_FIXED;
-					break;
-				case -1:
-					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-					break;
-				default:
-					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
-			}
-		}
-#endif
-		t->blockBad = 0;
-		t->chunkUsed = 1;
-		t->objectId = pt->t.objectId;
-		t->chunkId = pt->t.chunkId;
-		t->byteCount = pt->t.byteCount;
-		t->chunkDeleted = 0;
-		t->serialNumber = 0;
-		t->sequenceNumber = pt->t.sequenceNumber;
-
-		/* Do extra header info stuff */
-
-		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-			t->chunkId = 0;
-			t->byteCount = 0;
-
-			t->extraHeaderInfoAvailable = 1;
-			t->extraParentObjectId =
-			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-			t->extraIsShrinkHeader =
-			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-			t->extraShadows =
-			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-			t->extraObjectType =
-			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-
-			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
-				t->extraEquivalentObjectId = pt->t.byteCount;
-			} else {
-				t->extraFileLength = pt->t.byteCount;
-			}
-		}
-	}
-
-	yaffs_DumpPackedTags2(pt);
-	yaffs_DumpTags2(t);
-
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.h
deleted file mode 100644
index c2242ffe76..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/* This is used to pack YAFFS2 tags, not YAFFS1tags. */
-
-#ifndef __YAFFS_PACKEDTAGS2_H__
-#define __YAFFS_PACKEDTAGS2_H__
-
-#include "yaffs_guts.h"
-#include "yaffs_ecc.h"
-
-typedef struct {
-	unsigned sequenceNumber;
-	unsigned objectId;
-	unsigned chunkId;
-	unsigned byteCount;
-} yaffs_PackedTags2TagsPart;
-
-typedef struct {
-	yaffs_PackedTags2TagsPart t;
-	yaffs_ECCOther ecc;
-} yaffs_PackedTags2;
-
-void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
-void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.c
deleted file mode 100644
index 474be9cea3..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "yportenv.h"
-//#include <linux/string.h>
-
-/*
- * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
- */
-#define swapcode(TYPE, parmi, parmj, n) { 		\
-	long i = (n) / sizeof (TYPE); 			\
-	register TYPE *pi = (TYPE *) (parmi); 		\
-	register TYPE *pj = (TYPE *) (parmj); 		\
-	do { 						\
-		register TYPE	t = *pi;		\
-		*pi++ = *pj;				\
-		*pj++ = t;				\
-        } while (--i > 0);				\
-}
-
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static __inline void
-swapfunc(char *a, char *b, int n, int swaptype)
-{
-	if (swaptype <= 1)
-		swapcode(long, a, b, n)
-	else
-		swapcode(char, a, b, n)
-}
-
-#define swap(a, b)					\
-	if (swaptype == 0) {				\
-		long t = *(long *)(a);			\
-		*(long *)(a) = *(long *)(b);		\
-		*(long *)(b) = t;			\
-	} else						\
-		swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
-
-static __inline char *
-med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
-{
-	return cmp(a, b) < 0 ?
-	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
-              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-}
-
-#ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-void
-yaffs_qsort(void *aa, size_t n, size_t es,
-	int (*cmp)(const void *, const void *))
-{
-	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-	int d, r, swaptype, swap_cnt;
-	register char *a = aa;
-
-loop:	SWAPINIT(a, es);
-	swap_cnt = 0;
-	if (n < 7) {
-		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
-			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-	pm = (char *)a + (n / 2) * es;
-	if (n > 7) {
-		pl = (char *)a;
-		pn = (char *)a + (n - 1) * es;
-		if (n > 40) {
-			d = (n / 8) * es;
-			pl = med3(pl, pl + d, pl + 2 * d, cmp);
-			pm = med3(pm - d, pm, pm + d, cmp);
-			pn = med3(pn - 2 * d, pn - d, pn, cmp);
-		}
-		pm = med3(pl, pm, pn, cmp);
-	}
-	swap(a, pm);
-	pa = pb = (char *)a + es;
-
-	pc = pd = (char *)a + (n - 1) * es;
-	for (;;) {
-		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
-			if (r == 0) {
-				swap_cnt = 1;
-				swap(pa, pb);
-				pa += es;
-			}
-			pb += es;
-		}
-		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
-			if (r == 0) {
-				swap_cnt = 1;
-				swap(pc, pd);
-				pd -= es;
-			}
-			pc -= es;
-		}
-		if (pb > pc)
-			break;
-		swap(pb, pc);
-		swap_cnt = 1;
-		pb += es;
-		pc -= es;
-	}
-	if (swap_cnt == 0) {  /* Switch to insertion sort */
-		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
-			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-
-	pn = (char *)a + n * es;
-	r = min(pa - (char *)a, pb - pa);
-	vecswap(a, pb - r, r);
-	r = min((long)(pd - pc), (long)(pn - pd - es));
-	vecswap(pb, pn - r, r);
-	if ((r = pb - pa) > es)
-		yaffs_qsort(a, r / es, es, cmp);
-	if ((r = pd - pc) > es) {
-		/* Iterate rather than recurse to save stack space */
-		a = pn - r;
-		n = r / es;
-		goto loop;
-	}
-/*		yaffs_qsort(pn - r, r / es, es, cmp);*/
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.h
deleted file mode 100644
index 610b7ec849..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YAFFS_QSORT_H__
-#define __YAFFS_QSORT_H__
-
-extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
-                   int (*cmp)(const void *, const void *));
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.c
deleted file mode 100644
index 7622b1af7c..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_guts.h"
-#include "yaffs_tagscompat.h"
-#include "yaffs_ecc.h"
-
-static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-#ifdef NOTYET
-static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-				     const __u8 * data,
-				     const yaffs_Spare * spare);
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-				    const yaffs_Spare * spare);
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-#endif
-
-static const char yaffs_countBitsTable[256] = {
-	0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-	4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
-};
-
-int yaffs_CountBits(__u8 x)
-{
-	int retVal;
-	retVal = yaffs_countBitsTable[x];
-	return retVal;
-}
-
-/********** Tags ECC calculations  *********/
-
-void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-{
-	yaffs_ECCCalculate(data, spare->ecc1);
-	yaffs_ECCCalculate(&data[256], spare->ecc2);
-}
-
-void yaffs_CalcTagsECC(yaffs_Tags * tags)
-{
-	/* Calculate an ecc */
-
-	unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
-	unsigned i, j;
-	unsigned ecc = 0;
-	unsigned bit = 0;
-
-	tags->ecc = 0;
-
-	for (i = 0; i < 8; i++) {
-		for (j = 1; j & 0xff; j <<= 1) {
-			bit++;
-			if (b[i] & j) {
-				ecc ^= bit;
-			}
-		}
-	}
-
-	tags->ecc = ecc;
-
-}
-
-int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-{
-	unsigned ecc = tags->ecc;
-
-	yaffs_CalcTagsECC(tags);
-
-	ecc ^= tags->ecc;
-
-	if (ecc && ecc <= 64) {
-		/* TODO: Handle the failure better. Retire? */
-		unsigned char *b = ((yaffs_TagsUnion *) tags)->asBytes;
-
-		ecc--;
-
-		b[ecc / 8] ^= (1 << (ecc & 7));
-
-		/* Now recvalc the ecc */
-		yaffs_CalcTagsECC(tags);
-
-		return 1;	/* recovered error */
-	} else if (ecc) {
-		/* Wierd ecc failure value */
-		/* TODO Need to do somethiong here */
-		return -1;	/* unrecovered error */
-	}
-
-	return 0;
-}
-
-/********** Tags **********/
-
-static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
-				    yaffs_Tags * tagsPtr)
-{
-	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
-
-	yaffs_CalcTagsECC(tagsPtr);
-
-	sparePtr->tagByte0 = tu->asBytes[0];
-	sparePtr->tagByte1 = tu->asBytes[1];
-	sparePtr->tagByte2 = tu->asBytes[2];
-	sparePtr->tagByte3 = tu->asBytes[3];
-	sparePtr->tagByte4 = tu->asBytes[4];
-	sparePtr->tagByte5 = tu->asBytes[5];
-	sparePtr->tagByte6 = tu->asBytes[6];
-	sparePtr->tagByte7 = tu->asBytes[7];
-}
-
-static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
-				   yaffs_Tags * tagsPtr)
-{
-	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
-	int result;
-
-	tu->asBytes[0] = sparePtr->tagByte0;
-	tu->asBytes[1] = sparePtr->tagByte1;
-	tu->asBytes[2] = sparePtr->tagByte2;
-	tu->asBytes[3] = sparePtr->tagByte3;
-	tu->asBytes[4] = sparePtr->tagByte4;
-	tu->asBytes[5] = sparePtr->tagByte5;
-	tu->asBytes[6] = sparePtr->tagByte6;
-	tu->asBytes[7] = sparePtr->tagByte7;
-
-	result = yaffs_CheckECCOnTags(tagsPtr);
-	if (result > 0) {
-		dev->tagsEccFixed++;
-	} else if (result < 0) {
-		dev->tagsEccUnfixed++;
-	}
-}
-
-static void yaffs_SpareInitialise(yaffs_Spare * spare)
-{
-	memset(spare, 0xFF, sizeof(yaffs_Spare));
-}
-
-static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
-				  int chunkInNAND, const __u8 * data,
-				  yaffs_Spare * spare)
-{
-	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("**>> yaffs chunk %d is not valid" TENDSTR),
-		   chunkInNAND));
-		return YAFFS_FAIL;
-	}
-
-	dev->nPageWrites++;
-	return dev->writeChunkToNAND(dev, chunkInNAND, data, spare);
-}
-
-static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
-				   int chunkInNAND,
-				   __u8 * data,
-				   yaffs_Spare * spare,
-				   yaffs_ECCResult * eccResult,
-				   int doErrorCorrection)
-{
-	int retVal;
-	yaffs_Spare localSpare;
-
-	dev->nPageReads++;
-
-	if (!spare && data) {
-		/* If we don't have a real spare, then we use a local one. */
-		/* Need this for the calculation of the ecc */
-		spare = &localSpare;
-	}
-
-	if (!dev->useNANDECC) {
-		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data, spare);
-		if (data && doErrorCorrection) {
-			/* Do ECC correction */
-			/* Todo handle any errors */
-			int eccResult1, eccResult2;
-			__u8 calcEcc[3];
-
-			yaffs_ECCCalculate(data, calcEcc);
-			eccResult1 =
-			    yaffs_ECCCorrect(data, spare->ecc1, calcEcc);
-			yaffs_ECCCalculate(&data[256], calcEcc);
-			eccResult2 =
-			    yaffs_ECCCorrect(&data[256], spare->ecc2, calcEcc);
-
-			if (eccResult1 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error fix performed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-				dev->eccFixed++;
-			} else if (eccResult1 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error unfixed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-				dev->eccUnfixed++;
-			}
-
-			if (eccResult2 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error fix performed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-				dev->eccFixed++;
-			} else if (eccResult2 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>yaffs ecc error unfixed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-				dev->eccUnfixed++;
-			}
-
-			if (eccResult1 || eccResult2) {
-				/* We had a data problem on this page */
-				yaffs_HandleReadDataError(dev, chunkInNAND);
-			}
-
-			if (eccResult1 < 0 || eccResult2 < 0)
-				*eccResult = YAFFS_ECC_RESULT_UNFIXED;
-			else if (eccResult1 > 0 || eccResult2 > 0)
-				*eccResult = YAFFS_ECC_RESULT_FIXED;
-			else
-				*eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		}
-	} else {
-		/* Must allocate enough memory for spare+2*sizeof(int) */
-		/* for ecc results from device. */
-		struct yaffs_NANDSpare nspare;
-		retVal =
-		    dev->readChunkFromNAND(dev, chunkInNAND, data,
-					   (yaffs_Spare *) & nspare);
-		memcpy(spare, &nspare, sizeof(yaffs_Spare));
-		if (data && doErrorCorrection) {
-			if (nspare.eccres1 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error fix performed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-			} else if (nspare.eccres1 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error unfixed on chunk %d:0"
-				    TENDSTR), chunkInNAND));
-			}
-
-			if (nspare.eccres2 > 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error fix performed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-			} else if (nspare.eccres2 < 0) {
-				T(YAFFS_TRACE_ERROR,
-				  (TSTR
-				   ("**>>mtd ecc error unfixed on chunk %d:1"
-				    TENDSTR), chunkInNAND));
-			}
-
-			if (nspare.eccres1 || nspare.eccres2) {
-				/* We had a data problem on this page */
-				yaffs_HandleReadDataError(dev, chunkInNAND);
-			}
-
-			if (nspare.eccres1 < 0 || nspare.eccres2 < 0)
-				*eccResult = YAFFS_ECC_RESULT_UNFIXED;
-			else if (nspare.eccres1 > 0 || nspare.eccres2 > 0)
-				*eccResult = YAFFS_ECC_RESULT_FIXED;
-			else
-				*eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-
-		}
-	}
-	return retVal;
-}
-
-#ifdef NOTYET
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-				  int chunkInNAND)
-{
-
-	static int init = 0;
-	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
-	static __u8 data[YAFFS_BYTES_PER_CHUNK];
-	/* Might as well always allocate the larger size for */
-	/* dev->useNANDECC == true; */
-	static __u8 spare[sizeof(struct yaffs_NANDSpare)];
-
-	dev->readChunkFromNAND(dev, chunkInNAND, data, (yaffs_Spare *) spare);
-
-	if (!init) {
-		memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK);
-		init = 1;
-	}
-
-	if (memcmp(cmpbuf, data, YAFFS_BYTES_PER_CHUNK))
-		return YAFFS_FAIL;
-	if (memcmp(cmpbuf, spare, 16))
-		return YAFFS_FAIL;
-
-	return YAFFS_OK;
-
-}
-#endif
-
-/*
- * Functions for robustisizing
- */
-
-static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-{
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-
-	/* Mark the block for retirement */
-	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
-
-	/* TODO:
-	 * Just do a garbage collection on the affected block
-	 * then retire the block
-	 * NB recursion
-	 */
-}
-
-#ifdef NOTYET
-static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-{
-}
-
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-				     const __u8 * data,
-				     const yaffs_Spare * spare)
-{
-}
-
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-				    const yaffs_Spare * spare)
-{
-}
-
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-{
-	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
-
-	/* Mark the block for retirement */
-	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-	/* Delete the chunk */
-	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
-}
-
-static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
-			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-{
-
-	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-	    s0->tagByte0 != s1->tagByte0 ||
-	    s0->tagByte1 != s1->tagByte1 ||
-	    s0->tagByte2 != s1->tagByte2 ||
-	    s0->tagByte3 != s1->tagByte3 ||
-	    s0->tagByte4 != s1->tagByte4 ||
-	    s0->tagByte5 != s1->tagByte5 ||
-	    s0->tagByte6 != s1->tagByte6 ||
-	    s0->tagByte7 != s1->tagByte7 ||
-	    s0->ecc1[0] != s1->ecc1[0] ||
-	    s0->ecc1[1] != s1->ecc1[1] ||
-	    s0->ecc1[2] != s1->ecc1[2] ||
-	    s0->ecc2[0] != s1->ecc2[0] ||
-	    s0->ecc2[1] != s1->ecc2[1] || s0->ecc2[2] != s1->ecc2[2]) {
-		return 0;
-	}
-
-	return 1;
-}
-#endif				/* NOTYET */
-
-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
-						    int chunkInNAND,
-						    const __u8 * data,
-						    const yaffs_ExtendedTags *
-						    eTags)
-{
-	yaffs_Spare spare;
-	yaffs_Tags tags;
-
-	yaffs_SpareInitialise(&spare);
-
-	if (eTags->chunkDeleted) {
-		spare.pageStatus = 0;
-	} else {
-		tags.objectId = eTags->objectId;
-		tags.chunkId = eTags->chunkId;
-		tags.byteCount = eTags->byteCount;
-		tags.serialNumber = eTags->serialNumber;
-
-		if (!dev->useNANDECC && data) {
-			yaffs_CalcECC(data, &spare);
-		}
-		yaffs_LoadTagsIntoSpare(&spare, &tags);
-
-	}
-
-	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
-}
-
-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-						     int chunkInNAND,
-						     __u8 * data,
-						     yaffs_ExtendedTags * eTags)
-{
-
-	yaffs_Spare spare;
-	yaffs_Tags tags;
-	yaffs_ECCResult eccResult;
-
-	static yaffs_Spare spareFF;
-	static int init;
-
-	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
-		init = 1;
-	}
-
-	if (yaffs_ReadChunkFromNAND
-	    (dev, chunkInNAND, data, &spare, &eccResult, 1)) {
-		/* eTags may be NULL */
-		if (eTags) {
-
-			int deleted =
-			    (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0;
-
-			eTags->chunkDeleted = deleted;
-			eTags->eccResult = eccResult;
-			eTags->blockBad = 0;	/* We're reading it */
-			/* therefore it is not a bad block */
-			eTags->chunkUsed =
-			    (memcmp(&spareFF, &spare, sizeof(spareFF)) !=
-			     0) ? 1 : 0;
-
-			if (eTags->chunkUsed) {
-				yaffs_GetTagsFromSpare(dev, &spare, &tags);
-
-				eTags->objectId = tags.objectId;
-				eTags->chunkId = tags.chunkId;
-				eTags->byteCount = tags.byteCount;
-				eTags->serialNumber = tags.serialNumber;
-			}
-		}
-
-		return YAFFS_OK;
-	} else {
-		return YAFFS_FAIL;
-	}
-}
-
-int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-					    int blockInNAND)
-{
-
-	yaffs_Spare spare;
-
-	memset(&spare, 0xff, sizeof(yaffs_Spare));
-
-	spare.blockStatus = 'Y';
-
-	yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock, NULL,
-			       &spare);
-	yaffs_WriteChunkToNAND(dev, blockInNAND * dev->nChunksPerBlock + 1,
-			       NULL, &spare);
-
-	return YAFFS_OK;
-
-}
-
-int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-					  int blockNo, yaffs_BlockState *
-					  state,
-					  int *sequenceNumber)
-{
-
-	yaffs_Spare spare0, spare1;
-	static yaffs_Spare spareFF;
-	static int init;
-	yaffs_ECCResult dummy;
-
-	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
-		init = 1;
-	}
-
-	*sequenceNumber = 0;
-
-	yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock, NULL,
-				&spare0, &dummy, 1);
-	yaffs_ReadChunkFromNAND(dev, blockNo * dev->nChunksPerBlock + 1, NULL,
-				&spare1, &dummy, 1);
-
-	if (yaffs_CountBits(spare0.blockStatus & spare1.blockStatus) < 7)
-		*state = YAFFS_BLOCK_STATE_DEAD;
-	else if (memcmp(&spareFF, &spare0, sizeof(spareFF)) == 0)
-		*state = YAFFS_BLOCK_STATE_EMPTY;
-	else
-		*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-
-	return YAFFS_OK;
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.h
deleted file mode 100644
index a61e3ba14f..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_TAGSCOMPAT_H__
-#define __YAFFS_TAGSCOMPAT_H__
-
-#include "yaffs_guts.h"
-int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
-						    int chunkInNAND,
-						    const __u8 * data,
-						    const yaffs_ExtendedTags *
-						    tags);
-int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-						     int chunkInNAND,
-						     __u8 * data,
-						     yaffs_ExtendedTags *
-						     tags);
-int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
-					    int blockNo);
-int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
-					  int blockNo, yaffs_BlockState *
-					  state, int *sequenceNumber);
-
-void yaffs_CalcTagsECC(yaffs_Tags * tags);
-int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-int yaffs_CountBits(__u8 byte);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.c
deleted file mode 100644
index 9e0bd1cf56..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include "yaffs_tagsvalidity.h"
-
-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-{
-	memset(tags, 0, sizeof(yaffs_ExtendedTags));
-	tags->validMarker0 = 0xAAAAAAAA;
-	tags->validMarker1 = 0x55555555;
-}
-
-int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-{
-	return (tags->validMarker0 == 0xAAAAAAAA &&
-		tags->validMarker1 == 0x55555555);
-
-}
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.h
deleted file mode 100644
index 2fd0c24ed2..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YAFFS_TAGS_VALIDITY_H__
-#define __YAFFS_TAGS_VALIDITY_H__
-
-#include "yaffs_guts.h"
-
-void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
-int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffsinterface.h b/target/linux/generic-2.6/files/fs/yaffs2/yaffsinterface.h
deleted file mode 100644
index 810837a32d..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffsinterface.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFSINTERFACE_H__
-#define __YAFFSINTERFACE_H__
-
-int yaffs_Initialise(unsigned nBlocks);
-
-#endif
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h b/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
deleted file mode 100644
index 15ac28121c..0000000000
--- a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2007 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-
-#ifndef __YPORTENV_H__
-#define __YPORTENV_H__
-
-#if defined CONFIG_YAFFS_WINCE
-
-#include "ywinceenv.h"
-
-#elif  defined __KERNEL__
-
-#include "moduleconfig.h"
-
-/* Linux kernel */
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-#include <linux/config.h>
-#endif
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-#define YCHAR char
-#define YUCHAR unsigned char
-#define _Y(x)     x
-#define yaffs_strcpy(a,b)    strcpy(a,b)
-#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
-#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
-#define yaffs_strlen(s)	     strlen(s)
-#define yaffs_sprintf	     sprintf
-#define yaffs_toupper(a)     toupper(a)
-
-#define Y_INLINE inline
-
-#define YAFFS_LOSTNFOUND_NAME		"lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX		"obj"
-
-/* #define YPRINTF(x) printk x */
-#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-#define YFREE(x)   kfree(x)
-#define YMALLOC_ALT(x) vmalloc(x)
-#define YFREE_ALT(x)   vfree(x)
-#define YMALLOC_DMA(x) YMALLOC(x)
-
-// KR - added for use in scan so processes aren't blocked indefinitely.
-#define YYIELD() schedule()
-
-#define YAFFS_ROOT_MODE			0666
-#define YAFFS_LOSTNFOUND_MODE		0666
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
-#define Y_TIME_CONVERT(x) (x).tv_sec
-#else
-#define Y_CURRENT_TIME CURRENT_TIME
-#define Y_TIME_CONVERT(x) (x)
-#endif
-
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
-
-#define TENDSTR "\n"
-#define TSTR(x) KERN_WARNING x
-#define TOUT(p) printk p
-
-#define yaffs_trace(mask, fmt, args...) \
-	do { if ((mask) & (yaffs_traceMask|YAFFS_TRACE_ERROR)) \
-		printk(KERN_WARNING "yaffs: " fmt, ## args); \
-	} while (0)
-
-#define compile_time_assertion(assertion) \
-	({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
-
-#elif defined CONFIG_YAFFS_DIRECT
-
-/* Direct interface */
-#include "ydirectenv.h"
-
-#elif defined CONFIG_YAFFS_UTIL
-
-/* Stuff for YAFFS utilities */
-
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
-
-#include "devextras.h"
-
-#define YMALLOC(x) malloc(x)
-#define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x) free(x)
-
-#define YCHAR char
-#define YUCHAR unsigned char
-#define _Y(x)     x
-#define yaffs_strcpy(a,b)    strcpy(a,b)
-#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
-#define yaffs_strlen(s)	     strlen(s)
-#define yaffs_sprintf	     sprintf
-#define yaffs_toupper(a)     toupper(a)
-
-#define Y_INLINE inline
-
-/* #define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) */
-/* #define YALERT(s) YINFO(s) */
-
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TOUT(p) printf p
-
-#define YAFFS_LOSTNFOUND_NAME		"lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX		"obj"
-/* #define YPRINTF(x) printf x */
-
-#define YAFFS_ROOT_MODE				0666
-#define YAFFS_LOSTNFOUND_MODE		0666
-
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
-
-#else
-/* Should have specified a configuration type */
-#error Unknown configuration
-
-#endif
-
-/* see yaffs_fs.c */
-extern unsigned int yaffs_traceMask;
-extern unsigned int yaffs_wr_attempts;
-
-/*
- * Tracing flags.
- * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
- */
-
-#define YAFFS_TRACE_OS			0x00000002
-#define YAFFS_TRACE_ALLOCATE		0x00000004
-#define YAFFS_TRACE_SCAN		0x00000008
-#define YAFFS_TRACE_BAD_BLOCKS		0x00000010
-#define YAFFS_TRACE_ERASE		0x00000020
-#define YAFFS_TRACE_GC			0x00000040
-#define YAFFS_TRACE_WRITE		0x00000080
-#define YAFFS_TRACE_TRACING		0x00000100
-#define YAFFS_TRACE_DELETION		0x00000200
-#define YAFFS_TRACE_BUFFERS		0x00000400
-#define YAFFS_TRACE_NANDACCESS		0x00000800
-#define YAFFS_TRACE_GC_DETAIL		0x00001000
-#define YAFFS_TRACE_SCAN_DEBUG		0x00002000
-#define YAFFS_TRACE_MTD			0x00004000
-#define YAFFS_TRACE_CHECKPOINT		0x00008000
-
-#define YAFFS_TRACE_VERIFY		0x00010000
-#define YAFFS_TRACE_VERIFY_NAND		0x00020000
-#define YAFFS_TRACE_VERIFY_FULL		0x00040000
-#define YAFFS_TRACE_VERIFY_ALL		0x000F0000
-
-
-#define YAFFS_TRACE_ERROR		0x40000000
-#define YAFFS_TRACE_BUG			0x80000000
-#define YAFFS_TRACE_ALWAYS		0xF0000000
-
-
-#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-
-#ifndef CONFIG_YAFFS_WINCE
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-#endif
-
-#endif
diff --git a/target/linux/generic-2.6/files/include/linux/glamo-engine.h b/target/linux/generic-2.6/files/include/linux/glamo-engine.h
deleted file mode 100644
index 516d45fa6e..0000000000
--- a/target/linux/generic-2.6/files/include/linux/glamo-engine.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __GLAMO_ENGINE_H
-#define __GLAMO_ENGINE_H
-
-enum glamo_engine {
-	GLAMO_ENGINE_CAPTURE = 0,
-	GLAMO_ENGINE_ISP = 1,
-	GLAMO_ENGINE_JPEG = 2,
-	GLAMO_ENGINE_MPEG_ENC = 3,
-	GLAMO_ENGINE_MPEG_DEC = 4,
-	GLAMO_ENGINE_LCD = 5,
-	GLAMO_ENGINE_CMDQ = 6,
-	GLAMO_ENGINE_2D = 7,
-	GLAMO_ENGINE_3D = 8,
-	GLAMO_ENGINE_MMC = 9,
-	GLAMO_ENGINE_MICROP0 = 10,
-	GLAMO_ENGINE_RISC = 11,
-	GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
-	GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
-#if 0
-	GLAMO_ENGINE_H264_DEC = 14,
-	GLAMO_ENGINE_RISC1 = 15,
-	GLAMO_ENGINE_SPI = 16,
-#endif
-	__NUM_GLAMO_ENGINES
-};
-
-#endif
diff --git a/target/linux/generic-2.6/files/include/linux/glamofb.h b/target/linux/generic-2.6/files/include/linux/glamofb.h
deleted file mode 100644
index 5f9fab5a48..0000000000
--- a/target/linux/generic-2.6/files/include/linux/glamofb.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _LINUX_GLAMOFB_H
-#define _LINUX_GLAMOFB_H
-
-#include <linux/fb.h>
-
-#ifdef __KERNEL__
-
-struct glamo_core;
-struct glamofb_handle;
-
-struct glamo_fb_platform_data {
-    int width, height;
-
-    int num_modes;
-    struct fb_videomode *modes;
-
-    struct glamo_core *core;
-};
-
-int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-
-#ifdef CONFIG_MFD_GLAMO
-void glamo_lcm_reset(struct platform_device *pdev, int level);
-#else
-#define glamo_lcm_reset(...) do {} while (0)
-#endif
-
-#endif
-
-#define GLAMOFB_ENGINE_ENABLE _IOW('F', 0x1, __u32)
-#define GLAMOFB_ENGINE_DISABLE _IOW('F', 0x2, __u32)
-#define GLAMOFB_ENGINE_RESET _IOW('F', 0x3, __u32)
-
-#endif
diff --git a/target/linux/generic-2.6/files/include/linux/gpio_buttons.h b/target/linux/generic-2.6/files/include/linux/gpio_buttons.h
deleted file mode 100644
index f85b993ed2..0000000000
--- a/target/linux/generic-2.6/files/include/linux/gpio_buttons.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Definitions for the GPIO buttons interface driver
- *
- *  Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- *  This file was based on: /include/linux/gpio_keys.h
- *	The original gpio_keys.h seems not to have a license.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#ifndef _GPIO_BUTTONS_H_
-#define _GPIO_BUTTONS_H_
-
-struct gpio_button {
-	int	gpio;		/* GPIO line number */
-	int	active_low;
-	char	*desc;		/* button description */
-	int	type;		/* input event type (EV_KEY, EV_SW) */
-	int	code;		/* input event code (KEY_*, SW_*) */
-	int	threshold;	/* count threshold */
-};
-
-struct gpio_buttons_platform_data {
-	struct gpio_button *buttons;
-	int	nbuttons;		/* number of buttons */
-	int	poll_interval;		/* polling interval */
-};
-
-#endif /* _GPIO_BUTTONS_H_ */
diff --git a/target/linux/generic-2.6/files/include/linux/gpio_dev.h b/target/linux/generic-2.6/files/include/linux/gpio_dev.h
deleted file mode 100644
index a2a4b51c78..0000000000
--- a/target/linux/generic-2.6/files/include/linux/gpio_dev.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _GPIO_DEV_H__
-#define _GPIO_DEV_H__
-
-/*********************************************************************
- *
- * This Linux kernel header is expanded from the original driver
- * (gpio_dev) by John Crispin. It provides an ioctl based interface to
- * GPIO pins via the /dev/gpio char device and gpiolib within the kernel.
- * The third argument to each ioctl is the GPIO pin number.
- *
- * This driver has been tested with lk 2.6.31 and works. The original
- * driver fails quietly with this version. The protocol is now a bit
- * different: the ioctl(fd, GPIO_REQUEST, <pin>) should be called
- * after the open("/dev/gpio", O_RDWR) to determine if the <pin> is
- * already in use. If the ioctl is successful (i.e. returns 0 for not
- * in use) then the <pin> is claimed by this driver and
- * ioctl(fd, GPIO_FREE, <pin>) should be called prior to close(fd) .
- * 
- * See <kernel_source>/Documentation/gpio.txt
- * Note that kernel designers prefer the use of the sysfs gpio interface.
- * This char driver is easier to use from code and faster.
- ********************************************************************/
-
-/* This header can be included in both the user and kernel spaces */
-/* The _IO macro is defined in sys/ioctl.h */
-
-#define IOC_GPIODEV_MAGIC  'B'
-
-#define GPIO_GET        _IO(IOC_GPIODEV_MAGIC, 10)
-#define GPIO_SET        _IO(IOC_GPIODEV_MAGIC, 11)
-#define GPIO_CLEAR      _IO(IOC_GPIODEV_MAGIC, 12)
-#define GPIO_DIR_IN     _IO(IOC_GPIODEV_MAGIC, 13)
-#define GPIO_DIR_OUT    _IO(IOC_GPIODEV_MAGIC, 14)
-        /* Sets the direction out and clears the <pin> (low) */
-
-#define GPIO_DIR_HIGH   _IO(IOC_GPIODEV_MAGIC, 15)
-        /* Sets the direction out and sets the <pin> (high) */
-#define GPIO_REQUEST    _IO(IOC_GPIODEV_MAGIC, 16)
-#define GPIO_FREE       _IO(IOC_GPIODEV_MAGIC, 17)
-#define GPIO_CAN_SLEEP  _IO(IOC_GPIODEV_MAGIC, 18)
-
-#endif
diff --git a/target/linux/generic-2.6/files/include/linux/myloader.h b/target/linux/generic-2.6/files/include/linux/myloader.h
deleted file mode 100644
index dcba6eb62a..0000000000
--- a/target/linux/generic-2.6/files/include/linux/myloader.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Compex's MyLoader specific definitions
- *
- *  Copyright (C) 2006-2008 Gabor Juhos <juhosg@openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-
-#ifndef _MYLOADER_H_
-#define _MYLOADER_H_
-
-/* Myloader specific magic numbers */
-#define MYLO_MAGIC_SYS_PARAMS	0x20021107
-#define MYLO_MAGIC_PARTITIONS	0x20021103
-#define MYLO_MAGIC_BOARD_PARAMS	0x20021103
-
-/* Vendor ID's (seems to be same as the PCI vendor ID's) */
-#define VENID_COMPEX		0x11F6
-
-/* Devices based on the ADM5120 */
-#define DEVID_COMPEX_NP27G	0x0078
-#define DEVID_COMPEX_NP28G	0x044C
-#define DEVID_COMPEX_NP28GHS	0x044E
-#define DEVID_COMPEX_WP54Gv1C	0x0514
-#define DEVID_COMPEX_WP54G	0x0515
-#define DEVID_COMPEX_WP54AG	0x0546
-#define DEVID_COMPEX_WPP54AG	0x0550
-#define DEVID_COMPEX_WPP54G	0x0555
-
-/* Devices based on the Atheros AR2317 */
-#define DEVID_COMPEX_NP25G	0x05E6
-#define DEVID_COMPEX_WPE53G	0x05DC
-
-/* Devices based on the Atheros AR71xx */
-#define DEVID_COMPEX_WP543	0x0640
-
-/* Devices based on the IXP422 */
-#define DEVID_COMPEX_WP18	0x047E
-#define DEVID_COMPEX_NP18A	0x0489
-
-/* Other devices */
-#define DEVID_COMPEX_NP26G8M	0x03E8
-#define DEVID_COMPEX_NP26G16M	0x03E9
-
-struct mylo_partition {
-	uint16_t	flags;	/* partition flags */
-	uint16_t	type;	/* type of the partition */
-	uint32_t	addr;	/* relative address of the partition from the
-				   flash start */
-	uint32_t	size;	/* size of the partition in bytes */
-	uint32_t	param;	/* if this is the active partition, the
-				   MyLoader load code to this address */
-};
-
-#define PARTITION_FLAG_ACTIVE	0x8000 /* this is the active partition,
-					* MyLoader loads firmware from here */
-#define PARTITION_FLAG_ISRAM	0x2000 /* FIXME: this is a RAM partition? */
-#define PARTIIION_FLAG_RAMLOAD	0x1000 /* FIXME: load this partition into the RAM? */
-#define PARTITION_FLAG_PRELOAD	0x0800 /* the partition data preloaded to RAM
-					* before decompression */
-#define PARTITION_FLAG_LZMA	0x0100 /* partition data compressed by LZMA */
-#define PARTITION_FLAG_HAVEHDR  0x0002 /* the partition data have a header */
-
-#define PARTITION_TYPE_FREE	0
-#define PARTITION_TYPE_USED	1
-
-#define MYLO_MAX_PARTITIONS	8	/* maximum number of partitions in the
-					   partition table */
-
-struct mylo_partition_table {
-	uint32_t	magic;		/* must be MYLO_MAGIC_PARTITIONS */
-	uint32_t	res0;		/* unknown/unused */
-	uint32_t	res1;		/* unknown/unused */
-	uint32_t 	res2;		/* unknown/unused */
-	struct mylo_partition partitions[MYLO_MAX_PARTITIONS];
-};
-
-struct mylo_partition_header {
-	uint32_t	len;		/* length of the partition data */
-	uint32_t	crc;		/* CRC value of the partition data */
-};
-
-struct mylo_system_params {
-	uint32_t	magic;		/* must be MYLO_MAGIC_SYS_PARAMS */
-	uint32_t	res0;
-	uint32_t	res1;
-	uint32_t	mylo_ver;
-	uint16_t	vid;		/* Vendor ID */
-	uint16_t	did;		/* Device ID */
-	uint16_t	svid;		/* Sub Vendor ID */
-	uint16_t	sdid;		/* Sub Device ID */
-	uint32_t	rev;		/* device revision */
-	uint32_t	fwhi;
-	uint32_t	fwlo;
-	uint32_t	tftp_addr;
-	uint32_t	prog_start;
-	uint32_t	flash_size;	/* size of boot FLASH in bytes */
-	uint32_t	dram_size;	/* size of onboard RAM in bytes */
-};
-
-struct mylo_eth_addr {
-	uint8_t	mac[6];
-	uint8_t	csum[2];
-};
-
-#define MYLO_ETHADDR_COUNT	8	/* maximum number of ethernet address
-					   in the board parameters */
-
-struct mylo_board_params {
-	uint32_t	magic;	/* must be MYLO_MAGIC_BOARD_PARAMS */
-	uint32_t	res0;
-	uint32_t	res1;
-	uint32_t	res2;
-	struct mylo_eth_addr addr[MYLO_ETHADDR_COUNT];
-};
-
-#endif /* _MYLOADER_H_*/
diff --git a/target/linux/generic-2.6/files/include/linux/pwm/pwm.h b/target/linux/generic-2.6/files/include/linux/pwm/pwm.h
deleted file mode 100644
index e01cca9036..0000000000
--- a/target/linux/generic-2.6/files/include/linux/pwm/pwm.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * include/linux/pwm.h
- *
- * Copyright (C) 2008 Bill Gatliff < bgat@billgatliff.com>
- *
- * This program is free software; you may redistribute and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef __LINUX_PWM_H
-#define __LINUX_PWM_H
-
-enum {
-	PWM_CONFIG_DUTY_TICKS = BIT(0),
-	PWM_CONFIG_PERIOD_TICKS = BIT(1),
-	PWM_CONFIG_POLARITY = BIT(2),
-	PWM_CONFIG_START = BIT(3),
-	PWM_CONFIG_STOP = BIT(4),
-
-	PWM_CONFIG_HANDLER = BIT(5),
-
-	PWM_CONFIG_DUTY_NS = BIT(6),
-	PWM_CONFIG_DUTY_PERCENT = BIT(7),
-	PWM_CONFIG_PERIOD_NS = BIT(8),
-};
-
-struct pwm_channel;
-struct work_struct;
-
-typedef int (*pwm_handler_t)(struct pwm_channel *p, void *data);
-typedef void (*pwm_callback_t)(struct pwm_channel *p);
-
-struct pwm_channel_config {
-	int config_mask;
-	unsigned long duty_ticks;
-	unsigned long period_ticks;
-	int polarity;
-
-	pwm_handler_t handler;
-
-	unsigned long duty_ns;
-	unsigned long period_ns;
-	int duty_percent;
-};
-
-struct pwm_device {
-	struct list_head list;
-	spinlock_t list_lock;
-	struct device *dev;
-	struct module *owner;
-	struct pwm_channel *channels;
-
-	const char *bus_id;
-	int nchan;
-
-	int	(*request)	(struct pwm_channel *p);
-	void	(*free)		(struct pwm_channel *p);
-	int	(*config)	(struct pwm_channel *p,
-				 struct pwm_channel_config *c);
-	int	(*config_nosleep)(struct pwm_channel *p,
-				  struct pwm_channel_config *c);
-	int	(*synchronize)	(struct pwm_channel *p,
-				 struct pwm_channel *to_p);
-	int	(*unsynchronize)(struct pwm_channel *p,
-				 struct pwm_channel *from_p);
-	int	(*set_callback)	(struct pwm_channel *p,
-				 pwm_callback_t callback);
-};
-
-int pwm_register(struct pwm_device *pwm);
-int pwm_unregister(struct pwm_device *pwm);
-
-enum {
-	FLAG_REQUESTED = 0,
-	FLAG_STOP = 1,
-};
-
-struct pwm_channel {
-	struct list_head list;
-	struct pwm_device *pwm;
-	const char *requester;
-	pid_t pid;
-	int chan;
-	unsigned long flags;
-	unsigned long tick_hz;
-
-	spinlock_t lock;
-	struct completion complete;
-
-	pwm_callback_t callback;
-
-	struct work_struct handler_work;
-	pwm_handler_t handler;
-	void *handler_data;
-
-	int active_high;
-	unsigned long period_ticks;
-	unsigned long duty_ticks;
-};
-
-struct gpio_pwm_platform_data {
-	int gpio;
-};
-
-struct pwm_channel *
-pwm_request(const char *bus_id, int chan,
-	    const char *requester);
-
-void pwm_free(struct pwm_channel *pwm);
-
-int pwm_config_nosleep(struct pwm_channel *pwm,
-		       struct pwm_channel_config *c);
-
-int pwm_config(struct pwm_channel *pwm,
-	       struct pwm_channel_config *c);
-
-unsigned long pwm_ns_to_ticks(struct pwm_channel *pwm,
-			      unsigned long nsecs);
-
-unsigned long pwm_ticks_to_ns(struct pwm_channel *pwm,
-			      unsigned long ticks);
-
-int pwm_set_period_ns(struct pwm_channel *pwm,
-		      unsigned long period_ns);
-
-unsigned long int pwm_get_period_ns(struct pwm_channel *pwm);
-
-int pwm_set_duty_ns(struct pwm_channel *pwm,
-		    unsigned long duty_ns);
-
-int pwm_set_duty_percent(struct pwm_channel *pwm,
-			 int percent);
-
-unsigned long pwm_get_duty_ns(struct pwm_channel *pwm);
-
-int pwm_set_polarity(struct pwm_channel *pwm,
-		     int active_high);
-
-int pwm_start(struct pwm_channel *pwm);
-
-int pwm_stop(struct pwm_channel *pwm);
-
-int pwm_set_handler(struct pwm_channel *pwm,
-		    pwm_handler_t handler,
-		    void *data);
-
-int pwm_synchronize(struct pwm_channel *p,
-		    struct pwm_channel *to_p);
-
-
-int pwm_unsynchronize(struct pwm_channel *p,
-		      struct pwm_channel *from_p);
-
-
-#endif /* __LINUX_PWM_H */
diff --git a/target/linux/generic-2.6/files/include/linux/rtl8366rb.h b/target/linux/generic-2.6/files/include/linux/rtl8366rb.h
deleted file mode 100644
index 053e2ec04f..0000000000
--- a/target/linux/generic-2.6/files/include/linux/rtl8366rb.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Platform data definition for the Realtek RTL8366S ethernet switch driver
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef _RTL8366RB_H
-#define _RTL8366RB_H
-
-#define RTL8366RB_DRIVER_NAME	"rtl8366rb"
-
-struct rtl8366rb_platform_data {
-	unsigned	gpio_sda;
-	unsigned	gpio_sck;
-};
-
-#endif /*  _RTL8366RB_SMI_H */
diff --git a/target/linux/generic-2.6/files/include/linux/rtl8366s.h b/target/linux/generic-2.6/files/include/linux/rtl8366s.h
deleted file mode 100644
index 09173ec200..0000000000
--- a/target/linux/generic-2.6/files/include/linux/rtl8366s.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Platform data definition for the Realtek RTL8366S ethernet switch driver
- *
- * Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef _RTL8366S_H
-#define _RTL8366S_H
-
-#define RTL8366S_DRIVER_NAME	"rtl8366s"
-
-struct rtl8366s_platform_data {
-	unsigned	gpio_sda;
-	unsigned	gpio_sck;
-};
-
-#endif /*  _RTL8366_SMI_H */
diff --git a/target/linux/generic-2.6/files/include/linux/switch.h b/target/linux/generic-2.6/files/include/linux/switch.h
deleted file mode 100644
index 25aedb83b0..0000000000
--- a/target/linux/generic-2.6/files/include/linux/switch.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * switch.h: Switch configuration API
- *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __LINUX_SWITCH_H
-#define __LINUX_SWITCH_H
-
-#include <linux/types.h>
-#include <linux/netdevice.h>
-#include <linux/netlink.h>
-#include <linux/genetlink.h>
-#ifndef __KERNEL__
-#include <netlink/netlink.h>
-#include <netlink/genl/genl.h>
-#include <netlink/genl/ctrl.h>
-#else
-#include <net/genetlink.h>
-#endif
-
-/* main attributes */
-enum {
-	SWITCH_ATTR_UNSPEC,
-	/* global */
-	SWITCH_ATTR_TYPE,
-	/* device */
-	SWITCH_ATTR_ID,
-	SWITCH_ATTR_NAME,
-	SWITCH_ATTR_DEV_NAME,
-	SWITCH_ATTR_VLANS,
-	SWITCH_ATTR_PORTS,
-	SWITCH_ATTR_CPU_PORT,
-	/* attributes */
-	SWITCH_ATTR_OP_ID,
-	SWITCH_ATTR_OP_TYPE,
-	SWITCH_ATTR_OP_NAME,
-	SWITCH_ATTR_OP_PORT,
-	SWITCH_ATTR_OP_VLAN,
-	SWITCH_ATTR_OP_VALUE_INT,
-	SWITCH_ATTR_OP_VALUE_STR,
-	SWITCH_ATTR_OP_VALUE_PORTS,
-	SWITCH_ATTR_OP_DESCRIPTION,
-	/* port lists */
-	SWITCH_ATTR_PORT,
-	SWITCH_ATTR_MAX
-};
-
-/* commands */
-enum {
-	SWITCH_CMD_UNSPEC,
-	SWITCH_CMD_GET_SWITCH,
-	SWITCH_CMD_NEW_ATTR,
-	SWITCH_CMD_LIST_GLOBAL,
-	SWITCH_CMD_GET_GLOBAL,
-	SWITCH_CMD_SET_GLOBAL,
-	SWITCH_CMD_LIST_PORT,
-	SWITCH_CMD_GET_PORT,
-	SWITCH_CMD_SET_PORT,
-	SWITCH_CMD_LIST_VLAN,
-	SWITCH_CMD_GET_VLAN,
-	SWITCH_CMD_SET_VLAN
-};
-
-/* data types */
-enum switch_val_type {
-	SWITCH_TYPE_UNSPEC,
-	SWITCH_TYPE_INT,
-	SWITCH_TYPE_STRING,
-	SWITCH_TYPE_PORTS,
-	SWITCH_TYPE_NOVAL,
-};
-
-/* port nested attributes */
-enum {
-	SWITCH_PORT_UNSPEC,
-	SWITCH_PORT_ID,
-	SWITCH_PORT_FLAG_TAGGED,
-	SWITCH_PORT_ATTR_MAX
-};
-
-#define SWITCH_ATTR_DEFAULTS_OFFSET	0x1000
-
-#ifdef __KERNEL__
-
-struct switch_dev;
-struct switch_op;
-struct switch_val;
-struct switch_attr;
-struct switch_attrlist;
-
-int register_switch(struct switch_dev *dev, struct net_device *netdev);
-void unregister_switch(struct switch_dev *dev);
-
-struct switch_attrlist {
-	/* filled in by the driver */
-	int n_attr;
-	const struct switch_attr *attr;
-};
-
-
-struct switch_dev {
-	int id;
-	void *priv;
-	const char *name;
-
-	/* NB: either devname or netdev must be set */
-	const char *devname;
-	struct net_device *netdev;
-
-	int ports;
-	int vlans;
-	int cpu_port;
-	struct switch_attrlist attr_global, attr_port, attr_vlan;
-
-	spinlock_t lock;
-	struct switch_port *portbuf;
-	struct list_head dev_list;
-	unsigned long def_global, def_port, def_vlan;
-
-	int (*get_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
-	int (*set_vlan_ports)(struct switch_dev *dev, struct switch_val *val);
-	int (*get_port_pvid)(struct switch_dev *dev, int port, int *val);
-	int (*set_port_pvid)(struct switch_dev *dev, int port, int val);
-	int (*apply_config)(struct switch_dev *dev);
-	int (*reset_switch)(struct switch_dev *dev);
-};
-
-struct switch_port {
-	u32 id;
-	u32 flags;
-};
-
-struct switch_val {
-	const struct switch_attr *attr;
-	int port_vlan;
-	int len;
-	union {
-		const char *s;
-		u32 i;
-		struct switch_port *ports;
-	} value;
-};
-
-struct switch_attr {
-	int disabled;
-	int type;
-	const char *name;
-	const char *description;
-
-	int (*set)(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val);
-	int (*get)(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val);
-
-	/* for driver internal use */
-	int id;
-	int ofs;
-	int max;
-};
-
-#endif
-
-#endif
diff --git a/target/linux/generic-2.6/image/Makefile b/target/linux/generic-2.6/image/Makefile
deleted file mode 100644
index e733e0a37a..0000000000
--- a/target/linux/generic-2.6/image/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-# use default targets for everything
-
-$(eval $(call BuildImage))
diff --git a/target/linux/generic-2.6/image/initramfs-base-files.txt b/target/linux/generic-2.6/image/initramfs-base-files.txt
deleted file mode 100644
index eda5d0d278..0000000000
--- a/target/linux/generic-2.6/image/initramfs-base-files.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-nod /dev/console 600 0 0 c 5 1
-nod /dev/null 666 0 0 c 1 3
-nod /dev/zero 666 0 0 c 1 5
-nod /dev/tty 666 0 0 c 5 0
-nod /dev/tty0 660 0 0 c 4 0
-nod /dev/tty1 660 0 0 c 4 1
-nod /dev/random 666 0 0 c 1 8
-nod /dev/urandom 666 0 0 c 1 9
-dir /dev/pts 755 0 0
diff --git a/target/linux/generic-2.6/image/lzma-loader/Makefile b/target/linux/generic-2.6/image/lzma-loader/Makefile
deleted file mode 100644
index d75a4468b0..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME := loader
-PKG_VERSION := 0.05
-
-PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)$(LOADER_TYPE)
-
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-	touch $@
-
-$(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" \
-		RAMSIZE=$(RAMSIZE) \
-		LOADADDR=$(LOADADDR) \
-		KERNEL_ENTRY=$(KERNEL_ENTRY) \
-		IMAGE_COPY=$(IMAGE_COPY)
-
-
-$(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
-	$(CP) $< $@
-
-$(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
-	$(CP) $< $@
-
-$(KDIR)/loader$(LOADER_TYPE).bin: $(PKG_BUILD_DIR)/lzma.bin
-	$(CP) $< $@
-
-download: 
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(KDIR)/loader$(LOADER_TYPE).elf $(KDIR)/loader$(LOADER_TYPE).bin
-install:
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(KDIR)/loader.elf
-	rm -f $(KDIR)/loader.bin
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c
deleted file mode 100644
index c90a0d3ef4..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
-  LzmaDecode.c
-  LZMA Decoder (optimized for Speed version)
-  
-  LZMA SDK 4.22 Copyright (c) 1999-2005 Igor Pavlov (2005-06-10)
-  http://www.7-zip.org/
-
-  LZMA SDK is licensed under two licenses:
-  1) GNU Lesser General Public License (GNU LGPL)
-  2) Common Public License (CPL)
-  It means that you can select one of these two licenses and 
-  follow rules of that license.
-
-  SPECIAL EXCEPTION:
-  Igor Pavlov, as the author of this Code, expressly permits you to 
-  statically or dynamically link your Code (or bind by name) to the 
-  interfaces of this file without subjecting your linked Code to the 
-  terms of the CPL or GNU LGPL. Any modifications or additions 
-  to this file, however, are subject to the LGPL or CPL terms.
-*/
-
-#include "LzmaDecode.h"
-
-#ifndef Byte
-#define Byte unsigned char
-#endif
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-
-#define RC_READ_BYTE (*Buffer++)
-
-#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \
-  { int i; for(i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) | RC_READ_BYTE; }}
-
-#ifdef _LZMA_IN_CB
-
-#define RC_TEST { if (Buffer == BufferLim) \
-  { SizeT size; int result = InCallback->Read(InCallback, &Buffer, &size); if (result != LZMA_RESULT_OK) return result; \
-  BufferLim = Buffer + size; if (size == 0) return LZMA_RESULT_DATA_ERROR; }}
-
-#define RC_INIT Buffer = BufferLim = 0; RC_INIT2
-
-#else
-
-#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }
-
-#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2
- 
-#endif
-
-#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }
-
-#define IfBit0(p) RC_NORMALIZE; bound = (Range >> kNumBitModelTotalBits) * *(p); if (Code < bound)
-#define UpdateBit0(p) Range = bound; *(p) += (kBitModelTotal - *(p)) >> kNumMoveBits;
-#define UpdateBit1(p) Range -= bound; Code -= bound; *(p) -= (*(p)) >> kNumMoveBits;
-
-#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \
-  { UpdateBit0(p); mi <<= 1; A0; } else \
-  { UpdateBit1(p); mi = (mi + mi) + 1; A1; } 
-  
-#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)               
-
-#define RangeDecoderBitTreeDecode(probs, numLevels, res) \
-  { int i = numLevels; res = 1; \
-  do { CProb *p = probs + res; RC_GET_BIT(p, res) } while(--i != 0); \
-  res -= (1 << numLevels); }
-
-
-#define kNumPosBitsMax 4
-#define kNumPosStatesMax (1 << kNumPosBitsMax)
-
-#define kLenNumLowBits 3
-#define kLenNumLowSymbols (1 << kLenNumLowBits)
-#define kLenNumMidBits 3
-#define kLenNumMidSymbols (1 << kLenNumMidBits)
-#define kLenNumHighBits 8
-#define kLenNumHighSymbols (1 << kLenNumHighBits)
-
-#define LenChoice 0
-#define LenChoice2 (LenChoice + 1)
-#define LenLow (LenChoice2 + 1)
-#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
-
-
-#define kNumStates 12
-#define kNumLitStates 7
-
-#define kStartPosModelIndex 4
-#define kEndPosModelIndex 14
-#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-
-#define kNumPosSlotBits 6
-#define kNumLenToPosStates 4
-
-#define kNumAlignBits 4
-#define kAlignTableSize (1 << kNumAlignBits)
-
-#define kMatchMinLen 2
-
-#define IsMatch 0
-#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-#define IsRepG0 (IsRep + kNumStates)
-#define IsRepG1 (IsRepG0 + kNumStates)
-#define IsRepG2 (IsRepG1 + kNumStates)
-#define IsRep0Long (IsRepG2 + kNumStates)
-#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-#define LenCoder (Align + kAlignTableSize)
-#define RepLenCoder (LenCoder + kNumLenProbs)
-#define Literal (RepLenCoder + kNumLenProbs)
-
-#if Literal != LZMA_BASE_SIZE
-StopCompilingDueBUG
-#endif
-
-#if 0
-int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size)
-{
-  unsigned char prop0;
-  if (size < LZMA_PROPERTIES_SIZE)
-    return LZMA_RESULT_DATA_ERROR;
-  prop0 = propsData[0];
-  if (prop0 >= (9 * 5 * 5))
-    return LZMA_RESULT_DATA_ERROR;
-  {
-    for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5));
-    for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9);
-    propsRes->lc = prop0;
-    /*
-    unsigned char remainder = (unsigned char)(prop0 / 9);
-    propsRes->lc = prop0 % 9;
-    propsRes->pb = remainder / 5;
-    propsRes->lp = remainder % 5;
-    */
-  }
-
-  #ifdef _LZMA_OUT_READ
-  {
-    int i;
-    propsRes->DictionarySize = 0;
-    for (i = 0; i < 4; i++)
-      propsRes->DictionarySize += (UInt32)(propsData[1 + i]) << (i * 8);
-    if (propsRes->DictionarySize == 0)
-      propsRes->DictionarySize = 1;
-  }
-  #endif
-  return LZMA_RESULT_OK;
-}
-#endif
-
-#define kLzmaStreamWasFinishedId (-1)
-
-int LzmaDecode(CLzmaDecoderState *vs,
-    #ifdef _LZMA_IN_CB
-    ILzmaInCallback *InCallback,
-    #else
-    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
-    #endif
-    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed)
-{
-  CProb *p = vs->Probs;
-  SizeT nowPos = 0;
-  Byte previousByte = 0;
-  UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;
-  UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;
-  int lc = vs->Properties.lc;
-
-  #ifdef _LZMA_OUT_READ
-  
-  UInt32 Range = vs->Range;
-  UInt32 Code = vs->Code;
-  #ifdef _LZMA_IN_CB
-  const Byte *Buffer = vs->Buffer;
-  const Byte *BufferLim = vs->BufferLim;
-  #else
-  const Byte *Buffer = inStream;
-  const Byte *BufferLim = inStream + inSize;
-  #endif
-  int state = vs->State;
-  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
-  int len = vs->RemainLen;
-  UInt32 globalPos = vs->GlobalPos;
-  UInt32 distanceLimit = vs->DistanceLimit;
-
-  Byte *dictionary = vs->Dictionary;
-  UInt32 dictionarySize = vs->Properties.DictionarySize;
-  UInt32 dictionaryPos = vs->DictionaryPos;
-
-  Byte tempDictionary[4];
-
-  #ifndef _LZMA_IN_CB
-  *inSizeProcessed = 0;
-  #endif
-  *outSizeProcessed = 0;
-  if (len == kLzmaStreamWasFinishedId)
-    return LZMA_RESULT_OK;
-
-  if (dictionarySize == 0)
-  {
-    dictionary = tempDictionary;
-    dictionarySize = 1;
-    tempDictionary[0] = vs->TempDictionary[0];
-  }
-
-  if (len == kLzmaNeedInitId)
-  {
-    {
-      UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
-      UInt32 i;
-      for (i = 0; i < numProbs; i++)
-        p[i] = kBitModelTotal >> 1; 
-      rep0 = rep1 = rep2 = rep3 = 1;
-      state = 0;
-      globalPos = 0;
-      distanceLimit = 0;
-      dictionaryPos = 0;
-      dictionary[dictionarySize - 1] = 0;
-      #ifdef _LZMA_IN_CB
-      RC_INIT;
-      #else
-      RC_INIT(inStream, inSize);
-      #endif
-    }
-    len = 0;
-  }
-  while(len != 0 && nowPos < outSize)
-  {
-    UInt32 pos = dictionaryPos - rep0;
-    if (pos >= dictionarySize)
-      pos += dictionarySize;
-    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
-    if (++dictionaryPos == dictionarySize)
-      dictionaryPos = 0;
-    len--;
-  }
-  if (dictionaryPos == 0)
-    previousByte = dictionary[dictionarySize - 1];
-  else
-    previousByte = dictionary[dictionaryPos - 1];
-
-  #else /* if !_LZMA_OUT_READ */
-
-  int state = 0;
-  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
-  int len = 0;
-  const Byte *Buffer;
-  const Byte *BufferLim;
-  UInt32 Range;
-  UInt32 Code;
-
-  #ifndef _LZMA_IN_CB
-  *inSizeProcessed = 0;
-  #endif
-  *outSizeProcessed = 0;
-
-  {
-    UInt32 i;
-    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
-    for (i = 0; i < numProbs; i++)
-      p[i] = kBitModelTotal >> 1;
-  }
-  
-  #ifdef _LZMA_IN_CB
-  RC_INIT;
-  #else
-  RC_INIT(inStream, inSize);
-  #endif
-
-  #endif /* _LZMA_OUT_READ */
-
-  while(nowPos < outSize)
-  {
-    CProb *prob;
-    UInt32 bound;
-    int posState = (int)(
-        (nowPos 
-        #ifdef _LZMA_OUT_READ
-        + globalPos
-        #endif
-        )
-        & posStateMask);
-
-    prob = p + IsMatch + (state << kNumPosBitsMax) + posState;
-    IfBit0(prob)
-    {
-      int symbol = 1;
-      UpdateBit0(prob)
-      prob = p + Literal + (LZMA_LIT_SIZE * 
-        (((
-        (nowPos 
-        #ifdef _LZMA_OUT_READ
-        + globalPos
-        #endif
-        )
-        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
-
-      if (state >= kNumLitStates)
-      {
-        int matchByte;
-        #ifdef _LZMA_OUT_READ
-        UInt32 pos = dictionaryPos - rep0;
-        if (pos >= dictionarySize)
-          pos += dictionarySize;
-        matchByte = dictionary[pos];
-        #else
-        matchByte = outStream[nowPos - rep0];
-        #endif
-        do
-        {
-          int bit;
-          CProb *probLit;
-          matchByte <<= 1;
-          bit = (matchByte & 0x100);
-          probLit = prob + 0x100 + bit + symbol;
-          RC_GET_BIT2(probLit, symbol, if (bit != 0) break, if (bit == 0) break)
-        }
-        while (symbol < 0x100);
-      }
-      while (symbol < 0x100)
-      {
-        CProb *probLit = prob + symbol;
-        RC_GET_BIT(probLit, symbol)
-      }
-      previousByte = (Byte)symbol;
-
-      outStream[nowPos++] = previousByte;
-      #ifdef _LZMA_OUT_READ
-      if (distanceLimit < dictionarySize)
-        distanceLimit++;
-
-      dictionary[dictionaryPos] = previousByte;
-      if (++dictionaryPos == dictionarySize)
-        dictionaryPos = 0;
-      #endif
-      if (state < 4) state = 0;
-      else if (state < 10) state -= 3;
-      else state -= 6;
-    }
-    else             
-    {
-      UpdateBit1(prob);
-      prob = p + IsRep + state;
-      IfBit0(prob)
-      {
-        UpdateBit0(prob);
-        rep3 = rep2;
-        rep2 = rep1;
-        rep1 = rep0;
-        state = state < kNumLitStates ? 0 : 3;
-        prob = p + LenCoder;
-      }
-      else
-      {
-        UpdateBit1(prob);
-        prob = p + IsRepG0 + state;
-        IfBit0(prob)
-        {
-          UpdateBit0(prob);
-          prob = p + IsRep0Long + (state << kNumPosBitsMax) + posState;
-          IfBit0(prob)
-          {
-            #ifdef _LZMA_OUT_READ
-            UInt32 pos;
-            #endif
-            UpdateBit0(prob);
-            
-            #ifdef _LZMA_OUT_READ
-            if (distanceLimit == 0)
-            #else
-            if (nowPos == 0)
-            #endif
-              return LZMA_RESULT_DATA_ERROR;
-            
-            state = state < kNumLitStates ? 9 : 11;
-            #ifdef _LZMA_OUT_READ
-            pos = dictionaryPos - rep0;
-            if (pos >= dictionarySize)
-              pos += dictionarySize;
-            previousByte = dictionary[pos];
-            dictionary[dictionaryPos] = previousByte;
-            if (++dictionaryPos == dictionarySize)
-              dictionaryPos = 0;
-            #else
-            previousByte = outStream[nowPos - rep0];
-            #endif
-            outStream[nowPos++] = previousByte;
-            #ifdef _LZMA_OUT_READ
-            if (distanceLimit < dictionarySize)
-              distanceLimit++;
-            #endif
-
-            continue;
-          }
-          else
-          {
-            UpdateBit1(prob);
-          }
-        }
-        else
-        {
-          UInt32 distance;
-          UpdateBit1(prob);
-          prob = p + IsRepG1 + state;
-          IfBit0(prob)
-          {
-            UpdateBit0(prob);
-            distance = rep1;
-          }
-          else 
-          {
-            UpdateBit1(prob);
-            prob = p + IsRepG2 + state;
-            IfBit0(prob)
-            {
-              UpdateBit0(prob);
-              distance = rep2;
-            }
-            else
-            {
-              UpdateBit1(prob);
-              distance = rep3;
-              rep3 = rep2;
-            }
-            rep2 = rep1;
-          }
-          rep1 = rep0;
-          rep0 = distance;
-        }
-        state = state < kNumLitStates ? 8 : 11;
-        prob = p + RepLenCoder;
-      }
-      {
-        int numBits, offset;
-        CProb *probLen = prob + LenChoice;
-        IfBit0(probLen)
-        {
-          UpdateBit0(probLen);
-          probLen = prob + LenLow + (posState << kLenNumLowBits);
-          offset = 0;
-          numBits = kLenNumLowBits;
-        }
-        else
-        {
-          UpdateBit1(probLen);
-          probLen = prob + LenChoice2;
-          IfBit0(probLen)
-          {
-            UpdateBit0(probLen);
-            probLen = prob + LenMid + (posState << kLenNumMidBits);
-            offset = kLenNumLowSymbols;
-            numBits = kLenNumMidBits;
-          }
-          else
-          {
-            UpdateBit1(probLen);
-            probLen = prob + LenHigh;
-            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-            numBits = kLenNumHighBits;
-          }
-        }
-        RangeDecoderBitTreeDecode(probLen, numBits, len);
-        len += offset;
-      }
-
-      if (state < 4)
-      {
-        int posSlot;
-        state += kNumLitStates;
-        prob = p + PosSlot +
-            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
-            kNumPosSlotBits);
-        RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot);
-        if (posSlot >= kStartPosModelIndex)
-        {
-          int numDirectBits = ((posSlot >> 1) - 1);
-          rep0 = (2 | ((UInt32)posSlot & 1));
-          if (posSlot < kEndPosModelIndex)
-          {
-            rep0 <<= numDirectBits;
-            prob = p + SpecPos + rep0 - posSlot - 1;
-          }
-          else
-          {
-            numDirectBits -= kNumAlignBits;
-            do
-            {
-              RC_NORMALIZE
-              Range >>= 1;
-              rep0 <<= 1;
-              if (Code >= Range)
-              {
-                Code -= Range;
-                rep0 |= 1;
-              }
-            }
-            while (--numDirectBits != 0);
-            prob = p + Align;
-            rep0 <<= kNumAlignBits;
-            numDirectBits = kNumAlignBits;
-          }
-          {
-            int i = 1;
-            int mi = 1;
-            do
-            {
-              CProb *prob3 = prob + mi;
-              RC_GET_BIT2(prob3, mi, ; , rep0 |= i);
-              i <<= 1;
-            }
-            while(--numDirectBits != 0);
-          }
-        }
-        else
-          rep0 = posSlot;
-        if (++rep0 == (UInt32)(0))
-        {
-          /* it's for stream version */
-          len = kLzmaStreamWasFinishedId;
-          break;
-        }
-      }
-
-      len += kMatchMinLen;
-      #ifdef _LZMA_OUT_READ
-      if (rep0 > distanceLimit) 
-      #else
-      if (rep0 > nowPos)
-      #endif
-        return LZMA_RESULT_DATA_ERROR;
-
-      #ifdef _LZMA_OUT_READ
-      if (dictionarySize - distanceLimit > (UInt32)len)
-        distanceLimit += len;
-      else
-        distanceLimit = dictionarySize;
-      #endif
-
-      do
-      {
-        #ifdef _LZMA_OUT_READ
-        UInt32 pos = dictionaryPos - rep0;
-        if (pos >= dictionarySize)
-          pos += dictionarySize;
-        previousByte = dictionary[pos];
-        dictionary[dictionaryPos] = previousByte;
-        if (++dictionaryPos == dictionarySize)
-          dictionaryPos = 0;
-        #else
-        previousByte = outStream[nowPos - rep0];
-        #endif
-        len--;
-        outStream[nowPos++] = previousByte;
-      }
-      while(len != 0 && nowPos < outSize);
-    }
-  }
-  RC_NORMALIZE;
-
-  #ifdef _LZMA_OUT_READ
-  vs->Range = Range;
-  vs->Code = Code;
-  vs->DictionaryPos = dictionaryPos;
-  vs->GlobalPos = globalPos + (UInt32)nowPos;
-  vs->DistanceLimit = distanceLimit;
-  vs->Reps[0] = rep0;
-  vs->Reps[1] = rep1;
-  vs->Reps[2] = rep2;
-  vs->Reps[3] = rep3;
-  vs->State = state;
-  vs->RemainLen = len;
-  vs->TempDictionary[0] = tempDictionary[0];
-  #endif
-
-  #ifdef _LZMA_IN_CB
-  vs->Buffer = Buffer;
-  vs->BufferLim = BufferLim;
-  #else
-  *inSizeProcessed = (SizeT)(Buffer - inStream);
-  #endif
-  *outSizeProcessed = nowPos;
-  return LZMA_RESULT_OK;
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h
deleted file mode 100644
index 213062af12..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* 
-  LzmaDecode.h
-  LZMA Decoder interface
-
-  LZMA SDK 4.21 Copyright (c) 1999-2005 Igor Pavlov (2005-06-08)
-  http://www.7-zip.org/
-
-  LZMA SDK is licensed under two licenses:
-  1) GNU Lesser General Public License (GNU LGPL)
-  2) Common Public License (CPL)
-  It means that you can select one of these two licenses and 
-  follow rules of that license.
-
-  SPECIAL EXCEPTION:
-  Igor Pavlov, as the author of this code, expressly permits you to 
-  statically or dynamically link your code (or bind by name) to the 
-  interfaces of this file without subjecting your linked code to the 
-  terms of the CPL or GNU LGPL. Any modifications or additions 
-  to this file, however, are subject to the LGPL or CPL terms.
-*/
-
-#ifndef __LZMADECODE_H
-#define __LZMADECODE_H
-
-/* #define _LZMA_IN_CB */
-/* Use callback for input data */
-
-/* #define _LZMA_OUT_READ */
-/* Use read function for output data */
-
-/* #define _LZMA_PROB32 */
-/* It can increase speed on some 32-bit CPUs, 
-   but memory usage will be doubled in that case */
-
-/* #define _LZMA_LOC_OPT */
-/* Enable local speed optimizations inside code */
-
-/* #define _LZMA_SYSTEM_SIZE_T */
-/* Use system's size_t. You can use it to enable 64-bit sizes supporting*/
-
-#ifndef UInt32
-#ifdef _LZMA_UINT32_IS_ULONG
-#define UInt32 unsigned long
-#else
-#define UInt32 unsigned int
-#endif
-#endif
-
-#ifndef SizeT
-#ifdef _LZMA_SYSTEM_SIZE_T
-#include <stddef.h>
-#define SizeT size_t
-#else
-#define SizeT UInt32
-#endif
-#endif
-
-#ifdef _LZMA_PROB32
-#define CProb UInt32
-#else
-#define CProb unsigned short
-#endif
-
-#define LZMA_RESULT_OK 0
-#define LZMA_RESULT_DATA_ERROR 1
-
-#ifdef _LZMA_IN_CB
-typedef struct _ILzmaInCallback
-{
-  int (*Read)(void *object, const unsigned char **buffer, SizeT *bufferSize);
-} ILzmaInCallback;
-#endif
-
-#define LZMA_BASE_SIZE 1846
-#define LZMA_LIT_SIZE 768
-
-#define LZMA_PROPERTIES_SIZE 5
-
-typedef struct _CLzmaProperties
-{
-  int lc;
-  int lp;
-  int pb;
-  #ifdef _LZMA_OUT_READ
-  UInt32 DictionarySize;
-  #endif
-}CLzmaProperties;
-
-int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size);
-
-#define LzmaGetNumProbs(Properties) (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
-
-#define kLzmaNeedInitId (-2)
-
-typedef struct _CLzmaDecoderState
-{
-  CLzmaProperties Properties;
-  CProb *Probs;
-
-  #ifdef _LZMA_IN_CB
-  const unsigned char *Buffer;
-  const unsigned char *BufferLim;
-  #endif
-
-  #ifdef _LZMA_OUT_READ
-  unsigned char *Dictionary;
-  UInt32 Range;
-  UInt32 Code;
-  UInt32 DictionaryPos;
-  UInt32 GlobalPos;
-  UInt32 DistanceLimit;
-  UInt32 Reps[4];
-  int State;
-  int RemainLen;
-  unsigned char TempDictionary[4];
-  #endif
-} CLzmaDecoderState;
-
-#ifdef _LZMA_OUT_READ
-#define LzmaDecoderInit(vs) { (vs)->RemainLen = kLzmaNeedInitId; }
-#endif
-
-int LzmaDecode(CLzmaDecoderState *vs,
-    #ifdef _LZMA_IN_CB
-    ILzmaInCallback *inCallback,
-    #else
-    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
-    #endif
-    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
-
-#endif
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/Makefile b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
deleted file mode 100644
index 910172c4f8..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-RAMSTART = 0x80000000
-RAMSIZE = 0x00100000		# 1MB
-LOADADDR = 0x80400000		# RAM start + 4M
-KERNEL_ENTRY = 0x80001000
-IMAGE_COPY:=0
-
-CROSS_COMPILE = mips-linux-
-
-OBJCOPY:= $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
-CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSTART=${RAMSTART} -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB
-ifeq ($(IMAGE_COPY),1)
-CFLAGS += -DLOADADDR=${LOADADDR} -DIMAGE_COPY=1
-endif
-
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-.c.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
-CC =       $(CROSS_COMPILE)gcc
-LD =       $(CROSS_COMPILE)ld
-OBJDUMP =  $(CROSS_COMPILE)objdump
-
-O_FORMAT = $(shell $(OBJDUMP) -i | head -2 | grep elf32)
-
-# Drop some uninteresting sections in the kernel.
-# This is only relevant for ELF kernels but doesn't hurt a.out
-drop-sections   = .reginfo .mdebug .comment
-strip-flags     = $(addprefix --remove-section=,$(drop-sections))
-
-all : lzma.elf lzma.bin
-
-lzma.lds: lzma.lds.in
-	sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,_start,g' $< >$@
-
-kernel.o: vmlinux.lzma lzma.lds
-	$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
-
-lzma.bin: lzma.elf
-	$(OBJCOPY) $< $@
-
-ifeq ($(IMAGE_COPY),1)
-LOADER_ENTRY ?= $(KERNEL_ENTRY)
-lzma.o: decompress.o LzmaDecode.o kernel.o
-	sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,entry,g' lzma.lds.in >lzma-stage2.lds
-	$(LD) -static --no-warn-mismatch -e entry -Tlzma-stage2.lds -o temp-$@ $^
-	$(OBJCOPY) temp-$@ lzma.tmp
-	@echo "SECTIONS { .data : { code_start = .; *(.data) code_stop = .; }}" > lzma-data.lds
-	$(LD) -no-warn-mismatch -T lzma-data.lds -r -o $@ -b binary lzma.tmp --oformat $(O_FORMAT)
-	
-lzma.elf: start.o lzma.o
-	sed -e 's,@LOADADDR@,$(LOADER_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
-	$(LD) -s -Tlzma-copy.lds -o $@ $^
-else
-lzma.elf: start.o decompress.o LzmaDecode.o kernel.o
-	$(LD) -s -Tlzma.lds -o $@ $^
-endif
-
-clean:
-	rm -f *.o lzma.elf lzma.bin *.tmp *.lds
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
deleted file mode 100644
index 45ac509cdc..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * LZMA compressed kernel decompressor for bcm947xx boards
- *
- * Copyright (C) 2005 by Oleg I. Vdovikin <oleg@cs.msu.su>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *
- * Please note, this was code based on the bunzip2 decompressor code
- * by Manuel Novoa III  (mjn3@codepoet.org), although the only thing left
- * is an idea and part of original vendor code
- *
- *
- * 12-Mar-2005  Mineharu Takahara <mtakahar@yahoo.com>
- *   pass actual output size to decoder (stream mode
- *   compressed input is not a requirement anymore)
- *
- * 24-Apr-2005 Oleg I. Vdovikin
- *   reordered functions using lds script, removed forward decl
- *
- * ??-Nov-2005 Mike Baker
- *   reorder the script as an lzma wrapper; do not depend on flash access
- */
-
-#include "LzmaDecode.h"
-
-#define KSEG0			0x80000000
-#define KSEG1			0xa0000000
-
-#define KSEG1ADDR(a)		((((unsigned)(a)) & 0x1fffffffU) | KSEG1)
-
-#define Index_Invalidate_I	0x00
-#define Index_Writeback_Inv_D   0x01
-
-#define cache_unroll(base,op)	\
-	__asm__ __volatile__(		\
-		".set noreorder;\n"		\
-		".set mips3;\n"			\
-		"cache %1, (%0);\n"		\
-		".set mips0;\n"			\
-		".set reorder\n"		\
-		:						\
-		: "r" (base),			\
-		  "i" (op));
-
-
-static __inline__ void blast_icache(unsigned long size, unsigned long lsize)
-{
-	unsigned long start = KSEG0;
-	unsigned long end = (start + size);
-
-	while(start < end) {
-		cache_unroll(start,Index_Invalidate_I);
-		start += lsize;
-	}
-}
-
-static __inline__ void blast_dcache(unsigned long size, unsigned long lsize)
-{
-	unsigned long start = KSEG0;
-	unsigned long end = (start + size);
-
-	while(start < end) {
-		cache_unroll(start,Index_Writeback_Inv_D);
-		start += lsize;
-	}
-}
-
-unsigned char *data;
-
-static int read_byte(void *object, unsigned char **buffer, UInt32 *bufferSize)
-{
-	*bufferSize = 1;
-	*buffer = data;
-	++data;
-	return LZMA_RESULT_OK;
-}
-
-static __inline__ unsigned char get_byte(void)
-{
-	unsigned char *buffer;
-	UInt32 fake;
-	
-	return read_byte(0, &buffer, &fake), *buffer;
-}
-
-/* This puts lzma workspace 128k below RAM end. 
- * That should be enough for both lzma and stack
- */
-static char *buffer = (char *)(RAMSTART + RAMSIZE - 0x00020000);
-extern char lzma_start[];
-extern char lzma_end[];
-
-/* should be the first function */
-void entry(unsigned long icache_size, unsigned long icache_lsize, 
-	unsigned long dcache_size, unsigned long dcache_lsize)
-{
-	unsigned int i;  /* temp value */
-	unsigned int osize; /* uncompressed size */
-	volatile unsigned int arg0, arg1, arg2, arg3;
-
-	/* restore argument registers */
-	__asm__ __volatile__ ("ori %0, $12, 0":"=r"(arg0));
-	__asm__ __volatile__ ("ori %0, $13, 0":"=r"(arg1));
-	__asm__ __volatile__ ("ori %0, $14, 0":"=r"(arg2));
-	__asm__ __volatile__ ("ori %0, $15, 0":"=r"(arg3));
-
-	ILzmaInCallback callback;
-	CLzmaDecoderState vs;
-	callback.Read = read_byte;
-
-	data = lzma_start;
-
-	/* lzma args */
-	i = get_byte();
-	vs.Properties.lc = i % 9, i = i / 9;
-	vs.Properties.lp = i % 5, vs.Properties.pb = i / 5;
-
-	vs.Probs = (CProb *)buffer;
-
-	/* skip rest of the LZMA coder property */
-	for (i = 0; i < 4; i++)
-		get_byte();
-
-	/* read the lower half of uncompressed size in the header */
-	osize = ((unsigned int)get_byte()) +
-		((unsigned int)get_byte() << 8) +
-		((unsigned int)get_byte() << 16) +
-		((unsigned int)get_byte() << 24);
-
-	/* skip rest of the header (upper half of uncompressed size) */
-	for (i = 0; i < 4; i++) 
-		get_byte();
-
-	/* decompress kernel */
-	if ((i = LzmaDecode(&vs, &callback,
-	(unsigned char*)KERNEL_ENTRY, osize, &osize)) == LZMA_RESULT_OK)
-	{
-		blast_dcache(dcache_size, dcache_lsize);
-		blast_icache(icache_size, icache_lsize);
-
-		/* Jump to load address */
-		((void (*)(int a0, int a1, int a2, int a3)) KERNEL_ENTRY)(arg0, arg1, arg2, arg3);
-	}
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in b/target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in
deleted file mode 100644
index fbc87ab8e2..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in
+++ /dev/null
@@ -1,20 +0,0 @@
-OUTPUT_ARCH(mips)
-ENTRY(_start)
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = @LOADADDR@;
-  .text      :
-  {
-    _ftext = . ;
-    *(.text)
-    *(.rodata)
-  } =0
-
-  .reginfo : { *(.reginfo) }
-
-  .bss       :
-  {
-   *(.bss)
-  }
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in b/target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in
deleted file mode 100644
index 6021cec014..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in
+++ /dev/null
@@ -1,24 +0,0 @@
-OUTPUT_ARCH(mips)
-ENTRY(@ENTRY@)
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = @LOADADDR@;
-  .text      :
-  {
-    _ftext = . ;
-    *(.text.entry)
-    *(.text)
-    *(.rodata)
-    lzma_start = .;
-    kernel.o
-    lzma_end = .;
-  } =0
-
-  .reginfo : { *(.reginfo) }
-
-  .bss       :
-  {
-   *(.bss)
-  }
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/print.c b/target/linux/generic-2.6/image/lzma-loader/src/print.c
deleted file mode 100644
index 950687beff..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/print.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#include	"print.h"
-
-/* macros */
-#define		IsDigit(x)	( ((x) >= '0') && ((x) <= '9') )
-#define		Ctod(x)		( (x) - '0')
-
-/* forward declaration */
-extern int PrintChar(char *, char, int, int);
-extern int PrintString(char *, char *, int, int);
-extern int PrintNum(char *, unsigned long, int, int, int, int, char, int);
-
-/* private variable */
-static const char theFatalMsg[] = "fatal error in lp_Print!";
-
-/* -*-
- * A low level printf() function.
- */
-void
-lp_Print(void (*output)(void *, char *, int), 
-	 void * arg,
-	 char *fmt, 
-	 va_list ap)
-{
-
-#define 	OUTPUT(arg, s, l)  \
-  { if (((l) < 0) || ((l) > LP_MAX_BUF)) { \
-       (*output)(arg, (char*)theFatalMsg, sizeof(theFatalMsg)-1); for(;;); \
-    } else { \
-      (*output)(arg, s, l); \
-    } \
-  }
-    
-    char buf[LP_MAX_BUF];
-
-    char c;
-    char *s;
-    long int num;
-
-    int longFlag;
-    int negFlag;
-    int width;
-    int prec;
-    int ladjust;
-    char padc;
-
-    int length;
-
-    for(;;) {
-	{ 
-	    /* scan for the next '%' */
-	    char *fmtStart = fmt;
-	    while ( (*fmt != '\0') && (*fmt != '%')) {
-		fmt ++;
-	    }
-
-	    /* flush the string found so far */
-	    OUTPUT(arg, fmtStart, fmt-fmtStart);
-
-	    /* are we hitting the end? */
-	    if (*fmt == '\0') break;
-	}
-
-	/* we found a '%' */
-	fmt ++;
-	
-	/* check for long */
-	if (*fmt == 'l') {
-	    longFlag = 1;
-	    fmt ++;
-	} else {
-	    longFlag = 0;
-	}
-
-	/* check for other prefixes */
-	width = 0;
-	prec = -1;
-	ladjust = 0;
-	padc = ' ';
-
-	if (*fmt == '-') {
-	    ladjust = 1;
-	    fmt ++;
-	}
-
-	if (*fmt == '0') {
-	    padc = '0';
-	    fmt++;
-	}
-
-	if (IsDigit(*fmt)) {
-	    while (IsDigit(*fmt)) {
-		width = 10 * width + Ctod(*fmt++);
-	    }
-	}
-
-	if (*fmt == '.') {
-	    fmt ++;
-	    if (IsDigit(*fmt)) {
-		prec = 0;
-		while (IsDigit(*fmt)) {
-		    prec = prec*10 + Ctod(*fmt++);
-		}
-	    }
-	}
-
-
-	/* check format flag */
-	negFlag = 0;
-	switch (*fmt) {
-	 case 'b':
-	    if (longFlag) { 
-		num = va_arg(ap, long int); 
-	    } else { 
-		num = va_arg(ap, int);
-	    }
-	    length = PrintNum(buf, num, 2, 0, width, ladjust, padc, 0);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 'd':
-	 case 'D':
-	    if (longFlag) { 
-		num = va_arg(ap, long int);
-	    } else { 
-		num = va_arg(ap, int); 
-	    }
-	    if (num < 0) {
-		num = - num;
-		negFlag = 1;
-	    }
-	    length = PrintNum(buf, num, 10, negFlag, width, ladjust, padc, 0);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 'o':
-	 case 'O':
-	    if (longFlag) { 
-		num = va_arg(ap, long int);
-	    } else { 
-		num = va_arg(ap, int); 
-	    }
-	    length = PrintNum(buf, num, 8, 0, width, ladjust, padc, 0);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 'u':
-	 case 'U':
-	    if (longFlag) { 
-		num = va_arg(ap, long int);
-	    } else { 
-		num = va_arg(ap, int); 
-	    }
-	    length = PrintNum(buf, num, 10, 0, width, ladjust, padc, 0);
-	    OUTPUT(arg, buf, length);
-	    break;
-	    
-	 case 'x':
-	    if (longFlag) { 
-		num = va_arg(ap, long int);
-	    } else { 
-		num = va_arg(ap, int); 
-	    }
-	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 0);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 'X':
-	    if (longFlag) { 
-		num = va_arg(ap, long int);
-	    } else { 
-		num = va_arg(ap, int); 
-	    }
-	    length = PrintNum(buf, num, 16, 0, width, ladjust, padc, 1);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 'c':
-	    c = (char)va_arg(ap, int);
-	    length = PrintChar(buf, c, width, ladjust);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case 's':
-	    s = (char*)va_arg(ap, char *);
-	    length = PrintString(buf, s, width, ladjust);
-	    OUTPUT(arg, buf, length);
-	    break;
-
-	 case '\0':
-	    fmt --;
-	    break;
-
-	 default:
-	    /* output this char as it is */
-	    OUTPUT(arg, fmt, 1);
-	}	/* switch (*fmt) */
-
-	fmt ++;
-    }		/* for(;;) */
-
-    /* special termination call */
-    OUTPUT(arg, "\0", 1);
-}
-
-
-/* --------------- local help functions --------------------- */
-int
-PrintChar(char * buf, char c, int length, int ladjust)
-{
-    int i;
-    
-    if (length < 1) length = 1;
-    if (ladjust) {
-	*buf = c;
-	for (i=1; i< length; i++) buf[i] = ' ';
-    } else {
-	for (i=0; i< length-1; i++) buf[i] = ' ';
-	buf[length - 1] = c;
-    }
-    return length;
-}
-
-int
-PrintString(char * buf, char* s, int length, int ladjust)
-{
-    int i;
-    int len=0;
-    char* s1 = s;
-    while (*s1++) len++;
-    if (length < len) length = len;
-
-    if (ladjust) {
-	for (i=0; i< len; i++) buf[i] = s[i];
-	for (i=len; i< length; i++) buf[i] = ' ';
-    } else {
-	for (i=0; i< length-len; i++) buf[i] = ' ';
-	for (i=length-len; i < length; i++) buf[i] = s[i-length+len];
-    }
-    return length;
-}
-
-int
-PrintNum(char * buf, unsigned long u, int base, int negFlag, 
-	 int length, int ladjust, char padc, int upcase)
-{
-    /* algorithm :
-     *  1. prints the number from left to right in reverse form.
-     *  2. fill the remaining spaces with padc if length is longer than
-     *     the actual length
-     *     TRICKY : if left adjusted, no "0" padding.
-     *		    if negtive, insert  "0" padding between "0" and number.
-     *  3. if (!ladjust) we reverse the whole string including paddings
-     *  4. otherwise we only reverse the actual string representing the num.
-     */
-
-    int actualLength =0;
-    char *p = buf;
-    int i;
-
-    do {
-	int tmp = u %base;
-	if (tmp <= 9) {
-	    *p++ = '0' + tmp;
-	} else if (upcase) {
-	    *p++ = 'A' + tmp - 10;
-	} else {
-	    *p++ = 'a' + tmp - 10;
-	}
-	u /= base;
-    } while (u != 0);
-
-    if (negFlag) {
-	*p++ = '-';
-    }
-
-    /* figure out actual length and adjust the maximum length */
-    actualLength = p - buf;
-    if (length < actualLength) length = actualLength;
-
-    /* add padding */
-    if (ladjust) {
-	padc = ' ';
-    }
-    if (negFlag && !ladjust && (padc == '0')) {
-	for (i = actualLength-1; i< length-1; i++) buf[i] = padc;
-	buf[length -1] = '-';
-    } else {
-	for (i = actualLength; i< length; i++) buf[i] = padc;
-    }
-	    
-
-    /* prepare to reverse the string */
-    {
-	int begin = 0;
-	int end;
-	if (ladjust) {
-	    end = actualLength - 1;
-	} else {
-	    end = length -1;
-	}
-
-	while (end > begin) {
-	    char tmp = buf[begin];
-	    buf[begin] = buf[end];
-	    buf[end] = tmp;
-	    begin ++;
-	    end --;
-	}
-    }
-
-    /* adjust the string pointer */
-    return length;
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/print.h b/target/linux/generic-2.6/image/lzma-loader/src/print.h
deleted file mode 100644
index b051463909..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/print.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef _print_h_
-#define _print_h_
-
-#include <stdarg.h>
-
-/* this is the maximum width for a variable */
-#define		LP_MAX_BUF	80
-
-/* -*-
- * output function takes an void pointer which is passed in as the
- * second argument in lp_Print().  This black-box argument gives output
- * function a way to track state.
- *
- * The second argument in output function is a pointer to char buffer.
- * The third argument specifies the number of chars to outputed.
- *
- * output function cannot assume the buffer is null-terminated after
- * l number of chars.
- */
-void lp_Print(void (*output)(void *, char *, int), 
-	      void * arg,
-	      char *fmt, 
-	      va_list ap);
-
-#endif
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/printf.c b/target/linux/generic-2.6/image/lzma-loader/src/printf.c
deleted file mode 100644
index 49bd50d7c7..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/printf.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#include "printf.h"
-#include "print.h"
-#include "uart16550.h"
-
-static void myoutput(void *arg, char *s, int l)
-{
-    int i;
-
-    // special termination call
-    if ((l==1) && (s[0] == '\0')) return;
-    
-    for (i=0; i< l; i++) {
-	Uart16550Put(s[i]);
-	if (s[i] == '\n') Uart16550Put('\r');
-    }
-}
-
-void printf(char *fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    lp_Print(myoutput, 0, fmt, ap);
-    va_end(ap);
-}
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/printf.h b/target/linux/generic-2.6/image/lzma-loader/src/printf.h
deleted file mode 100644
index 9b1c1df232..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/printf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef _printf_h_
-#define _printf_h_
-
-#include <stdarg.h>
-void printf(char *fmt, ...);
-
-#endif /* _printf_h_ */
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/start.S b/target/linux/generic-2.6/image/lzma-loader/src/start.S
deleted file mode 100644
index 864293379f..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/start.S
+++ /dev/null
@@ -1,160 +0,0 @@
-#include <asm/asm.h>
-#include <asm/regdef.h>
-
-#define KSEG0		0x80000000
-
-#define C0_CONFIG	$16
-#define C0_TAGLO	$28
-#define C0_TAGHI	$29
-
-#define	CONF1_DA_SHIFT	7			/* D$ associativity */
-#define CONF1_DA_MASK	0x00000380
-#define CONF1_DA_BASE	1
-#define CONF1_DL_SHIFT	10			/* D$ line size */
-#define CONF1_DL_MASK	0x00001c00
-#define CONF1_DL_BASE	2
-#define CONF1_DS_SHIFT	13			/* D$ sets/way */
-#define CONF1_DS_MASK	0x0000e000
-#define CONF1_DS_BASE	64
-#define CONF1_IA_SHIFT	16			/* I$ associativity */
-#define CONF1_IA_MASK	0x00070000
-#define CONF1_IA_BASE	1
-#define CONF1_IL_SHIFT	19			/* I$ line size */
-#define CONF1_IL_MASK	0x00380000
-#define CONF1_IL_BASE	2
-#define CONF1_IS_SHIFT	22			/* Instruction cache sets/way */
-#define CONF1_IS_MASK	0x01c00000
-#define CONF1_IS_BASE	64
-
-#define Index_Invalidate_I	0x00
-#define Index_Writeback_Inv_D   0x01
-
-LEAF(_start)
-	
-	.set	mips32
-	.set noreorder
-
-	/* save argument registers */
-	move t4, a0
-	move t5, a1
-	move t6, a2
-	move t7, a3
-	
-	/* set up stack */
-	li	sp, RAMSTART + RAMSIZE - 16
-
-#ifdef IMAGE_COPY
-	/* Copy decompressor code to the right place */
-	li  t2, LOADADDR
-	add a0, t2, 0
-	la  a1, code_start
-	la  a2, code_stop
-$L1:
-	lw  t0, 0(a1)
-	sw  t0, 0(a0)
-	add a1, 4
-	add a0, 4
-	blt a1, a2, $L1
-	nop
-#endif
-
-	/* At this point we need to invalidate dcache and */
-	/* icache before jumping to new code */
-
-1:	/* Get cache sizes */
-	mfc0	s0,C0_CONFIG,1
-
-	li	s1,CONF1_DL_MASK
-	and	s1,s0
-	beq	s1,zero,nodc
-	nop
-
-	srl	s1,CONF1_DL_SHIFT
-	li	t0,CONF1_DL_BASE
-	sll	s1,t0,s1		/* s1 has D$ cache line size */
-
-	li	s2,CONF1_DA_MASK
-	and	s2,s0
-	srl	s2,CONF1_DA_SHIFT
-	addiu	s2,CONF1_DA_BASE	/* s2 now has D$ associativity */
-
-	li	t0,CONF1_DS_MASK
-	and	t0,s0
-	srl	t0,CONF1_DS_SHIFT
-	li	s3,CONF1_DS_BASE
-	sll	s3,s3,t0		/* s3 has D$ sets per way */
-
-	multu	s2,s3			/* sets/way * associativity */
-	mflo	t0			/* total cache lines */
-
-	multu	s1,t0			/* D$ linesize * lines */
-	mflo	s2			/* s2 is now D$ size in bytes */
-
-	/* Initilize the D$: */
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	li	t0,KSEG0		/* Just an address for the first $ line */
-	addu	t1,t0,s2		/*  + size of cache == end */
-
-1:	cache	Index_Writeback_Inv_D,0(t0)
-	bne	t0,t1,1b
-	addu	t0,s1
-	
-nodc:
-	/* Now we get to do it all again for the I$ */
-	
-	move	s3,zero			/* just in case there is no icache */
-	move	s4,zero
-
-	li	t0,CONF1_IL_MASK
-	and	t0,s0
-	beq	t0,zero,noic
-	nop
-
-	srl	t0,CONF1_IL_SHIFT
-	li	s3,CONF1_IL_BASE
-	sll	s3,t0			/* s3 has I$ cache line size */
-
-	li	t0,CONF1_IA_MASK
-	and	t0,s0
-	srl	t0,CONF1_IA_SHIFT
-	addiu	s4,t0,CONF1_IA_BASE	/* s4 now has I$ associativity */
-
-	li	t0,CONF1_IS_MASK
-	and	t0,s0
-	srl	t0,CONF1_IS_SHIFT
-	li	s5,CONF1_IS_BASE
-	sll	s5,t0			/* s5 has I$ sets per way */
-
-	multu	s4,s5			/* sets/way * associativity */
-	mflo	t0			/* s4 is now total cache lines */
-
-	multu	s3,t0			/* I$ linesize * lines */
-	mflo	s4			/* s4 is cache size in bytes */
-
-	/* Initilize the I$: */
-	mtc0	zero,C0_TAGLO
-	mtc0	zero,C0_TAGHI
-
-	li	t0,KSEG0		/* Just an address for the first $ line */
-	addu	t1,t0,s4		/*  + size of cache == end */
-
-1:	cache	Index_Invalidate_I,0(t0)
-	bne	t0,t1,1b
-	addu	t0,s3
-noic:
-	/* jump to main */
-	move    a0,s3                   /* icache line size */
-	move    a1,s4                   /* icache size */
-	move    a2,s1                   /* dcache line size */
-#ifdef IMAGE_COPY
-	jal		t2
-#else
-	jal     entry
-#endif
-	move    a3,s2                   /* dcache size */
-
-	.set reorder
-END(_start)
-
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/uart16550.c b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.c
deleted file mode 100644
index 7df5727600..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/uart16550.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-
-#include "uart16550.h"
-
-/* === CONFIG === */
-
-#define         BASE                    0xb8058000
-#define         MAX_BAUD                1152000
-#define         REG_OFFSET              4
-
-/* === END OF CONFIG === */
-
-/* register offset */
-#define         OFS_RCV_BUFFER          (0*REG_OFFSET)
-#define         OFS_TRANS_HOLD          (0*REG_OFFSET)
-#define         OFS_SEND_BUFFER         (0*REG_OFFSET)
-#define         OFS_INTR_ENABLE         (1*REG_OFFSET)
-#define         OFS_INTR_ID             (2*REG_OFFSET)
-#define         OFS_DATA_FORMAT         (3*REG_OFFSET)
-#define         OFS_LINE_CONTROL        (3*REG_OFFSET)
-#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)
-#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)
-#define         OFS_LINE_STATUS         (5*REG_OFFSET)
-#define         OFS_MODEM_STATUS        (6*REG_OFFSET)
-#define         OFS_RS232_INPUT         (6*REG_OFFSET)
-#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)
-
-#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)
-#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)
-
-
-/* memory-mapped read/write of the port */
-#define         UART16550_READ(y)    (*((volatile uint32*)(BASE + y)))
-#define         UART16550_WRITE(y, z)  ((*((volatile uint32*)(BASE + y))) = z)
-
-#define DEBUG_LED (*(unsigned short*)0xb7ffffc0)
-#define OutputLED(x)  (DEBUG_LED = x)
-
-void Uart16550Init(uint32 baud, uint8 data, uint8 parity, uint8 stop)
-{
-    /* disable interrupts */
-    UART16550_WRITE(OFS_INTR_ENABLE, 0);
-
-    /* set up buad rate */
-    { 
-        uint32 divisor;
-       
-        /* set DIAB bit */
-        UART16550_WRITE(OFS_LINE_CONTROL, 0x80);
-        
-        /* set divisor */
-        divisor = MAX_BAUD / baud;
-        UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff);
-        UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00)>>8);
-
-        /* clear DIAB bit */
-        UART16550_WRITE(OFS_LINE_CONTROL, 0x0);
-    }
-
-    /* set data format */
-    UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);
-}
-
-uint8 Uart16550GetPoll()
-{
-    while((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0);
-    return UART16550_READ(OFS_RCV_BUFFER);
-}
-
-
-void Uart16550Put(uint8 byte)
-{
-    while ((UART16550_READ(OFS_LINE_STATUS) &0x20) == 0);
-    UART16550_WRITE(OFS_SEND_BUFFER, byte);
-}
-
diff --git a/target/linux/generic-2.6/image/lzma-loader/src/uart16550.h b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.h
deleted file mode 100644
index b3fd6fdd75..0000000000
--- a/target/linux/generic-2.6/image/lzma-loader/src/uart16550.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2001 MontaVista Software Inc.
- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef _uart16550_h_
-#define _uart16550_h_
-
-typedef         unsigned char uint8;
-typedef         unsigned int  uint32;
-
-#define         UART16550_BAUD_2400             2400
-#define         UART16550_BAUD_4800             4800
-#define         UART16550_BAUD_9600             9600
-#define         UART16550_BAUD_19200            19200
-#define         UART16550_BAUD_38400            38400
-#define         UART16550_BAUD_57600            57600
-#define         UART16550_BAUD_115200           115200
-
-#define         UART16550_PARITY_NONE           0
-#define         UART16550_PARITY_ODD            0x08
-#define         UART16550_PARITY_EVEN           0x18
-#define         UART16550_PARITY_MARK           0x28
-#define         UART16550_PARITY_SPACE          0x38
-
-#define         UART16550_DATA_5BIT             0x0
-#define         UART16550_DATA_6BIT             0x1
-#define         UART16550_DATA_7BIT             0x2
-#define         UART16550_DATA_8BIT             0x3
-
-#define         UART16550_STOP_1BIT             0x0
-#define         UART16550_STOP_2BIT             0x4
-
-void Uart16550Init(uint32 baud, uint8 data, uint8 parity, uint8 stop);
-
-/* blocking call */
-uint8 Uart16550GetPoll();
-
-void Uart16550Put(uint8 byte);
-
-#endif
diff --git a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
deleted file mode 100644
index b2be83183a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
+++ /dev/null
@@ -1,4170 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1367,6 +1367,71 @@ config CRAMFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS
-+	tristate "SquashFS 3.0 - Squashed file system support"
-+	select ZLIB_INFLATE
-+	help
-+	  Saying Y here includes support for SquashFS 3.0 (a Compressed Read-Only File
-+	  System).  Squashfs is a highly compressed read-only filesystem for Linux.
-+	  It uses zlib compression to compress both files, inodes and directories.
-+	  Inodes in the system are very small and all blocks are packed to minimise
-+	  data overhead. Block sizes greater than 4K are supported up to a maximum of 64K.
-+	  SquashFS 3.0 supports 64 bit filesystems and files (larger than 4GB), full
-+	  uid/gid information, hard links and timestamps.
-+
-+	  Squashfs is intended for general read-only filesystem use, for archival
-+	  use (i.e. in cases where a .tar.gz file may be used), and in embedded
-+	  systems where low overhead is needed.  Further information and filesystem tools
-+	  are available from http://squashfs.sourceforge.net.
-+
-+	  If you want to compile this as a module ( = code which can be
-+	  inserted in and removed from the running kernel whenever you want),
-+	  say M here and read <file:Documentation/modules.txt>.  The module
-+	  will be called squashfs.  Note that the root file system (the one
-+	  containing the directory /) cannot be compiled as a module.
-+
-+	  If unsure, say N.
-+
-+config SQUASHFS_EMBEDDED
-+
-+	bool "Additional options for memory-constrained systems"
-+	depends on SQUASHFS
-+	default n
-+	help
-+	  Saying Y here allows you to specify cache sizes and how Squashfs
-+	  allocates memory.  This is only intended for memory constrained
-+	  systems.
-+
-+	  If unsure, say N.
-+
-+config SQUASHFS_FRAGMENT_CACHE_SIZE
-+	int "Number of fragments cached" if SQUASHFS_EMBEDDED
-+	depends on SQUASHFS
-+	default "3"
-+	help
-+	  By default SquashFS caches the last 3 fragments read from
-+	  the filesystem.  Increasing this amount may mean SquashFS
-+	  has to re-read fragments less often from disk, at the expense
-+	  of extra system memory.  Decreasing this amount will mean
-+	  SquashFS uses less memory at the expense of extra reads from disk.
-+
-+	  Note there must be at least one cached fragment.  Anything
-+	  much more than three will probably not make much difference.
-+
-+config SQUASHFS_VMALLOC
-+	bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED
-+	depends on SQUASHFS
-+	default n
-+	help
-+	  By default SquashFS uses kmalloc to obtain fragment cache memory.
-+	  Kmalloc memory is the standard kernel allocator, but it can fail
-+	  on memory constrained systems.  Because of the way Vmalloc works,
-+	  Vmalloc can succeed when kmalloc fails.  Specifying this option
-+	  will make SquashFS always use Vmalloc to allocate the
-+	  fragment cache memory.
-+
-+	  If unsure, say N.
-+
- config VXFS_FS
- 	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
- 	depends on BLOCK
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD)		+= jbd/
- obj-$(CONFIG_JBD2)		+= jbd2/
- obj-$(CONFIG_EXT2_FS)		+= ext2/
- obj-$(CONFIG_CRAMFS)		+= cramfs/
-+obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
---- /dev/null
-+++ b/fs/squashfs/inode.c
-@@ -0,0 +1,2122 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * inode.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/slab.h>
-+#include <linux/squashfs_fs_sb.h>
-+#include <linux/squashfs_fs_i.h>
-+#include <linux/buffer_head.h>
-+#include <linux/vfs.h>
-+#include <linux/init.h>
-+#include <linux/dcache.h>
-+#include <linux/wait.h>
-+#include <linux/zlib.h>
-+#include <linux/blkdev.h>
-+#include <linux/vmalloc.h>
-+#include <asm/uaccess.h>
-+#include <asm/semaphore.h>
-+
-+#include "squashfs.h"
-+
-+static void squashfs_put_super(struct super_block *);
-+static int squashfs_statfs(struct dentry *, struct kstatfs *);
-+static int squashfs_symlink_readpage(struct file *file, struct page *page);
-+static int squashfs_readpage(struct file *file, struct page *page);
-+static int squashfs_readpage4K(struct file *file, struct page *page);
-+static int squashfs_readdir(struct file *, void *, filldir_t);
-+static struct inode *squashfs_alloc_inode(struct super_block *sb);
-+static void squashfs_destroy_inode(struct inode *inode);
-+static int init_inodecache(void);
-+static void destroy_inodecache(void);
-+static struct dentry *squashfs_lookup(struct inode *, struct dentry *,
-+				struct nameidata *);
-+static struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode);
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize);
-+static int squashfs_get_sb(struct file_system_type *, int,
-+			const char *, void *, struct vfsmount *);
-+
-+
-+static z_stream stream;
-+
-+static struct file_system_type squashfs_fs_type = {
-+	.owner = THIS_MODULE,
-+	.name = "squashfs",
-+	.get_sb = squashfs_get_sb,
-+	.kill_sb = kill_block_super,
-+	.fs_flags = FS_REQUIRES_DEV
-+};
-+
-+static unsigned char squashfs_filetype_table[] = {
-+	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
-+};
-+
-+static struct super_operations squashfs_ops = {
-+	.alloc_inode = squashfs_alloc_inode,
-+	.destroy_inode = squashfs_destroy_inode,
-+	.statfs = squashfs_statfs,
-+	.put_super = squashfs_put_super,
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_symlink_aops = {
-+	.readpage = squashfs_symlink_readpage
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_aops = {
-+	.readpage = squashfs_readpage
-+};
-+
-+SQSH_EXTERN struct address_space_operations squashfs_aops_4K = {
-+	.readpage = squashfs_readpage4K
-+};
-+
-+static struct file_operations squashfs_dir_ops = {
-+	.read = generic_read_dir,
-+	.readdir = squashfs_readdir
-+};
-+
-+SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = {
-+	.lookup = squashfs_lookup
-+};
-+
-+
-+static struct buffer_head *get_block_length(struct super_block *s,
-+				int *cur_index, int *offset, int *c_byte)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned short temp;
-+	struct buffer_head *bh;
-+
-+	if (!(bh = sb_bread(s, *cur_index)))
-+		goto out;
-+
-+	if (msblk->devblksize - *offset == 1) {
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		else
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		brelse(bh);
-+		if (!(bh = sb_bread(s, ++(*cur_index))))
-+			goto out;
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				bh->b_data);
-+		else
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				bh->b_data);
-+		*c_byte = temp;
-+		*offset = 1;
-+	} else {
-+		if (msblk->swap) {
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset + 1));
-+		} else {
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset + 1));
-+		}
-+		*c_byte = temp;
-+		*offset += 2;
-+	}
-+
-+	if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) {
-+		if (*offset == msblk->devblksize) {
-+			brelse(bh);
-+			if (!(bh = sb_bread(s, ++(*cur_index))))
-+				goto out;
-+			*offset = 0;
-+		}
-+		if (*((unsigned char *) (bh->b_data + *offset)) !=
-+						SQUASHFS_MARKER_BYTE) {
-+			ERROR("Metadata block marker corrupt @ %x\n",
-+						*cur_index);
-+			brelse(bh);
-+			goto out;
-+		}
-+		(*offset)++;
-+	}
-+	return bh;
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+			long long index, unsigned int length,
-+			long long *next_index)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >>
-+			msblk->devblksize_log2) + 2];
-+	unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1);
-+	unsigned int cur_index = index >> msblk->devblksize_log2;
-+	int bytes, avail_bytes, b = 0, k;
-+	char *c_buffer;
-+	unsigned int compressed;
-+	unsigned int c_byte = length;
-+
-+	if (c_byte) {
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte);
-+		c_buffer = compressed ? msblk->read_data : buffer;
-+		c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
-+					? "" : "un", (unsigned int) c_byte);
-+
-+		if (!(bh[0] = sb_getblk(s, cur_index)))
-+			goto block_release;
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			if (!(bh[b] = sb_getblk(s, ++cur_index)))
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b, bh);
-+	} else {
-+		if (!(bh[0] = get_block_length(s, &cur_index, &offset,
-+								&c_byte)))
-+			goto read_failure;
-+
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED(c_byte);
-+		c_buffer = compressed ? msblk->read_data : buffer;
-+		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
-+					? "" : "un", (unsigned int) c_byte);
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			if (!(bh[b] = sb_getblk(s, ++cur_index)))
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b - 1, bh + 1);
-+	}
-+
-+	if (compressed)
-+		down(&msblk->read_data_mutex);
-+
-+	for (bytes = 0, k = 0; k < b; k++) {
-+		avail_bytes = (c_byte - bytes) > (msblk->devblksize - offset) ?
-+					msblk->devblksize - offset :
-+					c_byte - bytes;
-+		wait_on_buffer(bh[k]);
-+		if (!buffer_uptodate(bh[k]))
-+			goto block_release;
-+		memcpy(c_buffer + bytes, bh[k]->b_data + offset, avail_bytes);
-+		bytes += avail_bytes;
-+		offset = 0;
-+		brelse(bh[k]);
-+	}
-+
-+	/*
-+	 * uncompress block
-+	 */
-+	if (compressed) {
-+		int zlib_err;
-+
-+		stream.next_in = c_buffer;
-+		stream.avail_in = c_byte;
-+		stream.next_out = buffer;
-+		stream.avail_out = msblk->read_size;
-+
-+		if (((zlib_err = zlib_inflateInit(&stream)) != Z_OK) ||
-+				((zlib_err = zlib_inflate(&stream, Z_FINISH))
-+				 != Z_STREAM_END) || ((zlib_err =
-+				zlib_inflateEnd(&stream)) != Z_OK)) {
-+			ERROR("zlib_fs returned unexpected result 0x%x\n",
-+				zlib_err);
-+			bytes = 0;
-+		} else
-+			bytes = stream.total_out;
-+
-+		up(&msblk->read_data_mutex);
-+	}
-+
-+	if (next_index)
-+		*next_index = index + c_byte + (length ? 0 :
-+				(SQUASHFS_CHECK_DATA(msblk->sblk.flags)
-+				 ? 3 : 2));
-+	return bytes;
-+
-+block_release:
-+	while (--b >= 0)
-+		brelse(bh[b]);
-+
-+read_failure:
-+	ERROR("sb_bread failed reading block 0x%x\n", cur_index);
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, char *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int n, i, bytes, return_length = length;
-+	long long next_index;
-+
-+	TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset);
-+
-+	while ( 1 ) {
-+		for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+			if (msblk->block_cache[i].block == block)
-+				break;
-+
-+		down(&msblk->block_cache_mutex);
-+
-+		if (i == SQUASHFS_CACHED_BLKS) {
-+			/* read inode header block */
-+			for (i = msblk->next_cache, n = SQUASHFS_CACHED_BLKS;
-+					n ; n --, i = (i + 1) %
-+					SQUASHFS_CACHED_BLKS)
-+				if (msblk->block_cache[i].block !=
-+							SQUASHFS_USED_BLK)
-+					break;
-+
-+			if (n == 0) {
-+				wait_queue_t wait;
-+
-+				init_waitqueue_entry(&wait, current);
-+				add_wait_queue(&msblk->waitq, &wait);
-+				set_current_state(TASK_UNINTERRUPTIBLE);
-+ 				up(&msblk->block_cache_mutex);
-+				schedule();
-+				set_current_state(TASK_RUNNING);
-+				remove_wait_queue(&msblk->waitq, &wait);
-+				continue;
-+			}
-+			msblk->next_cache = (i + 1) % SQUASHFS_CACHED_BLKS;
-+
-+			if (msblk->block_cache[i].block ==
-+							SQUASHFS_INVALID_BLK) {
-+				if (!(msblk->block_cache[i].data =
-+						kmalloc(SQUASHFS_METADATA_SIZE,
-+						GFP_KERNEL))) {
-+					ERROR("Failed to allocate cache"
-+							"block\n");
-+					up(&msblk->block_cache_mutex);
-+					goto out;
-+				}
-+			}
-+
-+			msblk->block_cache[i].block = SQUASHFS_USED_BLK;
-+			up(&msblk->block_cache_mutex);
-+
-+			if (!(msblk->block_cache[i].length =
-+						squashfs_read_data(s,
-+						msblk->block_cache[i].data,
-+						block, 0, &next_index))) {
-+				ERROR("Unable to read cache block [%llx:%x]\n",
-+						block, offset);
-+				goto out;
-+			}
-+
-+			down(&msblk->block_cache_mutex);
-+			wake_up(&msblk->waitq);
-+			msblk->block_cache[i].block = block;
-+			msblk->block_cache[i].next_index = next_index;
-+			TRACE("Read cache block [%llx:%x]\n", block, offset);
-+		}
-+
-+		if (msblk->block_cache[i].block != block) {
-+			up(&msblk->block_cache_mutex);
-+			continue;
-+		}
-+
-+		if ((bytes = msblk->block_cache[i].length - offset) >= length) {
-+			if (buffer)
-+				memcpy(buffer, msblk->block_cache[i].data +
-+						offset, length);
-+			if (msblk->block_cache[i].length - offset == length) {
-+				*next_block = msblk->block_cache[i].next_index;
-+				*next_offset = 0;
-+			} else {
-+				*next_block = block;
-+				*next_offset = offset + length;
-+			}
-+			up(&msblk->block_cache_mutex);
-+			goto finish;
-+		} else {
-+			if (buffer) {
-+				memcpy(buffer, msblk->block_cache[i].data +
-+						offset, bytes);
-+				buffer += bytes;
-+			}
-+			block = msblk->block_cache[i].next_index;
-+			up(&msblk->block_cache_mutex);
-+			length -= bytes;
-+			offset = 0;
-+		}
-+	}
-+
-+finish:
-+	return return_length;
-+out:
-+	return 0;
-+}
-+
-+
-+static int get_fragment_location(struct super_block *s, unsigned int fragment,
-+				long long *fragment_start_block,
-+				unsigned int *fragment_size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start_block =
-+		msblk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)];
-+	int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment);
-+	struct squashfs_fragment_entry fragment_entry;
-+
-+	if (msblk->swap) {
-+		struct squashfs_fragment_entry sfragment_entry;
-+
-+		if (!squashfs_get_cached_block(s, (char *) &sfragment_entry,
-+					start_block, offset,
-+					sizeof(sfragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+		SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry);
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) &fragment_entry,
-+					start_block, offset,
-+					sizeof(fragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+
-+	*fragment_start_block = fragment_entry.start_block;
-+	*fragment_size = fragment_entry.size;
-+
-+	return 1;
-+
-+out:
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+					squashfs_fragment_cache *fragment)
-+{
-+	down(&msblk->fragment_mutex);
-+	fragment->locked --;
-+	wake_up(&msblk->fragment_wait_queue);
-+	up(&msblk->fragment_mutex);
-+}
-+
-+
-+SQSH_EXTERN struct squashfs_fragment_cache *get_cached_fragment(struct super_block
-+					*s, long long start_block,
-+					int length)
-+{
-+	int i, n;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+
-+	while ( 1 ) {
-+		down(&msblk->fragment_mutex);
-+
-+		for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS &&
-+				msblk->fragment[i].block != start_block; i++);
-+
-+		if (i == SQUASHFS_CACHED_FRAGMENTS) {
-+			for (i = msblk->next_fragment, n =
-+				SQUASHFS_CACHED_FRAGMENTS; n &&
-+				msblk->fragment[i].locked; n--, i = (i + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS);
-+
-+			if (n == 0) {
-+				wait_queue_t wait;
-+
-+				init_waitqueue_entry(&wait, current);
-+				add_wait_queue(&msblk->fragment_wait_queue,
-+									&wait);
-+				set_current_state(TASK_UNINTERRUPTIBLE);
-+				up(&msblk->fragment_mutex);
-+				schedule();
-+				set_current_state(TASK_RUNNING);
-+				remove_wait_queue(&msblk->fragment_wait_queue,
-+									&wait);
-+				continue;
-+			}
-+			msblk->next_fragment = (msblk->next_fragment + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS;
-+
-+			if (msblk->fragment[i].data == NULL)
-+				if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
-+						(SQUASHFS_FILE_MAX_SIZE))) {
-+					ERROR("Failed to allocate fragment "
-+							"cache block\n");
-+					up(&msblk->fragment_mutex);
-+					goto out;
-+				}
-+
-+			msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+			msblk->fragment[i].locked = 1;
-+			up(&msblk->fragment_mutex);
-+
-+			if (!(msblk->fragment[i].length = squashfs_read_data(s,
-+						msblk->fragment[i].data,
-+						start_block, length, NULL))) {
-+				ERROR("Unable to read fragment cache block "
-+							"[%llx]\n", start_block);
-+				msblk->fragment[i].locked = 0;
-+				goto out;
-+			}
-+
-+			msblk->fragment[i].block = start_block;
-+			TRACE("New fragment %d, start block %lld, locked %d\n",
-+						i, msblk->fragment[i].block,
-+						msblk->fragment[i].locked);
-+			break;
-+		}
-+
-+		msblk->fragment[i].locked++;
-+		up(&msblk->fragment_mutex);
-+		TRACE("Got fragment %d, start block %lld, locked %d\n", i,
-+						msblk->fragment[i].block,
-+						msblk->fragment[i].locked);
-+		break;
-+	}
-+
-+	return &msblk->fragment[i];
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+static struct inode *squashfs_new_inode(struct super_block *s,
-+		struct squashfs_base_inode_header *inodeb)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct inode *i = new_inode(s);
-+
-+	if (i) {
-+		i->i_ino = inodeb->inode_number;
-+		i->i_mtime.tv_sec = inodeb->mtime;
-+		i->i_atime.tv_sec = inodeb->mtime;
-+		i->i_ctime.tv_sec = inodeb->mtime;
-+		i->i_uid = msblk->uid[inodeb->uid];
-+		i->i_mode = inodeb->mode;
-+		i->i_size = 0;
-+		if (inodeb->guid == SQUASHFS_GUIDS)
-+			i->i_gid = i->i_uid;
-+		else
-+			i->i_gid = msblk->guid[inodeb->guid];
-+	}
-+
-+	return i;
-+}
-+
-+
-+static struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode)
-+{
-+	struct inode *i;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long block = SQUASHFS_INODE_BLK(inode) +
-+		sblk->inode_table_start;
-+	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
-+	long long next_block;
-+	unsigned int next_offset;
-+	union squashfs_inode_header id, sid;
-+	struct squashfs_base_inode_header *inodeb = &id.base,
-+					  *sinodeb = &sid.base;
-+
-+	TRACE("Entered squashfs_iget\n");
-+
-+	if (msblk->swap) {
-+		if (!squashfs_get_cached_block(s, (char *) sinodeb, block,
-+					offset, sizeof(*sinodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+		SQUASHFS_SWAP_BASE_INODE_HEADER(inodeb, sinodeb,
-+					sizeof(*sinodeb));
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) inodeb, block,
-+					offset, sizeof(*inodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+
-+	switch(inodeb->inode_type) {
-+		case SQUASHFS_FILE_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_reg_inode_header *inodep = &id.reg;
-+			struct squashfs_reg_inode_header *sinodep = &sid.reg;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_REG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = 1;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_LREG_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_lreg_inode_header *inodep = &id.lreg;
-+			struct squashfs_lreg_inode_header *sinodep = &sid.lreg;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LREG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_DIR_TYPE: {
-+			struct squashfs_dir_inode_header *inodep = &id.dir;
-+			struct squashfs_dir_inode_header *sinodep = &sid.dir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DIR_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = 0;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Directory inode %x:%x, start_block %x, offset "
-+					"%x\n", SQUASHFS_INODE_BLK(inode),
-+					offset, inodep->start_block,
-+					inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_LDIR_TYPE: {
-+			struct squashfs_ldir_inode_header *inodep = &id.ldir;
-+			struct squashfs_ldir_inode_header *sinodep = &sid.ldir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LDIR_INODE_HEADER(inodep,
-+						sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_start = next_block;
-+			SQUASHFS_I(i)->u.s2.directory_index_offset =
-+								next_offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count =
-+								inodep->i_count;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Long directory inode %x:%x, start_block %x, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_SYMLINK_TYPE: {
-+			struct squashfs_symlink_inode_header *inodep =
-+								&id.symlink;
-+			struct squashfs_symlink_inode_header *sinodep =
-+								&sid.symlink;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_SYMLINK_INODE_HEADER(inodep,
-+								sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->symlink_size;
-+			i->i_op = &page_symlink_inode_operations;
-+			i->i_data.a_ops = &squashfs_symlink_aops;
-+			i->i_mode |= S_IFLNK;
-+			SQUASHFS_I(i)->start_block = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+
-+			TRACE("Symbolic link inode %x:%x, start_block %llx, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					next_block, next_offset);
-+			break;
-+		 }
-+		 case SQUASHFS_BLKDEV_TYPE:
-+		 case SQUASHFS_CHRDEV_TYPE: {
-+			struct squashfs_dev_inode_header *inodep = &id.dev;
-+			struct squashfs_dev_inode_header *sinodep = &sid.dev;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DEV_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type ==
-+					SQUASHFS_CHRDEV_TYPE) ?  S_IFCHR :
-+					S_IFBLK;
-+			init_special_inode(i, i->i_mode,
-+					old_decode_dev(inodep->rdev));
-+
-+			TRACE("Device inode %x:%x, rdev %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->rdev);
-+			break;
-+		 }
-+		 case SQUASHFS_FIFO_TYPE:
-+		 case SQUASHFS_SOCKET_TYPE: {
-+			struct squashfs_ipc_inode_header *inodep = &id.ipc;
-+			struct squashfs_ipc_inode_header *sinodep = &sid.ipc;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_IPC_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE)
-+							? S_IFIFO : S_IFSOCK;
-+			init_special_inode(i, i->i_mode, 0);
-+			break;
-+		 }
-+		 default:
-+			ERROR("Unknown inode type %d in squashfs_iget!\n",
-+					inodeb->inode_type);
-+			goto failed_read1;
-+	}
-+
-+	insert_inode_hash(i);
-+	return i;
-+
-+failed_read:
-+	ERROR("Unable to read inode [%llx:%x]\n", block, offset);
-+
-+failed_read1:
-+	return NULL;
-+}
-+
-+
-+static int read_fragment_index_table(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	/* Allocate fragment index table */
-+	if (!(msblk->fragment_index = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES
-+					(sblk->fragments), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		return 0;
-+	}
-+
-+	if (SQUASHFS_FRAGMENT_INDEX_BYTES(sblk->fragments) &&
-+					!squashfs_read_data(s, (char *)
-+					msblk->fragment_index,
-+					sblk->fragment_table_start,
-+					SQUASHFS_FRAGMENT_INDEX_BYTES
-+					(sblk->fragments) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		ERROR("unable to read fragment index table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		long long fragment;
-+
-+		for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sblk->fragments);
-+									i++) {
-+			SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment),
-+						&msblk->fragment_index[i], 1);
-+			msblk->fragment_index[i] = fragment;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent)
-+{
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	msblk->iget = squashfs_iget;
-+	msblk->read_blocklist = read_blocklist;
-+	msblk->read_fragment_index_table = read_fragment_index_table;
-+
-+	if (sblk->s_major == 1) {
-+		if (!squashfs_1_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 1.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with "
-+				"Squashfs 1.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if (sblk->s_major == 2) {
-+		if (!squashfs_2_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 2.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with "
-+				"Squashfs 2.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if(sblk->s_major != SQUASHFS_MAJOR || sblk->s_minor >
-+			SQUASHFS_MINOR) {
-+		SERROR("Major/Minor mismatch, trying to mount newer %d.%d "
-+				"filesystem\n", sblk->s_major, sblk->s_minor);
-+		SERROR("Please update your kernel\n");
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int squashfs_fill_super(struct super_block *s, void *data, int silent)
-+{
-+	struct squashfs_sb_info *msblk;
-+	struct squashfs_super_block *sblk;
-+	int i;
-+	char b[BDEVNAME_SIZE];
-+	struct inode *root;
-+
-+	TRACE("Entered squashfs_read_superblock\n");
-+
-+	if (!(s->s_fs_info = kmalloc(sizeof(struct squashfs_sb_info),
-+						GFP_KERNEL))) {
-+		ERROR("Failed to allocate superblock\n");
-+		goto failure;
-+	}
-+	memset(s->s_fs_info, 0, sizeof(struct squashfs_sb_info));
-+	msblk = s->s_fs_info;
-+	sblk = &msblk->sblk;
-+
-+	msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE);
-+	msblk->devblksize_log2 = ffz(~msblk->devblksize);
-+
-+	init_MUTEX(&msblk->read_data_mutex);
-+	init_MUTEX(&msblk->read_page_mutex);
-+	init_MUTEX(&msblk->block_cache_mutex);
-+	init_MUTEX(&msblk->fragment_mutex);
-+	init_MUTEX(&msblk->meta_index_mutex);
-+
-+	init_waitqueue_head(&msblk->waitq);
-+	init_waitqueue_head(&msblk->fragment_wait_queue);
-+
-+	if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START,
-+					sizeof(struct squashfs_super_block) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		SERROR("unable to read superblock\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Check it is a SQUASHFS superblock */
-+	msblk->swap = 0;
-+	if ((s->s_magic = sblk->s_magic) != SQUASHFS_MAGIC) {
-+		if (sblk->s_magic == SQUASHFS_MAGIC_SWAP) {
-+			struct squashfs_super_block ssblk;
-+
-+			WARNING("Mounting a different endian SQUASHFS "
-+				"filesystem on %s\n", bdevname(s->s_bdev, b));
-+
-+			SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk);
-+			memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block));
-+			msblk->swap = 1;
-+		} else  {
-+			SERROR("Can't find a SQUASHFS superblock on %s\n",
-+							bdevname(s->s_bdev, b));
-+			goto failed_mount;
-+		}
-+	}
-+
-+	/* Check the MAJOR & MINOR versions */
-+	if(!supported_squashfs_filesystem(msblk, silent))
-+		goto failed_mount;
-+
-+	TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b));
-+	TRACE("Inodes are %scompressed\n",
-+					SQUASHFS_UNCOMPRESSED_INODES
-+					(sblk->flags) ? "un" : "");
-+	TRACE("Data is %scompressed\n",
-+					SQUASHFS_UNCOMPRESSED_DATA(sblk->flags)
-+					? "un" : "");
-+	TRACE("Check data is %s present in the filesystem\n",
-+					SQUASHFS_CHECK_DATA(sblk->flags) ?
-+					"" : "not");
-+	TRACE("Filesystem size %lld bytes\n", sblk->bytes_used);
-+	TRACE("Block size %d\n", sblk->block_size);
-+	TRACE("Number of inodes %d\n", sblk->inodes);
-+	if (sblk->s_major > 1)
-+		TRACE("Number of fragments %d\n", sblk->fragments);
-+	TRACE("Number of uids %d\n", sblk->no_uids);
-+	TRACE("Number of gids %d\n", sblk->no_guids);
-+	TRACE("sblk->inode_table_start %llx\n", sblk->inode_table_start);
-+	TRACE("sblk->directory_table_start %llx\n", sblk->directory_table_start);
-+	if (sblk->s_major > 1)
-+		TRACE("sblk->fragment_table_start %llx\n",
-+					sblk->fragment_table_start);
-+	TRACE("sblk->uid_start %llx\n", sblk->uid_start);
-+
-+	s->s_flags |= MS_RDONLY;
-+	s->s_op = &squashfs_ops;
-+
-+	/* Init inode_table block pointer array */
-+	if (!(msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) *
-+					SQUASHFS_CACHED_BLKS, GFP_KERNEL))) {
-+		ERROR("Failed to allocate block cache\n");
-+		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+		msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+
-+	msblk->next_cache = 0;
-+
-+	/* Allocate read_data block */
-+	msblk->read_size = (sblk->block_size < SQUASHFS_METADATA_SIZE) ?
-+					SQUASHFS_METADATA_SIZE :
-+					sblk->block_size;
-+
-+	if (!(msblk->read_data = kmalloc(msblk->read_size, GFP_KERNEL))) {
-+		ERROR("Failed to allocate read_data block\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Allocate read_page block */
-+	if (!(msblk->read_page = kmalloc(sblk->block_size, GFP_KERNEL))) {
-+		ERROR("Failed to allocate read_page block\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Allocate uid and gid tables */
-+	if (!(msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) *
-+					sizeof(unsigned int), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		goto failed_mount;
-+	}
-+	msblk->guid = msblk->uid + sblk->no_uids;
-+
-+	if (msblk->swap) {
-+		unsigned int suid[sblk->no_uids + sblk->no_guids];
-+
-+		if (!squashfs_read_data(s, (char *) &suid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+			ERROR("unable to read uid/gid table\n");
-+			goto failed_mount;
-+		}
-+
-+		SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids +
-+			sblk->no_guids), (sizeof(unsigned int) * 8));
-+	} else
-+		if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+			ERROR("unable to read uid/gid table\n");
-+			goto failed_mount;
-+		}
-+
-+
-+	if (sblk->s_major == 1 && squashfs_1_0_supported(msblk))
-+		goto allocate_root;
-+
-+	if (!(msblk->fragment = kmalloc(sizeof(struct squashfs_fragment_cache) *
-+				SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) {
-+		ERROR("Failed to allocate fragment block cache\n");
-+		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) {
-+		msblk->fragment[i].locked = 0;
-+		msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+		msblk->fragment[i].data = NULL;
-+	}
-+
-+	msblk->next_fragment = 0;
-+
-+	/* Allocate fragment index table */
-+	if (msblk->read_fragment_index_table(s) == 0)
-+		goto failed_mount;
-+
-+allocate_root:
-+	if ((root = (msblk->iget)(s, sblk->root_inode)) == NULL)
-+		goto failed_mount;
-+
-+	if ((s->s_root = d_alloc_root(root)) == NULL) {
-+		ERROR("Root inode create failed\n");
-+		iput(root);
-+		goto failed_mount;
-+	}
-+
-+	TRACE("Leaving squashfs_read_super\n");
-+	return 0;
-+
-+failed_mount:
-+	kfree(msblk->fragment_index);
-+	kfree(msblk->fragment);
-+	kfree(msblk->uid);
-+	kfree(msblk->read_page);
-+	kfree(msblk->read_data);
-+	kfree(msblk->block_cache);
-+	kfree(msblk->fragment_index_2);
-+	kfree(s->s_fs_info);
-+	s->s_fs_info = NULL;
-+	return -EINVAL;
-+
-+failure:
-+	return -ENOMEM;
-+}
-+
-+
-+static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
-+{
-+	struct squashfs_sb_info *msblk = dentry->d_inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	TRACE("Entered squashfs_statfs\n");
-+
-+	buf->f_type = SQUASHFS_MAGIC;
-+	buf->f_bsize = sblk->block_size;
-+	buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1;
-+	buf->f_bfree = buf->f_bavail = 0;
-+	buf->f_files = sblk->inodes;
-+	buf->f_ffree = 0;
-+	buf->f_namelen = SQUASHFS_NAME_LEN;
-+
-+	return 0;
-+}
-+
-+
-+static int squashfs_symlink_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	int index = page->index << PAGE_CACHE_SHIFT, length, bytes;
-+	long long block = SQUASHFS_I(inode)->start_block;
-+	int offset = SQUASHFS_I(inode)->offset;
-+	void *pageaddr = kmap(page);
-+
-+	TRACE("Entered squashfs_symlink_readpage, page index %ld, start block "
-+				"%llx, offset %x\n", page->index,
-+				SQUASHFS_I(inode)->start_block,
-+				SQUASHFS_I(inode)->offset);
-+
-+	for (length = 0; length < index; length += bytes) {
-+		if (!(bytes = squashfs_get_cached_block(inode->i_sb, NULL,
-+				block, offset, PAGE_CACHE_SIZE, &block,
-+				&offset))) {
-+			ERROR("Unable to read symbolic link [%llx:%x]\n", block,
-+					offset);
-+			goto skip_read;
-+		}
-+	}
-+
-+	if (length != index) {
-+		ERROR("(squashfs_symlink_readpage) length != index\n");
-+		bytes = 0;
-+		goto skip_read;
-+	}
-+
-+	bytes = (i_size_read(inode) - length) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE :
-+					i_size_read(inode) - length;
-+
-+	if (!(bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block,
-+					offset, bytes, &block, &offset)))
-+		ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
-+
-+skip_read:
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
-+{
-+	struct meta_index *meta = NULL;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	int i;
-+
-+	down(&msblk->meta_index_mutex);
-+
-+	TRACE("locate_meta_index: index %d, offset %d\n", index, offset);
-+
-+	if(msblk->meta_index == NULL)
-+		goto not_allocated;
-+
-+	for (i = 0; i < SQUASHFS_META_NUMBER; i ++)
-+		if (msblk->meta_index[i].inode_number == inode->i_ino &&
-+				msblk->meta_index[i].offset >= offset &&
-+				msblk->meta_index[i].offset <= index &&
-+				msblk->meta_index[i].locked == 0) {
-+			TRACE("locate_meta_index: entry %d, offset %d\n", i,
-+					msblk->meta_index[i].offset);
-+			meta = &msblk->meta_index[i];
-+			offset = meta->offset;
-+		}
-+
-+	if (meta)
-+		meta->locked = 1;
-+
-+not_allocated:
-+	up(&msblk->meta_index_mutex);
-+
-+	return meta;
-+}
-+
-+
-+struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct meta_index *meta = NULL;
-+	int i;
-+
-+	down(&msblk->meta_index_mutex);
-+
-+	TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip);
-+
-+	if(msblk->meta_index == NULL) {
-+		if (!(msblk->meta_index = kmalloc(sizeof(struct meta_index) *
-+					SQUASHFS_META_NUMBER, GFP_KERNEL))) {
-+			ERROR("Failed to allocate meta_index\n");
-+			goto failed;
-+		}
-+		for(i = 0; i < SQUASHFS_META_NUMBER; i++) {
-+			msblk->meta_index[i].inode_number = 0;
-+			msblk->meta_index[i].locked = 0;
-+		}
-+		msblk->next_meta_index = 0;
-+	}
-+
-+	for(i = SQUASHFS_META_NUMBER; i &&
-+			msblk->meta_index[msblk->next_meta_index].locked; i --)
-+		msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	if(i == 0) {
-+		TRACE("empty_meta_index: failed!\n");
-+		goto failed;
-+	}
-+
-+	TRACE("empty_meta_index: returned meta entry %d, %p\n",
-+			msblk->next_meta_index,
-+			&msblk->meta_index[msblk->next_meta_index]);
-+
-+	meta = &msblk->meta_index[msblk->next_meta_index];
-+	msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	meta->inode_number = inode->i_ino;
-+	meta->offset = offset;
-+	meta->skip = skip;
-+	meta->entries = 0;
-+	meta->locked = 1;
-+
-+failed:
-+	up(&msblk->meta_index_mutex);
-+	return meta;
-+}
-+
-+
-+void release_meta_index(struct inode *inode, struct meta_index *meta)
-+{
-+	meta->locked = 0;
-+}
-+
-+
-+static int read_block_index(struct super_block *s, int blocks, char *block_list,
-+		long long *start_block, int *offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned int *block_listp;
-+	int block = 0;
-+
-+	if (msblk->swap) {
-+		char sblock_list[blocks << 2];
-+
-+		if (!squashfs_get_cached_block(s, sblock_list, *start_block,
-+				*offset, blocks << 2, start_block, offset)) {
-+			ERROR("Unable to read block list [%llx:%x]\n",
-+				*start_block, *offset);
-+			goto failure;
-+		}
-+		SQUASHFS_SWAP_INTS(((unsigned int *)block_list),
-+				((unsigned int *)sblock_list), blocks);
-+	} else
-+		if (!squashfs_get_cached_block(s, block_list, *start_block,
-+				*offset, blocks << 2, start_block, offset)) {
-+			ERROR("Unable to read block list [%llx:%x]\n",
-+				*start_block, *offset);
-+			goto failure;
-+		}
-+
-+	for (block_listp = (unsigned int *) block_list; blocks;
-+				block_listp++, blocks --)
-+		block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp);
-+
-+	return block;
-+
-+failure:
-+	return -1;
-+}
-+
-+
-+#define SIZE 256
-+
-+static inline int calculate_skip(int blocks) {
-+	int skip = (blocks - 1) / ((SQUASHFS_SLOTS * SQUASHFS_META_ENTRIES + 1) * SQUASHFS_META_INDEXES);
-+	return skip >= 7 ? 7 : skip + 1;
-+}
-+
-+
-+static int get_meta_index(struct inode *inode, int index,
-+		long long *index_block, int *index_offset,
-+		long long *data_block, char *block_list)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int skip = calculate_skip(i_size_read(inode) >> sblk->block_log);
-+	int offset = 0;
-+	struct meta_index *meta;
-+	struct meta_entry *meta_entry;
-+	long long cur_index_block = SQUASHFS_I(inode)->u.s1.block_list_start;
-+	int cur_offset = SQUASHFS_I(inode)->offset;
-+	long long cur_data_block = SQUASHFS_I(inode)->start_block;
-+	int i;
-+
-+	index /= SQUASHFS_META_INDEXES * skip;
-+
-+	while ( offset < index ) {
-+		meta = locate_meta_index(inode, index, offset + 1);
-+
-+		if (meta == NULL) {
-+			if ((meta = empty_meta_index(inode, offset + 1,
-+							skip)) == NULL)
-+				goto all_done;
-+		} else {
-+			offset = index < meta->offset + meta->entries ? index :
-+				meta->offset + meta->entries - 1;
-+			meta_entry = &meta->meta_entry[offset - meta->offset];
-+			cur_index_block = meta_entry->index_block + sblk->inode_table_start;
-+			cur_offset = meta_entry->offset;
-+			cur_data_block = meta_entry->data_block;
-+			TRACE("get_meta_index: offset %d, meta->offset %d, "
-+				"meta->entries %d\n", offset, meta->offset,
-+				meta->entries);
-+			TRACE("get_meta_index: index_block 0x%llx, offset 0x%x"
-+				" data_block 0x%llx\n", cur_index_block,
-+				cur_offset, cur_data_block);
-+		}
-+
-+		for (i = meta->offset + meta->entries; i <= index &&
-+				i < meta->offset + SQUASHFS_META_ENTRIES; i++) {
-+			int blocks = skip * SQUASHFS_META_INDEXES;
-+
-+			while (blocks) {
-+				int block = blocks > (SIZE >> 2) ? (SIZE >> 2) :
-+					blocks;
-+				int res = read_block_index(inode->i_sb, block,
-+					block_list, &cur_index_block,
-+					&cur_offset);
-+
-+				if (res == -1)
-+					goto failed;
-+
-+				cur_data_block += res;
-+				blocks -= block;
-+			}
-+
-+			meta_entry = &meta->meta_entry[i - meta->offset];
-+			meta_entry->index_block = cur_index_block - sblk->inode_table_start;
-+			meta_entry->offset = cur_offset;
-+			meta_entry->data_block = cur_data_block;
-+			meta->entries ++;
-+			offset ++;
-+		}
-+
-+		TRACE("get_meta_index: meta->offset %d, meta->entries %d\n",
-+				meta->offset, meta->entries);
-+
-+		release_meta_index(inode, meta);
-+	}
-+
-+all_done:
-+	*index_block = cur_index_block;
-+	*index_offset = cur_offset;
-+	*data_block = cur_data_block;
-+
-+	return offset * SQUASHFS_META_INDEXES * skip;
-+
-+failed:
-+	release_meta_index(inode, meta);
-+	return -1;
-+}
-+
-+
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize)
-+{
-+	long long block_ptr;
-+	int offset;
-+	long long block;
-+	int res = get_meta_index(inode, index, &block_ptr, &offset, &block,
-+		block_list);
-+
-+	TRACE("read_blocklist: res %d, index %d, block_ptr 0x%llx, offset"
-+		       " 0x%x, block 0x%llx\n", res, index, block_ptr, offset,
-+		       block);
-+
-+	if(res == -1)
-+		goto failure;
-+
-+	index -= res;
-+
-+	while ( index ) {
-+		int blocks = index > (SIZE >> 2) ? (SIZE >> 2) : index;
-+		int res = read_block_index(inode->i_sb, blocks, block_list,
-+			&block_ptr, &offset);
-+		if (res == -1)
-+			goto failure;
-+		block += res;
-+		index -= blocks;
-+	}
-+
-+	if (read_block_index(inode->i_sb, 1, block_list,
-+			&block_ptr, &offset) == -1)
-+		goto failure;
-+	*bsize = *((unsigned int *) block_list);
-+
-+	return block;
-+
-+failure:
-+	return 0;
-+}
-+
-+
-+static int squashfs_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned char block_list[SIZE];
-+	long long block;
-+	unsigned int bsize, i = 0, bytes = 0, byte_offset = 0;
-+	int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT);
-+ 	void *pageaddr;
-+	struct squashfs_fragment_cache *fragment = NULL;
-+	char *data_ptr = msblk->read_page;
-+
-+	int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1;
-+	int start_index = page->index & ~mask;
-+	int end_index = start_index | mask;
-+
-+	TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n",
-+					page->index,
-+					SQUASHFS_I(inode)->start_block);
-+
-+	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
-+					PAGE_CACHE_SHIFT))
-+		goto skip_read;
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < (i_size_read(inode) >>
-+					sblk->block_log)) {
-+		if ((block = (msblk->read_blocklist)(inode, index, 1,
-+					block_list, NULL, &bsize)) == 0)
-+			goto skip_read;
-+
-+		down(&msblk->read_page_mutex);
-+
-+		if (!(bytes = squashfs_read_data(inode->i_sb, msblk->read_page,
-+					block, bsize, NULL))) {
-+			ERROR("Unable to read page, block %llx, size %x\n", block,
-+					bsize);
-+			up(&msblk->read_page_mutex);
-+			goto skip_read;
-+		}
-+	} else {
-+		if ((fragment = get_cached_fragment(inode->i_sb,
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					SQUASHFS_I(inode)->u.s1.fragment_size))
-+					== NULL) {
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					(int) SQUASHFS_I(inode)->
-+					u.s1.fragment_size);
-+			goto skip_read;
-+		}
-+		bytes = SQUASHFS_I(inode)->u.s1.fragment_offset +
-+					(i_size_read(inode) & (sblk->block_size
-+					- 1));
-+		byte_offset = SQUASHFS_I(inode)->u.s1.fragment_offset;
-+		data_ptr = fragment->data;
-+	}
-+
-+	for (i = start_index; i <= end_index && byte_offset < bytes;
-+					i++, byte_offset += PAGE_CACHE_SIZE) {
-+		struct page *push_page;
-+		int available_bytes = (bytes - byte_offset) > PAGE_CACHE_SIZE ?
-+					PAGE_CACHE_SIZE : bytes - byte_offset;
-+
-+		TRACE("bytes %d, i %d, byte_offset %d, available_bytes %d\n",
-+					bytes, i, byte_offset, available_bytes);
-+
-+		if (i == page->index)  {
-+			pageaddr = kmap_atomic(page, KM_USER0);
-+			memcpy(pageaddr, data_ptr + byte_offset,
-+					available_bytes);
-+			memset(pageaddr + available_bytes, 0,
-+					PAGE_CACHE_SIZE - available_bytes);
-+			kunmap_atomic(pageaddr, KM_USER0);
-+			flush_dcache_page(page);
-+			SetPageUptodate(page);
-+			unlock_page(page);
-+		} else if ((push_page =
-+				grab_cache_page_nowait(page->mapping, i))) {
-+ 			pageaddr = kmap_atomic(push_page, KM_USER0);
-+
-+			memcpy(pageaddr, data_ptr + byte_offset,
-+					available_bytes);
-+			memset(pageaddr + available_bytes, 0,
-+					PAGE_CACHE_SIZE - available_bytes);
-+			kunmap_atomic(pageaddr, KM_USER0);
-+			flush_dcache_page(push_page);
-+			SetPageUptodate(push_page);
-+			unlock_page(push_page);
-+			page_cache_release(push_page);
-+		}
-+	}
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < (i_size_read(inode) >>
-+					sblk->block_log))
-+		up(&msblk->read_page_mutex);
-+	else
-+		release_cached_fragment(msblk, fragment);
-+
-+	return 0;
-+
-+skip_read:
-+	pageaddr = kmap_atomic(page, KM_USER0);
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap_atomic(pageaddr, KM_USER0);
-+	flush_dcache_page(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+static int squashfs_readpage4K(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned char block_list[SIZE];
-+	long long block;
-+	unsigned int bsize, bytes = 0;
-+ 	void *pageaddr;
-+
-+	TRACE("Entered squashfs_readpage4K, page index %lx, start block %llx\n",
-+					page->index,
-+					SQUASHFS_I(inode)->start_block);
-+
-+	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
-+					PAGE_CACHE_SHIFT)) {
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		goto skip_read;
-+	}
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| page->index < (i_size_read(inode) >>
-+					sblk->block_log)) {
-+		block = (msblk->read_blocklist)(inode, page->index, 1,
-+					block_list, NULL, &bsize);
-+
-+		down(&msblk->read_page_mutex);
-+		bytes = squashfs_read_data(inode->i_sb, msblk->read_page, block,
-+					bsize, NULL);
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		if (bytes)
-+			memcpy(pageaddr, msblk->read_page, bytes);
-+		else
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					block, bsize);
-+		up(&msblk->read_page_mutex);
-+	} else {
-+		struct squashfs_fragment_cache *fragment =
-+			get_cached_fragment(inode->i_sb,
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block,
-+					SQUASHFS_I(inode)-> u.s1.fragment_size);
-+		pageaddr = kmap_atomic(page, KM_USER0);
-+		if (fragment) {
-+			bytes = i_size_read(inode) & (sblk->block_size - 1);
-+			memcpy(pageaddr, fragment->data + SQUASHFS_I(inode)->
-+					u.s1.fragment_offset, bytes);
-+			release_cached_fragment(msblk, fragment);
-+		} else
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					SQUASHFS_I(inode)->
-+					u.s1.fragment_start_block, (int)
-+					SQUASHFS_I(inode)-> u.s1.fragment_size);
-+	}
-+
-+skip_read:
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap_atomic(pageaddr, KM_USER0);
-+	flush_dcache_page(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+static int get_dir_index_using_offset(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				long long f_pos)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index index;
-+
-+	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
-+					i_count, (unsigned int) f_pos);
-+
-+	f_pos =- 3;
-+	if (f_pos == 0)
-+		goto finish;
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(&index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) &index,
-+					index_start, index_offset,
-+					sizeof(index), &index_start,
-+					&index_offset);
-+
-+		if (index.index > f_pos)
-+			break;
-+
-+		squashfs_get_cached_block(s, NULL, index_start, index_offset,
-+					index.size + 1, &index_start,
-+					&index_offset);
-+
-+		length = index.index;
-+		*next_block = index.start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+
-+finish:
-+	return length + 3;
-+}
-+
-+
-+static int get_dir_index_using_name(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				const char *name, int size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	char buffer[sizeof(struct squashfs_dir_index) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_index *index = (struct squashfs_dir_index *) buffer;
-+	char str[SQUASHFS_NAME_LEN + 1];
-+
-+	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
-+
-+	strncpy(str, name, size);
-+	str[size] = '\0';
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) index,
-+					index_start, index_offset,
-+					sizeof(struct squashfs_dir_index),
-+					&index_start, &index_offset);
-+
-+		squashfs_get_cached_block(s, index->name, index_start,
-+					index_offset, index->size + 1,
-+					&index_start, &index_offset);
-+
-+		index->name[index->size + 1] = '\0';
-+
-+		if (strcmp(index->name, str) > 0)
-+			break;
-+
-+		length = index->index;
-+		*next_block = index->start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+	return length + 3;
-+}
-+
-+
-+static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
-+{
-+	struct inode *i = file->f_dentry->d_inode;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+		sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dirs_read = 0,
-+		dir_count;
-+	struct squashfs_dir_header dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
-+
-+	TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset);
-+
-+	while(file->f_pos < 3) {
-+		char *name;
-+		int size, i_ino;
-+
-+		if(file->f_pos == 0) {
-+			name = ".";
-+			size = 1;
-+			i_ino = i->i_ino;
-+		} else {
-+			name = "..";
-+			size = 2;
-+			i_ino = SQUASHFS_I(i)->u.s2.parent_inode;
-+		}
-+		TRACE("Calling filldir(%x, %s, %d, %d, %d, %d)\n",
-+				(unsigned int) dirent, name, size, (int)
-+				file->f_pos, i_ino,
-+				squashfs_filetype_table[1]);
-+
-+		if (filldir(dirent, name, size,
-+				file->f_pos, i_ino,
-+				squashfs_filetype_table[1]) < 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+		}
-+		file->f_pos += size;
-+		dirs_read++;
-+	}
-+
-+	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count,
-+				file->f_pos);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block, next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block, next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+						next_block, next_offset,
-+						dire->size + 1, &next_block,
-+						&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (file->f_pos >= length)
-+				continue;
-+
-+			dire->name[dire->size + 1] = '\0';
-+
-+			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d, %d)\n",
-+					(unsigned int) dirent, dire->name,
-+					dire->size + 1, (int) file->f_pos,
-+					dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type]);
-+
-+			if (filldir(dirent, dire->name, dire->size + 1,
-+					file->f_pos,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type])
-+					< 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+			}
-+			file->f_pos = length;
-+			dirs_read++;
-+		}
-+	}
-+
-+finish:
-+	return dirs_read;
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	return 0;
-+}
-+
-+
-+static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry,
-+				struct nameidata *nd)
-+{
-+	const unsigned char *name = dentry->d_name.name;
-+	int len = dentry->d_name.len;
-+	struct inode *inode = NULL;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+				sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0,
-+				dir_count;
-+	struct squashfs_dir_header dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry) + SQUASHFS_NAME_LEN];
-+	struct squashfs_dir_entry *dire = (struct squashfs_dir_entry *) buffer;
-+
-+	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
-+
-+	if (len > SQUASHFS_NAME_LEN)
-+		goto exit_loop;
-+
-+	length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, name,
-+				len);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block,next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block,next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+					next_block, next_offset, dire->size + 1,
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (name[0] < dire->name[0])
-+				goto exit_loop;
-+
-+			if ((len == dire->size + 1) && !strncmp(name,
-+						dire->name, len)) {
-+				squashfs_inode_t ino =
-+					SQUASHFS_MKINODE(dirh.start_block,
-+					dire->offset);
-+
-+				TRACE("calling squashfs_iget for directory "
-+					"entry %s, inode %x:%x, %d\n", name,
-+					dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number);
-+
-+				inode = (msblk->iget)(i->i_sb, ino);
-+
-+				goto exit_loop;
-+			}
-+		}
-+	}
-+
-+exit_loop:
-+	d_add(dentry, inode);
-+	return ERR_PTR(0);
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	goto exit_loop;
-+}
-+
-+
-+static void squashfs_put_super(struct super_block *s)
-+{
-+	int i;
-+
-+	if (s->s_fs_info) {
-+		struct squashfs_sb_info *sbi = s->s_fs_info;
-+		if (sbi->block_cache)
-+			for (i = 0; i < SQUASHFS_CACHED_BLKS; i++)
-+				if (sbi->block_cache[i].block !=
-+							SQUASHFS_INVALID_BLK)
-+					kfree(sbi->block_cache[i].data);
-+		if (sbi->fragment)
-+			for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++)
-+				SQUASHFS_FREE(sbi->fragment[i].data);
-+		kfree(sbi->fragment);
-+		kfree(sbi->block_cache);
-+		kfree(sbi->read_data);
-+		kfree(sbi->read_page);
-+		kfree(sbi->uid);
-+		kfree(sbi->fragment_index);
-+		kfree(sbi->fragment_index_2);
-+		kfree(sbi->meta_index);
-+		kfree(s->s_fs_info);
-+		s->s_fs_info = NULL;
-+	}
-+}
-+
-+
-+static int squashfs_get_sb(struct file_system_type *fs_type,
-+			int flags, const char *dev_name, void *data,
-+			struct vfsmount *mnt)
-+{
-+	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super, mnt);
-+}
-+
-+
-+static int __init init_squashfs_fs(void)
-+{
-+	int err = init_inodecache();
-+	if (err)
-+		goto out;
-+
-+	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
-+		"Phillip Lougher\n");
-+
-+	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
-+		ERROR("Failed to allocate zlib workspace\n");
-+		destroy_inodecache();
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	if ((err = register_filesystem(&squashfs_fs_type))) {
-+		vfree(stream.workspace);
-+		destroy_inodecache();
-+	}
-+
-+out:
-+	return err;
-+}
-+
-+
-+static void __exit exit_squashfs_fs(void)
-+{
-+	vfree(stream.workspace);
-+	unregister_filesystem(&squashfs_fs_type);
-+	destroy_inodecache();
-+}
-+
-+
-+static struct kmem_cache * squashfs_inode_cachep;
-+
-+
-+static struct inode *squashfs_alloc_inode(struct super_block *sb)
-+{
-+	struct squashfs_inode_info *ei;
-+	ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL);
-+	if (!ei)
-+		return NULL;
-+	return &ei->vfs_inode;
-+}
-+
-+
-+static void squashfs_destroy_inode(struct inode *inode)
-+{
-+	kmem_cache_free(squashfs_inode_cachep, SQUASHFS_I(inode));
-+}
-+
-+
-+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
-+{
-+	struct squashfs_inode_info *ei = foo;
-+
-+	inode_init_once(&ei->vfs_inode);
-+}
-+
-+
-+static int __init init_inodecache(void)
-+{
-+	squashfs_inode_cachep = kmem_cache_create("squashfs_inode_cache",
-+	     sizeof(struct squashfs_inode_info),
-+	     0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
-+	     init_once);
-+	if (squashfs_inode_cachep == NULL)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+
-+static void destroy_inodecache(void)
-+{
-+	kmem_cache_destroy(squashfs_inode_cachep);
-+}
-+
-+
-+module_init(init_squashfs_fs);
-+module_exit(exit_squashfs_fs);
-+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
-+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/fs/squashfs/Makefile
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
-+
-+obj-$(CONFIG_SQUASHFS) += squashfs.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
---- /dev/null
-+++ b/fs/squashfs/squashfs2_0.c
-@@ -0,0 +1,758 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs2_0.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/module.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/slab.h>
-+#include <linux/squashfs_fs_sb.h>
-+#include <linux/squashfs_fs_i.h>
-+#include <linux/buffer_head.h>
-+#include <linux/vfs.h>
-+#include <linux/init.h>
-+#include <linux/dcache.h>
-+#include <linux/wait.h>
-+#include <linux/zlib.h>
-+#include <linux/blkdev.h>
-+#include <linux/vmalloc.h>
-+#include <asm/uaccess.h>
-+#include <asm/semaphore.h>
-+
-+#include "squashfs.h"
-+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir);
-+static struct dentry *squashfs_lookup_2(struct inode *, struct dentry *,
-+				struct nameidata *);
-+
-+static struct file_operations squashfs_dir_ops_2 = {
-+	.read = generic_read_dir,
-+	.readdir = squashfs_readdir_2
-+};
-+
-+static struct inode_operations squashfs_dir_inode_ops_2 = {
-+	.lookup = squashfs_lookup_2
-+};
-+
-+static unsigned char squashfs_filetype_table[] = {
-+	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
-+};
-+
-+static int read_fragment_index_table_2(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	if (!(msblk->fragment_index_2 = kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES_2
-+					(sblk->fragments), GFP_KERNEL))) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		return 0;
-+	}
-+
-+	if (SQUASHFS_FRAGMENT_INDEX_BYTES_2(sblk->fragments) &&
-+					!squashfs_read_data(s, (char *)
-+					msblk->fragment_index_2,
-+					sblk->fragment_table_start,
-+					SQUASHFS_FRAGMENT_INDEX_BYTES_2
-+					(sblk->fragments) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
-+		ERROR("unable to read fragment index table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		unsigned int fragment;
-+
-+		for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES_2(sblk->fragments);
-+									i++) {
-+			SQUASHFS_SWAP_FRAGMENT_INDEXES_2((&fragment),
-+						&msblk->fragment_index_2[i], 1);
-+			msblk->fragment_index_2[i] = fragment;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int get_fragment_location_2(struct super_block *s, unsigned int fragment,
-+				long long *fragment_start_block,
-+				unsigned int *fragment_size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start_block =
-+		msblk->fragment_index_2[SQUASHFS_FRAGMENT_INDEX_2(fragment)];
-+	int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET_2(fragment);
-+	struct squashfs_fragment_entry_2 fragment_entry;
-+
-+	if (msblk->swap) {
-+		struct squashfs_fragment_entry_2 sfragment_entry;
-+
-+		if (!squashfs_get_cached_block(s, (char *) &sfragment_entry,
-+					start_block, offset,
-+					sizeof(sfragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+		SQUASHFS_SWAP_FRAGMENT_ENTRY_2(&fragment_entry, &sfragment_entry);
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) &fragment_entry,
-+					start_block, offset,
-+					sizeof(fragment_entry), &start_block,
-+					&offset))
-+			goto out;
-+
-+	*fragment_start_block = fragment_entry.start_block;
-+	*fragment_size = fragment_entry.size;
-+
-+	return 1;
-+
-+out:
-+	return 0;
-+}
-+
-+
-+static struct inode *squashfs_new_inode(struct super_block *s,
-+		struct squashfs_base_inode_header_2 *inodeb, unsigned int ino)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	struct inode *i = new_inode(s);
-+
-+	if (i) {
-+		i->i_ino = ino;
-+		i->i_mtime.tv_sec = sblk->mkfs_time;
-+		i->i_atime.tv_sec = sblk->mkfs_time;
-+		i->i_ctime.tv_sec = sblk->mkfs_time;
-+		i->i_uid = msblk->uid[inodeb->uid];
-+		i->i_mode = inodeb->mode;
-+		i->i_nlink = 1;
-+		i->i_size = 0;
-+		if (inodeb->guid == SQUASHFS_GUIDS)
-+			i->i_gid = i->i_uid;
-+		else
-+			i->i_gid = msblk->guid[inodeb->guid];
-+	}
-+
-+	return i;
-+}
-+
-+
-+static struct inode *squashfs_iget_2(struct super_block *s, squashfs_inode_t inode)
-+{
-+	struct inode *i;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned int block = SQUASHFS_INODE_BLK(inode) +
-+		sblk->inode_table_start;
-+	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
-+	unsigned int ino = SQUASHFS_MK_VFS_INODE(block
-+		- sblk->inode_table_start, offset);
-+	long long next_block;
-+	unsigned int next_offset;
-+	union squashfs_inode_header_2 id, sid;
-+	struct squashfs_base_inode_header_2 *inodeb = &id.base,
-+					  *sinodeb = &sid.base;
-+
-+	TRACE("Entered squashfs_iget\n");
-+
-+	if (msblk->swap) {
-+		if (!squashfs_get_cached_block(s, (char *) sinodeb, block,
-+					offset, sizeof(*sinodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+		SQUASHFS_SWAP_BASE_INODE_HEADER_2(inodeb, sinodeb,
-+					sizeof(*sinodeb));
-+	} else
-+		if (!squashfs_get_cached_block(s, (char *) inodeb, block,
-+					offset, sizeof(*inodeb), &next_block,
-+					&next_offset))
-+			goto failed_read;
-+
-+	switch(inodeb->inode_type) {
-+		case SQUASHFS_FILE_TYPE: {
-+			struct squashfs_reg_inode_header_2 *inodep = &id.reg;
-+			struct squashfs_reg_inode_header_2 *sinodep = &sid.reg;
-+			long long frag_blk;
-+			unsigned int frag_size;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_REG_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG &&
-+					!get_fragment_location_2(s,
-+					inodep->fragment, &frag_blk, &frag_size))
-+				goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			i->i_blksize = PAGE_CACHE_SIZE;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			if (sblk->block_size > 4096)
-+				i->i_data.a_ops = &squashfs_aops;
-+			else
-+				i->i_data.a_ops = &squashfs_aops_4K;
-+
-+			TRACE("File inode %x:%x, start_block %x, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_DIR_TYPE: {
-+			struct squashfs_dir_inode_header_2 *inodep = &id.dir;
-+			struct squashfs_dir_inode_header_2 *sinodep = &sid.dir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DIR_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops_2;
-+			i->i_fop = &squashfs_dir_ops_2;
-+			i->i_mode |= S_IFDIR;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = 0;
-+			SQUASHFS_I(i)->u.s2.parent_inode = 0;
-+
-+			TRACE("Directory inode %x:%x, start_block %x, offset "
-+					"%x\n", SQUASHFS_INODE_BLK(inode),
-+					offset, inodep->start_block,
-+					inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_LDIR_TYPE: {
-+			struct squashfs_ldir_inode_header_2 *inodep = &id.ldir;
-+			struct squashfs_ldir_inode_header_2 *sinodep = &sid.ldir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LDIR_INODE_HEADER_2(inodep,
-+						sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops_2;
-+			i->i_fop = &squashfs_dir_ops_2;
-+			i->i_mode |= S_IFDIR;
-+			i->i_mtime.tv_sec = inodep->mtime;
-+			i->i_atime.tv_sec = inodep->mtime;
-+			i->i_ctime.tv_sec = inodep->mtime;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_start = next_block;
-+			SQUASHFS_I(i)->u.s2.directory_index_offset =
-+								next_offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count =
-+								inodep->i_count;
-+			SQUASHFS_I(i)->u.s2.parent_inode = 0;
-+
-+			TRACE("Long directory inode %x:%x, start_block %x, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_SYMLINK_TYPE: {
-+			struct squashfs_symlink_inode_header_2 *inodep =
-+								&id.symlink;
-+			struct squashfs_symlink_inode_header_2 *sinodep =
-+								&sid.symlink;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(inodep,
-+								sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_size = inodep->symlink_size;
-+			i->i_op = &page_symlink_inode_operations;
-+			i->i_data.a_ops = &squashfs_symlink_aops;
-+			i->i_mode |= S_IFLNK;
-+			SQUASHFS_I(i)->start_block = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+
-+			TRACE("Symbolic link inode %x:%x, start_block %llx, "
-+					"offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					next_block, next_offset);
-+			break;
-+		 }
-+		 case SQUASHFS_BLKDEV_TYPE:
-+		 case SQUASHFS_CHRDEV_TYPE: {
-+			struct squashfs_dev_inode_header_2 *inodep = &id.dev;
-+			struct squashfs_dev_inode_header_2 *sinodep = &sid.dev;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, (char *)
-+						sinodep, block, offset,
-+						sizeof(*sinodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DEV_INODE_HEADER_2(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, (char *)
-+						inodep, block, offset,
-+						sizeof(*inodep), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+			if ((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_mode |= (inodeb->inode_type ==
-+					SQUASHFS_CHRDEV_TYPE) ?  S_IFCHR :
-+					S_IFBLK;
-+			init_special_inode(i, i->i_mode,
-+					old_decode_dev(inodep->rdev));
-+
-+			TRACE("Device inode %x:%x, rdev %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->rdev);
-+			break;
-+		 }
-+		 case SQUASHFS_FIFO_TYPE:
-+		 case SQUASHFS_SOCKET_TYPE: {
-+			if ((i = squashfs_new_inode(s, inodeb, ino)) == NULL)
-+				goto failed_read1;
-+
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE)
-+							? S_IFIFO : S_IFSOCK;
-+			init_special_inode(i, i->i_mode, 0);
-+			break;
-+		 }
-+		 default:
-+			ERROR("Unknown inode type %d in squashfs_iget!\n",
-+					inodeb->inode_type);
-+			goto failed_read1;
-+	}
-+
-+	insert_inode_hash(i);
-+	return i;
-+
-+failed_read:
-+	ERROR("Unable to read inode [%x:%x]\n", block, offset);
-+
-+failed_read1:
-+	return NULL;
-+}
-+
-+
-+static int get_dir_index_using_offset(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				long long f_pos)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index_2 index;
-+
-+	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
-+					i_count, (unsigned int) f_pos);
-+
-+	if (f_pos == 0)
-+		goto finish;
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index_2 sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX_2(&index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) &index,
-+					index_start, index_offset,
-+					sizeof(index), &index_start,
-+					&index_offset);
-+
-+		if (index.index > f_pos)
-+			break;
-+
-+		squashfs_get_cached_block(s, NULL, index_start, index_offset,
-+					index.size + 1, &index_start,
-+					&index_offset);
-+
-+		length = index.index;
-+		*next_block = index.start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+
-+finish:
-+	return length;
-+}
-+
-+
-+static int get_dir_index_using_name(struct super_block *s, long long
-+				*next_block, unsigned int *next_offset,
-+				long long index_start,
-+				unsigned int index_offset, int i_count,
-+				const char *name, int size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	char buffer[sizeof(struct squashfs_dir_index_2) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_index_2 *index = (struct squashfs_dir_index_2 *) buffer;
-+	char str[SQUASHFS_NAME_LEN + 1];
-+
-+	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
-+
-+	strncpy(str, name, size);
-+	str[size] = '\0';
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index_2 sindex;
-+			squashfs_get_cached_block(s, (char *) &sindex,
-+					index_start, index_offset,
-+					sizeof(sindex), &index_start,
-+					&index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX_2(index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, (char *) index,
-+					index_start, index_offset,
-+					sizeof(struct squashfs_dir_index_2),
-+					&index_start, &index_offset);
-+
-+		squashfs_get_cached_block(s, index->name, index_start,
-+					index_offset, index->size + 1,
-+					&index_start, &index_offset);
-+
-+		index->name[index->size + 1] = '\0';
-+
-+		if (strcmp(index->name, str) > 0)
-+			break;
-+
-+		length = index->index;
-+		*next_block = index->start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+	return length;
-+}
-+
-+
-+static int squashfs_readdir_2(struct file *file, void *dirent, filldir_t filldir)
-+{
-+	struct inode *i = file->f_dentry->d_inode;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+		sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dirs_read = 0,
-+		dir_count;
-+	struct squashfs_dir_header_2 dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry_2) + SQUASHFS_NAME_LEN + 1];
-+	struct squashfs_dir_entry_2 *dire = (struct squashfs_dir_entry_2 *) buffer;
-+
-+	TRACE("Entered squashfs_readdir_2 [%llx:%x]\n", next_block, next_offset);
-+
-+	length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count,
-+				file->f_pos);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header_2 sdirh;
-+
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry_2 sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block, next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block, next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+						next_block, next_offset,
-+						dire->size + 1, &next_block,
-+						&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (file->f_pos >= length)
-+				continue;
-+
-+			dire->name[dire->size + 1] = '\0';
-+
-+			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n",
-+					(unsigned int) dirent, dire->name,
-+					dire->size + 1, (int) file->f_pos,
-+					dirh.start_block, dire->offset,
-+					squashfs_filetype_table[dire->type]);
-+
-+			if (filldir(dirent, dire->name, dire->size + 1,
-+					file->f_pos, SQUASHFS_MK_VFS_INODE(
-+					dirh.start_block, dire->offset),
-+					squashfs_filetype_table[dire->type])
-+					< 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+			}
-+			file->f_pos = length;
-+			dirs_read++;
-+		}
-+	}
-+
-+finish:
-+	return dirs_read;
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	return 0;
-+}
-+
-+
-+static struct dentry *squashfs_lookup_2(struct inode *i, struct dentry *dentry,
-+				struct nameidata *nd)
-+{
-+	const unsigned char *name = dentry->d_name.name;
-+	int len = dentry->d_name.len;
-+	struct inode *inode = NULL;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+				sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0,
-+				dir_count;
-+	struct squashfs_dir_header_2 dirh;
-+	char buffer[sizeof(struct squashfs_dir_entry_2) + SQUASHFS_NAME_LEN];
-+	struct squashfs_dir_entry_2 *dire = (struct squashfs_dir_entry_2 *) buffer;
-+	int sorted = sblk->s_major == 2 && sblk->s_minor >= 1;
-+
-+	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
-+
-+	if (len > SQUASHFS_NAME_LEN)
-+		goto exit_loop;
-+
-+	length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, name,
-+				len);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header_2 sdirh;
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &sdirh,
-+					next_block, next_offset, sizeof(sdirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER_2(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, (char *) &dirh,
-+					next_block, next_offset, sizeof(dirh),
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry_2 sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						&sdire, next_block,next_offset,
-+						sizeof(sdire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY_2(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, (char *)
-+						dire, next_block,next_offset,
-+						sizeof(*dire), &next_block,
-+						&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name,
-+					next_block, next_offset, dire->size + 1,
-+					&next_block, &next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (sorted && name[0] < dire->name[0])
-+				goto exit_loop;
-+
-+			if ((len == dire->size + 1) && !strncmp(name,
-+						dire->name, len)) {
-+				squashfs_inode_t ino =
-+					SQUASHFS_MKINODE(dirh.start_block,
-+					dire->offset);
-+
-+				TRACE("calling squashfs_iget for directory "
-+					"entry %s, inode %x:%x, %lld\n", name,
-+					dirh.start_block, dire->offset, ino);
-+
-+				inode = (msblk->iget)(i->i_sb, ino);
-+
-+				goto exit_loop;
-+			}
-+		}
-+	}
-+
-+exit_loop:
-+	d_add(dentry, inode);
-+	return ERR_PTR(0);
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	goto exit_loop;
-+}
-+
-+
-+int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	msblk->iget = squashfs_iget_2;
-+	msblk->read_fragment_index_table = read_fragment_index_table_2;
-+
-+	sblk->bytes_used = sblk->bytes_used_2;
-+	sblk->uid_start = sblk->uid_start_2;
-+	sblk->guid_start = sblk->guid_start_2;
-+	sblk->inode_table_start = sblk->inode_table_start_2;
-+	sblk->directory_table_start = sblk->directory_table_start_2;
-+	sblk->fragment_table_start = sblk->fragment_table_start_2;
-+
-+	return 1;
-+}
---- /dev/null
-+++ b/fs/squashfs/squashfs.h
-@@ -0,0 +1,86 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs.h
-+ */
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#endif
-+
-+#ifdef SQUASHFS_TRACE
-+#define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
-+#else
-+#define TRACE(s, args...)	{}
-+#endif
-+
-+#define ERROR(s, args...)	printk(KERN_ERR "SQUASHFS error: "s, ## args)
-+
-+#define SERROR(s, args...)	do { \
-+				if (!silent) \
-+				printk(KERN_ERR "SQUASHFS error: "s, ## args);\
-+				} while(0)
-+
-+#define WARNING(s, args...)	printk(KERN_WARNING "SQUASHFS: "s, ## args)
-+
-+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
-+{
-+	return list_entry(inode, struct squashfs_inode_info, vfs_inode);
-+}
-+
-+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
-+#define SQSH_EXTERN
-+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+				long long index, unsigned int length,
-+				long long *next_index);
-+extern int squashfs_get_cached_block(struct super_block *s, char *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset);
-+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+					squashfs_fragment_cache *fragment);
-+extern struct squashfs_fragment_cache *get_cached_fragment(struct super_block
-+					*s, long long start_block,
-+					int length);
-+extern struct address_space_operations squashfs_symlink_aops;
-+extern struct address_space_operations squashfs_aops;
-+extern struct address_space_operations squashfs_aops_4K;
-+extern struct inode_operations squashfs_dir_inode_ops;
-+#else
-+#define SQSH_EXTERN static
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+	return 0;
-+}
-+#endif
---- a/include/linux/magic.h
-+++ b/include/linux/magic.h
-@@ -35,6 +35,9 @@
- #define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
- #define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
- 
-+#define SQUASHFS_MAGIC			0x73717368
-+#define SQUASHFS_MAGIC_SWAP		0x68737173
-+
- #define SMB_SUPER_MAGIC		0x517B
- #define USBDEVICE_SUPER_MAGIC	0x9fa2
- #define CGROUP_SUPER_MAGIC	0x27e0eb
---- /dev/null
-+++ b/include/linux/squashfs_fs.h
-@@ -0,0 +1,911 @@
-+#ifndef SQUASHFS_FS
-+#define SQUASHFS_FS
-+
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs.h
-+ */
-+
-+#ifndef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#define CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#endif
-+
-+#ifdef	CONFIG_SQUASHFS_VMALLOC
-+#define SQUASHFS_ALLOC(a)		vmalloc(a)
-+#define SQUASHFS_FREE(a)		vfree(a)
-+#else
-+#define SQUASHFS_ALLOC(a)		kmalloc(a, GFP_KERNEL)
-+#define SQUASHFS_FREE(a)		kfree(a)
-+#endif
-+#define SQUASHFS_CACHED_FRAGMENTS	CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE
-+#define SQUASHFS_MAJOR			3
-+#define SQUASHFS_MINOR			0
-+#define SQUASHFS_START			0
-+
-+/* size of metadata (inode and directory) blocks */
-+#define SQUASHFS_METADATA_SIZE		8192
-+#define SQUASHFS_METADATA_LOG		13
-+
-+/* default size of data blocks */
-+#define SQUASHFS_FILE_SIZE		65536
-+#define SQUASHFS_FILE_LOG		16
-+
-+#define SQUASHFS_FILE_MAX_SIZE		65536
-+
-+/* Max number of uids and gids */
-+#define SQUASHFS_UIDS			256
-+#define SQUASHFS_GUIDS			255
-+
-+/* Max length of filename (not 255) */
-+#define SQUASHFS_NAME_LEN		256
-+
-+#define SQUASHFS_INVALID		((long long) 0xffffffffffff)
-+#define SQUASHFS_INVALID_FRAG		((unsigned int) 0xffffffff)
-+#define SQUASHFS_INVALID_BLK		((long long) -1)
-+#define SQUASHFS_USED_BLK		((long long) -2)
-+
-+/* Filesystem flags */
-+#define SQUASHFS_NOI			0
-+#define SQUASHFS_NOD			1
-+#define SQUASHFS_CHECK			2
-+#define SQUASHFS_NOF			3
-+#define SQUASHFS_NO_FRAG		4
-+#define SQUASHFS_ALWAYS_FRAG		5
-+#define SQUASHFS_DUPLICATE		6
-+
-+#define SQUASHFS_BIT(flag, bit)		((flag >> bit) & 1)
-+
-+#define SQUASHFS_UNCOMPRESSED_INODES(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOI)
-+
-+#define SQUASHFS_UNCOMPRESSED_DATA(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOD)
-+
-+#define SQUASHFS_UNCOMPRESSED_FRAGMENTS(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_NOF)
-+
-+#define SQUASHFS_NO_FRAGMENTS(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_NO_FRAG)
-+
-+#define SQUASHFS_ALWAYS_FRAGMENTS(flags)	SQUASHFS_BIT(flags, \
-+						SQUASHFS_ALWAYS_FRAG)
-+
-+#define SQUASHFS_DUPLICATES(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_DUPLICATE)
-+
-+#define SQUASHFS_CHECK_DATA(flags)		SQUASHFS_BIT(flags, \
-+						SQUASHFS_CHECK)
-+
-+#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, \
-+		duplicate_checking)	(noi | (nod << 1) | (check_data << 2) \
-+		| (nof << 3) | (no_frag << 4) | (always_frag << 5) | \
-+		(duplicate_checking << 6))
-+
-+/* Max number of types and file types */
-+#define SQUASHFS_DIR_TYPE		1
-+#define SQUASHFS_FILE_TYPE		2
-+#define SQUASHFS_SYMLINK_TYPE		3
-+#define SQUASHFS_BLKDEV_TYPE		4
-+#define SQUASHFS_CHRDEV_TYPE		5
-+#define SQUASHFS_FIFO_TYPE		6
-+#define SQUASHFS_SOCKET_TYPE		7
-+#define SQUASHFS_LDIR_TYPE		8
-+#define SQUASHFS_LREG_TYPE		9
-+
-+/* 1.0 filesystem type definitions */
-+#define SQUASHFS_TYPES			5
-+#define SQUASHFS_IPC_TYPE		0
-+
-+/* Flag whether block is compressed or uncompressed, bit is set if block is
-+ * uncompressed */
-+#define SQUASHFS_COMPRESSED_BIT		(1 << 15)
-+
-+#define SQUASHFS_COMPRESSED_SIZE(B)	(((B) & ~SQUASHFS_COMPRESSED_BIT) ? \
-+		(B) & ~SQUASHFS_COMPRESSED_BIT :  SQUASHFS_COMPRESSED_BIT)
-+
-+#define SQUASHFS_COMPRESSED(B)		(!((B) & SQUASHFS_COMPRESSED_BIT))
-+
-+#define SQUASHFS_COMPRESSED_BIT_BLOCK		(1 << 24)
-+
-+#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B)	(((B) & \
-+	~SQUASHFS_COMPRESSED_BIT_BLOCK) ? (B) & \
-+	~SQUASHFS_COMPRESSED_BIT_BLOCK : SQUASHFS_COMPRESSED_BIT_BLOCK)
-+
-+#define SQUASHFS_COMPRESSED_BLOCK(B)	(!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK))
-+
-+/*
-+ * Inode number ops.  Inodes consist of a compressed block number, and an
-+ * uncompressed  offset within that block
-+ */
-+#define SQUASHFS_INODE_BLK(a)		((unsigned int) ((a) >> 16))
-+
-+#define SQUASHFS_INODE_OFFSET(a)	((unsigned int) ((a) & 0xffff))
-+
-+#define SQUASHFS_MKINODE(A, B)		((squashfs_inode_t)(((squashfs_inode_t) (A)\
-+					<< 16) + (B)))
-+
-+/* Compute 32 bit VFS inode number from squashfs inode number */
-+#define SQUASHFS_MK_VFS_INODE(a, b)	((unsigned int) (((a) << 8) + \
-+					((b) >> 2) + 1))
-+/* XXX */
-+
-+/* Translate between VFS mode and squashfs mode */
-+#define SQUASHFS_MODE(a)		((a) & 0xfff)
-+
-+/* fragment and fragment table defines */
-+#define SQUASHFS_FRAGMENT_BYTES(A)	(A * sizeof(struct squashfs_fragment_entry))
-+
-+#define SQUASHFS_FRAGMENT_INDEX(A)	(SQUASHFS_FRAGMENT_BYTES(A) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_OFFSET(A)	(SQUASHFS_FRAGMENT_BYTES(A) % \
-+						SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEXES(A)	((SQUASHFS_FRAGMENT_BYTES(A) + \
-+					SQUASHFS_METADATA_SIZE - 1) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_BYTES(A)	(SQUASHFS_FRAGMENT_INDEXES(A) *\
-+						sizeof(long long))
-+
-+/* cached data constants for filesystem */
-+#define SQUASHFS_CACHED_BLKS		8
-+
-+#define SQUASHFS_MAX_FILE_SIZE_LOG	64
-+
-+#define SQUASHFS_MAX_FILE_SIZE		((long long) 1 << \
-+					(SQUASHFS_MAX_FILE_SIZE_LOG - 2))
-+
-+#define SQUASHFS_MARKER_BYTE		0xff
-+
-+/* meta index cache */
-+#define SQUASHFS_META_INDEXES	(SQUASHFS_METADATA_SIZE / sizeof(unsigned int))
-+#define SQUASHFS_META_ENTRIES	31
-+#define SQUASHFS_META_NUMBER	8
-+#define SQUASHFS_SLOTS		4
-+
-+#include <linux/magic.h>
-+
-+struct meta_entry {
-+	long long		data_block;
-+	unsigned int		index_block;
-+	unsigned short		offset;
-+	unsigned short		pad;
-+};
-+
-+struct meta_index {
-+	unsigned int		inode_number;
-+	unsigned int		offset;
-+	unsigned short		entries;
-+	unsigned short		skip;
-+	unsigned short		locked;
-+	unsigned short		pad;
-+	struct meta_entry	meta_entry[SQUASHFS_META_ENTRIES];
-+};
-+
-+
-+/*
-+ * definitions for structures on disk
-+ */
-+
-+typedef long long		squashfs_block_t;
-+typedef long long		squashfs_inode_t;
-+
-+struct squashfs_super_block {
-+	unsigned int		s_magic;
-+	unsigned int		inodes;
-+	unsigned int		bytes_used_2;
-+	unsigned int		uid_start_2;
-+	unsigned int		guid_start_2;
-+	unsigned int		inode_table_start_2;
-+	unsigned int		directory_table_start_2;
-+	unsigned int		s_major:16;
-+	unsigned int		s_minor:16;
-+	unsigned int		block_size_1:16;
-+	unsigned int		block_log:16;
-+	unsigned int		flags:8;
-+	unsigned int		no_uids:8;
-+	unsigned int		no_guids:8;
-+	unsigned int		mkfs_time /* time of filesystem creation */;
-+	squashfs_inode_t	root_inode;
-+	unsigned int		block_size;
-+	unsigned int		fragments;
-+	unsigned int		fragment_table_start_2;
-+	long long		bytes_used;
-+	long long		uid_start;
-+	long long		guid_start;
-+	long long		inode_table_start;
-+	long long		directory_table_start;
-+	long long		fragment_table_start;
-+	long long		unused;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_index {
-+	unsigned int		index;
-+	unsigned int		start_block;
-+	unsigned char		size;
-+	unsigned char		name[0];
-+} __attribute__ ((packed));
-+
-+#define SQUASHFS_BASE_INODE_HEADER		\
-+	unsigned int		inode_type:4;	\
-+	unsigned int		mode:12;	\
-+	unsigned int		uid:8;		\
-+	unsigned int		guid:8;		\
-+	unsigned int		mtime;		\
-+	unsigned int 		inode_number;
-+
-+struct squashfs_base_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	squashfs_block_t	start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	unsigned int		file_size;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_lreg_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	squashfs_block_t	start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	long long		file_size;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		start_block;
-+	unsigned int		parent_inode;
-+} __attribute__  ((packed));
-+
-+struct squashfs_ldir_inode_header {
-+	SQUASHFS_BASE_INODE_HEADER;
-+	unsigned int		nlink;
-+	unsigned int		file_size:27;
-+	unsigned int		offset:13;
-+	unsigned int		start_block;
-+	unsigned int		i_count:16;
-+	unsigned int		parent_inode;
-+	struct squashfs_dir_index	index[0];
-+} __attribute__  ((packed));
-+
-+union squashfs_inode_header {
-+	struct squashfs_base_inode_header	base;
-+	struct squashfs_dev_inode_header	dev;
-+	struct squashfs_symlink_inode_header	symlink;
-+	struct squashfs_reg_inode_header	reg;
-+	struct squashfs_lreg_inode_header	lreg;
-+	struct squashfs_dir_inode_header	dir;
-+	struct squashfs_ldir_inode_header	ldir;
-+	struct squashfs_ipc_inode_header	ipc;
-+};
-+
-+struct squashfs_dir_entry {
-+	unsigned int		offset:13;
-+	unsigned int		type:3;
-+	unsigned int		size:8;
-+	int			inode_number:16;
-+	char			name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_header {
-+	unsigned int		count:8;
-+	unsigned int		start_block;
-+	unsigned int		inode_number;
-+} __attribute__ ((packed));
-+
-+struct squashfs_fragment_entry {
-+	long long		start_block;
-+	unsigned int		size;
-+	unsigned int		unused;
-+} __attribute__ ((packed));
-+
-+extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen);
-+extern int squashfs_uncompress_init(void);
-+extern int squashfs_uncompress_exit(void);
-+
-+/*
-+ * macros to convert each packed bitfield structure from little endian to big
-+ * endian and vice versa.  These are needed when creating or using a filesystem
-+ * on a machine with different byte ordering to the target architecture.
-+ *
-+ */
-+
-+#define SQUASHFS_SWAP_START \
-+	int bits;\
-+	int b_pos;\
-+	unsigned long long val;\
-+	unsigned char *s;\
-+	unsigned char *d;
-+
-+#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_super_block));\
-+	SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->inodes, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->bytes_used_2, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->uid_start_2, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->guid_start_2, d, 128, 32);\
-+	SQUASHFS_SWAP((s)->inode_table_start_2, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->directory_table_start_2, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->s_major, d, 224, 16);\
-+	SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\
-+	SQUASHFS_SWAP((s)->block_size_1, d, 256, 16);\
-+	SQUASHFS_SWAP((s)->block_log, d, 272, 16);\
-+	SQUASHFS_SWAP((s)->flags, d, 288, 8);\
-+	SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\
-+	SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\
-+	SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\
-+	SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\
-+	SQUASHFS_SWAP((s)->block_size, d, 408, 32);\
-+	SQUASHFS_SWAP((s)->fragments, d, 440, 32);\
-+	SQUASHFS_SWAP((s)->fragment_table_start_2, d, 472, 32);\
-+	SQUASHFS_SWAP((s)->bytes_used, d, 504, 64);\
-+	SQUASHFS_SWAP((s)->uid_start, d, 568, 64);\
-+	SQUASHFS_SWAP((s)->guid_start, d, 632, 64);\
-+	SQUASHFS_SWAP((s)->inode_table_start, d, 696, 64);\
-+	SQUASHFS_SWAP((s)->directory_table_start, d, 760, 64);\
-+	SQUASHFS_SWAP((s)->fragment_table_start, d, 824, 64);\
-+	SQUASHFS_SWAP((s)->unused, d, 888, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->guid, d, 24, 8);\
-+	SQUASHFS_SWAP((s)->mtime, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 64, 32);
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_ipc_inode_header))\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_dev_inode_header)); \
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->rdev, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_reg_inode_header));\
-+	SQUASHFS_SWAP((s)->start_block, d, 96, 64);\
-+	SQUASHFS_SWAP((s)->fragment, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 224, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LREG_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_lreg_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 128, 64);\
-+	SQUASHFS_SWAP((s)->fragment, d, 192, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 224, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 256, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_dir_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 128, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 147, 13);\
-+	SQUASHFS_SWAP((s)->start_block, d, 160, 32);\
-+	SQUASHFS_SWAP((s)->parent_inode, d, 192, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE(s, d, \
-+			sizeof(struct squashfs_ldir_inode_header));\
-+	SQUASHFS_SWAP((s)->nlink, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 128, 27);\
-+	SQUASHFS_SWAP((s)->offset, d, 155, 13);\
-+	SQUASHFS_SWAP((s)->start_block, d, 168, 32);\
-+	SQUASHFS_SWAP((s)->i_count, d, 200, 16);\
-+	SQUASHFS_SWAP((s)->parent_inode, d, 216, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INDEX(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index));\
-+	SQUASHFS_SWAP((s)->index, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->size, d, 64, 8);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header));\
-+	SQUASHFS_SWAP((s)->count, d, 0, 8);\
-+	SQUASHFS_SWAP((s)->start_block, d, 8, 32);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 40, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry));\
-+	SQUASHFS_SWAP((s)->offset, d, 0, 13);\
-+	SQUASHFS_SWAP((s)->type, d, 13, 3);\
-+	SQUASHFS_SWAP((s)->size, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->inode_number, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry));\
-+	SQUASHFS_SWAP((s)->start_block, d, 0, 64);\
-+	SQUASHFS_SWAP((s)->size, d, 64, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_SHORTS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 2);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			16)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_INTS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 4);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			32)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_LONG_LONGS(s, d, n) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * 8);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			64)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, 64);\
-+}
-+
-+#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\
-+	int entry;\
-+	int bit_position;\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, n * bits / 8);\
-+	for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += \
-+			bits)\
-+		SQUASHFS_SWAP(s[entry], d, bit_position, bits);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) SQUASHFS_SWAP_LONG_LONGS(s, d, n)
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+
-+struct squashfs_base_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		type:4;
-+	unsigned int		offset:4;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		mtime;
-+	unsigned int		start_block;
-+	unsigned int		file_size:32;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header_1 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:4; /* index into uid table */
-+	unsigned int		guid:4; /* index into guid table */
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+} __attribute__  ((packed));
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n) \
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 4);\
-+	SQUASHFS_SWAP((s)->guid, d, 20, 4);
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_ipc_inode_header_1));\
-+	SQUASHFS_SWAP((s)->type, d, 24, 4);\
-+	SQUASHFS_SWAP((s)->offset, d, 28, 4);\
-+}
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_dev_inode_header_1));\
-+	SQUASHFS_SWAP((s)->rdev, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header_1));\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_reg_inode_header_1));\
-+	SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 88, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_1(s, d, \
-+			sizeof(struct squashfs_dir_inode_header_1));\
-+	SQUASHFS_SWAP((s)->file_size, d, 24, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 43, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 56, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 88, 24);\
-+}
-+
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+
-+struct squashfs_dir_index_2 {
-+	unsigned int		index:27;
-+	unsigned int		start_block:29;
-+	unsigned char		size;
-+	unsigned char		name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_base_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_ipc_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+} __attribute__ ((packed));
-+
-+struct squashfs_dev_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned short		rdev;
-+} __attribute__ ((packed));
-+
-+struct squashfs_symlink_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned short		symlink_size;
-+	char			symlink[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_reg_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		mtime;
-+	unsigned int		start_block;
-+	unsigned int		fragment;
-+	unsigned int		offset;
-+	unsigned int		file_size:32;
-+	unsigned short		block_list[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		file_size:19;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+} __attribute__  ((packed));
-+
-+struct squashfs_ldir_inode_header_2 {
-+	unsigned int		inode_type:4;
-+	unsigned int		mode:12; /* protection */
-+	unsigned int		uid:8; /* index into uid table */
-+	unsigned int		guid:8; /* index into guid table */
-+	unsigned int		file_size:27;
-+	unsigned int		offset:13;
-+	unsigned int		mtime;
-+	unsigned int		start_block:24;
-+	unsigned int		i_count:16;
-+	struct squashfs_dir_index_2	index[0];
-+} __attribute__  ((packed));
-+
-+union squashfs_inode_header_2 {
-+	struct squashfs_base_inode_header_2	base;
-+	struct squashfs_dev_inode_header_2	dev;
-+	struct squashfs_symlink_inode_header_2	symlink;
-+	struct squashfs_reg_inode_header_2	reg;
-+	struct squashfs_dir_inode_header_2	dir;
-+	struct squashfs_ldir_inode_header_2	ldir;
-+	struct squashfs_ipc_inode_header_2	ipc;
-+};
-+
-+struct squashfs_dir_header_2 {
-+	unsigned int		count:8;
-+	unsigned int		start_block:24;
-+} __attribute__ ((packed));
-+
-+struct squashfs_dir_entry_2 {
-+	unsigned int		offset:13;
-+	unsigned int		type:3;
-+	unsigned int		size:8;
-+	char			name[0];
-+} __attribute__ ((packed));
-+
-+struct squashfs_fragment_entry_2 {
-+	unsigned int		start_block;
-+	unsigned int		size;
-+} __attribute__ ((packed));
-+
-+#define SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\
-+	SQUASHFS_MEMSET(s, d, n);\
-+	SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\
-+	SQUASHFS_SWAP((s)->mode, d, 4, 12);\
-+	SQUASHFS_SWAP((s)->uid, d, 16, 8);\
-+	SQUASHFS_SWAP((s)->guid, d, 24, 8);\
-+
-+#define SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, n) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, n)\
-+}
-+
-+#define SQUASHFS_SWAP_IPC_INODE_HEADER_2(s, d) \
-+	SQUASHFS_SWAP_BASE_INODE_HEADER_2(s, d, sizeof(struct squashfs_ipc_inode_header_2))
-+
-+#define SQUASHFS_SWAP_DEV_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_dev_inode_header_2)); \
-+	SQUASHFS_SWAP((s)->rdev, d, 32, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_symlink_inode_header_2));\
-+	SQUASHFS_SWAP((s)->symlink_size, d, 32, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_REG_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_reg_inode_header_2));\
-+	SQUASHFS_SWAP((s)->mtime, d, 32, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->fragment, d, 96, 32);\
-+	SQUASHFS_SWAP((s)->offset, d, 128, 32);\
-+	SQUASHFS_SWAP((s)->file_size, d, 160, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_dir_inode_header_2));\
-+	SQUASHFS_SWAP((s)->file_size, d, 32, 19);\
-+	SQUASHFS_SWAP((s)->offset, d, 51, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 64, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 96, 24);\
-+}
-+
-+#define SQUASHFS_SWAP_LDIR_INODE_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_SWAP_BASE_INODE_CORE_2(s, d, \
-+			sizeof(struct squashfs_ldir_inode_header_2));\
-+	SQUASHFS_SWAP((s)->file_size, d, 32, 27);\
-+	SQUASHFS_SWAP((s)->offset, d, 59, 13);\
-+	SQUASHFS_SWAP((s)->mtime, d, 72, 32);\
-+	SQUASHFS_SWAP((s)->start_block, d, 104, 24);\
-+	SQUASHFS_SWAP((s)->i_count, d, 128, 16);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_INDEX_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_index_2));\
-+	SQUASHFS_SWAP((s)->index, d, 0, 27);\
-+	SQUASHFS_SWAP((s)->start_block, d, 27, 29);\
-+	SQUASHFS_SWAP((s)->size, d, 56, 8);\
-+}
-+#define SQUASHFS_SWAP_DIR_HEADER_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_header_2));\
-+	SQUASHFS_SWAP((s)->count, d, 0, 8);\
-+	SQUASHFS_SWAP((s)->start_block, d, 8, 24);\
-+}
-+
-+#define SQUASHFS_SWAP_DIR_ENTRY_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_dir_entry_2));\
-+	SQUASHFS_SWAP((s)->offset, d, 0, 13);\
-+	SQUASHFS_SWAP((s)->type, d, 13, 3);\
-+	SQUASHFS_SWAP((s)->size, d, 16, 8);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_ENTRY_2(s, d) {\
-+	SQUASHFS_SWAP_START\
-+	SQUASHFS_MEMSET(s, d, sizeof(struct squashfs_fragment_entry_2));\
-+	SQUASHFS_SWAP((s)->start_block, d, 0, 32);\
-+	SQUASHFS_SWAP((s)->size, d, 32, 32);\
-+}
-+
-+#define SQUASHFS_SWAP_FRAGMENT_INDEXES_2(s, d, n) SQUASHFS_SWAP_INTS(s, d, n)
-+
-+/* fragment and fragment table defines */
-+#define SQUASHFS_FRAGMENT_BYTES_2(A)	(A * sizeof(struct squashfs_fragment_entry_2))
-+
-+#define SQUASHFS_FRAGMENT_INDEX_2(A)	(SQUASHFS_FRAGMENT_BYTES_2(A) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_OFFSET_2(A)	(SQUASHFS_FRAGMENT_BYTES_2(A) % \
-+						SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEXES_2(A)	((SQUASHFS_FRAGMENT_BYTES_2(A) + \
-+					SQUASHFS_METADATA_SIZE - 1) / \
-+					SQUASHFS_METADATA_SIZE)
-+
-+#define SQUASHFS_FRAGMENT_INDEX_BYTES_2(A)	(SQUASHFS_FRAGMENT_INDEXES_2(A) *\
-+						sizeof(int))
-+
-+#endif
-+
-+#ifdef __KERNEL__
-+
-+/*
-+ * macros used to swap each structure entry, taking into account
-+ * bitfields and different bitfield placing conventions on differing
-+ * architectures
-+ */
-+
-+#include <asm/byteorder.h>
-+
-+#ifdef __BIG_ENDIAN
-+	/* convert from little endian to big endian */
-+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \
-+		tbits, b_pos)
-+#else
-+	/* convert from big endian to little endian */
-+#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \
-+		tbits, 64 - tbits - b_pos)
-+#endif
-+
-+#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\
-+	b_pos = pos % 8;\
-+	val = 0;\
-+	s = (unsigned char *)p + (pos / 8);\
-+	d = ((unsigned char *) &val) + 7;\
-+	for(bits = 0; bits < (tbits + b_pos); bits += 8) \
-+		*d-- = *s++;\
-+	value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\
-+}
-+
-+#define SQUASHFS_MEMSET(s, d, n)	memset(s, 0, n);
-+
-+#endif
-+#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_i.h
-@@ -0,0 +1,45 @@
-+#ifndef SQUASHFS_FS_I
-+#define SQUASHFS_FS_I
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs_i.h
-+ */
-+
-+struct squashfs_inode_info {
-+	long long	start_block;
-+	unsigned int	offset;
-+	union {
-+		struct {
-+			long long	fragment_start_block;
-+			unsigned int	fragment_size;
-+			unsigned int	fragment_offset;
-+			long long	block_list_start;
-+		} s1;
-+		struct {
-+			long long	directory_index_start;
-+			unsigned int	directory_index_offset;
-+			unsigned int	directory_index_count;
-+			unsigned int	parent_inode;
-+		} s2;
-+	} u;
-+	struct inode	vfs_inode;
-+};
-+#endif
---- /dev/null
-+++ b/include/linux/squashfs_fs_sb.h
-@@ -0,0 +1,74 @@
-+#ifndef SQUASHFS_FS_SB
-+#define SQUASHFS_FS_SB
-+/*
-+ * Squashfs
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
-+ * Phillip Lougher <phillip@lougher.org.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs_fs_sb.h
-+ */
-+
-+#include <linux/squashfs_fs.h>
-+
-+struct squashfs_cache {
-+	long long	block;
-+	int		length;
-+	long long	next_index;
-+	char		*data;
-+};
-+
-+struct squashfs_fragment_cache {
-+	long long	block;
-+	int		length;
-+	unsigned int	locked;
-+	char		*data;
-+};
-+
-+struct squashfs_sb_info {
-+	struct squashfs_super_block	sblk;
-+	int			devblksize;
-+	int			devblksize_log2;
-+	int			swap;
-+	struct squashfs_cache	*block_cache;
-+	struct squashfs_fragment_cache	*fragment;
-+	int			next_cache;
-+	int			next_fragment;
-+	int			next_meta_index;
-+	unsigned int		*uid;
-+	unsigned int		*guid;
-+	long long		*fragment_index;
-+	unsigned int		*fragment_index_2;
-+	unsigned int		read_size;
-+	char			*read_data;
-+	char			*read_page;
-+	struct semaphore	read_data_mutex;
-+	struct semaphore	read_page_mutex;
-+	struct semaphore	block_cache_mutex;
-+	struct semaphore	fragment_mutex;
-+	struct semaphore	meta_index_mutex;
-+	wait_queue_head_t	waitq;
-+	wait_queue_head_t	fragment_wait_queue;
-+	struct meta_index	*meta_index;
-+	struct inode		*(*iget)(struct super_block *s,  squashfs_inode_t \
-+				inode);
-+	long long		(*read_blocklist)(struct inode *inode, int \
-+				index, int readahead_blks, char *block_list, \
-+				unsigned short **block_p, unsigned int *bsize);
-+	int			(*read_fragment_index_table)(struct super_block *s);
-+};
-+#endif
---- a/init/do_mounts_rd.c
-+++ b/init/do_mounts_rd.c
-@@ -5,6 +5,7 @@
- #include <linux/ext2_fs.h>
- #include <linux/romfs_fs.h>
- #include <linux/cramfs_fs.h>
-+#include <linux/squashfs_fs.h>
- #include <linux/initrd.h>
- #include <linux/string.h>
- 
-@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
-  * numbers could not be found.
-  *
-  * We currently check for the following magic numbers:
-+ *      squashfs
-  * 	minix
-  * 	ext2
-  *	romfs
-@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
- 	struct ext2_super_block *ext2sb;
- 	struct romfs_super_block *romfsb;
- 	struct cramfs_super *cramfsb;
-+	struct squashfs_super_block *squashfsb;
- 	int nblocks = -1;
- 	unsigned char *buf;
- 
-@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
- 	ext2sb = (struct ext2_super_block *) buf;
- 	romfsb = (struct romfs_super_block *) buf;
- 	cramfsb = (struct cramfs_super *) buf;
-+	squashfsb = (struct squashfs_super_block *) buf;
- 	memset(buf, 0xe5, size);
- 
- 	/*
-@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
- 		goto done;
- 	}
- 
-+	/* squashfs is at block zero too */
-+	if (squashfsb->s_magic == SQUASHFS_MAGIC) {
-+		printk(KERN_NOTICE
-+		       "RAMDISK: squashfs filesystem found at block %d\n",
-+		       start_block);
-+		nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
-+		goto done;
-+	}
-+
- 	/*
- 	 * Read block 1 to test for minix and ext2 superblock
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
deleted file mode 100644
index 939e0a9e32..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
+++ /dev/null
@@ -1,780 +0,0 @@
---- /dev/null
-+++ b/include/linux/LzmaDecode.h
-@@ -0,0 +1,100 @@
-+/*
-+  LzmaDecode.h
-+  LZMA Decoder interface
-+
-+  LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this code, expressly permits you to
-+  statically or dynamically link your code (or bind by name) to the
-+  interfaces of this file without subjecting your linked code to the
-+  terms of the CPL or GNU LGPL. Any modifications or additions
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#ifndef __LZMADECODE_H
-+#define __LZMADECODE_H
-+
-+/* #define _LZMA_IN_CB */
-+/* Use callback for input data */
-+
-+/* #define _LZMA_OUT_READ */
-+/* Use read function for output data */
-+
-+/* #define _LZMA_PROB32 */
-+/* It can increase speed on some 32-bit CPUs,
-+   but memory usage will be doubled in that case */
-+
-+/* #define _LZMA_LOC_OPT */
-+/* Enable local speed optimizations inside code */
-+
-+#ifndef UInt32
-+#ifdef _LZMA_UINT32_IS_ULONG
-+#define UInt32 unsigned long
-+#else
-+#define UInt32 unsigned int
-+#endif
-+#endif
-+
-+#ifdef _LZMA_PROB32
-+#define CProb UInt32
-+#else
-+#define CProb unsigned short
-+#endif
-+
-+#define LZMA_RESULT_OK 0
-+#define LZMA_RESULT_DATA_ERROR 1
-+#define LZMA_RESULT_NOT_ENOUGH_MEM 2
-+
-+#ifdef _LZMA_IN_CB
-+typedef struct _ILzmaInCallback
-+{
-+  int (*Read)(void *object, unsigned char **buffer, UInt32 *bufferSize);
-+} ILzmaInCallback;
-+#endif
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+/*
-+bufferSize = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp)))* sizeof(CProb)
-+bufferSize += 100 in case of _LZMA_OUT_READ
-+by default CProb is unsigned short,
-+but if specify _LZMA_PROB_32, CProb will be UInt32(unsigned int)
-+*/
-+
-+#ifdef _LZMA_OUT_READ
-+int LzmaDecoderInit(
-+    unsigned char *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    unsigned char *dictionary, UInt32 dictionarySize,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+  #else
-+    unsigned char *inStream, UInt32 inSize
-+  #endif
-+);
-+#endif
-+
-+int LzmaDecode(
-+    unsigned char *buffer,
-+  #ifndef _LZMA_OUT_READ
-+    UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback,
-+  #else
-+    unsigned char *inStream, UInt32 inSize,
-+  #endif
-+  #endif
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed);
-+
-+#endif
---- /dev/null
-+++ b/lib/LzmaDecode.c
-@@ -0,0 +1,663 @@
-+/*
-+  LzmaDecode.c
-+  LZMA Decoder
-+
-+  LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this code, expressly permits you to
-+  statically or dynamically link your code (or bind by name) to the
-+  interfaces of this file without subjecting your linked code to the
-+  terms of the CPL or GNU LGPL. Any modifications or additions
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#include <linux/LzmaDecode.h>
-+
-+#ifndef Byte
-+#define Byte unsigned char
-+#endif
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+typedef struct _CRangeDecoder
-+{
-+  Byte *Buffer;
-+  Byte *BufferLim;
-+  UInt32 Range;
-+  UInt32 Code;
-+  #ifdef _LZMA_IN_CB
-+  ILzmaInCallback *InCallback;
-+  int Result;
-+  #endif
-+  int ExtraBytes;
-+} CRangeDecoder;
-+
-+Byte RangeDecoderReadByte(CRangeDecoder *rd)
-+{
-+  if (rd->Buffer == rd->BufferLim)
-+  {
-+    #ifdef _LZMA_IN_CB
-+    UInt32 size;
-+    rd->Result = rd->InCallback->Read(rd->InCallback, &rd->Buffer, &size);
-+    rd->BufferLim = rd->Buffer + size;
-+    if (size == 0)
-+    #endif
-+    {
-+      rd->ExtraBytes = 1;
-+      return 0xFF;
-+    }
-+  }
-+  return (*rd->Buffer++);
-+}
-+
-+/* #define ReadByte (*rd->Buffer++) */
-+#define ReadByte (RangeDecoderReadByte(rd))
-+
-+void RangeDecoderInit(CRangeDecoder *rd,
-+  #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+  #else
-+    Byte *stream, UInt32 bufferSize
-+  #endif
-+    )
-+{
-+  int i;
-+  #ifdef _LZMA_IN_CB
-+  rd->InCallback = inCallback;
-+  rd->Buffer = rd->BufferLim = 0;
-+  #else
-+  rd->Buffer = stream;
-+  rd->BufferLim = stream + bufferSize;
-+  #endif
-+  rd->ExtraBytes = 0;
-+  rd->Code = 0;
-+  rd->Range = (0xFFFFFFFF);
-+  for(i = 0; i < 5; i++)
-+    rd->Code = (rd->Code << 8) | ReadByte;
-+}
-+
-+#define RC_INIT_VAR UInt32 range = rd->Range; UInt32 code = rd->Code;
-+#define RC_FLUSH_VAR rd->Range = range; rd->Code = code;
-+#define RC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | ReadByte; }
-+
-+UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits)
-+{
-+  RC_INIT_VAR
-+  UInt32 result = 0;
-+  int i;
-+  for (i = numTotalBits; i > 0; i--)
-+  {
-+    /* UInt32 t; */
-+    range >>= 1;
-+
-+    result <<= 1;
-+    if (code >= range)
-+    {
-+      code -= range;
-+      result |= 1;
-+    }
-+    /*
-+    t = (code - range) >> 31;
-+    t &= 1;
-+    code -= range & (t - 1);
-+    result = (result + result) | (1 - t);
-+    */
-+    RC_NORMALIZE
-+  }
-+  RC_FLUSH_VAR
-+  return result;
-+}
-+
-+int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd)
-+{
-+  UInt32 bound = (rd->Range >> kNumBitModelTotalBits) * *prob;
-+  if (rd->Code < bound)
-+  {
-+    rd->Range = bound;
-+    *prob += (kBitModelTotal - *prob) >> kNumMoveBits;
-+    if (rd->Range < kTopValue)
-+    {
-+      rd->Code = (rd->Code << 8) | ReadByte;
-+      rd->Range <<= 8;
-+    }
-+    return 0;
-+  }
-+  else
-+  {
-+    rd->Range -= bound;
-+    rd->Code -= bound;
-+    *prob -= (*prob) >> kNumMoveBits;
-+    if (rd->Range < kTopValue)
-+    {
-+      rd->Code = (rd->Code << 8) | ReadByte;
-+      rd->Range <<= 8;
-+    }
-+    return 1;
-+  }
-+}
-+
-+#define RC_GET_BIT2(prob, mi, A0, A1) \
-+  UInt32 bound = (range >> kNumBitModelTotalBits) * *prob; \
-+  if (code < bound) \
-+    { A0; range = bound; *prob += (kBitModelTotal - *prob) >> kNumMoveBits; mi <<= 1; } \
-+  else \
-+    { A1; range -= bound; code -= bound; *prob -= (*prob) >> kNumMoveBits; mi = (mi + mi) + 1; } \
-+  RC_NORMALIZE
-+
-+#define RC_GET_BIT(prob, mi) RC_GET_BIT2(prob, mi, ; , ;)
-+
-+int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
-+{
-+  int mi = 1;
-+  int i;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  for(i = numLevels; i > 0; i--)
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + mi;
-+    RC_GET_BIT(prob, mi)
-+    #else
-+    mi = (mi + mi) + RangeDecoderBitDecode(probs + mi, rd);
-+    #endif
-+  }
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return mi - (1 << numLevels);
-+}
-+
-+int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd)
-+{
-+  int mi = 1;
-+  int i;
-+  int symbol = 0;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  for(i = 0; i < numLevels; i++)
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + mi;
-+    RC_GET_BIT2(prob, mi, ; , symbol |= (1 << i))
-+    #else
-+    int bit = RangeDecoderBitDecode(probs + mi, rd);
-+    mi = mi + mi + bit;
-+    symbol |= (bit << i);
-+    #endif
-+  }
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd)
-+{
-+  int symbol = 1;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  do
-+  {
-+    #ifdef _LZMA_LOC_OPT
-+    CProb *prob = probs + symbol;
-+    RC_GET_BIT(prob, symbol)
-+    #else
-+    symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd);
-+    #endif
-+  }
-+  while (symbol < 0x100);
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte)
-+{
-+  int symbol = 1;
-+  #ifdef _LZMA_LOC_OPT
-+  RC_INIT_VAR
-+  #endif
-+  do
-+  {
-+    int bit;
-+    int matchBit = (matchByte >> 7) & 1;
-+    matchByte <<= 1;
-+    #ifdef _LZMA_LOC_OPT
-+    {
-+      CProb *prob = probs + ((1 + matchBit) << 8) + symbol;
-+      RC_GET_BIT2(prob, symbol, bit = 0, bit = 1)
-+    }
-+    #else
-+    bit = RangeDecoderBitDecode(probs + ((1 + matchBit) << 8) + symbol, rd);
-+    symbol = (symbol << 1) | bit;
-+    #endif
-+    if (matchBit != bit)
-+    {
-+      while (symbol < 0x100)
-+      {
-+        #ifdef _LZMA_LOC_OPT
-+        CProb *prob = probs + symbol;
-+        RC_GET_BIT(prob, symbol)
-+        #else
-+        symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd);
-+        #endif
-+      }
-+      break;
-+    }
-+  }
-+  while (symbol < 0x100);
-+  #ifdef _LZMA_LOC_OPT
-+  RC_FLUSH_VAR
-+  #endif
-+  return symbol;
-+}
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState)
-+{
-+  if(RangeDecoderBitDecode(p + LenChoice, rd) == 0)
-+    return RangeDecoderBitTreeDecode(p + LenLow +
-+        (posState << kLenNumLowBits), kLenNumLowBits, rd);
-+  if(RangeDecoderBitDecode(p + LenChoice2, rd) == 0)
-+    return kLenNumLowSymbols + RangeDecoderBitTreeDecode(p + LenMid +
-+        (posState << kLenNumMidBits), kLenNumMidBits, rd);
-+  return kLenNumLowSymbols + kLenNumMidSymbols +
-+      RangeDecoderBitTreeDecode(p + LenHigh, kLenNumHighBits, rd);
-+}
-+
-+#define kNumStates 12
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#ifdef _LZMA_OUT_READ
-+
-+typedef struct _LzmaVarState
-+{
-+  CRangeDecoder RangeDecoder;
-+  Byte *Dictionary;
-+  UInt32 DictionarySize;
-+  UInt32 DictionaryPos;
-+  UInt32 GlobalPos;
-+  UInt32 Reps[4];
-+  int lc;
-+  int lp;
-+  int pb;
-+  int State;
-+  int PreviousIsMatch;
-+  int RemainLen;
-+} LzmaVarState;
-+
-+int LzmaDecoderInit(
-+    unsigned char *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    unsigned char *dictionary, UInt32 dictionarySize,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback
-+    #else
-+    unsigned char *inStream, UInt32 inSize
-+    #endif
-+    )
-+{
-+  LzmaVarState *vs = (LzmaVarState *)buffer;
-+  CProb *p = (CProb *)(buffer + sizeof(LzmaVarState));
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp));
-+  UInt32 i;
-+  if (bufferSize < numProbs * sizeof(CProb) + sizeof(LzmaVarState))
-+    return LZMA_RESULT_NOT_ENOUGH_MEM;
-+  vs->Dictionary = dictionary;
-+  vs->DictionarySize = dictionarySize;
-+  vs->DictionaryPos = 0;
-+  vs->GlobalPos = 0;
-+  vs->Reps[0] = vs->Reps[1] = vs->Reps[2] = vs->Reps[3] = 1;
-+  vs->lc = lc;
-+  vs->lp = lp;
-+  vs->pb = pb;
-+  vs->State = 0;
-+  vs->PreviousIsMatch = 0;
-+  vs->RemainLen = 0;
-+  dictionary[dictionarySize - 1] = 0;
-+  for (i = 0; i < numProbs; i++)
-+    p[i] = kBitModelTotal >> 1;
-+  RangeDecoderInit(&vs->RangeDecoder,
-+      #ifdef _LZMA_IN_CB
-+      inCallback
-+      #else
-+      inStream, inSize
-+      #endif
-+  );
-+  return LZMA_RESULT_OK;
-+}
-+
-+int LzmaDecode(unsigned char *buffer,
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed)
-+{
-+  LzmaVarState *vs = (LzmaVarState *)buffer;
-+  CProb *p = (CProb *)(buffer + sizeof(LzmaVarState));
-+  CRangeDecoder rd = vs->RangeDecoder;
-+  int state = vs->State;
-+  int previousIsMatch = vs->PreviousIsMatch;
-+  Byte previousByte;
-+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
-+  UInt32 nowPos = 0;
-+  UInt32 posStateMask = (1 << (vs->pb)) - 1;
-+  UInt32 literalPosMask = (1 << (vs->lp)) - 1;
-+  int lc = vs->lc;
-+  int len = vs->RemainLen;
-+  UInt32 globalPos = vs->GlobalPos;
-+
-+  Byte *dictionary = vs->Dictionary;
-+  UInt32 dictionarySize = vs->DictionarySize;
-+  UInt32 dictionaryPos = vs->DictionaryPos;
-+
-+  if (len == -1)
-+  {
-+    *outSizeProcessed = 0;
-+    return LZMA_RESULT_OK;
-+  }
-+
-+  while(len > 0 && nowPos < outSize)
-+  {
-+    UInt32 pos = dictionaryPos - rep0;
-+    if (pos >= dictionarySize)
-+      pos += dictionarySize;
-+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
-+    if (++dictionaryPos == dictionarySize)
-+      dictionaryPos = 0;
-+    len--;
-+  }
-+  if (dictionaryPos == 0)
-+    previousByte = dictionary[dictionarySize - 1];
-+  else
-+    previousByte = dictionary[dictionaryPos - 1];
-+#else
-+
-+int LzmaDecode(
-+    Byte *buffer, UInt32 bufferSize,
-+    int lc, int lp, int pb,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback,
-+    #else
-+    unsigned char *inStream, UInt32 inSize,
-+    #endif
-+    unsigned char *outStream, UInt32 outSize,
-+    UInt32 *outSizeProcessed)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp));
-+  CProb *p = (CProb *)buffer;
-+  CRangeDecoder rd;
-+  UInt32 i;
-+  int state = 0;
-+  int previousIsMatch = 0;
-+  Byte previousByte = 0;
-+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
-+  UInt32 nowPos = 0;
-+  UInt32 posStateMask = (1 << pb) - 1;
-+  UInt32 literalPosMask = (1 << lp) - 1;
-+  int len = 0;
-+  if (bufferSize < numProbs * sizeof(CProb))
-+    return LZMA_RESULT_NOT_ENOUGH_MEM;
-+  for (i = 0; i < numProbs; i++)
-+    p[i] = kBitModelTotal >> 1;
-+  RangeDecoderInit(&rd,
-+      #ifdef _LZMA_IN_CB
-+      inCallback
-+      #else
-+      inStream, inSize
-+      #endif
-+      );
-+#endif
-+
-+  *outSizeProcessed = 0;
-+  while(nowPos < outSize)
-+  {
-+    int posState = (int)(
-+        (nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & posStateMask);
-+    #ifdef _LZMA_IN_CB
-+    if (rd.Result != LZMA_RESULT_OK)
-+      return rd.Result;
-+    #endif
-+    if (rd.ExtraBytes != 0)
-+      return LZMA_RESULT_DATA_ERROR;
-+    if (RangeDecoderBitDecode(p + IsMatch + (state << kNumPosBitsMax) + posState, &rd) == 0)
-+    {
-+      CProb *probs = p + Literal + (LZMA_LIT_SIZE *
-+        (((
-+        (nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
-+
-+      if (state < 4) state = 0;
-+      else if (state < 10) state -= 3;
-+      else state -= 6;
-+      if (previousIsMatch)
-+      {
-+        Byte matchByte;
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        matchByte = dictionary[pos];
-+        #else
-+        matchByte = outStream[nowPos - rep0];
-+        #endif
-+        previousByte = LzmaLiteralDecodeMatch(probs, &rd, matchByte);
-+        previousIsMatch = 0;
-+      }
-+      else
-+        previousByte = LzmaLiteralDecode(probs, &rd);
-+      outStream[nowPos++] = previousByte;
-+      #ifdef _LZMA_OUT_READ
-+      dictionary[dictionaryPos] = previousByte;
-+      if (++dictionaryPos == dictionarySize)
-+        dictionaryPos = 0;
-+      #endif
-+    }
-+    else
-+    {
-+      previousIsMatch = 1;
-+      if (RangeDecoderBitDecode(p + IsRep + state, &rd) == 1)
-+      {
-+        if (RangeDecoderBitDecode(p + IsRepG0 + state, &rd) == 0)
-+        {
-+          if (RangeDecoderBitDecode(p + IsRep0Long + (state << kNumPosBitsMax) + posState, &rd) == 0)
-+          {
-+            #ifdef _LZMA_OUT_READ
-+            UInt32 pos;
-+            #endif
-+            if (
-+               (nowPos
-+                #ifdef _LZMA_OUT_READ
-+                + globalPos
-+                #endif
-+               )
-+               == 0)
-+              return LZMA_RESULT_DATA_ERROR;
-+            state = state < 7 ? 9 : 11;
-+            #ifdef _LZMA_OUT_READ
-+            pos = dictionaryPos - rep0;
-+            if (pos >= dictionarySize)
-+              pos += dictionarySize;
-+            previousByte = dictionary[pos];
-+            dictionary[dictionaryPos] = previousByte;
-+            if (++dictionaryPos == dictionarySize)
-+              dictionaryPos = 0;
-+            #else
-+            previousByte = outStream[nowPos - rep0];
-+            #endif
-+            outStream[nowPos++] = previousByte;
-+            continue;
-+          }
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          if(RangeDecoderBitDecode(p + IsRepG1 + state, &rd) == 0)
-+            distance = rep1;
-+          else
-+          {
-+            if(RangeDecoderBitDecode(p + IsRepG2 + state, &rd) == 0)
-+              distance = rep2;
-+            else
-+            {
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        len = LzmaLenDecode(p + RepLenCoder, &rd, posState);
-+        state = state < 7 ? 8 : 11;
-+      }
-+      else
-+      {
-+        int posSlot;
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        state = state < 7 ? 7 : 10;
-+        len = LzmaLenDecode(p + LenCoder, &rd, posState);
-+        posSlot = RangeDecoderBitTreeDecode(p + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits), kNumPosSlotBits, &rd);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+          rep0 = ((2 | ((UInt32)posSlot & 1)) << numDirectBits);
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            rep0 += RangeDecoderReverseBitTreeDecode(
-+                p + SpecPos + rep0 - posSlot - 1, numDirectBits, &rd);
-+          }
-+          else
-+          {
-+            rep0 += RangeDecoderDecodeDirectBits(&rd,
-+                numDirectBits - kNumAlignBits) << kNumAlignBits;
-+            rep0 += RangeDecoderReverseBitTreeDecode(p + Align, kNumAlignBits, &rd);
-+          }
-+        }
-+        else
-+          rep0 = posSlot;
-+        rep0++;
-+      }
-+      if (rep0 == (UInt32)(0))
-+      {
-+        /* it's for stream version */
-+        len = -1;
-+        break;
-+      }
-+      if (rep0 > nowPos
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+      {
-+        return LZMA_RESULT_DATA_ERROR;
-+      }
-+      len += kMatchMinLen;
-+      do
-+      {
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        previousByte = dictionary[pos];
-+        dictionary[dictionaryPos] = previousByte;
-+        if (++dictionaryPos == dictionarySize)
-+          dictionaryPos = 0;
-+        #else
-+        previousByte = outStream[nowPos - rep0];
-+        #endif
-+        outStream[nowPos++] = previousByte;
-+        len--;
-+      }
-+      while(len > 0 && nowPos < outSize);
-+    }
-+  }
-+
-+  #ifdef _LZMA_OUT_READ
-+  vs->RangeDecoder = rd;
-+  vs->DictionaryPos = dictionaryPos;
-+  vs->GlobalPos = globalPos + nowPos;
-+  vs->Reps[0] = rep0;
-+  vs->Reps[1] = rep1;
-+  vs->Reps[2] = rep2;
-+  vs->Reps[3] = rep3;
-+  vs->State = state;
-+  vs->PreviousIsMatch = previousIsMatch;
-+  vs->RemainLen = len;
-+  #endif
-+
-+  *outSizeProcessed = nowPos;
-+  return LZMA_RESULT_OK;
-+}
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
- lib-y	+= kobject.o kref.o klist.o
- 
- obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
--	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o
-+	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o LzmaDecode.o
- 
- ifeq ($(CONFIG_DEBUG_KOBJECT),y)
- CFLAGS_kobject.o += -DDEBUG
diff --git a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
deleted file mode 100644
index 9050e370ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -4,6 +4,9 @@
-  * Copyright (c) 2002, 2003, 2004, 2005, 2006
-  * Phillip Lougher <phillip@lougher.org.uk>
-  *
-+ * LZMA decompressor support added by Oleg I. Vdovikin
-+ * Copyright (c) 2005 Oleg I.Vdovikin <oleg@cs.msu.su>
-+ *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2,
-@@ -21,6 +24,7 @@
-  * inode.c
-  */
- 
-+#define SQUASHFS_LZMA
- #include <linux/types.h>
- #include <linux/squashfs_fs.h>
- #include <linux/module.h>
-@@ -44,6 +48,19 @@
- 
- #include "squashfs.h"
- 
-+#ifdef SQUASHFS_LZMA
-+#include <linux/LzmaDecode.h>
-+
-+/* default LZMA settings, should be in sync with mksquashfs */
-+#define LZMA_LC 3
-+#define LZMA_LP 0
-+#define LZMA_PB 2
-+
-+#define LZMA_WORKSPACE_SIZE ((LZMA_BASE_SIZE + \
-+      (LZMA_LIT_SIZE << (LZMA_LC + LZMA_LP))) * sizeof(CProb))
-+
-+#endif
-+
- static void squashfs_put_super(struct super_block *);
- static int squashfs_statfs(struct dentry *, struct kstatfs *);
- static int squashfs_symlink_readpage(struct file *file, struct page *page);
-@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
- 			const char *, void *, struct vfsmount *);
- 
- 
-+#ifdef SQUASHFS_LZMA
-+static unsigned char lzma_workspace[LZMA_WORKSPACE_SIZE];
-+#else
- static z_stream stream;
-+#endif
- 
- static struct file_system_type squashfs_fs_type = {
- 	.owner = THIS_MODULE,
-@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
- 	if (compressed) {
- 		int zlib_err;
- 
-+#ifdef SQUASHFS_LZMA
-+		if ((zlib_err = LzmaDecode(lzma_workspace,
-+			LZMA_WORKSPACE_SIZE, LZMA_LC, LZMA_LP, LZMA_PB,
-+			c_buffer, c_byte, buffer, msblk->read_size, &bytes)) != LZMA_RESULT_OK)
-+		{
-+			ERROR("lzma returned unexpected result 0x%x\n", zlib_err);
-+			bytes = 0;
-+		}
-+#else
- 		stream.next_in = c_buffer;
- 		stream.avail_in = c_byte;
- 		stream.next_out = buffer;
-@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
- 			bytes = 0;
- 		} else
- 			bytes = stream.total_out;
--
-+#endif
- 		up(&msblk->read_data_mutex);
- 	}
- 
-@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
- 	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
- 		"Phillip Lougher\n");
- 
-+#ifndef SQUASHFS_LZMA
- 	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
- 		ERROR("Failed to allocate zlib workspace\n");
- 		destroy_inodecache();
- 		err = -ENOMEM;
- 		goto out;
- 	}
-+#endif
- 
- 	if ((err = register_filesystem(&squashfs_fs_type))) {
-+#ifndef SQUASHFS_LZMA
- 		vfree(stream.workspace);
-+#endif
- 		destroy_inodecache();
- 	}
- 
-@@ -2064,7 +2098,9 @@ out:
- 
- static void __exit exit_squashfs_fs(void)
- {
-+#ifndef SQUASHFS_LZMA
- 	vfree(stream.workspace);
-+#endif
- 	unregister_filesystem(&squashfs_fs_type);
- 	destroy_inodecache();
- }
diff --git a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
deleted file mode 100644
index ba1b71c610..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -533,6 +533,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
deleted file mode 100644
index 56b7fc2c40..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -33,6 +33,7 @@
- #include <linux/fs.h>
- #include <linux/smp_lock.h>
- #include <linux/slab.h>
-+#include <linux/exportfs.h>
- #include <linux/squashfs_fs_sb.h>
- #include <linux/squashfs_fs_i.h>
- #include <linux/buffer_head.h>
-@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
- }
- 
- 
--static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
-+static void init_once(struct kmem_cache * cachep, void *foo)
- {
- 	struct squashfs_inode_info *ei = foo;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
deleted file mode 100644
index cd62e9c250..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/asm-mips/system.h
-+++ b/include/asm-mips/system.h
-@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
deleted file mode 100644
index 557736f7a4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
deleted file mode 100644
index 072900786b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
+++ /dev/null
@@ -1,169 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0001.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
- 
- static int __xipram xip_wait_for_operation(
- 		struct map_info *map, struct flchip *chip,
--		unsigned long adr, unsigned int chip_op_time )
-+		unsigned long adr, int *chip_op_time )
- {
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
-@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
- 	flstate_t oldstate, newstate;
- 
-        	start = xip_currtime();
--	usec = chip_op_time * 8;
-+	usec = *chip_op_time * 8;
- 	if (usec == 0)
- 		usec = 500000;
- 	done = 0;
-@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
- #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
- 	INVALIDATE_CACHED_RANGE(map, from, size)
- 
--#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, usec) \
--	xip_wait_for_operation(map, chip, cmd_adr, usec)
-+#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, p_usec) \
-+	xip_wait_for_operation(map, chip, cmd_adr, p_usec)
- 
- #else
- 
-@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
- static int inval_cache_and_wait_for_operation(
- 		struct map_info *map, struct flchip *chip,
- 		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
--		unsigned int chip_op_time)
-+		int *chip_op_time )
- {
- 	struct cfi_private *cfi = map->fldrv_priv;
- 	map_word status, status_OK = CMD(0x80);
--	int chip_state = chip->state;
--	unsigned int timeo, sleep_time;
-+	int z, chip_state = chip->state;
-+	unsigned long timeo;
- 
- 	spin_unlock(chip->mutex);
- 	if (inval_len)
- 		INVALIDATE_CACHED_RANGE(map, inval_adr, inval_len);
-+	if (*chip_op_time)
-+		cfi_udelay(*chip_op_time);
- 	spin_lock(chip->mutex);
- 
--	/* set our timeout to 8 times the expected delay */
--	timeo = chip_op_time * 8;
--	if (!timeo)
--		timeo = 500000;
--	sleep_time = chip_op_time / 2;
-+	timeo = *chip_op_time * 8 * HZ / 1000000;
-+	if (timeo < HZ/2)
-+		timeo = HZ/2;
-+	timeo += jiffies;
- 
-+	z = 0;
- 	for (;;) {
-+		if (chip->state != chip_state) {
-+			/* Someone's suspended the operation: sleep */
-+			DECLARE_WAITQUEUE(wait, current);
-+
-+			set_current_state(TASK_UNINTERRUPTIBLE);
-+			add_wait_queue(&chip->wq, &wait);
-+			spin_unlock(chip->mutex);
-+			schedule();
-+			remove_wait_queue(&chip->wq, &wait);
-+			timeo = jiffies + (HZ / 2); /* FIXME */
-+			spin_lock(chip->mutex);
-+			continue;
-+		}
-+
- 		status = map_read(map, cmd_adr);
- 		if (map_word_andequal(map, status, status_OK, status_OK))
- 			break;
- 
--		if (!timeo) {
-+		/* OK Still waiting */
-+		if (time_after(jiffies, timeo)) {
- 			map_write(map, CMD(0x70), cmd_adr);
- 			chip->state = FL_STATUS;
- 			return -ETIME;
- 		}
- 
--		/* OK Still waiting. Drop the lock, wait a while and retry. */
-+		/* Latency issues. Drop the lock, wait a while and retry */
-+		z++;
- 		spin_unlock(chip->mutex);
--		if (sleep_time >= 1000000/HZ) {
--			/*
--			 * Half of the normal delay still remaining
--			 * can be performed with a sleeping delay instead
--			 * of busy waiting.
--			 */
--			msleep(sleep_time/1000);
--			timeo -= sleep_time;
--			sleep_time = 1000000/HZ;
--		} else {
--			udelay(1);
--			cond_resched();
--			timeo--;
--		}
-+		cfi_udelay(1);
- 		spin_lock(chip->mutex);
--
--		while (chip->state != chip_state) {
--			/* Someone's suspended the operation: sleep */
--			DECLARE_WAITQUEUE(wait, current);
--			set_current_state(TASK_UNINTERRUPTIBLE);
--			add_wait_queue(&chip->wq, &wait);
--			spin_unlock(chip->mutex);
--			schedule();
--			remove_wait_queue(&chip->wq, &wait);
--			spin_lock(chip->mutex);
--		}
- 	}
- 
-+	if (!z) {
-+		if (!--(*chip_op_time))
-+			*chip_op_time = 1;
-+	} else if (z > 1)
-+		++(*chip_op_time);
-+
- 	/* Done and happy. */
-  	chip->state = FL_STATUS;
- 	return 0;
-@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
- #endif
- 
- #define WAIT_TIMEOUT(map, chip, adr, udelay) \
--	INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, udelay);
-+	({ int __udelay = (udelay); \
-+	   INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, &__udelay); })
- 
- 
- static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
-@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
- 				   adr, map_bankwidth(map),
--				   chip->word_write_time);
-+				   &chip->word_write_time);
- 	if (ret) {
- 		xip_enable(map, chip, adr);
- 		printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
- 				   initial_adr, initial_len,
--				   chip->buffer_write_time);
-+				   &chip->buffer_write_time);
- 	if (ret) {
- 		map_write(map, CMD(0x70), cmd_adr);
- 		chip->state = FL_STATUS;
-@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
- 
- 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
- 				   adr, len,
--				   chip->erase_time);
-+				   &chip->erase_time);
- 	if (ret) {
- 		map_write(map, CMD(0x70), adr);
- 		chip->state = FL_STATUS;
diff --git a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
deleted file mode 100644
index 01e27573bc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/010-disable_old_squashfs_compatibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,3 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += inode.o
--squashfs-y += squashfs2_0.o
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -24,6 +24,9 @@
- #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
- #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
- #endif
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+#endif
- 
- #ifdef SQUASHFS_TRACE
- #define TRACE(s, args...)	printk(KERN_NOTICE "SQUASHFS: "s, ## args)
diff --git a/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
deleted file mode 100644
index 4eba9095cf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -120,6 +120,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch
deleted file mode 100644
index e51005f308..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c	2010-03-15 15:52:04.000000000 +0000
-+++ b/arch/mips/kernel/machine_kexec.c	2010-03-29 12:10:37.000000000 +0100
-@@ -52,7 +52,7 @@
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch
deleted file mode 100644
index 3dfbec7923..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/024-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -831,6 +831,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -57,6 +57,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -67,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1277,6 +1279,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -110,6 +110,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -166,3 +167,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -28,6 +28,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -111,4 +112,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
deleted file mode 100644
index f5d9b0ca8a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -16,6 +16,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 
- 	if (!devname)
- 		return NULL;
-@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
- 
- 	/* Setup the MTD structure */
- 	/* make the name contain the block device in */
--	dev->mtd.name = kmalloc(sizeof("block2mtd: ") + strlen(devname),
--			GFP_KERNEL);
-+
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	dev->mtd.name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
-+
- 	if (!dev->mtd.name)
- 		goto devinit_err;
-+	
-+	strcpy(dev->mtd.name, mtdname);
- 
--	sprintf(dev->mtd.name, "block2mtd: %s", devname);
--
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
--
--	if (add_mtd_device(&dev->mtd)) {
-+	
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("blkmtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
deleted file mode 100644
index 5b882c6063..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
+++ /dev/null
@@ -1,951 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -47,6 +47,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -20,6 +20,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/squashfs_fs.h>
-+#include <linux/root_dev.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -39,7 +41,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *
- 	return 0;
- }
- 
-+static u_int32_t cur_offset = 0;
-+static int add_one_partition(struct mtd_info *master, const struct mtd_partition *part,
-+		int i, struct mtd_part **slp)
-+{
-+	struct mtd_part *slave;
-+
-+	/* allocate the partition structure */
-+	slave = kzalloc (sizeof(*slave), GFP_KERNEL);
-+	if (!slave) {
-+		printk ("memory allocation error while creating partitions for \"%s\"\n",
-+			master->name);
-+		del_mtd_partitions(master);
-+		return -ENOMEM;
-+	}
-+	list_add(&slave->list, &mtd_partitions);
-+
-+	/* set up the MTD object for this partition */
-+	slave->mtd.type = master->type;
-+	slave->mtd.flags = master->flags & ~part->mask_flags;
-+	slave->mtd.size = part->size;
-+	slave->mtd.writesize = master->writesize;
-+	slave->mtd.oobsize = master->oobsize;
-+	slave->mtd.oobavail = master->oobavail;
-+	slave->mtd.subpage_sft = master->subpage_sft;
-+
-+	slave->mtd.name = part->name;
-+	slave->mtd.owner = master->owner;
-+
-+	slave->mtd.read = part_read;
-+	slave->mtd.write = part_write;
-+
-+	if (master->panic_write)
-+		slave->mtd.panic_write = part_panic_write;
-+
-+	slave->mtd.refresh_device = part->refresh_partition;
-+
-+	if(master->point && master->unpoint){
-+		slave->mtd.point = part_point;
-+		slave->mtd.unpoint = part_unpoint;
-+	}
-+
-+	if (master->read_oob)
-+		slave->mtd.read_oob = part_read_oob;
-+	if (master->write_oob)
-+		slave->mtd.write_oob = part_write_oob;
-+	if(master->read_user_prot_reg)
-+		slave->mtd.read_user_prot_reg = part_read_user_prot_reg;
-+	if(master->read_fact_prot_reg)
-+		slave->mtd.read_fact_prot_reg = part_read_fact_prot_reg;
-+	if(master->write_user_prot_reg)
-+		slave->mtd.write_user_prot_reg = part_write_user_prot_reg;
-+	if(master->lock_user_prot_reg)
-+		slave->mtd.lock_user_prot_reg = part_lock_user_prot_reg;
-+	if(master->get_user_prot_info)
-+		slave->mtd.get_user_prot_info = part_get_user_prot_info;
-+	if(master->get_fact_prot_info)
-+		slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
-+	if (master->sync)
-+		slave->mtd.sync = part_sync;
-+	if (!i && master->suspend && master->resume) {
-+			slave->mtd.suspend = part_suspend;
-+			slave->mtd.resume = part_resume;
-+	}
-+	if (master->writev)
-+		slave->mtd.writev = part_writev;
-+	if (master->lock)
-+		slave->mtd.lock = part_lock;
-+	if (master->unlock)
-+		slave->mtd.unlock = part_unlock;
-+	if (master->block_isbad)
-+		slave->mtd.block_isbad = part_block_isbad;
-+	if (master->block_markbad)
-+		slave->mtd.block_markbad = part_block_markbad;
-+	slave->mtd.erase = part_erase;
-+	slave->master = master;
-+	slave->offset = part->offset;
-+	slave->index = i;
-+
-+	if (slave->offset == MTDPART_OFS_APPEND)
-+		slave->offset = cur_offset;
-+	if (slave->offset == MTDPART_OFS_NXTBLK) {
-+		slave->offset = cur_offset;
-+		if ((cur_offset % master->erasesize) != 0) {
-+			/* Round up to next erasesize */
-+			slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize;
-+			printk(KERN_NOTICE "Moving partition %d: "
-+			       "0x%08x -> 0x%08x\n", i,
-+			       cur_offset, slave->offset);
-+		}
-+	}
-+	if (slave->mtd.size == MTDPART_SIZ_FULL)
-+		slave->mtd.size = master->size - slave->offset;
-+	cur_offset = slave->offset + slave->mtd.size;
-+
-+	printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
-+		slave->offset + slave->mtd.size, slave->mtd.name);
-+
-+	/* let's do some sanity checks */
-+	if (slave->offset >= master->size) {
-+			/* let's register it anyway to preserve ordering */
-+		slave->offset = 0;
-+		slave->mtd.size = 0;
-+		printk ("mtd: partition \"%s\" is out of reach -- disabled\n",
-+			part->name);
-+	}
-+	if (slave->offset + slave->mtd.size > master->size) {
-+		slave->mtd.size = master->size - slave->offset;
-+		printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",
-+			part->name, master->name, slave->mtd.size);
-+	}
-+	if (master->numeraseregions>1) {
-+		/* Deal with variable erase size stuff */
-+		int i;
-+		struct mtd_erase_region_info *regions = master->eraseregions;
-+
-+		/* Find the first erase regions which is part of this partition. */
-+		for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++)
-+			;
-+
-+		for (i--; i < master->numeraseregions && slave->offset + slave->mtd.size > regions[i].offset; i++) {
-+			if (slave->mtd.erasesize < regions[i].erasesize) {
-+				slave->mtd.erasesize = regions[i].erasesize;
-+			}
-+		}
-+	} else {
-+		/* Single erase size */
-+		slave->mtd.erasesize = master->erasesize;
-+	}
-+
-+	if ((slave->mtd.flags & MTD_WRITEABLE) &&
-+	    (slave->offset % slave->mtd.erasesize)) {
-+		/* Doesn't start on a boundary of major erase size */
-+		/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */
-+		slave->mtd.flags &= ~MTD_WRITEABLE;
-+		printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
-+			part->name);
-+	}
-+	if ((slave->mtd.flags & MTD_WRITEABLE) &&
-+	    (slave->mtd.size % slave->mtd.erasesize)) {
-+		slave->mtd.flags &= ~MTD_WRITEABLE;
-+		printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
-+			part->name);
-+	}
-+
-+	slave->mtd.ecclayout = master->ecclayout;
-+	if (master->block_isbad) {
-+		uint32_t offs = 0;
-+
-+		while(offs < slave->mtd.size) {
-+			if (master->block_isbad(master,
-+						offs + slave->offset))
-+				slave->mtd.ecc_stats.badblocks++;
-+			offs += slave->mtd.erasesize;
-+		}
-+	}
-+
-+	if(part->mtdp)
-+	{	/* store the object pointer (caller may or may not register it */
-+		*part->mtdp = &slave->mtd;
-+		slave->registered = 0;
-+	}
-+	else
-+	{
-+		/* register our partition */
-+		add_mtd_device(&slave->mtd);
-+		slave->registered = 1;
-+	}
-+
-+	if (slp)
-+		*slp = slave;
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	char buf[512];
-+	struct squashfs_super_block *sb = (struct squashfs_super_block *) buf;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(*sb), &len, buf);
-+	if (ret || (len != sizeof(*sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (*((u32 *) buf) != SQUASHFS_MAGIC) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (sb->bytes_used <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) sb->bytes_used;
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, struct mtd_partition *part,
-+		int index)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%X, len=%X \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	ret = add_one_partition(master, dpart, index, &slave);
-+	if (ret)
-+		kfree(dpart);
-+	else if (slave)
-+		rpart->split = &slave->mtd;
-+
-+	return ret;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		/* find the index of the last partition */
-+		if (!list_empty(&mtd_partitions))
-+			index = list_first_entry(&mtd_partitions, struct mtd_part, list)->index + 1;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart, index);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			part->offset, part->mtd.size);
-+		strcpy(part->mtd.name, ROOTFS_SPLIT_NAME);
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		strcpy(part->mtd.name, ROOTFS_REMOVED_NAME);
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *
- 		       int nbparts)
- {
- 	struct mtd_part *slave;
--	u_int32_t cur_offset = 0;
--	int i;
-+	struct mtd_partition *part;
-+	int i, j, ret = 0;
- 
- 	printk (KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
--	for (i = 0; i < nbparts; i++) {
--
--		/* allocate the partition structure */
--		slave = kzalloc (sizeof(*slave), GFP_KERNEL);
--		if (!slave) {
--			printk ("memory allocation error while creating partitions for \"%s\"\n",
--				master->name);
--			del_mtd_partitions(master);
--			return -ENOMEM;
--		}
--		list_add(&slave->list, &mtd_partitions);
--
--		/* set up the MTD object for this partition */
--		slave->mtd.type = master->type;
--		slave->mtd.flags = master->flags & ~parts[i].mask_flags;
--		slave->mtd.size = parts[i].size;
--		slave->mtd.writesize = master->writesize;
--		slave->mtd.oobsize = master->oobsize;
--		slave->mtd.oobavail = master->oobavail;
--		slave->mtd.subpage_sft = master->subpage_sft;
--
--		slave->mtd.name = parts[i].name;
--		slave->mtd.owner = master->owner;
--
--		slave->mtd.read = part_read;
--		slave->mtd.write = part_write;
--
--		if (master->panic_write)
--			slave->mtd.panic_write = part_panic_write;
--
--		if(master->point && master->unpoint){
--			slave->mtd.point = part_point;
--			slave->mtd.unpoint = part_unpoint;
--		}
--
--		if (master->read_oob)
--			slave->mtd.read_oob = part_read_oob;
--		if (master->write_oob)
--			slave->mtd.write_oob = part_write_oob;
--		if(master->read_user_prot_reg)
--			slave->mtd.read_user_prot_reg = part_read_user_prot_reg;
--		if(master->read_fact_prot_reg)
--			slave->mtd.read_fact_prot_reg = part_read_fact_prot_reg;
--		if(master->write_user_prot_reg)
--			slave->mtd.write_user_prot_reg = part_write_user_prot_reg;
--		if(master->lock_user_prot_reg)
--			slave->mtd.lock_user_prot_reg = part_lock_user_prot_reg;
--		if(master->get_user_prot_info)
--			slave->mtd.get_user_prot_info = part_get_user_prot_info;
--		if(master->get_fact_prot_info)
--			slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
--		if (master->sync)
--			slave->mtd.sync = part_sync;
--		if (!i && master->suspend && master->resume) {
--				slave->mtd.suspend = part_suspend;
--				slave->mtd.resume = part_resume;
--		}
--		if (master->writev)
--			slave->mtd.writev = part_writev;
--		if (master->lock)
--			slave->mtd.lock = part_lock;
--		if (master->unlock)
--			slave->mtd.unlock = part_unlock;
--		if (master->block_isbad)
--			slave->mtd.block_isbad = part_block_isbad;
--		if (master->block_markbad)
--			slave->mtd.block_markbad = part_block_markbad;
--		slave->mtd.erase = part_erase;
--		slave->master = master;
--		slave->offset = parts[i].offset;
--		slave->index = i;
--
--		if (slave->offset == MTDPART_OFS_APPEND)
--			slave->offset = cur_offset;
--		if (slave->offset == MTDPART_OFS_NXTBLK) {
--			slave->offset = cur_offset;
--			if ((cur_offset % master->erasesize) != 0) {
--				/* Round up to next erasesize */
--				slave->offset = ((cur_offset / master->erasesize) + 1) * master->erasesize;
--				printk(KERN_NOTICE "Moving partition %d: "
--				       "0x%08x -> 0x%08x\n", i,
--				       cur_offset, slave->offset);
--			}
--		}
--		if (slave->mtd.size == MTDPART_SIZ_FULL)
--			slave->mtd.size = master->size - slave->offset;
--		cur_offset = slave->offset + slave->mtd.size;
--
--		printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset,
--			slave->offset + slave->mtd.size, slave->mtd.name);
--
--		/* let's do some sanity checks */
--		if (slave->offset >= master->size) {
--				/* let's register it anyway to preserve ordering */
--			slave->offset = 0;
--			slave->mtd.size = 0;
--			printk ("mtd: partition \"%s\" is out of reach -- disabled\n",
--				parts[i].name);
--		}
--		if (slave->offset + slave->mtd.size > master->size) {
--			slave->mtd.size = master->size - slave->offset;
--			printk ("mtd: partition \"%s\" extends beyond the end of device \"%s\" -- size truncated to %#x\n",
--				parts[i].name, master->name, slave->mtd.size);
--		}
--		if (master->numeraseregions>1) {
--			/* Deal with variable erase size stuff */
--			int i;
--			struct mtd_erase_region_info *regions = master->eraseregions;
--
--			/* Find the first erase regions which is part of this partition. */
--			for (i=0; i < master->numeraseregions && slave->offset >= regions[i].offset; i++)
--				;
--
--			for (i--; i < master->numeraseregions && slave->offset + slave->mtd.size > regions[i].offset; i++) {
--				if (slave->mtd.erasesize < regions[i].erasesize) {
--					slave->mtd.erasesize = regions[i].erasesize;
--				}
-+	for (i = 0, j = 0; i < nbparts; i++) {
-+		part = (struct mtd_partition *) &parts[i];
-+		ret = add_one_partition(master, part, j, &slave);
-+		if (ret)
-+			return ret;
-+		j++;
-+
-+		if (strcmp(part->name, "rootfs") == 0 && slave->registered) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
- 			}
--		} else {
--			/* Single erase size */
--			slave->mtd.erasesize = master->erasesize;
--		}
--
--		if ((slave->mtd.flags & MTD_WRITEABLE) &&
--		    (slave->offset % slave->mtd.erasesize)) {
--			/* Doesn't start on a boundary of major erase size */
--			/* FIXME: Let it be writable if it is on a boundary of _minor_ erase size though */
--			slave->mtd.flags &= ~MTD_WRITEABLE;
--			printk ("mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--				parts[i].name);
--		}
--		if ((slave->mtd.flags & MTD_WRITEABLE) &&
--		    (slave->mtd.size % slave->mtd.erasesize)) {
--			slave->mtd.flags &= ~MTD_WRITEABLE;
--			printk ("mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--				parts[i].name);
--		}
--
--		slave->mtd.ecclayout = master->ecclayout;
--		if (master->block_isbad) {
--			uint32_t offs = 0;
--
--			while(offs < slave->mtd.size) {
--				if (master->block_isbad(master,
--							offs + slave->offset))
--					slave->mtd.ecc_stats.badblocks++;
--				offs += slave->mtd.erasesize;
--			}
--		}
--
--		if(parts[i].mtdp)
--		{	/* store the object pointer (caller may or may not register it */
--			*parts[i].mtdp = &slave->mtd;
--			slave->registered = 0;
--		}
--		else
--		{
--			/* register our partition */
--			add_mtd_device(&slave->mtd);
--			slave->registered = 1;
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, part, j);
-+			if (ret == 0)
-+				j++;
-+#endif
- 		}
- 	}
- 
-@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info
- 	return ret;
- }
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+
- EXPORT_SYMBOL_GPL(parse_mtd_partitions);
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
- EXPORT_SYMBOL_GPL(register_mtd_parser);
- EXPORT_SYMBOL_GPL(deregister_mtd_parser);
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -34,6 +34,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_excl(dev->blkdev);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_excl(devname, O_RDWR, NULL);
-+	bdev = open_bdev_excl(dev->devname, O_RDWR, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_excl(dev->blkdev);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+	else {
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+	}
-+	if (bdev)
-+		close_bdev_excl(bdev);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	/* Setup the MTD structure */
- 	/* make the name contain the block device in */
-@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 	
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -17,6 +17,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -98,6 +98,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	u_int32_t flags;
-@@ -211,6 +212,9 @@ struct mtd_info {
- 	struct module *owner;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -36,6 +36,7 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	u_int32_t size;			/* partition size */
-@@ -43,6 +44,7 @@ struct mtd_partition {
- 	u_int32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
- 	struct mtd_info **mtdp;		/* pointer to store the MTD object */
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -52,6 +54,7 @@ struct mtd_partition {
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -95,6 +95,7 @@ struct otp_info {
- #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
- #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
- #define MTDFILEMODE		_IO('M', 19)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
deleted file mode 100644
index 784fba1b70..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 61f2806bda..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -573,6 +573,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			*priv;
- };
- 
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -70,7 +70,18 @@ static int __init plat_nand_probe(struct
- 	platform_set_drvdata(pdev, data);
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index 307f088604..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -124,6 +124,22 @@ struct nf_conn
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_XTABLES
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
- obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -208,6 +208,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -181,6 +181,12 @@ static int ct_seq_show(struct seq_file *
- 		return -ENOSPC;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		return -ENOSPC;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index 7b0dd43c0b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,34 +314,36 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+	
-+	return length;
-+}
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 	return length;
- }
- 
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,9 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
--
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
- 
-@@ -500,6 +501,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch b/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch
deleted file mode 100644
index 32251e37d7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/120-netfilter-headers-types.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
-Author: Patrick McHardy <kaber@trash.net>
-Date:   Wed May 21 14:08:38 2008 -0700
-
-    netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
-    
-    Greg Steuck <greg@nest.cx> points out that some of the netfilter
-    headers can't be used in userspace without including linux/types.h
-    first. The headers include their own linux/types.h include statements,
-    these are stripped by make headers-install because they are inside
-    #ifdef __KERNEL__ however. Move them out to fix this.
-    
-    Reported and Tested by Greg Steuck.
-    
-    Signed-off-by: Patrick McHardy <kaber@trash.net>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -3,7 +3,6 @@
- 
- #ifdef __KERNEL__
- #include <linux/init.h>
--#include <linux/types.h>
- #include <linux/skbuff.h>
- #include <linux/net.h>
- #include <linux/if.h>
-@@ -12,6 +11,7 @@
- #include <linux/wait.h>
- #include <linux/list.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- 
- /* Responses from hook functions. */
---- a/include/linux/netfilter_arp/arp_tables.h
-+++ b/include/linux/netfilter_arp/arp_tables.h
-@@ -11,11 +11,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in.h>
- #include <linux/if_arp.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_arp.h>
- 
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -17,11 +17,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in.h>
- #include <linux/ip.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_ipv4.h>
- 
---- a/include/linux/netfilter_ipv6/ip6_tables.h
-+++ b/include/linux/netfilter_ipv6/ip6_tables.h
-@@ -17,11 +17,11 @@
- 
- #ifdef __KERNEL__
- #include <linux/if.h>
--#include <linux/types.h>
- #include <linux/in6.h>
- #include <linux/ipv6.h>
- #include <linux/skbuff.h>
- #endif
-+#include <linux/types.h>
- #include <linux/compiler.h>
- #include <linux/netfilter_ipv6.h>
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
deleted file mode 100644
index 5fcef0a7d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
+++ /dev/null
@@ -1,914 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,474 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *	       of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *	       
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+struct imq_private {
-+	struct tasklet_struct tasklet;
-+	unsigned long tasklet_pending;
-+};
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	if (entry) {
-+		if (entry->indev)
-+			dev_put(entry->indev);
-+		if (entry->outdev)
-+			dev_put(entry->outdev);
-+		kfree(entry);
-+	}
-+}
-+
-+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	dev->trans_start = jiffies;
-+	nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
-+	return 0;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct imq_private *priv;
-+	struct sk_buff *skb2 = NULL;
-+	struct Qdisc *q;
-+	unsigned int index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	int ret = -1;
-+
-+	if (index > numdevs)
-+		return -1;
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (!dev) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			return -1;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+	}
-+
-+	priv = netdev_priv(dev);
-+	if (!(dev->flags & IFF_UP)) {
-+		entry->skb->imq_flags = 0;
-+		nf_reinject(entry, NF_ACCEPT);
-+		return 0;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	if (entry->skb->destructor) {
-+		skb2 = entry->skb;
-+		entry->skb = skb_clone(entry->skb, GFP_ATOMIC);
-+		if (!entry->skb)
-+			return -1;
-+	}
-+	entry->skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += entry->skb->len;
-+	dev->stats.rx_packets++;
-+
-+	spin_lock_bh(&dev->queue_lock);
-+	q = dev->qdisc;
-+	if (q->enqueue) {
-+		q->enqueue(skb_get(entry->skb), q);
-+		if (skb_shared(entry->skb)) {
-+			entry->skb->destructor = imq_skb_destructor;
-+			kfree_skb(entry->skb);
-+			ret = 0;
-+		}
-+	}
-+	if (!test_and_set_bit(1, &priv->tasklet_pending))
-+		tasklet_schedule(&priv->tasklet);
-+	spin_unlock_bh(&dev->queue_lock);
-+
-+	if (skb2)
-+		kfree_skb(ret ? entry->skb : skb2);
-+
-+	return ret;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static void qdisc_run_tasklet(unsigned long arg)
-+{
-+	struct net_device *dev = (struct net_device *)arg;
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	spin_lock(&dev->queue_lock);
-+	qdisc_run(dev);
-+	clear_bit(1, &priv->tasklet_pending);
-+	spin_unlock(&dev->queue_lock);
-+}
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	tasklet_kill(&priv->tasklet);
-+	netif_stop_queue(dev);
-+
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	struct imq_private *priv = netdev_priv(dev);
-+
-+	tasklet_init(&priv->tasklet, qdisc_run_tasklet, (unsigned long)dev);
-+	netif_start_queue(dev);
-+
-+	return 0;
-+}
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->hard_start_xmit    = imq_dev_xmit;
-+	dev->open		= imq_open;
-+	dev->get_stats		= imq_get_stats;
-+	dev->stop		= imq_close;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= sizeof(struct imq_private),
-+	.setup		= imq_setup,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	err = nf_register_queue_handler(PF_INET, &nfqh);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err3;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_queue_handler(PF_INET6, &nfqh);
-+	if (err)
-+		goto err4;
-+
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err5;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err6;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err6:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err5:
-+	nf_unregister_queue_handler(PF_INET6, &nfqh);
-+err4:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err3:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err2:
-+	nf_unregister_queue_handler(PF_INET, &nfqh);
-+err1:
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(sizeof(struct imq_private), "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (!numdevs || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+	nf_unregister_queue_handler(PF_INET6, &nfqh);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+	nf_unregister_queue_handler(PF_INET, &nfqh);
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -117,6 +117,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,9 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+#define IMQ_MAX_DEVS   16
-+
-+#define IMQ_F_IFMASK   0x7f
-+#define IMQ_F_ENQUEUE  0x80
-+
-+#endif /* _IMQ_H */
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,8 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+struct ipt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _IPT_IMQ_H */
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,8 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+struct ip6t_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _IP6T_IMQ_H */
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -296,6 +296,10 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	unsigned char			imq_flags;
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -95,6 +95,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf
- int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
- {
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
---- /dev/null
-+++ b/net/ipv4/netfilter/ipt_IMQ.c
-@@ -0,0 +1,69 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter_ipv4/ip_tables.h>
-+#include <linux/netfilter_ipv4/ipt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+			       const struct net_device *in,
-+			       const struct net_device *out,
-+			       unsigned int hooknum,
-+			       const struct xt_target *target,
-+			       const void *targinfo)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info *)targinfo;
-+
-+	pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const char *tablename,
-+			  const void *e,
-+			  const struct xt_target *target,
-+			  void *targinfo,
-+			  unsigned int hook_mask)
-+{
-+	struct ipt_imq_info *mr;
-+
-+	mr = (struct ipt_imq_info *)targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target ipt_imq_reg = {
-+	.name		= "IMQ",
-+	.family		= AF_INET,
-+	.target		= imq_target,
-+	.targetsize	= sizeof(struct ipt_imq_info),
-+	.checkentry	= imq_checkentry,
-+	.me		= THIS_MODULE,
-+	.table		= "mangle"
-+};
-+
-+static int __init init(void)
-+{
-+	return xt_register_target(&ipt_imq_reg);
-+}
-+
-+static void __exit fini(void)
-+{
-+	xt_unregister_target(&ipt_imq_reg);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -123,6 +123,17 @@ config IP_NF_FILTER
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config IP_NF_TARGET_IMQ
-+       tristate "IMQ target support"
-+       depends on IP_NF_MANGLE && IMQ
-+       help
-+         This option adds a `IMQ' target which is used to specify if and
-+         to which IMQ device packets should get enqueued/dequeued.
-+
-+	 For more information visit: http://www.linuximq.net/
-+
-+         To compile it as a module, choose M here.  If unsure, say N.
-+
- config IP_NF_TARGET_REJECT
- 	tristate "REJECT target support"
- 	depends on IP_NF_FILTER
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -51,6 +51,7 @@ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl
- obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
- obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
- obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
-+obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
- obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
- obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
---- /dev/null
-+++ b/net/ipv6/netfilter/ip6t_IMQ.c
-@@ -0,0 +1,69 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter_ipv6/ip6_tables.h>
-+#include <linux/netfilter_ipv6/ip6t_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+			       const struct net_device *in,
-+			       const struct net_device *out,
-+			       unsigned int hooknum,
-+			       const struct xt_target *target,
-+			       const void *targinfo)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info *)targinfo;
-+
-+	pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const char *tablename,
-+			  const void *entry,
-+			  const struct xt_target *target,
-+			  void *targinfo,
-+			  unsigned int hook_mask)
-+{
-+	struct ip6t_imq_info *mr;
-+
-+	mr = (struct ip6t_imq_info *)targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target ip6t_imq_reg = {
-+	.name           = "IMQ",
-+	.family		= AF_INET6,
-+	.target         = imq_target,
-+	.targetsize	= sizeof(struct ip6t_imq_info),
-+	.table		= "mangle",
-+	.checkentry     = imq_checkentry,
-+	.me             = THIS_MODULE
-+};
-+
-+static int __init init(void)
-+{
-+	return xt_register_target(&ip6t_imq_reg);
-+}
-+
-+static void __exit fini(void)
-+{
-+	xt_unregister_target(&ip6t_imq_reg);
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
---- a/net/ipv6/netfilter/Kconfig
-+++ b/net/ipv6/netfilter/Kconfig
-@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config IP6_NF_TARGET_IMQ
-+	tristate "IMQ target support"
-+	depends on IP6_NF_MANGLE && IMQ
-+	help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config IP6_NF_TARGET_HL
- 	tristate  'HL (hoplimit) target support'
- 	depends on IP6_NF_MANGLE
---- a/net/ipv6/netfilter/Makefile
-+++ b/net/ipv6/netfilter/Makefile
-@@ -6,6 +6,7 @@
- obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
- obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
- obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
-+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
- obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
- obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
- 
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -203,6 +203,7 @@ void __qdisc_run(struct net_device *dev)
- 
- 	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
- }
-+EXPORT_SYMBOL(__qdisc_run);
- 
- static void dev_watchdog(unsigned long arg)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
deleted file mode 100644
index efab40c2d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on NF_CONNTRACK && (IPV6 || IPV6=n)
-+	depends on NF_CONNTRACK
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -423,7 +423,7 @@ config NETFILTER_XT_TARGET_CONNSECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
-+	depends on NETFILTER_XTABLES
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
deleted file mode 100644
index 6d16488814..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1362 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	depends on NF_CONNTRACK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # generic X tables 
- obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -266,6 +266,11 @@ config NF_NAT_IRC
- 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,513 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->max_expected = max_outstanding;
-+		hlpr->timeout = setup_timeout;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
deleted file mode 100644
index 3f66e2c674..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
+++ /dev/null
@@ -1,797 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -162,8 +162,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *	
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -139,6 +139,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+	  
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,704 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+	
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP 
-+	
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+	
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb->dst;
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+
-+static int esfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_HEAD);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit - 1) {
-+		sch->qstats.requeues++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+	
-+	a = old_a = q->next[q->tail];
-+	
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+	
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+	
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+	
-+static int esfq_q_init(struct esfq_sched_data *q, struct rtattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = RTA_DATA(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+	
-+	if (opt && opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+		
-+	} else {
-+		struct tc_esfq_qopt *ctl = RTA_DATA(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+		
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+		
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+		
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+	
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+	
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+	
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct rtattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+	
-+	q->quantum = psched_mtu(sch->dev); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+	
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct rtattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+	
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(sch->dev); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+	
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb->tail;
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+rtattr_failure:
-+	skb_trim(skb, b - skb->data);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.requeue	=	esfq_requeue,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void) 
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
deleted file mode 100644
index eccdbe2f92..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+		
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
--
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+	
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
deleted file mode 100644
index 2196a494b2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -1539,7 +1539,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8169,
- 		.region		= 1,
- 		.align		= 0,
--		.intr_event	= SYSErr | LinkChg | RxOverflow |
-+		.intr_event	= LinkChg | RxOverflow |
- 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= 0
-@@ -1548,7 +1548,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8168,
- 		.region		= 2,
- 		.align		= 8,
--		.intr_event	= SYSErr | LinkChg | RxOverflow |
-+		.intr_event	= LinkChg | RxOverflow |
- 				  TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= RTL_FEATURE_MSI
-@@ -1557,7 +1557,7 @@ static const struct rtl_cfg_info {
- 		.hw_start	= rtl_hw_start_8101,
- 		.region		= 2,
- 		.align		= 8,
--		.intr_event	= SYSErr | LinkChg | RxOverflow | PCSTimeout |
-+		.intr_event	= LinkChg | RxOverflow | PCSTimeout |
- 				  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- 		.napi_event	= RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- 		.msi		= RTL_FEATURE_MSI
-@@ -2905,10 +2905,12 @@ static irqreturn_t rtl8169_interrupt(int
- 			break;
- 		}
- 
-+#if 0
- 		if (unlikely(status & SYSErr)) {
- 			rtl8169_pcierr_interrupt(dev);
- 			break;
- 		}
-+#endif
- 
- 		if (status & LinkChg)
- 			rtl8169_check_link_status(dev, tp, ioaddr);
diff --git a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
deleted file mode 100644
index 9d76d01595..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
+++ /dev/null
@@ -1,7776 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1449,6 +1449,9 @@ config VXFS_FS
- 	  To compile this as a module, choose M here: the module will be
- 	  called freevxfs.  If unsure, say N.
- 
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
- config MINIX_FS
- 	tristate "Minix file system support"
- 	depends on BLOCK
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_MSDOS_FS)		+= msdos/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
diff --git a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6faa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
deleted file mode 100644
index f91db03bd7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -27,7 +27,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+	
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
deleted file mode 100644
index d215d12077..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -9,7 +9,7 @@ config SND_PCM
- 	depends on SND
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 	depends on SND
- 
- config SND_RAWMIDI
diff --git a/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch b/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
deleted file mode 100644
index 0a68134f7a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/30-fix_conflicting_getline.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/scripts/unifdef.c
-+++ b/scripts/unifdef.c
-@@ -206,7 +206,7 @@ static void             done(void);
- static void             error(const char *);
- static int              findsym(const char *);
- static void             flushline(bool);
--static Linetype         getline(void);
-+static Linetype         get_line(void);
- static Linetype         ifeval(const char **);
- static void             ignoreoff(void);
- static void             ignoreon(void);
-@@ -512,7 +512,7 @@ process(void)
- 
- 	for (;;) {
- 		linenum++;
--		lineval = getline();
-+		lineval = get_line();
- 		trans_table[ifstate[depth]][lineval]();
- 		debug("process %s -> %s depth %d",
- 		    linetype_name[lineval],
-@@ -526,7 +526,7 @@ process(void)
-  * help from skipcomment().
-  */
- static Linetype
--getline(void)
-+get_line(void)
- {
- 	const char *cp;
- 	int cursym;
diff --git a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
deleted file mode 100644
index 7208dde0ef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
- 	  load average.
- 	  If unsure, say Y.
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
- obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
- obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch b/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
deleted file mode 100644
index d20eb5eae8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -185,4 +185,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_DEFAULT_ON
-+	tristate "LED Default ON Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be initialised in the ON state.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -27,3 +27,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledt
- obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
- obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
deleted file mode 100644
index 86c26346a8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/drivers/rtc/rtc-ds1672.c
-+++ b/drivers/rtc/rtc-ds1672.c
-@@ -13,10 +13,10 @@
- #include <linux/i2c.h>
- #include <linux/rtc.h>
- 
--#define DRV_VERSION "0.3"
-+#define DRV_VERSION "0.4"
- 
--/* Addresses to scan: none. This chip cannot be detected. */
--static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-+/* Addresses to scan: 0x68 */
-+static const unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
- 
- /* Insmod parameters */
- I2C_CLIENT_INSMOD;
diff --git a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
deleted file mode 100644
index 46ca987e53..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -197,4 +197,20 @@ config HP_SDC_RTC
- 	  Say Y here if you want to support the built-in real time clock
- 	  of the HP SDC controller.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK)		+= yealink.
- obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
- obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
deleted file mode 100644
index de8b57adf7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -955,6 +955,13 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
- config GPIO_VR41XX
- 	tristate "NEC VR4100 series General-purpose I/O Unit support"
- 	depends on CPU_VR41XX
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch
deleted file mode 100644
index cef6ea592e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -421,6 +421,7 @@ config FS_POSIX_ACL
- 
- source "fs/xfs/Kconfig"
- source "fs/gfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- config OCFS2_FS
- 	tristate "OCFS2 file system support"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS)		+= hppfs/
- obj-$(CONFIG_DEBUG_FS)		+= debugfs/
- obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch
deleted file mode 100644
index c127336346..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
-+#else
- static void yaffs_read_inode(struct inode *inode);
-+#endif
-+
- 
- static void yaffs_put_inode(struct inode *inode);
- static void yaffs_delete_inode(struct inode *);
-@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_
- 
- static struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
- 	.read_inode = yaffs_read_inode,
-+#endif
- 	.put_inode = yaffs_put_inode,
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
-@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup
- 	T(YAFFS_TRACE_OS,
- 	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+	inode = yaffs_iget(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
-+#else
- 	inode = iget(sb, obj->objectId);
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
- 	/* NB You can't be holding grossLock or deadlock will happen! */
-+#endif
- 
- 	return inode;
- }
-@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl
- }
- 
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+	struct inode *inode;
-+
-+	T(YAFFS_TRACE_OS,
-+	  (KERN_DEBUG "yaffs_iget for %lu\n", ino));
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
-+
-+	yaffs_GrossLock(dev);
-+
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#else
- static void yaffs_read_inode(struct inode *inode)
- {
- 	/* NB This is called as a side effect of other functions, but
-@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod
- 
- 	yaffs_GrossUnlock(dev);
- }
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */
- 
- static LIST_HEAD(yaffs_dev_list);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
deleted file mode 100644
index c4ef46529c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+	
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}	
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
deleted file mode 100644
index a47129171f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
+++ /dev/null
@@ -1,102433 +0,0 @@
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -930,6 +930,8 @@ and is between 256 and 4096 characters. 
- 
- 	l2cr=		[PPC]
- 
-+	l3cr=		[PPC]
-+
- 	lapic		[X86-32,APIC] Enable the local APIC even if BIOS
- 			disabled it.
- 
---- a/Documentation/powerpc/booting-without-of.txt
-+++ b/Documentation/powerpc/booting-without-of.txt
-@@ -59,12 +59,39 @@ Table of Contents
-       p) Freescale Synchronous Serial Interface
- 	  q) USB EHCI controllers
- 
--  VII - Specifying interrupt information for devices
-+  VII - Marvell Discovery mv64[345]6x System Controller chips
-+    1) The /system-controller node
-+    2) Child nodes of /system-controller
-+      a) Marvell Discovery MDIO bus
-+      b) Marvell Discovery ethernet controller
-+      c) Marvell Discovery PHY nodes
-+      d) Marvell Discovery SDMA nodes
-+      e) Marvell Discovery BRG nodes
-+      f) Marvell Discovery CUNIT nodes
-+      g) Marvell Discovery MPSCROUTING nodes
-+      h) Marvell Discovery MPSCINTR nodes
-+      i) Marvell Discovery MPSC nodes
-+      j) Marvell Discovery Watch Dog Timer nodes
-+      k) Marvell Discovery I2C nodes
-+      l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes
-+      m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes
-+      n) Marvell Discovery GPP (General Purpose Pins) nodes
-+      o) Marvell Discovery PCI host bridge node
-+      p) Marvell Discovery CPU Error nodes
-+      q) Marvell Discovery SRAM Controller nodes
-+      r) Marvell Discovery PCI Error Handler nodes
-+      s) Marvell Discovery Memory Controller nodes
-+
-+  VIII - Specifying interrupt information for devices
-     1) interrupts property
-     2) interrupt-parent property
-     3) OpenPIC Interrupt Controllers
-     4) ISA Interrupt Controllers
- 
-+  VIII - Specifying GPIO information for devices
-+    1) gpios property
-+    2) gpio-controller nodes
-+
-   Appendix A - Sample SOC node for MPC8540
- 
- 
-@@ -1269,10 +1296,6 @@ platforms are moved over to use the flat
- 
-   Recommended properties:
- 
--    - linux,network-index : This is the intended "index" of this
--      network device.  This is used by the bootwrapper to interpret
--      MAC addresses passed by the firmware when no information other
--      than indices is available to associate an address with a device.
-     - phy-connection-type : a string naming the controller/PHY interface type,
-       i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
-       "tbi", or "rtbi".  This property is only really needed if the connection
-@@ -1622,8 +1645,7 @@ platforms are moved over to use the flat
-    - device_type : should be "network", "hldc", "uart", "transparent"
-      "bisync", "atm", or "serial".
-    - compatible : could be "ucc_geth" or "fsl_atm" and so on.
--   - model : should be "UCC".
--   - device-id : the ucc number(1-8), corresponding to UCCx in UM.
-+   - cell-index : the ucc number(1-8), corresponding to UCCx in UM.
-    - reg : Offset and length of the register set for the device
-    - interrupts : <a b> where a is the interrupt number and b is a
-      field that represents an encoding of the sense and level
-@@ -1667,10 +1689,6 @@ platforms are moved over to use the flat
-    - phy-handle : The phandle for the PHY connected to this controller.
- 
-    Recommended properties:
--   - linux,network-index : This is the intended "index" of this
--     network device.  This is used by the bootwrapper to interpret
--     MAC addresses passed by the firmware when no information other
--     than indices is available to associate an address with a device.
-    - phy-connection-type : a string naming the controller/PHY interface type,
-      i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
-      Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
-@@ -1680,8 +1698,7 @@ platforms are moved over to use the flat
- 	ucc@2000 {
- 		device_type = "network";
- 		compatible = "ucc_geth";
--		model = "UCC";
--		device-id = <1>;
-+		cell-index = <1>;
- 		reg = <2000 200>;
- 		interrupts = <a0 0>;
- 		interrupt-parent = <700>;
-@@ -1995,7 +2012,6 @@ platforms are moved over to use the flat
- 		interrupts = <20 8>;
- 		interrupt-parent = <&PIC>;
- 		phy-handle = <&PHY0>;
--		linux,network-index = <0>;
- 		fsl,cpm-command = <12000300>;
- 	};
- 
-@@ -2217,12 +2233,6 @@ platforms are moved over to use the flat
- 			  EMAC, that is the content of the current (bogus) "phy-port"
- 			  property.
- 
--    Recommended properties:
--    - linux,network-index : This is the intended "index" of this
--      network device.  This is used by the bootwrapper to interpret
--      MAC addresses passed by the firmware when no information other
--      than indices is available to associate an address with a device.
--
-     Optional properties:
-     - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,
- 			  a search is performed.
-@@ -2246,7 +2256,6 @@ platforms are moved over to use the flat
-     Example:
- 
- 	EMAC0: ethernet@40000800 {
--		linux,network-index = <0>;
- 		device_type = "network";
- 		compatible = "ibm,emac-440gp", "ibm,emac";
- 		interrupt-parent = <&UIC1>;
-@@ -2817,9 +2826,528 @@ platforms are moved over to use the flat
- 	   };
- 
- 
--   More devices will be defined as this spec matures.
-+VII - Marvell Discovery mv64[345]6x System Controller chips
-+===========================================================
-+
-+The Marvell mv64[345]60 series of system controller chips contain
-+many of the peripherals needed to implement a complete computer
-+system.  In this section, we define device tree nodes to describe
-+the system controller chip itself and each of the peripherals
-+which it contains.  Compatible string values for each node are
-+prefixed with the string "marvell,", for Marvell Technology Group Ltd.
-+
-+1) The /system-controller node
-+
-+  This node is used to represent the system-controller and must be
-+  present when the system uses a system contller chip. The top-level
-+  system-controller node contains information that is global to all
-+  devices within the system controller chip. The node name begins
-+  with "system-controller" followed by the unit address, which is
-+  the base address of the memory-mapped register set for the system
-+  controller chip.
-+
-+  Required properties:
-+
-+    - ranges : Describes the translation of system controller addresses
-+      for memory mapped registers.
-+    - clock-frequency: Contains the main clock frequency for the system
-+      controller chip.
-+    - reg : This property defines the address and size of the
-+      memory-mapped registers contained within the system controller
-+      chip.  The address specified in the "reg" property should match
-+      the unit address of the system-controller node.
-+    - #address-cells : Address representation for system controller
-+      devices.  This field represents the number of cells needed to
-+      represent the address of the memory-mapped registers of devices
-+      within the system controller chip.
-+    - #size-cells : Size representation for for the memory-mapped
-+      registers within the system controller chip.
-+    - #interrupt-cells : Defines the width of cells used to represent
-+      interrupts.
-+
-+  Optional properties:
-+
-+    - model : The specific model of the system controller chip.  Such
-+      as, "mv64360", "mv64460", or "mv64560".
-+    - compatible : A string identifying the compatibility identifiers
-+      of the system controller chip.
-+
-+  The system-controller node contains child nodes for each system
-+  controller device that the platform uses.  Nodes should not be created
-+  for devices which exist on the system controller chip but are not used
-+
-+  Example Marvell Discovery mv64360 system-controller node:
-+
-+    system-controller@f1000000 { /* Marvell Discovery mv64360 */
-+	    #address-cells = <1>;
-+	    #size-cells = <1>;
-+	    model = "mv64360";                      /* Default */
-+	    compatible = "marvell,mv64360";
-+	    clock-frequency = <133333333>;
-+	    reg = <0xf1000000 0x10000>;
-+	    virtual-reg = <0xf1000000>;
-+	    ranges = <0x88000000 0x88000000 0x1000000 /* PCI 0 I/O Space */
-+		    0x80000000 0x80000000 0x8000000 /* PCI 0 MEM Space */
-+		    0xa0000000 0xa0000000 0x4000000 /* User FLASH */
-+		    0x00000000 0xf1000000 0x0010000 /* Bridge's regs */
-+		    0xf2000000 0xf2000000 0x0040000>;/* Integrated SRAM */
-+
-+	    [ child node definitions... ]
-+    }
-+
-+2) Child nodes of /system-controller
-+
-+   a) Marvell Discovery MDIO bus
-+
-+   The MDIO is a bus to which the PHY devices are connected.  For each
-+   device that exists on this bus, a child node should be created.  See
-+   the definition of the PHY node below for an example of how to define
-+   a PHY.
-+
-+   Required properties:
-+     - #address-cells : Should be <1>
-+     - #size-cells : Should be <0>
-+     - device_type : Should be "mdio"
-+     - compatible : Should be "marvell,mv64360-mdio"
-+
-+   Example:
-+
-+     mdio {
-+	     #address-cells = <1>;
-+	     #size-cells = <0>;
-+	     device_type = "mdio";
-+	     compatible = "marvell,mv64360-mdio";
-+
-+	     ethernet-phy@0 {
-+		     ......
-+	     };
-+     };
-+
-+
-+   b) Marvell Discovery ethernet controller
-+
-+   The Discover ethernet controller is described with two levels
-+   of nodes.  The first level describes an ethernet silicon block
-+   and the second level describes up to 3 ethernet nodes within
-+   that block.  The reason for the multiple levels is that the
-+   registers for the node are interleaved within a single set
-+   of registers.  The "ethernet-block" level describes the
-+   shared register set, and the "ethernet" nodes describe ethernet
-+   port-specific properties.
-+
-+   Ethernet block node
-+
-+   Required properties:
-+     - #address-cells : <1>
-+     - #size-cells : <0>
-+     - compatible : "marvell,mv64360-eth-block"
-+     - reg : Offset and length of the register set for this block
-+
-+   Example Discovery Ethernet block node:
-+     ethernet-block@2000 {
-+	     #address-cells = <1>;
-+	     #size-cells = <0>;
-+	     compatible = "marvell,mv64360-eth-block";
-+	     reg = <0x2000 0x2000>;
-+	     ethernet@0 {
-+		     .......
-+	     };
-+     };
-+
-+   Ethernet port node
-+
-+   Required properties:
-+     - device_type : Should be "network".
-+     - compatible : Should be "marvell,mv64360-eth".
-+     - reg : Should be <0>, <1>, or <2>, according to which registers
-+       within the silicon block the device uses.
-+     - interrupts : <a> where a is the interrupt number for the port.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+     - phy : the phandle for the PHY connected to this ethernet
-+       controller.
-+     - local-mac-address : 6 bytes, MAC address
-+
-+   Example Discovery Ethernet port node:
-+     ethernet@0 {
-+	     device_type = "network";
-+	     compatible = "marvell,mv64360-eth";
-+	     reg = <0>;
-+	     interrupts = <32>;
-+	     interrupt-parent = <&PIC>;
-+	     phy = <&PHY0>;
-+	     local-mac-address = [ 00 00 00 00 00 00 ];
-+     };
-+
-+
-+
-+   c) Marvell Discovery PHY nodes
-+
-+   Required properties:
-+     - device_type : Should be "ethernet-phy"
-+     - interrupts : <a> where a is the interrupt number for this phy.
-+     - interrupt-parent : the phandle for the interrupt controller that
-+       services interrupts for this device.
-+     - reg : The ID number for the phy, usually a small integer
-+
-+   Example Discovery PHY node:
-+     ethernet-phy@1 {
-+	     device_type = "ethernet-phy";
-+	     compatible = "broadcom,bcm5421";
-+	     interrupts = <76>;      /* GPP 12 */
-+	     interrupt-parent = <&PIC>;
-+	     reg = <1>;
-+     };
-+
-+
-+   d) Marvell Discovery SDMA nodes
-+
-+   Represent DMA hardware associated with the MPSC (multiprotocol
-+   serial controllers).
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-sdma"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : <a> where a is the interrupt number for the DMA
-+       device.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery SDMA node:
-+     sdma@4000 {
-+	     compatible = "marvell,mv64360-sdma";
-+	     reg = <0x4000 0xc18>;
-+	     virtual-reg = <0xf1004000>;
-+	     interrupts = <36>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   e) Marvell Discovery BRG nodes
-+
-+   Represent baud rate generator hardware associated with the MPSC
-+   (multiprotocol serial controllers).
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-brg"
-+     - reg : Offset and length of the register set for this device
-+     - clock-src : A value from 0 to 15 which selects the clock
-+       source for the baud rate generator.  This value corresponds
-+       to the CLKS value in the BRGx configuration register.  See
-+       the mv64x60 User's Manual.
-+     - clock-frequence : The frequency (in Hz) of the baud rate
-+       generator's input clock.
-+     - current-speed : The current speed setting (presumably by
-+       firmware) of the baud rate generator.
-+
-+   Example Discovery BRG node:
-+     brg@b200 {
-+	     compatible = "marvell,mv64360-brg";
-+	     reg = <0xb200 0x8>;
-+	     clock-src = <8>;
-+	     clock-frequency = <133333333>;
-+	     current-speed = <9600>;
-+     };
-+
-+
-+   f) Marvell Discovery CUNIT nodes
-+
-+   Represent the Serial Communications Unit device hardware.
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery CUNIT node:
-+     cunit@f200 {
-+	     reg = <0xf200 0x200>;
-+     };
-+
-+
-+   g) Marvell Discovery MPSCROUTING nodes
-+
-+   Represent the Discovery's MPSC routing hardware
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery CUNIT node:
-+     mpscrouting@b500 {
-+	     reg = <0xb400 0xc>;
-+     };
-+
-+
-+   h) Marvell Discovery MPSCINTR nodes
-+
-+   Represent the Discovery's MPSC DMA interrupt hardware registers
-+   (SDMA cause and mask registers).
-+
-+   Required properties:
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery MPSCINTR node:
-+     mpsintr@b800 {
-+	     reg = <0xb800 0x100>;
-+     };
-+
-+
-+   i) Marvell Discovery MPSC nodes
-+
-+   Represent the Discovery's MPSC (Multiprotocol Serial Controller)
-+   serial port.
-+
-+   Required properties:
-+     - device_type : "serial"
-+     - compatible : "marvell,mv64360-mpsc"
-+     - reg : Offset and length of the register set for this device
-+     - sdma : the phandle for the SDMA node used by this port
-+     - brg : the phandle for the BRG node used by this port
-+     - cunit : the phandle for the CUNIT node used by this port
-+     - mpscrouting : the phandle for the MPSCROUTING node used by this port
-+     - mpscintr : the phandle for the MPSCINTR node used by this port
-+     - cell-index : the hardware index of this cell in the MPSC core
-+     - max_idle : value needed for MPSC CHR3 (Maximum Frame Length)
-+       register
-+     - interrupts : <a> where a is the interrupt number for the MPSC.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery MPSCINTR node:
-+     mpsc@8000 {
-+	     device_type = "serial";
-+	     compatible = "marvell,mv64360-mpsc";
-+	     reg = <0x8000 0x38>;
-+	     virtual-reg = <0xf1008000>;
-+	     sdma = <&SDMA0>;
-+	     brg = <&BRG0>;
-+	     cunit = <&CUNIT>;
-+	     mpscrouting = <&MPSCROUTING>;
-+	     mpscintr = <&MPSCINTR>;
-+	     cell-index = <0>;
-+	     max_idle = <40>;
-+	     interrupts = <40>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
- 
--VII - Specifying interrupt information for devices
-+   j) Marvell Discovery Watch Dog Timer nodes
-+
-+   Represent the Discovery's watchdog timer hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-wdt"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery Watch Dog Timer node:
-+     wdt@b410 {
-+	     compatible = "marvell,mv64360-wdt";
-+	     reg = <0xb410 0x8>;
-+     };
-+
-+
-+   k) Marvell Discovery I2C nodes
-+
-+   Represent the Discovery's I2C hardware
-+
-+   Required properties:
-+     - device_type : "i2c"
-+     - compatible : "marvell,mv64360-i2c"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : <a> where a is the interrupt number for the I2C.
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery I2C node:
-+	     compatible = "marvell,mv64360-i2c";
-+	     reg = <0xc000 0x20>;
-+	     virtual-reg = <0xf100c000>;
-+	     interrupts = <37>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes
-+
-+   Represent the Discovery's PIC hardware
-+
-+   Required properties:
-+     - #interrupt-cells : <1>
-+     - #address-cells : <0>
-+     - compatible : "marvell,mv64360-pic"
-+     - reg : Offset and length of the register set for this device
-+     - interrupt-controller
-+
-+   Example Discovery PIC node:
-+     pic {
-+	     #interrupt-cells = <1>;
-+	     #address-cells = <0>;
-+	     compatible = "marvell,mv64360-pic";
-+	     reg = <0x0 0x88>;
-+	     interrupt-controller;
-+     };
-+
-+
-+   m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes
-+
-+   Represent the Discovery's MPP hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-mpp"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery MPP node:
-+     mpp@f000 {
-+	     compatible = "marvell,mv64360-mpp";
-+	     reg = <0xf000 0x10>;
-+     };
-+
-+
-+   n) Marvell Discovery GPP (General Purpose Pins) nodes
-+
-+   Represent the Discovery's GPP hardware
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-gpp"
-+     - reg : Offset and length of the register set for this device
-+
-+   Example Discovery GPP node:
-+     gpp@f000 {
-+	     compatible = "marvell,mv64360-gpp";
-+	     reg = <0xf100 0x20>;
-+     };
-+
-+
-+   o) Marvell Discovery PCI host bridge node
-+
-+   Represents the Discovery's PCI host bridge device.  The properties
-+   for this node conform to Rev 2.1 of the PCI Bus Binding to IEEE
-+   1275-1994.  A typical value for the compatible property is
-+   "marvell,mv64360-pci".
-+
-+   Example Discovery PCI host bridge node
-+     pci@80000000 {
-+	     #address-cells = <3>;
-+	     #size-cells = <2>;
-+	     #interrupt-cells = <1>;
-+	     device_type = "pci";
-+	     compatible = "marvell,mv64360-pci";
-+	     reg = <0xcf8 0x8>;
-+	     ranges = <0x01000000 0x0        0x0
-+			     0x88000000 0x0 0x01000000
-+		       0x02000000 0x0 0x80000000
-+			     0x80000000 0x0 0x08000000>;
-+	     bus-range = <0 255>;
-+	     clock-frequency = <66000000>;
-+	     interrupt-parent = <&PIC>;
-+	     interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-+	     interrupt-map = <
-+		     /* IDSEL 0x0a */
-+		     0x5000 0 0 1 &PIC 80
-+		     0x5000 0 0 2 &PIC 81
-+		     0x5000 0 0 3 &PIC 91
-+		     0x5000 0 0 4 &PIC 93
-+
-+		     /* IDSEL 0x0b */
-+		     0x5800 0 0 1 &PIC 91
-+		     0x5800 0 0 2 &PIC 93
-+		     0x5800 0 0 3 &PIC 80
-+		     0x5800 0 0 4 &PIC 81
-+
-+		     /* IDSEL 0x0c */
-+		     0x6000 0 0 1 &PIC 91
-+		     0x6000 0 0 2 &PIC 93
-+		     0x6000 0 0 3 &PIC 80
-+		     0x6000 0 0 4 &PIC 81
-+
-+		     /* IDSEL 0x0d */
-+		     0x6800 0 0 1 &PIC 93
-+		     0x6800 0 0 2 &PIC 80
-+		     0x6800 0 0 3 &PIC 81
-+		     0x6800 0 0 4 &PIC 91
-+	     >;
-+     };
-+
-+
-+   p) Marvell Discovery CPU Error nodes
-+
-+   Represent the Discovery's CPU error handler device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-cpu-error"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery CPU Error node:
-+     cpu-error@0070 {
-+	     compatible = "marvell,mv64360-cpu-error";
-+	     reg = <0x70 0x10 0x128 0x28>;
-+	     interrupts = <3>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   q) Marvell Discovery SRAM Controller nodes
-+
-+   Represent the Discovery's SRAM controller device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-sram-ctrl"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery SRAM Controller node:
-+     sram-ctrl@0380 {
-+	     compatible = "marvell,mv64360-sram-ctrl";
-+	     reg = <0x380 0x80>;
-+	     interrupts = <13>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   r) Marvell Discovery PCI Error Handler nodes
-+
-+   Represent the Discovery's PCI error handler device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-pci-error"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery PCI Error Handler node:
-+     pci-error@1d40 {
-+	     compatible = "marvell,mv64360-pci-error";
-+	     reg = <0x1d40 0x40 0xc28 0x4>;
-+	     interrupts = <12>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+   s) Marvell Discovery Memory Controller nodes
-+
-+   Represent the Discovery's memory controller device.
-+
-+   Required properties:
-+     - compatible : "marvell,mv64360-mem-ctrl"
-+     - reg : Offset and length of the register set for this device
-+     - interrupts : the interrupt number for this device
-+     - interrupt-parent : the phandle for the interrupt controller
-+       that services interrupts for this device.
-+
-+   Example Discovery Memory Controller node:
-+     mem-ctrl@1400 {
-+	     compatible = "marvell,mv64360-mem-ctrl";
-+	     reg = <0x1400 0x60>;
-+	     interrupts = <17>;
-+	     interrupt-parent = <&PIC>;
-+     };
-+
-+
-+VIII - Specifying interrupt information for devices
- ===================================================
- 
- The device tree represents the busses and devices of a hardware
-@@ -2905,6 +3433,54 @@ encodings listed below:
- 	2 =  high to low edge sensitive type enabled
- 	3 =  low to high edge sensitive type enabled
- 
-+VIII - Specifying GPIO information for devices
-+==============================================
-+
-+1) gpios property
-+-----------------
-+
-+Nodes that makes use of GPIOs should define them using `gpios' property,
-+format of which is: <&gpio-controller1-phandle gpio1-specifier
-+		     &gpio-controller2-phandle gpio2-specifier
-+		     0 /* holes are permitted, means no GPIO 3 */
-+		     &gpio-controller4-phandle gpio4-specifier
-+		     ...>;
-+
-+Note that gpio-specifier length is controller dependent.
-+
-+gpio-specifier may encode: bank, pin position inside the bank,
-+whether pin is open-drain and whether pin is logically inverted.
-+
-+Example of the node using GPIOs:
-+
-+	node {
-+		gpios = <&qe_pio_e 18 0>;
-+	};
-+
-+In this example gpio-specifier is "18 0" and encodes GPIO pin number,
-+and empty GPIO flags as accepted by the "qe_pio_e" gpio-controller.
-+
-+2) gpio-controller nodes
-+------------------------
-+
-+Every GPIO controller node must have #gpio-cells property defined,
-+this information will be used to translate gpio-specifiers.
-+
-+Example of two SOC GPIO banks defined as gpio-controller nodes:
-+
-+	qe_pio_a: gpio-controller@1400 {
-+		#gpio-cells = <2>;
-+		compatible = "fsl,qe-pario-bank-a", "fsl,qe-pario-bank";
-+		reg = <0x1400 0x18>;
-+		gpio-controller;
-+	};
-+
-+	qe_pio_e: gpio-controller@1460 {
-+		#gpio-cells = <2>;
-+		compatible = "fsl,qe-pario-bank-e", "fsl,qe-pario-bank";
-+		reg = <0x1460 0x18>;
-+		gpio-controller;
-+	};
- 
- Appendix A - Sample SOC node for MPC8540
- ========================================
---- /dev/null
-+++ b/Documentation/powerpc/phyp-assisted-dump.txt
-@@ -0,0 +1,127 @@
-+
-+                   Hypervisor-Assisted Dump
-+                   ------------------------
-+                       November 2007
-+
-+The goal of hypervisor-assisted dump is to enable the dump of
-+a crashed system, and to do so from a fully-reset system, and
-+to minimize the total elapsed time until the system is back
-+in production use.
-+
-+As compared to kdump or other strategies, hypervisor-assisted
-+dump offers several strong, practical advantages:
-+
-+-- Unlike kdump, the system has been reset, and loaded
-+   with a fresh copy of the kernel.  In particular,
-+   PCI and I/O devices have been reinitialized and are
-+   in a clean, consistent state.
-+-- As the dump is performed, the dumped memory becomes
-+   immediately available to the system for normal use.
-+-- After the dump is completed, no further reboots are
-+   required; the system will be fully usable, and running
-+   in it's normal, production mode on it normal kernel.
-+
-+The above can only be accomplished by coordination with,
-+and assistance from the hypervisor. The procedure is
-+as follows:
-+
-+-- When a system crashes, the hypervisor will save
-+   the low 256MB of RAM to a previously registered
-+   save region. It will also save system state, system
-+   registers, and hardware PTE's.
-+
-+-- After the low 256MB area has been saved, the
-+   hypervisor will reset PCI and other hardware state.
-+   It will *not* clear RAM. It will then launch the
-+   bootloader, as normal.
-+
-+-- The freshly booted kernel will notice that there
-+   is a new node (ibm,dump-kernel) in the device tree,
-+   indicating that there is crash data available from
-+   a previous boot. It will boot into only 256MB of RAM,
-+   reserving the rest of system memory.
-+
-+-- Userspace tools will parse /sys/kernel/release_region
-+   and read /proc/vmcore to obtain the contents of memory,
-+   which holds the previous crashed kernel. The userspace
-+   tools may copy this info to disk, or network, nas, san,
-+   iscsi, etc. as desired.
-+
-+   For Example: the values in /sys/kernel/release-region
-+   would look something like this (address-range pairs).
-+   CPU:0x177fee000-0x10000: HPTE:0x177ffe020-0x1000: /
-+   DUMP:0x177fff020-0x10000000, 0x10000000-0x16F1D370A
-+
-+-- As the userspace tools complete saving a portion of
-+   dump, they echo an offset and size to
-+   /sys/kernel/release_region to release the reserved
-+   memory back to general use.
-+
-+   An example of this is:
-+     "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
-+   which will release 256MB at the 1GB boundary.
-+
-+Please note that the hypervisor-assisted dump feature
-+is only available on Power6-based systems with recent
-+firmware versions.
-+
-+Implementation details:
-+----------------------
-+
-+During boot, a check is made to see if firmware supports
-+this feature on this particular machine. If it does, then
-+we check to see if a active dump is waiting for us. If yes
-+then everything but 256 MB of RAM is reserved during early
-+boot. This area is released once we collect a dump from user
-+land scripts that are run. If there is dump data, then
-+the /sys/kernel/release_region file is created, and
-+the reserved memory is held.
-+
-+If there is no waiting dump data, then only the highest
-+256MB of the ram is reserved as a scratch area. This area
-+is *not* released: this region will be kept permanently
-+reserved, so that it can act as a receptacle for a copy
-+of the low 256MB in the case a crash does occur. See,
-+however, "open issues" below, as to whether
-+such a reserved region is really needed.
-+
-+Currently the dump will be copied from /proc/vmcore to a
-+a new file upon user intervention. The starting address
-+to be read and the range for each data point in provided
-+in /sys/kernel/release_region.
-+
-+The tools to examine the dump will be same as the ones
-+used for kdump.
-+
-+General notes:
-+--------------
-+Security: please note that there are potential security issues
-+with any sort of dump mechanism. In particular, plaintext
-+(unencrypted) data, and possibly passwords, may be present in
-+the dump data. Userspace tools must take adequate precautions to
-+preserve security.
-+
-+Open issues/ToDo:
-+------------
-+ o The various code paths that tell the hypervisor that a crash
-+   occurred, vs. it simply being a normal reboot, should be
-+   reviewed, and possibly clarified/fixed.
-+
-+ o Instead of using /sys/kernel, should there be a /sys/dump
-+   instead? There is a dump_subsys being created by the s390 code,
-+   perhaps the pseries code should use a similar layout as well.
-+
-+ o Is reserving a 256MB region really required? The goal of
-+   reserving a 256MB scratch area is to make sure that no
-+   important crash data is clobbered when the hypervisor
-+   save low mem to the scratch area. But, if one could assure
-+   that nothing important is located in some 256MB area, then
-+   it would not need to be reserved. Something that can be
-+   improved in subsequent versions.
-+
-+ o Still working the kdump team to integrate this with kdump,
-+   some work remains but this would not affect the current
-+   patches.
-+
-+ o Still need to write a shell script, to copy the dump away.
-+   Currently I am parsing it manually.
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -49,6 +49,19 @@ config IRQ_PER_CPU
- 	bool
- 	default y
- 
-+config STACKTRACE_SUPPORT
-+	bool
-+	default y
-+
-+config TRACE_IRQFLAGS_SUPPORT
-+	bool
-+	depends on PPC64
-+	default y
-+
-+config LOCKDEP_SUPPORT
-+	bool
-+	default y
-+
- config RWSEM_GENERIC_SPINLOCK
- 	bool
- 
-@@ -81,6 +94,11 @@ config GENERIC_FIND_NEXT_BIT
- 	bool
- 	default y
- 
-+config GENERIC_GPIO
-+	bool
-+	help
-+	  Generic GPIO API support
-+
- config ARCH_NO_VIRT_TO_BUS
- 	def_bool PPC64
- 
-@@ -91,6 +109,7 @@ config PPC
- 	select HAVE_OPROFILE
- 	select HAVE_KPROBES
- 	select HAVE_KRETPROBES
-+	select HAVE_LMB
- 
- config EARLY_PRINTK
- 	bool
-@@ -210,15 +229,6 @@ source kernel/Kconfig.hz
- source kernel/Kconfig.preempt
- source "fs/Kconfig.binfmt"
- 
--# We optimistically allocate largepages from the VM, so make the limit
--# large enough (16MB). This badly named config option is actually
--# max order + 1
--config FORCE_MAX_ZONEORDER
--	int
--	depends on PPC64
--	default "9" if PPC_64K_PAGES
--	default "13"
--
- config HUGETLB_PAGE_SIZE_VARIABLE
- 	bool
- 	depends on HUGETLB_PAGE
-@@ -307,6 +317,16 @@ config CRASH_DUMP
- 
- 	  Don't change this unless you know what you are doing.
- 
-+config PHYP_DUMP
-+	bool "Hypervisor-assisted dump (EXPERIMENTAL)"
-+	depends on PPC_PSERIES && EXPERIMENTAL
-+	help
-+	  Hypervisor-assisted dump is meant to be a kdump replacement
-+	  offering robustness and speed not possible without system
-+	  hypervisor assistence.
-+
-+	  If unsure, say "N"
-+
- config PPCBUG_NVRAM
- 	bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
- 	default y if PPC_PREP
-@@ -381,6 +401,26 @@ config PPC_64K_PAGES
- 	  while on hardware with such support, it will be used to map
- 	  normal application pages.
- 
-+config FORCE_MAX_ZONEORDER
-+	int "Maximum zone order"
-+	default "9" if PPC_64K_PAGES
-+	default "13" if PPC64 && !PPC_64K_PAGES
-+	default "11"
-+	help
-+	  The kernel memory allocator divides physically contiguous memory
-+	  blocks into "zones", where each zone is a power of two number of
-+	  pages.  This option selects the largest power of two that the kernel
-+	  keeps in the memory allocator.  If you need to allocate very large
-+	  blocks of physically contiguous memory, then you may need to
-+	  increase this value.
-+
-+	  This config option is actually maximum order plus one. For example,
-+	  a value of 11 means that the largest free memory block is 2^10 pages.
-+
-+	  The page size is not necessarily 4KB.  For example, on 64-bit
-+	  systems, 64KB pages can be enabled via CONFIG_PPC_64K_PAGES.  Keep
-+	  this in mind when choosing a value for this option.
-+
- config PPC_SUBPAGE_PROT
- 	bool "Support setting protections for 4k subpages"
- 	depends on PPC_64K_PAGES
-@@ -490,6 +530,14 @@ config FSL_PCI
-  	bool
- 	select PPC_INDIRECT_PCI
- 
-+config 4xx_SOC
-+	bool
-+
-+config FSL_LBC
-+	bool
-+	help
-+	  Freescale Localbus support
-+
- # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
- config MCA
- 	bool
-@@ -663,22 +711,6 @@ config CONSISTENT_SIZE
- 	hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
- 	default "0x00200000" if NOT_COHERENT_CACHE
- 
--config BOOT_LOAD_BOOL
--	bool "Set the boot link/load address"
--	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
--	help
--	  This option allows you to set the initial load address of the zImage
--	  or zImage.initrd file.  This can be useful if you are on a board
--	  which has a small amount of memory.
--
--	  Say N here unless you know what you are doing.
--
--config BOOT_LOAD
--	hex "Link/load address for booting" if BOOT_LOAD_BOOL
--	default "0x00400000" if 40x || 8xx || 8260
--	default "0x01000000" if 44x
--	default "0x00800000"
--
- config PIN_TLB
- 	bool "Pinned Kernel TLBs (860 ONLY)"
- 	depends on ADVANCED_OPTIONS && 8xx
---- a/arch/powerpc/Kconfig.debug
-+++ b/arch/powerpc/Kconfig.debug
-@@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR
- 	hex "CPM UART early debug transmit descriptor address"
- 	depends on PPC_EARLY_DEBUG_CPM
- 	default "0xfa202008" if PPC_EP88XC
--	default "0xf0000008" if CPM2
-+	default "0xf0001ff8" if CPM2
- 	default "0xff002008" if CPM1
- 	help
- 	  This specifies the address of the transmit descriptor
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -71,13 +71,11 @@ endif
- 
- LDFLAGS_vmlinux	:= -Bstatic
- 
--CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
--AFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)
- CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc
--CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple
--KBUILD_CPPFLAGS	+= $(CPPFLAGS-y)
--KBUILD_AFLAGS	+= $(AFLAGS-y)
--KBUILD_CFLAGS	+= -msoft-float -pipe $(CFLAGS-y)
-+CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple
-+KBUILD_CPPFLAGS	+= -Iarch/$(ARCH)
-+KBUILD_AFLAGS	+= -Iarch/$(ARCH)
-+KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
- CPP		= $(CC) -E $(KBUILD_CFLAGS)
- 
- CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
-@@ -164,7 +162,7 @@ boot := arch/$(ARCH)/boot
- $(BOOT_TARGETS): vmlinux
- 	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
- 
--bootwrapper_install:
-+bootwrapper_install %.dtb:
- 	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
- 
- define archhelp
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
- $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/virtex405-head.o: BOOTCFLAGS += -mcpu=405
- 
- 
- zlib       := inffast.c inflate.c inftrees.c
-@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-82
- 		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
- 		fixed-head.S ep88xc.c ep405.c \
- 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
--		cuboot-warp.c cuboot-85xx-cpm2.c
-+		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-+		virtex405-head.S
- src-boot := $(src-wlib) $(src-plat) empty.c
- 
- src-boot := $(addprefix $(obj)/, $(src-boot))
-@@ -192,7 +194,7 @@ image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
- image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
- image-$(CONFIG_PPC_PMAC)		+= zImage.pmac
- image-$(CONFIG_PPC_HOLLY)		+= zImage.holly
--image-$(CONFIG_PPC_PRPMC2800)		+= zImage.prpmc2800
-+image-$(CONFIG_PPC_PRPMC2800)		+= dtbImage.prpmc2800
- image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries
- image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
- 
-@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER)			+= cuImage.rai
- image-$(CONFIG_TAISHAN)			+= cuImage.taishan
- image-$(CONFIG_KATMAI)			+= cuImage.katmai
- image-$(CONFIG_WARP)			+= cuImage.warp
-+image-$(CONFIG_YOSEMITE)		+= cuImage.yosemite
- 
- # Board ports in arch/powerpc/platform/8xx/Kconfig
- image-$(CONFIG_PPC_MPC86XADS)		+= cuImage.mpc866ads
-@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555)			+= cuImage.tqm
- image-$(CONFIG_TQM8560)			+= cuImage.tqm8560
- image-$(CONFIG_SBC8548)			+= cuImage.sbc8548
- image-$(CONFIG_SBC8560)			+= cuImage.sbc8560
-+image-$(CONFIG_KSI8560)			+= cuImage.ksi8560
- 
- # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
- image-$(CONFIG_STORCENTER)		+= cuImage.storcenter
-@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,$*)
- 
- # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
--$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
--	$(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
-+$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-+	$(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
--$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
--	$(call if_changed,wrap,$*,$(dtstree)/$*.dts)
-+$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-+	$(call if_changed,wrap,$*,,$(obj)/$*.dtb)
- 
- # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
- # prefix
-@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux
- $(obj)/uImage: vmlinux $(wrapperbits)
- 	$(call if_changed,wrap,uboot)
- 
--$(obj)/cuImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,cuboot-$*,$(dtstree)/$*.dts)
-+$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
- 
--$(obj)/treeImage.initrd.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
-+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
- 
--$(obj)/treeImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
--	$(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts)
-+$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
-+
-+$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-+
-+$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-+	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
-+
-+# Rule to build device tree blobs
-+$(obj)/%.dtb: $(dtstree)/%.dts $(obj)/dtc
-+	$(obj)/dtc -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(dtstree)/$*.dts
- 
- # If there isn't a platform selected then just strip the vmlinux.
- ifeq (,$(image-y))
-@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
- 
- # anything not in $(targets)
- clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
--	otheros.bld
-+	otheros.bld *.dtb
- 
- # clean up files cached by wrapper
- clean-kernel := vmlinux.strip vmlinux.bin
---- a/arch/powerpc/boot/bamboo.c
-+++ b/arch/powerpc/boot/bamboo.c
-@@ -33,7 +33,8 @@ static void bamboo_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
- 	ibm4xx_sdram_fixup_memsize();
- 	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
--	dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
-+	dt_fixup_mac_address_by_alias("ethernet0", bamboo_mac0);
-+	dt_fixup_mac_address_by_alias("ethernet1", bamboo_mac1);
- }
- 
- void bamboo_init(void *mac0, void *mac1)
---- a/arch/powerpc/boot/cpm-serial.c
-+++ b/arch/powerpc/boot/cpm-serial.c
-@@ -11,6 +11,7 @@
- #include "types.h"
- #include "io.h"
- #include "ops.h"
-+#include "page.h"
- 
- struct cpm_scc {
- 	u32 gsmrl;
-@@ -42,6 +43,22 @@ struct cpm_param {
- 	u16 tbase;
- 	u8 rfcr;
- 	u8 tfcr;
-+	u16 mrblr;
-+	u32 rstate;
-+	u8 res1[4];
-+	u16 rbptr;
-+	u8 res2[6];
-+	u32 tstate;
-+	u8 res3[4];
-+	u16 tbptr;
-+	u8 res4[6];
-+	u16 maxidl;
-+	u16 idlc;
-+	u16 brkln;
-+	u16 brkec;
-+	u16 brkcr;
-+	u16 rmask;
-+	u8 res5[4];
- };
- 
- struct cpm_bd {
-@@ -54,10 +71,10 @@ static void *cpcr;
- static struct cpm_param *param;
- static struct cpm_smc *smc;
- static struct cpm_scc *scc;
--struct cpm_bd *tbdf, *rbdf;
-+static struct cpm_bd *tbdf, *rbdf;
- static u32 cpm_cmd;
--static u8 *muram_start;
--static u32 muram_offset;
-+static void *cbd_addr;
-+static u32 cbd_offset;
- 
- static void (*do_cmd)(int op);
- static void (*enable_port)(void);
-@@ -119,20 +136,25 @@ static int cpm_serial_open(void)
- 
- 	out_8(&param->rfcr, 0x10);
- 	out_8(&param->tfcr, 0x10);
-+	out_be16(&param->mrblr, 1);
-+	out_be16(&param->maxidl, 0);
-+	out_be16(&param->brkec, 0);
-+	out_be16(&param->brkln, 0);
-+	out_be16(&param->brkcr, 0);
- 
--	rbdf = (struct cpm_bd *)muram_start;
--	rbdf->addr = (u8 *)(rbdf + 2);
-+	rbdf = cbd_addr;
-+	rbdf->addr = (u8 *)rbdf - 1;
- 	rbdf->sc = 0xa000;
- 	rbdf->len = 1;
- 
- 	tbdf = rbdf + 1;
--	tbdf->addr = (u8 *)(rbdf + 2) + 1;
-+	tbdf->addr = (u8 *)rbdf - 2;
- 	tbdf->sc = 0x2000;
- 	tbdf->len = 1;
- 
- 	sync();
--	out_be16(&param->rbase, muram_offset);
--	out_be16(&param->tbase, muram_offset + sizeof(struct cpm_bd));
-+	out_be16(&param->rbase, cbd_offset);
-+	out_be16(&param->tbase, cbd_offset + sizeof(struct cpm_bd));
- 
- 	do_cmd(CPM_CMD_INIT_RX_TX);
- 
-@@ -175,10 +197,12 @@ static unsigned char cpm_serial_getc(voi
- 
- int cpm_console_init(void *devp, struct serial_console_data *scdp)
- {
--	void *reg_virt[2];
--	int is_smc = 0, is_cpm2 = 0, n;
--	unsigned long reg_phys;
-+	void *vreg[2];
-+	u32 reg[2];
-+	int is_smc = 0, is_cpm2 = 0;
- 	void *parent, *muram;
-+	void *muram_addr;
-+	unsigned long muram_offset, muram_size;
- 
- 	if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
- 		is_smc = 1;
-@@ -202,63 +226,64 @@ int cpm_console_init(void *devp, struct 
- 	else
- 		do_cmd = cpm1_cmd;
- 
--	n = getprop(devp, "fsl,cpm-command", &cpm_cmd, 4);
--	if (n < 4)
-+	if (getprop(devp, "fsl,cpm-command", &cpm_cmd, 4) < 4)
- 		return -1;
- 
--	n = getprop(devp, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		for (n = 0; n < 2; n++) {
--			if (!dt_xlate_reg(devp, n, &reg_phys, NULL))
--				return -1;
--
--			reg_virt[n] = (void *)reg_phys;
--		}
--	}
-+	if (dt_get_virtual_reg(devp, vreg, 2) < 2)
-+		return -1;
- 
- 	if (is_smc)
--		smc = reg_virt[0];
-+		smc = vreg[0];
- 	else
--		scc = reg_virt[0];
-+		scc = vreg[0];
- 
--	param = reg_virt[1];
-+	param = vreg[1];
- 
- 	parent = get_parent(devp);
- 	if (!parent)
- 		return -1;
- 
--	n = getprop(parent, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		if (!dt_xlate_reg(parent, 0, &reg_phys, NULL))
--			return -1;
--
--		reg_virt[0] = (void *)reg_phys;
--	}
--
--	cpcr = reg_virt[0];
-+	if (dt_get_virtual_reg(parent, &cpcr, 1) < 1)
-+		return -1;
- 
- 	muram = finddevice("/soc/cpm/muram/data");
- 	if (!muram)
- 		return -1;
- 
- 	/* For bootwrapper-compatible device trees, we assume that the first
--	 * entry has at least 18 bytes, and that #address-cells/#data-cells
-+	 * entry has at least 128 bytes, and that #address-cells/#data-cells
- 	 * is one for both parent and child.
- 	 */
- 
--	n = getprop(muram, "virtual-reg", reg_virt, sizeof(reg_virt));
--	if (n < (int)sizeof(reg_virt)) {
--		if (!dt_xlate_reg(muram, 0, &reg_phys, NULL))
--			return -1;
-+	if (dt_get_virtual_reg(muram, &muram_addr, 1) < 1)
-+		return -1;
-+
-+	if (getprop(muram, "reg", reg, 8) < 8)
-+		return -1;
-+
-+	muram_offset = reg[0];
-+	muram_size = reg[1];
-+
-+	/* Store the buffer descriptors at the end of the first muram chunk.
-+	 * For SMC ports on CPM2-based platforms, relocate the parameter RAM
-+	 * just before the buffer descriptors.
-+	 */
-+
-+	cbd_offset = muram_offset + muram_size - 2 * sizeof(struct cpm_bd);
- 
--		reg_virt[0] = (void *)reg_phys;
-+	if (is_cpm2 && is_smc) {
-+		u16 *smc_base = (u16 *)param;
-+		u16 pram_offset;
-+
-+		pram_offset = cbd_offset - 64;
-+		pram_offset = _ALIGN_DOWN(pram_offset, 64);
-+
-+		disable_port();
-+		out_be16(smc_base, pram_offset);
-+		param = muram_addr - muram_offset + pram_offset;
- 	}
- 
--	muram_start = reg_virt[0];
--
--	n = getprop(muram, "reg", &muram_offset, 4);
--	if (n < 4)
--		return -1;
-+	cbd_addr = muram_addr - muram_offset + cbd_offset;
- 
- 	scdp->open = cpm_serial_open;
- 	scdp->putc = cpm_serial_putc;
---- a/arch/powerpc/boot/cuboot-pq2.c
-+++ b/arch/powerpc/boot/cuboot-pq2.c
-@@ -128,7 +128,7 @@ static void fixup_pci(void)
- 	u8 *soc_regs;
- 	int i, len;
- 	void *node, *parent_node;
--	u32 naddr, nsize, mem_log2;
-+	u32 naddr, nsize, mem_pow2, mem_mask;
- 
- 	node = finddevice("/pci");
- 	if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
-@@ -141,7 +141,7 @@ static void fixup_pci(void)
- 
- 	soc_regs = (u8 *)fsl_get_immr();
- 	if (!soc_regs)
--		goto err;
-+		goto unhandled;
- 
- 	dt_get_reg_format(node, &naddr, &nsize);
- 	if (naddr != 3 || nsize != 2)
-@@ -153,7 +153,7 @@ static void fixup_pci(void)
- 
- 	dt_get_reg_format(parent_node, &naddr, &nsize);
- 	if (naddr != 1 || nsize != 1)
--		goto err;
-+		goto unhandled;
- 
- 	len = getprop(node, "ranges", pci_ranges_buf,
- 	              sizeof(pci_ranges_buf));
-@@ -170,14 +170,20 @@ static void fixup_pci(void)
- 	}
- 
- 	if (!mem || !mmio || !io)
--		goto err;
-+		goto unhandled;
-+	if (mem->size[1] != mmio->size[1])
-+		goto unhandled;
-+	if (mem->size[1] & (mem->size[1] - 1))
-+		goto unhandled;
-+	if (io->size[1] & (io->size[1] - 1))
-+		goto unhandled;
- 
- 	if (mem->phys_addr + mem->size[1] == mmio->phys_addr)
- 		mem_base = mem;
- 	else if (mmio->phys_addr + mmio->size[1] == mem->phys_addr)
- 		mem_base = mmio;
- 	else
--		goto err;
-+		goto unhandled;
- 
- 	out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
- 	out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));
-@@ -201,8 +207,9 @@ static void fixup_pci(void)
- 	out_le32(&pci_regs[0][58], 0);
- 	out_le32(&pci_regs[0][60], 0);
- 
--	mem_log2 = 1 << (__ilog2_u32(bd.bi_memsize - 1) + 1);
--	out_le32(&pci_regs[0][62], 0xa0000000 | ~((1 << (mem_log2 - 12)) - 1));
-+	mem_pow2 = 1 << (__ilog2_u32(bd.bi_memsize - 1) + 1);
-+	mem_mask = ~(mem_pow2 - 1) >> 12;
-+	out_le32(&pci_regs[0][62], 0xa0000000 | mem_mask);
- 
- 	/* If PCI is disabled, drive RST high to enable. */
- 	if (!(in_le32(&pci_regs[0][32]) & 1)) {
-@@ -228,7 +235,11 @@ static void fixup_pci(void)
- 	return;
- 
- err:
--	printf("Bad PCI node\r\n");
-+	printf("Bad PCI node -- using existing firmware setup.\r\n");
-+	return;
-+
-+unhandled:
-+	printf("Unsupported PCI node -- using existing firmware setup.\r\n");
- }
- 
- static void pq2_platform_fixups(void)
---- a/arch/powerpc/boot/cuboot-rainier.c
-+++ b/arch/powerpc/boot/cuboot-rainier.c
-@@ -42,7 +42,8 @@ static void rainier_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ibm4xx_denali_fixup_memsize();
--	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- }
- 
- void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
---- a/arch/powerpc/boot/cuboot-sequoia.c
-+++ b/arch/powerpc/boot/cuboot-sequoia.c
-@@ -42,7 +42,8 @@ static void sequoia_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ibm4xx_denali_fixup_memsize();
--	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- }
- 
- void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
---- a/arch/powerpc/boot/cuboot-taishan.c
-+++ b/arch/powerpc/boot/cuboot-taishan.c
-@@ -40,7 +40,8 @@ static void taishan_fixups(void)
- 
- 	ibm4xx_sdram_fixup_memsize();
- 
--	dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
- 
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- }
---- a/arch/powerpc/boot/cuboot-warp.c
-+++ b/arch/powerpc/boot/cuboot-warp.c
-@@ -24,7 +24,7 @@ static void warp_fixups(void)
- 	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
- 	ibm4xx_sdram_fixup_memsize();
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
--	dt_fixup_mac_addresses(&bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
- }
- 
- 
---- /dev/null
-+++ b/arch/powerpc/boot/cuboot-yosemite.c
-@@ -0,0 +1,44 @@
-+/*
-+ * Old U-boot compatibility for Yosemite
-+ *
-+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ *
-+ * Copyright 2008 IBM Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include "ops.h"
-+#include "stdio.h"
-+#include "4xx.h"
-+#include "44x.h"
-+#include "cuboot.h"
-+
-+#define TARGET_4xx
-+#define TARGET_44x
-+#include "ppcboot.h"
-+
-+static bd_t bd;
-+
-+static void yosemite_fixups(void)
-+{
-+	unsigned long sysclk = 66666666;
-+
-+	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
-+	ibm4xx_sdram_fixup_memsize();
-+	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
-+	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-+	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
-+}
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		unsigned long r6, unsigned long r7)
-+{
-+	CUBOOT_INIT();
-+	platform_ops.fixups = yosemite_fixups;
-+	platform_ops.exit = ibm44x_dbcr_reset;
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- a/arch/powerpc/boot/devtree.c
-+++ b/arch/powerpc/boot/devtree.c
-@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const c
- 
- 	return 0;
- }
-+
-+int dt_get_virtual_reg(void *node, void **addr, int nres)
-+{
-+	unsigned long xaddr;
-+	int n;
-+
-+	n = getprop(node, "virtual-reg", addr, nres * 4);
-+	if (n > 0)
-+		return n / 4;
-+
-+	for (n = 0; n < nres; n++) {
-+		if (!dt_xlate_reg(node, n, &xaddr, NULL))
-+			break;
-+
-+		addr[n] = (void *)xaddr;
-+	}
-+
-+	return n;
-+}
-+
---- a/arch/powerpc/boot/dts/bamboo.dts
-+++ b/arch/powerpc/boot/dts/bamboo.dts
-@@ -204,7 +204,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
-@@ -225,7 +224,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- /dev/null
-+++ b/arch/powerpc/boot/dts/canyonlands.dts
-@@ -0,0 +1,402 @@
-+/*
-+ * Device Tree Source for AMCC Canyonlands (460EX)
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,canyonlands";
-+	compatible = "amcc,canyonlands";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,460EX";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+			timebase-frequency = <0>; /* Filled in by U-Boot */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by U-Boot */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC2: interrupt-controller2 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <2>;
-+		dcr-reg = <0e0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <a 4 b 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC3: interrupt-controller3 {
-+		compatible = "ibm,uic-460ex","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <3>;
-+		dcr-reg = <0f0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <10 4 11 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-460ex";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-460ex";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-460ex", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <2>;
-+			num-rx-chans = <10>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-parent = <&UIC2>;
-+			interrupts = <	/*TXEOB*/ 6 4
-+					/*RXEOB*/ 7 4
-+					/*SERR*/  3 4
-+					/*TXDE*/  4 4
-+					/*RXDE*/  5 4>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-460ex", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <b0000000 4 b0000000 50000000>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-460ex", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				interrupts = <6 4>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1d 4>;
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4>;
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-460ex", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-460ex", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-460ex", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			RGMII0: emac-rgmii@ef601500 {
-+				compatible = "ibm,rgmii-460ex", "ibm,rgmii";
-+				reg = <ef601500 8>;
-+				has-mdio;
-+			};
-+
-+			TAH0: emac-tah@ef601350 {
-+				compatible = "ibm,tah-460ex", "ibm,tah";
-+				reg = <ef601350 30>;
-+			};
-+
-+			TAH1: emac-tah@ef601450 {
-+				compatible = "ibm,tah-460ex", "ibm,tah";
-+				reg = <ef601450 30>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460ex", "ibm,emac4";
-+				interrupt-parent = <&EMAC0>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 10 4
-+						 /*Wake*/   1 &UIC2 14 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <0>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460ex", "ibm,emac4";
-+				interrupt-parent = <&EMAC1>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 11 4
-+						 /*Wake*/   1 &UIC2 15 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <1>;
-+				mal-rx-channel = <8>;
-+				cell-index = <1>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <1>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+		};
-+
-+		PCIX0: pci@c0ec00000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pcix-460ex", "ibm,plb-pcix";
-+			primary;
-+			large-inbound-windows;
-+			enable-msi-hole;
-+			reg = <c 0ec00000   8	/* Config space access */
-+			       0 0 0		/* no IACK cycles */
-+			       c 0ed00000   4   /* Special cycles */
-+			       c 0ec80000 100	/* Internal registers */
-+			       c 0ec80100  fc>;	/* Internal messaging registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-+				  01000000 0 00000000 0000000c 08000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 0 to 0x3f */
-+			bus-range = <0 3f>;
-+
-+			/* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-+			interrupt-map-mask = <0000 0 0 0>;
-+			interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
-+		};
-+
-+		PCIE0: pciex@d00000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <0>; /* port number */
-+			reg = <d 00000000 20000000	/* Config space access */
-+			       c 08010000 00001000>;	/* Registers */
-+			dcr-reg = <100 020>;
-+			sdr-base = <300>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-+				  01000000 0 00000000 0000000f 80000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 40 to 0x7f */
-+			bus-range = <40 7f>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
-+		};
-+
-+		PCIE1: pciex@d20000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <1>; /* port number */
-+			reg = <d 20000000 20000000	/* Config space access */
-+			       c 08011000 00001000>;	/* Registers */
-+			dcr-reg = <120 020>;
-+			sdr-base = <340>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-+				  01000000 0 00000000 0000000f 80010000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 80 to 0xbf */
-+			bus-range = <80 bf>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/ebony.dts
-+++ b/arch/powerpc/boot/dts/ebony.dts
-@@ -241,7 +241,6 @@
- 			};
- 
- 			EMAC0: ethernet@40000800 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
-@@ -261,7 +260,6 @@
- 				zmii-channel = <0>;
- 			};
- 			EMAC1: ethernet@40000900 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- a/arch/powerpc/boot/dts/ep8248e.dts
-+++ b/arch/powerpc/boot/dts/ep8248e.dts
-@@ -121,8 +121,7 @@
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 0x1100 0x1140
--					       0xec0 0x9800 0x800>;
-+					reg = <0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -138,7 +137,7 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8248-smc-uart",
- 				             "fsl,cpm2-smc-uart";
--				reg = <0x11a80 0x20 0x1100 0x40>;
-+				reg = <0x11a80 0x20 0x87fc 2>;
- 				interrupts = <4 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <7>;
---- a/arch/powerpc/boot/dts/ep88xc.dts
-+++ b/arch/powerpc/boot/dts/ep88xc.dts
-@@ -2,7 +2,7 @@
-  * EP88xC Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-- * Copyright 2007 Freescale Semiconductor, Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor, Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "EP88xC";
-@@ -23,44 +24,44 @@
- 
- 		PowerPC,885@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#16>;
--			i-cache-line-size = <d#16>;
--			d-cache-size = <d#8192>;
--			i-cache-size = <d#8192>;
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;
-+			i-cache-line-size = <16>;
-+			d-cache-size = <8192>;
-+			i-cache-size = <8192>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@fa200100 {
- 		compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <fa200100 40>;
-+		reg = <0xfa200100 0x40>;
- 
- 		ranges = <
--			0 0 fc000000 04000000
--			3 0 fa000000 01000000
-+			0x0 0x0 0xfc000000 0x4000000
-+			0x3 0x0 0xfa000000 0x1000000
- 		>;
- 
- 		flash@0,2000000 {
- 			compatible = "cfi-flash";
--			reg = <0 2000000 2000000>;
-+			reg = <0x0 0x2000000 0x2000000>;
- 			bank-width = <4>;
- 			device-width = <2>;
- 		};
- 
- 		board-control@3,400000 {
--			reg = <3 400000 10>;
-+			reg = <0x3 0x400000 0x10>;
- 			compatible = "fsl,ep88xc-bcsr";
- 		};
- 	};
-@@ -70,25 +71,25 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 fa200000 00004000>;
-+		ranges = <0x0 0xfa200000 0x4000>;
- 		bus-frequency = <0>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <fa200000 4000>;
-+		reg = <0xfa200000 0x4000>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			PHY0: ethernet-phy@0 {
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY1: ethernet-phy@1 {
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -97,7 +98,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -109,7 +110,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <1e00 188>;
-+			reg = <0x1e00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <7 1>;
- 			interrupt-parent = <&PIC>;
-@@ -120,7 +121,7 @@
- 		PIC: interrupt-controller@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -130,29 +131,29 @@
- 			#size-cells = <2>;
- 			compatible = "fsl,pq-pcmcia";
- 			device_type = "pcmcia";
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <d 1>;
-+			interrupts = <13 1>;
- 		};
- 
- 		cpm@9c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc885-cpm", "fsl,cpm1";
--			command-proc = <9c0>;
-+			command-proc = <0x9c0>;
- 			interrupts = <0>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			ranges;
- 
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -160,7 +161,7 @@
- 				compatible = "fsl,mpc885-brg",
- 				             "fsl,cpm1-brg",
- 				             "fsl,cpm-brg";
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 			};
- 
- 			CPM_PIC: interrupt-controller@930 {
-@@ -168,7 +169,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc885-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -178,11 +179,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 				linux,planetcore-label = "SMC1";
- 			};
- 
-@@ -191,11 +192,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-scc-uart",
- 				             "fsl,cpm1-scc-uart";
--				reg = <a20 20 3d00 80>;
--				interrupts = <1d>;
-+				reg = <0xa20 0x20 0x3d00 0x80>;
-+				interrupts = <29>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <0040>;
-+				fsl,cpm-command = <0x40>;
- 				linux,planetcore-label = "SCC2";
- 			};
- 
-@@ -204,9 +205,9 @@
- 				#size-cells = <0>;
- 				compatible = "fsl,mpc885-usb",
- 				             "fsl,cpm1-usb";
--				reg = <a00 18 1c00 80>;
-+				reg = <0xa00 0x18 0x1c00 0x80>;
- 				interrupt-parent = <&CPM_PIC>;
--				interrupts = <1e>;
-+				interrupts = <30>;
- 				fsl,cpm-command = <0000>;
- 			};
- 		};
---- /dev/null
-+++ b/arch/powerpc/boot/dts/glacier.dts
-@@ -0,0 +1,467 @@
-+/*
-+ * Device Tree Source for AMCC Glacier (460GT)
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,glacier";
-+	compatible = "amcc,glacier", "amcc,canyonlands";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		ethernet2 = &EMAC2;
-+		ethernet3 = &EMAC3;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,460GT";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+			timebase-frequency = <0>; /* Filled in by U-Boot */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by U-Boot */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC2: interrupt-controller2 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <2>;
-+		dcr-reg = <0e0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <a 4 b 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	UIC3: interrupt-controller3 {
-+		compatible = "ibm,uic-460gt","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <3>;
-+		dcr-reg = <0f0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <10 4 11 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-460gt";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-460gt";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-460gt", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-460gt", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <20>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-parent = <&UIC2>;
-+			interrupts = <	/*TXEOB*/ 6 4
-+					/*RXEOB*/ 7 4
-+					/*SERR*/  3 4
-+					/*TXDE*/  4 4
-+					/*RXDE*/  5 4>;
-+			desc-base-addr-high = <8>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-460gt", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <b0000000 4 b0000000 50000000>;
-+			clock-frequency = <0>; /* Filled in by U-Boot */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-460gt", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				interrupts = <6 4>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1d 4>;
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>; /* Filled in by U-Boot */
-+				current-speed = <0>; /* Filled in by U-Boot */
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4>;
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-460gt", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-460gt", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-460gt", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			RGMII0: emac-rgmii@ef601500 {
-+				compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-+				reg = <ef601500 8>;
-+				has-mdio;
-+			};
-+
-+			RGMII1: emac-rgmii@ef601600 {
-+				compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-+				reg = <ef601600 8>;
-+				has-mdio;
-+			};
-+
-+			TAH0: emac-tah@ef601350 {
-+				compatible = "ibm,tah-460gt", "ibm,tah";
-+				reg = <ef601350 30>;
-+			};
-+
-+			TAH1: emac-tah@ef601450 {
-+				compatible = "ibm,tah-460gt", "ibm,tah";
-+				reg = <ef601450 30>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC0>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 10 4
-+						 /*Wake*/   1 &UIC2 14 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <0>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC1>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 11 4
-+						 /*Wake*/   1 &UIC2 15 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <1>;
-+				mal-rx-channel = <8>;
-+				cell-index = <1>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII0>;
-+				rgmii-channel = <1>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+
-+			EMAC2: ethernet@ef601100 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC2>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 12 4
-+						 /*Wake*/   1 &UIC2 16 4>;
-+				reg = <ef601100 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <2>;
-+				mal-rx-channel = <10>;
-+				cell-index = <2>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII1>;
-+				rgmii-channel = <0>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+
-+			EMAC3: ethernet@ef601200 {
-+				device_type = "network";
-+				compatible = "ibm,emac-460gt", "ibm,emac4";
-+				interrupt-parent = <&EMAC3>;
-+				interrupts = <0 1>;
-+				#interrupt-cells = <1>;
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				interrupt-map = </*Status*/ 0 &UIC2 13 4
-+						 /*Wake*/   1 &UIC2 17 4>;
-+				reg = <ef601200 70>;
-+				local-mac-address = [000000000000]; /* Filled in by U-Boot */
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <3>;
-+				mal-rx-channel = <18>;
-+				cell-index = <3>;
-+				max-frame-size = <2328>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rgmii";
-+				phy-map = <00000000>;
-+				rgmii-device = <&RGMII1>;
-+				rgmii-channel = <1>;
-+				has-inverted-stacr-oc;
-+				has-new-stacr-staopc;
-+				mdio-device = <&EMAC0>;
-+			};
-+		};
-+
-+		PCIX0: pci@c0ec00000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pcix-460gt", "ibm,plb-pcix";
-+			primary;
-+			large-inbound-windows;
-+			enable-msi-hole;
-+			reg = <c 0ec00000   8	/* Config space access */
-+			       0 0 0		/* no IACK cycles */
-+			       c 0ed00000   4   /* Special cycles */
-+			       c 0ec80000 100	/* Internal registers */
-+			       c 0ec80100  fc>;	/* Internal messaging registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-+				  01000000 0 00000000 0000000c 08000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 0 to 0x3f */
-+			bus-range = <0 3f>;
-+
-+			/* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-+			interrupt-map-mask = <0000 0 0 0>;
-+			interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
-+		};
-+
-+		PCIE0: pciex@d00000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <0>; /* port number */
-+			reg = <d 00000000 20000000	/* Config space access */
-+			       c 08010000 00001000>;	/* Registers */
-+			dcr-reg = <100 020>;
-+			sdr-base = <300>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-+				  01000000 0 00000000 0000000f 80000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 40 to 0x7f */
-+			bus-range = <40 7f>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
-+		};
-+
-+		PCIE1: pciex@d20000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
-+			primary;
-+			port = <1>; /* port number */
-+			reg = <d 20000000 20000000	/* Config space access */
-+			       c 08011000 00001000>;	/* Registers */
-+			dcr-reg = <120 020>;
-+			sdr-base = <340>;
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed
-+			 */
-+			ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-+				  01000000 0 00000000 0000000f 80010000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* This drives busses 80 to 0xbf */
-+			bus-range = <80 bf>;
-+
-+			/* Legacy interrupts (note the weird polarity, the bridge seems
-+			 * to invert PCIe legacy interrupts).
-+			 * We are de-swizzling here because the numbers are actually for
-+			 * port of the root complex virtual P2P bridge. But I want
-+			 * to avoid putting a node for it in the tree, so the numbers
-+			 * below are basically de-swizzled numbers.
-+			 * The real slot is on idsel 0, so the swizzling is 1:1
-+			 */
-+			interrupt-map-mask = <0000 0 0 7>;
-+			interrupt-map = <
-+				0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-+				0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-+				0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-+				0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/haleakala.dts
-+++ b/arch/powerpc/boot/dts/haleakala.dts
-@@ -12,7 +12,7 @@
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	model = "amcc,haleakala";
--	compatible = "amcc,kilauea";
-+	compatible = "amcc,haleakala", "amcc,kilauea";
- 	dcr-parent = <&/cpus/cpu@0>;
- 
- 	aliases {
-@@ -218,7 +218,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/katmai.dts
-+++ b/arch/powerpc/boot/dts/katmai.dts
-@@ -212,7 +212,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "gmii";
---- a/arch/powerpc/boot/dts/kilauea.dts
-+++ b/arch/powerpc/boot/dts/kilauea.dts
-@@ -219,7 +219,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -247,7 +247,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- /dev/null
-+++ b/arch/powerpc/boot/dts/ksi8560.dts
-@@ -0,0 +1,267 @@
-+/*
-+ * Device Tree Source for Emerson KSI8560
-+ *
-+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
-+ *
-+ * Based on mpc8560ads.dts
-+ *
-+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
-+ * the terms of the GNU General Public License version 2.  This program
-+ * is licensed "as is" without any warranty of any kind, whether express
-+ * or implied.
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "KSI8560";
-+	compatible = "emerson,KSI8560";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+		ethernet2 = &enet2;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8560@0 {
-+			device_type = "cpu";
-+			reg = <0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <0x8000>;		/* L1, 32K */
-+			i-cache-size = <0x8000>;		/* L1, 32K */
-+			timebase-frequency = <0>;		/* From U-boot */
-+			bus-frequency = <0>;			/* From U-boot */
-+			clock-frequency = <0>;			/* From U-boot */
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x10000000>;			/* Fixed by bootwrapper */
-+	};
-+
-+	soc@fdf00000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		ranges = <0x00000000 0xfdf00000 0x00100000>;
-+		bus-frequency = <0>;				/* Fixed by bootwrapper */
-+
-+		memory-controller@2000 {
-+			compatible = "fsl,8540-memory-controller";
-+			reg = <0x2000 0x1000>;
-+			interrupt-parent = <&MPIC>;
-+			interrupts = <0x12 0x2>;
-+		};
-+
-+		l2-cache-controller@20000 {
-+			compatible = "fsl,8540-l2-cache-controller";
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <0x20>;		/* 32 bytes */
-+			cache-size = <0x40000>;			/* L2, 256K */
-+			interrupt-parent = <&MPIC>;
-+			interrupts = <0x10 0x2>;
-+		};
-+
-+		i2c@3000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <0>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3000 0x100>;
-+			interrupts = <0x2b 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			dfsrr;
-+		};
-+
-+		mdio@24520 {					/* For TSECs */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "fsl,gianfar-mdio";
-+			reg = <0x24520 0x20>;
-+
-+			PHY1: ethernet-phy@1 {
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x1>;
-+				device_type = "ethernet-phy";
-+			};
-+
-+			PHY2: ethernet-phy@2 {
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x2>;
-+				device_type = "ethernet-phy";
-+			};
-+		};
-+
-+		enet0: ethernet@24000 {
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x24000 0x1000>;
-+			/* Mac address filled in by bootwrapper */
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			phy-handle = <&PHY1>;
-+		};
-+
-+		enet1: ethernet@25000 {
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x25000 0x1000>;
-+			/* Mac address filled in by bootwrapper */
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-+			interrupt-parent = <&MPIC>;
-+			phy-handle = <&PHY2>;
-+		};
-+
-+		MPIC: pic@40000 {
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			interrupt-controller;
-+			reg = <0x40000 0x40000>;
-+			device_type = "open-pic";
-+		};
-+
-+		cpm@919c0 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
-+			reg = <0x919c0 0x30>;
-+			ranges;
-+
-+			muram@80000 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0x0 0x80000 0x10000>;
-+
-+				data@0 {
-+					compatible = "fsl,cpm-muram-data";
-+					reg = <0x0 0x4000 0x9000 0x2000>;
-+				};
-+			};
-+
-+			brg@919f0 {
-+				compatible = "fsl,mpc8560-brg",
-+					     "fsl,cpm2-brg",
-+					     "fsl,cpm-brg";
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
-+				clock-frequency = <165000000>;	/* 166MHz */
-+			};
-+
-+			CPMPIC: pic@90c00 {
-+				#address-cells = <0>;
-+				#interrupt-cells = <2>;
-+				interrupt-controller;
-+				interrupts = <0x2e 0x2>;
-+				interrupt-parent = <&MPIC>;
-+				reg = <0x90c00 0x80>;
-+				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
-+			};
-+
-+			serial@91a00 {
-+				device_type = "serial";
-+				compatible = "fsl,mpc8560-scc-uart",
-+					     "fsl,cpm2-scc-uart";
-+				reg = <0x91a00 0x20 0x88000 0x100>;
-+				fsl,cpm-brg = <1>;
-+				fsl,cpm-command = <0x800000>;
-+				current-speed = <0x1c200>;
-+				interrupts = <0x28 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+			};
-+
-+			serial@91a20 {
-+				device_type = "serial";
-+				compatible = "fsl,mpc8560-scc-uart",
-+					     "fsl,cpm2-scc-uart";
-+				reg = <0x91a20 0x20 0x88100 0x100>;
-+				fsl,cpm-brg = <2>;
-+				fsl,cpm-command = <0x4a00000>;
-+				current-speed = <0x1c200>;
-+				interrupts = <0x29 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+			};
-+
-+			mdio@90d00 {				/* For FCCs */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "fsl,cpm2-mdio-bitbang";
-+				reg = <0x90d00 0x14>;
-+				fsl,mdio-pin = <24>;
-+				fsl,mdc-pin = <25>;
-+
-+				PHY0: ethernet-phy@0 {
-+					interrupt-parent = <&MPIC>;
-+					reg = <0x0>;
-+					device_type = "ethernet-phy";
-+				};
-+			};
-+
-+			enet2: ethernet@91300 {
-+				device_type = "network";
-+				compatible = "fsl,mpc8560-fcc-enet",
-+					     "fsl,cpm2-fcc-enet";
-+				reg = <0x91300 0x20 0x88400 0x100 0x91390 0x1>;
-+				/* Mac address filled in by bootwrapper */
-+				local-mac-address = [ 00 00 00 00 00 00 ];
-+				fsl,cpm-command = <0x12000300>;
-+				interrupts = <0x20 0x8>;
-+				interrupt-parent = <&CPMPIC>;
-+				phy-handle = <&PHY0>;
-+			};
-+		};
-+	};
-+
-+	localbus@fdf05000 {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		compatible = "fsl,mpc8560-localbus";
-+		reg = <0xfdf05000 0x68>;
-+
-+		ranges = <0x0 0x0 0xe0000000 0x00800000
-+			  0x4 0x0 0xe8080000 0x00080000>;
-+
-+		flash@0,0 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "jedec-flash";
-+			reg = <0x0 0x0 0x800000>;
-+			bank-width = <0x2>;
-+
-+			partition@0 {
-+				label = "Primary Kernel";
-+				reg = <0x0 0x180000>;
-+			};
-+			partition@180000 {
-+				label = "Primary Filesystem";
-+				reg = <0x180000 0x580000>;
-+			};
-+			partition@700000 {
-+				label = "Monitor";
-+				reg = <0x300000 0x100000>;
-+				read-only;
-+			};
-+		};
-+
-+		cpld@4,0 {
-+			compatible = "emerson,KSI8560-cpld";
-+			reg = <0x4 0x0 0x80000>;
-+		};
-+	};
-+
-+
-+	chosen {
-+		linux,stdout-path = "/soc/cpm/serial@91a00";
-+	};
-+};
---- a/arch/powerpc/boot/dts/kuroboxHD.dts
-+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
-@@ -7,6 +7,7 @@
-  * Based on sandpoint.dts
-  *
-  * 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * This file is licensed under
-  * the terms of the GNU General Public License version 2.  This program
-@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
- 
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "KuroboxHD";
- 	compatible = "linkstation";
-@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
- 
- 		PowerPC,603e { /* Really 8241 */
- 			device_type = "cpu";
--			reg = <0>;
--			clock-frequency = <bebc200>;	/* Fixed by bootloader */
--			timebase-frequency = <1743000>; /* Fixed by bootloader */
-+			reg = <0x0>;
-+			clock-frequency = <200000000>;	/* Fixed by bootloader */
-+			timebase-frequency = <24391680>; /* Fixed by bootloader */
- 			bus-frequency = <0>;		/* Fixed by bootloader */
- 			/* Following required by dtc but not used */
--			i-cache-size = <4000>;
--			d-cache-size = <4000>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 04000000>;
-+		reg = <0x0 0x4000000>;
- 	};
- 
- 	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
- 		device_type = "soc";
- 		compatible = "mpc10x";
- 		store-gathering = <0>; /* 0 == off, !0 == on */
--		reg = <80000000 00100000>;
--		ranges = <80000000 80000000 70000000	/* pci mem space */
--			  fc000000 fc000000 00100000	/* EUMB */
--			  fe000000 fe000000 00c00000	/* pci i/o space */
--			  fec00000 fec00000 00300000	/* pci cfg regs */
--			  fef00000 fef00000 00100000>;	/* pci iack */
-+		reg = <0x80000000 0x100000>;
-+		ranges = <0x80000000 0x80000000 0x70000000	/* pci mem space */
-+			  0xfc000000 0xfc000000 0x100000	/* EUMB */
-+			  0xfe000000 0xfe000000 0xc00000	/* pci i/o space */
-+			  0xfec00000 0xfec00000 0x300000	/* pci cfg regs */
-+			  0xfef00000 0xfef00000 0x100000>;	/* pci iack */
- 
- 		i2c@80003000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <80003000 1000>;
-+			reg = <0x80003000 0x1000>;
- 			interrupts = <5 2>;
- 			interrupt-parent = <&mpic>;
- 
- 			rtc@32 {
- 				device_type = "rtc";
- 				compatible = "ricoh,rs5c372a";
--				reg = <32>;
-+				reg = <0x32>;
- 			};
- 		};
- 
-@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004500 8>;
--			clock-frequency = <5d08d88>;
--			current-speed = <2580>;
-+			reg = <0x80004500 0x8>;
-+			clock-frequency = <97553800>;
-+			current-speed = <9600>;
- 			interrupts = <9 0>;
- 			interrupt-parent = <&mpic>;
- 		};
-@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004600 8>;
--			clock-frequency = <5d08d88>;
--			current-speed = <e100>;
--			interrupts = <a 0>;
-+			reg = <0x80004600 0x8>;
-+			clock-frequency = <97553800>;
-+			current-speed = <57600>;
-+			interrupts = <10 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
- 			device_type = "open-pic";
- 			compatible = "chrp,open-pic";
- 			interrupt-controller;
--			reg = <80040000 40000>;
-+			reg = <0x80040000 0x40000>;
- 		};
- 
- 		pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
- 			compatible = "mpc10x-pci";
--			reg = <fec00000 400000>;
--			ranges = <01000000 0        0 fe000000 0 00c00000
--				  02000000 0 80000000 80000000 0 70000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <7f28155>;
-+			reg = <0xfec00000 0x400000>;
-+			ranges = <0x1000000 0x0        0x0 0xfe000000 0x0 0xc00000
-+				  0x2000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <133333333>;
- 			interrupt-parent = <&mpic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 11 - IRQ0 ETH */
--				5800 0 0 1 &mpic 0 1
--				5800 0 0 2 &mpic 1 1
--				5800 0 0 3 &mpic 2 1
--				5800 0 0 4 &mpic 3 1
-+				0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
- 				/* IDSEL 12 - IRQ1 IDE0 */
--				6000 0 0 1 &mpic 1 1
--				6000 0 0 2 &mpic 2 1
--				6000 0 0 3 &mpic 3 1
--				6000 0 0 4 &mpic 0 1
-+				0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x6000 0x0 0x0 0x4 &mpic 0x0 0x1
- 				/* IDSEL 14 - IRQ3 USB2.0 */
--				7000 0 0 1 &mpic 3 1
--				7000 0 0 2 &mpic 3 1
--				7000 0 0 3 &mpic 3 1
--				7000 0 0 4 &mpic 3 1
-+				0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		};
- 	};
---- a/arch/powerpc/boot/dts/kuroboxHG.dts
-+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
-@@ -7,6 +7,7 @@
-  * Based on sandpoint.dts
-  *
-  * 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * This file is licensed under
-  * the terms of the GNU General Public License version 2.  This program
-@@ -17,6 +18,8 @@ XXXX add flash parts, rtc, ??
- 
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "KuroboxHG";
- 	compatible = "linkstation";
-@@ -35,19 +38,19 @@ XXXX add flash parts, rtc, ??
- 
- 		PowerPC,603e { /* Really 8241 */
- 			device_type = "cpu";
--			reg = <0>;
--			clock-frequency = <fdad680>;	/* Fixed by bootloader */
--			timebase-frequency = <1F04000>; /* Fixed by bootloader */
-+			reg = <0x0>;
-+			clock-frequency = <266000000>;	/* Fixed by bootloader */
-+			timebase-frequency = <32522240>; /* Fixed by bootloader */
- 			bus-frequency = <0>;		/* Fixed by bootloader */
- 			/* Following required by dtc but not used */
--			i-cache-size = <4000>;
--			d-cache-size = <4000>;
-+			i-cache-size = <0x4000>;
-+			d-cache-size = <0x4000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;
-+		reg = <0x0 0x8000000>;
- 	};
- 
- 	soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
-@@ -56,26 +59,26 @@ XXXX add flash parts, rtc, ??
- 		device_type = "soc";
- 		compatible = "mpc10x";
- 		store-gathering = <0>; /* 0 == off, !0 == on */
--		reg = <80000000 00100000>;
--		ranges = <80000000 80000000 70000000	/* pci mem space */
--			  fc000000 fc000000 00100000	/* EUMB */
--			  fe000000 fe000000 00c00000	/* pci i/o space */
--			  fec00000 fec00000 00300000	/* pci cfg regs */
--			  fef00000 fef00000 00100000>;	/* pci iack */
-+		reg = <0x80000000 0x100000>;
-+		ranges = <0x80000000 0x80000000 0x70000000	/* pci mem space */
-+			  0xfc000000 0xfc000000 0x100000	/* EUMB */
-+			  0xfe000000 0xfe000000 0xc00000	/* pci i/o space */
-+			  0xfec00000 0xfec00000 0x300000	/* pci cfg regs */
-+			  0xfef00000 0xfef00000 0x100000>;	/* pci iack */
- 
- 		i2c@80003000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <80003000 1000>;
-+			reg = <0x80003000 0x1000>;
- 			interrupts = <5 2>;
- 			interrupt-parent = <&mpic>;
- 
- 			rtc@32 {
- 				device_type = "rtc";
- 				compatible = "ricoh,rs5c372a";
--				reg = <32>;
-+				reg = <0x32>;
- 			};
- 		};
- 
-@@ -83,9 +86,9 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004500 8>;
--			clock-frequency = <7c044a8>;
--			current-speed = <2580>;
-+			reg = <0x80004500 0x8>;
-+			clock-frequency = <130041000>;
-+			current-speed = <9600>;
- 			interrupts = <9 0>;
- 			interrupt-parent = <&mpic>;
- 		};
-@@ -94,10 +97,10 @@ XXXX add flash parts, rtc, ??
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <80004600 8>;
--			clock-frequency = <7c044a8>;
--			current-speed = <e100>;
--			interrupts = <a 0>;
-+			reg = <0x80004600 0x8>;
-+			clock-frequency = <130041000>;
-+			current-speed = <57600>;
-+			interrupts = <10 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -107,7 +110,7 @@ XXXX add flash parts, rtc, ??
- 			device_type = "open-pic";
- 			compatible = "chrp,open-pic";
- 			interrupt-controller;
--			reg = <80040000 40000>;
-+			reg = <0x80040000 0x40000>;
- 		};
- 
- 		pci0: pci@fec00000 {
-@@ -116,29 +119,29 @@ XXXX add flash parts, rtc, ??
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
- 			compatible = "mpc10x-pci";
--			reg = <fec00000 400000>;
--			ranges = <01000000 0        0 fe000000 0 00c00000
--				  02000000 0 80000000 80000000 0 70000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <7f28155>;
-+			reg = <0xfec00000 0x400000>;
-+			ranges = <0x1000000 0x0        0x0 0xfe000000 0x0 0xc00000
-+				  0x2000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <133333333>;
- 			interrupt-parent = <&mpic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 11 - IRQ0 ETH */
--				5800 0 0 1 &mpic 0 1
--				5800 0 0 2 &mpic 1 1
--				5800 0 0 3 &mpic 2 1
--				5800 0 0 4 &mpic 3 1
-+				0x5800 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x5800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x5800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x5800 0x0 0x0 0x4 &mpic 0x3 0x1
- 				/* IDSEL 12 - IRQ1 IDE0 */
--				6000 0 0 1 &mpic 1 1
--				6000 0 0 2 &mpic 2 1
--				6000 0 0 3 &mpic 3 1
--				6000 0 0 4 &mpic 0 1
-+				0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x6000 0x0 0x0 0x4 &mpic 0x0 0x1
- 				/* IDSEL 14 - IRQ3 USB2.0 */
--				7000 0 0 1 &mpic 3 1
--				7000 0 0 2 &mpic 3 1
--				7000 0 0 3 &mpic 3 1
--				7000 0 0 4 &mpic 3 1
-+				0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				0x7000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		};
- 	};
---- a/arch/powerpc/boot/dts/makalu.dts
-+++ b/arch/powerpc/boot/dts/makalu.dts
-@@ -219,7 +219,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -247,7 +247,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
-+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC7448HPC2 (Taiga) board Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  * 2006 Roy Zang <Roy Zang at freescale.com>.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "mpc7448hpc2";
-@@ -23,11 +24,11 @@
- 				
- 		PowerPC,7448@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K bytes
--			i-cache-size = <8000>;		// L1, 32K bytes
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K bytes
-+			i-cache-size = <0x8000>;		// L1, 32K bytes
- 			timebase-frequency = <0>;	// 33 MHz, from uboot
- 			clock-frequency = <0>;		// From U-Boot
- 			bus-frequency = <0>;		// From U-Boot
-@@ -36,7 +37,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 20000000	// DDR2   512M at 0
-+		reg = <0x0 0x20000000	// DDR2   512M at 0
- 		       >;
- 	};
- 
-@@ -44,14 +45,14 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "tsi-bridge";
--		ranges = <00000000 c0000000 00010000>;
--		reg = <c0000000 00010000>;
-+		ranges = <0x0 0xc0000000 0x10000>;
-+		reg = <0xc0000000 0x10000>;
- 		bus-frequency = <0>;
- 
- 		i2c@7000 {
- 			interrupt-parent = <&mpic>;
--			interrupts = <E 0>;
--			reg = <7000 400>;
-+			interrupts = <14 0>;
-+			reg = <0x7000 0x400>;
- 			device_type = "i2c";
- 			compatible  = "tsi108-i2c";
- 		};
-@@ -59,20 +60,20 @@
- 		MDIO: mdio@6000 {
- 			device_type = "mdio";
- 			compatible = "tsi108-mdio";
--			reg = <6000 50>;
-+			reg = <0x6000 0x50>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			phy8: ethernet-phy@8 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <8>;
-+				reg = <0x8>;
- 			};
- 
- 			phy9: ethernet-phy@9 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <9>;
-+				reg = <0x9>;
- 			};
- 
- 		};
-@@ -82,9 +83,9 @@
- 			#size-cells = <0>;
- 			device_type = "network";
- 			compatible = "tsi108-ethernet";
--			reg = <6000 200>;
-+			reg = <0x6000 0x200>;
- 			address = [ 00 06 D2 00 00 01 ];
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 			interrupt-parent = <&mpic>;
- 			mdio-handle = <&MDIO>;
- 			phy-handle = <&phy8>;
-@@ -96,9 +97,9 @@
- 			#size-cells = <0>;
- 			device_type = "network";
- 			compatible = "tsi108-ethernet";
--			reg = <6400 200>;
-+			reg = <0x6400 0x200>;
- 			address = [ 00 06 D2 00 00 02 ];
--			interrupts = <11 2>;
-+			interrupts = <17 2>;
- 			interrupt-parent = <&mpic>;
- 			mdio-handle = <&MDIO>;
- 			phy-handle = <&phy9>;
-@@ -107,18 +108,18 @@
- 		serial@7808 {
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <7808 200>;
--			clock-frequency = <3f6b5a00>;
--			interrupts = <c 0>;
-+			reg = <0x7808 0x200>;
-+			clock-frequency = <1064000000>;
-+			interrupts = <12 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		serial@7c08 {
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <7c08 200>;
--			clock-frequency = <3f6b5a00>;
--			interrupts = <d 0>;
-+			reg = <0x7c08 0x200>;
-+			clock-frequency = <1064000000>;
-+			interrupts = <13 0>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -127,7 +128,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <7400 400>;
-+			reg = <0x7400 0x400>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                        	big-endian;
-@@ -138,39 +139,39 @@
- 			#interrupt-cells = <1>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
--			reg = <1000 1000>;
-+			reg = <0x1000 0x1000>;
- 			bus-range = <0 0>;
--			ranges = <02000000 0 e0000000 e0000000 0 1A000000	
--				  01000000 0 00000000 fa000000 0 00010000>;
--			clock-frequency = <7f28154>;
-+			ranges = <0x2000000 0x0 0xe0000000 0xe0000000 0x0 0x1a000000	
-+				  0x1000000 0x0 0x0 0xfa000000 0x0 0x10000>;
-+			clock-frequency = <133333332>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <17 2>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupts = <23 2>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 
- 				/* IDSEL 0x11 */
--				0800 0 0 1 &RT0 24 0
--				0800 0 0 2 &RT0 25 0
--				0800 0 0 3 &RT0 26 0
--				0800 0 0 4 &RT0 27 0
-+				0x800 0x0 0x0 0x1 &RT0 0x24 0x0
-+				0x800 0x0 0x0 0x2 &RT0 0x25 0x0
-+				0x800 0x0 0x0 0x3 &RT0 0x26 0x0
-+				0x800 0x0 0x0 0x4 &RT0 0x27 0x0
- 
- 				/* IDSEL 0x12 */
--				1000 0 0 1 &RT0 25 0
--				1000 0 0 2 &RT0 26 0
--				1000 0 0 3 &RT0 27 0
--				1000 0 0 4 &RT0 24 0
-+				0x1000 0x0 0x0 0x1 &RT0 0x25 0x0
-+				0x1000 0x0 0x0 0x2 &RT0 0x26 0x0
-+				0x1000 0x0 0x0 0x3 &RT0 0x27 0x0
-+				0x1000 0x0 0x0 0x4 &RT0 0x24 0x0
- 
- 				/* IDSEL 0x13 */
--				1800 0 0 1 &RT0 26 0
--				1800 0 0 2 &RT0 27 0
--				1800 0 0 3 &RT0 24 0
--				1800 0 0 4 &RT0 25 0
-+				0x1800 0x0 0x0 0x1 &RT0 0x26 0x0
-+				0x1800 0x0 0x0 0x2 &RT0 0x27 0x0
-+				0x1800 0x0 0x0 0x3 &RT0 0x24 0x0
-+				0x1800 0x0 0x0 0x4 &RT0 0x25 0x0
- 
- 				/* IDSEL 0x14 */
--				2000 0 0 1 &RT0 27 0
--				2000 0 0 2 &RT0 24 0
--				2000 0 0 3 &RT0 25 0
--				2000 0 0 4 &RT0 26 0
-+				0x2000 0x0 0x0 0x1 &RT0 0x27 0x0
-+				0x2000 0x0 0x0 0x2 &RT0 0x24 0x0
-+				0x2000 0x0 0x0 0x3 &RT0 0x25 0x0
-+				0x2000 0x0 0x0 0x4 &RT0 0x26 0x0
- 				>;
- 
- 			RT0: router@1180 {
-@@ -180,7 +181,7 @@
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
- 				big-endian;
--				interrupts = <17 2>;
-+				interrupts = <23 2>;
- 				interrupt-parent = <&mpic>;
- 			};
- 		};
---- a/arch/powerpc/boot/dts/mpc8272ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8272 ADS Device Tree Source
-  *
-- * Copyright 2005 Freescale Semiconductor Inc.
-+ * Copyright 2005,2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,8 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "MPC8272ADS";
- 	compatible = "fsl,mpc8272ads";
-@@ -21,11 +23,11 @@
- 
- 		PowerPC,8272@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#32>;
--			i-cache-line-size = <d#32>;
--			d-cache-size = <d#16384>;
--			i-cache-size = <d#16384>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <16384>;
-+			i-cache-size = <16384>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -34,7 +36,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@f0010100 {
-@@ -42,21 +44,21 @@
- 		             "fsl,pq2-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <f0010100 40>;
-+		reg = <0xf0010100 0x40>;
- 
--		ranges = <0 0 fe000000 02000000
--		          1 0 f4500000 00008000
--		          3 0 f8200000 00008000>;
-+		ranges = <0x0 0x0 0xfe000000 0x2000000
-+		          0x1 0x0 0xf4500000 0x8000
-+		          0x3 0x0 0xf8200000 0x8000>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 2000000>;
-+			reg = <0x0 0x0 0x2000000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		board-control@1,0 {
--			reg = <1 0 20>;
-+			reg = <0x1 0x0 0x20>;
- 			compatible = "fsl,mpc8272ads-bcsr";
- 		};
- 
-@@ -65,46 +67,46 @@
- 			             "fsl,pq2ads-pci-pic";
- 			#interrupt-cells = <1>;
- 			interrupt-controller;
--			reg = <3 0 8>;
-+			reg = <0x3 0x0 0x8>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <14 8>;
-+			interrupts = <20 8>;
- 		};
- 	};
- 
- 
- 	pci@f0010800 {
- 		device_type = "pci";
--		reg = <f0010800 10c f00101ac 8 f00101c4 8>;
-+		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
- 		compatible = "fsl,mpc8272-pci", "fsl,pq2-pci";
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		clock-frequency = <d#66666666>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		clock-frequency = <66666666>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 		                 /* IDSEL 0x16 */
--		                 b000 0 0 1 &PCI_PIC 0
--		                 b000 0 0 2 &PCI_PIC 1
--		                 b000 0 0 3 &PCI_PIC 2
--		                 b000 0 0 4 &PCI_PIC 3
-+		                 0xb000 0x0 0x0 0x1 &PCI_PIC 0
-+		                 0xb000 0x0 0x0 0x2 &PCI_PIC 1
-+		                 0xb000 0x0 0x0 0x3 &PCI_PIC 2
-+		                 0xb000 0x0 0x0 0x4 &PCI_PIC 3
- 
- 		                 /* IDSEL 0x17 */
--		                 b800 0 0 1 &PCI_PIC 4
--		                 b800 0 0 2 &PCI_PIC 5
--		                 b800 0 0 3 &PCI_PIC 6
--		                 b800 0 0 4 &PCI_PIC 7
-+		                 0xb800 0x0 0x0 0x1 &PCI_PIC 4
-+		                 0xb800 0x0 0x0 0x2 &PCI_PIC 5
-+		                 0xb800 0x0 0x0 0x3 &PCI_PIC 6
-+		                 0xb800 0x0 0x0 0x4 &PCI_PIC 7
- 
- 		                 /* IDSEL 0x18 */
--		                 c000 0 0 1 &PCI_PIC 8
--		                 c000 0 0 2 &PCI_PIC 9
--		                 c000 0 0 3 &PCI_PIC a
--		                 c000 0 0 4 &PCI_PIC b>;
-+		                 0xc000 0x0 0x0 0x1 &PCI_PIC 8
-+		                 0xc000 0x0 0x0 0x2 &PCI_PIC 9
-+		                 0xc000 0x0 0x0 0x3 &PCI_PIC 10
-+		                 0xc000 0x0 0x0 0x4 &PCI_PIC 11>;
- 
- 		interrupt-parent = <&PIC>;
--		interrupts = <12 8>;
--		ranges = <42000000 0 80000000 80000000 0 20000000
--		          02000000 0 a0000000 a0000000 0 20000000
--		          01000000 0 00000000 f6000000 0 02000000>;
-+		interrupts = <18 8>;
-+		ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+		          0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+		          0x1000000 0x0 0x0 0xf6000000 0x0 0x2000000>;
- 	};
- 
- 	soc@f0000000 {
-@@ -112,26 +114,26 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 		compatible = "fsl,mpc8272", "fsl,pq2-soc";
--		ranges = <00000000 f0000000 00053000>;
-+		ranges = <0x0 0xf0000000 0x53000>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <f0000000 00053000>;
-+		reg = <0xf0000000 0x53000>;
- 
- 		cpm@119c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
--			reg = <119c0 30>;
-+			reg = <0x119c0 0x30>;
- 			ranges;
- 
- 			muram@0 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 0 10000>;
-+				ranges = <0x0 0x0 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9800 800>;
-+					reg = <0x0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -139,29 +141,29 @@
- 				compatible = "fsl,mpc8272-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <119f0 10 115f0 10>;
-+				reg = <0x119f0 0x10 0x115f0 0x10>;
- 			};
- 
- 			serial@11a00 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8272-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a00 20 8000 100>;
--				interrupts = <28 8>;
-+				reg = <0x11a00 0x20 0x8000 0x100>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
-+				fsl,cpm-command = <0x800000>;
- 			};
- 
- 			serial@11a60 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8272-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a60 20 8300 100>;
--				interrupts = <2b 8>;
-+				reg = <0x11a60 0x20 0x8300 0x100>;
-+				interrupts = <43 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <4>;
--				fsl,cpm-command = <0ce00000>;
-+				fsl,cpm-command = <0xce00000>;
- 			};
- 
- 			mdio@10d40 {
-@@ -169,23 +171,23 @@
- 				compatible = "fsl,mpc8272ads-mdio-bitbang",
- 				             "fsl,mpc8272-mdio-bitbang",
- 				             "fsl,cpm2-mdio-bitbang";
--				reg = <10d40 14>;
-+				reg = <0x10d40 0x14>;
- 				#address-cells = <1>;
- 				#size-cells = <0>;
--				fsl,mdio-pin = <12>;
--				fsl,mdc-pin = <13>;
-+				fsl,mdio-pin = <18>;
-+				fsl,mdc-pin = <19>;
- 
- 				PHY0: ethernet-phy@0 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <17 8>;
--					reg = <0>;
-+					interrupts = <23 8>;
-+					reg = <0x0>;
- 					device_type = "ethernet-phy";
- 				};
- 
- 				PHY1: ethernet-phy@1 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <17 8>;
--					reg = <3>;
-+					interrupts = <23 8>;
-+					reg = <0x3>;
- 					device_type = "ethernet-phy";
- 				};
- 			};
-@@ -194,33 +196,33 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8272-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11300 20 8400 100 11390 1>;
-+				reg = <0x11300 0x20 0x8400 0x100 0x11390 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <20 8>;
-+				interrupts = <32 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY0>;
- 				linux,network-index = <0>;
--				fsl,cpm-command = <12000300>;
-+				fsl,cpm-command = <0x12000300>;
- 			};
- 
- 			ethernet@11320 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8272-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11320 20 8500 100 113b0 1>;
-+				reg = <0x11320 0x20 0x8500 0x100 0x113b0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <21 8>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY1>;
- 				linux,network-index = <1>;
--				fsl,cpm-command = <16200300>;
-+				fsl,cpm-command = <0x16200300>;
- 			};
- 		};
- 
- 		PIC: interrupt-controller@10c00 {
- 			#interrupt-cells = <2>;
- 			interrupt-controller;
--			reg = <10c00 80>;
-+			reg = <0x10c00 0x80>;
- 			compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
- 		};
- 
-@@ -232,14 +234,14 @@
- 			             "fsl,talitos-sec2",
- 			             "fsl,talitos",
- 			             "talitos";
--			reg = <30000 10000>;
--			interrupts = <b 8>;
-+			reg = <0x30000 0x10000>;
-+			interrupts = <11 8>;
- 			interrupt-parent = <&PIC>;
- 			num-channels = <4>;
--			channel-fifo-len = <18>;
--			exec-units-mask = <0000007e>;
-+			channel-fifo-len = <24>;
-+			exec-units-mask = <0x7e>;
- /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
--			descriptor-types-mask = <01010ebf>;
-+			descriptor-types-mask = <0x1010ebf>;
- 		};
- 	};
- 
---- a/arch/powerpc/boot/dts/mpc832x_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
-@@ -255,9 +255,7 @@
- 		enet0: ucc@2200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <3>;
--			device-id = <3>;
- 			reg = <0x2200 0x200>;
- 			interrupts = <34>;
- 			interrupt-parent = <&qeic>;
-@@ -271,9 +269,7 @@
- 		enet1: ucc@3200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <4>;
--			device-id = <4>;
- 			reg = <0x3200 0x200>;
- 			interrupts = <35>;
- 			interrupt-parent = <&qeic>;
-@@ -287,8 +283,7 @@
- 		ucc@2400 {
- 			device_type = "serial";
- 			compatible = "ucc_uart";
--			model = "UCC";
--			device-id = <5>;	/* The UCC number, 1-7*/
-+			cell-index = <5>;	/* The UCC number, 1-7*/
- 			port-number = <0>;	/* Which ttyQEx device */
- 			soft-uart;		/* We need Soft-UART */
- 			reg = <0x2400 0x200>;
---- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
-+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
-@@ -208,9 +208,7 @@
- 		enet0: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
- 			reg = <0x3000 0x200>;
- 			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
-@@ -224,9 +222,7 @@
- 		enet1: ucc@2200 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <3>;
--			device-id = <3>;
- 			reg = <0x2200 0x200>;
- 			interrupts = <34>;
- 			interrupt-parent = <&qeic>;
---- a/arch/powerpc/boot/dts/mpc836x_mds.dts
-+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
-@@ -257,9 +257,7 @@
- 		enet0: ucc@2000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <1>;
--			device-id = <1>;
- 			reg = <0x2000 0x200>;
- 			interrupts = <32>;
- 			interrupt-parent = <&qeic>;
-@@ -274,9 +272,7 @@
- 		enet1: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
- 			reg = <0x3000 0x200>;
- 			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
---- a/arch/powerpc/boot/dts/mpc8540ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8540 ADS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8540ADS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8540@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8540@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00100000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x100000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8540-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8540-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,24 +87,24 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -113,9 +114,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -125,9 +126,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -137,9 +138,9 @@
- 			device_type = "network";
- 			model = "FEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <29 2>;
-+			interrupts = <41 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -148,9 +149,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -158,9 +159,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 		mpic: pic@40000 {
-@@ -168,7 +169,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -177,90 +178,90 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x02 */
--			1000 0 0 1 &mpic 1 1
--			1000 0 0 2 &mpic 2 1
--			1000 0 0 3 &mpic 3 1
--			1000 0 0 4 &mpic 4 1
-+			0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x03 */
--			1800 0 0 1 &mpic 4 1
--			1800 0 0 2 &mpic 1 1
--			1800 0 0 3 &mpic 2 1
--			1800 0 0 4 &mpic 3 1
-+			0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x04 */
--			2000 0 0 1 &mpic 3 1
--			2000 0 0 2 &mpic 4 1
--			2000 0 0 3 &mpic 1 1
--			2000 0 0 4 &mpic 2 1
-+			0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x05 */
--			2800 0 0 1 &mpic 2 1
--			2800 0 0 2 &mpic 3 1
--			2800 0 0 3 &mpic 4 1
--			2800 0 0 4 &mpic 1 1
-+			0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x0c */
--			6000 0 0 1 &mpic 1 1
--			6000 0 0 2 &mpic 2 1
--			6000 0 0 3 &mpic 3 1
--			6000 0 0 4 &mpic 4 1
-+			0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x0d */
--			6800 0 0 1 &mpic 4 1
--			6800 0 0 2 &mpic 1 1
--			6800 0 0 3 &mpic 2 1
--			6800 0 0 4 &mpic 3 1
-+			0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x0e */
--			7000 0 0 1 &mpic 3 1
--			7000 0 0 2 &mpic 4 1
--			7000 0 0 3 &mpic 1 1
--			7000 0 0 4 &mpic 2 1
-+			0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x0f */
--			7800 0 0 1 &mpic 2 1
--			7800 0 0 2 &mpic 3 1
--			7800 0 0 3 &mpic 4 1
--			7800 0 0 4 &mpic 1 1
-+			0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 */
--			9000 0 0 1 &mpic 1 1
--			9000 0 0 2 &mpic 2 1
--			9000 0 0 3 &mpic 3 1
--			9000 0 0 4 &mpic 4 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x13 */
--			9800 0 0 1 &mpic 4 1
--			9800 0 0 2 &mpic 1 1
--			9800 0 0 3 &mpic 2 1
--			9800 0 0 4 &mpic 3 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x14 */
--			a000 0 0 1 &mpic 3 1
--			a000 0 0 2 &mpic 4 1
--			a000 0 0 3 &mpic 1 1
--			a000 0 0 4 &mpic 2 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic 2 1
--			a800 0 0 2 &mpic 3 1
--			a800 0 0 3 &mpic 4 1
--			a800 0 0 4 &mpic 1 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8541cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8541 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8541CDS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8541@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8541@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8541-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8541-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,18 +87,18 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -107,9 +108,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -119,9 +120,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -130,9 +131,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -140,9 +141,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -151,7 +152,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -161,17 +162,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8541-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9000 1000>;
-+					reg = <0x0 0x2000 0x9000 0x1000>;
- 				};
- 			};
- 
-@@ -179,16 +180,16 @@
- 				compatible = "fsl,mpc8541-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
- 			};
- 		};
-@@ -196,68 +197,68 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <1f800 0 0 7>;
-+		interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x10 */
--			08000 0 0 1 &mpic 0 1
--			08000 0 0 2 &mpic 1 1
--			08000 0 0 3 &mpic 2 1
--			08000 0 0 4 &mpic 3 1
-+			0x8000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x11 */
--			08800 0 0 1 &mpic 0 1
--			08800 0 0 2 &mpic 1 1
--			08800 0 0 3 &mpic 2 1
--			08800 0 0 4 &mpic 3 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x12 (Slot 1) */
--			09000 0 0 1 &mpic 0 1
--			09000 0 0 2 &mpic 1 1
--			09000 0 0 3 &mpic 2 1
--			09000 0 0 4 &mpic 3 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x13 (Slot 2) */
--			09800 0 0 1 &mpic 1 1
--			09800 0 0 2 &mpic 2 1
--			09800 0 0 3 &mpic 3 1
--			09800 0 0 4 &mpic 0 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x14 (Slot 3) */
--			0a000 0 0 1 &mpic 2 1
--			0a000 0 0 2 &mpic 3 1
--			0a000 0 0 3 &mpic 0 1
--			0a000 0 0 4 &mpic 1 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x15 (Slot 4) */
--			0a800 0 0 1 &mpic 3 1
--			0a800 0 0 2 &mpic 0 1
--			0a800 0 0 3 &mpic 1 1
--			0a800 0 0 4 &mpic 2 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x0 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* Bus 1 (Tundra Bridge) */
- 			/* IDSEL 0x12 (ISA bridge) */
--			19000 0 0 1 &mpic 0 1
--			19000 0 0 2 &mpic 1 1
--			19000 0 0 3 &mpic 2 1
--			19000 0 0 4 &mpic 3 1>;
-+			0x19000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x19000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x19000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x19000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		i8259@19000 {
- 			interrupt-controller;
- 			device_type = "interrupt-controller";
--			reg = <19000 0 0 0 1>;
-+			reg = <0x19000 0x0 0x0 0x0 0x1>;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
- 			compatible = "chrp,iic";
-@@ -268,24 +269,24 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic b 1
--			a800 0 0 3 &mpic b 1
--			a800 0 0 4 &mpic b 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0xb 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8544ds.dts
-+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8544 DS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- / {
- 	model = "MPC8544DS";
- 	compatible = "MPC8544DS", "MPC85xxDS";
-@@ -27,17 +28,16 @@
- 	};
- 
- 	cpus {
--		#cpus = <1>;
- 		#address-cells = <1>;
- 		#size-cells = <0>;
- 
- 		PowerPC,8544@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -46,7 +46,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 00000000>;	// Filled by U-Boot
-+		reg = <0x0 0x0>;	// Filled by U-Boot
- 	};
- 
- 	soc8544@e0000000 {
-@@ -54,24 +54,24 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 
--		ranges = <00000000 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;		// Filled out by uboot.
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8544-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8544-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -79,8 +79,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -90,8 +90,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -100,30 +100,71 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <0>;
-+				interrupts = <10 1>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <1>;
-+				interrupts = <10 1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
- 
-+		dma@21300 {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			compatible = "fsl,mpc8544-dma", "fsl,eloplus-dma";
-+			reg = <0x21300 0x4>;
-+			ranges = <0x0 0x21100 0x200>;
-+			cell-index = <0>;
-+			dma-channel@0 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x0 0x80>;
-+				cell-index = <0>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <20 2>;
-+			};
-+			dma-channel@80 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x80 0x80>;
-+				cell-index = <1>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <21 2>;
-+			};
-+			dma-channel@100 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x100 0x80>;
-+				cell-index = <2>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <22 2>;
-+			};
-+			dma-channel@180 {
-+				compatible = "fsl,mpc8544-dma-channel",
-+						"fsl,eloplus-dma-channel";
-+				reg = <0x180 0x80>;
-+				cell-index = <3>;
-+				interrupt-parent = <&mpic>;
-+				interrupts = <23 2>;
-+			};
-+		};
-+
- 		enet0: ethernet@24000 {
- 			cell-index = <0>;
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 			phy-connection-type = "rgmii-id";
-@@ -134,9 +175,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 			phy-connection-type = "rgmii-id";
-@@ -146,9 +187,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -156,15 +197,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -173,7 +214,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -184,32 +225,32 @@
- 		cell-index = <0>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x11 J17 Slot 1 */
--			8800 0 0 1 &mpic 2 1
--			8800 0 0 2 &mpic 3 1
--			8800 0 0 3 &mpic 4 1
--			8800 0 0 4 &mpic 1 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 J16 Slot 2 */
- 
--			9000 0 0 1 &mpic 3 1
--			9000 0 0 2 &mpic 4 1
--			9000 0 0 3 &mpic 2 1
--			9000 0 0 4 &mpic 1 1>;
-+			0x9000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 c0000000 c0000000 0 20000000
--			  01000000 0 00000000 e1000000 0 00010000>;
--		clock-frequency = <3f940aa>;
-+		interrupts = <24 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe1000000 0x0 0x10000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 	};
- 
- 	pci1: pcie@e0009000 {
-@@ -219,33 +260,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e1010000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe0009000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <26 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 4 1
--			0000 0 0 2 &mpic 5 1
--			0000 0 0 3 &mpic 6 1
--			0000 0 0 4 &mpic 7 1
-+			0000 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x5 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x6 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x7 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00010000>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x10000>;
- 		};
- 	};
- 
-@@ -256,33 +297,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 10000000
--			  01000000 0 00000000 e1020000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe000a000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <25 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 0 1
--			0000 0 0 2 &mpic 1 1
--			0000 0 0 3 &mpic 2 1
--			0000 0 0 4 &mpic 3 1
-+			0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 10000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00010000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x10000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x10000>;
- 		};
- 	};
- 
-@@ -293,72 +334,72 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000b000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 b0000000 b0000000 0 00100000
--			  01000000 0 00000000 b0100000 0 00100000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xe000b000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xb0000000 0xb0000000 0x0 0x100000
-+			  0x1000000 0x0 0x0 0xb0100000 0x0 0x100000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1b 2>;
--		interrupt-map-mask = <ff00 0 0 1>;
-+		interrupts = <27 2>;
-+		interrupt-map-mask = <0xff00 0x0 0x0 0x1>;
- 		interrupt-map = <
- 			// IDSEL 0x1c  USB
--			e000 0 0 1 &i8259 c 2
--			e100 0 0 2 &i8259 9 2
--			e200 0 0 3 &i8259 a 2
--			e300 0 0 4 &i8259 b 2
-+			0xe000 0x0 0x0 0x1 &i8259 0xc 0x2
-+			0xe100 0x0 0x0 0x2 &i8259 0x9 0x2
-+			0xe200 0x0 0x0 0x3 &i8259 0xa 0x2
-+			0xe300 0x0 0x0 0x4 &i8259 0xb 0x2
- 
- 			// IDSEL 0x1d  Audio
--			e800 0 0 1 &i8259 6 2
-+			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
- 
- 			// IDSEL 0x1e Legacy
--			f000 0 0 1 &i8259 7 2
--			f100 0 0 1 &i8259 7 2
-+			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-+			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
- 
- 			// IDSEL 0x1f IDE/SATA
--			f800 0 0 1 &i8259 e 2
--			f900 0 0 1 &i8259 5 2
-+			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-+			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
- 		>;
- 
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 b0000000
--				  02000000 0 b0000000
--				  0 00100000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xb0000000
-+				  0x2000000 0x0 0xb0000000
-+				  0x0 0x100000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 
- 			uli1575@0 {
--				reg = <0 0 0 0 0>;
-+				reg = <0x0 0x0 0x0 0x0 0x0>;
- 				#size-cells = <2>;
- 				#address-cells = <3>;
--				ranges = <02000000 0 b0000000
--					  02000000 0 b0000000
--					  0 00100000
--
--					  01000000 0 00000000
--					  01000000 0 00000000
--					  0 00100000>;
-+				ranges = <0x2000000 0x0 0xb0000000
-+					  0x2000000 0x0 0xb0000000
-+					  0x0 0x100000
-+
-+					  0x1000000 0x0 0x0
-+					  0x1000000 0x0 0x0
-+					  0x0 0x100000>;
- 				isa@1e {
- 					device_type = "isa";
- 					#interrupt-cells = <2>;
- 					#size-cells = <1>;
- 					#address-cells = <2>;
--					reg = <f000 0 0 0 0>;
--					ranges = <1 0
--						  01000000 0 0
--						  00001000>;
-+					reg = <0xf000 0x0 0x0 0x0 0x0>;
-+					ranges = <0x1 0x0
-+						  0x1000000 0x0 0x0
-+						  0x1000>;
- 					interrupt-parent = <&i8259>;
- 
- 					i8259: interrupt-controller@20 {
--						reg = <1 20 2
--						       1 a0 2
--						       1 4d0 2>;
-+						reg = <0x1 0x20 0x2
-+						       0x1 0xa0 0x2
-+						       0x1 0x4d0 0x2>;
- 						interrupt-controller;
- 						device_type = "interrupt-controller";
- 						#address-cells = <0>;
-@@ -371,28 +412,28 @@
- 					i8042@60 {
- 						#size-cells = <0>;
- 						#address-cells = <1>;
--						reg = <1 60 1 1 64 1>;
--						interrupts = <1 3 c 3>;
-+						reg = <0x1 0x60 0x1 0x1 0x64 0x1>;
-+						interrupts = <1 3 12 3>;
- 						interrupt-parent = <&i8259>;
- 
- 						keyboard@0 {
--							reg = <0>;
-+							reg = <0x0>;
- 							compatible = "pnpPNP,303";
- 						};
- 
- 						mouse@1 {
--							reg = <1>;
-+							reg = <0x1>;
- 							compatible = "pnpPNP,f03";
- 						};
- 					};
- 
- 					rtc@70 {
- 						compatible = "pnpPNP,b00";
--						reg = <1 70 2>;
-+						reg = <0x1 0x70 0x2>;
- 					};
- 
- 					gpio@400 {
--						reg = <1 400 80>;
-+						reg = <0x1 0x400 0x80>;
- 					};
- 				};
- 			};
---- a/arch/powerpc/boot/dts/mpc8548cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8548 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8548CDS";
-@@ -36,11 +37,11 @@
- 
- 		PowerPC,8548@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -49,31 +50,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8548@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <00000000 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8548-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8548-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -81,8 +82,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -92,8 +93,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -102,30 +103,30 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -135,9 +136,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -147,9 +148,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -160,9 +161,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 		};
-@@ -172,9 +173,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <27000 1000>;
-+			reg = <0x27000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <25 2 26 2 27 2>;
-+			interrupts = <37 2 38 2 39 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -184,9 +185,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;	// reg base, size
-+			reg = <0x4500 0x100>;	// reg base, size
- 			clock-frequency = <0>;	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -194,15 +195,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>;	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities reg
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -211,7 +212,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -220,139 +221,139 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x4 (PCIX Slot 2) */
--			02000 0 0 1 &mpic 0 1
--			02000 0 0 2 &mpic 1 1
--			02000 0 0 3 &mpic 2 1
--			02000 0 0 4 &mpic 3 1
-+			0x2000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x2000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x2000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x2000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x5 (PCIX Slot 3) */
--			02800 0 0 1 &mpic 1 1
--			02800 0 0 2 &mpic 2 1
--			02800 0 0 3 &mpic 3 1
--			02800 0 0 4 &mpic 0 1
-+			0x2800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x2800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x2800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x2800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x6 (PCIX Slot 4) */
--			03000 0 0 1 &mpic 2 1
--			03000 0 0 2 &mpic 3 1
--			03000 0 0 3 &mpic 0 1
--			03000 0 0 4 &mpic 1 1
-+			0x3000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x3000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x3000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0x3000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x8 (PCIX Slot 5) */
--			04000 0 0 1 &mpic 0 1
--			04000 0 0 2 &mpic 1 1
--			04000 0 0 3 &mpic 2 1
--			04000 0 0 4 &mpic 3 1
-+			0x4000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x4000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x4000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x4000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0xC (Tsi310 bridge) */
--			06000 0 0 1 &mpic 0 1
--			06000 0 0 2 &mpic 1 1
--			06000 0 0 3 &mpic 2 1
--			06000 0 0 4 &mpic 3 1
-+			0x6000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x6000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x6000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x6000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x14 (Slot 2) */
--			0a000 0 0 1 &mpic 0 1
--			0a000 0 0 2 &mpic 1 1
--			0a000 0 0 3 &mpic 2 1
--			0a000 0 0 4 &mpic 3 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x15 (Slot 3) */
--			0a800 0 0 1 &mpic 1 1
--			0a800 0 0 2 &mpic 2 1
--			0a800 0 0 3 &mpic 3 1
--			0a800 0 0 4 &mpic 0 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x16 (Slot 4) */
--			0b000 0 0 1 &mpic 2 1
--			0b000 0 0 2 &mpic 3 1
--			0b000 0 0 3 &mpic 0 1
--			0b000 0 0 4 &mpic 1 1
-+			0xb000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xb000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xb000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xb000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x18 (Slot 5) */
--			0c000 0 0 1 &mpic 0 1
--			0c000 0 0 2 &mpic 1 1
--			0c000 0 0 3 &mpic 2 1
--			0c000 0 0 4 &mpic 3 1
-+			0xc000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xc000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xc000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xc000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x1C (Tsi310 bridge PCI primary) */
--			0E000 0 0 1 &mpic 0 1
--			0E000 0 0 2 &mpic 1 1
--			0E000 0 0 3 &mpic 2 1
--			0E000 0 0 4 &mpic 3 1>;
-+			0xe000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0xe000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xe000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xe000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 10000000
--			  01000000 0 00000000 e2000000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		pci_bridge@1c {
--			interrupt-map-mask = <f800 0 0 7>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 
- 				/* IDSEL 0x00 (PrPMC Site) */
--				0000 0 0 1 &mpic 0 1
--				0000 0 0 2 &mpic 1 1
--				0000 0 0 3 &mpic 2 1
--				0000 0 0 4 &mpic 3 1
-+				0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x04 (VIA chip) */
--				2000 0 0 1 &mpic 0 1
--				2000 0 0 2 &mpic 1 1
--				2000 0 0 3 &mpic 2 1
--				2000 0 0 4 &mpic 3 1
-+				0x2000 0x0 0x0 0x1 &mpic 0x0 0x1
-+				0x2000 0x0 0x0 0x2 &mpic 0x1 0x1
-+				0x2000 0x0 0x0 0x3 &mpic 0x2 0x1
-+				0x2000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x05 (8139) */
--				2800 0 0 1 &mpic 1 1
-+				0x2800 0x0 0x0 0x1 &mpic 0x1 0x1
- 
- 				/* IDSEL 0x06 (Slot 6) */
--				3000 0 0 1 &mpic 2 1
--				3000 0 0 2 &mpic 3 1
--				3000 0 0 3 &mpic 0 1
--				3000 0 0 4 &mpic 1 1
-+				0x3000 0x0 0x0 0x1 &mpic 0x2 0x1
-+				0x3000 0x0 0x0 0x2 &mpic 0x3 0x1
-+				0x3000 0x0 0x0 0x3 &mpic 0x0 0x1
-+				0x3000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDESL 0x07 (Slot 7) */
--				3800 0 0 1 &mpic 3 1
--				3800 0 0 2 &mpic 0 1
--				3800 0 0 3 &mpic 1 1
--				3800 0 0 4 &mpic 2 1>;
-+				0x3800 0x0 0x0 0x1 &mpic 0x3 0x1
-+				0x3800 0x0 0x0 0x2 &mpic 0x0 0x1
-+				0x3800 0x0 0x0 0x3 &mpic 0x1 0x1
-+				0x3800 0x0 0x0 0x4 &mpic 0x2 0x1>;
- 
--			reg = <e000 0 0 0 0>;
-+			reg = <0xe000 0x0 0x0 0x0 0x0>;
- 			#interrupt-cells = <1>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00080000>;
--			clock-frequency = <1fca055>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x80000>;
-+			clock-frequency = <33333333>;
- 
- 			isa@4 {
- 				device_type = "isa";
- 				#interrupt-cells = <2>;
- 				#size-cells = <1>;
- 				#address-cells = <2>;
--				reg = <2000 0 0 0 0>;
--				ranges = <1 0 01000000 0 0 00001000>;
-+				reg = <0x2000 0x0 0x0 0x0 0x0>;
-+				ranges = <0x1 0x0 0x1000000 0x0 0x0 0x1000>;
- 				interrupt-parent = <&i8259>;
- 
- 				i8259: interrupt-controller@20 {
- 					interrupt-controller;
- 					device_type = "interrupt-controller";
--					reg = <1 20 2
--					       1 a0 2
--					       1 4d0 2>;
-+					reg = <0x1 0x20 0x2
-+					       0x1 0xa0 0x2
-+					       0x1 0x4d0 0x2>;
- 					#address-cells = <0>;
- 					#interrupt-cells = <2>;
- 					compatible = "chrp,iic";
-@@ -362,7 +363,7 @@
- 
- 				rtc@70 {
- 					compatible = "pnpPNP,b00";
--					reg = <1 70 2>;
-+					reg = <0x1 0x70 0x2>;
- 				};
- 			};
- 		};
-@@ -370,64 +371,64 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic 1 1
--			a800 0 0 3 &mpic 2 1
--			a800 0 0 4 &mpic 3 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 90000000 90000000 0 10000000
--			  01000000 0 00000000 e2800000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x90000000 0x90000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
- 
- 	pci2: pcie@e000a000 {
- 		cell-index = <2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x0 (PEX) */
--			00000 0 0 1 &mpic 0 1
--			00000 0 0 2 &mpic 1 1
--			00000 0 0 3 &mpic 2 1
--			00000 0 0 4 &mpic 3 1>;
-+			00000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			00000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			00000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			00000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 08000000>;
--		clock-frequency = <1fca055>;
-+		interrupts = <26 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>;
-+		clock-frequency = <33333333>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
-+		reg = <0xe000a000 0x1000>;
- 		compatible = "fsl,mpc8548-pcie";
- 		device_type = "pci";
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 08000000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x8000000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8555cds.dts
-+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8555 CDS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8555CDS";
-@@ -31,11 +32,11 @@
- 
- 		PowerPC,8555@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;	//  33 MHz, from uboot
- 			bus-frequency = <0>;	// 166 MHz
- 			clock-frequency = <0>;	// 825 MHz, from uboot
-@@ -44,31 +45,31 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 08000000>;	// 128M at 0x0
-+		reg = <0x0 0x8000000>;	// 128M at 0x0
- 	};
- 
- 	soc8555@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;	// CCSRBAR 1M
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;	// CCSRBAR 1M
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8555-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8555-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -76,8 +77,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -86,18 +87,18 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -107,9 +108,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -119,9 +120,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -130,9 +131,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>; 	// reg base, size
-+			reg = <0x4500 0x100>; 	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -140,9 +141,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;	// reg base, size
-+			reg = <0x4600 0x100>;	// reg base, size
- 			clock-frequency = <0>; 	// should we fill in in uboot?
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -151,7 +152,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
-@@ -161,17 +162,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9000 1000>;
-+					reg = <0x0 0x2000 0x9000 0x1000>;
- 				};
- 			};
- 
-@@ -179,16 +180,16 @@
- 				compatible = "fsl,mpc8555-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
- 			};
- 		};
-@@ -196,68 +197,68 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <1f800 0 0 7>;
-+		interrupt-map-mask = <0x1f800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x10 */
--			08000 0 0 1 &mpic 0 1
--			08000 0 0 2 &mpic 1 1
--			08000 0 0 3 &mpic 2 1
--			08000 0 0 4 &mpic 3 1
-+			0x8000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x11 */
--			08800 0 0 1 &mpic 0 1
--			08800 0 0 2 &mpic 1 1
--			08800 0 0 3 &mpic 2 1
--			08800 0 0 4 &mpic 3 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x12 (Slot 1) */
--			09000 0 0 1 &mpic 0 1
--			09000 0 0 2 &mpic 1 1
--			09000 0 0 3 &mpic 2 1
--			09000 0 0 4 &mpic 3 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 			/* IDSEL 0x13 (Slot 2) */
--			09800 0 0 1 &mpic 1 1
--			09800 0 0 2 &mpic 2 1
--			09800 0 0 3 &mpic 3 1
--			09800 0 0 4 &mpic 0 1
-+			0x9800 0x0 0x0 0x1 &mpic 0x1 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x2 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x3 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x0 0x1
- 
- 			/* IDSEL 0x14 (Slot 3) */
--			0a000 0 0 1 &mpic 2 1
--			0a000 0 0 2 &mpic 3 1
--			0a000 0 0 3 &mpic 0 1
--			0a000 0 0 4 &mpic 1 1
-+			0xa000 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0xa000 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0xa000 0x0 0x0 0x3 &mpic 0x0 0x1
-+			0xa000 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x15 (Slot 4) */
--			0a800 0 0 1 &mpic 3 1
--			0a800 0 0 2 &mpic 0 1
--			0a800 0 0 3 &mpic 1 1
--			0a800 0 0 4 &mpic 2 1
-+			0xa800 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0x0 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* Bus 1 (Tundra Bridge) */
- 			/* IDSEL 0x12 (ISA bridge) */
--			19000 0 0 1 &mpic 0 1
--			19000 0 0 2 &mpic 1 1
--			19000 0 0 3 &mpic 2 1
--			19000 0 0 4 &mpic 3 1>;
-+			0x19000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0x19000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0x19000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0x19000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 
- 		i8259@19000 {
- 			interrupt-controller;
- 			device_type = "interrupt-controller";
--			reg = <19000 0 0 0 1>;
-+			reg = <0x19000 0x0 0x0 0x0 0x1>;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
- 			compatible = "chrp,iic";
-@@ -268,24 +269,24 @@
- 
- 	pci1: pci@e0009000 {
- 		cell-index = <1>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x15 */
--			a800 0 0 1 &mpic b 1
--			a800 0 0 2 &mpic b 1
--			a800 0 0 3 &mpic b 1
--			a800 0 0 4 &mpic b 1>;
-+			0xa800 0x0 0x0 0x1 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x2 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x3 &mpic 0xb 0x1
-+			0xa800 0x0 0x0 0x4 &mpic 0xb 0x1>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <19 2>;
-+		interrupts = <25 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 e3000000 0 00100000>;
--		clock-frequency = <3f940aa>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0009000 1000>;
-+		reg = <0xe0009000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
---- a/arch/powerpc/boot/dts/mpc8560ads.dts
-+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8560 ADS Device Tree Source
-  *
-- * Copyright 2006 Freescale Semiconductor Inc.
-+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC8560ADS";
-@@ -32,74 +33,74 @@
- 
- 		PowerPC,8560@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
--			timebase-frequency = <04ead9a0>;
--			bus-frequency = <13ab6680>;
--			clock-frequency = <312c8040>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
-+			timebase-frequency = <82500000>;
-+			bus-frequency = <330000000>;
-+			clock-frequency = <825000000>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 10000000>;
-+		reg = <0x0 0x10000000>;
- 	};
- 
- 	soc8560@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00000200>;
--		bus-frequency = <13ab6680>;
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x200>;
-+		bus-frequency = <330000000>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8540-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8540-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <40000>;	// L2, 256K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x40000>;	// L2, 256K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		mdio@24520 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <5 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <7 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -109,9 +110,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 		};
-@@ -121,9 +122,9 @@
- 			device_type = "network";
- 			model = "TSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 		};
-@@ -132,7 +133,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			device_type = "open-pic";
- 		};
- 
-@@ -140,17 +141,17 @@
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
--			reg = <919c0 30>;
-+			reg = <0x919c0 0x30>;
- 			ranges;
- 
- 			muram@80000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 80000 10000>;
-+				ranges = <0x0 0x80000 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 4000 9000 2000>;
-+					reg = <0x0 0x4000 0x9000 0x2000>;
- 				};
- 			};
- 
-@@ -158,17 +159,17 @@
- 				compatible = "fsl,mpc8560-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <919f0 10 915f0 10>;
--				clock-frequency = <d#165000000>;
-+				reg = <0x919f0 0x10 0x915f0 0x10>;
-+				clock-frequency = <165000000>;
- 			};
- 
- 			cpmpic: pic@90c00 {
- 				interrupt-controller;
- 				#address-cells = <0>;
- 				#interrupt-cells = <2>;
--				interrupts = <2e 2>;
-+				interrupts = <46 2>;
- 				interrupt-parent = <&mpic>;
--				reg = <90c00 80>;
-+				reg = <0x90c00 0x80>;
- 				compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
- 			};
- 
-@@ -176,11 +177,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8560-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <91a00 20 88000 100>;
-+				reg = <0x91a00 0x20 0x88000 0x100>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
--				current-speed = <1c200>;
--				interrupts = <28 8>;
-+				fsl,cpm-command = <0x800000>;
-+				current-speed = <115200>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&cpmpic>;
- 			};
- 
-@@ -188,11 +189,11 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc8560-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <91a20 20 88100 100>;
-+				reg = <0x91a20 0x20 0x88100 0x100>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <04a00000>;
--				current-speed = <1c200>;
--				interrupts = <29 8>;
-+				fsl,cpm-command = <0x4a00000>;
-+				current-speed = <115200>;
-+				interrupts = <41 8>;
- 				interrupt-parent = <&cpmpic>;
- 			};
- 
-@@ -200,10 +201,10 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8560-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <91320 20 88500 100 913b0 1>;
-+				reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				fsl,cpm-command = <16200300>;
--				interrupts = <21 8>;
-+				fsl,cpm-command = <0x16200300>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&cpmpic>;
- 				phy-handle = <&phy2>;
- 			};
-@@ -212,10 +213,10 @@
- 				device_type = "network";
- 				compatible = "fsl,mpc8560-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <91340 20 88600 100 913d0 1>;
-+				reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				fsl,cpm-command = <1a400300>;
--				interrupts = <22 8>;
-+				fsl,cpm-command = <0x1a400300>;
-+				interrupts = <34 8>;
- 				interrupt-parent = <&cpmpic>;
- 				phy-handle = <&phy3>;
- 			};
-@@ -229,87 +230,87 @@
- 		#address-cells = <3>;
- 		compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
- 		device_type = "pci";
--		reg = <e0008000 1000>;
--		clock-frequency = <3f940aa>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		reg = <0xe0008000 0x1000>;
-+		clock-frequency = <66666666>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 				/* IDSEL 0x2 */
--				 1000 0 0 1 &mpic 1 1
--				 1000 0 0 2 &mpic 2 1
--				 1000 0 0 3 &mpic 3 1
--				 1000 0 0 4 &mpic 4 1
-+				 0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 0x3 */
--				 1800 0 0 1 &mpic 4 1
--				 1800 0 0 2 &mpic 1 1
--				 1800 0 0 3 &mpic 2 1
--				 1800 0 0 4 &mpic 3 1
-+				 0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 0x4 */
--				 2000 0 0 1 &mpic 3 1
--				 2000 0 0 2 &mpic 4 1
--				 2000 0 0 3 &mpic 1 1
--				 2000 0 0 4 &mpic 2 1
-+				 0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 0x5  */
--				 2800 0 0 1 &mpic 2 1
--				 2800 0 0 2 &mpic 3 1
--				 2800 0 0 3 &mpic 4 1
--				 2800 0 0 4 &mpic 1 1
-+				 0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDSEL 12 */
--				 6000 0 0 1 &mpic 1 1
--				 6000 0 0 2 &mpic 2 1
--				 6000 0 0 3 &mpic 3 1
--				 6000 0 0 4 &mpic 4 1
-+				 0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 13 */
--				 6800 0 0 1 &mpic 4 1
--				 6800 0 0 2 &mpic 1 1
--				 6800 0 0 3 &mpic 2 1
--				 6800 0 0 4 &mpic 3 1
-+				 0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 14*/
--				 7000 0 0 1 &mpic 3 1
--				 7000 0 0 2 &mpic 4 1
--				 7000 0 0 3 &mpic 1 1
--				 7000 0 0 4 &mpic 2 1
-+				 0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 15 */
--				 7800 0 0 1 &mpic 2 1
--				 7800 0 0 2 &mpic 3 1
--				 7800 0 0 3 &mpic 4 1
--				 7800 0 0 4 &mpic 1 1
-+				 0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 				/* IDSEL 18 */
--				 9000 0 0 1 &mpic 1 1
--				 9000 0 0 2 &mpic 2 1
--				 9000 0 0 3 &mpic 3 1
--				 9000 0 0 4 &mpic 4 1
-+				 0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-+				 0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-+				 0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-+				 0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 				/* IDSEL 19 */
--				 9800 0 0 1 &mpic 4 1
--				 9800 0 0 2 &mpic 1 1
--				 9800 0 0 3 &mpic 2 1
--				 9800 0 0 4 &mpic 3 1
-+				 0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-+				 0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-+				 0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-+				 0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
- 
- 				/* IDSEL 20 */
--				 a000 0 0 1 &mpic 3 1
--				 a000 0 0 2 &mpic 4 1
--				 a000 0 0 3 &mpic 1 1
--				 a000 0 0 4 &mpic 2 1
-+				 0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-+				 0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-+				 0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-+				 0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 				/* IDSEL 21 */
--				 a800 0 0 1 &mpic 2 1
--				 a800 0 0 2 &mpic 3 1
--				 a800 0 0 3 &mpic 4 1
--				 a800 0 0 4 &mpic 1 1>;
-+				 0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-+				 0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-+				 0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-+				 0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
-+		interrupts = <24 2>;
- 		bus-range = <0 0>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 01000000>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8568mds.dts
-+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8568E MDS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,10 +9,7 @@
-  * option) any later version.
-  */
- 
--
--/*
--/memreserve/	00000000 1000000;
--*/
-+/dts-v1/;
- 
- / {
- 	model = "MPC8568EMDS";
-@@ -37,11 +34,11 @@
- 
- 		PowerPC,8568@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -50,36 +47,36 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 10000000>;
-+		reg = <0x0 0x10000000>;
- 	};
- 
- 	bcsr@f8000000 {
- 		device_type = "board-control";
--		reg = <f8000000 8000>;
-+		reg = <0xf8000000 0x8000>;
- 	};
- 
- 	soc8568@e0000000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 e0000000 00100000>;
--		reg = <e0000000 00001000>;
-+		ranges = <0x0 0xe0000000 0x100000>;
-+		reg = <0xe0000000 0x1000>;
- 		bus-frequency = <0>;
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,8568-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,8568-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -87,14 +84,14 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 
- 			rtc@68 {
- 				compatible = "dallas,ds1374";
--				reg = <68>;
-+				reg = <0x68>;
- 			};
- 		};
- 
-@@ -103,8 +100,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -113,30 +110,30 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@7 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <7>;
-+				reg = <0x7>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -146,9 +143,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
-- 			interrupts = <1d 2 1e 2 22 2>;
-+ 			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 		};
-@@ -158,9 +155,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
-- 			interrupts = <23 2 24 2 28 2>;
-+ 			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 		};
-@@ -169,15 +166,15 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8548-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -185,9 +182,9 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -195,13 +192,13 @@
- 			device_type = "crypto";
- 			model = "SEC2";
- 			compatible = "talitos";
--			reg = <30000 f000>;
--			interrupts = <2d 2>;
-+			reg = <0x30000 0xf000>;
-+			interrupts = <45 2>;
- 			interrupt-parent = <&mpic>;
- 			num-channels = <4>;
--			channel-fifo-len = <18>;
--			exec-units-mask = <000000fe>;
--			descriptor-types-mask = <012b0ebf>;
-+			channel-fifo-len = <24>;
-+			exec-units-mask = <0xfe>;
-+			descriptor-types-mask = <0x12b0ebf>;
- 		};
- 
- 		mpic: pic@40000 {
-@@ -209,73 +206,73 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
-                         big-endian;
- 		};
- 
- 		par_io@e0100 {
--			reg = <e0100 100>;
-+			reg = <0xe0100 0x100>;
- 			device_type = "par_io";
- 			num-ports = <7>;
- 
- 			pio1: ucc_pin@01 {
- 				pio-map = <
- 			/* port  pin  dir  open_drain  assignment  has_irq */
--					4  0a  1  0  2  0 	/* TxD0 */
--					4  09  1  0  2  0 	/* TxD1 */
--					4  08  1  0  2  0 	/* TxD2 */
--					4  07  1  0  2  0 	/* TxD3 */
--					4  17  1  0  2  0 	/* TxD4 */
--					4  16  1  0  2  0 	/* TxD5 */
--					4  15  1  0  2  0 	/* TxD6 */
--					4  14  1  0  2  0 	/* TxD7 */
--					4  0f  2  0  2  0 	/* RxD0 */
--					4  0e  2  0  2  0 	/* RxD1 */
--					4  0d  2  0  2  0 	/* RxD2 */
--					4  0c  2  0  2  0 	/* RxD3 */
--					4  1d  2  0  2  0 	/* RxD4 */
--					4  1c  2  0  2  0 	/* RxD5 */
--					4  1b  2  0  2  0 	/* RxD6 */
--					4  1a  2  0  2  0 	/* RxD7 */
--					4  0b  1  0  2  0 	/* TX_EN */
--					4  18  1  0  2  0 	/* TX_ER */
--					4  10  2  0  2  0 	/* RX_DV */
--					4  1e  2  0  2  0 	/* RX_ER */
--					4  11  2  0  2  0 	/* RX_CLK */
--					4  13  1  0  2  0 	/* GTX_CLK */
--					1  1f  2  0  3  0>;	/* GTX125 */
-+					0x4  0xa  0x1  0x0  0x2  0x0 	/* TxD0 */
-+					0x4  0x9  0x1  0x0  0x2  0x0 	/* TxD1 */
-+					0x4  0x8  0x1  0x0  0x2  0x0 	/* TxD2 */
-+					0x4  0x7  0x1  0x0  0x2  0x0 	/* TxD3 */
-+					0x4  0x17  0x1  0x0  0x2  0x0 	/* TxD4 */
-+					0x4  0x16  0x1  0x0  0x2  0x0 	/* TxD5 */
-+					0x4  0x15  0x1  0x0  0x2  0x0 	/* TxD6 */
-+					0x4  0x14  0x1  0x0  0x2  0x0 	/* TxD7 */
-+					0x4  0xf  0x2  0x0  0x2  0x0 	/* RxD0 */
-+					0x4  0xe  0x2  0x0  0x2  0x0 	/* RxD1 */
-+					0x4  0xd  0x2  0x0  0x2  0x0 	/* RxD2 */
-+					0x4  0xc  0x2  0x0  0x2  0x0 	/* RxD3 */
-+					0x4  0x1d  0x2  0x0  0x2  0x0 	/* RxD4 */
-+					0x4  0x1c  0x2  0x0  0x2  0x0 	/* RxD5 */
-+					0x4  0x1b  0x2  0x0  0x2  0x0 	/* RxD6 */
-+					0x4  0x1a  0x2  0x0  0x2  0x0 	/* RxD7 */
-+					0x4  0xb  0x1  0x0  0x2  0x0 	/* TX_EN */
-+					0x4  0x18  0x1  0x0  0x2  0x0 	/* TX_ER */
-+					0x4  0x10  0x2  0x0  0x2  0x0 	/* RX_DV */
-+					0x4  0x1e  0x2  0x0  0x2  0x0 	/* RX_ER */
-+					0x4  0x11  0x2  0x0  0x2  0x0 	/* RX_CLK */
-+					0x4  0x13  0x1  0x0  0x2  0x0 	/* GTX_CLK */
-+					0x1  0x1f  0x2  0x0  0x3  0x0>;	/* GTX125 */
- 			};
- 
- 			pio2: ucc_pin@02 {
- 				pio-map = <
- 			/* port  pin  dir  open_drain  assignment  has_irq */
--					5  0a 1  0  2  0   /* TxD0 */
--					5  09 1  0  2  0   /* TxD1 */
--					5  08 1  0  2  0   /* TxD2 */
--					5  07 1  0  2  0   /* TxD3 */
--					5  17 1  0  2  0   /* TxD4 */
--					5  16 1  0  2  0   /* TxD5 */
--					5  15 1  0  2  0   /* TxD6 */
--					5  14 1  0  2  0   /* TxD7 */
--					5  0f 2  0  2  0   /* RxD0 */
--					5  0e 2  0  2  0   /* RxD1 */
--					5  0d 2  0  2  0   /* RxD2 */
--					5  0c 2  0  2  0   /* RxD3 */
--					5  1d 2  0  2  0   /* RxD4 */
--					5  1c 2  0  2  0   /* RxD5 */
--					5  1b 2  0  2  0   /* RxD6 */
--					5  1a 2  0  2  0   /* RxD7 */
--					5  0b 1  0  2  0   /* TX_EN */
--					5  18 1  0  2  0   /* TX_ER */
--					5  10 2  0  2  0   /* RX_DV */
--					5  1e 2  0  2  0   /* RX_ER */
--					5  11 2  0  2  0   /* RX_CLK */
--					5  13 1  0  2  0   /* GTX_CLK */
--					1  1f 2  0  3  0   /* GTX125 */
--					4  06 3  0  2  0   /* MDIO */
--					4  05 1  0  2  0>; /* MDC */
-+					0x5  0xa 0x1  0x0  0x2  0x0   /* TxD0 */
-+					0x5  0x9 0x1  0x0  0x2  0x0   /* TxD1 */
-+					0x5  0x8 0x1  0x0  0x2  0x0   /* TxD2 */
-+					0x5  0x7 0x1  0x0  0x2  0x0   /* TxD3 */
-+					0x5  0x17 0x1  0x0  0x2  0x0   /* TxD4 */
-+					0x5  0x16 0x1  0x0  0x2  0x0   /* TxD5 */
-+					0x5  0x15 0x1  0x0  0x2  0x0   /* TxD6 */
-+					0x5  0x14 0x1  0x0  0x2  0x0   /* TxD7 */
-+					0x5  0xf 0x2  0x0  0x2  0x0   /* RxD0 */
-+					0x5  0xe 0x2  0x0  0x2  0x0   /* RxD1 */
-+					0x5  0xd 0x2  0x0  0x2  0x0   /* RxD2 */
-+					0x5  0xc 0x2  0x0  0x2  0x0   /* RxD3 */
-+					0x5  0x1d 0x2  0x0  0x2  0x0   /* RxD4 */
-+					0x5  0x1c 0x2  0x0  0x2  0x0   /* RxD5 */
-+					0x5  0x1b 0x2  0x0  0x2  0x0   /* RxD6 */
-+					0x5  0x1a 0x2  0x0  0x2  0x0   /* RxD7 */
-+					0x5  0xb 0x1  0x0  0x2  0x0   /* TX_EN */
-+					0x5  0x18 0x1  0x0  0x2  0x0   /* TX_ER */
-+					0x5  0x10 0x2  0x0  0x2  0x0   /* RX_DV */
-+					0x5  0x1e 0x2  0x0  0x2  0x0   /* RX_ER */
-+					0x5  0x11 0x2  0x0  0x2  0x0   /* RX_CLK */
-+					0x5  0x13 0x1  0x0  0x2  0x0   /* GTX_CLK */
-+					0x1  0x1f 0x2  0x0  0x3  0x0   /* GTX125 */
-+					0x4  0x6 0x3  0x0  0x2  0x0   /* MDIO */
-+					0x4  0x5 0x1  0x0  0x2  0x0>; /* MDC */
- 			};
- 		};
- 	};
-@@ -285,28 +282,28 @@
- 		#size-cells = <1>;
- 		device_type = "qe";
- 		compatible = "fsl,qe";
--		ranges = <0 e0080000 00040000>;
--		reg = <e0080000 480>;
-+		ranges = <0x0 0xe0080000 0x40000>;
-+		reg = <0xe0080000 0x480>;
- 		brg-frequency = <0>;
--		bus-frequency = <179A7B00>;
-+		bus-frequency = <396000000>;
- 
- 		muram@10000 {
-  			#address-cells = <1>;
-  			#size-cells = <1>;
- 			compatible = "fsl,qe-muram", "fsl,cpm-muram";
--			ranges = <0 00010000 0000c000>;
-+			ranges = <0x0 0x10000 0x10000>;
- 
- 			data-only@0 {
- 				compatible = "fsl,qe-muram-data",
- 					     "fsl,cpm-muram-data";
--				reg = <0 c000>;
-+				reg = <0x0 0x10000>;
- 			};
- 		};
- 
- 		spi@4c0 {
- 			cell-index = <0>;
- 			compatible = "fsl,spi";
--			reg = <4c0 40>;
-+			reg = <0x4c0 0x40>;
- 			interrupts = <2>;
- 			interrupt-parent = <&qeic>;
- 			mode = "cpu";
-@@ -315,7 +312,7 @@
- 		spi@500 {
- 			cell-index = <1>;
- 			compatible = "fsl,spi";
--			reg = <500 40>;
-+			reg = <0x500 0x40>;
- 			interrupts = <1>;
- 			interrupt-parent = <&qeic>;
- 			mode = "cpu";
-@@ -324,11 +321,9 @@
- 		enet2: ucc@2000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <1>;
--			device-id = <1>;
--			reg = <2000 200>;
--			interrupts = <20>;
-+			reg = <0x2000 0x200>;
-+			interrupts = <32>;
- 			interrupt-parent = <&qeic>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			rx-clock-name = "none";
-@@ -341,11 +336,9 @@
- 		enet3: ucc@3000 {
- 			device_type = "network";
- 			compatible = "ucc_geth";
--			model = "UCC";
- 			cell-index = <2>;
--			device-id = <2>;
--			reg = <3000 200>;
--			interrupts = <21>;
-+			reg = <0x3000 0x200>;
-+			interrupts = <33>;
- 			interrupt-parent = <&qeic>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			rx-clock-name = "none";
-@@ -358,7 +351,7 @@
- 		mdio@2120 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
--			reg = <2120 18>;
-+			reg = <0x2120 0x18>;
- 			compatible = "fsl,ucc-mdio";
- 
- 			/* These are the same PHYs as on
-@@ -366,25 +359,25 @@
- 			qe_phy0: ethernet-phy@07 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <7>;
-+				reg = <0x7>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy1: ethernet-phy@01 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy2: ethernet-phy@02 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <1 1>;
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 			qe_phy3: ethernet-phy@03 {
- 				interrupt-parent = <&mpic>;
- 				interrupts = <2 1>;
--				reg = <3>;
-+				reg = <0x3>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -394,9 +387,9 @@
- 			compatible = "fsl,qe-ic";
- 			#address-cells = <0>;
- 			#interrupt-cells = <1>;
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			big-endian;
--			interrupts = <2e 2 2e 2>; //high:30 low:30
-+			interrupts = <46 2 46 2>; //high:30 low:30
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -404,30 +397,30 @@
- 
- 	pci0: pci@e0008000 {
- 		cell-index = <0>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x12 AD18 */
--			9000 0 0 1 &mpic 5 1
--			9000 0 0 2 &mpic 6 1
--			9000 0 0 3 &mpic 7 1
--			9000 0 0 4 &mpic 4 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x5 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x6 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x7 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
- 
- 			/* IDSEL 0x13 AD19 */
--			9800 0 0 1 &mpic 6 1
--			9800 0 0 2 &mpic 7 1
--			9800 0 0 3 &mpic 4 1
--			9800 0 0 4 &mpic 5 1>;
-+			0x9800 0x0 0x0 0x1 &mpic 0x6 0x1
-+			0x9800 0x0 0x0 0x2 &mpic 0x7 0x1
-+			0x9800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x9800 0x0 0x0 0x4 &mpic 0x5 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 e2000000 0 00800000>;
--		clock-frequency = <3f940aa>;
-+		interrupts = <24 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xe2000000 0x0 0x800000>;
-+		clock-frequency = <66666666>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e0008000 1000>;
-+		reg = <0xe0008000 0x1000>;
- 		compatible = "fsl,mpc8540-pci";
- 		device_type = "pci";
- 	};
-@@ -435,39 +428,39 @@
- 	/* PCI Express */
- 	pci1: pcie@e000a000 {
- 		cell-index = <2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 
- 			/* IDSEL 0x0 (PEX) */
--			00000 0 0 1 &mpic 0 1
--			00000 0 0 2 &mpic 1 1
--			00000 0 0 3 &mpic 2 1
--			00000 0 0 4 &mpic 3 1>;
-+			00000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			00000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			00000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			00000 0x0 0x0 0x4 &mpic 0x3 0x1>;
- 
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 10000000
--			  01000000 0 00000000 e2800000 0 00800000>;
--		clock-frequency = <1fca055>;
-+		interrupts = <26 2>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
-+			  0x1000000 0x0 0x0 0xe2800000 0x0 0x800000>;
-+		clock-frequency = <33333333>;
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <e000a000 1000>;
-+		reg = <0xe000a000 0x1000>;
- 		compatible = "fsl,mpc8548-pcie";
- 		device_type = "pci";
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 10000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00800000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x10000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x800000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8572ds.dts
-+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
-@@ -1,7 +1,7 @@
- /*
-  * MPC8572 DS Device Tree Source
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- / {
- 	model = "fsl,MPC8572DS";
- 	compatible = "fsl,MPC8572DS";
-@@ -33,11 +34,11 @@
- 
- 		PowerPC,8572@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -45,11 +46,11 @@
- 
- 		PowerPC,8572@1 {
- 			device_type = "cpu";
--			reg = <1>;
--			d-cache-line-size = <20>;	// 32 bytes
--			i-cache-line-size = <20>;	// 32 bytes
--			d-cache-size = <8000>;		// L1, 32K
--			i-cache-size = <8000>;		// L1, 32K
-+			reg = <0x1>;
-+			d-cache-line-size = <32>;	// 32 bytes
-+			i-cache-line-size = <32>;	// 32 bytes
-+			d-cache-size = <0x8000>;		// L1, 32K
-+			i-cache-size = <0x8000>;		// L1, 32K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
-@@ -58,38 +59,38 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 00000000>;	// Filled by U-Boot
-+		reg = <0x0 0x0>;	// Filled by U-Boot
- 	};
- 
- 	soc8572@ffe00000 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <00000000 ffe00000 00100000>;
--		reg = <ffe00000 00001000>;	// CCSRBAR & soc regs, remove once parse code for immrbase fixed
-+		ranges = <0x0 0xffe00000 0x100000>;
-+		reg = <0xffe00000 0x1000>;	// CCSRBAR & soc regs, remove once parse code for immrbase fixed
- 		bus-frequency = <0>;		// Filled out by uboot.
- 
- 		memory-controller@2000 {
- 			compatible = "fsl,mpc8572-memory-controller";
--			reg = <2000 1000>;
-+			reg = <0x2000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		memory-controller@6000 {
- 			compatible = "fsl,mpc8572-memory-controller";
--			reg = <6000 1000>;
-+			reg = <0x6000 0x1000>;
- 			interrupt-parent = <&mpic>;
--			interrupts = <12 2>;
-+			interrupts = <18 2>;
- 		};
- 
- 		l2-cache-controller@20000 {
- 			compatible = "fsl,mpc8572-l2-cache-controller";
--			reg = <20000 1000>;
--			cache-line-size = <20>;	// 32 bytes
--			cache-size = <80000>;	// L2, 512K
-+			reg = <0x20000 0x1000>;
-+			cache-line-size = <32>;	// 32 bytes
-+			cache-size = <0x80000>;	// L2, 512K
- 			interrupt-parent = <&mpic>;
--			interrupts = <10 2>;
-+			interrupts = <16 2>;
- 		};
- 
- 		i2c@3000 {
-@@ -97,8 +98,8 @@
- 			#size-cells = <0>;
- 			cell-index = <0>;
- 			compatible = "fsl-i2c";
--			reg = <3000 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -108,8 +109,8 @@
- 			#size-cells = <0>;
- 			cell-index = <1>;
- 			compatible = "fsl-i2c";
--			reg = <3100 100>;
--			interrupts = <2b 2>;
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
- 			interrupt-parent = <&mpic>;
- 			dfsrr;
- 		};
-@@ -118,27 +119,27 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			compatible = "fsl,gianfar-mdio";
--			reg = <24520 20>;
-+			reg = <0x24520 0x20>;
- 
- 			phy0: ethernet-phy@0 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <0>;
-+				interrupts = <10 1>;
-+				reg = <0x0>;
- 			};
- 			phy1: ethernet-phy@1 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <1>;
-+				interrupts = <10 1>;
-+				reg = <0x1>;
- 			};
- 			phy2: ethernet-phy@2 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <2>;
-+				interrupts = <10 1>;
-+				reg = <0x2>;
- 			};
- 			phy3: ethernet-phy@3 {
- 				interrupt-parent = <&mpic>;
--				interrupts = <a 1>;
--				reg = <3>;
-+				interrupts = <10 1>;
-+				reg = <0x3>;
- 			};
- 		};
- 
-@@ -147,9 +148,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <24000 1000>;
-+			reg = <0x24000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1d 2 1e 2 22 2>;
-+			interrupts = <29 2 30 2 34 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy0>;
- 			phy-connection-type = "rgmii-id";
-@@ -160,9 +161,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <25000 1000>;
-+			reg = <0x25000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <23 2 24 2 28 2>;
-+			interrupts = <35 2 36 2 40 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy1>;
- 			phy-connection-type = "rgmii-id";
-@@ -173,9 +174,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <26000 1000>;
-+			reg = <0x26000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <1f 2 20 2 21 2>;
-+			interrupts = <31 2 32 2 33 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy2>;
- 			phy-connection-type = "rgmii-id";
-@@ -186,9 +187,9 @@
- 			device_type = "network";
- 			model = "eTSEC";
- 			compatible = "gianfar";
--			reg = <27000 1000>;
-+			reg = <0x27000 0x1000>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
--			interrupts = <25 2 26 2 27 2>;
-+			interrupts = <37 2 38 2 39 2>;
- 			interrupt-parent = <&mpic>;
- 			phy-handle = <&phy3>;
- 			phy-connection-type = "rgmii-id";
-@@ -198,9 +199,9 @@
- 			cell-index = <0>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4500 100>;
-+			reg = <0x4500 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
-@@ -208,15 +209,15 @@
- 			cell-index = <1>;
- 			device_type = "serial";
- 			compatible = "ns16550";
--			reg = <4600 100>;
-+			reg = <0x4600 0x100>;
- 			clock-frequency = <0>;
--			interrupts = <2a 2>;
-+			interrupts = <42 2>;
- 			interrupt-parent = <&mpic>;
- 		};
- 
- 		global-utilities@e0000 {	//global utilities block
- 			compatible = "fsl,mpc8572-guts";
--			reg = <e0000 1000>;
-+			reg = <0xe0000 0x1000>;
- 			fsl,has-rstcr;
- 		};
- 
-@@ -225,7 +226,7 @@
- 			interrupt-controller;
- 			#address-cells = <0>;
- 			#interrupt-cells = <2>;
--			reg = <40000 40000>;
-+			reg = <0x40000 0x40000>;
- 			compatible = "chrp,open-pic";
- 			device_type = "open-pic";
- 			big-endian;
-@@ -239,167 +240,167 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe08000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 80000000 80000000 0 20000000
--			  01000000 0 00000000 ffc00000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe08000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc00000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <18 2>;
--		interrupt-map-mask = <ff00 0 0 7>;
-+		interrupts = <24 2>;
-+		interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x11 func 0 - PCI slot 1 */
--			8800 0 0 1 &mpic 2 1
--			8800 0 0 2 &mpic 3 1
--			8800 0 0 3 &mpic 4 1
--			8800 0 0 4 &mpic 1 1
-+			0x8800 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8800 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8800 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8800 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 1 - PCI slot 1 */
--			8900 0 0 1 &mpic 2 1
--			8900 0 0 2 &mpic 3 1
--			8900 0 0 3 &mpic 4 1
--			8900 0 0 4 &mpic 1 1
-+			0x8900 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8900 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8900 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8900 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 2 - PCI slot 1 */
--			8a00 0 0 1 &mpic 2 1
--			8a00 0 0 2 &mpic 3 1
--			8a00 0 0 3 &mpic 4 1
--			8a00 0 0 4 &mpic 1 1
-+			0x8a00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8a00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8a00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8a00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 3 - PCI slot 1 */
--			8b00 0 0 1 &mpic 2 1
--			8b00 0 0 2 &mpic 3 1
--			8b00 0 0 3 &mpic 4 1
--			8b00 0 0 4 &mpic 1 1
-+			0x8b00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8b00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8b00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8b00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 4 - PCI slot 1 */
--			8c00 0 0 1 &mpic 2 1
--			8c00 0 0 2 &mpic 3 1
--			8c00 0 0 3 &mpic 4 1
--			8c00 0 0 4 &mpic 1 1
-+			0x8c00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8c00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8c00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8c00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 5 - PCI slot 1 */
--			8d00 0 0 1 &mpic 2 1
--			8d00 0 0 2 &mpic 3 1
--			8d00 0 0 3 &mpic 4 1
--			8d00 0 0 4 &mpic 1 1
-+			0x8d00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8d00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8d00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8d00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 6 - PCI slot 1 */
--			8e00 0 0 1 &mpic 2 1
--			8e00 0 0 2 &mpic 3 1
--			8e00 0 0 3 &mpic 4 1
--			8e00 0 0 4 &mpic 1 1
-+			0x8e00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8e00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8e00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8e00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x11 func 7 - PCI slot 1 */
--			8f00 0 0 1 &mpic 2 1
--			8f00 0 0 2 &mpic 3 1
--			8f00 0 0 3 &mpic 4 1
--			8f00 0 0 4 &mpic 1 1
-+			0x8f00 0x0 0x0 0x1 &mpic 0x2 0x1
-+			0x8f00 0x0 0x0 0x2 &mpic 0x3 0x1
-+			0x8f00 0x0 0x0 0x3 &mpic 0x4 0x1
-+			0x8f00 0x0 0x0 0x4 &mpic 0x1 0x1
- 
- 			/* IDSEL 0x12 func 0 - PCI slot 2 */
--			9000 0 0 1 &mpic 3 1
--			9000 0 0 2 &mpic 4 1
--			9000 0 0 3 &mpic 1 1
--			9000 0 0 4 &mpic 2 1
-+			0x9000 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9000 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9000 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9000 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 1 - PCI slot 2 */
--			9100 0 0 1 &mpic 3 1
--			9100 0 0 2 &mpic 4 1
--			9100 0 0 3 &mpic 1 1
--			9100 0 0 4 &mpic 2 1
-+			0x9100 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9100 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9100 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9100 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 2 - PCI slot 2 */
--			9200 0 0 1 &mpic 3 1
--			9200 0 0 2 &mpic 4 1
--			9200 0 0 3 &mpic 1 1
--			9200 0 0 4 &mpic 2 1
-+			0x9200 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9200 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9200 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9200 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 3 - PCI slot 2 */
--			9300 0 0 1 &mpic 3 1
--			9300 0 0 2 &mpic 4 1
--			9300 0 0 3 &mpic 1 1
--			9300 0 0 4 &mpic 2 1
-+			0x9300 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9300 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9300 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9300 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 4 - PCI slot 2 */
--			9400 0 0 1 &mpic 3 1
--			9400 0 0 2 &mpic 4 1
--			9400 0 0 3 &mpic 1 1
--			9400 0 0 4 &mpic 2 1
-+			0x9400 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9400 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9400 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9400 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 5 - PCI slot 2 */
--			9500 0 0 1 &mpic 3 1
--			9500 0 0 2 &mpic 4 1
--			9500 0 0 3 &mpic 1 1
--			9500 0 0 4 &mpic 2 1
-+			0x9500 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9500 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9500 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9500 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 6 - PCI slot 2 */
--			9600 0 0 1 &mpic 3 1
--			9600 0 0 2 &mpic 4 1
--			9600 0 0 3 &mpic 1 1
--			9600 0 0 4 &mpic 2 1
-+			0x9600 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9600 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9600 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9600 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			/* IDSEL 0x12 func 7 - PCI slot 2 */
--			9700 0 0 1 &mpic 3 1
--			9700 0 0 2 &mpic 4 1
--			9700 0 0 3 &mpic 1 1
--			9700 0 0 4 &mpic 2 1
-+			0x9700 0x0 0x0 0x1 &mpic 0x3 0x1
-+			0x9700 0x0 0x0 0x2 &mpic 0x4 0x1
-+			0x9700 0x0 0x0 0x3 &mpic 0x1 0x1
-+			0x9700 0x0 0x0 0x4 &mpic 0x2 0x1
- 
- 			// IDSEL 0x1c  USB
--			e000 0 0 1 &i8259 c 2
--			e100 0 0 2 &i8259 9 2
--			e200 0 0 3 &i8259 a 2
--			e300 0 0 4 &i8259 b 2
-+			0xe000 0x0 0x0 0x1 &i8259 0xc 0x2
-+			0xe100 0x0 0x0 0x2 &i8259 0x9 0x2
-+			0xe200 0x0 0x0 0x3 &i8259 0xa 0x2
-+			0xe300 0x0 0x0 0x4 &i8259 0xb 0x2
- 
- 			// IDSEL 0x1d  Audio
--			e800 0 0 1 &i8259 6 2
-+			0xe800 0x0 0x0 0x1 &i8259 0x6 0x2
- 
- 			// IDSEL 0x1e Legacy
--			f000 0 0 1 &i8259 7 2
--			f100 0 0 1 &i8259 7 2
-+			0xf000 0x0 0x0 0x1 &i8259 0x7 0x2
-+			0xf100 0x0 0x0 0x1 &i8259 0x7 0x2
- 
- 			// IDSEL 0x1f IDE/SATA
--			f800 0 0 1 &i8259 e 2
--			f900 0 0 1 &i8259 5 2
-+			0xf800 0x0 0x0 0x1 &i8259 0xe 0x2
-+			0xf900 0x0 0x0 0x1 &i8259 0x5 0x2
- 
- 			>;
- 
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 80000000
--				  02000000 0 80000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0x80000000
-+				  0x2000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 			uli1575@0 {
--				reg = <0 0 0 0 0>;
-+				reg = <0x0 0x0 0x0 0x0 0x0>;
- 				#size-cells = <2>;
- 				#address-cells = <3>;
--				ranges = <02000000 0 80000000
--					  02000000 0 80000000
--					  0 20000000
--
--					  01000000 0 00000000
--					  01000000 0 00000000
--					  0 00100000>;
-+				ranges = <0x2000000 0x0 0x80000000
-+					  0x2000000 0x0 0x80000000
-+					  0x0 0x20000000
-+
-+					  0x1000000 0x0 0x0
-+					  0x1000000 0x0 0x0
-+					  0x0 0x100000>;
- 				isa@1e {
- 					device_type = "isa";
- 					#interrupt-cells = <2>;
- 					#size-cells = <1>;
- 					#address-cells = <2>;
--					reg = <f000 0 0 0 0>;
--					ranges = <1 0 01000000 0 0
--						  00001000>;
-+					reg = <0xf000 0x0 0x0 0x0 0x0>;
-+					ranges = <0x1 0x0 0x1000000 0x0 0x0
-+						  0x1000>;
- 					interrupt-parent = <&i8259>;
- 
- 					i8259: interrupt-controller@20 {
--						reg = <1 20 2
--						       1 a0 2
--						       1 4d0 2>;
-+						reg = <0x1 0x20 0x2
-+						       0x1 0xa0 0x2
-+						       0x1 0x4d0 0x2>;
- 						interrupt-controller;
- 						device_type = "interrupt-controller";
- 						#address-cells = <0>;
-@@ -412,29 +413,29 @@
- 					i8042@60 {
- 						#size-cells = <0>;
- 						#address-cells = <1>;
--						reg = <1 60 1 1 64 1>;
--						interrupts = <1 3 c 3>;
-+						reg = <0x1 0x60 0x1 0x1 0x64 0x1>;
-+						interrupts = <1 3 12 3>;
- 						interrupt-parent =
- 							<&i8259>;
- 
- 						keyboard@0 {
--							reg = <0>;
-+							reg = <0x0>;
- 							compatible = "pnpPNP,303";
- 						};
- 
- 						mouse@1 {
--							reg = <1>;
-+							reg = <0x1>;
- 							compatible = "pnpPNP,f03";
- 						};
- 					};
- 
- 					rtc@70 {
- 						compatible = "pnpPNP,b00";
--						reg = <1 70 2>;
-+						reg = <0x1 0x70 0x2>;
- 					};
- 
- 					gpio@400 {
--						reg = <1 400 80>;
-+						reg = <0x1 0x400 0x80>;
- 					};
- 				};
- 			};
-@@ -449,33 +450,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe09000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 a0000000 a0000000 0 20000000
--			  01000000 0 00000000 ffc10000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe09000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc10000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1a 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <26 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 4 1
--			0000 0 0 2 &mpic 5 1
--			0000 0 0 3 &mpic 6 1
--			0000 0 0 4 &mpic 7 1
-+			0000 0x0 0x0 0x1 &mpic 0x4 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x5 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x6 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x7 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 a0000000
--				  02000000 0 a0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xa0000000
-+				  0x2000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 		};
- 	};
- 
-@@ -486,33 +487,33 @@
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		reg = <ffe0a000 1000>;
--		bus-range = <0 ff>;
--		ranges = <02000000 0 c0000000 c0000000 0 20000000
--			  01000000 0 00000000 ffc20000 0 00010000>;
--		clock-frequency = <1fca055>;
-+		reg = <0xffe0a000 0x1000>;
-+		bus-range = <0 255>;
-+		ranges = <0x2000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
-+			  0x1000000 0x0 0x0 0xffc20000 0x0 0x10000>;
-+		clock-frequency = <33333333>;
- 		interrupt-parent = <&mpic>;
--		interrupts = <1b 2>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		interrupts = <27 2>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 			/* IDSEL 0x0 */
--			0000 0 0 1 &mpic 0 1
--			0000 0 0 2 &mpic 1 1
--			0000 0 0 3 &mpic 2 1
--			0000 0 0 4 &mpic 3 1
-+			0000 0x0 0x0 0x1 &mpic 0x0 0x1
-+			0000 0x0 0x0 0x2 &mpic 0x1 0x1
-+			0000 0x0 0x0 0x3 &mpic 0x2 0x1
-+			0000 0x0 0x0 0x4 &mpic 0x3 0x1
- 			>;
- 		pcie@0 {
--			reg = <0 0 0 0 0>;
-+			reg = <0x0 0x0 0x0 0x0 0x0>;
- 			#size-cells = <2>;
- 			#address-cells = <3>;
- 			device_type = "pci";
--			ranges = <02000000 0 c0000000
--				  02000000 0 c0000000
--				  0 20000000
--
--				  01000000 0 00000000
--				  01000000 0 00000000
--				  0 00100000>;
-+			ranges = <0x2000000 0x0 0xc0000000
-+				  0x2000000 0x0 0xc0000000
-+				  0x0 0x20000000
-+
-+				  0x1000000 0x0 0x0
-+				  0x1000000 0x0 0x0
-+				  0x0 0x100000>;
- 		};
- 	};
- };
---- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
-+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
-@@ -13,7 +13,7 @@
- 
- / {
- 	model = "MPC8641HPCN";
--	compatible = "mpc86xx";
-+	compatible = "fsl,mpc8641hpcn";
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 
---- a/arch/powerpc/boot/dts/mpc866ads.dts
-+++ b/arch/powerpc/boot/dts/mpc866ads.dts
-@@ -2,6 +2,7 @@
-  * MPC866 ADS Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-+ * Copyright 2008 Freescale Semiconductor, Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC866ADS";
-@@ -22,37 +24,37 @@
- 
- 		PowerPC,866@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <10>;	// 16 bytes
--			i-cache-line-size = <10>;	// 16 bytes
--			d-cache-size = <2000>;		// L1, 8K
--			i-cache-size = <4000>;		// L1, 16K
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;	// 16 bytes
-+			i-cache-line-size = <16>;	// 16 bytes
-+			d-cache-size = <0x2000>;		// L1, 8K
-+			i-cache-size = <0x4000>;		// L1, 16K
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 800000>;
-+		reg = <0x0 0x800000>;
- 	};
- 
- 	localbus@ff000100 {
- 		compatible = "fsl,mpc866-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <ff000100 40>;
-+		reg = <0xff000100 0x40>;
- 
- 		ranges = <
--			1 0 ff080000 00008000
--			5 0 ff0a0000 00008000
-+			0x1 0x0 0xff080000 0x8000
-+			0x5 0x0 0xff0a0000 0x8000
- 		>;
- 
- 		board-control@1,0 {
--			reg = <1 0 20 5 300 4>;
-+			reg = <0x1 0x0 0x20 0x5 0x300 0x4>;
- 			compatible = "fsl,mpc866ads-bcsr";
- 		};
- 	};
-@@ -61,17 +63,17 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 ff000000 00100000>;
--		reg = <ff000000 00000200>;
-+		ranges = <0x0 0xff000000 0x100000>;
-+		reg = <0xff000000 0x200>;
- 		bus-frequency = <0>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc866-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			PHY: ethernet-phy@f {
--				reg = <f>;
-+				reg = <0xf>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -80,7 +82,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc866-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -91,7 +93,7 @@
- 		PIC: pic@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc866-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -100,7 +102,7 @@
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc866-cpm", "fsl,cpm1";
- 			ranges;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			brg-frequency = <0>;
- 			interrupts = <0 2>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
-@@ -108,11 +110,11 @@
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -120,7 +122,7 @@
- 				compatible = "fsl,mpc866-brg",
- 					     "fsl,cpm1-brg",
- 					     "fsl,cpm-brg";
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 				clock-frequency = <0>;
- 			};
- 
-@@ -130,7 +132,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc866-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -140,31 +142,31 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc866-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 			};
- 
- 			serial@a90 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc866-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a90 10 3f80 40>;
-+				reg = <0xa90 0x10 0x3f80 0x40>;
- 				interrupts = <3>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <00d0>;
-+				fsl,cpm-command = <0xd0>;
- 			};
- 
- 			ethernet@a00 {
- 				device_type = "network";
- 				compatible = "fsl,mpc866-scc-enet",
- 				             "fsl,cpm1-scc-enet";
--				reg = <a00 18 3c00 100>;
-+				reg = <0xa00 0x18 0x3c00 0x100>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <1e>;
-+				interrupts = <30>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-command = <0000>;
- 				linux,network-index = <1>;
---- a/arch/powerpc/boot/dts/mpc885ads.dts
-+++ b/arch/powerpc/boot/dts/mpc885ads.dts
-@@ -2,7 +2,7 @@
-  * MPC885 ADS Device Tree Source
-  *
-  * Copyright 2006 MontaVista Software, Inc.
-- * Copyright 2007 Freescale Semiconductor, Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor, Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -10,6 +10,7 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
- 
- / {
- 	model = "MPC885ADS";
-@@ -23,45 +24,45 @@
- 
- 		PowerPC,885@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#16>;
--			i-cache-line-size = <d#16>;
--			d-cache-size = <d#8192>;
--			i-cache-size = <d#8192>;
-+			reg = <0x0>;
-+			d-cache-line-size = <16>;
-+			i-cache-line-size = <16>;
-+			d-cache-size = <8192>;
-+			i-cache-size = <8192>;
- 			timebase-frequency = <0>;
- 			bus-frequency = <0>;
- 			clock-frequency = <0>;
--			interrupts = <f 2>;	// decrementer interrupt
-+			interrupts = <15 2>;	// decrementer interrupt
- 			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@ff000100 {
- 		compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <ff000100 40>;
-+		reg = <0xff000100 0x40>;
- 
- 		ranges = <
--			0 0 fe000000 00800000
--			1 0 ff080000 00008000
--			5 0 ff0a0000 00008000
-+			0x0 0x0 0xfe000000 0x800000
-+			0x1 0x0 0xff080000 0x8000
-+			0x5 0x0 0xff0a0000 0x8000
- 		>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 800000>;
-+			reg = <0x0 0x0 0x800000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		board-control@1,0 {
--			reg = <1 0 20 5 300 4>;
-+			reg = <0x1 0x0 0x20 0x5 0x300 0x4>;
- 			compatible = "fsl,mpc885ads-bcsr";
- 		};
- 	};
-@@ -71,30 +72,30 @@
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		device_type = "soc";
--		ranges = <0 ff000000 00004000>;
-+		ranges = <0x0 0xff000000 0x4000>;
- 		bus-frequency = <0>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <ff000000 4000>;
-+		reg = <0xff000000 0x4000>;
- 
- 		mdio@e00 {
- 			compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
- 			PHY0: ethernet-phy@0 {
--				reg = <0>;
-+				reg = <0x0>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY1: ethernet-phy@1 {
--				reg = <1>;
-+				reg = <0x1>;
- 				device_type = "ethernet-phy";
- 			};
- 
- 			PHY2: ethernet-phy@2 {
--				reg = <2>;
-+				reg = <0x2>;
- 				device_type = "ethernet-phy";
- 			};
- 		};
-@@ -103,7 +104,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <e00 188>;
-+			reg = <0xe00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <3 1>;
- 			interrupt-parent = <&PIC>;
-@@ -115,7 +116,7 @@
- 			device_type = "network";
- 			compatible = "fsl,mpc885-fec-enet",
- 			             "fsl,pq1-fec-enet";
--			reg = <1e00 188>;
-+			reg = <0x1e00 0x188>;
- 			local-mac-address = [ 00 00 00 00 00 00 ];
- 			interrupts = <7 1>;
- 			interrupt-parent = <&PIC>;
-@@ -126,7 +127,7 @@
- 		PIC: interrupt-controller@0 {
- 			interrupt-controller;
- 			#interrupt-cells = <2>;
--			reg = <0 24>;
-+			reg = <0x0 0x24>;
- 			compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
- 		};
- 
-@@ -136,29 +137,29 @@
- 			#size-cells = <2>;
- 			compatible = "fsl,pq-pcmcia";
- 			device_type = "pcmcia";
--			reg = <80 80>;
-+			reg = <0x80 0x80>;
- 			interrupt-parent = <&PIC>;
--			interrupts = <d 1>;
-+			interrupts = <13 1>;
- 		};
- 
- 		cpm@9c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			compatible = "fsl,mpc885-cpm", "fsl,cpm1";
--			command-proc = <9c0>;
-+			command-proc = <0x9c0>;
- 			interrupts = <0>;	// cpm error interrupt
- 			interrupt-parent = <&CPM_PIC>;
--			reg = <9c0 40>;
-+			reg = <0x9c0 0x40>;
- 			ranges;
- 
- 			muram@2000 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 2000 2000>;
-+				ranges = <0x0 0x2000 0x2000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 1c00>;
-+					reg = <0x0 0x1c00>;
- 				};
- 			};
- 
-@@ -167,7 +168,7 @@
- 				             "fsl,cpm1-brg",
- 				             "fsl,cpm-brg";
- 				clock-frequency = <0>;
--				reg = <9f0 10>;
-+				reg = <0x9f0 0x10>;
- 			};
- 
- 			CPM_PIC: interrupt-controller@930 {
-@@ -175,7 +176,7 @@
- 				#interrupt-cells = <1>;
- 				interrupts = <5 2 0 2>;
- 				interrupt-parent = <&PIC>;
--				reg = <930 20>;
-+				reg = <0x930 0x20>;
- 				compatible = "fsl,mpc885-cpm-pic",
- 				             "fsl,cpm1-pic";
- 			};
-@@ -184,34 +185,34 @@
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a80 10 3e80 40>;
-+				reg = <0xa80 0x10 0x3e80 0x40>;
- 				interrupts = <4>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <0090>;
-+				fsl,cpm-command = <0x90>;
- 			};
- 
- 			serial@a90 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc885-smc-uart",
- 				             "fsl,cpm1-smc-uart";
--				reg = <a90 10 3f80 40>;
-+				reg = <0xa90 0x10 0x3f80 0x40>;
- 				interrupts = <3>;
- 				interrupt-parent = <&CPM_PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <00d0>;
-+				fsl,cpm-command = <0xd0>;
- 			};
- 
- 			ethernet@a40 {
- 				device_type = "network";
- 				compatible = "fsl,mpc885-scc-enet",
- 				             "fsl,cpm1-scc-enet";
--				reg = <a40 18 3e00 100>;
-+				reg = <0xa40 0x18 0x3e00 0x100>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
--				interrupts = <1c>;
-+				interrupts = <28>;
- 				interrupt-parent = <&CPM_PIC>;
- 				phy-handle = <&PHY2>;
--				fsl,cpm-command = <0080>;
-+				fsl,cpm-command = <0x80>;
- 				linux,network-index = <2>;
- 			};
- 		};
---- a/arch/powerpc/boot/dts/pq2fads.dts
-+++ b/arch/powerpc/boot/dts/pq2fads.dts
-@@ -1,7 +1,7 @@
- /*
-  * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
-  *
-- * Copyright 2007 Freescale Semiconductor Inc.
-+ * Copyright 2007,2008 Freescale Semiconductor Inc.
-  *
-  * This program is free software; you can redistribute  it and/or modify it
-  * under  the terms of  the GNU General  Public License as published by the
-@@ -9,6 +9,8 @@
-  * option) any later version.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	model = "pq2fads";
- 	compatible = "fsl,pq2fads";
-@@ -21,11 +23,11 @@
- 
- 		cpu@0 {
- 			device_type = "cpu";
--			reg = <0>;
--			d-cache-line-size = <d#32>;
--			i-cache-line-size = <d#32>;
--			d-cache-size = <d#16384>;
--			i-cache-size = <d#16384>;
-+			reg = <0x0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <16384>;
-+			i-cache-size = <16384>;
- 			timebase-frequency = <0>;
- 			clock-frequency = <0>;
- 		};
-@@ -33,7 +35,7 @@
- 
- 	memory {
- 		device_type = "memory";
--		reg = <0 0>;
-+		reg = <0x0 0x0>;
- 	};
- 
- 	localbus@f0010100 {
-@@ -41,67 +43,67 @@
- 		             "fsl,pq2-localbus";
- 		#address-cells = <2>;
- 		#size-cells = <1>;
--		reg = <f0010100 60>;
-+		reg = <0xf0010100 0x60>;
- 
--		ranges = <0 0 fe000000 00800000
--		          1 0 f4500000 00008000
--		          8 0 f8200000 00008000>;
-+		ranges = <0x0 0x0 0xfe000000 0x800000
-+		          0x1 0x0 0xf4500000 0x8000
-+		          0x8 0x0 0xf8200000 0x8000>;
- 
- 		flash@0,0 {
- 			compatible = "jedec-flash";
--			reg = <0 0 800000>;
-+			reg = <0x0 0x0 0x800000>;
- 			bank-width = <4>;
- 			device-width = <1>;
- 		};
- 
- 		bcsr@1,0 {
--			reg = <1 0 20>;
-+			reg = <0x1 0x0 0x20>;
- 			compatible = "fsl,pq2fads-bcsr";
- 		};
- 
- 		PCI_PIC: pic@8,0 {
- 			#interrupt-cells = <1>;
- 			interrupt-controller;
--			reg = <8 0 8>;
-+			reg = <0x8 0x0 0x8>;
- 			compatible = "fsl,pq2ads-pci-pic";
- 			interrupt-parent = <&PIC>;
--			interrupts = <18 8>;
-+			interrupts = <24 8>;
- 		};
- 	};
- 
- 	pci@f0010800 {
- 		device_type = "pci";
--		reg = <f0010800 10c f00101ac 8 f00101c4 8>;
-+		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;
- 		compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
- 		#interrupt-cells = <1>;
- 		#size-cells = <2>;
- 		#address-cells = <3>;
--		clock-frequency = <d#66000000>;
--		interrupt-map-mask = <f800 0 0 7>;
-+		clock-frequency = <66000000>;
-+		interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 		interrupt-map = <
- 		                /* IDSEL 0x16 */
--		                 b000 0 0 1 &PCI_PIC 0
--		                 b000 0 0 2 &PCI_PIC 1
--		                 b000 0 0 3 &PCI_PIC 2
--		                 b000 0 0 4 &PCI_PIC 3
-+		                 0xb000 0x0 0x0 0x1 &PCI_PIC 0
-+		                 0xb000 0x0 0x0 0x2 &PCI_PIC 1
-+		                 0xb000 0x0 0x0 0x3 &PCI_PIC 2
-+		                 0xb000 0x0 0x0 0x4 &PCI_PIC 3
- 
- 		                /* IDSEL 0x17 */
--		                 b800 0 0 1 &PCI_PIC 4
--		                 b800 0 0 2 &PCI_PIC 5
--		                 b800 0 0 3 &PCI_PIC 6
--		                 b800 0 0 4 &PCI_PIC 7
-+		                 0xb800 0x0 0x0 0x1 &PCI_PIC 4
-+		                 0xb800 0x0 0x0 0x2 &PCI_PIC 5
-+		                 0xb800 0x0 0x0 0x3 &PCI_PIC 6
-+		                 0xb800 0x0 0x0 0x4 &PCI_PIC 7
- 
- 		                /* IDSEL 0x18 */
--		                 c000 0 0 1 &PCI_PIC 8
--		                 c000 0 0 2 &PCI_PIC 9
--		                 c000 0 0 3 &PCI_PIC a
--		                 c000 0 0 4 &PCI_PIC b>;
-+		                 0xc000 0x0 0x0 0x1 &PCI_PIC 8
-+		                 0xc000 0x0 0x0 0x2 &PCI_PIC 9
-+		                 0xc000 0x0 0x0 0x3 &PCI_PIC 10
-+		                 0xc000 0x0 0x0 0x4 &PCI_PIC 11>;
- 
- 		interrupt-parent = <&PIC>;
--		interrupts = <12 8>;
--		ranges = <42000000 0 80000000 80000000 0 20000000
--		          02000000 0 a0000000 a0000000 0 20000000
--		          01000000 0 00000000 f6000000 0 02000000>;
-+		interrupts = <18 8>;
-+		ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+		          0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+		          0x1000000 0x0 0x0 0xf6000000 0x0 0x2000000>;
- 	};
- 
- 	soc@f0000000 {
-@@ -109,27 +111,27 @@
- 		#size-cells = <1>;
- 		device_type = "soc";
- 		compatible = "fsl,mpc8280", "fsl,pq2-soc";
--		ranges = <00000000 f0000000 00053000>;
-+		ranges = <0x0 0xf0000000 0x53000>;
- 
- 		// Temporary -- will go away once kernel uses ranges for get_immrbase().
--		reg = <f0000000 00053000>;
-+		reg = <0xf0000000 0x53000>;
- 
- 		cpm@119c0 {
- 			#address-cells = <1>;
- 			#size-cells = <1>;
- 			#interrupt-cells = <2>;
- 			compatible = "fsl,mpc8280-cpm", "fsl,cpm2";
--			reg = <119c0 30>;
-+			reg = <0x119c0 0x30>;
- 			ranges;
- 
- 			muram@0 {
- 				#address-cells = <1>;
- 				#size-cells = <1>;
--				ranges = <0 0 10000>;
-+				ranges = <0x0 0x0 0x10000>;
- 
- 				data@0 {
- 					compatible = "fsl,cpm-muram-data";
--					reg = <0 2000 9800 800>;
-+					reg = <0x0 0x2000 0x9800 0x800>;
- 				};
- 			};
- 
-@@ -137,53 +139,53 @@
- 				compatible = "fsl,mpc8280-brg",
- 				             "fsl,cpm2-brg",
- 				             "fsl,cpm-brg";
--				reg = <119f0 10 115f0 10>;
-+				reg = <0x119f0 0x10 0x115f0 0x10>;
- 			};
- 
- 			serial@11a00 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8280-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a00 20 8000 100>;
--				interrupts = <28 8>;
-+				reg = <0x11a00 0x20 0x8000 0x100>;
-+				interrupts = <40 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <1>;
--				fsl,cpm-command = <00800000>;
-+				fsl,cpm-command = <0x800000>;
- 			};
- 
- 			serial@11a20 {
- 				device_type = "serial";
- 				compatible = "fsl,mpc8280-scc-uart",
- 				             "fsl,cpm2-scc-uart";
--				reg = <11a20 20 8100 100>;
--				interrupts = <29 8>;
-+				reg = <0x11a20 0x20 0x8100 0x100>;
-+				interrupts = <41 8>;
- 				interrupt-parent = <&PIC>;
- 				fsl,cpm-brg = <2>;
--				fsl,cpm-command = <04a00000>;
-+				fsl,cpm-command = <0x4a00000>;
- 			};
- 
- 			ethernet@11320 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8280-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11320 20 8500 100 113b0 1>;
--				interrupts = <21 8>;
-+				reg = <0x11320 0x20 0x8500 0x100 0x113b0 0x1>;
-+				interrupts = <33 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY0>;
- 				linux,network-index = <0>;
--				fsl,cpm-command = <16200300>;
-+				fsl,cpm-command = <0x16200300>;
- 			};
- 
- 			ethernet@11340 {
- 				device_type = "network";
- 				compatible = "fsl,mpc8280-fcc-enet",
- 				             "fsl,cpm2-fcc-enet";
--				reg = <11340 20 8600 100 113d0 1>;
--				interrupts = <22 8>;
-+				reg = <0x11340 0x20 0x8600 0x100 0x113d0 0x1>;
-+				interrupts = <34 8>;
- 				interrupt-parent = <&PIC>;
- 				phy-handle = <&PHY1>;
- 				linux,network-index = <1>;
--				fsl,cpm-command = <1a400300>;
-+				fsl,cpm-command = <0x1a400300>;
- 				local-mac-address = [00 e0 0c 00 79 01];
- 			};
- 
-@@ -194,21 +196,21 @@
- 				             "fsl,cpm2-mdio-bitbang";
- 				#address-cells = <1>;
- 				#size-cells = <0>;
--				reg = <10d40 14>;
-+				reg = <0x10d40 0x14>;
- 				fsl,mdio-pin = <9>;
--				fsl,mdc-pin = <a>;
-+				fsl,mdc-pin = <10>;
- 
- 				PHY0: ethernet-phy@0 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <19 2>;
--					reg = <0>;
-+					interrupts = <25 2>;
-+					reg = <0x0>;
- 					device_type = "ethernet-phy";
- 				};
- 
- 				PHY1: ethernet-phy@1 {
- 					interrupt-parent = <&PIC>;
--					interrupts = <19 2>;
--					reg = <3>;
-+					interrupts = <25 2>;
-+					reg = <0x3>;
- 					device_type = "ethernet-phy";
- 				};
- 			};
-@@ -218,17 +220,17 @@
- 				#size-cells = <0>;
- 				compatible = "fsl,mpc8280-usb",
- 				             "fsl,cpm2-usb";
--				reg = <11b60 18 8b00 100>;
-+				reg = <0x11b60 0x18 0x8b00 0x100>;
- 				interrupt-parent = <&PIC>;
--				interrupts = <b 8>;
--				fsl,cpm-command = <2e600000>;
-+				interrupts = <11 8>;
-+				fsl,cpm-command = <0x2e600000>;
- 			};
- 		};
- 
- 		PIC: interrupt-controller@10c00 {
- 			#interrupt-cells = <2>;
- 			interrupt-controller;
--			reg = <10c00 80>;
-+			reg = <0x10c00 0x80>;
- 			compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
- 		};
- 
---- a/arch/powerpc/boot/dts/prpmc2800.dts
-+++ b/arch/powerpc/boot/dts/prpmc2800.dts
-@@ -11,6 +11,8 @@
-  * if it can determine the exact PrPMC type.
-  */
- 
-+/dts-v1/;
-+
- / {
- 	#address-cells = <1>;
- 	#size-cells = <1>;
-@@ -25,46 +27,46 @@
- 		PowerPC,7447 {
- 			device_type = "cpu";
- 			reg = <0>;
--			clock-frequency = <2bb0b140>;	/* Default (733 MHz) */
--			bus-frequency = <7f28155>;	/* 133.333333 MHz */
--			timebase-frequency = <1fca055>;	/* 33.333333 MHz */
--			i-cache-line-size = <20>;
--			d-cache-line-size = <20>;
--			i-cache-size = <8000>;
--			d-cache-size = <8000>;
-+			clock-frequency = <733333333>;	/* Default */
-+			bus-frequency = <133333333>;
-+			timebase-frequency = <33333333>;
-+			i-cache-line-size = <32>;
-+			d-cache-line-size = <32>;
-+			i-cache-size = <32768>;
-+			d-cache-size = <32768>;
- 		};
- 	};
- 
- 	memory {
- 		device_type = "memory";
--		reg = <00000000 20000000>;	/* Default (512MB) */
-+		reg = <0x0 0x20000000>;			/* Default (512MB) */
- 	};
- 
--	mv64x60@f1000000 { /* Marvell Discovery */
-+	system-controller@f1000000 { /* Marvell Discovery mv64360 */
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		model = "mv64360";			/* Default */
--		compatible = "marvell,mv64x60";
--		clock-frequency = <7f28155>;		/* 133.333333 MHz */
--		reg = <f1000000 00010000>;
--		virtual-reg = <f1000000>;
--		ranges = <88000000 88000000 01000000	/* PCI 0 I/O Space */
--			  80000000 80000000 08000000	/* PCI 0 MEM Space */
--			  a0000000 a0000000 04000000	/* User FLASH */
--			  00000000 f1000000 00010000	/* Bridge's regs */
--			  f2000000 f2000000 00040000>;	/* Integrated SRAM */
-+		compatible = "marvell,mv64360";
-+		clock-frequency = <133333333>;
-+		reg = <0xf1000000 0x10000>;
-+		virtual-reg = <0xf1000000>;
-+		ranges = <0x88000000 0x88000000 0x1000000 /* PCI 0 I/O Space */
-+			  0x80000000 0x80000000 0x8000000 /* PCI 0 MEM Space */
-+			  0xa0000000 0xa0000000 0x4000000 /* User FLASH */
-+			  0x00000000 0xf1000000 0x0010000 /* Bridge's regs */
-+			  0xf2000000 0xf2000000 0x0040000>;/* Integrated SRAM */
- 
- 		flash@a0000000 {
- 			device_type = "rom";
- 			compatible = "direct-mapped";
--			reg = <a0000000 4000000>; /* Default (64MB) */
-+			reg = <0xa0000000 0x4000000>; /* Default (64MB) */
- 			probe-type = "CFI";
- 			bank-width = <4>;
--			partitions = <00000000 00100000 /* RO */
--				      00100000 00040001 /* RW */
--				      00140000 00400000 /* RO */
--				      00540000 039c0000 /* RO */
--				      03f00000 00100000>; /* RO */
-+			partitions = <0x00000000 0x00100000 /* RO */
-+				      0x00100000 0x00040001 /* RW */
-+				      0x00140000 0x00400000 /* RO */
-+				      0x00540000 0x039c0000 /* RO */
-+				      0x03f00000 0x00100000>; /* RO */
- 			partition-names = "FW Image A", "FW Config Data", "Kernel Image", "Filesystem", "FW Image B";
- 		};
- 
-@@ -72,171 +74,153 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			device_type = "mdio";
--			compatible = "marvell,mv64x60-mdio";
--			ethernet-phy@1 {
-+			compatible = "marvell,mv64360-mdio";
-+			PHY0: ethernet-phy@1 {
- 				device_type = "ethernet-phy";
- 				compatible = "broadcom,bcm5421";
--				interrupts = <4c>;	/* GPP 12 */
--				interrupt-parent = <&/mv64x60/pic>;
-+				interrupts = <76>;	/* GPP 12 */
-+				interrupt-parent = <&PIC>;
- 				reg = <1>;
- 			};
--			ethernet-phy@3 {
-+			PHY1: ethernet-phy@3 {
- 				device_type = "ethernet-phy";
- 				compatible = "broadcom,bcm5421";
--				interrupts = <4c>;	/* GPP 12 */
--				interrupt-parent = <&/mv64x60/pic>;
-+				interrupts = <76>;	/* GPP 12 */
-+				interrupt-parent = <&PIC>;
- 				reg = <3>;
- 			};
- 		};
- 
--		ethernet@2000 {
--			reg = <2000 2000>;
--			eth0 {
-+		ethernet-group@2000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "marvell,mv64360-eth-group";
-+			reg = <0x2000 0x2000>;
-+			ethernet@0 {
- 				device_type = "network";
--				compatible = "marvell,mv64x60-eth";
--				block-index = <0>;
--				interrupts = <20>;
--				interrupt-parent = <&/mv64x60/pic>;
--				phy = <&/mv64x60/mdio/ethernet-phy@1>;
-+				compatible = "marvell,mv64360-eth";
-+				reg = <0>;
-+				interrupts = <32>;
-+				interrupt-parent = <&PIC>;
-+				phy = <&PHY0>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
- 			};
--			eth1 {
-+			ethernet@1 {
- 				device_type = "network";
--				compatible = "marvell,mv64x60-eth";
--				block-index = <1>;
--				interrupts = <21>;
--				interrupt-parent = <&/mv64x60/pic>;
--				phy = <&/mv64x60/mdio/ethernet-phy@3>;
-+				compatible = "marvell,mv64360-eth";
-+				reg = <1>;
-+				interrupts = <33>;
-+				interrupt-parent = <&PIC>;
-+				phy = <&PHY1>;
- 				local-mac-address = [ 00 00 00 00 00 00 ];
- 			};
- 		};
- 
--		sdma@4000 {
--			device_type = "dma";
--			compatible = "marvell,mv64x60-sdma";
--			reg = <4000 c18>;
--			virtual-reg = <f1004000>;
--			interrupt-base = <0>;
--			interrupts = <24>;
--			interrupt-parent = <&/mv64x60/pic>;
--		};
--
--		sdma@6000 {
--			device_type = "dma";
--			compatible = "marvell,mv64x60-sdma";
--			reg = <6000 c18>;
--			virtual-reg = <f1006000>;
--			interrupt-base = <0>;
--			interrupts = <26>;
--			interrupt-parent = <&/mv64x60/pic>;
--		};
--
--		brg@b200 {
--			compatible = "marvell,mv64x60-brg";
--			reg = <b200 8>;
-+		SDMA0: sdma@4000 {
-+			compatible = "marvell,mv64360-sdma";
-+			reg = <0x4000 0xc18>;
-+			virtual-reg = <0xf1004000>;
-+			interrupts = <36>;
-+			interrupt-parent = <&PIC>;
-+		};
-+
-+		SDMA1: sdma@6000 {
-+			compatible = "marvell,mv64360-sdma";
-+			reg = <0x6000 0xc18>;
-+			virtual-reg = <0xf1006000>;
-+			interrupts = <38>;
-+			interrupt-parent = <&PIC>;
-+		};
-+
-+		BRG0: brg@b200 {
-+			compatible = "marvell,mv64360-brg";
-+			reg = <0xb200 0x8>;
- 			clock-src = <8>;
--			clock-frequency = <7ed6b40>;
--			current-speed = <2580>;
--			bcr = <0>;
-+			clock-frequency = <133333333>;
-+			current-speed = <9600>;
- 		};
- 
--		brg@b208 {
--			compatible = "marvell,mv64x60-brg";
--			reg = <b208 8>;
-+		BRG1: brg@b208 {
-+			compatible = "marvell,mv64360-brg";
-+			reg = <0xb208 0x8>;
- 			clock-src = <8>;
--			clock-frequency = <7ed6b40>;
--			current-speed = <2580>;
--			bcr = <0>;
-+			clock-frequency = <133333333>;
-+			current-speed = <9600>;
- 		};
- 
--		cunit@f200 {
--			reg = <f200 200>;
-+		CUNIT: cunit@f200 {
-+			reg = <0xf200 0x200>;
- 		};
- 
--		mpscrouting@b400 {
--			reg = <b400 c>;
-+		MPSCROUTING: mpscrouting@b400 {
-+			reg = <0xb400 0xc>;
- 		};
- 
--		mpscintr@b800 {
--			reg = <b800 100>;
--			virtual-reg = <f100b800>;
-+		MPSCINTR: mpscintr@b800 {
-+			reg = <0xb800 0x100>;
-+			virtual-reg = <0xf100b800>;
- 		};
- 
--		mpsc@8000 {
-+		MPSC0: mpsc@8000 {
- 			device_type = "serial";
--			compatible = "marvell,mpsc";
--			reg = <8000 38>;
--			virtual-reg = <f1008000>;
--			sdma = <&/mv64x60/sdma@4000>;
--			brg = <&/mv64x60/brg@b200>;
--			cunit = <&/mv64x60/cunit@f200>;
--			mpscrouting = <&/mv64x60/mpscrouting@b400>;
--			mpscintr = <&/mv64x60/mpscintr@b800>;
--			block-index = <0>;
--			max_idle = <28>;
--			chr_1 = <0>;
--			chr_2 = <0>;
--			chr_10 = <3>;
--			mpcr = <0>;
--			interrupts = <28>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mpsc";
-+			reg = <0x8000 0x38>;
-+			virtual-reg = <0xf1008000>;
-+			sdma = <&SDMA0>;
-+			brg = <&BRG0>;
-+			cunit = <&CUNIT>;
-+			mpscrouting = <&MPSCROUTING>;
-+			mpscintr = <&MPSCINTR>;
-+			cell-index = <0>;
-+			interrupts = <40>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
--		mpsc@9000 {
-+		MPSC1: mpsc@9000 {
- 			device_type = "serial";
--			compatible = "marvell,mpsc";
--			reg = <9000 38>;
--			virtual-reg = <f1009000>;
--			sdma = <&/mv64x60/sdma@6000>;
--			brg = <&/mv64x60/brg@b208>;
--			cunit = <&/mv64x60/cunit@f200>;
--			mpscrouting = <&/mv64x60/mpscrouting@b400>;
--			mpscintr = <&/mv64x60/mpscintr@b800>;
--			block-index = <1>;
--			max_idle = <28>;
--			chr_1 = <0>;
--			chr_2 = <0>;
--			chr_10 = <3>;
--			mpcr = <0>;
--			interrupts = <2a>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mpsc";
-+			reg = <0x9000 0x38>;
-+			virtual-reg = <0xf1009000>;
-+			sdma = <&SDMA1>;
-+			brg = <&BRG1>;
-+			cunit = <&CUNIT>;
-+			mpscrouting = <&MPSCROUTING>;
-+			mpscintr = <&MPSCINTR>;
-+			cell-index = <1>;
-+			interrupts = <42>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		wdt@b410 {			/* watchdog timer */
--			compatible = "marvell,mv64x60-wdt";
--			reg = <b410 8>;
--			timeout = <a>;		/* wdt timeout in seconds */
-+			compatible = "marvell,mv64360-wdt";
-+			reg = <0xb410 0x8>;
- 		};
- 
- 		i2c@c000 {
- 			device_type = "i2c";
--			compatible = "marvell,mv64x60-i2c";
--			reg = <c000 20>;
--			virtual-reg = <f100c000>;
--			freq_m = <8>;
--			freq_n = <3>;
--			timeout = <3e8>;		/* 1000 = 1 second */
--			retries = <1>;
--			interrupts = <25>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-i2c";
-+			reg = <0xc000 0x20>;
-+			virtual-reg = <0xf100c000>;
-+			interrupts = <37>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
--		pic {
-+		PIC: pic {
- 			#interrupt-cells = <1>;
- 			#address-cells = <0>;
--			compatible = "marvell,mv64x60-pic";
--			reg = <0000 88>;
-+			compatible = "marvell,mv64360-pic";
-+			reg = <0x0 0x88>;
- 			interrupt-controller;
- 		};
- 
- 		mpp@f000 {
--			compatible = "marvell,mv64x60-mpp";
--			reg = <f000 10>;
-+			compatible = "marvell,mv64360-mpp";
-+			reg = <0xf000 0x10>;
- 		};
- 
- 		gpp@f100 {
--			compatible = "marvell,mv64x60-gpp";
--			reg = <f100 20>;
-+			compatible = "marvell,mv64360-gpp";
-+			reg = <0xf100 0x20>;
- 		};
- 
- 		pci@80000000 {
-@@ -244,73 +228,75 @@
- 			#size-cells = <2>;
- 			#interrupt-cells = <1>;
- 			device_type = "pci";
--			compatible = "marvell,mv64x60-pci";
--			reg = <0cf8 8>;
--			ranges = <01000000 0        0 88000000 0 01000000
--				  02000000 0 80000000 80000000 0 08000000>;
--			bus-range = <0 ff>;
--			clock-frequency = <3EF1480>;
--			interrupt-pci-iack = <0c34>;
--			interrupt-parent = <&/mv64x60/pic>;
--			interrupt-map-mask = <f800 0 0 7>;
-+			compatible = "marvell,mv64360-pci";
-+			reg = <0xcf8 0x8>;
-+			ranges = <0x01000000 0x0        0x0
-+					0x88000000 0x0 0x01000000
-+				  0x02000000 0x0 0x80000000
-+				  	0x80000000 0x0 0x08000000>;
-+			bus-range = <0 255>;
-+			clock-frequency = <66000000>;
-+			interrupt-pci-iack = <0xc34>;
-+			interrupt-parent = <&PIC>;
-+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- 			interrupt-map = <
- 				/* IDSEL 0x0a */
--				5000 0 0 1 &/mv64x60/pic 50
--				5000 0 0 2 &/mv64x60/pic 51
--				5000 0 0 3 &/mv64x60/pic 5b
--				5000 0 0 4 &/mv64x60/pic 5d
-+				0x5000 0 0 1 &PIC 80
-+				0x5000 0 0 2 &PIC 81
-+				0x5000 0 0 3 &PIC 91
-+				0x5000 0 0 4 &PIC 93
- 
- 				/* IDSEL 0x0b */
--				5800 0 0 1 &/mv64x60/pic 5b
--				5800 0 0 2 &/mv64x60/pic 5d
--				5800 0 0 3 &/mv64x60/pic 50
--				5800 0 0 4 &/mv64x60/pic 51
-+				0x5800 0 0 1 &PIC 91
-+				0x5800 0 0 2 &PIC 93
-+				0x5800 0 0 3 &PIC 80
-+				0x5800 0 0 4 &PIC 81
- 
- 				/* IDSEL 0x0c */
--				6000 0 0 1 &/mv64x60/pic 5b
--				6000 0 0 2 &/mv64x60/pic 5d
--				6000 0 0 3 &/mv64x60/pic 50
--				6000 0 0 4 &/mv64x60/pic 51
-+				0x6000 0 0 1 &PIC 91
-+				0x6000 0 0 2 &PIC 93
-+				0x6000 0 0 3 &PIC 80
-+				0x6000 0 0 4 &PIC 81
- 
- 				/* IDSEL 0x0d */
--				6800 0 0 1 &/mv64x60/pic 5d
--				6800 0 0 2 &/mv64x60/pic 50
--				6800 0 0 3 &/mv64x60/pic 51
--				6800 0 0 4 &/mv64x60/pic 5b
-+				0x6800 0 0 1 &PIC 93
-+				0x6800 0 0 2 &PIC 80
-+				0x6800 0 0 3 &PIC 81
-+				0x6800 0 0 4 &PIC 91
- 			>;
- 		};
- 
- 		cpu-error@0070 {
--			compatible = "marvell,mv64x60-cpu-error";
--			reg = <0070 10 0128 28>;
--			interrupts = <03>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-cpu-error";
-+			reg = <0x70 0x10 0x128 0x28>;
-+			interrupts = <3>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		sram-ctrl@0380 {
--			compatible = "marvell,mv64x60-sram-ctrl";
--			reg = <0380 80>;
--			interrupts = <0d>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-sram-ctrl";
-+			reg = <0x380 0x80>;
-+			interrupts = <13>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		pci-error@1d40 {
--			compatible = "marvell,mv64x60-pci-error";
--			reg = <1d40 40 0c28 4>;
--			interrupts = <0c>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-pci-error";
-+			reg = <0x1d40 0x40 0xc28 0x4>;
-+			interrupts = <12>;
-+			interrupt-parent = <&PIC>;
- 		};
- 
- 		mem-ctrl@1400 {
--			compatible = "marvell,mv64x60-mem-ctrl";
--			reg = <1400 60>;
--			interrupts = <11>;
--			interrupt-parent = <&/mv64x60/pic>;
-+			compatible = "marvell,mv64360-mem-ctrl";
-+			reg = <0x1400 0x60>;
-+			interrupts = <17>;
-+			interrupt-parent = <&PIC>;
- 		};
- 	};
- 
- 	chosen {
- 		bootargs = "ip=on";
--		linux,stdout-path = "/mv64x60@f1000000/mpsc@8000";
-+		linux,stdout-path = &MPSC0;
- 	};
- };
---- a/arch/powerpc/boot/dts/rainier.dts
-+++ b/arch/powerpc/boot/dts/rainier.dts
-@@ -254,7 +254,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC0>;
-@@ -270,7 +269,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -284,7 +283,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC1>;
-@@ -300,7 +298,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- /dev/null
-+++ b/arch/powerpc/boot/dts/sbc8641d.dts
-@@ -0,0 +1,352 @@
-+/*
-+ * SBC8641D Device Tree Source
-+ *
-+ * Copyright 2008 Wind River Systems Inc.
-+ *
-+ * Paul Gortmaker (see MAINTAINERS for contact information)
-+ *
-+ * Based largely on the mpc8641_hpcn.dts by Freescale Semiconductor Inc.
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+
-+/dts-v1/;
-+
-+/ {
-+	model = "SBC8641D";
-+	compatible = "wind,sbc8641";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	aliases {
-+		ethernet0 = &enet0;
-+		ethernet1 = &enet1;
-+		ethernet2 = &enet2;
-+		ethernet3 = &enet3;
-+		serial0 = &serial0;
-+		serial1 = &serial1;
-+		pci0 = &pci0;
-+		pci1 = &pci1;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		PowerPC,8641@0 {
-+			device_type = "cpu";
-+			reg = <0>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <32768>;		// L1
-+			i-cache-size = <32768>;		// L1
-+			timebase-frequency = <0>;	// From uboot
-+			bus-frequency = <0>;		// From uboot
-+			clock-frequency = <0>;		// From uboot
-+		};
-+		PowerPC,8641@1 {
-+			device_type = "cpu";
-+			reg = <1>;
-+			d-cache-line-size = <32>;
-+			i-cache-line-size = <32>;
-+			d-cache-size = <32768>;
-+			i-cache-size = <32768>;
-+			timebase-frequency = <0>;	// From uboot
-+			bus-frequency = <0>;		// From uboot
-+			clock-frequency = <0>;		// From uboot
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x20000000>;	// 512M at 0x0
-+	};
-+
-+	localbus@f8005000 {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		compatible = "fsl,mpc8641-localbus", "simple-bus";
-+		reg = <0xf8005000 0x1000>;
-+		interrupts = <19 2>;
-+		interrupt-parent = <&mpic>;
-+
-+		ranges = <0 0 0xff000000 0x01000000	// 16MB Boot flash
-+			  1 0 0xf0000000 0x00010000	// 64KB EEPROM
-+			  2 0 0xf1000000 0x00100000	// EPLD (1MB)
-+			  3 0 0xe0000000 0x04000000	// 64MB LB SDRAM (CS3)
-+			  4 0 0xe4000000 0x04000000	// 64MB LB SDRAM (CS4)
-+			  6 0 0xf4000000 0x00100000	// LCD display (1MB)
-+			  7 0 0xe8000000 0x04000000>;	// 64MB OneNAND
-+
-+		flash@0,0 {
-+			compatible = "cfi-flash";
-+			reg = <0 0 0x01000000>;
-+			bank-width = <2>;
-+			device-width = <2>;
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			partition@0 {
-+				label = "dtb";
-+				reg = <0x00000000 0x00100000>;
-+				read-only;
-+			};
-+			partition@300000 {
-+				label = "kernel";
-+				reg = <0x00100000 0x00400000>;
-+				read-only;
-+			};
-+			partition@400000 {
-+				label = "fs";
-+				reg = <0x00500000 0x00a00000>;
-+			};
-+			partition@700000 {
-+				label = "firmware";
-+				reg = <0x00f00000 0x00100000>;
-+				read-only;
-+			};
-+		};
-+
-+		epld@2,0 {
-+			compatible = "wrs,epld-localbus";
-+			#address-cells = <2>;
-+			#size-cells = <1>;
-+			reg = <2 0 0x100000>;
-+			ranges = <0 0 5 0 1	// User switches
-+				  1 0 5 1 1	// Board ID/Rev
-+				  3 0 5 3 1>;	// LEDs
-+		};
-+	};
-+
-+	soc@f8000000 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		device_type = "soc";
-+		compatible = "simple-bus";
-+		ranges = <0x00000000 0xf8000000 0x00100000>;
-+		reg = <0xf8000000 0x00001000>;	// CCSRBAR
-+		bus-frequency = <0>;
-+
-+		i2c@3000 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <0>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3000 0x100>;
-+			interrupts = <43 2>;
-+			interrupt-parent = <&mpic>;
-+			dfsrr;
-+		};
-+
-+		i2c@3100 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			cell-index = <1>;
-+			compatible = "fsl-i2c";
-+			reg = <0x3100 0x100>;
-+			interrupts = <43 2>;
-+			interrupt-parent = <&mpic>;
-+			dfsrr;
-+		};
-+
-+		mdio@24520 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			compatible = "fsl,gianfar-mdio";
-+			reg = <0x24520 0x20>;
-+
-+			phy0: ethernet-phy@1f {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <0x1f>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy1: ethernet-phy@0 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <0>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy2: ethernet-phy@1 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <1>;
-+				device_type = "ethernet-phy";
-+			};
-+			phy3: ethernet-phy@2 {
-+				interrupt-parent = <&mpic>;
-+				interrupts = <10 1>;
-+				reg = <2>;
-+				device_type = "ethernet-phy";
-+			};
-+		};
-+
-+		enet0: ethernet@24000 {
-+			cell-index = <0>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x24000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <29 2 30  2 34 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy0>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet1: ethernet@25000 {
-+			cell-index = <1>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x25000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <35 2 36 2 40 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy1>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet2: ethernet@26000 {
-+			cell-index = <2>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x26000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <31 2 32 2 33 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy2>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		enet3: ethernet@27000 {
-+			cell-index = <3>;
-+			device_type = "network";
-+			model = "TSEC";
-+			compatible = "gianfar";
-+			reg = <0x27000 0x1000>;
-+			local-mac-address = [ 00 00 00 00 00 00 ];
-+			interrupts = <37 2 38 2 39 2>;
-+			interrupt-parent = <&mpic>;
-+			phy-handle = <&phy3>;
-+			phy-connection-type = "rgmii-id";
-+		};
-+
-+		serial0: serial@4500 {
-+			cell-index = <0>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4500 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <42 2>;
-+			interrupt-parent = <&mpic>;
-+		};
-+
-+		serial1: serial@4600 {
-+			cell-index = <1>;
-+			device_type = "serial";
-+			compatible = "ns16550";
-+			reg = <0x4600 0x100>;
-+			clock-frequency = <0>;
-+			interrupts = <28 2>;
-+			interrupt-parent = <&mpic>;
-+		};
-+
-+		mpic: pic@40000 {
-+			clock-frequency = <0>;
-+			interrupt-controller;
-+			#address-cells = <0>;
-+			#interrupt-cells = <2>;
-+			reg = <0x40000 0x40000>;
-+			compatible = "chrp,open-pic";
-+			device_type = "open-pic";
-+			big-endian;
-+		};
-+
-+		global-utilities@e0000 {
-+			compatible = "fsl,mpc8641-guts";
-+			reg = <0xe0000 0x1000>;
-+			fsl,has-rstcr;
-+		};
-+	};
-+
-+	pci0: pcie@f8008000 {
-+		cell-index = <0>;
-+		compatible = "fsl,mpc8641-pcie";
-+		device_type = "pci";
-+		#interrupt-cells = <1>;
-+		#size-cells = <2>;
-+		#address-cells = <3>;
-+		reg = <0xf8008000 0x1000>;
-+		bus-range = <0x0 0xff>;
-+		ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-+			  0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
-+		clock-frequency = <33333333>;
-+		interrupt-parent = <&mpic>;
-+		interrupts = <24 2>;
-+		interrupt-map-mask = <0xff00 0 0 7>;
-+		interrupt-map = <
-+			/* IDSEL 0x0 */
-+			0x0000 0 0 1 &mpic 0 1
-+			0x0000 0 0 2 &mpic 1 1
-+			0x0000 0 0 3 &mpic 2 1
-+			0x0000 0 0 4 &mpic 3 1
-+			>;
-+
-+		pcie@0 {
-+			reg = <0 0 0 0 0>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			device_type = "pci";
-+			ranges = <0x02000000 0x0 0x80000000
-+				  0x02000000 0x0 0x80000000
-+				  0x0 0x20000000
-+
-+				  0x01000000 0x0 0x00000000
-+				  0x01000000 0x0 0x00000000
-+				  0x0 0x00100000>;
-+		};
-+
-+	};
-+
-+	pci1: pcie@f8009000 {
-+		cell-index = <1>;
-+		compatible = "fsl,mpc8641-pcie";
-+		device_type = "pci";
-+		#interrupt-cells = <1>;
-+		#size-cells = <2>;
-+		#address-cells = <3>;
-+		reg = <0xf8009000 0x1000>;
-+		bus-range = <0 0xff>;
-+		ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-+			  0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
-+		clock-frequency = <33333333>;
-+		interrupt-parent = <&mpic>;
-+		interrupts = <25 2>;
-+		interrupt-map-mask = <0xf800 0 0 7>;
-+		interrupt-map = <
-+			/* IDSEL 0x0 */
-+			0x0000 0 0 1 &mpic 4 1
-+			0x0000 0 0 2 &mpic 5 1
-+			0x0000 0 0 3 &mpic 6 1
-+			0x0000 0 0 4 &mpic 7 1
-+			>;
-+
-+		pcie@0 {
-+			reg = <0 0 0 0 0>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			device_type = "pci";
-+			ranges = <0x02000000 0x0 0xa0000000
-+				  0x02000000 0x0 0xa0000000
-+				  0x0 0x20000000
-+
-+				  0x01000000 0x0 0x00000000
-+				  0x01000000 0x0 0x00000000
-+				  0x0 0x00100000>;
-+		};
-+	};
-+};
---- a/arch/powerpc/boot/dts/sequoia.dts
-+++ b/arch/powerpc/boot/dts/sequoia.dts
-@@ -269,7 +269,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC0>;
-@@ -285,7 +284,7 @@
- 				mal-tx-channel = <0>;
- 				mal-rx-channel = <0>;
- 				cell-index = <0>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -299,7 +298,6 @@
- 			};
- 
- 			EMAC1: ethernet@ef600f00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440epx", "ibm,emac4";
- 				interrupt-parent = <&EMAC1>;
-@@ -315,7 +313,7 @@
- 				mal-tx-channel = <1>;
- 				mal-rx-channel = <1>;
- 				cell-index = <1>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
---- a/arch/powerpc/boot/dts/taishan.dts
-+++ b/arch/powerpc/boot/dts/taishan.dts
-@@ -104,6 +104,16 @@
- 		// FIXME: anything else?
- 	};
- 
-+	L2C0: l2c {
-+		compatible = "ibm,l2-cache-440gx", "ibm,l2-cache";
-+		dcr-reg = <20 8			/* Internal SRAM DCR's */
-+			   30 8>;		/* L2 cache DCR's */
-+		cache-line-size = <20>;		/* 32 bytes */
-+		cache-size = <40000>;		/* L2, 256K */
-+		interrupt-parent = <&UIC2>;
-+		interrupts = <17 1>;
-+	};
-+
- 	plb {
- 		compatible = "ibm,plb-440gx", "ibm,plb4";
- 		#address-cells = <2>;
-@@ -232,10 +242,18 @@
- 				reg = <40000790 8>;
- 			};
- 
-+			TAH0: emac-tah@40000b50 {
-+				compatible = "ibm,tah-440gx", "ibm,tah";
-+				reg = <40000b50 30>;
-+			};
-+
-+			TAH1: emac-tah@40000d50 {
-+				compatible = "ibm,tah-440gx", "ibm,tah";
-+				reg = <40000d50 30>;
-+			};
- 
- 			EMAC0: ethernet@40000800 {
- 				unused = <1>;
--				linux,network-index = <2>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC1>;
-@@ -256,7 +274,6 @@
- 			};
- 		 	EMAC1: ethernet@40000900 {
- 				unused = <1>;
--				linux,network-index = <3>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC1>;
-@@ -277,7 +294,6 @@
- 			};
- 
- 		 	EMAC2: ethernet@40000c00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC2>;
-@@ -288,7 +304,7 @@
- 				mal-tx-channel = <2>;
- 				mal-rx-channel = <2>;
- 				cell-index = <2>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -297,10 +313,11 @@
- 				rgmii-channel = <0>;
-  				zmii-device = <&ZMII0>;
- 				zmii-channel = <2>;
-+				tah-device = <&TAH0>;
-+				tah-channel = <0>;
- 			};
- 
- 		 	EMAC3: ethernet@40000e00 {
--				linux,network-index = <1>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440gx", "ibm,emac4";
- 				interrupt-parent = <&UIC2>;
-@@ -311,7 +328,7 @@
- 				mal-tx-channel = <3>;
- 				mal-rx-channel = <3>;
- 				cell-index = <3>;
--				max-frame-size = <5dc>;
-+				max-frame-size = <2328>;
- 				rx-fifo-size = <1000>;
- 				tx-fifo-size = <800>;
- 				phy-mode = "rgmii";
-@@ -320,6 +337,8 @@
- 				rgmii-channel = <1>;
-  				zmii-device = <&ZMII0>;
- 				zmii-channel = <3>;
-+				tah-device = <&TAH1>;
-+				tah-channel = <0>;
- 			};
- 
- 
---- a/arch/powerpc/boot/dts/walnut.dts
-+++ b/arch/powerpc/boot/dts/walnut.dts
-@@ -125,7 +125,6 @@
- 			};
- 
- 			EMAC: ethernet@ef600800 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-405gp", "ibm,emac";
- 				interrupt-parent = <&UIC0>;
---- a/arch/powerpc/boot/dts/warp.dts
-+++ b/arch/powerpc/boot/dts/warp.dts
-@@ -204,7 +204,6 @@
- 			};
- 
- 			EMAC0: ethernet@ef600e00 {
--				linux,network-index = <0>;
- 				device_type = "network";
- 				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
- 				interrupt-parent = <&UIC1>;
---- /dev/null
-+++ b/arch/powerpc/boot/dts/yosemite.dts
-@@ -0,0 +1,304 @@
-+/*
-+ * Device Tree Source for AMCC Yosemite
-+ *
-+ * Copyright 2008 IBM Corp.
-+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without
-+ * any warranty of any kind, whether express or implied.
-+ */
-+
-+/ {
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+	model = "amcc,yosemite";
-+	compatible = "amcc,yosemite","amcc,bamboo";
-+	dcr-parent = <&/cpus/cpu@0>;
-+
-+	aliases {
-+		ethernet0 = &EMAC0;
-+		ethernet1 = &EMAC1;
-+		serial0 = &UART0;
-+		serial1 = &UART1;
-+		serial2 = &UART2;
-+		serial3 = &UART3;
-+	};
-+
-+	cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		cpu@0 {
-+			device_type = "cpu";
-+			model = "PowerPC,440EP";
-+			reg = <0>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+			timebase-frequency = <0>; /* Filled in by zImage */
-+			i-cache-line-size = <20>;
-+			d-cache-line-size = <20>;
-+			i-cache-size = <8000>;
-+			d-cache-size = <8000>;
-+			dcr-controller;
-+			dcr-access-method = "native";
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0 0 0>; /* Filled in by zImage */
-+	};
-+
-+	UIC0: interrupt-controller0 {
-+		compatible = "ibm,uic-440ep","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <0>;
-+		dcr-reg = <0c0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+	};
-+
-+	UIC1: interrupt-controller1 {
-+		compatible = "ibm,uic-440ep","ibm,uic";
-+		interrupt-controller;
-+		cell-index = <1>;
-+		dcr-reg = <0d0 009>;
-+		#address-cells = <0>;
-+		#size-cells = <0>;
-+		#interrupt-cells = <2>;
-+		interrupts = <1e 4 1f 4>; /* cascade */
-+		interrupt-parent = <&UIC0>;
-+	};
-+
-+	SDR0: sdr {
-+		compatible = "ibm,sdr-440ep";
-+		dcr-reg = <00e 002>;
-+	};
-+
-+	CPR0: cpr {
-+		compatible = "ibm,cpr-440ep";
-+		dcr-reg = <00c 002>;
-+	};
-+
-+	plb {
-+		compatible = "ibm,plb-440ep", "ibm,plb-440gp", "ibm,plb4";
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+		clock-frequency = <0>; /* Filled in by zImage */
-+
-+		SDRAM0: sdram {
-+			compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
-+			dcr-reg = <010 2>;
-+		};
-+
-+		DMA0: dma {
-+			compatible = "ibm,dma-440ep", "ibm,dma-440gp";
-+			dcr-reg = <100 027>;
-+		};
-+
-+		MAL0: mcmal {
-+			compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
-+			dcr-reg = <180 62>;
-+			num-tx-chans = <4>;
-+			num-rx-chans = <2>;
-+			interrupt-parent = <&MAL0>;
-+			interrupts = <0 1 2 3 4>;
-+			#interrupt-cells = <1>;
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-+					/*RXEOB*/ 1 &UIC0 b 4
-+					/*SERR*/  2 &UIC1 0 4
-+					/*TXDE*/  3 &UIC1 1 4
-+					/*RXDE*/  4 &UIC1 2 4>;
-+		};
-+
-+		POB0: opb {
-+			compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			/* Bamboo is oddball in the 44x world and doesn't use the ERPN
-+			 * bits.
-+			 */
-+			ranges = <00000000 0 00000000 80000000
-+			          80000000 0 80000000 80000000>;
-+			interrupt-parent = <&UIC1>;
-+			interrupts = <7 4>;
-+			clock-frequency = <0>; /* Filled in by zImage */
-+
-+			EBC0: ebc {
-+				compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
-+				dcr-reg = <012 2>;
-+				#address-cells = <2>;
-+				#size-cells = <1>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				interrupts = <5 1>;
-+				interrupt-parent = <&UIC1>;
-+			};
-+
-+			UART0: serial@ef600300 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600300 8>;
-+				virtual-reg = <ef600300>;
-+				clock-frequency = <0>; /* Filled in by zImage */
-+				current-speed = <1c200>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <0 4>;
-+			};
-+
-+			UART1: serial@ef600400 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600400 8>;
-+				virtual-reg = <ef600400>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <1 4>;
-+			};
-+
-+			UART2: serial@ef600500 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600500 8>;
-+				virtual-reg = <ef600500>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <3 4>;
-+				status = "disabled";
-+			};
-+
-+			UART3: serial@ef600600 {
-+				device_type = "serial";
-+				compatible = "ns16550";
-+				reg = <ef600600 8>;
-+				virtual-reg = <ef600600>;
-+				clock-frequency = <0>;
-+				current-speed = <0>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <4 4>;
-+				status = "disabled";
-+			};
-+
-+			IIC0: i2c@ef600700 {
-+				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-+				reg = <ef600700 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <2 4>;
-+			};
-+
-+			IIC1: i2c@ef600800 {
-+				compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-+				reg = <ef600800 14>;
-+				interrupt-parent = <&UIC0>;
-+				interrupts = <7 4>;
-+			};
-+
-+			spi@ef600900 {
-+				compatible = "amcc,spi-440ep";
-+				reg = <ef600900 6>;
-+				interrupts = <8 4>;
-+				interrupt-parent = <&UIC0>;
-+			};
-+
-+			ZMII0: emac-zmii@ef600d00 {
-+				compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
-+				reg = <ef600d00 c>;
-+			};
-+
-+			EMAC0: ethernet@ef600e00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1c 4 1d 4>;
-+				reg = <ef600e00 70>;
-+				local-mac-address = [000000000000];
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <0 1>;
-+				mal-rx-channel = <0>;
-+				cell-index = <0>;
-+				max-frame-size = <5dc>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rmii";
-+				phy-map = <00000000>;
-+				zmii-device = <&ZMII0>;
-+				zmii-channel = <0>;
-+			};
-+
-+			EMAC1: ethernet@ef600f00 {
-+				device_type = "network";
-+				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
-+				interrupt-parent = <&UIC1>;
-+				interrupts = <1e 4 1f 4>;
-+				reg = <ef600f00 70>;
-+				local-mac-address = [000000000000];
-+				mal-device = <&MAL0>;
-+				mal-tx-channel = <2 3>;
-+				mal-rx-channel = <1>;
-+				cell-index = <1>;
-+				max-frame-size = <5dc>;
-+				rx-fifo-size = <1000>;
-+				tx-fifo-size = <800>;
-+				phy-mode = "rmii";
-+				phy-map = <00000000>;
-+				zmii-device = <&ZMII0>;
-+				zmii-channel = <1>;
-+			};
-+
-+			usb@ef601000 {
-+				compatible = "ohci-be";
-+				reg = <ef601000 80>;
-+				interrupts = <8 4 9 4>;
-+				interrupt-parent = < &UIC1 >;
-+			};
-+		};
-+
-+		PCI0: pci@ec000000 {
-+			device_type = "pci";
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			#address-cells = <3>;
-+			compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
-+			primary;
-+			reg = <0 eec00000 8	/* Config space access */
-+			       0 eed00000 4	/* IACK */
-+			       0 eed00000 4	/* Special cycle */
-+			       0 ef400000 40>;	/* Internal registers */
-+
-+			/* Outbound ranges, one memory and one IO,
-+			 * later cannot be changed. Chip supports a second
-+			 * IO range but we don't use it for now
-+			 */
-+			ranges = <02000000 0 a0000000 0 a0000000 0 20000000
-+				  01000000 0 00000000 0 e8000000 0 00010000>;
-+
-+			/* Inbound 2GB range starting at 0 */
-+			dma-ranges = <42000000 0 0 0 0 0 80000000>;
-+
-+			/* Bamboo has all 4 IRQ pins tied together per slot */
-+			interrupt-map-mask = <f800 0 0 0>;
-+			interrupt-map = <
-+				/* IDSEL 1 */
-+				0800 0 0 0 &UIC0 1c 8
-+
-+				/* IDSEL 2 */
-+				1000 0 0 0 &UIC0 1b 8
-+
-+				/* IDSEL 3 */
-+				1800 0 0 0 &UIC0 1a 8
-+
-+				/* IDSEL 4 */
-+				2000 0 0 0 &UIC0 19 8
-+			>;
-+		};
-+	};
-+
-+	chosen {
-+		linux,stdout-path = "/plb/opb/serial@ef600300";
-+	};
-+};
---- a/arch/powerpc/boot/ebony.c
-+++ b/arch/powerpc/boot/ebony.c
-@@ -75,7 +75,8 @@ static void ebony_fixups(void)
- 
- 	ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
- 	ibm4xx_sdram_fixup_memsize();
--	dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
-+	dt_fixup_mac_address_by_alias("ethernet0", ebony_mac0);
-+	dt_fixup_mac_address_by_alias("ethernet1", ebony_mac1);
- 	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
- 	ebony_flashsel_fixup();
- }
---- a/arch/powerpc/boot/libfdt-wrapper.c
-+++ b/arch/powerpc/boot/libfdt-wrapper.c
-@@ -35,7 +35,7 @@
- #define check_err(err) \
- 	({ \
- 		if (BAD_ERROR(err) || ((err < 0) && DEBUG)) \
--			printf("%s():%d  %s\n\r", __FUNCTION__, __LINE__, \
-+			printf("%s():%d  %s\n\r", __func__, __LINE__, \
- 			       fdt_strerror(err)); \
- 		if (BAD_ERROR(err)) \
- 			exit(); \
---- a/arch/powerpc/boot/mpc52xx-psc.c
-+++ b/arch/powerpc/boot/mpc52xx-psc.c
-@@ -51,14 +51,9 @@ static unsigned char psc_getc(void)
- 
- int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
- {
--	int n;
--
- 	/* Get the base address of the psc registers */
--	n = getprop(devp, "virtual-reg", &psc, sizeof(psc));
--	if (n != sizeof(psc)) {
--		if (!dt_xlate_reg(devp, 0, (void *)&psc, NULL))
--			return -1;
--	}
-+	if (dt_get_virtual_reg(devp, &psc, 1) < 1)
-+		return -1;
- 
- 	scdp->open = psc_open;
- 	scdp->putc = psc_putc;
---- a/arch/powerpc/boot/mpsc.c
-+++ b/arch/powerpc/boot/mpsc.c
-@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct
- 	if (mpscintr_base == NULL)
- 		goto err_out;
- 
--	n = getprop(devp, "block-index", &v, sizeof(v));
-+	n = getprop(devp, "cell-index", &v, sizeof(v));
- 	if (n != sizeof(v))
- 		goto err_out;
- 	reg_set = (int)v;
---- a/arch/powerpc/boot/mv64x60.c
-+++ b/arch/powerpc/boot/mv64x60.c
-@@ -535,7 +535,7 @@ u8 *mv64x60_get_bridge_pbase(void)
- 	u32 v[2];
- 	void *devp;
- 
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "reg", v, sizeof(v)) != sizeof(v))
-@@ -553,7 +553,7 @@ u8 *mv64x60_get_bridge_base(void)
- 	u32 v;
- 	void *devp;
- 
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
---- a/arch/powerpc/boot/mv64x60_i2c.c
-+++ b/arch/powerpc/boot/mv64x60_i2c.c
-@@ -185,7 +185,7 @@ int mv64x60_i2c_open(void)
- 	u32 v;
- 	void *devp;
- 
--	devp = finddevice("/mv64x60/i2c");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360-i2c");
- 	if (devp == NULL)
- 		goto err_out;
- 	if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v))
---- a/arch/powerpc/boot/ns16550.c
-+++ b/arch/powerpc/boot/ns16550.c
-@@ -55,15 +55,9 @@ static u8 ns16550_tstc(void)
- int ns16550_console_init(void *devp, struct serial_console_data *scdp)
- {
- 	int n;
--	unsigned long reg_phys;
- 
--	n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
--	if (n != sizeof(reg_base)) {
--		if (!dt_xlate_reg(devp, 0, &reg_phys, NULL))
--			return -1;
--
--		reg_base = (void *)reg_phys;
--	}
-+	if (dt_get_virtual_reg(devp, (void **)&reg_base, 1) < 1)
-+		return -1;
- 
- 	n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
- 	if (n != sizeof(reg_shift))
---- a/arch/powerpc/boot/ops.h
-+++ b/arch/powerpc/boot/ops.h
-@@ -95,6 +95,7 @@ int dt_xlate_reg(void *node, int res, un
- int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
- int dt_is_compatible(void *node, const char *compat);
- void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
-+int dt_get_virtual_reg(void *node, void **addr, int nres);
- 
- static inline void *finddevice(const char *name)
- {
---- a/arch/powerpc/boot/prpmc2800.c
-+++ b/arch/powerpc/boot/prpmc2800.c
-@@ -344,20 +344,20 @@ static void prpmc2800_bridge_setup(u32 m
- 			acc_bits);
- 
- 	/* Get the cpu -> pci i/o & mem mappings from the device tree */
--	devp = finddevice("/mv64x60/pci@80000000");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360-pci");
- 	if (devp == NULL)
--		fatal("Error: Missing /mv64x60/pci@80000000"
-+		fatal("Error: Missing marvell,mv64360-pci"
- 				" device tree node\n\r");
- 
- 	rc = getprop(devp, "ranges", v, sizeof(v));
- 	if (rc != sizeof(v))
--		fatal("Error: Can't find /mv64x60/pci@80000000/ranges"
-+		fatal("Error: Can't find marvell,mv64360-pci ranges"
- 				" property\n\r");
- 
- 	/* Get the cpu -> pci i/o & mem mappings from the device tree */
--	devp = finddevice("/mv64x60");
-+	devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 	if (devp == NULL)
--		fatal("Error: Missing /mv64x60 device tree node\n\r");
-+		fatal("Error: Missing marvell,mv64360 device tree node\n\r");
- 
- 	enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
- 	enables |= 0x0007fe00; /* Disable all cpu->pci windows */
-@@ -429,9 +429,9 @@ static void prpmc2800_fixups(void)
- 	setprop(devp, "model", model, l);
- 
- 	/* Set /cpus/PowerPC,7447/clock-frequency */
--	devp = finddevice("/cpus/PowerPC,7447");
-+	devp = find_node_by_prop_value_str(NULL, "device_type", "cpu");
- 	if (devp == NULL)
--		fatal("Error: Missing proper /cpus device tree node\n\r");
-+		fatal("Error: Missing proper cpu device tree node\n\r");
- 	v[0] = bip->core_speed;
- 	setprop(devp, "clock-frequency", &v[0], sizeof(v[0]));
- 
-@@ -443,16 +443,17 @@ static void prpmc2800_fixups(void)
- 	v[1] = bip->mem_size;
- 	setprop(devp, "reg", v, sizeof(v));
- 
--	/* Update /mv64x60/model, if this is a mv64362 */
-+	/* Update model, if this is a mv64362 */
- 	if (bip->bridge_type == BRIDGE_TYPE_MV64362) {
--		devp = finddevice("/mv64x60");
-+		devp = find_node_by_compatible(NULL, "marvell,mv64360");
- 		if (devp == NULL)
--			fatal("Error: Missing /mv64x60 device tree node\n\r");
-+			fatal("Error: Missing marvell,mv64360"
-+					" device tree node\n\r");
- 		setprop(devp, "model", "mv64362", strlen("mv64362") + 1);
- 	}
- 
- 	/* Set User FLASH size */
--	devp = finddevice("/mv64x60/flash@a0000000");
-+	devp = find_node_by_compatible(NULL, "direct-mapped");
- 	if (devp == NULL)
- 		fatal("Error: Missing User FLASH device tree node\n\r");
- 	rc = getprop(devp, "reg", v, sizeof(v));
---- a/arch/powerpc/boot/ps3-head.S
-+++ b/arch/powerpc/boot/ps3-head.S
-@@ -27,8 +27,9 @@
- /*
-  * __system_reset_overlay - The PS3 first stage entry.
-  *
-- * The bootwraper build script copies the 0x100 bytes at symbol
-- * __system_reset_overlay to offset 0x100 of the rom image.
-+ * The bootwraper build script copies the 512 bytes at symbol
-+ * __system_reset_overlay to offset 0x100 of the rom image.  This symbol
-+ * must occupy 512 or less bytes.
-  *
-  * The PS3 has a single processor with two threads.
-  */
-@@ -47,8 +48,6 @@ __system_reset_overlay:
- 
- 	mfspr	r3, 0x88
- 	cntlzw.	r3, r3
--	li	r4, 0
--	li	r5, 0
- 	beq	1f
- 
- 	/* Secondary goes to __secondary_hold in kernel. */
-@@ -57,8 +56,14 @@ __system_reset_overlay:
- 	mtctr	r4
- 	bctr
- 
--	/* Primary delays then goes to _zimage_start in wrapper. */
- 1:
-+	/* Save the value at addr zero for a null pointer write check later. */
-+
-+	li	r4, 0
-+	lwz	r3, 0(r4)
-+
-+	/* Primary delays then goes to _zimage_start in wrapper. */
-+
- 	or	31, 31, 31 /* db16cyc */
- 	or	31, 31, 31 /* db16cyc */
- 
-@@ -67,16 +72,18 @@ __system_reset_overlay:
- 	mtctr	r4
- 	bctr
- 
-+	. = __system_reset_overlay + 512
-+
- /*
-  * __system_reset_kernel - Place holder for the kernel reset vector.
-  *
-- * The bootwrapper build script copies 0x100 bytes from offset 0x100
-+ * The bootwrapper build script copies 512 bytes from offset 0x100
-  * of the rom image to the symbol __system_reset_kernel.  At runtime
-- * the bootwrapper program copies the 0x100 bytes at __system_reset_kernel
-- * to ram address 0x100.  This symbol must occupy 0x100 bytes.
-+ * the bootwrapper program copies the 512 bytes at __system_reset_kernel
-+ * to ram address 0x100.  This symbol must occupy 512 bytes.
-  */
- 
- 	.globl __system_reset_kernel
- __system_reset_kernel:
- 
--	. = __system_reset_kernel + 0x100
-+	. = __system_reset_kernel + 512
---- a/arch/powerpc/boot/ps3.c
-+++ b/arch/powerpc/boot/ps3.c
-@@ -27,10 +27,10 @@
- #include "page.h"
- #include "ops.h"
- 
--extern s64 lv1_panic(u64 in_1);
--extern s64 lv1_get_logical_partition_id(u64 *out_1);
--extern s64 lv1_get_logical_ppe_id(u64 *out_1);
--extern s64 lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
-+extern int lv1_panic(u64 in_1);
-+extern int lv1_get_logical_partition_id(u64 *out_1);
-+extern int lv1_get_logical_ppe_id(u64 *out_1);
-+extern int lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
- 	u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
- 
- #ifdef DEBUG
-@@ -46,6 +46,7 @@ BSS_STACK(4096);
-  * edit the command line passed to vmlinux (by setting /chosen/bootargs).
-  * The buffer is put in it's own section so that tools may locate it easier.
-  */
-+
- static char cmdline[COMMAND_LINE_SIZE]
- 	__attribute__((__section__("__builtin_cmdline")));
- 
-@@ -75,7 +76,7 @@ static void ps3_exit(void)
- 
- static int ps3_repository_read_rm_size(u64 *rm_size)
- {
--	s64 result;
-+	int result;
- 	u64 lpar_id;
- 	u64 ppe_id;
- 	u64 v2;
-@@ -114,16 +115,17 @@ void ps3_copy_vectors(void)
- {
- 	extern char __system_reset_kernel[];
- 
--	memcpy((void *)0x100, __system_reset_kernel, 0x100);
--	flush_cache((void *)0x100, 0x100);
-+	memcpy((void *)0x100, __system_reset_kernel, 512);
-+	flush_cache((void *)0x100, 512);
- }
- 
--void platform_init(void)
-+void platform_init(unsigned long null_check)
- {
- 	const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */
- 	void *chosen;
- 	unsigned long ft_addr;
- 	u64 rm_size;
-+	unsigned long val;
- 
- 	console_ops.write = ps3_console_write;
- 	platform_ops.exit = ps3_exit;
-@@ -151,6 +153,11 @@ void platform_init(void)
- 
- 	printf(" flat tree at 0x%lx\n\r", ft_addr);
- 
-+	val = *(unsigned long *)0;
-+
-+	if (val != null_check)
-+		printf("null check failed: %lx != %lx\n\r", val, null_check);
-+
- 	((kernel_entry_t)0)(ft_addr, 0, NULL);
- 
- 	ps3_exit();
---- a/arch/powerpc/boot/serial.c
-+++ b/arch/powerpc/boot/serial.c
-@@ -119,7 +119,7 @@ int serial_console_init(void)
- 
- 	if (dt_is_compatible(devp, "ns16550"))
- 		rc = ns16550_console_init(devp, &serial_cd);
--	else if (dt_is_compatible(devp, "marvell,mpsc"))
-+	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
- 		rc = mpsc_console_init(devp, &serial_cd);
- 	else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
- 	         dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
---- /dev/null
-+++ b/arch/powerpc/boot/simpleboot.c
-@@ -0,0 +1,84 @@
-+/*
-+ * The simple platform -- for booting when firmware doesn't supply a device
-+ *                        tree or any platform configuration information.
-+ *                        All data is extracted from an embedded device tree
-+ *                        blob.
-+ *
-+ * Authors: Scott Wood <scottwood@freescale.com>
-+ *          Grant Likely <grant.likely@secretlab.ca>
-+ *
-+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
-+ * Copyright (c) 2008 Secret Lab Technologies Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include "ops.h"
-+#include "types.h"
-+#include "io.h"
-+#include "stdio.h"
-+#include "libfdt/libfdt.h"
-+
-+BSS_STACK(4*1024);
-+
-+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-+		   unsigned long r6, unsigned long r7)
-+{
-+	const u32 *na, *ns, *reg, *timebase;
-+	u64 memsize64;
-+	int node, size, i;
-+
-+	/* Make sure FDT blob is sane */
-+	if (fdt_check_header(_dtb_start) != 0)
-+		fatal("Invalid device tree blob\n");
-+
-+	/* Find the #address-cells and #size-cells properties */
-+	node = fdt_path_offset(_dtb_start, "/");
-+	if (node < 0)
-+		fatal("Cannot find root node\n");
-+	na = fdt_getprop(_dtb_start, node, "#address-cells", &size);
-+	if (!na || (size != 4))
-+		fatal("Cannot find #address-cells property");
-+	ns = fdt_getprop(_dtb_start, node, "#size-cells", &size);
-+	if (!ns || (size != 4))
-+		fatal("Cannot find #size-cells property");
-+
-+	/* Find the memory range */
-+	node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
-+					     "memory", sizeof("memory"));
-+	if (node < 0)
-+		fatal("Cannot find memory node\n");
-+	reg = fdt_getprop(_dtb_start, node, "reg", &size);
-+	if (size < (*na+*ns) * sizeof(u32))
-+		fatal("cannot get memory range\n");
-+
-+	/* Only interested in memory based at 0 */
-+	for (i = 0; i < *na; i++)
-+		if (*reg++ != 0)
-+			fatal("Memory range is not based at address 0\n");
-+
-+	/* get the memsize and trucate it to under 4G on 32 bit machines */
-+	memsize64 = 0;
-+	for (i = 0; i < *ns; i++)
-+		memsize64 = (memsize64 << 32) | *reg++;
-+	if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
-+		memsize64 = 0xffffffff;
-+
-+	/* finally, setup the timebase */
-+	node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
-+					     "cpu", sizeof("cpu"));
-+	if (!node)
-+		fatal("Cannot find cpu node\n");
-+	timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &size);
-+	if (timebase && (size == 4))
-+		timebase_period_ns = 1000000000 / *timebase;
-+
-+	/* Now we have the memory size; initialize the heap */
-+	simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
-+
-+	/* prepare the device tree and find the console */
-+	fdt_init(_dtb_start);
-+	serial_console_init();
-+}
---- a/arch/powerpc/boot/treeboot-walnut.c
-+++ b/arch/powerpc/boot/treeboot-walnut.c
-@@ -68,7 +68,7 @@ static void walnut_fixups(void)
- 	ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
- 	ibm4xx_fixup_ebc_ranges("/plb/ebc");
- 	walnut_flashsel_fixup();
--	dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF);
-+	dt_fixup_mac_address_by_alias("ethernet0", (u8 *) WALNUT_OPENBIOS_MAC_OFF);
- }
- 
- void platform_init(void)
---- /dev/null
-+++ b/arch/powerpc/boot/virtex405-head.S
-@@ -0,0 +1,30 @@
-+#include "ppc_asm.h"
-+
-+	.text
-+	.global _zimage_start
-+_zimage_start:
-+
-+	/* PPC errata 213: needed by Virtex-4 FX */
-+	mfccr0  0
-+	oris    0,0,0x50000000@h
-+	mtccr0  0
-+
-+	/*
-+	 * Invalidate the data cache if the data cache is turned off.
-+	 * - The 405 core does not invalidate the data cache on power-up
-+	 *   or reset but does turn off the data cache. We cannot assume
-+	 *   that the cache contents are valid.
-+	 * - If the data cache is turned on this must have been done by
-+	 *   a bootloader and we assume that the cache contents are
-+	 *   valid.
-+	 */
-+	mfdccr	r9
-+	cmplwi	r9,0
-+	bne	2f
-+	lis	r9,0
-+	li	r8,256
-+	mtctr	r8
-+1:	dccci	r0,r9
-+	addi	r9,r9,0x20
-+	bdnz	1b
-+2:	b	_zimage_start_lib
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -174,7 +174,7 @@ cuboot*)
-     *-mpc83*)
-         platformo=$object/cuboot-83xx.o
-         ;;
--    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
-+    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555|*-ksi8560*)
-         platformo=$object/cuboot-85xx-cpm2.o
-         ;;
-     *-mpc85*|*-tqm8540|*-sbc85*)
-@@ -199,6 +199,10 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-virtex405-*)
-+    platformo="$object/virtex405-head.o $object/simpleboot.o"
-+    binary=y
-+    ;;
- esac
- 
- vmz="$tmpdir/`basename \"$kernel\"`.$ext"
-@@ -226,10 +230,13 @@ if [ -n "$version" ]; then
-     uboot_version="-n Linux-$version"
- fi
- 
-+# physical offset of kernel image
-+membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
-+
- case "$platform" in
- uboot)
-     rm -f "$ofile"
--    mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \
-+    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
- 	$uboot_version -d "$vmz" "$ofile"
-     if [ -z "$cacheit" ]; then
- 	rm -f "$vmz"
-@@ -298,15 +305,16 @@ treeboot*)
-     exit 0
-     ;;
- ps3)
--    # The ps3's loader supports loading gzipped binary images from flash
--    # rom to addr zero. The loader enters the image at addr 0x100.  A
--    # bootwrapper overlay is use to arrange for the kernel to be loaded
--    # to addr zero and to have a suitable bootwrapper entry at 0x100.
--    # To construct the rom image, 0x100 bytes from offset 0x100 in the
--    # kernel is copied to the bootwrapper symbol __system_reset_kernel.
--    # The 0x100 bytes at the bootwrapper symbol __system_reset_overlay is
--    # then copied to offset 0x100.  At runtime the bootwrapper program
--    # copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
-+    # The ps3's loader supports loading a gzipped binary image from flash
-+    # rom to ram addr zero. The loader then enters the system reset
-+    # vector at addr 0x100.  A bootwrapper overlay is used to arrange for
-+    # a binary image of the kernel to be at addr zero, and yet have a
-+    # suitable bootwrapper entry at 0x100.  To construct the final rom
-+    # image 512 bytes from offset 0x100 is copied to the bootwrapper
-+    # place holder at symbol __system_reset_kernel.  The 512 bytes of the
-+    # bootwrapper entry code at symbol __system_reset_overlay is then
-+    # copied to offset 0x100.  At runtime the bootwrapper program copies
-+    # the data at __system_reset_kernel back to addr 0x100.
- 
-     system_reset_overlay=0x`${CROSS}nm "$ofile" \
-         | grep ' __system_reset_overlay$'       \
-@@ -317,7 +325,7 @@ ps3)
-         | cut -d' ' -f1`
-     system_reset_kernel=`printf "%d" $system_reset_kernel`
-     overlay_dest="256"
--    overlay_size="256"
-+    overlay_size="512"
- 
-     ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
- 
---- /dev/null
-+++ b/arch/powerpc/configs/40x/ep405_defconfig
-@@ -0,0 +1,968 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:50:09 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_EP405=y
-+# CONFIG_KILAUEA is not set
-+# CONFIG_MAKALU is not set
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405GP=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_EHCI_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/kilauea_defconfig
-@@ -0,0 +1,839 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:51:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+CONFIG_KILAUEA=y
-+# CONFIG_MAKALU is not set
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/makalu_defconfig
-@@ -0,0 +1,839 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:52:30 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+# CONFIG_KILAUEA is not set
-+CONFIG_MAKALU=y
-+# CONFIG_WALNUT is not set
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/40x/walnut_defconfig
-@@ -0,0 +1,887 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:54:12 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_EP405 is not set
-+# CONFIG_KILAUEA is not set
-+# CONFIG_MAKALU is not set
-+CONFIG_WALNUT=y
-+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
-+CONFIG_405GP=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+# CONFIG_PCI_LEGACY is not set
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/bamboo_defconfig
-@@ -0,0 +1,815 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:36:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_BAMBOO=y
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440EP=y
-+CONFIG_IBM440EP_ERR42=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
-@@ -0,0 +1,721 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc1
-+# Thu Feb 21 14:29:28 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+# CONFIG_LOGBUFFER is not set
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_CANYONLANDS=y
-+CONFIG_460EX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+# CONFIG_MISC_DEVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=256
-+CONFIG_IBM_NEW_EMAC_TXB=256
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_TAH=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+# CONFIG_CRYPTO is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/ebony_defconfig
-@@ -0,0 +1,898 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:50:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+CONFIG_EBONY=y
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440GP=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/katmai_defconfig
-@@ -0,0 +1,790 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24-rc6
-+# Mon Dec 24 11:17:43 2007
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC52xx is not set
-+# CONFIG_PPC_MPC5200 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+CONFIG_KATMAI=y
-+# CONFIG_RAINIER is not set
-+CONFIG_440SPe=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_DEVICE_TREE="katmai.dts"
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI 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
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+# CONFIG_UCC_SLOW is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_KPROBES is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/rainier_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:53:10 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+CONFIG_RAINIER=y
-+# CONFIG_WARP is not set
-+CONFIG_440GRX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+CONFIG_PPC_EARLY_DEBUG_44x=y
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/sequoia_defconfig
-@@ -0,0 +1,916 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:53:46 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+CONFIG_SEQUOIA=y
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440EPX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+CONFIG_PPC_EARLY_DEBUG_44x=y
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
-+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/taishan_defconfig
-@@ -0,0 +1,815 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:40:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_PPC4xx_PCI_EXPRESS is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+CONFIG_TAISHAN=y
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+# CONFIG_WARP is not set
-+CONFIG_440GX=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE=""
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+CONFIG_MACINTOSH_DRIVERS=y
-+# CONFIG_MAC_EMUMOUSEBTN is not set
-+# CONFIG_WINDFARM is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+CONFIG_IBM_NEW_EMAC_TAH=y
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_KGDB is not set
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/44x/warp_defconfig
-@@ -0,0 +1,1110 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc2
-+# Fri Feb 15 21:54:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+CONFIG_44x=y
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_4xx=y
-+CONFIG_BOOKE=y
-+CONFIG_PTE_64BIT=y
-+CONFIG_PHYS_64BIT=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-pika"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_BAMBOO is not set
-+# CONFIG_EBONY is not set
-+# CONFIG_SEQUOIA is not set
-+# CONFIG_TAISHAN is not set
-+# CONFIG_KATMAI is not set
-+# CONFIG_RAINIER is not set
-+CONFIG_WARP=y
-+CONFIG_440EP=y
-+CONFIG_IBM440EP_ERR42=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+# CONFIG_HZ_250 is not set
-+# CONFIG_HZ_300 is not set
-+CONFIG_HZ_1000=y
-+CONFIG_HZ=1000
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+CONFIG_CMDLINE_BOOL=y
-+CONFIG_CMDLINE="ip=on"
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x01000000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# 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 is not set
-+# CONFIG_IP_PNP_RARP is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+# CONFIG_NETFILTER_XTABLES is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+# CONFIG_IP_NF_QUEUE is not set
-+# CONFIG_IP_NF_IPTABLES is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+CONFIG_VLAN_8021Q=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+# CONFIG_STANDALONE is not set
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+CONFIG_MTD_OOPS=m
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# 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_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
-+CONFIG_MTD_NAND=y
-+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-+CONFIG_MTD_NAND_ECC_SMC=y
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_NAND_FSL_ELBC is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+# CONFIG_SCSI_LOWLEVEL is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_MPC is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_GADGET is not set
-+CONFIG_MMC=m
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=m
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_WBSD is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+# CONFIG_TMPFS is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+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=y
-+# 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=y
-+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
-+# 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=y
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+CONFIG_BDI_SWITCH=y
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
-@@ -0,0 +1,1395 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Fri Apr 11 11:10:09 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+CONFIG_MPC831x_RDB=y
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC831x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_CAFE is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+CONFIG_MTD_NAND_FSL_ELBC=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+CONFIG_USB_GADGET_NET2280=y
-+CONFIG_USB_NET2280=y
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 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_S3C2410 is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+CONFIG_USB_GADGET_DUALSPEED=y
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
-@@ -0,0 +1,1451 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:15 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+CONFIG_MPC831x_RDB=y
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC831x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_CAFE is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_NAND_FSL_ELBC is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+CONFIG_USB_GADGET_NET2280=y
-+CONFIG_USB_NET2280=y
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 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_S3C2410 is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+CONFIG_USB_GADGET_DUALSPEED=y
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
-@@ -0,0 +1,1081 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:51 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+CONFIG_MPC832x_MDS=y
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC832x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+CONFIG_DAVICOM_PHY=y
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+# CONFIG_UGETH_NAPI is not set
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
-@@ -0,0 +1,1233 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:16 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+CONFIG_MPC832x_RDB=y
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC832x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+CONFIG_ICPLUS_PHY=y
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+# CONFIG_E1000_NAPI is not set
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+CONFIG_UGETH_NAPI=y
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+# CONFIG_USB_HID is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SDHCI is not set
-+# CONFIG_MMC_WBSD is not set
-+# CONFIG_MMC_TIFM_SD is not set
-+CONFIG_MMC_SPI=y
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+CONFIG_LDM_PARTITION=y
-+# CONFIG_LDM_DEBUG is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+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=y
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+CONFIG_NLS_ISO8859_8=y
-+# CONFIG_NLS_CODEPAGE_1250 is not set
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+# CONFIG_NLS_ASCII is not set
-+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
-+# 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
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_CRC32=y
-+CONFIG_CRC7=y
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
-@@ -0,0 +1,1295 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:17 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+CONFIG_MPC834x_ITX=y
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_PARTITIONS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0xfe000000
-+CONFIG_MTD_PHYSMAP_LEN=0x1000000
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+# CONFIG_BLK_DEV_IDE is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+CONFIG_SATA_SIL=y
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+CONFIG_PATA_PLATFORM=y
-+CONFIG_PATA_OF_PLATFORM=y
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+# CONFIG_MD_RAID456 is not set
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF8574=y
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# 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
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
-@@ -0,0 +1,1222 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:18 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+CONFIG_MPC834x_ITX=y
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_PARTITIONS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_BLKDEVS is not set
-+# CONFIG_MTD_BLOCK is not set
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0xfe000000
-+CONFIG_MTD_PHYSMAP_LEN=0x800000
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+CONFIG_SCSI_SPI_ATTRS=y
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+CONFIG_CICADA_PHY=y
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+# CONFIG_NET_ETHERNET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF8574=y
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_MPC83xx=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+CONFIG_USB_UHCI_HCD=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+CONFIG_RTC_DRV_DS1307=y
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# 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
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
-@@ -0,0 +1,1021 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:56 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+CONFIG_MPC834x_MDS=y
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
-@@ -0,0 +1,1079 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:36:57 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+CONFIG_MPC836x_MDS=y
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_GIANFAR is not set
-+CONFIG_UCC_GETH=y
-+# CONFIG_UGETH_NAPI is not set
-+# CONFIG_UGETH_MAGIC_PACKET is not set
-+# CONFIG_UGETH_FILTERING is not set
-+# CONFIG_UGETH_TX_ON_DEMAND is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+CONFIG_UCC_FAST=y
-+CONFIG_UCC=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:23 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+CONFIG_MPC837x_MDS=y
-+# CONFIG_MPC837x_RDB is not set
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC837x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_MV is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
-@@ -0,0 +1,930 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:24 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+CONFIG_MPC837x_RDB=y
-+# CONFIG_SBC834x is not set
-+CONFIG_PPC_MPC837x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# 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=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+# CONFIG_SATA_MV is not set
-+CONFIG_SATA_FSL=y
-+# CONFIG_PATA_PLATFORM is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+# CONFIG_MD_LINEAR is not set
-+# CONFIG_MD_RAID0 is not set
-+CONFIG_MD_RAID1=y
-+# CONFIG_MD_RAID10 is not set
-+CONFIG_MD_RAID456=y
-+CONFIG_MD_RAID5_RESHAPE=y
-+# CONFIG_MD_MULTIPATH is not set
-+# CONFIG_MD_FAULTY is not set
-+# CONFIG_BLK_DEV_DM is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+# CONFIG_USB_DEVICEFS is not set
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_ROOT_HUB_TT=y
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+CONFIG_USB_EHCI_FSL=y
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+# CONFIG_ENABLE_MUST_CHECK is not set
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_XOR_BLOCKS=y
-+CONFIG_ASYNC_CORE=y
-+CONFIG_ASYNC_MEMCPY=y
-+CONFIG_ASYNC_XOR=y
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
-@@ -0,0 +1,828 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:38 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+# CONFIG_FSL_EMB_PERFMON is not set
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+# CONFIG_SMP is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+CONFIG_PPC_83xx=y
-+# CONFIG_PPC_86xx is not set
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC83xx=y
-+# CONFIG_MPC831x_RDB is not set
-+# CONFIG_MPC832x_MDS is not set
-+# CONFIG_MPC832x_RDB is not set
-+# CONFIG_MPC834x_MDS is not set
-+# CONFIG_MPC834x_ITX is not set
-+# CONFIG_MPC836x_MDS is not set
-+# CONFIG_MPC837x_MDS is not set
-+# CONFIG_MPC837x_RDB is not set
-+CONFIG_SBC834x=y
-+CONFIG_PPC_MPC834x=y
-+CONFIG_IPIC=y
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_83xx_WDT=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+# CONFIG_CRYPTO_HW is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
-@@ -0,0 +1,899 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 11 16:25:19 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+CONFIG_KSI8560=y
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_RCU_TRACE=y
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_WANT_DEVICE_TREE=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# 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_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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+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_IDEDISK is not set
-+# 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+# CONFIG_BLK_DEV_IDEDMA is not set
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+CONFIG_MDIO_BITBANG=y
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_FS_ENET=y
-+# CONFIG_FS_ENET_HAS_SCC is not set
-+CONFIG_FS_ENET_HAS_FCC=y
-+CONFIG_FS_ENET_MDIO_FCC=y
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
-@@ -0,0 +1,796 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:25 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+CONFIG_MPC8540_ADS=y
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig
-@@ -0,0 +1,1564 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:03 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-+# CONFIG_TASKSTATS is not set
-+CONFIG_AUDIT=y
-+# CONFIG_AUDITSYSCALL is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+CONFIG_MPC85xx_DS=y
-+# CONFIG_KSI8560 is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_FSL_ULI1575=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=y
-+CONFIG_NET_IPGRE=y
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_ARPD=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=y
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=y
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+# CONFIG_INET6_AH is not set
-+# CONFIG_INET6_ESP is not set
-+# CONFIG_INET6_IPCOMP is not set
-+# CONFIG_IPV6_MIP6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET6_XFRM_MODE_TUNNEL=y
-+CONFIG_INET6_XFRM_MODE_BEET=y
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=y
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=131072
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=y
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+CONFIG_SCSI_LOGGING=y
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_SATA_AHCI=y
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+CONFIG_PATA_ALI=y
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=y
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+CONFIG_VITESSE_PHY=y
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# 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_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_DETECT_IRQ=y
-+CONFIG_SERIAL_8250_RSA=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_NVRAM=y
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+CONFIG_DVB_CORE=m
-+# CONFIG_DVB_CORE_ATTACH is not set
-+CONFIG_DVB_CAPTURE_DRIVERS=y
-+
-+#
-+# Supported SAA7146 based PCI Adapters
-+#
-+# CONFIG_TTPCI_EEPROM is not set
-+# CONFIG_DVB_BUDGET_CORE is not set
-+
-+#
-+# Supported USB Adapters
-+#
-+# CONFIG_DVB_USB is not set
-+# CONFIG_DVB_TTUSB_BUDGET is not set
-+# CONFIG_DVB_TTUSB_DEC is not set
-+# CONFIG_DVB_CINERGYT2 is not set
-+
-+#
-+# Supported FlexCopII (B2C2) Adapters
-+#
-+# CONFIG_DVB_B2C2_FLEXCOP is not set
-+
-+#
-+# Supported BT878 Adapters
-+#
-+
-+#
-+# Supported Pluto2 Adapters
-+#
-+# CONFIG_DVB_PLUTO2 is not set
-+
-+#
-+# Supported DVB Frontends
-+#
-+
-+#
-+# Customise DVB Frontends
-+#
-+# CONFIG_DVB_FE_CUSTOMISE is not set
-+
-+#
-+# DVB-S (satellite) frontends
-+#
-+# CONFIG_DVB_STV0299 is not set
-+# CONFIG_DVB_CX24110 is not set
-+# CONFIG_DVB_CX24123 is not set
-+# CONFIG_DVB_TDA8083 is not set
-+# CONFIG_DVB_MT312 is not set
-+# CONFIG_DVB_VES1X93 is not set
-+# CONFIG_DVB_S5H1420 is not set
-+# CONFIG_DVB_TDA10086 is not set
-+
-+#
-+# DVB-T (terrestrial) frontends
-+#
-+# CONFIG_DVB_SP8870 is not set
-+# CONFIG_DVB_SP887X is not set
-+# CONFIG_DVB_CX22700 is not set
-+# CONFIG_DVB_CX22702 is not set
-+# CONFIG_DVB_L64781 is not set
-+# CONFIG_DVB_TDA1004X is not set
-+# CONFIG_DVB_NXT6000 is not set
-+# CONFIG_DVB_MT352 is not set
-+# CONFIG_DVB_ZL10353 is not set
-+# CONFIG_DVB_DIB3000MB is not set
-+# CONFIG_DVB_DIB3000MC is not set
-+# CONFIG_DVB_DIB7000M is not set
-+# CONFIG_DVB_DIB7000P is not set
-+
-+#
-+# DVB-C (cable) frontends
-+#
-+# CONFIG_DVB_VES1820 is not set
-+# CONFIG_DVB_TDA10021 is not set
-+# CONFIG_DVB_TDA10023 is not set
-+# CONFIG_DVB_STV0297 is not set
-+
-+#
-+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-+#
-+# CONFIG_DVB_NXT200X is not set
-+# CONFIG_DVB_OR51211 is not set
-+# CONFIG_DVB_OR51132 is not set
-+# CONFIG_DVB_BCM3510 is not set
-+# CONFIG_DVB_LGDT330X is not set
-+# CONFIG_DVB_S5H1409 is not set
-+
-+#
-+# Tuners/PLL support
-+#
-+# CONFIG_DVB_PLL is not set
-+# CONFIG_DVB_TDA826X is not set
-+# CONFIG_DVB_TDA827X is not set
-+# CONFIG_DVB_TDA18271 is not set
-+# CONFIG_DVB_TUNER_QT1010 is not set
-+# CONFIG_DVB_TUNER_MT2060 is not set
-+# CONFIG_DVB_TUNER_MT2266 is not set
-+# CONFIG_DVB_TUNER_MT2131 is not set
-+# CONFIG_DVB_TUNER_DIB0070 is not set
-+# CONFIG_DVB_TUNER_XC5000 is not set
-+
-+#
-+# Miscellaneous devices
-+#
-+# CONFIG_DVB_LNBP21 is not set
-+# CONFIG_DVB_ISL6421 is not set
-+# CONFIG_DVB_TUA6100 is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+# CONFIG_SND_SEQUENCER is not set
-+# CONFIG_SND_MIXER_OSS is not set
-+# CONFIG_SND_PCM_OSS is not set
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+
-+#
-+# Generic devices
-+#
-+CONFIG_SND_AC97_CODEC=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+
-+#
-+# PCI devices
-+#
-+# CONFIG_SND_AD1889 is not set
-+# CONFIG_SND_ALS300 is not set
-+# CONFIG_SND_ALS4000 is not set
-+# CONFIG_SND_ALI5451 is not set
-+# CONFIG_SND_ATIIXP is not set
-+# CONFIG_SND_ATIIXP_MODEM is not set
-+# CONFIG_SND_AU8810 is not set
-+# CONFIG_SND_AU8820 is not set
-+# CONFIG_SND_AU8830 is not set
-+# CONFIG_SND_AZT3328 is not set
-+# CONFIG_SND_BT87X is not set
-+# CONFIG_SND_CA0106 is not set
-+# CONFIG_SND_CMIPCI is not set
-+# CONFIG_SND_OXYGEN is not set
-+# CONFIG_SND_CS4281 is not set
-+# CONFIG_SND_CS46XX is not set
-+# CONFIG_SND_CS5530 is not set
-+# CONFIG_SND_DARLA20 is not set
-+# CONFIG_SND_GINA20 is not set
-+# CONFIG_SND_LAYLA20 is not set
-+# CONFIG_SND_DARLA24 is not set
-+# CONFIG_SND_GINA24 is not set
-+# CONFIG_SND_LAYLA24 is not set
-+# CONFIG_SND_MONA is not set
-+# CONFIG_SND_MIA is not set
-+# CONFIG_SND_ECHO3G is not set
-+# CONFIG_SND_INDIGO is not set
-+# CONFIG_SND_INDIGOIO is not set
-+# CONFIG_SND_INDIGODJ is not set
-+# CONFIG_SND_EMU10K1 is not set
-+# CONFIG_SND_EMU10K1X is not set
-+# CONFIG_SND_ENS1370 is not set
-+# CONFIG_SND_ENS1371 is not set
-+# CONFIG_SND_ES1938 is not set
-+# CONFIG_SND_ES1968 is not set
-+# CONFIG_SND_FM801 is not set
-+# CONFIG_SND_HDA_INTEL is not set
-+# CONFIG_SND_HDSP is not set
-+# CONFIG_SND_HDSPM is not set
-+# CONFIG_SND_HIFIER is not set
-+# CONFIG_SND_ICE1712 is not set
-+# CONFIG_SND_ICE1724 is not set
-+CONFIG_SND_INTEL8X0=y
-+# CONFIG_SND_INTEL8X0M is not set
-+# CONFIG_SND_KORG1212 is not set
-+# CONFIG_SND_MAESTRO3 is not set
-+# CONFIG_SND_MIXART is not set
-+# CONFIG_SND_NM256 is not set
-+# CONFIG_SND_PCXHR is not set
-+# CONFIG_SND_RIPTIDE is not set
-+# CONFIG_SND_RME32 is not set
-+# CONFIG_SND_RME96 is not set
-+# CONFIG_SND_RME9652 is not set
-+# CONFIG_SND_SONICVIBES is not set
-+# CONFIG_SND_TRIDENT is not set
-+# CONFIG_SND_VIA82XX is not set
-+# CONFIG_SND_VIA82XX_MODEM is not set
-+# CONFIG_SND_VIRTUOSO is not set
-+# CONFIG_SND_VX222 is not set
-+# CONFIG_SND_YMFPCI is not set
-+# CONFIG_SND_AC97_POWER_SAVE is not set
-+
-+#
-+# ALSA PowerMac devices
-+#
-+
-+#
-+# ALSA PowerPC devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_USX2Y is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+# CONFIG_SND_SOC is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_AC97_BUS=y
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+CONFIG_RTC_DRV_CMOS=y
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_DMADEVICES=y
-+
-+#
-+# DMA Devices
-+#
-+CONFIG_FSL_DMA=y
-+# CONFIG_FSL_DMA_SELFTEST is not set
-+CONFIG_DMA_ENGINE=y
-+
-+#
-+# DMA Clients
-+#
-+# CONFIG_NET_DMA is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+# CONFIG_NTFS_RW is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+CONFIG_ADFS_FS=m
-+# CONFIG_ADFS_FS_RW is not set
-+CONFIG_AFFS_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_BEFS_FS=m
-+# CONFIG_BEFS_DEBUG is not set
-+CONFIG_BFS_FS=m
-+CONFIG_EFS_FS=m
-+CONFIG_CRAMFS=y
-+CONFIG_VXFS_FS=m
-+# CONFIG_MINIX_FS is not set
-+CONFIG_HPFS_FS=m
-+CONFIG_QNX4FS_FS=m
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_SYSV_FS=m
-+CONFIG_UFS_FS=m
-+# CONFIG_UFS_FS_WRITE is not set
-+# CONFIG_UFS_DEBUG is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+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_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# 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=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
-@@ -0,0 +1,885 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:27 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+CONFIG_MPC8560_ADS=y
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+CONFIG_PCI_DEBUG=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+CONFIG_DAVICOM_PHY=y
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_FS_ENET=y
-+# CONFIG_FS_ENET_HAS_SCC is not set
-+CONFIG_FS_ENET_HAS_FCC=y
-+# CONFIG_FS_ENET_MDIO_FCC is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+CONFIG_E1000_NAPI=y
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+CONFIG_SERIAL_CPM_SCC2=y
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig
-@@ -0,0 +1,1117 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:05 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+# CONFIG_KMOD is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+CONFIG_MPC85xx_MDS=y
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_QUICC_ENGINE=y
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+# CONFIG_BLK_DEV_SD is not set
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+# CONFIG_CHR_DEV_SG is not set
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_UCC_GETH is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+# CONFIG_SERIAL_QE is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+# CONFIG_BOOKE_WDT is not set
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+CONFIG_RTC_DRV_DS1374=y
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_XMON is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+# CONFIG_PPC_EARLY_DEBUG_44x is not set
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig
-@@ -0,0 +1,1549 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc7
-+# Mon Mar 31 11:37:06 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-+# CONFIG_TASKSTATS is not set
-+CONFIG_AUDIT=y
-+# CONFIG_AUDITSYSCALL is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+CONFIG_MPC85xx_DS=y
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_FSL_ULI1575=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=y
-+CONFIG_NET_IPGRE=y
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_ARPD=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=y
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+CONFIG_IPV6=y
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+# CONFIG_INET6_AH is not set
-+# CONFIG_INET6_ESP is not set
-+# CONFIG_INET6_IPCOMP is not set
-+# CONFIG_IPV6_MIP6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET6_XFRM_MODE_TUNNEL=y
-+CONFIG_INET6_XFRM_MODE_BEET=y
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=y
-+# CONFIG_IPV6_TUNNEL is not set
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=y
-+# CONFIG_BLK_DEV_SX8 is not set
-+# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=131072
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=y
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=y
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+CONFIG_SCSI_LOGGING=y
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_IPR is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+# CONFIG_ATA_NONSTANDARD is not set
-+CONFIG_SATA_AHCI=y
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_SATA_FSL is not set
-+CONFIG_PATA_ALI=y
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NINJA32 is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
-+# CONFIG_PATA_PLATFORM is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=y
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+CONFIG_VITESSE_PHY=y
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# 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_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_MANY_PORTS=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_DETECT_IRQ=y
-+CONFIG_SERIAL_8250_RSA=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+CONFIG_NVRAM=y
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+# CONFIG_I2C_CHARDEV is not set
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+CONFIG_SENSORS_EEPROM=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+CONFIG_DVB_CORE=m
-+# CONFIG_DVB_CORE_ATTACH is not set
-+CONFIG_DVB_CAPTURE_DRIVERS=y
-+
-+#
-+# Supported SAA7146 based PCI Adapters
-+#
-+# CONFIG_TTPCI_EEPROM is not set
-+# CONFIG_DVB_BUDGET_CORE is not set
-+
-+#
-+# Supported USB Adapters
-+#
-+# CONFIG_DVB_USB is not set
-+# CONFIG_DVB_TTUSB_BUDGET is not set
-+# CONFIG_DVB_TTUSB_DEC is not set
-+# CONFIG_DVB_CINERGYT2 is not set
-+
-+#
-+# Supported FlexCopII (B2C2) Adapters
-+#
-+# CONFIG_DVB_B2C2_FLEXCOP is not set
-+
-+#
-+# Supported BT878 Adapters
-+#
-+
-+#
-+# Supported Pluto2 Adapters
-+#
-+# CONFIG_DVB_PLUTO2 is not set
-+
-+#
-+# Supported DVB Frontends
-+#
-+
-+#
-+# Customise DVB Frontends
-+#
-+# CONFIG_DVB_FE_CUSTOMISE is not set
-+
-+#
-+# DVB-S (satellite) frontends
-+#
-+# CONFIG_DVB_STV0299 is not set
-+# CONFIG_DVB_CX24110 is not set
-+# CONFIG_DVB_CX24123 is not set
-+# CONFIG_DVB_TDA8083 is not set
-+# CONFIG_DVB_MT312 is not set
-+# CONFIG_DVB_VES1X93 is not set
-+# CONFIG_DVB_S5H1420 is not set
-+# CONFIG_DVB_TDA10086 is not set
-+
-+#
-+# DVB-T (terrestrial) frontends
-+#
-+# CONFIG_DVB_SP8870 is not set
-+# CONFIG_DVB_SP887X is not set
-+# CONFIG_DVB_CX22700 is not set
-+# CONFIG_DVB_CX22702 is not set
-+# CONFIG_DVB_L64781 is not set
-+# CONFIG_DVB_TDA1004X is not set
-+# CONFIG_DVB_NXT6000 is not set
-+# CONFIG_DVB_MT352 is not set
-+# CONFIG_DVB_ZL10353 is not set
-+# CONFIG_DVB_DIB3000MB is not set
-+# CONFIG_DVB_DIB3000MC is not set
-+# CONFIG_DVB_DIB7000M is not set
-+# CONFIG_DVB_DIB7000P is not set
-+
-+#
-+# DVB-C (cable) frontends
-+#
-+# CONFIG_DVB_VES1820 is not set
-+# CONFIG_DVB_TDA10021 is not set
-+# CONFIG_DVB_TDA10023 is not set
-+# CONFIG_DVB_STV0297 is not set
-+
-+#
-+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-+#
-+# CONFIG_DVB_NXT200X is not set
-+# CONFIG_DVB_OR51211 is not set
-+# CONFIG_DVB_OR51132 is not set
-+# CONFIG_DVB_BCM3510 is not set
-+# CONFIG_DVB_LGDT330X is not set
-+# CONFIG_DVB_S5H1409 is not set
-+
-+#
-+# Tuners/PLL support
-+#
-+# CONFIG_DVB_PLL is not set
-+# CONFIG_DVB_TDA826X is not set
-+# CONFIG_DVB_TDA827X is not set
-+# CONFIG_DVB_TDA18271 is not set
-+# CONFIG_DVB_TUNER_QT1010 is not set
-+# CONFIG_DVB_TUNER_MT2060 is not set
-+# CONFIG_DVB_TUNER_MT2266 is not set
-+# CONFIG_DVB_TUNER_MT2131 is not set
-+# CONFIG_DVB_TUNER_DIB0070 is not set
-+# CONFIG_DVB_TUNER_XC5000 is not set
-+
-+#
-+# Miscellaneous devices
-+#
-+# CONFIG_DVB_LNBP21 is not set
-+# CONFIG_DVB_ISL6421 is not set
-+# CONFIG_DVB_TUA6100 is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+# CONFIG_SND_SEQUENCER is not set
-+# CONFIG_SND_MIXER_OSS is not set
-+# CONFIG_SND_PCM_OSS is not set
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+# CONFIG_SND_DEBUG is not set
-+
-+#
-+# Generic devices
-+#
-+CONFIG_SND_AC97_CODEC=y
-+# CONFIG_SND_DUMMY is not set
-+# CONFIG_SND_MTPAV is not set
-+# CONFIG_SND_SERIAL_U16550 is not set
-+# CONFIG_SND_MPU401 is not set
-+
-+#
-+# PCI devices
-+#
-+# CONFIG_SND_AD1889 is not set
-+# CONFIG_SND_ALS300 is not set
-+# CONFIG_SND_ALS4000 is not set
-+# CONFIG_SND_ALI5451 is not set
-+# CONFIG_SND_ATIIXP is not set
-+# CONFIG_SND_ATIIXP_MODEM is not set
-+# CONFIG_SND_AU8810 is not set
-+# CONFIG_SND_AU8820 is not set
-+# CONFIG_SND_AU8830 is not set
-+# CONFIG_SND_AZT3328 is not set
-+# CONFIG_SND_BT87X is not set
-+# CONFIG_SND_CA0106 is not set
-+# CONFIG_SND_CMIPCI is not set
-+# CONFIG_SND_OXYGEN is not set
-+# CONFIG_SND_CS4281 is not set
-+# CONFIG_SND_CS46XX is not set
-+# CONFIG_SND_CS5530 is not set
-+# CONFIG_SND_DARLA20 is not set
-+# CONFIG_SND_GINA20 is not set
-+# CONFIG_SND_LAYLA20 is not set
-+# CONFIG_SND_DARLA24 is not set
-+# CONFIG_SND_GINA24 is not set
-+# CONFIG_SND_LAYLA24 is not set
-+# CONFIG_SND_MONA is not set
-+# CONFIG_SND_MIA is not set
-+# CONFIG_SND_ECHO3G is not set
-+# CONFIG_SND_INDIGO is not set
-+# CONFIG_SND_INDIGOIO is not set
-+# CONFIG_SND_INDIGODJ is not set
-+# CONFIG_SND_EMU10K1 is not set
-+# CONFIG_SND_EMU10K1X is not set
-+# CONFIG_SND_ENS1370 is not set
-+# CONFIG_SND_ENS1371 is not set
-+# CONFIG_SND_ES1938 is not set
-+# CONFIG_SND_ES1968 is not set
-+# CONFIG_SND_FM801 is not set
-+# CONFIG_SND_HDA_INTEL is not set
-+# CONFIG_SND_HDSP is not set
-+# CONFIG_SND_HDSPM is not set
-+# CONFIG_SND_HIFIER is not set
-+# CONFIG_SND_ICE1712 is not set
-+# CONFIG_SND_ICE1724 is not set
-+CONFIG_SND_INTEL8X0=y
-+# CONFIG_SND_INTEL8X0M is not set
-+# CONFIG_SND_KORG1212 is not set
-+# CONFIG_SND_MAESTRO3 is not set
-+# CONFIG_SND_MIXART is not set
-+# CONFIG_SND_NM256 is not set
-+# CONFIG_SND_PCXHR is not set
-+# CONFIG_SND_RIPTIDE is not set
-+# CONFIG_SND_RME32 is not set
-+# CONFIG_SND_RME96 is not set
-+# CONFIG_SND_RME9652 is not set
-+# CONFIG_SND_SONICVIBES is not set
-+# CONFIG_SND_TRIDENT is not set
-+# CONFIG_SND_VIA82XX is not set
-+# CONFIG_SND_VIA82XX_MODEM is not set
-+# CONFIG_SND_VIRTUOSO is not set
-+# CONFIG_SND_VX222 is not set
-+# CONFIG_SND_YMFPCI is not set
-+# CONFIG_SND_AC97_POWER_SAVE is not set
-+
-+#
-+# ALSA PowerMac devices
-+#
-+
-+#
-+# ALSA PowerPC devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_USX2Y is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+# CONFIG_SND_SOC is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_AC97_BUS=y
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_EHCI_HCD=y
-+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-+# CONFIG_USB_EHCI_FSL is not set
-+CONFIG_USB_EHCI_HCD_PPC_OF=y
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD_PPC_OF=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-+CONFIG_USB_OHCI_HCD_PCI=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
-+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+# CONFIG_USB_STORAGE_DATAFAB is not set
-+# CONFIG_USB_STORAGE_FREECOM is not set
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+# CONFIG_USB_STORAGE_DPCM is not set
-+# CONFIG_USB_STORAGE_USBAT is not set
-+# CONFIG_USB_STORAGE_SDDR09 is not set
-+# CONFIG_USB_STORAGE_SDDR55 is not set
-+# CONFIG_USB_STORAGE_JUMPSHOT is not set
-+# CONFIG_USB_STORAGE_ALAUDA is not set
-+# CONFIG_USB_STORAGE_KARMA is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+CONFIG_RTC_DRV_CMOS=y
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=y
-+# CONFIG_NTFS_DEBUG is not set
-+# CONFIG_NTFS_RW is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_FS is not set
-+
-+#
-+# Miscellaneous filesystems
-+#
-+CONFIG_ADFS_FS=m
-+# CONFIG_ADFS_FS_RW is not set
-+CONFIG_AFFS_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_BEFS_FS=m
-+# CONFIG_BEFS_DEBUG is not set
-+CONFIG_BFS_FS=m
-+CONFIG_EFS_FS=m
-+CONFIG_CRAMFS=y
-+CONFIG_VXFS_FS=m
-+# CONFIG_MINIX_FS is not set
-+CONFIG_HPFS_FS=m
-+CONFIG_QNX4FS_FS=m
-+# CONFIG_ROMFS_FS is not set
-+CONFIG_SYSV_FS=m
-+CONFIG_UFS_FS=m
-+# CONFIG_UFS_FS_WRITE is not set
-+# CONFIG_UFS_DEBUG is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+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 is not set
-+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_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+CONFIG_MAC_PARTITION=y
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# 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=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
-@@ -0,0 +1,935 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:30 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+CONFIG_MPC85xx_CDS=y
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+CONFIG_PPC_I8259=y
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/ide.txt for help/info on IDE drives
-+#
-+# CONFIG_BLK_DEV_IDE_SATA is not set
-+# CONFIG_BLK_DEV_IDEDISK is not set
-+# 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+CONFIG_E1000=y
-+CONFIG_E1000_NAPI=y
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
-@@ -0,0 +1,812 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+CONFIG_SBC8548=y
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+# CONFIG_HID_SUPPORT is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/sbc8560_defconfig
-@@ -0,0 +1,830 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:39 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+CONFIG_SBC8560=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=y
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+# CONFIG_SECCOMP is not set
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_FSL_SOC=y
-+# CONFIG_PCI is not set
-+# CONFIG_PCI_DOMAINS is not set
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=y
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_E1000E_ENABLED is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+CONFIG_NETDEV_10000=y
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# 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_RUNTIME_UARTS=2
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+# CONFIG_USB_ARCH_HAS_HCD is not set
-+# CONFIG_USB_ARCH_HAS_OHCI is not set
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EDAC is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+# CONFIG_RTC_DEBUG is not set
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+CONFIG_RTC_DRV_M48T59=y
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_EXT2_FS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+CONFIG_DEBUG_MUTEXES=y
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_BDI_SWITCH is not set
-+CONFIG_PPC_EARLY_DEBUG=y
-+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
-+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
-+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
-+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
-+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
-+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
-+# CONFIG_PPC_EARLY_DEBUG_44x is not set
-+# CONFIG_PPC_EARLY_DEBUG_40x is not set
-+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
-@@ -0,0 +1,1253 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:42 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_UNLOAD is not set
-+CONFIG_MODVERSIONS=y
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+CONFIG_STX_GP3=y
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+CONFIG_HIGHMEM=y
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# 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 is not set
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+CONFIG_NETFILTER_XTABLES=m
-+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+# CONFIG_IP_NF_MATCH_ECN is not set
-+# CONFIG_IP_NF_MATCH_AH is not set
-+# CONFIG_IP_NF_MATCH_TTL is not set
-+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-+CONFIG_IP_NF_FILTER=m
-+# CONFIG_IP_NF_TARGET_REJECT is not set
-+# CONFIG_IP_NF_TARGET_LOG is not set
-+# CONFIG_IP_NF_TARGET_ULOG is not set
-+# CONFIG_IP_NF_MANGLE is not set
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+CONFIG_NET_PKTGEN=y
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_MTD is not set
-+CONFIG_OF_DEVICE=y
-+CONFIG_PARPORT=m
-+CONFIG_PARPORT_PC=m
-+# CONFIG_PARPORT_PC_FIFO is not set
-+# CONFIG_PARPORT_PC_SUPERIO is not set
-+# CONFIG_PARPORT_GSC is not set
-+# CONFIG_PARPORT_AX88796 is not set
-+# CONFIG_PARPORT_1284 is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_PARIDE is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+CONFIG_BLK_DEV_NBD=m
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/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 is not set
-+CONFIG_BLK_DEV_IDECD=m
-+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-+# CONFIG_BLK_DEV_IDETAPE is not set
-+# CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_BLK_DEV_IDESCSI is not set
-+# CONFIG_IDE_TASK_IOCTL is not set
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+
-+#
-+# PCI IDE chipsets support
-+#
-+# CONFIG_BLK_DEV_GENERIC is not set
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+# CONFIG_BLK_DEV_VIA82CXXX is not set
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+# CONFIG_BLK_DEV_IDEDMA is not set
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+CONFIG_CHR_DEV_ST=m
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+CONFIG_SCSI_MULTI_LUN=y
-+CONFIG_SCSI_CONSTANTS=y
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_DPT_I2O is not set
-+# CONFIG_SCSI_ADVANSYS is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_BUSLOGIC is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_PPA is not set
-+# CONFIG_SCSI_IMM is not set
-+# CONFIG_SCSI_MVSAS is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_NSP32 is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+CONFIG_MARVELL_PHY=y
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+# CONFIG_NET_POCKET is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PLIP is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=m
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+CONFIG_KEYBOARD_ATKBD=y
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_INPUT_MOUSE=y
-+CONFIG_MOUSE_PS2=y
-+CONFIG_MOUSE_PS2_ALPS=y
-+CONFIG_MOUSE_PS2_LOGIPS2PP=y
-+CONFIG_MOUSE_PS2_SYNAPTICS=y
-+CONFIG_MOUSE_PS2_LIFEBOOK=y
-+CONFIG_MOUSE_PS2_TRACKPOINT=y
-+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIO_PARKBD is not set
-+# CONFIG_SERIO_PCIPS2 is not set
-+CONFIG_SERIO_LIBPS2=y
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+# CONFIG_SERIAL_CPM_SCC1 is not set
-+CONFIG_SERIAL_CPM_SCC2=y
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+CONFIG_PRINTER=m
-+# CONFIG_LP_CONSOLE is not set
-+# CONFIG_PPDEV is not set
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=m
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=m
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=m
-+
-+#
-+# I2C Algorithms
-+#
-+CONFIG_I2C_ALGOBIT=m
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+# CONFIG_I2C_MPC is not set
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+CONFIG_AGP=m
-+CONFIG_DRM=m
-+# CONFIG_DRM_TDFX is not set
-+# CONFIG_DRM_R128 is not set
-+# CONFIG_DRM_RADEON is not set
-+# CONFIG_DRM_MGA is not set
-+# CONFIG_DRM_SIS is not set
-+# CONFIG_DRM_VIA is not set
-+# CONFIG_DRM_SAVAGE is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=m
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+# CONFIG_SND is not set
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_AUXDISPLAY is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_AUTOFS_FS=m
-+CONFIG_AUTOFS4_FS=y
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+# CONFIG_JOLIET is not set
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+# CONFIG_PROC_KCORE is not set
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_CRAMFS=m
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+CONFIG_SMB_FS=m
-+# CONFIG_SMB_NLS_DEFAULT is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+# CONFIG_NLS_CODEPAGE_437 is not set
-+# 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
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=y
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_HIGHMEM is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+CONFIG_BDI_SWITCH=y
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
-@@ -0,0 +1,1097 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:43 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+CONFIG_TQM8540=y
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPM2 is not set
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/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 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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=y
-+# 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+CONFIG_TQM8541=y
-+# CONFIG_TQM8555 is not set
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/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 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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=y
-+# 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+CONFIG_TQM8555=y
-+# CONFIG_TQM8560 is not set
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/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 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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=y
-+# 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- /dev/null
-+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
-@@ -0,0 +1,1109 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Mon Mar 24 08:48:45 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+CONFIG_PPC_85xx=y
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_E500=y
-+CONFIG_BOOKE=y
-+CONFIG_FSL_BOOKE=y
-+CONFIG_FSL_EMB_PERFMON=y
-+# CONFIG_PHYS_64BIT is not set
-+CONFIG_SPE=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+# CONFIG_KALLSYMS is not set
-+# CONFIG_HOTPLUG is not set
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+# CONFIG_EPOLL is not set
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_MPC85xx=y
-+# CONFIG_MPC8540_ADS is not set
-+# CONFIG_MPC8560_ADS is not set
-+# CONFIG_MPC85xx_CDS is not set
-+# CONFIG_MPC85xx_MDS is not set
-+# CONFIG_MPC85xx_DS is not set
-+# CONFIG_STX_GP3 is not set
-+# CONFIG_TQM8540 is not set
-+# CONFIG_TQM8541 is not set
-+# CONFIG_TQM8555 is not set
-+CONFIG_TQM8560=y
-+# CONFIG_SBC8548 is not set
-+# CONFIG_SBC8560 is not set
-+CONFIG_TQM85xx=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+CONFIG_CPM2=y
-+CONFIG_PPC_CPM_NEW_BINDING=y
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_CPM=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+# CONFIG_PACKET_MMAP is not set
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+# 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 is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# 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_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+# CONFIG_MTD_PHYSMAP_OF is not set
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=y
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=32768
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+CONFIG_IDE=y
-+CONFIG_IDE_MAX_HWIFS=4
-+CONFIG_BLK_DEV_IDE=y
-+
-+#
-+# Please see Documentation/ide/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 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
-+CONFIG_IDE_PROC_FS=y
-+
-+#
-+# IDE chipset support/bugfixes
-+#
-+CONFIG_IDE_GENERIC=y
-+# CONFIG_BLK_DEV_PLATFORM is not set
-+CONFIG_BLK_DEV_IDEDMA_SFF=y
-+
-+#
-+# PCI IDE chipsets support
-+#
-+CONFIG_BLK_DEV_IDEPCI=y
-+CONFIG_IDEPCI_PCIBUS_ORDER=y
-+# CONFIG_BLK_DEV_OFFBOARD is not set
-+CONFIG_BLK_DEV_GENERIC=y
-+# CONFIG_BLK_DEV_OPTI621 is not set
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+# CONFIG_BLK_DEV_AEC62XX is not set
-+# CONFIG_BLK_DEV_ALI15X3 is not set
-+# CONFIG_BLK_DEV_AMD74XX is not set
-+# CONFIG_BLK_DEV_CMD64X is not set
-+# CONFIG_BLK_DEV_TRIFLEX is not set
-+# CONFIG_BLK_DEV_CY82C693 is not set
-+# CONFIG_BLK_DEV_CS5520 is not set
-+# CONFIG_BLK_DEV_CS5530 is not set
-+# CONFIG_BLK_DEV_HPT34X is not set
-+# CONFIG_BLK_DEV_HPT366 is not set
-+# CONFIG_BLK_DEV_JMICRON is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_PIIX is not set
-+# CONFIG_BLK_DEV_IT8213 is not set
-+# CONFIG_BLK_DEV_IT821X is not set
-+# CONFIG_BLK_DEV_NS87415 is not set
-+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-+# CONFIG_BLK_DEV_SVWKS is not set
-+# CONFIG_BLK_DEV_SIIMAGE is not set
-+# CONFIG_BLK_DEV_SL82C105 is not set
-+# CONFIG_BLK_DEV_SLC90E66 is not set
-+# CONFIG_BLK_DEV_TRM290 is not set
-+CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_TC86C001 is not set
-+CONFIG_BLK_DEV_IDEDMA=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_BLK_DEV_HD is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_PCNET32 is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_B44 is not set
-+# CONFIG_FORCEDETH is not set
-+# CONFIG_EEPRO100 is not set
-+CONFIG_E100=y
-+# CONFIG_FEALNX is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_NE2K_PCI is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO is not set
-+# CONFIG_R6040 is not set
-+# CONFIG_SIS900 is not set
-+# CONFIG_EPIC100 is not set
-+# CONFIG_SUNDANCE is not set
-+# CONFIG_TLAN is not set
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_SC92031 is not set
-+# CONFIG_FS_ENET is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+CONFIG_GFAR_NAPI=y
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+# CONFIG_INPUT_MOUSEDEV is not set
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_NR_UARTS=4
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CPM=y
-+CONFIG_SERIAL_CPM_CONSOLE=y
-+CONFIG_SERIAL_CPM_SCC1=y
-+# CONFIG_SERIAL_CPM_SCC2 is not set
-+# CONFIG_SERIAL_CPM_SCC3 is not set
-+# CONFIG_SERIAL_CPM_SCC4 is not set
-+# CONFIG_SERIAL_CPM_SMC1 is not set
-+# CONFIG_SERIAL_CPM_SMC2 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=y
-+# CONFIG_NVRAM is not set
-+CONFIG_GEN_RTC=y
-+# CONFIG_GEN_RTC_X is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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=y
-+# 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+CONFIG_HWMON_DEBUG_CHIP=y
-+# CONFIG_THERMAL is not set
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+CONFIG_FS_MBCACHE=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+# CONFIG_JFFS2_SUMMARY is not set
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+# CONFIG_NFS_V3 is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_MSDOS_PARTITION is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+# CONFIG_MAGIC_SYSRQ is not set
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+# CONFIG_DEBUG_KERNEL is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_KGDB_CONSOLE is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+# CONFIG_CRYPTO_MANAGER is not set
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC is not set
-+# CONFIG_CRYPTO_NULL is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_MD5 is not set
-+# 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_GF128MUL is not set
-+# CONFIG_CRYPTO_ECB is not set
-+# CONFIG_CRYPTO_CBC is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
-+CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/bamboo_defconfig
-+++ /dev/null
-@@ -1,815 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:36:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_BAMBOO=y
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440EP=y
--CONFIG_IBM440EP_ERR42=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/chrp32_defconfig
-+++ b/arch/powerpc/configs/chrp32_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:33:36 2008
-+# Thu Mar 27 13:55:37 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=15
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/ebony_defconfig
-+++ /dev/null
-@@ -1,898 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:50:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--CONFIG_EBONY=y
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440GP=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_OF_RTC=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--# CONFIG_CRYPTO_HW is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/ep405_defconfig
-+++ /dev/null
-@@ -1,968 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:50:09 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_EP405=y
--# CONFIG_KILAUEA is not set
--# CONFIG_MAKALU is not set
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405GP=y
--CONFIG_IBM405_ERR77=y
--CONFIG_IBM405_ERR51=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_EHCI_HCD is not set
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/g5_defconfig
-+++ b/arch/powerpc/configs/g5_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:36:41 2008
-+# Thu Mar 27 13:55:43 2008
- #
- CONFIG_PPC64=y
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/iseries_defconfig
-+++ b/arch/powerpc/configs/iseries_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 10:43:46 2008
-+# Thu Mar 27 13:55:45 2008
- #
- CONFIG_PPC64=y
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- # CONFIG_HOTPLUG_PCI is not set
-@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/katmai_defconfig
-+++ /dev/null
-@@ -1,790 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc6
--# Mon Dec 24 11:17:43 2007
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_FAIR_GROUP_SCHED=y
--CONFIG_FAIR_USER_SCHED=y
--# CONFIG_FAIR_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC52xx is not set
--# CONFIG_PPC_MPC5200 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--CONFIG_KATMAI=y
--# CONFIG_RAINIER is not set
--CONFIG_440SPe=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_WANT_DEVICE_TREE=y
--CONFIG_DEVICE_TREE="katmai.dts"
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_IP1000 is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI 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
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# USB Gadget Support
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_ROMFS_FS is not set
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS=y
--# 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
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--# CONFIG_UCC_SLOW is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--# CONFIG_KPROBES is not set
--# CONFIG_MARKERS is not set
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/kilauea_defconfig
-+++ /dev/null
-@@ -1,839 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:51:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--CONFIG_KILAUEA=y
--# CONFIG_MAKALU is not set
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405EX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--# CONFIG_MISC_DEVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=256
--CONFIG_IBM_NEW_EMAC_TXB=256
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/makalu_defconfig
-+++ /dev/null
-@@ -1,839 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:52:30 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--CONFIG_PPC4xx_PCI_EXPRESS=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--# CONFIG_KILAUEA is not set
--CONFIG_MAKALU=y
--# CONFIG_WALNUT is not set
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405EX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--# CONFIG_MISC_DEVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=256
--CONFIG_IBM_NEW_EMAC_TXB=256
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/maple_defconfig
-+++ b/arch/powerpc/configs/maple_defconfig
-@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_STANDALONE=y
- CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
-+CONFIG_FW_LOADER=y
- # CONFIG_DEBUG_DRIVER is not set
- # CONFIG_DEBUG_DEVRES is not set
- # CONFIG_SYS_HYPERVISOR is not set
-@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y
- CONFIG_BLK_DEV_IDECD=y
- # CONFIG_BLK_DEV_IDETAPE is not set
- # CONFIG_BLK_DEV_IDEFLOPPY is not set
-+# CONFIG_BLK_DEV_IDESCSI is not set
- CONFIG_IDE_TASK_IOCTL=y
- CONFIG_IDE_PROC_FS=y
- 
-@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y
- # SCSI device support
- #
- # CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
- # CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
-+# CONFIG_SCSI_PROC_FS is not set
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+# CONFIG_BLK_DEV_SR is not set
-+CONFIG_CHR_DEV_SG=y
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+# CONFIG_SCSI_SCAN_ASYNC is not set
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-+# CONFIG_SCSI_3W_9XXX is not set
-+# CONFIG_SCSI_ACARD is not set
-+# CONFIG_SCSI_AACRAID is not set
-+# CONFIG_SCSI_AIC7XXX is not set
-+# CONFIG_SCSI_AIC7XXX_OLD is not set
-+# CONFIG_SCSI_AIC79XX is not set
-+# CONFIG_SCSI_AIC94XX is not set
-+# CONFIG_SCSI_ARCMSR is not set
-+# CONFIG_MEGARAID_NEWGEN is not set
-+# CONFIG_MEGARAID_LEGACY is not set
-+# CONFIG_MEGARAID_SAS is not set
-+# CONFIG_SCSI_HPTIOP is not set
-+# CONFIG_SCSI_DMX3191D is not set
-+# CONFIG_SCSI_EATA is not set
-+# CONFIG_SCSI_FUTURE_DOMAIN is not set
-+# CONFIG_SCSI_GDTH is not set
-+# CONFIG_SCSI_IPS is not set
-+# CONFIG_SCSI_INITIO is not set
-+# CONFIG_SCSI_INIA100 is not set
-+# CONFIG_SCSI_STEX is not set
-+# CONFIG_SCSI_SYM53C8XX_2 is not set
-+CONFIG_SCSI_IPR=y
-+CONFIG_SCSI_IPR_TRACE=y
-+CONFIG_SCSI_IPR_DUMP=y
-+# CONFIG_SCSI_QLOGIC_1280 is not set
-+# CONFIG_SCSI_QLA_FC is not set
-+# CONFIG_SCSI_QLA_ISCSI is not set
-+# CONFIG_SCSI_LPFC is not set
-+# CONFIG_SCSI_DC395x is not set
-+# CONFIG_SCSI_DC390T is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_SRP is not set
-+CONFIG_ATA=y
-+CONFIG_ATA_NONSTANDARD=y
-+# CONFIG_SATA_AHCI is not set
-+# CONFIG_SATA_SVW is not set
-+# CONFIG_ATA_PIIX is not set
-+# CONFIG_SATA_MV is not set
-+# CONFIG_SATA_NV is not set
-+# CONFIG_PDC_ADMA is not set
-+# CONFIG_SATA_QSTOR is not set
-+# CONFIG_SATA_PROMISE is not set
-+# CONFIG_SATA_SX4 is not set
-+# CONFIG_SATA_SIL is not set
-+# CONFIG_SATA_SIL24 is not set
-+# CONFIG_SATA_SIS is not set
-+# CONFIG_SATA_ULI is not set
-+# CONFIG_SATA_VIA is not set
-+# CONFIG_SATA_VITESSE is not set
-+# CONFIG_SATA_INIC162X is not set
-+# CONFIG_PATA_ALI is not set
-+# CONFIG_PATA_AMD is not set
-+# CONFIG_PATA_ARTOP is not set
-+# CONFIG_PATA_ATIIXP is not set
-+# CONFIG_PATA_CMD640_PCI is not set
-+# CONFIG_PATA_CMD64X is not set
-+# CONFIG_PATA_CS5520 is not set
-+# CONFIG_PATA_CS5530 is not set
-+# CONFIG_PATA_CYPRESS is not set
-+# CONFIG_PATA_EFAR is not set
-+# CONFIG_ATA_GENERIC is not set
-+# CONFIG_PATA_HPT366 is not set
-+# CONFIG_PATA_HPT37X is not set
-+# CONFIG_PATA_HPT3X2N is not set
-+# CONFIG_PATA_HPT3X3 is not set
-+# CONFIG_PATA_IT821X is not set
-+# CONFIG_PATA_IT8213 is not set
-+# CONFIG_PATA_JMICRON is not set
-+# CONFIG_PATA_TRIFLEX is not set
-+# CONFIG_PATA_MARVELL is not set
-+# CONFIG_PATA_MPIIX is not set
-+# CONFIG_PATA_OLDPIIX is not set
-+# CONFIG_PATA_NETCELL is not set
-+# CONFIG_PATA_NS87410 is not set
-+# CONFIG_PATA_NS87415 is not set
-+# CONFIG_PATA_OPTI is not set
-+# CONFIG_PATA_OPTIDMA is not set
-+# CONFIG_PATA_PDC_OLD is not set
-+# CONFIG_PATA_RADISYS is not set
-+# CONFIG_PATA_RZ1000 is not set
-+# CONFIG_PATA_SC1200 is not set
-+# CONFIG_PATA_SERVERWORKS is not set
-+# CONFIG_PATA_PDC2027X is not set
-+# CONFIG_PATA_SIL680 is not set
-+# CONFIG_PATA_SIS is not set
-+# CONFIG_PATA_VIA is not set
-+# CONFIG_PATA_WINBOND is not set
- # CONFIG_MD is not set
- # CONFIG_FUSION is not set
- 
-@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y
- # CONFIG_HIPPI is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
-+# CONFIG_NET_FC is not set
- # CONFIG_SHAPER is not set
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
-@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y
- #
- # may also be needed; see USB_STORAGE Help for more information
- #
-+# CONFIG_USB_STORAGE is not set
- # CONFIG_USB_LIBUSUAL is not set
- 
- #
- # USB Imaging devices
- #
- # CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
- CONFIG_USB_MON=y
- 
- #
---- a/arch/powerpc/configs/mpc8313_rdb_defconfig
-+++ /dev/null
-@@ -1,1393 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:14 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--CONFIG_MPC831x_RDB=y
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC831x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_CAFE is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--CONFIG_USB_GADGET_NET2280=y
--CONFIG_USB_NET2280=y
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 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_S3C2410 is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--CONFIG_USB_GADGET_DUALSPEED=y
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--# CONFIG_USB_G_PRINTER is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8315_rdb_defconfig
-+++ /dev/null
-@@ -1,1451 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:15 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--CONFIG_MPC831x_RDB=y
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC831x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_CAFE is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_AHCI is not set
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_ALI is not set
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--CONFIG_USB_GADGET_NET2280=y
--CONFIG_USB_NET2280=y
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 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_S3C2410 is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--CONFIG_USB_GADGET_DUALSPEED=y
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--# CONFIG_USB_G_PRINTER is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc832x_mds_defconfig
-+++ /dev/null
-@@ -1,1081 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:51 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--CONFIG_MPC832x_MDS=y
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC832x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--CONFIG_DAVICOM_PHY=y
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--# CONFIG_UGETH_NAPI is not set
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc832x_rdb_defconfig
-+++ /dev/null
-@@ -1,1233 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:16 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--CONFIG_MPC832x_RDB=y
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC832x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--CONFIG_ICPLUS_PHY=y
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--# CONFIG_E1000_NAPI is not set
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--CONFIG_UGETH_NAPI=y
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM70 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--# CONFIG_USB_HID is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SDHCI is not set
--# CONFIG_MMC_WBSD is not set
--# CONFIG_MMC_TIFM_SD is not set
--CONFIG_MMC_SPI=y
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--CONFIG_LDM_PARTITION=y
--# CONFIG_LDM_DEBUG is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--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=y
--# CONFIG_NLS_CODEPAGE_949 is not set
--# CONFIG_NLS_CODEPAGE_874 is not set
--CONFIG_NLS_ISO8859_8=y
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--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
--# 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
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--CONFIG_CRC_ITU_T=y
--CONFIG_CRC32=y
--CONFIG_CRC7=y
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc834x_itx_defconfig
-+++ /dev/null
-@@ -1,1295 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:17 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--CONFIG_MPC834x_ITX=y
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_PARTITIONS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0xfe000000
--CONFIG_MTD_PHYSMAP_LEN=0x1000000
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--# CONFIG_BLK_DEV_IDE is not set
--# CONFIG_BLK_DEV_HD_ONLY is not set
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_AHCI is not set
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--CONFIG_SATA_SIL=y
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--# CONFIG_PATA_ALI is not set
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--CONFIG_PATA_PLATFORM=y
--CONFIG_PATA_OF_PLATFORM=y
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--CONFIG_MD_LINEAR=y
--CONFIG_MD_RAID0=y
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--# CONFIG_MD_RAID456 is not set
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF8574=y
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_OHCI_HCD is not set
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# 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
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
-+++ /dev/null
-@@ -1,1222 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:18 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--CONFIG_MPC834x_ITX=y
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_PARTITIONS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0xfe000000
--CONFIG_MTD_PHYSMAP_LEN=0x800000
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--CONFIG_CICADA_PHY=y
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF8574=y
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_MPC83xx=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_OHCI_HCD is not set
--CONFIG_USB_UHCI_HCD=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--CONFIG_RTC_INTF_DEV_UIE_EMUL=y
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--CONFIG_RTC_DRV_DS1307=y
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_MAX6902 is not set
--# CONFIG_RTC_DRV_R9701 is not set
--# CONFIG_RTC_DRV_RS5C348 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--# CONFIG_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# 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
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc834x_mds_defconfig
-+++ /dev/null
-@@ -1,1021 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:56 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--CONFIG_MPC834x_MDS=y
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc836x_mds_defconfig
-+++ /dev/null
-@@ -1,1079 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:36:57 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--CONFIG_MPC836x_MDS=y
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_GIANFAR is not set
--CONFIG_UCC_GETH=y
--# CONFIG_UGETH_NAPI is not set
--# CONFIG_UGETH_MAGIC_PACKET is not set
--# CONFIG_UGETH_FILTERING is not set
--# CONFIG_UGETH_TX_ON_DEMAND is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--CONFIG_UCC_FAST=y
--CONFIG_UCC=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc837x_mds_defconfig
-+++ /dev/null
-@@ -1,899 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:23 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--CONFIG_MPC837x_MDS=y
--# CONFIG_MPC837x_RDB is not set
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC837x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_MV is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc837x_rdb_defconfig
-+++ /dev/null
-@@ -1,930 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:24 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--CONFIG_MPC837x_RDB=y
--# CONFIG_SBC834x is not set
--CONFIG_PPC_MPC837x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# 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=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--# CONFIG_SATA_MV is not set
--CONFIG_SATA_FSL=y
--# CONFIG_PATA_PLATFORM is not set
--CONFIG_MD=y
--CONFIG_BLK_DEV_MD=y
--# CONFIG_MD_LINEAR is not set
--# CONFIG_MD_RAID0 is not set
--CONFIG_MD_RAID1=y
--# CONFIG_MD_RAID10 is not set
--CONFIG_MD_RAID456=y
--CONFIG_MD_RAID5_RESHAPE=y
--# CONFIG_MD_MULTIPATH is not set
--# CONFIG_MD_FAULTY is not set
--# CONFIG_BLK_DEV_DM is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--CONFIG_USB_EHCI_ROOT_HUB_TT=y
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--CONFIG_USB_EHCI_FSL=y
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--# CONFIG_ENABLE_MUST_CHECK is not set
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_XOR_BLOCKS=y
--CONFIG_ASYNC_CORE=y
--CONFIG_ASYNC_MEMCPY=y
--CONFIG_ASYNC_XOR=y
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc83xx_defconfig
-+++ b/arch/powerpc/configs/mpc83xx_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:25 2008
-+# Linux kernel version: 2.6.25-rc9
-+# Tue Apr 15 18:07:36 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -201,6 +201,7 @@ CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT is not set
- CONFIG_BINFMT_ELF=y
- # CONFIG_BINFMT_MISC is not set
-+CONFIG_FORCE_MAX_ZONEORDER=11
- CONFIG_MATH_EMULATION=y
- # CONFIG_IOMMU_HELPER is not set
- CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-@@ -353,7 +354,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
- # CONFIG_FW_LOADER is not set
- # CONFIG_SYS_HYPERVISOR is not set
- # CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# 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_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
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+CONFIG_MTD_NAND_FSL_ELBC=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
- CONFIG_OF_DEVICE=y
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
-@@ -362,6 +446,7 @@ CONFIG_BLK_DEV=y
- CONFIG_BLK_DEV_LOOP=y
- # CONFIG_BLK_DEV_CRYPTOLOOP is not set
- # CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_UB is not set
- CONFIG_BLK_DEV_RAM=y
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=32768
-@@ -469,6 +554,15 @@ CONFIG_NETDEV_10000=y
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+# CONFIG_USB_CATC is not set
-+# CONFIG_USB_KAWETH is not set
-+# CONFIG_USB_PEGASUS is not set
-+# CONFIG_USB_RTL8150 is not set
-+# CONFIG_USB_USBNET is not set
- # CONFIG_WAN is not set
- # CONFIG_PPP is not set
- # CONFIG_SLIP is not set
-@@ -563,6 +657,7 @@ CONFIG_I2C_MPC=y
- # CONFIG_I2C_SIMTEC is not set
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
- 
- #
- # Miscellaneous I2C Chip support
-@@ -648,6 +743,11 @@ CONFIG_WATCHDOG=y
- CONFIG_83xx_WDT=y
- 
- #
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
- # Sonics Silicon Backplane
- #
- CONFIG_SSB_POSSIBLE=y
-@@ -664,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y
- # CONFIG_VIDEO_DEV is not set
- # CONFIG_DVB_CORE is not set
- CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
- 
- #
- # Graphics support
-@@ -686,6 +787,14 @@ CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
- # CONFIG_HID_DEBUG is not set
- # CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- # CONFIG_USB_ARCH_HAS_OHCI is not set
-@@ -715,8 +824,55 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y
- # CONFIG_USB_R8A66597_HCD is not set
- 
- #
-+# USB Device Class drivers
-+#
-+# CONFIG_USB_ACM is not set
-+# CONFIG_USB_PRINTER is not set
-+
-+#
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
- #
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+# CONFIG_USB_STORAGE is not set
-+# CONFIG_USB_LIBUSUAL is not set
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+# CONFIG_USB_SERIAL is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_SISUSBVGA is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
- # CONFIG_USB_GADGET is not set
- # CONFIG_MMC is not set
- # CONFIG_MEMSTICK is not set
-@@ -792,6 +948,7 @@ CONFIG_TMPFS=y
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
-+# CONFIG_JFFS2_FS is not set
- # CONFIG_CRAMFS is not set
- # CONFIG_VXFS_FS is not set
- # CONFIG_MINIX_FS is not set
-@@ -862,6 +1019,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/mpc8540_ads_defconfig
-+++ /dev/null
-@@ -1,796 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:25 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--CONFIG_MPC8540_ADS=y
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--# CONFIG_USB_ARCH_HAS_HCD is not set
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8544_ds_defconfig
-+++ /dev/null
-@@ -1,1549 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:03 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--CONFIG_BSD_PROCESS_ACCT=y
--# CONFIG_BSD_PROCESS_ACCT_V3 is not set
--# CONFIG_TASKSTATS is not set
--CONFIG_AUDIT=y
--# CONFIG_AUDITSYSCALL is not set
--CONFIG_IKCONFIG=y
--CONFIG_IKCONFIG_PROC=y
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--CONFIG_MODVERSIONS=y
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--CONFIG_MPC85xx_DS=y
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_FSL_ULI1575=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--CONFIG_NET_KEY=m
--# CONFIG_NET_KEY_MIGRATE is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--CONFIG_IP_ROUTE_MULTIPATH=y
--CONFIG_IP_ROUTE_VERBOSE=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--CONFIG_IP_PNP_RARP=y
--CONFIG_NET_IPIP=y
--CONFIG_NET_IPGRE=y
--CONFIG_NET_IPGRE_BROADCAST=y
--CONFIG_IP_MROUTE=y
--CONFIG_IP_PIMSM_V1=y
--CONFIG_IP_PIMSM_V2=y
--CONFIG_ARPD=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=y
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--CONFIG_IPV6=y
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--# CONFIG_INET6_AH is not set
--# CONFIG_INET6_ESP is not set
--# CONFIG_INET6_IPCOMP is not set
--# CONFIG_IPV6_MIP6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--CONFIG_INET6_XFRM_MODE_TRANSPORT=y
--CONFIG_INET6_XFRM_MODE_TUNNEL=y
--CONFIG_INET6_XFRM_MODE_BEET=y
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=y
--# CONFIG_IPV6_TUNNEL is not set
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--CONFIG_IP_SCTP=m
--# CONFIG_SCTP_DBG_MSG is not set
--# CONFIG_SCTP_DBG_OBJCNT is not set
--# CONFIG_SCTP_HMAC_NONE is not set
--# CONFIG_SCTP_HMAC_SHA1 is not set
--CONFIG_SCTP_HMAC_MD5=y
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=y
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=131072
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--CONFIG_CHR_DEV_ST=y
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=y
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--# CONFIG_SCSI_CONSTANTS is not set
--CONFIG_SCSI_LOGGING=y
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--CONFIG_SATA_AHCI=y
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--CONFIG_PATA_ALI=y
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--CONFIG_DUMMY=y
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--CONFIG_VITESSE_PHY=y
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# 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_VT_HW_CONSOLE_BINDING is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=2
--CONFIG_SERIAL_8250_RUNTIME_UARTS=2
--CONFIG_SERIAL_8250_EXTENDED=y
--CONFIG_SERIAL_8250_MANY_PORTS=y
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--CONFIG_SERIAL_8250_DETECT_IRQ=y
--CONFIG_SERIAL_8250_RSA=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--CONFIG_NVRAM=y
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--CONFIG_DVB_CORE=m
--# CONFIG_DVB_CORE_ATTACH is not set
--CONFIG_DVB_CAPTURE_DRIVERS=y
--
--#
--# Supported SAA7146 based PCI Adapters
--#
--# CONFIG_TTPCI_EEPROM is not set
--# CONFIG_DVB_BUDGET_CORE is not set
--
--#
--# Supported USB Adapters
--#
--# CONFIG_DVB_USB is not set
--# CONFIG_DVB_TTUSB_BUDGET is not set
--# CONFIG_DVB_TTUSB_DEC is not set
--# CONFIG_DVB_CINERGYT2 is not set
--
--#
--# Supported FlexCopII (B2C2) Adapters
--#
--# CONFIG_DVB_B2C2_FLEXCOP is not set
--
--#
--# Supported BT878 Adapters
--#
--
--#
--# Supported Pluto2 Adapters
--#
--# CONFIG_DVB_PLUTO2 is not set
--
--#
--# Supported DVB Frontends
--#
--
--#
--# Customise DVB Frontends
--#
--# CONFIG_DVB_FE_CUSTOMISE is not set
--
--#
--# DVB-S (satellite) frontends
--#
--# CONFIG_DVB_STV0299 is not set
--# CONFIG_DVB_CX24110 is not set
--# CONFIG_DVB_CX24123 is not set
--# CONFIG_DVB_TDA8083 is not set
--# CONFIG_DVB_MT312 is not set
--# CONFIG_DVB_VES1X93 is not set
--# CONFIG_DVB_S5H1420 is not set
--# CONFIG_DVB_TDA10086 is not set
--
--#
--# DVB-T (terrestrial) frontends
--#
--# CONFIG_DVB_SP8870 is not set
--# CONFIG_DVB_SP887X is not set
--# CONFIG_DVB_CX22700 is not set
--# CONFIG_DVB_CX22702 is not set
--# CONFIG_DVB_L64781 is not set
--# CONFIG_DVB_TDA1004X is not set
--# CONFIG_DVB_NXT6000 is not set
--# CONFIG_DVB_MT352 is not set
--# CONFIG_DVB_ZL10353 is not set
--# CONFIG_DVB_DIB3000MB is not set
--# CONFIG_DVB_DIB3000MC is not set
--# CONFIG_DVB_DIB7000M is not set
--# CONFIG_DVB_DIB7000P is not set
--
--#
--# DVB-C (cable) frontends
--#
--# CONFIG_DVB_VES1820 is not set
--# CONFIG_DVB_TDA10021 is not set
--# CONFIG_DVB_TDA10023 is not set
--# CONFIG_DVB_STV0297 is not set
--
--#
--# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
--#
--# CONFIG_DVB_NXT200X is not set
--# CONFIG_DVB_OR51211 is not set
--# CONFIG_DVB_OR51132 is not set
--# CONFIG_DVB_BCM3510 is not set
--# CONFIG_DVB_LGDT330X is not set
--# CONFIG_DVB_S5H1409 is not set
--
--#
--# Tuners/PLL support
--#
--# CONFIG_DVB_PLL is not set
--# CONFIG_DVB_TDA826X is not set
--# CONFIG_DVB_TDA827X is not set
--# CONFIG_DVB_TDA18271 is not set
--# CONFIG_DVB_TUNER_QT1010 is not set
--# CONFIG_DVB_TUNER_MT2060 is not set
--# CONFIG_DVB_TUNER_MT2266 is not set
--# CONFIG_DVB_TUNER_MT2131 is not set
--# CONFIG_DVB_TUNER_DIB0070 is not set
--# CONFIG_DVB_TUNER_XC5000 is not set
--
--#
--# Miscellaneous devices
--#
--# CONFIG_DVB_LNBP21 is not set
--# CONFIG_DVB_ISL6421 is not set
--# CONFIG_DVB_TUA6100 is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Console display driver support
--#
--CONFIG_VGA_CONSOLE=y
--# CONFIG_VGACON_SOFT_SCROLLBACK is not set
--CONFIG_DUMMY_CONSOLE=y
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--# CONFIG_SND_SEQUENCER is not set
--# CONFIG_SND_MIXER_OSS is not set
--# CONFIG_SND_PCM_OSS is not set
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# CONFIG_SND_VERBOSE_PRINTK is not set
--# CONFIG_SND_DEBUG is not set
--
--#
--# Generic devices
--#
--CONFIG_SND_AC97_CODEC=y
--# CONFIG_SND_DUMMY is not set
--# CONFIG_SND_MTPAV is not set
--# CONFIG_SND_SERIAL_U16550 is not set
--# CONFIG_SND_MPU401 is not set
--
--#
--# PCI devices
--#
--# CONFIG_SND_AD1889 is not set
--# CONFIG_SND_ALS300 is not set
--# CONFIG_SND_ALS4000 is not set
--# CONFIG_SND_ALI5451 is not set
--# CONFIG_SND_ATIIXP is not set
--# CONFIG_SND_ATIIXP_MODEM is not set
--# CONFIG_SND_AU8810 is not set
--# CONFIG_SND_AU8820 is not set
--# CONFIG_SND_AU8830 is not set
--# CONFIG_SND_AZT3328 is not set
--# CONFIG_SND_BT87X is not set
--# CONFIG_SND_CA0106 is not set
--# CONFIG_SND_CMIPCI is not set
--# CONFIG_SND_OXYGEN is not set
--# CONFIG_SND_CS4281 is not set
--# CONFIG_SND_CS46XX is not set
--# CONFIG_SND_CS5530 is not set
--# CONFIG_SND_DARLA20 is not set
--# CONFIG_SND_GINA20 is not set
--# CONFIG_SND_LAYLA20 is not set
--# CONFIG_SND_DARLA24 is not set
--# CONFIG_SND_GINA24 is not set
--# CONFIG_SND_LAYLA24 is not set
--# CONFIG_SND_MONA is not set
--# CONFIG_SND_MIA is not set
--# CONFIG_SND_ECHO3G is not set
--# CONFIG_SND_INDIGO is not set
--# CONFIG_SND_INDIGOIO is not set
--# CONFIG_SND_INDIGODJ is not set
--# CONFIG_SND_EMU10K1 is not set
--# CONFIG_SND_EMU10K1X is not set
--# CONFIG_SND_ENS1370 is not set
--# CONFIG_SND_ENS1371 is not set
--# CONFIG_SND_ES1938 is not set
--# CONFIG_SND_ES1968 is not set
--# CONFIG_SND_FM801 is not set
--# CONFIG_SND_HDA_INTEL is not set
--# CONFIG_SND_HDSP is not set
--# CONFIG_SND_HDSPM is not set
--# CONFIG_SND_HIFIER is not set
--# CONFIG_SND_ICE1712 is not set
--# CONFIG_SND_ICE1724 is not set
--CONFIG_SND_INTEL8X0=y
--# CONFIG_SND_INTEL8X0M is not set
--# CONFIG_SND_KORG1212 is not set
--# CONFIG_SND_MAESTRO3 is not set
--# CONFIG_SND_MIXART is not set
--# CONFIG_SND_NM256 is not set
--# CONFIG_SND_PCXHR is not set
--# CONFIG_SND_RIPTIDE is not set
--# CONFIG_SND_RME32 is not set
--# CONFIG_SND_RME96 is not set
--# CONFIG_SND_RME9652 is not set
--# CONFIG_SND_SONICVIBES is not set
--# CONFIG_SND_TRIDENT is not set
--# CONFIG_SND_VIA82XX is not set
--# CONFIG_SND_VIA82XX_MODEM is not set
--# CONFIG_SND_VIRTUOSO is not set
--# CONFIG_SND_VX222 is not set
--# CONFIG_SND_YMFPCI is not set
--# CONFIG_SND_AC97_POWER_SAVE is not set
--
--#
--# ALSA PowerMac devices
--#
--
--#
--# ALSA PowerPC devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_USX2Y is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--# CONFIG_SND_SOC is not set
--
--#
--# SoC Audio support for SuperH
--#
--
--#
--# ALSA SoC audio for Freescale SOCs
--#
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_AC97_BUS=y
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--CONFIG_RTC_DRV_CMOS=y
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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=m
--CONFIG_JOLIET=y
--CONFIG_ZISOFS=y
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--CONFIG_NTFS_FS=y
--# CONFIG_NTFS_DEBUG is not set
--# CONFIG_NTFS_RW is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--CONFIG_ADFS_FS=m
--# CONFIG_ADFS_FS_RW is not set
--CONFIG_AFFS_FS=m
--CONFIG_HFS_FS=m
--CONFIG_HFSPLUS_FS=m
--CONFIG_BEFS_FS=m
--# CONFIG_BEFS_DEBUG is not set
--CONFIG_BFS_FS=m
--CONFIG_EFS_FS=m
--CONFIG_CRAMFS=y
--CONFIG_VXFS_FS=m
--# CONFIG_MINIX_FS is not set
--CONFIG_HPFS_FS=m
--CONFIG_QNX4FS_FS=m
--# CONFIG_ROMFS_FS is not set
--CONFIG_SYSV_FS=m
--CONFIG_UFS_FS=m
--# CONFIG_UFS_FS_WRITE is not set
--# CONFIG_UFS_DEBUG is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--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_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# 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=m
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--CONFIG_CRYPTO_SHA1=m
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc8560_ads_defconfig
-+++ /dev/null
-@@ -1,885 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:27 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--CONFIG_MPC8560_ADS=y
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--CONFIG_PCI_DEBUG=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--CONFIG_DAVICOM_PHY=y
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_FS_ENET=y
--# CONFIG_FS_ENET_HAS_SCC is not set
--CONFIG_FS_ENET_HAS_FCC=y
--# CONFIG_FS_ENET_MDIO_FCC is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--CONFIG_E1000_NAPI=y
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--CONFIG_SERIAL_CPM_SCC2=y
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc8568mds_defconfig
-+++ /dev/null
-@@ -1,1117 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:05 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--CONFIG_MPC85xx_MDS=y
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_QUICC_ENGINE=y
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--# CONFIG_BLK_DEV_SD is not set
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_UCC_GETH is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--# CONFIG_SERIAL_QE is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--# CONFIG_BOOKE_WDT is not set
--
--#
--# PCI-based Watchdog Cards
--#
--# CONFIG_PCIPCWATCHDOG is not set
--# CONFIG_WDTPCI is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--CONFIG_RTC_DRV_DS1374=y
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_XMON is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--# CONFIG_PPC_EARLY_DEBUG_44x is not set
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/mpc8572_ds_defconfig
-+++ /dev/null
-@@ -1,1549 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc7
--# Mon Mar 31 11:37:06 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--CONFIG_BSD_PROCESS_ACCT=y
--# CONFIG_BSD_PROCESS_ACCT_V3 is not set
--# CONFIG_TASKSTATS is not set
--CONFIG_AUDIT=y
--# CONFIG_AUDITSYSCALL is not set
--CONFIG_IKCONFIG=y
--CONFIG_IKCONFIG_PROC=y
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--CONFIG_MODVERSIONS=y
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--CONFIG_MPC85xx_DS=y
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_FSL_ULI1575=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--CONFIG_NET_KEY=m
--# CONFIG_NET_KEY_MIGRATE is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--CONFIG_IP_ROUTE_MULTIPATH=y
--CONFIG_IP_ROUTE_VERBOSE=y
--CONFIG_IP_PNP=y
--CONFIG_IP_PNP_DHCP=y
--CONFIG_IP_PNP_BOOTP=y
--CONFIG_IP_PNP_RARP=y
--CONFIG_NET_IPIP=y
--CONFIG_NET_IPGRE=y
--CONFIG_NET_IPGRE_BROADCAST=y
--CONFIG_IP_MROUTE=y
--CONFIG_IP_PIMSM_V1=y
--CONFIG_IP_PIMSM_V2=y
--CONFIG_ARPD=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=y
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--CONFIG_IPV6=y
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--# CONFIG_INET6_AH is not set
--# CONFIG_INET6_ESP is not set
--# CONFIG_INET6_IPCOMP is not set
--# CONFIG_IPV6_MIP6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--CONFIG_INET6_XFRM_MODE_TRANSPORT=y
--CONFIG_INET6_XFRM_MODE_TUNNEL=y
--CONFIG_INET6_XFRM_MODE_BEET=y
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=y
--# CONFIG_IPV6_TUNNEL is not set
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--CONFIG_IP_SCTP=m
--# CONFIG_SCTP_DBG_MSG is not set
--# CONFIG_SCTP_DBG_OBJCNT is not set
--# CONFIG_SCTP_HMAC_NONE is not set
--# CONFIG_SCTP_HMAC_SHA1 is not set
--CONFIG_SCTP_HMAC_MD5=y
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=y
--# CONFIG_BLK_DEV_SX8 is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=131072
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--CONFIG_CHR_DEV_ST=y
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=y
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=y
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--# CONFIG_SCSI_CONSTANTS is not set
--CONFIG_SCSI_LOGGING=y
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_IPR is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--CONFIG_ATA=y
--# CONFIG_ATA_NONSTANDARD is not set
--CONFIG_SATA_AHCI=y
--# CONFIG_SATA_SVW is not set
--# CONFIG_ATA_PIIX is not set
--# CONFIG_SATA_MV is not set
--# CONFIG_SATA_NV is not set
--# CONFIG_PDC_ADMA is not set
--# CONFIG_SATA_QSTOR is not set
--# CONFIG_SATA_PROMISE is not set
--# CONFIG_SATA_SX4 is not set
--# CONFIG_SATA_SIL is not set
--# CONFIG_SATA_SIL24 is not set
--# CONFIG_SATA_SIS is not set
--# CONFIG_SATA_ULI is not set
--# CONFIG_SATA_VIA is not set
--# CONFIG_SATA_VITESSE is not set
--# CONFIG_SATA_INIC162X is not set
--# CONFIG_SATA_FSL is not set
--CONFIG_PATA_ALI=y
--# CONFIG_PATA_AMD is not set
--# CONFIG_PATA_ARTOP is not set
--# CONFIG_PATA_ATIIXP is not set
--# CONFIG_PATA_CMD640_PCI is not set
--# CONFIG_PATA_CMD64X is not set
--# CONFIG_PATA_CS5520 is not set
--# CONFIG_PATA_CS5530 is not set
--# CONFIG_PATA_CYPRESS is not set
--# CONFIG_PATA_EFAR is not set
--# CONFIG_ATA_GENERIC is not set
--# CONFIG_PATA_HPT366 is not set
--# CONFIG_PATA_HPT37X is not set
--# CONFIG_PATA_HPT3X2N is not set
--# CONFIG_PATA_HPT3X3 is not set
--# CONFIG_PATA_IT821X is not set
--# CONFIG_PATA_IT8213 is not set
--# CONFIG_PATA_JMICRON is not set
--# CONFIG_PATA_TRIFLEX is not set
--# CONFIG_PATA_MARVELL is not set
--# CONFIG_PATA_MPIIX is not set
--# CONFIG_PATA_OLDPIIX is not set
--# CONFIG_PATA_NETCELL is not set
--# CONFIG_PATA_NINJA32 is not set
--# CONFIG_PATA_NS87410 is not set
--# CONFIG_PATA_NS87415 is not set
--# CONFIG_PATA_OPTI is not set
--# CONFIG_PATA_OPTIDMA is not set
--# CONFIG_PATA_PDC_OLD is not set
--# CONFIG_PATA_RADISYS is not set
--# CONFIG_PATA_RZ1000 is not set
--# CONFIG_PATA_SC1200 is not set
--# CONFIG_PATA_SERVERWORKS is not set
--# CONFIG_PATA_PDC2027X is not set
--# CONFIG_PATA_SIL680 is not set
--# CONFIG_PATA_SIS is not set
--# CONFIG_PATA_VIA is not set
--# CONFIG_PATA_WINBOND is not set
--# CONFIG_PATA_PLATFORM is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--CONFIG_DUMMY=y
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--CONFIG_VITESSE_PHY=y
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# 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_VT_HW_CONSOLE_BINDING is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=2
--CONFIG_SERIAL_8250_RUNTIME_UARTS=2
--CONFIG_SERIAL_8250_EXTENDED=y
--CONFIG_SERIAL_8250_MANY_PORTS=y
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--CONFIG_SERIAL_8250_DETECT_IRQ=y
--CONFIG_SERIAL_8250_RSA=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--CONFIG_NVRAM=y
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--CONFIG_DVB_CORE=m
--# CONFIG_DVB_CORE_ATTACH is not set
--CONFIG_DVB_CAPTURE_DRIVERS=y
--
--#
--# Supported SAA7146 based PCI Adapters
--#
--# CONFIG_TTPCI_EEPROM is not set
--# CONFIG_DVB_BUDGET_CORE is not set
--
--#
--# Supported USB Adapters
--#
--# CONFIG_DVB_USB is not set
--# CONFIG_DVB_TTUSB_BUDGET is not set
--# CONFIG_DVB_TTUSB_DEC is not set
--# CONFIG_DVB_CINERGYT2 is not set
--
--#
--# Supported FlexCopII (B2C2) Adapters
--#
--# CONFIG_DVB_B2C2_FLEXCOP is not set
--
--#
--# Supported BT878 Adapters
--#
--
--#
--# Supported Pluto2 Adapters
--#
--# CONFIG_DVB_PLUTO2 is not set
--
--#
--# Supported DVB Frontends
--#
--
--#
--# Customise DVB Frontends
--#
--# CONFIG_DVB_FE_CUSTOMISE is not set
--
--#
--# DVB-S (satellite) frontends
--#
--# CONFIG_DVB_STV0299 is not set
--# CONFIG_DVB_CX24110 is not set
--# CONFIG_DVB_CX24123 is not set
--# CONFIG_DVB_TDA8083 is not set
--# CONFIG_DVB_MT312 is not set
--# CONFIG_DVB_VES1X93 is not set
--# CONFIG_DVB_S5H1420 is not set
--# CONFIG_DVB_TDA10086 is not set
--
--#
--# DVB-T (terrestrial) frontends
--#
--# CONFIG_DVB_SP8870 is not set
--# CONFIG_DVB_SP887X is not set
--# CONFIG_DVB_CX22700 is not set
--# CONFIG_DVB_CX22702 is not set
--# CONFIG_DVB_L64781 is not set
--# CONFIG_DVB_TDA1004X is not set
--# CONFIG_DVB_NXT6000 is not set
--# CONFIG_DVB_MT352 is not set
--# CONFIG_DVB_ZL10353 is not set
--# CONFIG_DVB_DIB3000MB is not set
--# CONFIG_DVB_DIB3000MC is not set
--# CONFIG_DVB_DIB7000M is not set
--# CONFIG_DVB_DIB7000P is not set
--
--#
--# DVB-C (cable) frontends
--#
--# CONFIG_DVB_VES1820 is not set
--# CONFIG_DVB_TDA10021 is not set
--# CONFIG_DVB_TDA10023 is not set
--# CONFIG_DVB_STV0297 is not set
--
--#
--# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
--#
--# CONFIG_DVB_NXT200X is not set
--# CONFIG_DVB_OR51211 is not set
--# CONFIG_DVB_OR51132 is not set
--# CONFIG_DVB_BCM3510 is not set
--# CONFIG_DVB_LGDT330X is not set
--# CONFIG_DVB_S5H1409 is not set
--
--#
--# Tuners/PLL support
--#
--# CONFIG_DVB_PLL is not set
--# CONFIG_DVB_TDA826X is not set
--# CONFIG_DVB_TDA827X is not set
--# CONFIG_DVB_TDA18271 is not set
--# CONFIG_DVB_TUNER_QT1010 is not set
--# CONFIG_DVB_TUNER_MT2060 is not set
--# CONFIG_DVB_TUNER_MT2266 is not set
--# CONFIG_DVB_TUNER_MT2131 is not set
--# CONFIG_DVB_TUNER_DIB0070 is not set
--# CONFIG_DVB_TUNER_XC5000 is not set
--
--#
--# Miscellaneous devices
--#
--# CONFIG_DVB_LNBP21 is not set
--# CONFIG_DVB_ISL6421 is not set
--# CONFIG_DVB_TUA6100 is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Console display driver support
--#
--CONFIG_VGA_CONSOLE=y
--# CONFIG_VGACON_SOFT_SCROLLBACK is not set
--CONFIG_DUMMY_CONSOLE=y
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--# CONFIG_SND_SEQUENCER is not set
--# CONFIG_SND_MIXER_OSS is not set
--# CONFIG_SND_PCM_OSS is not set
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# CONFIG_SND_VERBOSE_PRINTK is not set
--# CONFIG_SND_DEBUG is not set
--
--#
--# Generic devices
--#
--CONFIG_SND_AC97_CODEC=y
--# CONFIG_SND_DUMMY is not set
--# CONFIG_SND_MTPAV is not set
--# CONFIG_SND_SERIAL_U16550 is not set
--# CONFIG_SND_MPU401 is not set
--
--#
--# PCI devices
--#
--# CONFIG_SND_AD1889 is not set
--# CONFIG_SND_ALS300 is not set
--# CONFIG_SND_ALS4000 is not set
--# CONFIG_SND_ALI5451 is not set
--# CONFIG_SND_ATIIXP is not set
--# CONFIG_SND_ATIIXP_MODEM is not set
--# CONFIG_SND_AU8810 is not set
--# CONFIG_SND_AU8820 is not set
--# CONFIG_SND_AU8830 is not set
--# CONFIG_SND_AZT3328 is not set
--# CONFIG_SND_BT87X is not set
--# CONFIG_SND_CA0106 is not set
--# CONFIG_SND_CMIPCI is not set
--# CONFIG_SND_OXYGEN is not set
--# CONFIG_SND_CS4281 is not set
--# CONFIG_SND_CS46XX is not set
--# CONFIG_SND_CS5530 is not set
--# CONFIG_SND_DARLA20 is not set
--# CONFIG_SND_GINA20 is not set
--# CONFIG_SND_LAYLA20 is not set
--# CONFIG_SND_DARLA24 is not set
--# CONFIG_SND_GINA24 is not set
--# CONFIG_SND_LAYLA24 is not set
--# CONFIG_SND_MONA is not set
--# CONFIG_SND_MIA is not set
--# CONFIG_SND_ECHO3G is not set
--# CONFIG_SND_INDIGO is not set
--# CONFIG_SND_INDIGOIO is not set
--# CONFIG_SND_INDIGODJ is not set
--# CONFIG_SND_EMU10K1 is not set
--# CONFIG_SND_EMU10K1X is not set
--# CONFIG_SND_ENS1370 is not set
--# CONFIG_SND_ENS1371 is not set
--# CONFIG_SND_ES1938 is not set
--# CONFIG_SND_ES1968 is not set
--# CONFIG_SND_FM801 is not set
--# CONFIG_SND_HDA_INTEL is not set
--# CONFIG_SND_HDSP is not set
--# CONFIG_SND_HDSPM is not set
--# CONFIG_SND_HIFIER is not set
--# CONFIG_SND_ICE1712 is not set
--# CONFIG_SND_ICE1724 is not set
--CONFIG_SND_INTEL8X0=y
--# CONFIG_SND_INTEL8X0M is not set
--# CONFIG_SND_KORG1212 is not set
--# CONFIG_SND_MAESTRO3 is not set
--# CONFIG_SND_MIXART is not set
--# CONFIG_SND_NM256 is not set
--# CONFIG_SND_PCXHR is not set
--# CONFIG_SND_RIPTIDE is not set
--# CONFIG_SND_RME32 is not set
--# CONFIG_SND_RME96 is not set
--# CONFIG_SND_RME9652 is not set
--# CONFIG_SND_SONICVIBES is not set
--# CONFIG_SND_TRIDENT is not set
--# CONFIG_SND_VIA82XX is not set
--# CONFIG_SND_VIA82XX_MODEM is not set
--# CONFIG_SND_VIRTUOSO is not set
--# CONFIG_SND_VX222 is not set
--# CONFIG_SND_YMFPCI is not set
--# CONFIG_SND_AC97_POWER_SAVE is not set
--
--#
--# ALSA PowerMac devices
--#
--
--#
--# ALSA PowerPC devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_USX2Y is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--# CONFIG_SND_SOC is not set
--
--#
--# SoC Audio support for SuperH
--#
--
--#
--# ALSA SoC audio for Freescale SOCs
--#
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_AC97_BUS=y
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--CONFIG_USB_EHCI_HCD=y
--# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
--# CONFIG_USB_EHCI_TT_NEWSCHED is not set
--# CONFIG_USB_EHCI_FSL is not set
--CONFIG_USB_EHCI_HCD_PPC_OF=y
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
--CONFIG_USB_OHCI_HCD_PCI=y
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_UHCI_HCD is not set
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_SISUSBVGA is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_TEST is not set
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--# CONFIG_RTC_DRV_S35390A is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--CONFIG_RTC_DRV_CMOS=y
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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=m
--CONFIG_JOLIET=y
--CONFIG_ZISOFS=y
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--CONFIG_NTFS_FS=y
--# CONFIG_NTFS_DEBUG is not set
--# CONFIG_NTFS_RW is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
--
--#
--# Miscellaneous filesystems
--#
--CONFIG_ADFS_FS=m
--# CONFIG_ADFS_FS_RW is not set
--CONFIG_AFFS_FS=m
--CONFIG_HFS_FS=m
--CONFIG_HFSPLUS_FS=m
--CONFIG_BEFS_FS=m
--# CONFIG_BEFS_DEBUG is not set
--CONFIG_BFS_FS=m
--CONFIG_EFS_FS=m
--CONFIG_CRAMFS=y
--CONFIG_VXFS_FS=m
--# CONFIG_MINIX_FS is not set
--CONFIG_HPFS_FS=m
--CONFIG_QNX4FS_FS=m
--# CONFIG_ROMFS_FS is not set
--CONFIG_SYSV_FS=m
--CONFIG_UFS_FS=m
--# CONFIG_UFS_FS_WRITE is not set
--# CONFIG_UFS_DEBUG is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--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_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--CONFIG_MAC_PARTITION=y
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_BSD_DISKLABEL is not set
--# CONFIG_MINIX_SUBPARTITION is not set
--# CONFIG_SOLARIS_X86_PARTITION is not set
--# CONFIG_UNIXWARE_DISKLABEL is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# 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=m
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--CONFIG_CRYPTO_MD5=y
--CONFIG_CRYPTO_SHA1=m
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/mpc85xx_cds_defconfig
-+++ /dev/null
-@@ -1,935 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:30 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--CONFIG_MPC85xx_CDS=y
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--CONFIG_PPC_I8259=y
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/ide.txt for help/info on IDE drives
--#
--# CONFIG_BLK_DEV_IDE_SATA is not set
--# CONFIG_BLK_DEV_IDEDISK is not set
--# 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
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--CONFIG_E1000=y
--CONFIG_E1000_NAPI=y
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/pmac32_defconfig
-+++ b/arch/powerpc/configs/pmac32_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:05:14 2008
-+# Thu Mar 27 13:56:21 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
- CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
-@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- # CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- CONFIG_PCCARD=m
- # CONFIG_PCMCIA_DEBUG is not set
-@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- /dev/null
-+++ b/arch/powerpc/configs/ppc40x_defconfig
-@@ -0,0 +1,896 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc9
-+# Tue Apr 15 08:46:44 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+# CONFIG_6xx is not set
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+CONFIG_40x=y
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_4xx=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_NOT_COHERENT_CACHE=y
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+# CONFIG_GENERIC_TBSYNC is not set
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+# CONFIG_DEFAULT_UIMAGE is not set
-+CONFIG_PPC_DCR_NATIVE=y
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_PPC_DCR=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_KALLSYMS_EXTRA_PASS=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+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"
-+CONFIG_CLASSIC_RCU=y
-+CONFIG_PPC4xx_PCI_EXPRESS=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+CONFIG_EP405=y
-+CONFIG_KILAUEA=y
-+CONFIG_MAKALU=y
-+CONFIG_WALNUT=y
-+CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
-+CONFIG_405GP=y
-+CONFIG_405EX=y
-+CONFIG_XILINX_VIRTEX=y
-+CONFIG_XILINX_VIRTEX_II_PRO=y
-+CONFIG_XILINX_VIRTEX_4_FX=y
-+CONFIG_IBM405_ERR77=y
-+CONFIG_IBM405_ERR51=y
-+# CONFIG_IPIC is not set
-+# CONFIG_MPIC is not set
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+CONFIG_OF_RTC=y
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_NO_HZ is not set
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_MISC is not set
-+# CONFIG_MATH_EMULATION is not set
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_RESOURCES_64BIT=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+CONFIG_PROC_DEVICETREE=y
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_4xx_SOC=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+# CONFIG_PCIEPORTBUS is not set
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+# CONFIG_PCI_LEGACY is not set
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_CONSISTENT_START=0xff100000
-+CONFIG_CONSISTENT_SIZE=0x00200000
-+CONFIG_BOOT_LOAD=0x00400000
-+
-+#
-+# 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 is not set
-+# 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_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_NET_SCHED is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=y
-+CONFIG_PROC_EVENTS=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+CONFIG_MTD_OF_PARTS=y
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=m
-+CONFIG_MTD_BLOCK=m
-+# CONFIG_MTD_BLOCK_RO is not set
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+CONFIG_MTD_JEDECPROBE=y
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_I8 is not set
-+# CONFIG_MTD_CFI_INTELEXT is not set
-+CONFIG_MTD_CFI_AMDSTD=y
-+# 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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+# CONFIG_BLK_DEV_LOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=35000
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_XILINX_SYSACE is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_MII is not set
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+CONFIG_IBM_NEW_EMAC=y
-+CONFIG_IBM_NEW_EMAC_RXB=128
-+CONFIG_IBM_NEW_EMAC_TXB=64
-+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-+CONFIG_IBM_NEW_EMAC_ZMII=y
-+CONFIG_IBM_NEW_EMAC_RGMII=y
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+CONFIG_IBM_NEW_EMAC_EMAC4=y
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+CONFIG_NETDEV_10000=y
-+# CONFIG_CHELSIO_T1 is not set
-+# CONFIG_CHELSIO_T3 is not set
-+# CONFIG_IXGBE is not set
-+# CONFIG_IXGB is not set
-+# CONFIG_S2IO is not set
-+# CONFIG_MYRI10GE is not set
-+# CONFIG_NETXEN_NIC is not set
-+# CONFIG_NIU is not set
-+# CONFIG_MLX4_CORE is not set
-+# CONFIG_TEHUTI is not set
-+# CONFIG_BNX2X is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+# CONFIG_INPUT is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+# CONFIG_VT is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_PCI=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=y
-+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-+# CONFIG_SERIAL_8250_RSA is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+CONFIG_XILINX_HWICAP=m
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+# CONFIG_I2C is not set
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+CONFIG_THERMAL=y
-+# CONFIG_WATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_EXT4DEV_FS is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+# CONFIG_CONFIGFS_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_JFFS2_FS is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+# CONFIG_NFS_V4 is not set
-+# CONFIG_NFS_DIRECTIO is not set
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+# CONFIG_RPCSEC_GSS_KRB5 is not set
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_NLS is not set
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_SLUB_DEBUG_ON is not set
-+# CONFIG_SLUB_STATS is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+# CONFIG_DEBUGGER is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_MANAGER=y
-+# CONFIG_CRYPTO_HMAC is not set
-+# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# 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_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/ppc44x_defconfig
-+++ b/arch/powerpc/configs/ppc44x_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:57:35 2008
-+# Linux kernel version: 2.6.25-rc6
-+# Sat Apr  5 09:35:48 2008
- #
- # CONFIG_PPC64 is not set
- 
-@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_USER_SCHED=y
- # CONFIG_CGROUP_SCHED is not set
- CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
- # CONFIG_RELAY is not set
- # CONFIG_NAMESPACES is not set
- CONFIG_BLK_DEV_INITRD=y
-@@ -113,6 +114,7 @@ CONFIG_SLUB=y
- CONFIG_HAVE_OPROFILE=y
- # CONFIG_KPROBES is not set
- CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
- CONFIG_PROC_PAGE_MONITOR=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
-@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y
- # CONFIG_DEFAULT_NOOP is not set
- CONFIG_DEFAULT_IOSCHED="anticipatory"
- CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
- CONFIG_PPC4xx_PCI_EXPRESS=y
- 
- #
-@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y
- CONFIG_KATMAI=y
- CONFIG_RAINIER=y
- CONFIG_WARP=y
-+CONFIG_CANYONLANDS=y
-+CONFIG_YOSEMITE=y
- CONFIG_440EP=y
- CONFIG_440EPX=y
- CONFIG_440GRX=y
- CONFIG_440GP=y
- CONFIG_440GX=y
- CONFIG_440SPe=y
-+CONFIG_460EX=y
- CONFIG_IBM440EP_ERR42=y
- # CONFIG_IPIC is not set
- # CONFIG_MPIC is not set
-@@ -199,7 +203,6 @@ CONFIG_HZ=250
- CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
- # CONFIG_PREEMPT is not set
--# CONFIG_RCU_TRACE is not set
- CONFIG_BINFMT_ELF=y
- # CONFIG_BINFMT_MISC is not set
- CONFIG_MATH_EMULATION=y
-@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y
- #
- CONFIG_ZONE_DMA=y
- CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_4xx_SOC=y
- CONFIG_PCI=y
- CONFIG_PCI_DOMAINS=y
- CONFIG_PCI_SYSCALL=y
-@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
- # CONFIG_INFINIBAND is not set
- # CONFIG_EDAC is not set
- # CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
- 
- #
- # Userspace I/O
-@@ -805,6 +810,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/ppc64_defconfig
-+++ b/arch/powerpc/configs/ppc64_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:06:28 2008
-+# Thu Mar 27 13:56:24 2008
- #
- CONFIG_PPC64=y
- 
-@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y
- # CONFIG_CGROUP_NS is not set
- CONFIG_CPUSETS=y
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- # CONFIG_CGROUP_CPUACCT is not set
- # CONFIG_RESOURCE_COUNTERS is not set
- CONFIG_SYSFS_DEPRECATED=y
-@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
- CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
- CONFIG_KEXEC=y
- # CONFIG_CRASH_DUMP is not set
-+# CONFIG_PHYP_DUMP is not set
- CONFIG_IRQ_ALL_CPUS=y
- # CONFIG_NUMA is not set
- CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- CONFIG_PCCARD=y
- # CONFIG_PCMCIA_DEBUG is not set
-@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/pseries_defconfig
-+++ b/arch/powerpc/configs/pseries_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.25-rc6
--# Thu Mar 20 11:08:01 2008
-+# Thu Mar 27 13:56:28 2008
- #
- CONFIG_PPC64=y
- 
-@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y
- CONFIG_CGROUP_NS=y
- CONFIG_CPUSETS=y
- # CONFIG_GROUP_SCHED is not set
--# CONFIG_USER_SCHED is not set
--# CONFIG_CGROUP_SCHED is not set
- CONFIG_CGROUP_CPUACCT=y
- # CONFIG_RESOURCE_COUNTERS is not set
- CONFIG_SYSFS_DEPRECATED=y
-@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
- CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
- CONFIG_KEXEC=y
- # CONFIG_CRASH_DUMP is not set
-+# CONFIG_PHYP_DUMP is not set
- CONFIG_IRQ_ALL_CPUS=y
- CONFIG_NUMA=y
- CONFIG_NODES_SHIFT=4
-@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_ARCH_SUPPORTS_MSI=y
- CONFIG_PCI_MSI=y
--CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_LEGACY is not set
- # CONFIG_PCI_DEBUG is not set
- # CONFIG_PCCARD is not set
- CONFIG_HOTPLUG_PCI=m
-@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
- CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
- 
- #
- # Kernel hacking
---- a/arch/powerpc/configs/rainier_defconfig
-+++ /dev/null
-@@ -1,899 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:53:10 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--CONFIG_RAINIER=y
--# CONFIG_WARP is not set
--CONFIG_440GRX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_NET_ETHERNET is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--CONFIG_PPC_EARLY_DEBUG_44x=y
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc834x_defconfig
-+++ /dev/null
-@@ -1,828 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:38 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--CONFIG_6xx=y
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--# CONFIG_FSL_EMB_PERFMON is not set
--CONFIG_PPC_STD_MMU=y
--CONFIG_PPC_STD_MMU_32=y
--# CONFIG_PPC_MM_SLICES is not set
--# CONFIG_SMP is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--# CONFIG_KMOD is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MULTIPLATFORM is not set
--# CONFIG_PPC_82xx is not set
--CONFIG_PPC_83xx=y
--# CONFIG_PPC_86xx is not set
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC83xx=y
--# CONFIG_MPC831x_RDB is not set
--# CONFIG_MPC832x_MDS is not set
--# CONFIG_MPC832x_RDB is not set
--# CONFIG_MPC834x_MDS is not set
--# CONFIG_MPC834x_ITX is not set
--# CONFIG_MPC836x_MDS is not set
--# CONFIG_MPC837x_MDS is not set
--# CONFIG_MPC837x_RDB is not set
--CONFIG_SBC834x=y
--CONFIG_PPC_MPC834x=y
--CONFIG_IPIC=y
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_GENERIC_ISA_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=m
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--# CONFIG_GFAR_NAPI is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_83xx_WDT=y
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--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 is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--# CONFIG_CRYPTO_HW is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc8548_defconfig
-+++ /dev/null
-@@ -1,812 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--CONFIG_SBC8548=y
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--# CONFIG_HID_SUPPORT is not set
--# CONFIG_USB_SUPPORT is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sbc8560_defconfig
-+++ /dev/null
-@@ -1,830 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:39 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--CONFIG_SBC8560=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=y
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--# CONFIG_SECCOMP is not set
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_FSL_SOC=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--CONFIG_XFRM_USER=y
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--CONFIG_BROADCOM_PHY=y
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_E1000E_ENABLED is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--CONFIG_NETDEV_10000=y
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# 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_RUNTIME_UARTS=2
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--# CONFIG_USB_ARCH_HAS_HCD is not set
--# CONFIG_USB_ARCH_HAS_OHCI is not set
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--# CONFIG_RTC_DEBUG is not set
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# SPI RTC drivers
--#
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1511 is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--CONFIG_RTC_DRV_M48T59=y
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--# CONFIG_EXT2_FS is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS is not set
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_DEBUG_SLAB is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--CONFIG_DEBUG_MUTEXES=y
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--# CONFIG_PPC_EARLY_DEBUG_44x is not set
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- /dev/null
-+++ b/arch/powerpc/configs/sbc8641d_defconfig
-@@ -0,0 +1,1342 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc6
-+# Thu Apr 10 18:03:25 2008
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not set
-+# CONFIG_PPC_8xx is not set
-+# CONFIG_40x is not set
-+# CONFIG_44x is not set
-+# CONFIG_E200 is not set
-+CONFIG_PPC_FPU=y
-+CONFIG_ALTIVEC=y
-+CONFIG_PPC_STD_MMU=y
-+CONFIG_PPC_STD_MMU_32=y
-+# CONFIG_PPC_MM_SLICES is not set
-+CONFIG_SMP=y
-+CONFIG_NR_CPUS=2
-+CONFIG_PPC32=y
-+CONFIG_WORD_SIZE=32
-+CONFIG_PPC_MERGE=y
-+CONFIG_MMU=y
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_HARDIRQS=y
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-+CONFIG_IRQ_PER_CPU=y
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_GENERIC_LOCKBREAK=y
-+CONFIG_ARCH_HAS_ILOG2_U32=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_FIND_NEXT_BIT=y
-+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
-+CONFIG_PPC=y
-+CONFIG_EARLY_PRINTK=y
-+CONFIG_GENERIC_NVRAM=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+CONFIG_PPC_OF=y
-+CONFIG_OF=y
-+CONFIG_PPC_UDBG_16550=y
-+CONFIG_GENERIC_TBSYNC=y
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_DEFAULT_UIMAGE=y
-+# CONFIG_PPC_DCR_NATIVE is not set
-+# CONFIG_PPC_DCR_MMIO is not set
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+CONFIG_RELAY=y
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_EMBEDDED=y
-+CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_STOP_MACHINE=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+# CONFIG_DEFAULT_AS is not set
-+# CONFIG_DEFAULT_DEADLINE is not set
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# Platform support
-+#
-+# CONFIG_PPC_MULTIPLATFORM is not set
-+# CONFIG_PPC_82xx is not set
-+# CONFIG_PPC_83xx is not set
-+CONFIG_PPC_86xx=y
-+# CONFIG_PPC_MPC512x is not set
-+# CONFIG_PPC_MPC5121 is not set
-+# CONFIG_PPC_CELL is not set
-+# CONFIG_PPC_CELL_NATIVE is not set
-+# CONFIG_PQ2ADS is not set
-+# CONFIG_MPC8641_HPCN is not set
-+CONFIG_SBC8641D=y
-+# CONFIG_MPC8610_HPCD is not set
-+CONFIG_MPC8641=y
-+# CONFIG_IPIC is not set
-+CONFIG_MPIC=y
-+# CONFIG_MPIC_WEIRD is not set
-+# CONFIG_PPC_I8259 is not set
-+# CONFIG_PPC_RTAS is not set
-+# CONFIG_MMIO_NVRAM is not set
-+# CONFIG_PPC_MPC106 is not set
-+# CONFIG_PPC_970_NAP is not set
-+# CONFIG_PPC_INDIRECT_IO is not set
-+# CONFIG_GENERIC_IOMAP is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_FSL_ULI1575 is not set
-+
-+#
-+# Kernel options
-+#
-+# CONFIG_HIGHMEM is not set
-+CONFIG_TICK_ONESHOT=y
-+# CONFIG_NO_HZ is not set
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+# CONFIG_HZ_100 is not set
-+CONFIG_HZ_250=y
-+# CONFIG_HZ_300 is not set
-+# CONFIG_HZ_1000 is not set
-+CONFIG_HZ=250
-+# CONFIG_SCHED_HRTICK is not set
-+# CONFIG_PREEMPT_NONE is not set
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+CONFIG_PREEMPT=y
-+# CONFIG_PREEMPT_RCU is not set
-+CONFIG_BINFMT_ELF=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_FORCE_MAX_ZONEORDER=11
-+# CONFIG_IOMMU_HELPER is not set
-+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-+CONFIG_ARCH_HAS_WALK_MEMORY=y
-+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-+CONFIG_IRQ_ALL_CPUS=y
-+CONFIG_ARCH_FLATMEM_ENABLE=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+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_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+# CONFIG_PROC_DEVICETREE is not set
-+# CONFIG_CMDLINE_BOOL is not set
-+# CONFIG_PM is not set
-+CONFIG_SECCOMP=y
-+CONFIG_ISA_DMA_API=y
-+
-+#
-+# Bus options
-+#
-+CONFIG_ZONE_DMA=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_FSL_SOC=y
-+CONFIG_FSL_PCI=y
-+CONFIG_PCI=y
-+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_SYSCALL=y
-+CONFIG_PCIEPORTBUS=y
-+CONFIG_PCIEAER=y
-+CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_PCI_MSI is not set
-+CONFIG_PCI_LEGACY=y
-+# CONFIG_PCI_DEBUG is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_HOTPLUG_PCI is not set
-+
-+#
-+# Advanced setup
-+#
-+# CONFIG_ADVANCED_OPTIONS is not set
-+
-+#
-+# Default settings for advanced configuration options are used
-+#
-+CONFIG_HIGHMEM_START=0xfe000000
-+CONFIG_LOWMEM_SIZE=0x30000000
-+CONFIG_KERNEL_START=0xc0000000
-+CONFIG_TASK_SIZE=0xc0000000
-+CONFIG_BOOT_LOAD=0x00800000
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+# CONFIG_NET_KEY_MIGRATE is not set
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_NET_IPGRE_BROADCAST=y
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=y
-+CONFIG_INET_XFRM_MODE_TUNNEL=y
-+CONFIG_INET_XFRM_MODE_BEET=y
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETLABEL is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_NF_CONNTRACK is not set
-+CONFIG_NETFILTER_XTABLES=m
-+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
-+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_IP_NF_QUEUE=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_RECENT=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+# CONFIG_IP_NF_MATCH_AH is not set
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+# CONFIG_IP_NF_TARGET_TTL is not set
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_IP6_NF_QUEUE=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+# CONFIG_IP6_NF_MATCH_AH is not set
-+# CONFIG_IP6_NF_MATCH_MH is not set
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+# CONFIG_IP6_NF_TARGET_REJECT is not set
-+CONFIG_IP6_NF_MANGLE=m
-+# CONFIG_IP6_NF_TARGET_HL is not set
-+CONFIG_IP6_NF_RAW=m
-+
-+#
-+# Bridge: Netfilter Configuration
-+#
-+# CONFIG_BRIDGE_NF_EBTABLES is not set
-+# CONFIG_IP_DCCP is not set
-+CONFIG_IP_SCTP=m
-+# CONFIG_SCTP_DBG_MSG is not set
-+# CONFIG_SCTP_DBG_OBJCNT is not set
-+# CONFIG_SCTP_HMAC_NONE is not set
-+# CONFIG_SCTP_HMAC_SHA1 is not set
-+CONFIG_SCTP_HMAC_MD5=y
-+CONFIG_TIPC=m
-+# CONFIG_TIPC_ADVANCED is not set
-+# CONFIG_TIPC_DEBUG is not set
-+CONFIG_ATM=m
-+CONFIG_ATM_CLIP=m
-+# CONFIG_ATM_CLIP_NO_ICMP is not set
-+CONFIG_ATM_LANE=m
-+CONFIG_ATM_MPOA=m
-+CONFIG_ATM_BR2684=m
-+# CONFIG_ATM_BR2684_IPFILTER is not set
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=m
-+# 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_ECONET is not set
-+CONFIG_WAN_ROUTER=m
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+# CONFIG_NET_CLS_BASIC is not set
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+# CONFIG_CLS_U32_PERF is not set
-+# CONFIG_CLS_U32_MARK is not set
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+CONFIG_NET_PKTGEN=m
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+# CONFIG_FW_LOADER is not set
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_OF_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+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
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+CONFIG_MTD_CFI_ADV_OPTIONS=y
-+# CONFIG_MTD_CFI_NOSWAP is not set
-+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-+CONFIG_MTD_CFI_LE_BYTE_SWAP=y
-+# CONFIG_MTD_CFI_GEOMETRY is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+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_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
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PHYSMAP is not set
-+CONFIG_MTD_PHYSMAP_OF=y
-+# CONFIG_MTD_INTEL_VR_NOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM 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
-+# CONFIG_MTD_NAND is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+CONFIG_OF_DEVICE=y
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_FD is not set
-+# CONFIG_BLK_CPQ_DA is not set
-+# CONFIG_BLK_CPQ_CISS_DA is not set
-+# CONFIG_BLK_DEV_DAC960 is not set
-+# CONFIG_BLK_DEV_UMEM is not set
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_NBD=m
-+# CONFIG_BLK_DEV_SX8 is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_PHANTOM is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_SGI_IOC4 is not set
-+# CONFIG_TIFM_CORE is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+CONFIG_BLK_DEV_MD=y
-+CONFIG_MD_LINEAR=y
-+CONFIG_MD_RAID0=y
-+CONFIG_MD_RAID1=y
-+CONFIG_MD_RAID10=y
-+# CONFIG_MD_RAID456 is not set
-+CONFIG_MD_MULTIPATH=y
-+CONFIG_MD_FAULTY=y
-+CONFIG_BLK_DEV_DM=y
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=y
-+CONFIG_DM_SNAPSHOT=y
-+CONFIG_DM_MIRROR=y
-+CONFIG_DM_ZERO=y
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+# CONFIG_FUSION is not set
-+
-+#
-+# IEEE 1394 (FireWire) support
-+#
-+# CONFIG_FIREWIRE is not set
-+# CONFIG_IEEE1394 is not set
-+# CONFIG_I2O is not set
-+# CONFIG_MACINTOSH_DRIVERS is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+CONFIG_DUMMY=m
-+CONFIG_BONDING=m
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_ARCNET is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+# CONFIG_SMSC_PHY is not set
-+CONFIG_BROADCOM_PHY=y
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_HAPPYMEAL is not set
-+# CONFIG_SUNGEM is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_NET_TULIP is not set
-+# CONFIG_HP100 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_NET_PCI is not set
-+# CONFIG_B44 is not set
-+CONFIG_NETDEV_1000=y
-+# CONFIG_ACENIC is not set
-+# CONFIG_DL2K is not set
-+# CONFIG_E1000 is not set
-+# CONFIG_E1000E is not set
-+# CONFIG_E1000E_ENABLED is not set
-+# CONFIG_IP1000 is not set
-+# CONFIG_IGB is not set
-+# CONFIG_NS83820 is not set
-+# CONFIG_HAMACHI is not set
-+# CONFIG_YELLOWFIN is not set
-+# CONFIG_R8169 is not set
-+# CONFIG_SIS190 is not set
-+# CONFIG_SKGE is not set
-+# CONFIG_SKY2 is not set
-+# CONFIG_SK98LIN is not set
-+# CONFIG_VIA_VELOCITY is not set
-+# CONFIG_TIGON3 is not set
-+# CONFIG_BNX2 is not set
-+CONFIG_GIANFAR=y
-+# CONFIG_GFAR_NAPI is not set
-+# CONFIG_QLA3XXX is not set
-+# CONFIG_ATL1 is not set
-+# CONFIG_NETDEV_10000 is not set
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_WAN is not set
-+CONFIG_ATM_DRIVERS=y
-+# CONFIG_ATM_DUMMY is not set
-+# CONFIG_ATM_TCP is not set
-+# CONFIG_ATM_LANAI is not set
-+# CONFIG_ATM_ENI is not set
-+# CONFIG_ATM_FIRESTREAM is not set
-+# CONFIG_ATM_ZATM is not set
-+# CONFIG_ATM_NICSTAR is not set
-+# CONFIG_ATM_IDT77252 is not set
-+# CONFIG_ATM_AMBASSADOR is not set
-+# CONFIG_ATM_HORIZON is not set
-+# CONFIG_ATM_IA is not set
-+# CONFIG_ATM_FORE200E_MAYBE is not set
-+# CONFIG_ATM_HE is not set
-+# CONFIG_FDDI is not set
-+# CONFIG_HIPPI is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+# CONFIG_PPP_MPPE is not set
-+CONFIG_PPPOE=m
-+CONFIG_PPPOATM=m
-+# CONFIG_PPPOL2TP is not set
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLHC=m
-+CONFIG_SLIP_SMART=y
-+CONFIG_SLIP_MODE_SLIP6=y
-+CONFIG_NETCONSOLE=y
-+# CONFIG_NETCONSOLE_DYNAMIC is not set
-+CONFIG_NETPOLL=y
-+CONFIG_NETPOLL_TRAP=y
-+CONFIG_NET_POLL_CONTROLLER=y
-+# CONFIG_ISDN is not set
-+# CONFIG_PHONE is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_EVDEV is not set
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+# CONFIG_VT_HW_CONSOLE_BINDING is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_NOZOMI is not set
-+
-+#
-+# Serial drivers
-+#
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+# CONFIG_SERIAL_8250_EXTENDED is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+# CONFIG_SERIAL_UARTLITE is not set
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_OF_PLATFORM is not set
-+CONFIG_UNIX98_PTYS=y
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=256
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_HW_RANDOM=m
-+# CONFIG_NVRAM is not set
-+# CONFIG_GEN_RTC is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_DEVPORT=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_ALI1535 is not set
-+# CONFIG_I2C_ALI1563 is not set
-+# CONFIG_I2C_ALI15X3 is not set
-+# CONFIG_I2C_AMD756 is not set
-+# CONFIG_I2C_AMD8111 is not set
-+# CONFIG_I2C_I801 is not set
-+# CONFIG_I2C_I810 is not set
-+# CONFIG_I2C_PIIX4 is not set
-+CONFIG_I2C_MPC=y
-+# CONFIG_I2C_NFORCE2 is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+# CONFIG_I2C_PROSAVAGE is not set
-+# CONFIG_I2C_SAVAGE4 is not set
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_SIS5595 is not set
-+# CONFIG_I2C_SIS630 is not set
-+# CONFIG_I2C_SIS96X is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_VIA is not set
-+# CONFIG_I2C_VIAPRO is not set
-+# CONFIG_I2C_VOODOO3 is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 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
-+
-+#
-+# SPI support
-+#
-+# CONFIG_SPI is not set
-+# CONFIG_SPI_MASTER is not set
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_I5K_AMB is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S 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_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SIS5595 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VIA686A is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_VT8231 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+# CONFIG_THERMAL is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+CONFIG_SOFT_WATCHDOG=m
-+
-+#
-+# PCI-based Watchdog Cards
-+#
-+# CONFIG_PCIPCWATCHDOG is not set
-+# CONFIG_WDTPCI is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_AGP is not set
-+# CONFIG_DRM is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=m
-+# CONFIG_FB is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+CONFIG_VGA_CONSOLE=y
-+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-+CONFIG_DUMMY_CONSOLE=y
-+
-+#
-+# Sound
-+#
-+# CONFIG_SOUND is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+CONFIG_USB_ARCH_HAS_EHCI=y
-+# CONFIG_USB is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_INFINIBAND is not set
-+# CONFIG_EDAC is not set
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+
-+#
-+# Userspace I/O
-+#
-+# CONFIG_UIO is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+CONFIG_EXT2_FS_XATTR=y
-+CONFIG_EXT2_FS_POSIX_ACL=y
-+# 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=y
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4DEV_FS 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=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+# CONFIG_REISERFS_FS_SECURITY is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+CONFIG_OCFS2_FS=m
-+CONFIG_OCFS2_DEBUG_MASKLOG=y
-+# CONFIG_OCFS2_DEBUG_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_AUTOFS_FS=m
-+CONFIG_AUTOFS4_FS=m
-+# 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_PROC_KCORE=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_JFFS2_FS is not set
-+# CONFIG_CRAMFS is not set
-+# CONFIG_VXFS_FS is not set
-+CONFIG_MINIX_FS=m
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=m
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_DIRECTIO=y
-+# CONFIG_NFSD is not set
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+CONFIG_SMB_FS=m
-+CONFIG_SMB_NLS_DEFAULT=y
-+CONFIG_SMB_NLS_REMOTE="cp437"
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+# CONFIG_CIFS_DEBUG2 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
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=m
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_NLS_UTF8=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=m
-+CONFIG_ZLIB_DEFLATE=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_HAVE_LMB=y
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_BUGVERBOSE is not set
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_STACKOVERFLOW is not set
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_PAGEALLOC is not set
-+CONFIG_DEBUGGER=y
-+# CONFIG_XMON is not set
-+# CONFIG_VIRQ_DEBUG is not set
-+# CONFIG_BDI_SWITCH is not set
-+# CONFIG_PPC_EARLY_DEBUG is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_NETWORK=y
-+# CONFIG_SECURITY_NETWORK_XFRM is not set
-+CONFIG_SECURITY_CAPABILITIES=y
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_WP512=m
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GF128MUL is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_AUTHENC=m
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-+# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/sequoia_defconfig
-+++ /dev/null
-@@ -1,916 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:53:46 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--CONFIG_SEQUOIA=y
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440EPX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--CONFIG_TICK_ONESHOT=y
--CONFIG_NO_HZ=y
--CONFIG_HIGH_RES_TIMERS=y
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_BLKDEVS is not set
--# CONFIG_MTD_BLOCK is not set
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--CONFIG_PPC_EARLY_DEBUG=y
--# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
--# CONFIG_PPC_EARLY_DEBUG_G5 is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
--# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
--# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
--# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
--# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
--CONFIG_PPC_EARLY_DEBUG_44x=y
--# CONFIG_PPC_EARLY_DEBUG_40x is not set
--# CONFIG_PPC_EARLY_DEBUG_CPM is not set
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
--CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/stx_gp3_defconfig
-+++ /dev/null
-@@ -1,1253 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:42 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--# CONFIG_MODULE_UNLOAD is not set
--CONFIG_MODVERSIONS=y
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--# CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--CONFIG_STX_GP3=y
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--CONFIG_HIGHMEM=y
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--CONFIG_BINFMT_MISC=m
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# 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 is not set
--CONFIG_IP_PNP_BOOTP=y
--# CONFIG_IP_PNP_RARP is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IP_VS is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_NETFILTER_ADVANCED=y
--
--#
--# Core Netfilter Configuration
--#
--# CONFIG_NETFILTER_NETLINK_QUEUE is not set
--# CONFIG_NETFILTER_NETLINK_LOG is not set
--# CONFIG_NF_CONNTRACK is not set
--CONFIG_NETFILTER_XTABLES=m
--# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
--# CONFIG_NETFILTER_XT_TARGET_MARK is not set
--# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
--# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
--# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
--# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
--# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
--# CONFIG_NETFILTER_XT_MATCH_ESP is not set
--# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
--# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
--# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
--# CONFIG_NETFILTER_XT_MATCH_MAC is not set
--# CONFIG_NETFILTER_XT_MATCH_MARK is not set
--# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
--# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
--# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
--# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
--# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
--# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
--# CONFIG_NETFILTER_XT_MATCH_REALM is not set
--# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
--# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
--# CONFIG_NETFILTER_XT_MATCH_STRING is not set
--# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
--
--#
--# IP: Netfilter Configuration
--#
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--# CONFIG_IP_NF_MATCH_ECN is not set
--# CONFIG_IP_NF_MATCH_AH is not set
--# CONFIG_IP_NF_MATCH_TTL is not set
--# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
--CONFIG_IP_NF_FILTER=m
--# CONFIG_IP_NF_TARGET_REJECT is not set
--# CONFIG_IP_NF_TARGET_LOG is not set
--# CONFIG_IP_NF_TARGET_ULOG is not set
--# CONFIG_IP_NF_MANGLE is not set
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--CONFIG_NET_PKTGEN=y
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_FW_LOADER is not set
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--CONFIG_PARPORT=m
--CONFIG_PARPORT_PC=m
--# CONFIG_PARPORT_PC_FIFO is not set
--# CONFIG_PARPORT_PC_SUPERIO is not set
--# CONFIG_PARPORT_GSC is not set
--# CONFIG_PARPORT_AX88796 is not set
--# CONFIG_PARPORT_1284 is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_PARIDE is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--CONFIG_BLK_DEV_NBD=m
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/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 is not set
--CONFIG_BLK_DEV_IDECD=m
--CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
--# CONFIG_BLK_DEV_IDETAPE is not set
--# CONFIG_BLK_DEV_IDEFLOPPY is not set
--# CONFIG_BLK_DEV_IDESCSI is not set
--# CONFIG_IDE_TASK_IOCTL is not set
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--
--#
--# PCI IDE chipsets support
--#
--# CONFIG_BLK_DEV_GENERIC is not set
--# CONFIG_BLK_DEV_OPTI621 is not set
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--# CONFIG_BLK_DEV_VIA82CXXX is not set
--# CONFIG_BLK_DEV_TC86C001 is not set
--# CONFIG_BLK_DEV_IDEDMA is not set
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--CONFIG_CHR_DEV_ST=m
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--CONFIG_SCSI_MULTI_LUN=y
--CONFIG_SCSI_CONSTANTS=y
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
--# CONFIG_SCSI_3W_9XXX is not set
--# CONFIG_SCSI_ACARD is not set
--# CONFIG_SCSI_AACRAID is not set
--# CONFIG_SCSI_AIC7XXX is not set
--# CONFIG_SCSI_AIC7XXX_OLD is not set
--# CONFIG_SCSI_AIC79XX is not set
--# CONFIG_SCSI_AIC94XX is not set
--# CONFIG_SCSI_DPT_I2O is not set
--# CONFIG_SCSI_ADVANSYS is not set
--# CONFIG_SCSI_ARCMSR is not set
--# CONFIG_MEGARAID_NEWGEN is not set
--# CONFIG_MEGARAID_LEGACY is not set
--# CONFIG_MEGARAID_SAS is not set
--# CONFIG_SCSI_HPTIOP is not set
--# CONFIG_SCSI_BUSLOGIC is not set
--# CONFIG_SCSI_DMX3191D is not set
--# CONFIG_SCSI_EATA is not set
--# CONFIG_SCSI_FUTURE_DOMAIN is not set
--# CONFIG_SCSI_GDTH is not set
--# CONFIG_SCSI_IPS is not set
--# CONFIG_SCSI_INITIO is not set
--# CONFIG_SCSI_INIA100 is not set
--# CONFIG_SCSI_PPA is not set
--# CONFIG_SCSI_IMM is not set
--# CONFIG_SCSI_MVSAS is not set
--# CONFIG_SCSI_STEX is not set
--# CONFIG_SCSI_SYM53C8XX_2 is not set
--# CONFIG_SCSI_QLOGIC_1280 is not set
--# CONFIG_SCSI_QLA_FC is not set
--# CONFIG_SCSI_QLA_ISCSI is not set
--# CONFIG_SCSI_LPFC is not set
--# CONFIG_SCSI_DC395x is not set
--# CONFIG_SCSI_DC390T is not set
--# CONFIG_SCSI_NSP32 is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_SCSI_SRP is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--CONFIG_MARVELL_PHY=y
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--# CONFIG_NET_POCKET is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PLIP is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NET_FC is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--CONFIG_INPUT_MOUSEDEV_PSAUX=y
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
--CONFIG_INPUT_JOYDEV=m
--CONFIG_INPUT_EVDEV=m
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--CONFIG_KEYBOARD_ATKBD=y
--# CONFIG_KEYBOARD_SUNKBD is not set
--# CONFIG_KEYBOARD_LKKBD is not set
--# CONFIG_KEYBOARD_XTKBD is not set
--# CONFIG_KEYBOARD_NEWTON is not set
--# CONFIG_KEYBOARD_STOWAWAY is not set
--CONFIG_INPUT_MOUSE=y
--CONFIG_MOUSE_PS2=y
--CONFIG_MOUSE_PS2_ALPS=y
--CONFIG_MOUSE_PS2_LOGIPS2PP=y
--CONFIG_MOUSE_PS2_SYNAPTICS=y
--CONFIG_MOUSE_PS2_LIFEBOOK=y
--CONFIG_MOUSE_PS2_TRACKPOINT=y
--# CONFIG_MOUSE_PS2_TOUCHKIT is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_SERPORT=y
--# CONFIG_SERIO_PARKBD is not set
--# CONFIG_SERIO_PCIPS2 is not set
--CONFIG_SERIO_LIBPS2=y
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--# CONFIG_SERIAL_CPM_SCC1 is not set
--CONFIG_SERIAL_CPM_SCC2=y
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--CONFIG_PRINTER=m
--# CONFIG_LP_CONSOLE is not set
--# CONFIG_PPDEV is not set
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=m
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=m
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=m
--
--#
--# I2C Algorithms
--#
--CONFIG_I2C_ALGOBIT=m
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--# CONFIG_I2C_MPC is not set
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--CONFIG_AGP=m
--CONFIG_DRM=m
--# CONFIG_DRM_TDFX is not set
--# CONFIG_DRM_R128 is not set
--# CONFIG_DRM_RADEON is not set
--# CONFIG_DRM_MGA is not set
--# CONFIG_DRM_SIS is not set
--# CONFIG_DRM_VIA is not set
--# CONFIG_DRM_SAVAGE is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=m
--
--#
--# Advanced Linux Sound Architecture
--#
--# CONFIG_SND is not set
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--# CONFIG_AUXDISPLAY is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_AUTOFS_FS=m
--CONFIG_AUTOFS4_FS=y
--# CONFIG_FUSE_FS is not set
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--# CONFIG_JOLIET is not set
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=m
--CONFIG_UDF_NLS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=m
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=m
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--# CONFIG_PROC_KCORE is not set
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS=m
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--CONFIG_SMB_FS=m
--# CONFIG_SMB_NLS_DEFAULT is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
--# 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
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=y
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_HIGHMEM is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_KGDB_CONSOLE is not set
--CONFIG_BDI_SWITCH=y
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/taishan_defconfig
-+++ /dev/null
-@@ -1,815 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:40:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=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_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--CONFIG_TAISHAN=y
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--# CONFIG_WARP is not set
--CONFIG_440GX=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE=""
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--# CONFIG_MTD is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--CONFIG_MACINTOSH_DRIVERS=y
--# CONFIG_MAC_EMUMOUSEBTN is not set
--# CONFIG_WINDFARM is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--CONFIG_IBM_NEW_EMAC_RGMII=y
--CONFIG_IBM_NEW_EMAC_TAH=y
--CONFIG_IBM_NEW_EMAC_EMAC4=y
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--# CONFIG_SERIAL_8250_PCI is not set
--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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--CONFIG_DEBUGGER=y
--# CONFIG_KGDB is not set
--# CONFIG_XMON is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/tqm8540_defconfig
-+++ /dev/null
-@@ -1,1097 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--CONFIG_TQM8540=y
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_CPM2 is not set
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/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 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
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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=y
--# 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/tqm8541_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--CONFIG_TQM8541=y
--# CONFIG_TQM8555 is not set
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/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 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
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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=y
--# 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/tqm8555_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:44 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--CONFIG_TQM8555=y
--# CONFIG_TQM8560 is not set
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/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 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
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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=y
--# 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/tqm8560_defconfig
-+++ /dev/null
-@@ -1,1109 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc6
--# Mon Mar 24 08:48:45 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--CONFIG_PPC_85xx=y
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_E500=y
--CONFIG_BOOKE=y
--CONFIG_FSL_BOOKE=y
--CONFIG_FSL_EMB_PERFMON=y
--# CONFIG_PHYS_64BIT is not set
--CONFIG_SPE=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--CONFIG_DEFAULT_UIMAGE=y
--# CONFIG_PPC_DCR_NATIVE is not set
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--# CONFIG_KALLSYMS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--# CONFIG_EPOLL is not set
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--# CONFIG_MODULES is not set
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--CONFIG_MPC85xx=y
--# CONFIG_MPC8540_ADS is not set
--# CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_DS is not set
--# CONFIG_STX_GP3 is not set
--# CONFIG_TQM8540 is not set
--# CONFIG_TQM8541 is not set
--# CONFIG_TQM8555 is not set
--CONFIG_TQM8560=y
--# CONFIG_SBC8548 is not set
--# CONFIG_SBC8560 is not set
--CONFIG_TQM85xx=y
--# CONFIG_IPIC is not set
--CONFIG_MPIC=y
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--CONFIG_CPM2=y
--CONFIG_PPC_CPM_NEW_BINDING=y
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_CPM=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--CONFIG_MATH_EMULATION=y
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--# CONFIG_PROC_DEVICETREE is not set
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_FSL_SOC=y
--CONFIG_FSL_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--CONFIG_PCI_LEGACY=y
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_BOOT_LOAD=0x00800000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# CONFIG_NET_KEY is not set
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--# 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 is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--# 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_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_OF_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PHYSMAP_OF is not set
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=y
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=32768
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--CONFIG_IDE=y
--CONFIG_IDE_MAX_HWIFS=4
--CONFIG_BLK_DEV_IDE=y
--
--#
--# Please see Documentation/ide/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 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
--CONFIG_IDE_PROC_FS=y
--
--#
--# IDE chipset support/bugfixes
--#
--CONFIG_IDE_GENERIC=y
--# CONFIG_BLK_DEV_PLATFORM is not set
--CONFIG_BLK_DEV_IDEDMA_SFF=y
--
--#
--# PCI IDE chipsets support
--#
--CONFIG_BLK_DEV_IDEPCI=y
--CONFIG_IDEPCI_PCIBUS_ORDER=y
--# CONFIG_BLK_DEV_OFFBOARD is not set
--CONFIG_BLK_DEV_GENERIC=y
--# CONFIG_BLK_DEV_OPTI621 is not set
--CONFIG_BLK_DEV_IDEDMA_PCI=y
--# CONFIG_BLK_DEV_AEC62XX is not set
--# CONFIG_BLK_DEV_ALI15X3 is not set
--# CONFIG_BLK_DEV_AMD74XX is not set
--# CONFIG_BLK_DEV_CMD64X is not set
--# CONFIG_BLK_DEV_TRIFLEX is not set
--# CONFIG_BLK_DEV_CY82C693 is not set
--# CONFIG_BLK_DEV_CS5520 is not set
--# CONFIG_BLK_DEV_CS5530 is not set
--# CONFIG_BLK_DEV_HPT34X is not set
--# CONFIG_BLK_DEV_HPT366 is not set
--# CONFIG_BLK_DEV_JMICRON is not set
--# CONFIG_BLK_DEV_SC1200 is not set
--# CONFIG_BLK_DEV_PIIX is not set
--# CONFIG_BLK_DEV_IT8213 is not set
--# CONFIG_BLK_DEV_IT821X is not set
--# CONFIG_BLK_DEV_NS87415 is not set
--# CONFIG_BLK_DEV_PDC202XX_OLD is not set
--# CONFIG_BLK_DEV_PDC202XX_NEW is not set
--# CONFIG_BLK_DEV_SVWKS is not set
--# CONFIG_BLK_DEV_SIIMAGE is not set
--# CONFIG_BLK_DEV_SL82C105 is not set
--# CONFIG_BLK_DEV_SLC90E66 is not set
--# CONFIG_BLK_DEV_TRM290 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
--# CONFIG_BLK_DEV_TC86C001 is not set
--CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_IDE_ARCH_OBSOLETE_INIT=y
--# CONFIG_BLK_DEV_HD is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--CONFIG_PHYLIB=y
--
--#
--# MII PHY device drivers
--#
--# CONFIG_MARVELL_PHY is not set
--# CONFIG_DAVICOM_PHY is not set
--# CONFIG_QSEMI_PHY is not set
--# CONFIG_LXT_PHY is not set
--# CONFIG_CICADA_PHY is not set
--# CONFIG_VITESSE_PHY is not set
--# CONFIG_SMSC_PHY is not set
--# CONFIG_BROADCOM_PHY is not set
--# CONFIG_ICPLUS_PHY is not set
--# CONFIG_REALTEK_PHY is not set
--# CONFIG_FIXED_PHY is not set
--# CONFIG_MDIO_BITBANG is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_PCNET32 is not set
--# CONFIG_AMD8111_ETH is not set
--# CONFIG_ADAPTEC_STARFIRE is not set
--# CONFIG_B44 is not set
--# CONFIG_FORCEDETH is not set
--# CONFIG_EEPRO100 is not set
--CONFIG_E100=y
--# CONFIG_FEALNX is not set
--# CONFIG_NATSEMI is not set
--# CONFIG_NE2K_PCI is not set
--# CONFIG_8139CP is not set
--# CONFIG_8139TOO is not set
--# CONFIG_R6040 is not set
--# CONFIG_SIS900 is not set
--# CONFIG_EPIC100 is not set
--# CONFIG_SUNDANCE is not set
--# CONFIG_TLAN is not set
--# CONFIG_VIA_RHINE is not set
--# CONFIG_SC92031 is not set
--# CONFIG_FS_ENET is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--CONFIG_GIANFAR=y
--CONFIG_GFAR_NAPI=y
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--# CONFIG_INPUT_MOUSEDEV is not set
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_EVDEV is not set
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--# CONFIG_INPUT_KEYBOARD is not set
--# CONFIG_INPUT_MOUSE is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--# CONFIG_INPUT_TOUCHSCREEN is not set
--# CONFIG_INPUT_MISC is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_NR_UARTS=4
--CONFIG_SERIAL_8250_RUNTIME_UARTS=4
--# CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_SHARE_IRQ=y
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_SERIAL_CPM=y
--CONFIG_SERIAL_CPM_CONSOLE=y
--CONFIG_SERIAL_CPM_SCC1=y
--# CONFIG_SERIAL_CPM_SCC2 is not set
--# CONFIG_SERIAL_CPM_SCC3 is not set
--# CONFIG_SERIAL_CPM_SCC4 is not set
--# CONFIG_SERIAL_CPM_SMC1 is not set
--# CONFIG_SERIAL_CPM_SMC2 is not set
--# CONFIG_SERIAL_JSM is not set
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--CONFIG_GEN_RTC=y
--# CONFIG_GEN_RTC_X is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_ALI1535 is not set
--# CONFIG_I2C_ALI1563 is not set
--# CONFIG_I2C_ALI15X3 is not set
--# CONFIG_I2C_AMD756 is not set
--# CONFIG_I2C_AMD8111 is not set
--# CONFIG_I2C_I801 is not set
--# CONFIG_I2C_I810 is not set
--# CONFIG_I2C_PIIX4 is not set
--CONFIG_I2C_MPC=y
--# CONFIG_I2C_NFORCE2 is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_PROSAVAGE is not set
--# CONFIG_I2C_SAVAGE4 is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_SIS5595 is not set
--# CONFIG_I2C_SIS630 is not set
--# CONFIG_I2C_SIS96X is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_VIA is not set
--# CONFIG_I2C_VIAPRO is not set
--# CONFIG_I2C_VOODOO3 is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ADT7473 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_I5K_AMB is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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=y
--# 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SIS5595 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VIA686A is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_VT8231 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--CONFIG_HWMON_DEBUG_CHIP=y
--# CONFIG_THERMAL is not set
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--# CONFIG_DMADEVICES is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR 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_EXT4DEV_FS is not set
--CONFIG_JBD=y
--CONFIG_FS_MBCACHE=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--# CONFIG_NFS_V3 is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--CONFIG_PARTITION_ADVANCED=y
--# CONFIG_ACORN_PARTITION is not set
--# CONFIG_OSF_PARTITION is not set
--# CONFIG_AMIGA_PARTITION is not set
--# CONFIG_ATARI_PARTITION is not set
--# CONFIG_MAC_PARTITION is not set
--# CONFIG_MSDOS_PARTITION is not set
--# CONFIG_LDM_PARTITION is not set
--# CONFIG_SGI_PARTITION is not set
--# CONFIG_ULTRIX_PARTITION is not set
--# CONFIG_SUN_PARTITION is not set
--# CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
--# CONFIG_SYSV68_PARTITION is not set
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--# CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--# CONFIG_DEBUG_KERNEL is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_KGDB_CONSOLE is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
--CONFIG_PPC_LIB_RHEAP=y
---- a/arch/powerpc/configs/walnut_defconfig
-+++ /dev/null
-@@ -1,887 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:54:12 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--CONFIG_40x=y
--# CONFIG_44x is not set
--# CONFIG_E200 is not set
--CONFIG_4xx=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--CONFIG_LOCALVERSION_AUTO=y
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--CONFIG_POSIX_MQUEUE=y
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLAB is not set
--CONFIG_SLUB=y
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--CONFIG_LBD=y
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--# CONFIG_PPC4xx_PCI_EXPRESS is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_EP405 is not set
--# CONFIG_KILAUEA is not set
--# CONFIG_MAKALU is not set
--CONFIG_WALNUT=y
--# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
--CONFIG_405GP=y
--CONFIG_IBM405_ERR77=y
--CONFIG_IBM405_ERR51=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--CONFIG_OF_RTC=y
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--CONFIG_HZ_250=y
--# CONFIG_HZ_300 is not set
--# CONFIG_HZ_1000 is not set
--CONFIG_HZ=250
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--# CONFIG_CMDLINE_BOOL is not set
--# CONFIG_PM is not set
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--CONFIG_PPC_INDIRECT_PCI=y
--CONFIG_PCI=y
--CONFIG_PCI_DOMAINS=y
--CONFIG_PCI_SYSCALL=y
--# CONFIG_PCIEPORTBUS is not set
--CONFIG_ARCH_SUPPORTS_MSI=y
--# CONFIG_PCI_MSI is not set
--# CONFIG_PCI_LEGACY is not set
--# CONFIG_PCI_DEBUG is not set
--# CONFIG_PCCARD is not set
--# CONFIG_HOTPLUG_PCI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x00400000
--
--#
--# 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 is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--# CONFIG_NETFILTER is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=y
--CONFIG_PROC_EVENTS=y
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=m
--CONFIG_MTD_BLOCK=m
--# CONFIG_MTD_BLOCK_RO is not set
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--CONFIG_MTD_JEDECPROBE=y
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# CONFIG_MTD_INTEL_VR_NOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM 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
--# CONFIG_MTD_NAND is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_CPQ_DA is not set
--# CONFIG_BLK_CPQ_CISS_DA is not set
--# CONFIG_BLK_DEV_DAC960 is not set
--# CONFIG_BLK_DEV_UMEM is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_SX8 is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=35000
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_PHANTOM is not set
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_SGI_IOC4 is not set
--# CONFIG_TIFM_CORE is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
--# CONFIG_SCSI_NETLINK is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_FUSION is not set
--
--#
--# IEEE 1394 (FireWire) support
--#
--# CONFIG_FIREWIRE is not set
--# CONFIG_IEEE1394 is not set
--# CONFIG_I2O is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_ARCNET is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--# CONFIG_MII is not set
--# CONFIG_HAPPYMEAL is not set
--# CONFIG_SUNGEM is not set
--# CONFIG_CASSINI is not set
--# CONFIG_NET_VENDOR_3COM is not set
--# CONFIG_NET_TULIP is not set
--# CONFIG_HP100 is not set
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_NET_PCI is not set
--# CONFIG_B44 is not set
--CONFIG_NETDEV_1000=y
--# CONFIG_ACENIC is not set
--# CONFIG_DL2K is not set
--# CONFIG_E1000 is not set
--# CONFIG_E1000E is not set
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_IP1000 is not set
--# CONFIG_IGB is not set
--# CONFIG_NS83820 is not set
--# CONFIG_HAMACHI is not set
--# CONFIG_YELLOWFIN is not set
--# CONFIG_R8169 is not set
--# CONFIG_SIS190 is not set
--# CONFIG_SKGE is not set
--# CONFIG_SKY2 is not set
--# CONFIG_SK98LIN is not set
--# CONFIG_VIA_VELOCITY is not set
--# CONFIG_TIGON3 is not set
--# CONFIG_BNX2 is not set
--# CONFIG_QLA3XXX is not set
--# CONFIG_ATL1 is not set
--CONFIG_NETDEV_10000=y
--# CONFIG_CHELSIO_T1 is not set
--# CONFIG_CHELSIO_T3 is not set
--# CONFIG_IXGBE is not set
--# CONFIG_IXGB is not set
--# CONFIG_S2IO is not set
--# CONFIG_MYRI10GE is not set
--# CONFIG_NETXEN_NIC is not set
--# CONFIG_NIU is not set
--# CONFIG_MLX4_CORE is not set
--# CONFIG_TEHUTI is not set
--# CONFIG_BNX2X is not set
--# CONFIG_TR is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--# CONFIG_WAN is not set
--# CONFIG_FDDI is not set
--# CONFIG_HIPPI is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--# CONFIG_NOZOMI is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=y
--CONFIG_SERIAL_8250_PCI=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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_JSM is not set
--CONFIG_SERIAL_OF_PLATFORM=y
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_APPLICOM is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_DEVPORT=y
--# CONFIG_I2C is not set
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--# CONFIG_HWMON is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_AGP is not set
--# CONFIG_DRM is not set
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=m
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--CONFIG_USB_ARCH_HAS_EHCI=y
--# CONFIG_USB is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--# CONFIG_USB_GADGET is not set
--# CONFIG_MMC is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_INFINIBAND is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--# CONFIG_NLS is not set
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--# CONFIG_CRC_CCITT is not set
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--# CONFIG_DEBUG_INFO is not set
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--# CONFIG_BDI_SWITCH is not set
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
--CONFIG_CRYPTO_MANAGER=y
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC 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_GF128MUL is not set
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=y
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_CRYPTO_DEV_HIFN_795X is not set
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/configs/warp_defconfig
-+++ /dev/null
-@@ -1,1110 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc2
--# Fri Feb 15 21:54:43 2008
--#
--# CONFIG_PPC64 is not set
--
--#
--# Processor support
--#
--# CONFIG_6xx is not set
--# CONFIG_PPC_85xx is not set
--# CONFIG_PPC_8xx is not set
--# CONFIG_40x is not set
--CONFIG_44x=y
--# CONFIG_E200 is not set
--CONFIG_PPC_FPU=y
--CONFIG_4xx=y
--CONFIG_BOOKE=y
--CONFIG_PTE_64BIT=y
--CONFIG_PHYS_64BIT=y
--# CONFIG_PPC_MM_SLICES is not set
--CONFIG_NOT_COHERENT_CACHE=y
--CONFIG_PPC32=y
--CONFIG_WORD_SIZE=32
--CONFIG_PPC_MERGE=y
--CONFIG_MMU=y
--CONFIG_GENERIC_CMOS_UPDATE=y
--CONFIG_GENERIC_TIME=y
--CONFIG_GENERIC_TIME_VSYSCALL=y
--CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_HARDIRQS=y
--# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
--CONFIG_IRQ_PER_CPU=y
--CONFIG_RWSEM_XCHGADD_ALGORITHM=y
--CONFIG_ARCH_HAS_ILOG2_U32=y
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
--# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
--CONFIG_PPC=y
--CONFIG_EARLY_PRINTK=y
--CONFIG_GENERIC_NVRAM=y
--CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_ARCH_MAY_HAVE_PC_FDC=y
--CONFIG_PPC_OF=y
--CONFIG_OF=y
--CONFIG_PPC_UDBG_16550=y
--# CONFIG_GENERIC_TBSYNC is not set
--CONFIG_AUDIT_ARCH=y
--CONFIG_GENERIC_BUG=y
--# CONFIG_DEFAULT_UIMAGE is not set
--CONFIG_PPC_DCR_NATIVE=y
--# CONFIG_PPC_DCR_MMIO is not set
--CONFIG_PPC_DCR=y
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION="-pika"
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--CONFIG_GROUP_SCHED=y
--CONFIG_FAIR_GROUP_SCHED=y
--# CONFIG_RT_GROUP_SCHED is not set
--CONFIG_USER_SCHED=y
--# CONFIG_CGROUP_SCHED is not set
--CONFIG_SYSFS_DEPRECATED=y
--# CONFIG_RELAY is not set
--# CONFIG_NAMESPACES is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
--CONFIG_SYSCTL=y
--CONFIG_EMBEDDED=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--# CONFIG_HOTPLUG is not set
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_COMPAT_BRK=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--CONFIG_HAVE_OPROFILE=y
--# CONFIG_KPROBES is not set
--CONFIG_HAVE_KPROBES=y
--CONFIG_PROC_PAGE_MONITOR=y
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--# CONFIG_MODULE_FORCE_UNLOAD is not set
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=y
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=y
--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"
--CONFIG_CLASSIC_RCU=y
--# CONFIG_PREEMPT_RCU is not set
--
--#
--# Platform support
--#
--# CONFIG_PPC_MPC512x is not set
--# CONFIG_PPC_MPC5121 is not set
--# CONFIG_PPC_CELL is not set
--# CONFIG_PPC_CELL_NATIVE is not set
--# CONFIG_PQ2ADS is not set
--# CONFIG_BAMBOO is not set
--# CONFIG_EBONY is not set
--# CONFIG_SEQUOIA is not set
--# CONFIG_TAISHAN is not set
--# CONFIG_KATMAI is not set
--# CONFIG_RAINIER is not set
--CONFIG_WARP=y
--CONFIG_440EP=y
--CONFIG_IBM440EP_ERR42=y
--# CONFIG_IPIC is not set
--# CONFIG_MPIC is not set
--# CONFIG_MPIC_WEIRD is not set
--# CONFIG_PPC_I8259 is not set
--# CONFIG_PPC_RTAS is not set
--# CONFIG_MMIO_NVRAM is not set
--# CONFIG_PPC_MPC106 is not set
--# CONFIG_PPC_970_NAP is not set
--# CONFIG_PPC_INDIRECT_IO is not set
--# CONFIG_GENERIC_IOMAP is not set
--# CONFIG_CPU_FREQ is not set
--# CONFIG_FSL_ULI1575 is not set
--
--#
--# Kernel options
--#
--# CONFIG_HIGHMEM is not set
--# CONFIG_TICK_ONESHOT is not set
--# CONFIG_NO_HZ is not set
--# CONFIG_HIGH_RES_TIMERS is not set
--CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
--# CONFIG_HZ_100 is not set
--# CONFIG_HZ_250 is not set
--# CONFIG_HZ_300 is not set
--CONFIG_HZ_1000=y
--CONFIG_HZ=1000
--# CONFIG_SCHED_HRTICK is not set
--CONFIG_PREEMPT_NONE=y
--# CONFIG_PREEMPT_VOLUNTARY is not set
--# CONFIG_PREEMPT is not set
--CONFIG_RCU_TRACE=y
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_MISC is not set
--# CONFIG_MATH_EMULATION is not set
--# CONFIG_IOMMU_HELPER is not set
--CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
--CONFIG_ARCH_HAS_WALK_MEMORY=y
--CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
--CONFIG_ARCH_FLATMEM_ENABLE=y
--CONFIG_ARCH_POPULATES_NODE_MAP=y
--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_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4
--CONFIG_RESOURCES_64BIT=y
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_PROC_DEVICETREE=y
--CONFIG_CMDLINE_BOOL=y
--CONFIG_CMDLINE="ip=on"
--CONFIG_SECCOMP=y
--CONFIG_ISA_DMA_API=y
--
--#
--# Bus options
--#
--CONFIG_ZONE_DMA=y
--# CONFIG_PCI is not set
--# CONFIG_PCI_DOMAINS is not set
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--
--#
--# Advanced setup
--#
--# CONFIG_ADVANCED_OPTIONS is not set
--
--#
--# Default settings for advanced configuration options are used
--#
--CONFIG_HIGHMEM_START=0xfe000000
--CONFIG_LOWMEM_SIZE=0x30000000
--CONFIG_KERNEL_START=0xc0000000
--CONFIG_TASK_SIZE=0xc0000000
--CONFIG_CONSISTENT_START=0xff100000
--CONFIG_CONSISTENT_SIZE=0x00200000
--CONFIG_BOOT_LOAD=0x01000000
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--# CONFIG_PACKET_MMAP is not set
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--# CONFIG_XFRM_MIGRATE is not set
--# CONFIG_XFRM_STATISTICS is not set
--# 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 is not set
--# CONFIG_IP_PNP_RARP is not set
--# 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_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--CONFIG_INET_XFRM_MODE_TRANSPORT=y
--CONFIG_INET_XFRM_MODE_TUNNEL=y
--CONFIG_INET_XFRM_MODE_BEET=y
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--# CONFIG_TCP_MD5SIG is not set
--# CONFIG_IP_VS is not set
--# CONFIG_IPV6 is not set
--# CONFIG_INET6_XFRM_TUNNEL is not set
--# CONFIG_INET6_TUNNEL is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_NETFILTER_ADVANCED=y
--
--#
--# Core Netfilter Configuration
--#
--# CONFIG_NETFILTER_NETLINK_QUEUE is not set
--# CONFIG_NETFILTER_NETLINK_LOG is not set
--# CONFIG_NF_CONNTRACK is not set
--# CONFIG_NETFILTER_XTABLES is not set
--
--#
--# IP: Netfilter Configuration
--#
--# CONFIG_IP_NF_QUEUE is not set
--# CONFIG_IP_NF_IPTABLES is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--# CONFIG_BRIDGE is not set
--CONFIG_VLAN_8021Q=y
--# 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--# CONFIG_NET_SCHED is not set
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_CAN is not set
--# CONFIG_IRDA is not set
--# CONFIG_BT is not set
--# CONFIG_AF_RXRPC is not set
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--# CONFIG_STANDALONE is not set
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_CMDLINE_PARTS is not set
--CONFIG_MTD_OF_PARTS=y
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--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
--# CONFIG_SSFDC is not set
--CONFIG_MTD_OOPS=m
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--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_I8 is not set
--# CONFIG_MTD_CFI_INTELEXT is not set
--CONFIG_MTD_CFI_AMDSTD=y
--# 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
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PHYSMAP is not set
--CONFIG_MTD_PHYSMAP_OF=y
--# 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_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
--CONFIG_MTD_NAND=y
--# CONFIG_MTD_NAND_VERIFY_WRITE is not set
--CONFIG_MTD_NAND_ECC_SMC=y
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_NAND_FSL_ELBC is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--CONFIG_OF_DEVICE=y
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_FD is not set
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_UB is not set
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--# CONFIG_BLK_DEV_XIP is not set
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_XILINX_SYSACE is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_ENCLOSURE_SERVICES is not set
--CONFIG_HAVE_IDE=y
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=y
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=y
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--# CONFIG_BLK_DEV_SR is not set
--# CONFIG_CHR_DEV_SG is not set
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--# CONFIG_SCSI_SCAN_ASYNC is not set
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--CONFIG_SCSI_SPI_ATTRS=y
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--# CONFIG_SCSI_LOWLEVEL is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--# CONFIG_MACINTOSH_DRIVERS is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
--# CONFIG_VETH is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--CONFIG_IBM_NEW_EMAC=y
--CONFIG_IBM_NEW_EMAC_RXB=128
--CONFIG_IBM_NEW_EMAC_TXB=64
--CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
--CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
--CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
--# CONFIG_IBM_NEW_EMAC_DEBUG is not set
--CONFIG_IBM_NEW_EMAC_ZMII=y
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_B44 is not set
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
--# CONFIG_WAN is not set
--# CONFIG_PPP is not set
--# CONFIG_SLIP is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--# CONFIG_PHONE is not set
--
--#
--# Input device support
--#
--# CONFIG_INPUT is not set
--
--#
--# Hardware I/O ports
--#
--# CONFIG_SERIO is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--# CONFIG_VT is not set
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--CONFIG_SERIAL_8250=y
--CONFIG_SERIAL_8250_CONSOLE=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=y
--# CONFIG_SERIAL_8250_DETECT_IRQ is not set
--# CONFIG_SERIAL_8250_RSA is not set
--
--#
--# Non-8250 serial port support
--#
--# CONFIG_SERIAL_UARTLITE is not set
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--# CONFIG_SERIAL_OF_PLATFORM is not set
--CONFIG_UNIX98_PTYS=y
--CONFIG_LEGACY_PTYS=y
--CONFIG_LEGACY_PTY_COUNT=256
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_HW_RANDOM=y
--# CONFIG_NVRAM is not set
--# CONFIG_GEN_RTC is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--# CONFIG_I2C_CHARDEV is not set
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_MPC is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_DS1682 is not set
--CONFIG_SENSORS_EEPROM=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_PCF8575 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 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
--
--#
--# SPI support
--#
--# CONFIG_SPI is not set
--# CONFIG_SPI_MASTER is not set
--# CONFIG_W1 is not set
--# CONFIG_POWER_SUPPLY is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S 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_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_ADS7828 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83L786NG is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_THERMAL=y
--# CONFIG_WATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--# CONFIG_DAB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--# CONFIG_FB is not set
--# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--
--#
--# Sound
--#
--# CONFIG_SOUND is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
--
--#
--# Miscellaneous USB options
--#
--# CONFIG_USB_DEVICEFS is not set
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--CONFIG_USB_OHCI_HCD_PPC_OF=y
--CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
--# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
--CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
--CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=y
--# CONFIG_USB_STORAGE_DEBUG is not set
--# CONFIG_USB_STORAGE_DATAFAB is not set
--# CONFIG_USB_STORAGE_FREECOM is not set
--# CONFIG_USB_STORAGE_ISD200 is not set
--# CONFIG_USB_STORAGE_DPCM is not set
--# CONFIG_USB_STORAGE_USBAT is not set
--# CONFIG_USB_STORAGE_SDDR09 is not set
--# CONFIG_USB_STORAGE_SDDR55 is not set
--# CONFIG_USB_STORAGE_JUMPSHOT is not set
--# CONFIG_USB_STORAGE_ALAUDA is not set
--# CONFIG_USB_STORAGE_KARMA is not set
--# CONFIG_USB_LIBUSUAL is not set
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--# CONFIG_USB_SERIAL is not set
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--# CONFIG_USB_BERRY_CHARGE is not set
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
--# CONFIG_USB_GADGET is not set
--CONFIG_MMC=m
--# CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=m
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_WBSD is not set
--# CONFIG_MEMSTICK is not set
--# CONFIG_NEW_LEDS is not set
--# CONFIG_EDAC is not set
--# CONFIG_RTC_CLASS is not set
--
--#
--# Userspace I/O
--#
--# CONFIG_UIO is not set
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--# CONFIG_EXT3_FS is not set
--# CONFIG_EXT4DEV_FS is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--CONFIG_DNOTIFY=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--# 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_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_KCORE=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--# CONFIG_TMPFS is not set
--# CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_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_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--# CONFIG_JFFS2_SUMMARY is not set
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# CONFIG_VXFS_FS is not set
--# CONFIG_MINIX_FS is not set
--# CONFIG_HPFS_FS is not set
--# CONFIG_QNX4FS_FS is not set
--# CONFIG_ROMFS_FS is not set
--# CONFIG_SYSV_FS is not set
--# CONFIG_UFS_FS is not set
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--# CONFIG_NFS_V4 is not set
--# CONFIG_NFS_DIRECTIO is not set
--# CONFIG_NFSD is not set
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--# CONFIG_SUNRPC_BIND34 is not set
--# CONFIG_RPCSEC_GSS_KRB5 is not set
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--# CONFIG_CIFS is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--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=y
--# 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=y
--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
--# 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=y
--# CONFIG_NLS_KOI8_R is not set
--# CONFIG_NLS_KOI8_U is not set
--CONFIG_NLS_UTF8=y
--# CONFIG_DLM is not set
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=y
--# CONFIG_CRC16 is not set
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--# CONFIG_LIBCRC32C is not set
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_SCHED_DEBUG is not set
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_DEBUG_SLAB is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--# CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_STACKOVERFLOW is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_PAGEALLOC is not set
--# CONFIG_DEBUGGER is not set
--# CONFIG_VIRQ_DEBUG is not set
--CONFIG_BDI_SWITCH=y
--# CONFIG_PPC_EARLY_DEBUG is not set
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--# CONFIG_CRYPTO_SEQIV is not set
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
--# CONFIG_CRYPTO_NULL is not set
--# CONFIG_CRYPTO_MD4 is not set
--# CONFIG_CRYPTO_MD5 is not set
--# 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_GF128MUL is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_CBC is not set
--# CONFIG_CRYPTO_PCBC is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# 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_SEED is not set
--# CONFIG_CRYPTO_SALSA20 is not set
--# CONFIG_CRYPTO_DEFLATE is not set
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
--# CONFIG_CRYPTO_CRC32C is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_TEST is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_LZO is not set
--CONFIG_CRYPTO_HW=y
--# CONFIG_PPC_CLOCK is not set
---- a/arch/powerpc/kernel/Makefile
-+++ b/arch/powerpc/kernel/Makefile
-@@ -67,6 +67,7 @@ obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
- obj-$(CONFIG_SMP)		+= smp.o
- obj-$(CONFIG_KPROBES)		+= kprobes.o
- obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o
-+obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
- 
- pci64-$(CONFIG_PPC64)		+= pci_dn.o isa-bridge.o
- obj-$(CONFIG_PCI)		+= pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -26,8 +26,6 @@
- #ifdef CONFIG_PPC64
- #include <linux/time.h>
- #include <linux/hardirq.h>
--#else
--#include <linux/ptrace.h>
- #endif
- 
- #include <asm/io.h>
-@@ -46,6 +44,9 @@
- #include <asm/mmu.h>
- #include <asm/hvcall.h>
- #endif
-+#ifdef CONFIG_PPC_ISERIES
-+#include <asm/iseries/alpaca.h>
-+#endif
- 
- #define DEFINE(sym, val) \
- 	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-@@ -60,7 +61,6 @@ int main(void)
- 	DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
- #else
- 	DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
--	DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
- #endif /* CONFIG_PPC64 */
- 
- 	DEFINE(KSP, offsetof(struct thread_struct, ksp));
-@@ -80,7 +80,6 @@ int main(void)
- 	DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
- 	DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
--	DEFINE(PT_PTRACED, PT_PTRACED);
- #endif
- #ifdef CONFIG_SPE
- 	DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
-@@ -325,6 +324,9 @@ int main(void)
- 	DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
- 	DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
- 	DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
-+
-+	/* alpaca */
-+	DEFINE(ALPACA_SIZE, sizeof(struct alpaca));
- #endif
- 
- 	DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
---- a/arch/powerpc/kernel/btext.c
-+++ b/arch/powerpc/kernel/btext.c
-@@ -7,6 +7,7 @@
- #include <linux/string.h>
- #include <linux/init.h>
- #include <linux/module.h>
-+#include <linux/lmb.h>
- 
- #include <asm/sections.h>
- #include <asm/prom.h>
-@@ -15,7 +16,7 @@
- #include <asm/mmu.h>
- #include <asm/pgtable.h>
- #include <asm/io.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/processor.h>
- #include <asm/udbg.h>
- 
---- a/arch/powerpc/kernel/cpu_setup_44x.S
-+++ b/arch/powerpc/kernel/cpu_setup_44x.S
-@@ -3,7 +3,7 @@
-  * Valentine Barshak <vbarshak@ru.mvista.com>
-  * MontaVista Software, Inc (c) 2007
-  *
-- * Based on cpu_setup_6xx code by 
-+ * Based on cpu_setup_6xx code by
-  * Benjamin Herrenschmidt <benh@kernel.crashing.org>
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)
- 	bl	__fixup_440A_mcheck
- 	mtlr	r4
- 	blr
-+_GLOBAL(__setup_cpu_460ex)
-+_GLOBAL(__setup_cpu_460gt)
-+	b	__init_fpu_44x
- _GLOBAL(__setup_cpu_440gx)
- _GLOBAL(__setup_cpu_440spe)
- 	b	__fixup_440A_mcheck
---- a/arch/powerpc/kernel/cputable.c
-+++ b/arch/powerpc/kernel/cputable.c
-@@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned 
- extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
-+extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
-+extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
- extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
-@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_sp
- 		.machine_check		= machine_check_440A,
- 		.platform		= "ppc440",
- 	},
-+	{ /* 460EX */
-+		.pvr_mask		= 0xffff0002,
-+		.pvr_value		= 0x13020002,
-+		.cpu_name		= "460EX",
-+		.cpu_features		= CPU_FTRS_44X,
-+		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
-+		.icache_bsize		= 32,
-+		.dcache_bsize		= 32,
-+		.cpu_setup		= __setup_cpu_460ex,
-+		.machine_check		= machine_check_440A,
-+		.platform		= "ppc440",
-+	},
-+	{ /* 460GT */
-+		.pvr_mask		= 0xffff0002,
-+		.pvr_value		= 0x13020000,
-+		.cpu_name		= "460GT",
-+		.cpu_features		= CPU_FTRS_44X,
-+		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
-+		.icache_bsize		= 32,
-+		.dcache_bsize		= 32,
-+		.cpu_setup		= __setup_cpu_460gt,
-+		.machine_check		= machine_check_440A,
-+		.platform		= "ppc440",
-+	},
- #endif /* CONFIG_44x */
- #ifdef CONFIG_FSL_BOOKE
- #ifdef CONFIG_E200
-@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(un
- 				*t = *s;
- 			*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
- #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
--			/* ppc64 and booke expect identify_cpu to also call 
-+			/* ppc64 and booke expect identify_cpu to also call
- 			 * setup_cpu for that processor. I will consolidate
- 			 * that at a later time, for now, just use #ifdef.
- 			 * we also don't need to PTRRELOC the function pointer
---- a/arch/powerpc/kernel/crash.c
-+++ b/arch/powerpc/kernel/crash.c
-@@ -24,12 +24,13 @@
- #include <linux/init.h>
- #include <linux/irq.h>
- #include <linux/types.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/machdep.h>
- #include <asm/kexec.h>
- #include <asm/kdump.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/firmware.h>
- #include <asm/smp.h>
- #include <asm/system.h>
---- a/arch/powerpc/kernel/crash_dump.c
-+++ b/arch/powerpc/kernel/crash_dump.c
-@@ -13,8 +13,9 @@
- 
- #include <linux/crash_dump.h>
- #include <linux/bootmem.h>
-+#include <linux/lmb.h>
- #include <asm/kdump.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/firmware.h>
- #include <asm/uaccess.h>
- 
---- a/arch/powerpc/kernel/entry_32.S
-+++ b/arch/powerpc/kernel/entry_32.S
-@@ -110,9 +110,9 @@ transfer_to_handler:
- 	stw	r11,PT_REGS(r12)
- #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
- 	/* Check to see if the dbcr0 register is set up to debug.  Use the
--	   single-step bit to do this. */
-+	   internal debug mode bit to do this. */
- 	lwz	r12,THREAD_DBCR0(r12)
--	andis.	r12,r12,DBCR0_IC@h
-+	andis.	r12,r12,DBCR0_IDM@h
- 	beq+	3f
- 	/* From user and task is ptraced - load up global dbcr0 */
- 	li	r12,-1			/* clear all pending debug events */
-@@ -120,6 +120,12 @@ transfer_to_handler:
- 	lis	r11,global_dbcr0@ha
- 	tophys(r11,r11)
- 	addi	r11,r11,global_dbcr0@l
-+#ifdef CONFIG_SMP
-+	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)
-+	lwz	r9,TI_CPU(r9)
-+	slwi	r9,r9,3
-+	add	r11,r11,r9
-+#endif
- 	lwz	r12,0(r11)
- 	mtspr	SPRN_DBCR0,r12
- 	lwz	r12,4(r11)
-@@ -238,10 +244,10 @@ ret_from_syscall:
- 	stw	r11,_CCR(r1)
- syscall_exit_cont:
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
--	/* If the process has its own DBCR0 value, load it up.  The single
--	   step bit tells us that dbcr0 should be loaded. */
-+	/* If the process has its own DBCR0 value, load it up.  The internal
-+	   debug mode bit tells us that dbcr0 should be loaded. */
- 	lwz	r0,THREAD+THREAD_DBCR0(r2)
--	andis.	r10,r0,DBCR0_IC@h
-+	andis.	r10,r0,DBCR0_IDM@h
- 	bnel-	load_dbcr0
- #endif
- #ifdef CONFIG_44x
-@@ -666,10 +672,10 @@ user_exc_return:		/* r10 contains MSR_KE
- 
- restore_user:
- #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
--	/* Check whether this process has its own DBCR0 value.  The single
--	   step bit tells us that dbcr0 should be loaded. */
-+	/* Check whether this process has its own DBCR0 value.  The internal
-+	   debug mode bit tells us that dbcr0 should be loaded. */
- 	lwz	r0,THREAD+THREAD_DBCR0(r2)
--	andis.	r10,r0,DBCR0_IC@h
-+	andis.	r10,r0,DBCR0_IDM@h
- 	bnel-	load_dbcr0
- #endif
- 
-@@ -879,6 +885,12 @@ load_dbcr0:
- 	mfspr	r10,SPRN_DBCR0
- 	lis	r11,global_dbcr0@ha
- 	addi	r11,r11,global_dbcr0@l
-+#ifdef CONFIG_SMP
-+	rlwinm	r9,r1,0,0,(31-THREAD_SHIFT)
-+	lwz	r9,TI_CPU(r9)
-+	slwi	r9,r9,3
-+	add	r11,r11,r9
-+#endif
- 	stw	r10,0(r11)
- 	mtspr	SPRN_DBCR0,r0
- 	lwz	r10,4(r11)
-@@ -891,7 +903,7 @@ load_dbcr0:
- 	.section .bss
- 	.align	4
- global_dbcr0:
--	.space	8
-+	.space	8*NR_CPUS
- 	.previous
- #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
- 
---- a/arch/powerpc/kernel/entry_64.S
-+++ b/arch/powerpc/kernel/entry_64.S
-@@ -29,6 +29,8 @@
- #include <asm/cputable.h>
- #include <asm/firmware.h>
- #include <asm/bug.h>
-+#include <asm/ptrace.h>
-+#include <asm/irqflags.h>
- 
- /*
-  * System calls.
-@@ -39,7 +41,7 @@
- 
- /* This value is used to mark exception frames on the stack. */
- exception_marker:
--	.tc	ID_72656773_68657265[TC],0x7265677368657265
-+	.tc	ID_EXC_MARKER[TC],STACK_FRAME_REGS_MARKER
- 
- 	.section	".text"
- 	.align 7
-@@ -88,6 +90,14 @@ system_call_common:
- 	addi	r9,r1,STACK_FRAME_OVERHEAD
- 	ld	r11,exception_marker@toc(r2)
- 	std	r11,-16(r9)		/* "regshere" marker */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_on
-+	REST_GPR(0,r1)
-+	REST_4GPRS(3,r1)
-+	REST_2GPRS(7,r1)
-+	addi	r9,r1,STACK_FRAME_OVERHEAD
-+	ld	r12,_MSR(r1)
-+#endif /* CONFIG_TRACE_IRQFLAGS */
- 	li	r10,1
- 	stb	r10,PACASOFTIRQEN(r13)
- 	stb	r10,PACAHARDIRQEN(r13)
-@@ -102,7 +112,7 @@ BEGIN_FW_FTR_SECTION
- 	b	hardware_interrupt_entry
- 2:
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--#endif
-+#endif /* CONFIG_PPC_ISERIES */
- 	mfmsr	r11
- 	ori	r11,r11,MSR_EE
- 	mtmsrd	r11,1
-@@ -504,6 +514,10 @@ BEGIN_FW_FTR_SECTION
- 
- 	li	r3,0
- 	stb	r3,PACASOFTIRQEN(r13)	/* ensure we are soft-disabled */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_off
-+	mfmsr	r10
-+#endif
- 	ori	r10,r10,MSR_EE
- 	mtmsrd	r10			/* hard-enable again */
- 	addi	r3,r1,STACK_FRAME_OVERHEAD
-@@ -512,7 +526,7 @@ BEGIN_FW_FTR_SECTION
- 4:
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
- #endif
--	stb	r5,PACASOFTIRQEN(r13)
-+	TRACE_AND_RESTORE_IRQ(r5);
- 
- 	/* extract EE bit and use it to restore paca->hard_enabled */
- 	ld	r3,_MSR(r1)
-@@ -580,6 +594,16 @@ do_work:
- 	bne	restore
- 	/* here we are preempting the current task */
- 1:
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	bl	.trace_hardirqs_on
-+	/* Note: we just clobbered r10 which used to contain the previous
-+	 * MSR before the hard-disabling done by the caller of do_work.
-+	 * We don't have that value anymore, but it doesn't matter as
-+	 * we will hard-enable unconditionally, we can just reload the
-+	 * current MSR into r10
-+	 */
-+	mfmsr	r10
-+#endif /* CONFIG_TRACE_IRQFLAGS */
- 	li	r0,1
- 	stb	r0,PACASOFTIRQEN(r13)
- 	stb	r0,PACAHARDIRQEN(r13)
---- a/arch/powerpc/kernel/head_32.S
-+++ b/arch/powerpc/kernel/head_32.S
-@@ -30,6 +30,7 @@
- #include <asm/thread_info.h>
- #include <asm/ppc_asm.h>
- #include <asm/asm-offsets.h>
-+#include <asm/ptrace.h>
- 
- /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
- #define LOAD_BAT(n, reg, RA, RB)	\
-@@ -268,8 +269,8 @@ __secondary_hold_acknowledge:
- 	li	r10,MSR_KERNEL & ~(MSR_IR|MSR_DR); /* can take exceptions */ \
- 	MTMSRD(r10);			/* (except for mach check in rtas) */ \
- 	stw	r0,GPR0(r11);	\
--	lis	r10,0x7265;		/* put exception frame marker */ \
--	addi	r10,r10,0x6773;	\
-+	lis	r10,STACK_FRAME_REGS_MARKER@ha; /* exception frame marker */ \
-+	addi	r10,r10,STACK_FRAME_REGS_MARKER@l; \
- 	stw	r10,8(r11);	\
- 	SAVE_4GPRS(3, r11);	\
- 	SAVE_2GPRS(7, r11)
-@@ -763,23 +764,6 @@ load_up_altivec:
- 	b	fast_exception_return
- 
- /*
-- * AltiVec unavailable trap from kernel - print a message, but let
-- * the task use AltiVec in the kernel until it returns to user mode.
-- */
--KernelAltiVec:
--	lwz	r3,_MSR(r1)
--	oris	r3,r3,MSR_VEC@h
--	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
--	lis	r3,87f@h
--	ori	r3,r3,87f@l
--	mr	r4,r2		/* current */
--	lwz	r5,_NIP(r1)
--	bl	printk
--	b	ret_from_except
--87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
--	.align	4,0
--
--/*
-  * giveup_altivec(tsk)
-  * Disable AltiVec for the task given as the argument,
-  * and save the AltiVec registers in its thread_struct.
---- a/arch/powerpc/kernel/head_44x.S
-+++ b/arch/powerpc/kernel/head_44x.S
-@@ -211,7 +211,7 @@ skpinv:	addi	r4,r4,1				/* Increment */
- 	SET_IVOR(12, WatchdogTimer);
- 	SET_IVOR(13, DataTLBError);
- 	SET_IVOR(14, InstructionTLBError);
--	SET_IVOR(15, Debug);
-+	SET_IVOR(15, DebugCrit);
- 
- 	/* Establish the interrupt vector base */
- 	lis	r4,interrupt_base@h	/* IVPR only uses the high 16-bits */
-@@ -578,7 +578,7 @@ interrupt_base:
- 	b	InstructionStorage
- 
- 	/* Debug Interrupt */
--	DEBUG_EXCEPTION
-+	DEBUG_CRIT_EXCEPTION
- 
- /*
-  * Local functions
---- a/arch/powerpc/kernel/head_64.S
-+++ b/arch/powerpc/kernel/head_64.S
-@@ -36,8 +36,7 @@
- #include <asm/firmware.h>
- #include <asm/page_64.h>
- #include <asm/exception.h>
--
--#define DO_SOFT_DISABLE
-+#include <asm/irqflags.h>
- 
- /*
-  * We layout physical memory as follows:
-@@ -450,8 +449,8 @@ bad_stack:
-  */
- fast_exc_return_irq:			/* restores irq state too */
- 	ld	r3,SOFTE(r1)
-+	TRACE_AND_RESTORE_IRQ(r3);
- 	ld	r12,_MSR(r1)
--	stb	r3,PACASOFTIRQEN(r13)	/* restore paca->soft_enabled */
- 	rldicl	r4,r12,49,63		/* get MSR_EE to LSB */
- 	stb	r4,PACAHARDIRQEN(r13)	/* restore paca->hard_enabled */
- 	b	1f
-@@ -621,7 +620,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
- 	mtlr	r10
- 
- 	andi.	r10,r12,MSR_RI	/* check for unrecoverable exception */
--	beq-	unrecov_slb
-+	beq-	2f
- 
- .machine	push
- .machine	"power4"
-@@ -643,6 +642,22 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISER
- 	rfid
- 	b	.	/* prevent speculative execution */
- 
-+2:
-+#ifdef CONFIG_PPC_ISERIES
-+BEGIN_FW_FTR_SECTION
-+	b	unrecov_slb
-+END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-+#endif /* CONFIG_PPC_ISERIES */
-+	mfspr	r11,SPRN_SRR0
-+	clrrdi	r10,r13,32
-+	LOAD_HANDLER(r10,unrecov_slb)
-+	mtspr	SPRN_SRR0,r10
-+	mfmsr	r10
-+	ori	r10,r10,MSR_IR|MSR_DR|MSR_RI
-+	mtspr	SPRN_SRR1,r10
-+	rfid
-+	b	.
-+
- unrecov_slb:
- 	EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
- 	DISABLE_INTS
-@@ -808,7 +823,7 @@ _STATIC(load_up_altivec)
-  * Hash table stuff
-  */
- 	.align	7
--_GLOBAL(do_hash_page)
-+_STATIC(do_hash_page)
- 	std	r3,_DAR(r1)
- 	std	r4,_DSISR(r1)
- 
-@@ -820,6 +835,27 @@ BEGIN_FTR_SECTION
- END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 
- 	/*
-+	 * On iSeries, we soft-disable interrupts here, then
-+	 * hard-enable interrupts so that the hash_page code can spin on
-+	 * the hash_table_lock without problems on a shared processor.
-+	 */
-+	DISABLE_INTS
-+
-+	/*
-+	 * Currently, trace_hardirqs_off() will be called by DISABLE_INTS
-+	 * and will clobber volatile registers when irq tracing is enabled
-+	 * so we need to reload them. It may be possible to be smarter here
-+	 * and move the irq tracing elsewhere but let's keep it simple for
-+	 * now
-+	 */
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+	ld	r3,_DAR(r1)
-+	ld	r4,_DSISR(r1)
-+	ld	r5,_TRAP(r1)
-+	ld	r12,_MSR(r1)
-+	clrrdi	r5,r5,4
-+#endif /* CONFIG_TRACE_IRQFLAGS */
-+	/*
- 	 * We need to set the _PAGE_USER bit if MSR_PR is set or if we are
- 	 * accessing a userspace segment (even from the kernel). We assume
- 	 * kernel addresses always have the high bit set.
-@@ -832,13 +868,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 	rlwimi	r4,r5,22+2,31-2,31-2	/* Set _PAGE_EXEC if trap is 0x400 */
- 
- 	/*
--	 * On iSeries, we soft-disable interrupts here, then
--	 * hard-enable interrupts so that the hash_page code can spin on
--	 * the hash_table_lock without problems on a shared processor.
--	 */
--	DISABLE_INTS
--
--	/*
- 	 * r3 contains the faulting address
- 	 * r4 contains the required access permissions
- 	 * r5 contains the trap number
-@@ -848,7 +877,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
- 	bl	.hash_page		/* build HPTE if possible */
- 	cmpdi	r3,0			/* see if hash_page succeeded */
- 
--#ifdef DO_SOFT_DISABLE
- BEGIN_FW_FTR_SECTION
- 	/*
- 	 * If we had interrupts soft-enabled at the point where the
-@@ -860,7 +888,7 @@ BEGIN_FW_FTR_SECTION
- 	 */
- 	beq	13f
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--#endif
-+
- BEGIN_FW_FTR_SECTION
- 	/*
- 	 * Here we have interrupts hard-disabled, so it is sufficient
-@@ -874,11 +902,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISER
- 
- 	/*
- 	 * hash_page couldn't handle it, set soft interrupt enable back
--	 * to what it was before the trap.  Note that .local_irq_restore
-+	 * to what it was before the trap.  Note that .raw_local_irq_restore
- 	 * handles any interrupts pending at this point.
- 	 */
- 	ld	r3,SOFTE(r1)
--	bl	.local_irq_restore
-+	TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
-+	bl	.raw_local_irq_restore
- 	b	11f
- 
- /* Here we have a page fault that hash_page can't handle. */
-@@ -1477,6 +1506,10 @@ _INIT_STATIC(start_here_multiplatform)
- 	addi	r2,r2,0x4000
- 	add	r2,r2,r26
- 
-+	/* Set initial ptr to current */
-+	LOAD_REG_IMMEDIATE(r4, init_task)
-+	std	r4,PACACURRENT(r13)
-+
- 	/* Do very early kernel initializations, including initial hash table,
- 	 * stab and slb setup before we turn on relocation.	*/
- 
-@@ -1505,10 +1538,6 @@ _INIT_GLOBAL(start_here_common)
- 	li	r0,0
- 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)
- 
--	/* ptr to current */
--	LOAD_REG_IMMEDIATE(r4, init_task)
--	std	r4,PACACURRENT(r13)
--
- 	/* Load the TOC */
- 	ld	r2,PACATOC(r13)
- 	std	r1,PACAKSAVE(r13)
---- a/arch/powerpc/kernel/head_booke.h
-+++ b/arch/powerpc/kernel/head_booke.h
-@@ -56,8 +56,17 @@
-  * is necessary since the MMU is always on, for Book-E parts, and the stacks
-  * are offset from KERNELBASE.
-  *
-+ * There is some space optimization to be had here if desired.  However
-+ * to allow for a common kernel with support for debug exceptions either
-+ * going to critical or their own debug level we aren't currently
-+ * providing configurations that micro-optimize space usage.
-  */
--#define BOOKE_EXCEPTION_STACK_SIZE	(8192)
-+#ifdef CONFIG_44x
-+#define NUM_EXCEPTION_LVLS	2
-+#else
-+#define NUM_EXCEPTION_LVLS	3
-+#endif
-+#define BOOKE_EXCEPTION_STACK_SIZE	(4096 * NUM_EXCEPTION_LVLS)
- 
- /* CRIT_SPRG only used in critical exception handling */
- #define CRIT_SPRG	SPRN_SPRG2
-@@ -68,7 +77,7 @@
- #define CRIT_STACK_TOP		(exception_stack_top)
- 
- /* only on e200 for now */
--#define DEBUG_STACK_TOP		(exception_stack_top - 4096)
-+#define DEBUG_STACK_TOP		(exception_stack_top - 8192)
- #define DEBUG_SPRG		SPRN_SPRG6W
- 
- #ifdef CONFIG_SMP
-@@ -212,9 +221,8 @@ label:
-  * save (and later restore) the MSR via SPRN_CSRR1, which will still have
-  * the MSR_DE bit set.
-  */
--#ifdef CONFIG_E200
--#define DEBUG_EXCEPTION							      \
--	START_EXCEPTION(Debug);						      \
-+#define DEBUG_DEBUG_EXCEPTION						      \
-+	START_EXCEPTION(DebugDebug);					      \
- 	DEBUG_EXCEPTION_PROLOG;						      \
- 									      \
- 	/*								      \
-@@ -234,8 +242,8 @@ label:
- 	cmplw	r12,r10;						      \
- 	blt+	2f;			/* addr below exception vectors */    \
- 									      \
--	lis	r10,Debug@h;						      \
--	ori	r10,r10,Debug@l;					      \
-+	lis	r10,DebugDebug@h;					      \
-+	ori	r10,r10,DebugDebug@l;					      \
- 	cmplw	r12,r10;						      \
- 	bgt+	2f;			/* addr above exception vectors */    \
- 									      \
-@@ -265,9 +273,9 @@ label:
- 2:	mfspr	r4,SPRN_DBSR;						      \
- 	addi	r3,r1,STACK_FRAME_OVERHEAD;				      \
- 	EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
--#else
--#define DEBUG_EXCEPTION							      \
--	START_EXCEPTION(Debug);						      \
-+
-+#define DEBUG_CRIT_EXCEPTION						      \
-+	START_EXCEPTION(DebugCrit);					      \
- 	CRITICAL_EXCEPTION_PROLOG;					      \
- 									      \
- 	/*								      \
-@@ -287,8 +295,8 @@ label:
- 	cmplw	r12,r10;						      \
- 	blt+	2f;			/* addr below exception vectors */    \
- 									      \
--	lis	r10,Debug@h;						      \
--	ori	r10,r10,Debug@l;					      \
-+	lis	r10,DebugCrit@h;						      \
-+	ori	r10,r10,DebugCrit@l;					      \
- 	cmplw	r12,r10;						      \
- 	bgt+	2f;			/* addr above exception vectors */    \
- 									      \
-@@ -318,7 +326,6 @@ label:
- 2:	mfspr	r4,SPRN_DBSR;						      \
- 	addi	r3,r1,STACK_FRAME_OVERHEAD;				      \
- 	EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
--#endif
- 
- #define INSTRUCTION_STORAGE_EXCEPTION					      \
- 	START_EXCEPTION(InstructionStorage)				      \
---- a/arch/powerpc/kernel/head_fsl_booke.S
-+++ b/arch/powerpc/kernel/head_fsl_booke.S
-@@ -68,7 +68,9 @@ _ENTRY(_start);
- 	mr	r29,r5
- 	mr	r28,r6
- 	mr	r27,r7
-+	li	r25,0		/* phys kernel start (low) */
- 	li	r24,0		/* CPU number */
-+	li	r23,0		/* phys kernel start (high) */
- 
- /* We try to not make any assumptions about how the boot loader
-  * setup or used the TLBs.  We invalidate all mappings from the
-@@ -167,7 +169,28 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	mtspr	SPRN_MAS0,r7
- 	tlbre
- 
--	/* Just modify the entry ID, EPN and RPN for the temp mapping */
-+	/* grab and fixup the RPN */
-+	mfspr	r6,SPRN_MAS1	/* extract MAS1[SIZE] */
-+	rlwinm	r6,r6,25,27,30
-+	li	r8,-1
-+	addi	r6,r6,10
-+	slw	r6,r8,r6	/* convert to mask */
-+
-+	bl	1f		/* Find our address */
-+1:	mflr	r7
-+
-+	mfspr	r8,SPRN_MAS3
-+#ifdef CONFIG_PHYS_64BIT
-+	mfspr	r23,SPRN_MAS7
-+#endif
-+	and	r8,r6,r8
-+	subfic	r9,r6,-4096
-+	and	r9,r9,r7
-+
-+	or	r25,r8,r9
-+	ori	r8,r25,(MAS3_SX|MAS3_SW|MAS3_SR)
-+
-+	/* Just modify the entry ID and EPN for the temp mapping */
- 	lis	r7,0x1000	/* Set MAS0(TLBSEL) = 1 */
- 	rlwimi	r7,r5,16,4,15	/* Setup MAS0 = TLBSEL | ESEL(r5) */
- 	mtspr	SPRN_MAS0,r7
-@@ -177,12 +200,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	ori	r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
- 	mtspr	SPRN_MAS1,r6
- 	mfspr	r6,SPRN_MAS2
--	lis	r7,PHYSICAL_START@h
-+	li	r7,0		/* temp EPN = 0 */
- 	rlwimi	r7,r6,0,20,31
- 	mtspr	SPRN_MAS2,r7
--	mfspr	r6,SPRN_MAS3
--	rlwimi	r7,r6,0,20,31
--	mtspr	SPRN_MAS3,r7
-+	mtspr	SPRN_MAS3,r8
- 	tlbwe
- 
- 	xori	r6,r4,1
-@@ -232,8 +253,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	ori	r6,r6,PAGE_OFFSET@l
- 	rlwimi	r6,r7,0,20,31
- 	mtspr	SPRN_MAS2,r6
--	li	r7,(MAS3_SX|MAS3_SW|MAS3_SR)
--	mtspr	SPRN_MAS3,r7
-+	mtspr	SPRN_MAS3,r8
- 	tlbwe
- 
- /* 7. Jump to KERNELBASE mapping */
-@@ -283,7 +303,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
- 	SET_IVOR(12, WatchdogTimer);
- 	SET_IVOR(13, DataTLBError);
- 	SET_IVOR(14, InstructionTLBError);
--	SET_IVOR(15, Debug);
-+	SET_IVOR(15, DebugDebug);
-+#if defined(CONFIG_E500)
-+	SET_IVOR(15, DebugCrit);
-+#endif
- 	SET_IVOR(32, SPEUnavailable);
- 	SET_IVOR(33, SPEFloatingPointData);
- 	SET_IVOR(34, SPEFloatingPointRound);
-@@ -718,7 +741,10 @@ interrupt_base:
- 
- 
- 	/* Debug Interrupt */
--	DEBUG_EXCEPTION
-+	DEBUG_DEBUG_EXCEPTION
-+#if defined(CONFIG_E500)
-+	DEBUG_CRIT_EXCEPTION
-+#endif
- 
- /*
-  * Local functions
---- a/arch/powerpc/kernel/ibmebus.c
-+++ b/arch/powerpc/kernel/ibmebus.c
-@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const 
- 		ret = ibmebus_create_device(child);
- 		if (ret) {
- 			printk(KERN_ERR "%s: failed to create device (%i)",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			of_node_put(child);
- 			break;
- 		}
-@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struc
- 	if (bus_find_device(&ibmebus_bus_type, NULL, path,
- 			    ibmebus_match_path)) {
- 		printk(KERN_WARNING "%s: %s has already been probed\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 		rc = -EEXIST;
- 		goto out;
- 	}
-@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struc
- 		of_node_put(dn);
- 	} else {
- 		printk(KERN_WARNING "%s: no such device node: %s\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 		rc = -ENODEV;
- 	}
- 
-@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(stru
- 		return count;
- 	} else {
- 		printk(KERN_WARNING "%s: %s not on the bus\n",
--		       __FUNCTION__, path);
-+		       __func__, path);
- 
- 		kfree(path);
- 		return -ENODEV;
-@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
- 	err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
- 	if (err) {
- 		printk(KERN_ERR "%s: failed to register IBM eBus.\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return err;
- 	}
- 
- 	err = device_register(&ibmebus_bus_device);
- 	if (err) {
- 		printk(KERN_WARNING "%s: device_register returned %i\n",
--		       __FUNCTION__, err);
-+		       __func__, err);
- 		bus_unregister(&ibmebus_bus_type);
- 
- 		return err;
---- a/arch/powerpc/kernel/iommu.c
-+++ b/arch/powerpc/kernel/iommu.c
-@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table
- 	unsigned int order;
- 
- 	if (!tbl || !tbl->it_map) {
--		printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: expected TCE map for %s\n", __func__,
- 				node_name);
- 		return;
- 	}
-@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table
- 	for (i = 0; i < (tbl->it_size/64); i++) {
- 		if (tbl->it_map[i] != 0) {
- 			printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
--				__FUNCTION__, node_name);
-+				__func__, node_name);
- 			break;
- 		}
- 	}
---- a/arch/powerpc/kernel/irq.c
-+++ b/arch/powerpc/kernel/irq.c
-@@ -114,7 +114,7 @@ static inline void set_soft_enabled(unsi
- 	: : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
- }
- 
--void local_irq_restore(unsigned long en)
-+void raw_local_irq_restore(unsigned long en)
- {
- 	/*
- 	 * get_paca()->soft_enabled = en;
-@@ -174,6 +174,7 @@ void local_irq_restore(unsigned long en)
- 
- 	__hard_irq_enable();
- }
-+EXPORT_SYMBOL(raw_local_irq_restore);
- #endif /* CONFIG_PPC64 */
- 
- int show_interrupts(struct seq_file *p, void *v)
-@@ -310,8 +311,21 @@ void do_IRQ(struct pt_regs *regs)
- 				handler = &__do_IRQ;
- 			irqtp->task = curtp->task;
- 			irqtp->flags = 0;
-+
-+			/* Copy the softirq bits in preempt_count so that the
-+			 * softirq checks work in the hardirq context.
-+			 */
-+			irqtp->preempt_count =
-+				(irqtp->preempt_count & ~SOFTIRQ_MASK) |
-+				(curtp->preempt_count & SOFTIRQ_MASK);
-+
- 			call_handle_irq(irq, desc, irqtp, handler);
- 			irqtp->task = NULL;
-+
-+
-+			/* Set any flag that may have been set on the
-+			 * alternate stack
-+			 */
- 			if (irqtp->flags)
- 				set_bits(irqtp->flags, &curtp->flags);
- 		} else
-@@ -357,7 +371,7 @@ void irq_ctx_init(void)
- 		memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
- 		tp = softirq_ctx[i];
- 		tp->cpu = i;
--		tp->preempt_count = SOFTIRQ_OFFSET;
-+		tp->preempt_count = 0;
- 
- 		memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
- 		tp = hardirq_ctx[i];
---- a/arch/powerpc/kernel/isa-bridge.c
-+++ b/arch/powerpc/kernel/isa-bridge.c
-@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF
- 	 *			(size depending on dev->n_addr_cells)
- 	 *   cell 5:		the size of the range
- 	 */
--	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
-+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) {
- 		range++;
- 		rlen -= sizeof(struct isa_range);
- 		if (rlen < sizeof(struct isa_range))
- 			goto inval_range;
- 	}
--	if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
-+	if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO)
- 		goto inval_range;
- 
- 	isa_addr = range->isa_addr.a_lo;
-@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF
- 	 */
- 	if ((pci_addr != 0) || (isa_addr != 0)) {
- 		printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
---- a/arch/powerpc/kernel/lparcfg.c
-+++ b/arch/powerpc/kernel/lparcfg.c
-@@ -226,7 +226,7 @@ static void parse_system_parameter_strin
- 	unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
- 	if (!local_buffer) {
- 		printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
--		       __FILE__, __FUNCTION__, __LINE__);
-+		       __FILE__, __func__, __LINE__);
- 		return;
- 	}
- 
-@@ -243,14 +243,14 @@ static void parse_system_parameter_strin
- 	if (call_status != 0) {
- 		printk(KERN_INFO
- 		       "%s %s Error calling get-system-parameter (0x%x)\n",
--		       __FILE__, __FUNCTION__, call_status);
-+		       __FILE__, __func__, call_status);
- 	} else {
- 		int splpar_strlen;
- 		int idx, w_idx;
- 		char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
- 		if (!workbuffer) {
- 			printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
--			       __FILE__, __FUNCTION__, __LINE__);
-+			       __FILE__, __func__, __LINE__);
- 			kfree(local_buffer);
- 			return;
- 		}
-@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file
- 	current_weight = (resource >> 5 * 8) & 0xFF;
- 
- 	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
--		 __FUNCTION__, current_entitled, current_weight);
-+		 __func__, current_entitled, current_weight);
- 
- 	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
--		 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);
-+		 __func__, *new_entitled_ptr, *new_weight_ptr);
- 
- 	retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
- 				    *new_weight_ptr);
-@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file
- 		retval = -EINVAL;
- 	} else {
- 		printk(KERN_WARNING "%s: received unknown hv return code %ld",
--		       __FUNCTION__, retval);
-+		       __func__, retval);
- 		retval = -EIO;
- 	}
- 
---- a/arch/powerpc/kernel/machine_kexec.c
-+++ b/arch/powerpc/kernel/machine_kexec.c
-@@ -12,8 +12,9 @@
- #include <linux/kexec.h>
- #include <linux/reboot.h>
- #include <linux/threads.h>
-+#include <linux/lmb.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- 
- void machine_crash_shutdown(struct pt_regs *regs)
- {
---- a/arch/powerpc/kernel/paca.c
-+++ b/arch/powerpc/kernel/paca.c
-@@ -15,7 +15,6 @@
- #include <asm/ptrace.h>
- #include <asm/page.h>
- #include <asm/lppaca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #include <asm/paca.h>
- #include <asm/mmu.h>
- 
-@@ -25,13 +24,13 @@
- extern unsigned long __toc_start;
- 
- /*
-- * iSeries structure which the hypervisor knows about - this structure
-+ * The structure which the hypervisor knows about - this structure
-  * should not cross a page boundary.  The vpa_init/register_vpa call
-  * is now known to fail if the lppaca structure crosses a page
-- * boundary.  The lppaca is also used on POWER5 pSeries boxes.  The
-- * lppaca is 640 bytes long, and cannot readily change since the
-- * hypervisor knows its layout, so a 1kB alignment will suffice to
-- * ensure that it doesn't cross a page boundary.
-+ * boundary.  The lppaca is also used on legacy iSeries and POWER5
-+ * pSeries boxes.  The lppaca is 640 bytes long, and cannot readily
-+ * change since the hypervisor knows its layout, so a 1kB alignment
-+ * will suffice to ensure that it doesn't cross a page boundary.
-  */
- struct lppaca lppaca[] = {
- 	[0 ... (NR_CPUS-1)] = {
-@@ -66,32 +65,17 @@ struct slb_shadow slb_shadow[] __cacheli
-  * processors.  The processor VPD array needs one entry per physical
-  * processor (not thread).
-  */
--#define PACA_INIT_COMMON(number)					    \
-+#define PACA_INIT(number)						    \
-+{									    \
- 	.lppaca_ptr = &lppaca[number],					    \
- 	.lock_token = 0x8000,						    \
- 	.paca_index = (number),		/* Paca Index */		    \
- 	.kernel_toc = (unsigned long)(&__toc_start) + 0x8000UL,		    \
- 	.hw_cpu_id = 0xffff,						    \
--	.slb_shadow_ptr = &slb_shadow[number],
--
--#ifdef CONFIG_PPC_ISERIES
--#define PACA_INIT_ISERIES(number)					    \
--	.reg_save_ptr = &iseries_reg_save[number],
--
--#define PACA_INIT(number)						    \
--{									    \
--	PACA_INIT_COMMON(number)					    \
--	PACA_INIT_ISERIES(number)					    \
-+	.slb_shadow_ptr = &slb_shadow[number],				    \
-+	.__current = &init_task,					    \
- }
- 
--#else
--#define PACA_INIT(number)						    \
--{									    \
--	PACA_INIT_COMMON(number)					    \
--}
--
--#endif
--
- struct paca_struct paca[] = {
- 	PACA_INIT(0),
- #if NR_CPUS > 1
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -45,10 +45,6 @@
- #include <asm/signal.h>
- #include <asm/dcr.h>
- 
--#ifdef CONFIG_PPC64
--EXPORT_SYMBOL(local_irq_restore);
--#endif
--
- #ifdef CONFIG_PPC32
- extern void transfer_to_handler(void);
- extern void do_IRQ(struct pt_regs *regs);
-@@ -58,7 +54,6 @@ extern void program_check_exception(stru
- extern void single_step_exception(struct pt_regs *regs);
- extern int sys_sigreturn(struct pt_regs *regs);
- 
--EXPORT_SYMBOL(empty_zero_page);
- EXPORT_SYMBOL(clear_pages);
- EXPORT_SYMBOL(copy_page);
- EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
-@@ -79,6 +74,7 @@ EXPORT_SYMBOL(strncpy);
- EXPORT_SYMBOL(strcat);
- EXPORT_SYMBOL(strlen);
- EXPORT_SYMBOL(strcmp);
-+EXPORT_SYMBOL(strncmp);
- 
- EXPORT_SYMBOL(csum_partial);
- EXPORT_SYMBOL(csum_partial_copy_generic);
-@@ -192,3 +188,4 @@ EXPORT_SYMBOL(intercept_table);
- EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
-+EXPORT_SYMBOL(empty_zero_page);
---- a/arch/powerpc/kernel/process.c
-+++ b/arch/powerpc/kernel/process.c
-@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigne
- 	flush_spe_to_thread(current);
- 	error = do_execve(filename, (char __user * __user *) a1,
- 			  (char __user * __user *) a2, regs);
--	if (error == 0) {
--		task_lock(current);
--		current->ptrace &= ~PT_DTRACE;
--		task_unlock(current);
--	}
- 	putname(filename);
- out:
- 	return error;
-@@ -919,20 +914,6 @@ int validate_sp(unsigned long sp, struct
- 	return valid_irq_stack(sp, p, nbytes);
- }
- 
--#ifdef CONFIG_PPC64
--#define MIN_STACK_FRAME	112	/* same as STACK_FRAME_OVERHEAD, in fact */
--#define FRAME_LR_SAVE	2
--#define INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD + 288)
--#define REGS_MARKER	0x7265677368657265ul
--#define FRAME_MARKER	12
--#else
--#define MIN_STACK_FRAME	16
--#define FRAME_LR_SAVE	1
--#define INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
--#define REGS_MARKER	0x72656773ul
--#define FRAME_MARKER	2
--#endif
--
- EXPORT_SYMBOL(validate_sp);
- 
- unsigned long get_wchan(struct task_struct *p)
-@@ -944,15 +925,15 @@ unsigned long get_wchan(struct task_stru
- 		return 0;
- 
- 	sp = p->thread.ksp;
--	if (!validate_sp(sp, p, MIN_STACK_FRAME))
-+	if (!validate_sp(sp, p, STACK_FRAME_OVERHEAD))
- 		return 0;
- 
- 	do {
- 		sp = *(unsigned long *)sp;
--		if (!validate_sp(sp, p, MIN_STACK_FRAME))
-+		if (!validate_sp(sp, p, STACK_FRAME_OVERHEAD))
- 			return 0;
- 		if (count > 0) {
--			ip = ((unsigned long *)sp)[FRAME_LR_SAVE];
-+			ip = ((unsigned long *)sp)[STACK_FRAME_LR_SAVE];
- 			if (!in_sched_functions(ip))
- 				return ip;
- 		}
-@@ -981,12 +962,12 @@ void show_stack(struct task_struct *tsk,
- 	lr = 0;
- 	printk("Call Trace:\n");
- 	do {
--		if (!validate_sp(sp, tsk, MIN_STACK_FRAME))
-+		if (!validate_sp(sp, tsk, STACK_FRAME_OVERHEAD))
- 			return;
- 
- 		stack = (unsigned long *) sp;
- 		newsp = stack[0];
--		ip = stack[FRAME_LR_SAVE];
-+		ip = stack[STACK_FRAME_LR_SAVE];
- 		if (!firstframe || ip != lr) {
- 			printk("["REG"] ["REG"] ", sp, ip);
- 			print_symbol("%s", ip);
-@@ -1000,8 +981,8 @@ void show_stack(struct task_struct *tsk,
- 		 * See if this is an exception frame.
- 		 * We look for the "regshere" marker in the current frame.
- 		 */
--		if (validate_sp(sp, tsk, INT_FRAME_SIZE)
--		    && stack[FRAME_MARKER] == REGS_MARKER) {
-+		if (validate_sp(sp, tsk, STACK_INT_FRAME_SIZE)
-+		    && stack[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) {
- 			struct pt_regs *regs = (struct pt_regs *)
- 				(sp + STACK_FRAME_OVERHEAD);
- 			printk("--- Exception: %lx", regs->trap);
---- a/arch/powerpc/kernel/prom.c
-+++ b/arch/powerpc/kernel/prom.c
-@@ -31,10 +31,10 @@
- #include <linux/kexec.h>
- #include <linux/debugfs.h>
- #include <linux/irq.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/rtas.h>
--#include <asm/lmb.h>
- #include <asm/page.h>
- #include <asm/processor.h>
- #include <asm/irq.h>
-@@ -51,6 +51,7 @@
- #include <asm/machdep.h>
- #include <asm/pSeries_reconfig.h>
- #include <asm/pci-bridge.h>
-+#include <asm/phyp_dump.h>
- #include <asm/kexec.h>
- 
- #ifdef DEBUG
-@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem);
-  * The device tree may be allocated beyond our memory limit, or inside the
-  * crash kernel region for kdump. If so, move it out of the way.
-  */
--static void move_device_tree(void)
-+static void __init move_device_tree(void)
- {
- 	unsigned long start, size;
- 	void *p;
-@@ -1040,6 +1041,87 @@ static void __init early_reserve_mem(voi
- #endif
- }
- 
-+#ifdef CONFIG_PHYP_DUMP
-+/**
-+ * phyp_dump_calculate_reserve_size() - reserve variable boot area 5% or arg
-+ *
-+ * Function to find the largest size we need to reserve
-+ * during early boot process.
-+ *
-+ * It either looks for boot param and returns that OR
-+ * returns larger of 256 or 5% rounded down to multiples of 256MB.
-+ *
-+ */
-+static inline unsigned long phyp_dump_calculate_reserve_size(void)
-+{
-+	unsigned long tmp;
-+
-+	if (phyp_dump_info->reserve_bootvar)
-+		return phyp_dump_info->reserve_bootvar;
-+
-+	/* divide by 20 to get 5% of value */
-+	tmp = lmb_end_of_DRAM();
-+	do_div(tmp, 20);
-+
-+	/* round it down in multiples of 256 */
-+	tmp = tmp & ~0x0FFFFFFFUL;
-+
-+	return (tmp > PHYP_DUMP_RMR_END ? tmp : PHYP_DUMP_RMR_END);
-+}
-+
-+/**
-+ * phyp_dump_reserve_mem() - reserve all not-yet-dumped mmemory
-+ *
-+ * This routine may reserve memory regions in the kernel only
-+ * if the system is supported and a dump was taken in last
-+ * boot instance or if the hardware is supported and the
-+ * scratch area needs to be setup. In other instances it returns
-+ * without reserving anything. The memory in case of dump being
-+ * active is freed when the dump is collected (by userland tools).
-+ */
-+static void __init phyp_dump_reserve_mem(void)
-+{
-+	unsigned long base, size;
-+	unsigned long variable_reserve_size;
-+
-+	if (!phyp_dump_info->phyp_dump_configured) {
-+		printk(KERN_ERR "Phyp-dump not supported on this hardware\n");
-+		return;
-+	}
-+
-+	if (!phyp_dump_info->phyp_dump_at_boot) {
-+		printk(KERN_INFO "Phyp-dump disabled at boot time\n");
-+		return;
-+	}
-+
-+	variable_reserve_size = phyp_dump_calculate_reserve_size();
-+
-+	if (phyp_dump_info->phyp_dump_is_active) {
-+		/* Reserve *everything* above RMR.Area freed by userland tools*/
-+		base = variable_reserve_size;
-+		size = lmb_end_of_DRAM() - base;
-+
-+		/* XXX crashed_ram_end is wrong, since it may be beyond
-+		 * the memory_limit, it will need to be adjusted. */
-+		lmb_reserve(base, size);
-+
-+		phyp_dump_info->init_reserve_start = base;
-+		phyp_dump_info->init_reserve_size = size;
-+	} else {
-+		size = phyp_dump_info->cpu_state_size +
-+			phyp_dump_info->hpte_region_size +
-+			variable_reserve_size;
-+		base = lmb_end_of_DRAM() - size;
-+		lmb_reserve(base, size);
-+		phyp_dump_info->init_reserve_start = base;
-+		phyp_dump_info->init_reserve_size = size;
-+	}
-+}
-+#else
-+static inline void __init phyp_dump_reserve_mem(void) {}
-+#endif /* CONFIG_PHYP_DUMP  && CONFIG_PPC_RTAS */
-+
-+
- void __init early_init_devtree(void *params)
- {
- 	DBG(" -> early_init_devtree(%p)\n", params);
-@@ -1052,6 +1134,11 @@ void __init early_init_devtree(void *par
- 	of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
- #endif
- 
-+#ifdef CONFIG_PHYP_DUMP
-+	/* scan tree to see if dump occured during last boot */
-+	of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
-+#endif
-+
- 	/* Retrieve various informations from the /chosen node of the
- 	 * device-tree, including the platform type, initrd location and
- 	 * size, TCE reserve, and more ...
-@@ -1072,6 +1159,7 @@ void __init early_init_devtree(void *par
- 	reserve_kdump_trampoline();
- 	reserve_crashkernel();
- 	early_reserve_mem();
-+	phyp_dump_reserve_mem();
- 
- 	lmb_enforce_memory_limit(memory_limit);
- 	lmb_analyze();
-@@ -1244,12 +1332,14 @@ EXPORT_SYMBOL(of_node_put);
-  */
- void of_attach_node(struct device_node *np)
- {
--	write_lock(&devtree_lock);
-+	unsigned long flags;
-+
-+	write_lock_irqsave(&devtree_lock, flags);
- 	np->sibling = np->parent->child;
- 	np->allnext = allnodes;
- 	np->parent->child = np;
- 	allnodes = np;
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- }
- 
- /*
-@@ -1260,8 +1350,9 @@ void of_attach_node(struct device_node *
- void of_detach_node(struct device_node *np)
- {
- 	struct device_node *parent;
-+	unsigned long flags;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 
- 	parent = np->parent;
- 	if (!parent)
-@@ -1292,7 +1383,7 @@ void of_detach_node(struct device_node *
- 	of_node_set_flag(np, OF_DETACHED);
- 
- out_unlock:
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- }
- 
- #ifdef CONFIG_PPC_PSERIES
-@@ -1373,20 +1464,21 @@ __initcall(prom_reconfig_setup);
- int prom_add_property(struct device_node* np, struct property* prop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 
- 	prop->next = NULL;	
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (strcmp(prop->name, (*next)->name) == 0) {
- 			/* duplicate ! don't insert it */
--			write_unlock(&devtree_lock);
-+			write_unlock_irqrestore(&devtree_lock, flags);
- 			return -1;
- 		}
- 		next = &(*next)->next;
- 	}
- 	*next = prop;
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- #ifdef CONFIG_PROC_DEVICETREE
- 	/* try to add to proc as well if it was initialized */
-@@ -1406,9 +1498,10 @@ int prom_add_property(struct device_node
- int prom_remove_property(struct device_node *np, struct property *prop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 	int found = 0;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (*next == prop) {
-@@ -1421,7 +1514,7 @@ int prom_remove_property(struct device_n
- 		}
- 		next = &(*next)->next;
- 	}
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- 	if (!found)
- 		return -ENODEV;
-@@ -1447,9 +1540,10 @@ int prom_update_property(struct device_n
- 			 struct property *oldprop)
- {
- 	struct property **next;
-+	unsigned long flags;
- 	int found = 0;
- 
--	write_lock(&devtree_lock);
-+	write_lock_irqsave(&devtree_lock, flags);
- 	next = &np->properties;
- 	while (*next) {
- 		if (*next == oldprop) {
-@@ -1463,7 +1557,7 @@ int prom_update_property(struct device_n
- 		}
- 		next = &(*next)->next;
- 	}
--	write_unlock(&devtree_lock);
-+	write_unlock_irqrestore(&devtree_lock, flags);
- 
- 	if (!found)
- 		return -ENODEV;
---- a/arch/powerpc/kernel/prom_init.c
-+++ b/arch/powerpc/kernel/prom_init.c
-@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efi
- 	if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
- 		prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
- 
-+	/* CODEGEN,description is exposed in /proc/cpuinfo so
-+	   fix that too */
-+	rv = prom_getprop(node, "CODEGEN,description", prop, sizeof(prop));
-+	if (rv != PROM_ERROR && (strstr(prop, "CHRP")))
-+		prom_setprop(node, "/", "CODEGEN,description",
-+			     "Efika 5200B PowerPC System",
-+			     sizeof("Efika 5200B PowerPC System"));
-+
- 	/* Fixup bestcomm interrupts property */
- 	node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
- 	if (PHANDLE_VALID(node)) {
---- a/arch/powerpc/kernel/rtas.c
-+++ b/arch/powerpc/kernel/rtas.c
-@@ -22,6 +22,7 @@
- #include <linux/smp.h>
- #include <linux/completion.h>
- #include <linux/cpumask.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/rtas.h>
-@@ -34,7 +35,6 @@
- #include <asm/system.h>
- #include <asm/delay.h>
- #include <asm/uaccess.h>
--#include <asm/lmb.h>
- #include <asm/udbg.h>
- #include <asm/syscalls.h>
- #include <asm/smp.h>
-@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)
- 			break;
- 		default:
- 			printk(KERN_ERR "%s: unexpected RTAS error %d\n",
--					__FUNCTION__, rtas_rc);
-+					__func__, rtas_rc);
- 			rc = -ERANGE;
- 			break;
- 	}
---- a/arch/powerpc/kernel/rtas_flash.c
-+++ b/arch/powerpc/kernel/rtas_flash.c
-@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
- 				rtas_block_ctor);
- 	if (!flash_block_cache) {
- 		printk(KERN_ERR "%s: failed to create block cache\n",
--				__FUNCTION__);
-+				__func__);
- 		rc = -ENOMEM;
- 		goto cleanup;
- 	}
---- a/arch/powerpc/kernel/rtas_pci.c
-+++ b/arch/powerpc/kernel/rtas_pci.c
-@@ -56,21 +56,6 @@ static inline int config_access_valid(st
- 	return 0;
- }
- 
--static int of_device_available(struct device_node * dn)
--{
--        const char *status;
--
--        status = of_get_property(dn, "status", NULL);
--
--        if (!status)
--                return 1;
--
--        if (!strcmp(status, "okay"))
--                return 1;
--
--        return 0;
--}
--
- int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
- {
- 	int returnval = -1;
-@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct p
- 	for (dn = busdn->child; dn; dn = dn->sibling) {
- 		struct pci_dn *pdn = PCI_DN(dn);
- 		if (pdn && pdn->devfn == devfn
--		    && of_device_available(dn))
-+		    && of_device_is_available(dn))
- 			return rtas_read_config(pdn, where, size, val);
- 	}
- 
-@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct 
- 	for (dn = busdn->child; dn; dn = dn->sibling) {
- 		struct pci_dn *pdn = PCI_DN(dn);
- 		if (pdn && pdn->devfn == devfn
--		    && of_device_available(dn))
-+		    && of_device_is_available(dn))
- 			return rtas_write_config(pdn, where, size, val);
- 	}
- 	return PCIBIOS_DEVICE_NOT_FOUND;
-@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_c
- 
- 	res = b->resource[0];
- 	if (!res->flags) {
--		printk(KERN_ERR "%s: no IO resource for PHB %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: no IO resource for PHB %s\n", __func__,
- 				b->name);
- 		return 1;
- 	}
-@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_c
- 	rc = pcibios_unmap_io_space(b);
- 	if (rc) {
- 		printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
--			__FUNCTION__, b->name);
-+			__func__, b->name);
- 		return 1;
- 	}
- 
- 	if (release_resource(res)) {
- 		printk(KERN_ERR "%s: failed to release IO on bus %s\n",
--				__FUNCTION__, b->name);
-+				__func__, b->name);
- 		return 1;
- 	}
- 
-@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_c
- 		res = b->resource[i];
- 		if (!res->flags && i == 0) {
- 			printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
--				__FUNCTION__, b->name);
-+				__func__, b->name);
- 			return 1;
- 		}
- 		if (res->flags && release_resource(res)) {
- 			printk(KERN_ERR
- 			       "%s: failed to release IO %d on bus %s\n",
--				__FUNCTION__, i, b->name);
-+				__func__, i, b->name);
- 			return 1;
- 		}
- 	}
---- a/arch/powerpc/kernel/setup-common.c
-+++ b/arch/powerpc/kernel/setup-common.c
-@@ -34,6 +34,7 @@
- #include <linux/serial_8250.h>
- #include <linux/debugfs.h>
- #include <linux/percpu.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/prom.h>
- #include <asm/processor.h>
-@@ -56,7 +57,6 @@
- #include <asm/cache.h>
- #include <asm/page.h>
- #include <asm/mmu.h>
--#include <asm/lmb.h>
- #include <asm/xmon.h>
- #include <asm/cputhreads.h>
- 
-@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file 
- 	unsigned short min;
- 
- 	if (cpu_id == NR_CPUS) {
-+		struct device_node *root;
-+		const char *model = NULL;
- #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
- 		unsigned long bogosum = 0;
- 		int i;
-@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file 
- 		seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
- 		if (ppc_md.name)
- 			seq_printf(m, "platform\t: %s\n", ppc_md.name);
-+		root = of_find_node_by_path("/");
-+		if (root)
-+			model = of_get_property(root, "model", NULL);
-+		if (model)
-+			seq_printf(m, "model\t\t: %s\n", model);
-+		of_node_put(root);
-+
- 		if (ppc_md.show_cpuinfo != NULL)
- 			ppc_md.show_cpuinfo(m);
- 
---- a/arch/powerpc/kernel/setup_32.c
-+++ b/arch/powerpc/kernel/setup_32.c
-@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
- }
- __setup("l2cr=", ppc_setup_l2cr);
- 
-+/* Checks "l3cr=xxxx" command-line option */
-+int __init ppc_setup_l3cr(char *str)
-+{
-+	if (cpu_has_feature(CPU_FTR_L3CR)) {
-+		unsigned long val = simple_strtoul(str, NULL, 0);
-+		printk(KERN_INFO "l3cr set to %lx\n", val);
-+		_set_L3CR(val);		/* and enable it */
-+	}
-+	return 1;
-+}
-+__setup("l3cr=", ppc_setup_l3cr);
-+
- #ifdef CONFIG_GENERIC_NVRAM
- 
- /* Generic nvram hooks used by drivers/char/gen_nvram.c */
-@@ -277,7 +289,7 @@ void __init setup_arch(char **cmdline_p)
- 	if (ppc_md.panic)
- 		setup_panic();
- 
--	init_mm.start_code = PAGE_OFFSET;
-+	init_mm.start_code = (unsigned long)_stext;
- 	init_mm.end_code = (unsigned long) _etext;
- 	init_mm.end_data = (unsigned long) _edata;
- 	init_mm.brk = klimit;
---- a/arch/powerpc/kernel/setup_64.c
-+++ b/arch/powerpc/kernel/setup_64.c
-@@ -33,6 +33,8 @@
- #include <linux/serial_8250.h>
- #include <linux/bootmem.h>
- #include <linux/pci.h>
-+#include <linux/lockdep.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/kdump.h>
- #include <asm/prom.h>
-@@ -55,7 +57,6 @@
- #include <asm/cache.h>
- #include <asm/page.h>
- #include <asm/mmu.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- #include <asm/xmon.h>
- #include <asm/udbg.h>
-@@ -178,6 +179,9 @@ void __init early_setup(unsigned long dt
- 	/* Enable early debugging if any specified (see udbg.h) */
- 	udbg_early_init();
- 
-+	/* Initialize lockdep early or else spinlocks will blow */
-+	lockdep_init();
-+
-  	DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
- 
- 	/*
-@@ -510,7 +514,7 @@ void __init setup_arch(char **cmdline_p)
- 	if (ppc_md.panic)
- 		setup_panic();
- 
--	init_mm.start_code = PAGE_OFFSET;
-+	init_mm.start_code = (unsigned long)_stext;
- 	init_mm.end_code = (unsigned long) _etext;
- 	init_mm.end_data = (unsigned long) _edata;
- 	init_mm.brk = klimit;
---- /dev/null
-+++ b/arch/powerpc/kernel/stacktrace.c
-@@ -0,0 +1,47 @@
-+/*
-+ * Stack trace utility
-+ *
-+ * Copyright 2008 Christoph Hellwig, IBM Corp.
-+ *
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/stacktrace.h>
-+#include <asm/ptrace.h>
-+#include <asm/asm-offsets.h>
-+
-+/*
-+ * Save stack-backtrace addresses into a stack_trace buffer.
-+ */
-+void save_stack_trace(struct stack_trace *trace)
-+{
-+	unsigned long sp;
-+
-+	asm("mr %0,1" : "=r" (sp));
-+
-+	for (;;) {
-+		unsigned long *stack = (unsigned long *) sp;
-+		unsigned long newsp, ip;
-+
-+		if (!validate_sp(sp, current, STACK_FRAME_OVERHEAD))
-+			return;
-+
-+		newsp = stack[0];
-+		ip = stack[STACK_FRAME_LR_SAVE];
-+
-+		if (!trace->skip)
-+			trace->entries[trace->nr_entries++] = ip;
-+		else
-+			trace->skip--;
-+
-+		if (trace->nr_entries >= trace->max_entries)
-+			return;
-+
-+		sp = newsp;
-+	}
-+}
---- a/arch/powerpc/kernel/sys_ppc32.c
-+++ b/arch/powerpc/kernel/sys_ppc32.c
-@@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0,
- 
- 	error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
- 
--	if (error == 0) {
--		task_lock(current);
--		current->ptrace &= ~PT_DTRACE;
--		task_unlock(current);
--	}
- 	putname(filename);
- 
- out:
---- a/arch/powerpc/kernel/vdso.c
-+++ b/arch/powerpc/kernel/vdso.c
-@@ -21,13 +21,14 @@
- #include <linux/elf.h>
- #include <linux/security.h>
- #include <linux/bootmem.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgtable.h>
- #include <asm/system.h>
- #include <asm/processor.h>
- #include <asm/mmu.h>
- #include <asm/mmu_context.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/machdep.h>
- #include <asm/cputable.h>
- #include <asm/sections.h>
---- a/arch/powerpc/kernel/vio.c
-+++ b/arch/powerpc/kernel/vio.c
-@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device 
-  */
- int vio_register_driver(struct vio_driver *viodrv)
- {
--	printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__,
-+	printk(KERN_DEBUG "%s: driver %s registering\n", __func__,
- 		viodrv->driver.name);
- 
- 	/* fill in 'struct driver' fields */
-@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node
- 	/* we need the 'device_type' property, in order to match with drivers */
- 	if (of_node->type == NULL) {
- 		printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
--				__FUNCTION__,
-+				__func__,
- 				of_node->name ? of_node->name : "<unknown>");
- 		return NULL;
- 	}
-@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node
- 	unit_address = of_get_property(of_node, "reg", NULL);
- 	if (unit_address == NULL) {
- 		printk(KERN_WARNING "%s: node %s missing 'reg'\n",
--				__FUNCTION__,
-+				__func__,
- 				of_node->name ? of_node->name : "<unknown>");
- 		return NULL;
- 	}
-@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node
- 	/* register with generic device framework */
- 	if (device_register(&viodev->dev)) {
- 		printk(KERN_ERR "%s: failed to register device %s\n",
--				__FUNCTION__, viodev->dev.bus_id);
-+				__func__, viodev->dev.bus_id);
- 		/* XXX free TCE table */
- 		kfree(viodev);
- 		return NULL;
-@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)
- 	err = device_register(&vio_bus_device.dev);
- 	if (err) {
- 		printk(KERN_WARNING "%s: device_register returned %i\n",
--				__FUNCTION__, err);
-+				__func__, err);
- 		return err;
- 	}
- 
---- a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -1,11 +1,9 @@
- #ifdef CONFIG_PPC64
--#include <asm/page.h>
- #define PROVIDE32(x)	PROVIDE(__unused__##x)
- #else
--#define PAGE_SIZE	4096
--#define KERNELBASE	CONFIG_KERNEL_START
- #define PROVIDE32(x)	PROVIDE(x)
- #endif
-+#include <asm/page.h>
- #include <asm-generic/vmlinux.lds.h>
- #include <asm/cache.h>
- 
-@@ -33,7 +31,7 @@ SECTIONS
-  */
- 
- 	/* Text and gots */
--	.text : {
-+	.text : AT(ADDR(.text) - LOAD_OFFSET) {
- 		ALIGN_FUNCTION();
- 		*(.text.head)
- 		_text = .;
-@@ -58,7 +56,7 @@ SECTIONS
- 	RODATA
- 
- 	/* Exception & bug tables */
--	__ex_table : {
-+	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
- 		__start___ex_table = .;
- 		*(__ex_table)
- 		__stop___ex_table = .;
-@@ -74,7 +72,7 @@ SECTIONS
- 	. = ALIGN(PAGE_SIZE);
- 	__init_begin = .;
- 
--	.init.text : {
-+	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
- 		_sinittext = .;
- 		INIT_TEXT
- 		_einittext = .;
-@@ -83,11 +81,11 @@ SECTIONS
- 	/* .exit.text is discarded at runtime, not link time,
- 	 * to deal with references from __bug_table
- 	 */
--	.exit.text : {
-+	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
- 		EXIT_TEXT
- 	}
- 
--	.init.data : {
-+	.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
- 		INIT_DATA
- 		__vtop_table_begin = .;
- 		*(.vtop_fixup);
-@@ -103,19 +101,19 @@ SECTIONS
- 	}
- 
- 	. = ALIGN(16);
--	.init.setup : {
-+	.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
- 		__setup_start = .;
- 		*(.init.setup)
- 		__setup_end = .;
- 	}
- 
--	.initcall.init : {
-+	.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
- 		__initcall_start = .;
- 		INITCALLS
- 		__initcall_end = .;
- 		}
- 
--	.con_initcall.init : {
-+	.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
- 		__con_initcall_start = .;
- 		*(.con_initcall.init)
- 		__con_initcall_end = .;
-@@ -124,14 +122,14 @@ SECTIONS
- 	SECURITY_INIT
- 
- 	. = ALIGN(8);
--	__ftr_fixup : {
-+	__ftr_fixup : AT(ADDR(__ftr_fixup) - LOAD_OFFSET) {
- 		__start___ftr_fixup = .;
- 		*(__ftr_fixup)
- 		__stop___ftr_fixup = .;
- 	}
- #ifdef CONFIG_PPC64
- 	. = ALIGN(8);
--	__fw_ftr_fixup : {
-+	__fw_ftr_fixup : AT(ADDR(__fw_ftr_fixup) - LOAD_OFFSET) {
- 		__start___fw_ftr_fixup = .;
- 		*(__fw_ftr_fixup)
- 		__stop___fw_ftr_fixup = .;
-@@ -139,14 +137,14 @@ SECTIONS
- #endif
- #ifdef CONFIG_BLK_DEV_INITRD
- 	. = ALIGN(PAGE_SIZE);
--	.init.ramfs : {
-+	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
- 		__initramfs_start = .;
- 		*(.init.ramfs)
- 		__initramfs_end = .;
- 	}
- #endif
- 	. = ALIGN(PAGE_SIZE);
--	.data.percpu : {
-+	.data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {
- 		__per_cpu_start = .;
- 		*(.data.percpu)
- 		*(.data.percpu.shared_aligned)
-@@ -154,7 +152,7 @@ SECTIONS
- 	}
- 
- 	. = ALIGN(8);
--	.machine.desc : {
-+	.machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) {
- 		__machine_desc_start = . ;
- 		*(.machine.desc)
- 		__machine_desc_end = . ;
-@@ -172,25 +170,24 @@ SECTIONS
- 	_sdata = .;
- 
- #ifdef CONFIG_PPC32
--	.data    :
--	{
-+	.data : AT(ADDR(.data) - LOAD_OFFSET) {
- 		DATA_DATA
- 		*(.sdata)
- 		*(.got.plt) *(.got)
- 	}
- #else
--	.data : {
-+	.data : AT(ADDR(.data) - LOAD_OFFSET) {
- 		DATA_DATA
- 		*(.data.rel*)
- 		*(.toc1)
- 		*(.branch_lt)
- 	}
- 
--	.opd : {
-+	.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
- 		*(.opd)
- 	}
- 
--	.got : {
-+	.got : AT(ADDR(.got) - LOAD_OFFSET) {
- 		__toc_start = .;
- 		*(.got)
- 		*(.toc)
-@@ -207,26 +204,26 @@ SECTIONS
- #else
- 	. = ALIGN(16384);
- #endif
--	.data.init_task : {
-+	.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
- 		*(.data.init_task)
- 	}
- 
- 	. = ALIGN(PAGE_SIZE);
--	.data.page_aligned : {
-+	.data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
- 		*(.data.page_aligned)
- 	}
- 
--	.data.cacheline_aligned : {
-+	.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
- 		*(.data.cacheline_aligned)
- 	}
- 
- 	. = ALIGN(L1_CACHE_BYTES);
--	.data.read_mostly : {
-+	.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
- 		*(.data.read_mostly)
- 	}
- 
- 	. = ALIGN(PAGE_SIZE);
--	__data_nosave : {
-+	.data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
- 		__nosave_begin = .;
- 		*(.data.nosave)
- 		. = ALIGN(PAGE_SIZE);
-@@ -237,7 +234,7 @@ SECTIONS
-  * And finally the bss
-  */
- 
--	.bss : {
-+	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
- 		__bss_start = .;
- 		*(.sbss) *(.scommon)
- 		*(.dynbss)
---- a/arch/powerpc/lib/rheap.c
-+++ b/arch/powerpc/lib/rheap.c
-@@ -54,7 +54,7 @@ static int grow(rh_info_t * info, int ma
- 
- 	new_blocks = max_blocks - info->max_blocks;
- 
--	block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_KERNEL);
-+	block = kmalloc(sizeof(rh_block_t) * max_blocks, GFP_ATOMIC);
- 	if (block == NULL)
- 		return -ENOMEM;
- 
-@@ -258,7 +258,7 @@ rh_info_t *rh_create(unsigned int alignm
- 	if ((alignment & (alignment - 1)) != 0)
- 		return ERR_PTR(-EINVAL);
- 
--	info = kmalloc(sizeof(*info), GFP_KERNEL);
-+	info = kmalloc(sizeof(*info), GFP_ATOMIC);
- 	if (info == NULL)
- 		return ERR_PTR(-ENOMEM);
- 
---- a/arch/powerpc/lib/string.S
-+++ b/arch/powerpc/lib/string.S
-@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
- 	beq	1b
- 	blr
- 
-+_GLOBAL(strncmp)
-+	PPC_LCMPI r5,0
-+	beqlr
-+	mtctr	r5
-+	addi	r5,r3,-1
-+	addi	r4,r4,-1
-+1:	lbzu	r3,1(r5)
-+	cmpwi	1,r3,0
-+	lbzu	r0,1(r4)
-+	subf.	r3,r0,r3
-+	beqlr	1
-+	bdnzt	eq,1b
-+	blr
-+
- _GLOBAL(strlen)
- 	addi	r4,r3,-1
- 1:	lbzu	r0,1(r4)
---- a/arch/powerpc/math-emu/fabs.c
-+++ b/arch/powerpc/math-emu/fabs.c
-@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fadd.c
-+++ b/arch/powerpc/math-emu/fadd.c
-@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fadds.c
-+++ b/arch/powerpc/math-emu/fadds.c
-@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fcmpo.c
-+++ b/arch/powerpc/math-emu/fcmpo.c
-@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, voi
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-+	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fcmpu.c
-+++ b/arch/powerpc/math-emu/fcmpu.c
-@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, voi
- 	long cmp;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
-+	printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fctiw.c
-+++ b/arch/powerpc/math-emu/fctiw.c
-@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
- 	frD[1] = r;
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fctiwz.c
-+++ b/arch/powerpc/math-emu/fctiwz.c
-@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
- 	__FPU_FPSCR = fpscr;
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fdiv.c
-+++ b/arch/powerpc/math-emu/fdiv.c
-@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
-@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)
- 	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
- 		ret |= EFLAG_VXZDZ;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXZDZ raised\n", __func__);
- #endif
- 	}
- 	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
- 		ret |= EFLAG_VXIDI;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXIDI raised\n", __func__);
- #endif
- 	}
- 
---- a/arch/powerpc/math-emu/fdivs.c
-+++ b/arch/powerpc/math-emu/fdivs.c
-@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
-@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)
- 	if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
- 		ret |= EFLAG_VXZDZ;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXZDZ raised\n", __func__);
- #endif
- 	}
- 	if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
- 		ret |= EFLAG_VXIDI;
- #ifdef DEBUG
--		printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
-+		printk("%s: FPSCR_VXIDI raised\n", __func__);
- #endif
- 	}
- 
---- a/arch/powerpc/math-emu/fmadd.c
-+++ b/arch/powerpc/math-emu/fmadd.c
-@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, v
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmadds.c
-+++ b/arch/powerpc/math-emu/fmadds.c
-@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmr.c
-+++ b/arch/powerpc/math-emu/fmr.c
-@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fmsub.c
-+++ b/arch/powerpc/math-emu/fmsub.c
-@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, v
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmsubs.c
-+++ b/arch/powerpc/math-emu/fmsubs.c
-@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmul.c
-+++ b/arch/powerpc/math-emu/fmul.c
-@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fmuls.c
-+++ b/arch/powerpc/math-emu/fmuls.c
-@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnabs.c
-+++ b/arch/powerpc/math-emu/fnabs.c
-@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fneg.c
-+++ b/arch/powerpc/math-emu/fneg.c
-@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
- 	frD[1] = frB[1];
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p: ", __func__, frD, frB);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/fnmadd.c
-+++ b/arch/powerpc/math-emu/fnmadd.c
-@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmadds.c
-+++ b/arch/powerpc/math-emu/fnmadds.c
-@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB,
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmsub.c
-+++ b/arch/powerpc/math-emu/fnmsub.c
-@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB, 
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fnmsubs.c
-+++ b/arch/powerpc/math-emu/fnmsubs.c
-@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB,
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fres.c
-+++ b/arch/powerpc/math-emu/fres.c
-@@ -6,7 +6,7 @@ int
- fres(void *frD, void *frB)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p\n", __func__, frD, frB);
- #endif
- 	return -ENOSYS;
- }
---- a/arch/powerpc/math-emu/frsp.c
-+++ b/arch/powerpc/math-emu/frsp.c
-@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
- 	FP_DECL_D(B);
- 
- #ifdef DEBUG
--	printk("%s: D %p, B %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: D %p, B %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/frsqrte.c
-+++ b/arch/powerpc/math-emu/frsqrte.c
-@@ -6,7 +6,7 @@ int
- frsqrte(void *frD, void *frB)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p\n", __func__, frD, frB);
- #endif
- 	return 0;
- }
---- a/arch/powerpc/math-emu/fsel.c
-+++ b/arch/powerpc/math-emu/fsel.c
-@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32 
- 	FP_DECL_D(A);
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fsqrt.c
-+++ b/arch/powerpc/math-emu/fsqrt.c
-@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/fsqrts.c
-+++ b/arch/powerpc/math-emu/fsqrts.c
-@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
-+	printk("%s: %p %p %p %p\n", __func__, frD, frB);
- #endif
- 
- 	__FP_UNPACK_D(B, frB);
---- a/arch/powerpc/math-emu/fsub.c
-+++ b/arch/powerpc/math-emu/fsub.c
-@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/fsubs.c
-+++ b/arch/powerpc/math-emu/fsubs.c
-@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
- 	int ret = 0;
- 
- #ifdef DEBUG
--	printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
-+	printk("%s: %p %p %p\n", __func__, frD, frA, frB);
- #endif
- 
- 	__FP_UNPACK_D(A, frA);
---- a/arch/powerpc/math-emu/lfd.c
-+++ b/arch/powerpc/math-emu/lfd.c
-@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)
- 	if (copy_from_user(frD, ea, sizeof(double)))
- 		return -EFAULT;
- #ifdef DEBUG
--	printk("%s: D %p, ea %p: ", __FUNCTION__, frD, ea);
-+	printk("%s: D %p, ea %p: ", __func__, frD, ea);
- 	dump_double(frD);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/lfs.c
-+++ b/arch/powerpc/math-emu/lfs.c
-@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
- 	float f;
- 
- #ifdef DEBUG
--	printk("%s: D %p, ea %p\n", __FUNCTION__, frD, ea);
-+	printk("%s: D %p, ea %p\n", __func__, frD, ea);
- #endif
- 
- 	if (copy_from_user(&f, ea, sizeof(float)))
---- a/arch/powerpc/math-emu/mcrfs.c
-+++ b/arch/powerpc/math-emu/mcrfs.c
-@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
- 	u32 value, clear;
- 
- #ifdef DEBUG
--	printk("%s: %p (%08x) %d %d\n", __FUNCTION__, ccr, *ccr, crfD, crfS);
-+	printk("%s: %p (%08x) %d %d\n", __func__, ccr, *ccr, crfD, crfS);
- #endif
- 
- 	clear = 15 << ((7 - crfS) << 2);
-@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
- 	*ccr |= (value << ((7 - crfD) << 2));
- 
- #ifdef DEBUG
--	printk("CR: %08x\n", __FUNCTION__, *ccr);
-+	printk("CR: %08x\n", __func__, *ccr);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mffs.c
-+++ b/arch/powerpc/math-emu/mffs.c
-@@ -10,7 +10,7 @@ mffs(u32 *frD)
- 	frD[1] = __FPU_FPSCR;
- 
- #ifdef DEBUG
--	printk("%s: frD %p: %08x.%08x\n", __FUNCTION__, frD, frD[0], frD[1]);
-+	printk("%s: frD %p: %08x.%08x\n", __func__, frD, frD[0], frD[1]);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsb0.c
-+++ b/arch/powerpc/math-emu/mtfsb0.c
-@@ -11,7 +11,7 @@ mtfsb0(int crbD)
- 		__FPU_FPSCR &= ~(1 << (31 - crbD));
- 
- #ifdef DEBUG
--	printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-+	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsb1.c
-+++ b/arch/powerpc/math-emu/mtfsb1.c
-@@ -11,7 +11,7 @@ mtfsb1(int crbD)
- 		__FPU_FPSCR |= (1 << (31 - crbD));
- 
- #ifdef DEBUG
--	printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
-+	printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsf.c
-+++ b/arch/powerpc/math-emu/mtfsf.c
-@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
- 	__FPU_FPSCR |= (frB[1] & mask);
- 
- #ifdef DEBUG
--	printk("%s: %02x %p: %08lx\n", __FUNCTION__, FM, frB, __FPU_FPSCR);
-+	printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/mtfsfi.c
-+++ b/arch/powerpc/math-emu/mtfsfi.c
-@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int I
- 	__FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
- 
- #ifdef DEBUG
--	printk("%s: %d %x: %08lx\n", __FUNCTION__, crfD, IMM, __FPU_FPSCR);
-+	printk("%s: %d %x: %08lx\n", __func__, crfD, IMM, __FPU_FPSCR);
- #endif
- 
- 	return 0;
---- a/arch/powerpc/math-emu/stfd.c
-+++ b/arch/powerpc/math-emu/stfd.c
-@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
- {
- #if 0
- #ifdef DEBUG
--	printk("%s: S %p, ea %p: ", __FUNCTION__, frS, ea);
-+	printk("%s: S %p, ea %p: ", __func__, frS, ea);
- 	dump_double(frS);
- 	printk("\n");
- #endif
---- a/arch/powerpc/math-emu/stfiwx.c
-+++ b/arch/powerpc/math-emu/stfiwx.c
-@@ -6,7 +6,7 @@ int
- stfiwx(u32 *frS, void *ea)
- {
- #ifdef DEBUG
--	printk("%s: %p %p\n", __FUNCTION__, frS, ea);
-+	printk("%s: %p %p\n", __func__, frS, ea);
- #endif
- 
- 	if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
---- a/arch/powerpc/math-emu/stfs.c
-+++ b/arch/powerpc/math-emu/stfs.c
-@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
- 	int err;
- 
- #ifdef DEBUG
--	printk("%s: S %p, ea %p\n", __FUNCTION__, frS, ea);
-+	printk("%s: S %p, ea %p\n", __func__, frS, ea);
- #endif
- 
- 	__FP_UNPACK_D(A, frS);
---- a/arch/powerpc/mm/40x_mmu.c
-+++ b/arch/powerpc/mm/40x_mmu.c
-@@ -97,7 +97,7 @@ unsigned long __init mmu_mapin_ram(void)
- 	phys_addr_t p;
- 
- 	v = KERNELBASE;
--	p = PPC_MEMSTART;
-+	p = 0;
- 	s = total_lowmem;
- 
- 	if (__map_without_ltlbs)
---- a/arch/powerpc/mm/44x_mmu.c
-+++ b/arch/powerpc/mm/44x_mmu.c
-@@ -67,7 +67,7 @@ unsigned long __init mmu_mapin_ram(void)
- 
- 	/* Pin in enough TLBs to cover any lowmem not covered by the
- 	 * initial 256M mapping established in head_44x.S */
--	for (addr = PPC_PIN_SIZE; addr < total_lowmem;
-+	for (addr = PPC_PIN_SIZE; addr < lowmem_end_addr;
- 	     addr += PPC_PIN_SIZE)
- 		ppc44x_pin_tlb(addr + PAGE_OFFSET, addr);
- 
---- a/arch/powerpc/mm/Makefile
-+++ b/arch/powerpc/mm/Makefile
-@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)
- EXTRA_CFLAGS	+= -mno-minimal-toc
- endif
- 
--obj-y				:= fault.o mem.o lmb.o \
-+obj-y				:= fault.o mem.o \
- 				   init_$(CONFIG_WORD_SIZE).o \
- 				   pgtable_$(CONFIG_WORD_SIZE).o \
- 				   mmu_context_$(CONFIG_WORD_SIZE).o
---- a/arch/powerpc/mm/fsl_booke_mmu.c
-+++ b/arch/powerpc/mm/fsl_booke_mmu.c
-@@ -49,18 +49,15 @@
- #include <asm/mmu.h>
- #include <asm/uaccess.h>
- #include <asm/smp.h>
--#include <asm/bootx.h>
- #include <asm/machdep.h>
- #include <asm/setup.h>
- 
-+#include "mmu_decl.h"
-+
- extern void loadcam_entry(unsigned int index);
- unsigned int tlbcam_index;
- unsigned int num_tlbcam_entries;
- static unsigned long __cam0, __cam1, __cam2;
--extern unsigned long total_lowmem;
--extern unsigned long __max_low_memory;
--extern unsigned long __initial_memory_limit;
--#define MAX_LOW_MEM	CONFIG_LOWMEM_SIZE
- 
- #define NUM_TLBCAMS	(16)
- 
-@@ -165,15 +162,15 @@ void invalidate_tlbcam_entry(int index)
- void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
- 		unsigned long cam2)
- {
--	settlbcam(0, PAGE_OFFSET, PPC_MEMSTART, cam0, _PAGE_KERNEL, 0);
-+	settlbcam(0, PAGE_OFFSET, memstart_addr, cam0, _PAGE_KERNEL, 0);
- 	tlbcam_index++;
- 	if (cam1) {
- 		tlbcam_index++;
--		settlbcam(1, PAGE_OFFSET+cam0, PPC_MEMSTART+cam0, cam1, _PAGE_KERNEL, 0);
-+		settlbcam(1, PAGE_OFFSET+cam0, memstart_addr+cam0, cam1, _PAGE_KERNEL, 0);
- 	}
- 	if (cam2) {
- 		tlbcam_index++;
--		settlbcam(2, PAGE_OFFSET+cam0+cam1, PPC_MEMSTART+cam0+cam1, cam2, _PAGE_KERNEL, 0);
-+		settlbcam(2, PAGE_OFFSET+cam0+cam1, memstart_addr+cam0+cam1, cam2, _PAGE_KERNEL, 0);
- 	}
- }
- 
-@@ -196,35 +193,32 @@ unsigned long __init mmu_mapin_ram(void)
- void __init
- adjust_total_lowmem(void)
- {
--	unsigned long max_low_mem = MAX_LOW_MEM;
--	unsigned long cam_max = 0x10000000;
--	unsigned long ram;
--
--	/* adjust CAM size to max_low_mem */
--	if (max_low_mem < cam_max)
--		cam_max = max_low_mem;
--
--	/* adjust lowmem size to max_low_mem */
--	if (max_low_mem < total_lowmem)
--		ram = max_low_mem;
--	else
--		ram = total_lowmem;
-+	phys_addr_t max_lowmem_size = __max_low_memory;
-+	phys_addr_t cam_max_size = 0x10000000;
-+	phys_addr_t ram;
-+
-+	/* adjust CAM size to max_lowmem_size */
-+	if (max_lowmem_size < cam_max_size)
-+		cam_max_size = max_lowmem_size;
-+
-+	/* adjust lowmem size to max_lowmem_size */
-+	ram = min(max_lowmem_size, total_lowmem);
- 
- 	/* Calculate CAM values */
- 	__cam0 = 1UL << 2 * (__ilog2(ram) / 2);
--	if (__cam0 > cam_max)
--		__cam0 = cam_max;
-+	if (__cam0 > cam_max_size)
-+		__cam0 = cam_max_size;
- 	ram -= __cam0;
- 	if (ram) {
- 		__cam1 = 1UL << 2 * (__ilog2(ram) / 2);
--		if (__cam1 > cam_max)
--			__cam1 = cam_max;
-+		if (__cam1 > cam_max_size)
-+			__cam1 = cam_max_size;
- 		ram -= __cam1;
- 	}
- 	if (ram) {
- 		__cam2 = 1UL << 2 * (__ilog2(ram) / 2);
--		if (__cam2 > cam_max)
--			__cam2 = cam_max;
-+		if (__cam2 > cam_max_size)
-+			__cam2 = cam_max_size;
- 		ram -= __cam2;
- 	}
- 
-@@ -232,6 +226,6 @@ adjust_total_lowmem(void)
- 			" CAM2=%ldMb residual: %ldMb\n",
- 			__cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
- 			(total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
--	__max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2;
--	__initial_memory_limit = __max_low_memory;
-+	__max_low_memory = __cam0 + __cam1 + __cam2;
-+	__initial_memory_limit_addr = memstart_addr + __max_low_memory;
- }
---- a/arch/powerpc/mm/hash_utils_64.c
-+++ b/arch/powerpc/mm/hash_utils_64.c
-@@ -31,6 +31,7 @@
- #include <linux/cache.h>
- #include <linux/init.h>
- #include <linux/signal.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/pgtable.h>
-@@ -41,7 +42,7 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/abs_addr.h>
- #include <asm/tlbflush.h>
- #include <asm/io.h>
-@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vsta
- 	return ret < 0 ? ret : 0;
- }
- 
-+#ifdef CONFIG_MEMORY_HOTPLUG
-+static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
-+		      int psize, int ssize)
-+{
-+	unsigned long vaddr;
-+	unsigned int step, shift;
-+
-+	shift = mmu_psize_defs[psize].shift;
-+	step = 1 << shift;
-+
-+	if (!ppc_md.hpte_removebolted) {
-+		printk(KERN_WARNING "Platform doesn't implement "
-+				"hpte_removebolted\n");
-+		return -EINVAL;
-+	}
-+
-+	for (vaddr = vstart; vaddr < vend; vaddr += step)
-+		ppc_md.hpte_removebolted(vaddr, psize, ssize);
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MEMORY_HOTPLUG */
-+
- static int __init htab_dt_scan_seg_sizes(unsigned long node,
- 					 const char *uname, int depth,
- 					 void *data)
-@@ -434,6 +458,12 @@ void create_section_mapping(unsigned lon
- 			_PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
- 			mmu_linear_psize, mmu_kernel_ssize));
- }
-+
-+int remove_section_mapping(unsigned long start, unsigned long end)
-+{
-+	return htab_remove_mapping(start, end, mmu_linear_psize,
-+			mmu_kernel_ssize);
-+}
- #endif /* CONFIG_MEMORY_HOTPLUG */
- 
- static inline void make_bl(unsigned int *insn_addr, void *func)
---- a/arch/powerpc/mm/init_32.c
-+++ b/arch/powerpc/mm/init_32.c
-@@ -30,6 +30,7 @@
- #include <linux/highmem.h>
- #include <linux/initrd.h>
- #include <linux/pagemap.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/prom.h>
-@@ -41,7 +42,6 @@
- #include <asm/machdep.h>
- #include <asm/btext.h>
- #include <asm/tlb.h>
--#include <asm/lmb.h>
- #include <asm/sections.h>
- 
- #include "mmu_decl.h"
-@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga
- unsigned long total_memory;
- unsigned long total_lowmem;
- 
--unsigned long ppc_memstart;
--unsigned long ppc_memoffset = PAGE_OFFSET;
-+phys_addr_t memstart_addr;
-+phys_addr_t lowmem_end_addr;
- 
- int boot_mapsize;
- #ifdef CONFIG_PPC_PMAC
-@@ -95,10 +95,10 @@ int __map_without_ltlbs;
- unsigned long __max_low_memory = MAX_LOW_MEM;
- 
- /*
-- * limit of what is accessible with initial MMU setup -
-+ * address of the limit of what is accessible with initial MMU setup -
-  * 256MB usually, but only 16MB on 601.
-  */
--unsigned long __initial_memory_limit = 0x10000000;
-+phys_addr_t __initial_memory_limit_addr = (phys_addr_t)0x10000000;
- 
- /*
-  * Check for command-line options that affect what MMU_init will do.
-@@ -131,10 +131,10 @@ void __init MMU_init(void)
- 
- 	/* 601 can only access 16MB at the moment */
- 	if (PVR_VER(mfspr(SPRN_PVR)) == 1)
--		__initial_memory_limit = 0x01000000;
-+		__initial_memory_limit_addr = 0x01000000;
- 	/* 8xx can only access 8MB at the moment */
- 	if (PVR_VER(mfspr(SPRN_PVR)) == 0x50)
--		__initial_memory_limit = 0x00800000;
-+		__initial_memory_limit_addr = 0x00800000;
- 
- 	/* parse args from command line */
- 	MMU_setup();
-@@ -145,8 +145,8 @@ void __init MMU_init(void)
- 		printk(KERN_WARNING "Only using first contiguous memory region");
- 	}
- 
--	total_memory = lmb_end_of_DRAM();
--	total_lowmem = total_memory;
-+	total_lowmem = total_memory = lmb_end_of_DRAM() - memstart_addr;
-+	lowmem_end_addr = memstart_addr + total_lowmem;
- 
- #ifdef CONFIG_FSL_BOOKE
- 	/* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
-@@ -157,9 +157,10 @@ void __init MMU_init(void)
- 
- 	if (total_lowmem > __max_low_memory) {
- 		total_lowmem = __max_low_memory;
-+		lowmem_end_addr = memstart_addr + total_lowmem;
- #ifndef CONFIG_HIGHMEM
- 		total_memory = total_lowmem;
--		lmb_enforce_memory_limit(total_lowmem);
-+		lmb_enforce_memory_limit(lowmem_end_addr);
- 		lmb_analyze();
- #endif /* CONFIG_HIGHMEM */
- 	}
-@@ -184,8 +185,6 @@ void __init MMU_init(void)
- 	/* Map in I/O resources */
- 	if (ppc_md.progress)
- 		ppc_md.progress("MMU:setio", 0x302);
--	if (ppc_md.setup_io_mappings)
--		ppc_md.setup_io_mappings();
- 
- 	/* Initialize the context management stuff */
- 	mmu_context_init();
-@@ -208,7 +207,7 @@ void __init *early_get_page(void)
- 		p = alloc_bootmem_pages(PAGE_SIZE);
- 	} else {
- 		p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
--					__initial_memory_limit));
-+					__initial_memory_limit_addr));
- 	}
- 	return p;
- }
-@@ -276,7 +275,7 @@ static int __init setup_kcore(void)
- 
- 		kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
- 		if (!kcore_mem)
--			panic("%s: kmalloc failed\n", __FUNCTION__);
-+			panic("%s: kmalloc failed\n", __func__);
- 
- 		/* must stay under 32 bits */
- 		if ( 0xfffffffful - (unsigned long)__va(base) < size) {
---- a/arch/powerpc/mm/init_64.c
-+++ b/arch/powerpc/mm/init_64.c
-@@ -38,11 +38,11 @@
- #include <linux/nodemask.h>
- #include <linux/module.h>
- #include <linux/poison.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/page.h>
- #include <asm/prom.h>
--#include <asm/lmb.h>
- #include <asm/rtas.h>
- #include <asm/io.h>
- #include <asm/mmu_context.h>
-@@ -72,8 +72,7 @@
- #warning TASK_SIZE is smaller than it needs to be.
- #endif
- 
--/* max amount of RAM to use */
--unsigned long __max_memory;
-+phys_addr_t memstart_addr;
- 
- void free_initmem(void)
- {
-@@ -122,7 +121,7 @@ static int __init setup_kcore(void)
- 		/* GFP_ATOMIC to avoid might_sleep warnings during boot */
- 		kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
- 		if (!kcore_mem)
--			panic("%s: kmalloc failed\n", __FUNCTION__);
-+			panic("%s: kmalloc failed\n", __func__);
- 
- 		kclist_add(kcore_mem, __va(base), size);
- 	}
---- a/arch/powerpc/mm/lmb.c
-+++ /dev/null
-@@ -1,357 +0,0 @@
--/*
-- * Procedures for maintaining information about logical memory blocks.
-- *
-- * Peter Bergner, IBM Corp.	June 2001.
-- * Copyright (C) 2001 Peter Bergner.
-- * 
-- *      This program is free software; you can redistribute it and/or
-- *      modify it under the terms of the GNU General Public License
-- *      as published by the Free Software Foundation; either version
-- *      2 of the License, or (at your option) any later version.
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/bitops.h>
--#include <asm/types.h>
--#include <asm/page.h>
--#include <asm/prom.h>
--#include <asm/lmb.h>
--#ifdef CONFIG_PPC32
--#include "mmu_decl.h"		/* for __max_low_memory */
--#endif
--
--#undef DEBUG
--
--#ifdef DEBUG
--#include <asm/udbg.h>
--#define DBG(fmt...) udbg_printf(fmt)
--#else
--#define DBG(fmt...)
--#endif
--
--#define LMB_ALLOC_ANYWHERE	0
--
--struct lmb lmb;
--
--void lmb_dump_all(void)
--{
--#ifdef DEBUG
--	unsigned long i;
--
--	DBG("lmb_dump_all:\n");
--	DBG("    memory.cnt		  = 0x%lx\n", lmb.memory.cnt);
--	DBG("    memory.size		  = 0x%lx\n", lmb.memory.size);
--	for (i=0; i < lmb.memory.cnt ;i++) {
--		DBG("    memory.region[0x%x].base       = 0x%lx\n",
--			    i, lmb.memory.region[i].base);
--		DBG("		      .size     = 0x%lx\n",
--			    lmb.memory.region[i].size);
--	}
--
--	DBG("\n    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
--	DBG("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
--	for (i=0; i < lmb.reserved.cnt ;i++) {
--		DBG("    reserved.region[0x%x].base       = 0x%lx\n",
--			    i, lmb.reserved.region[i].base);
--		DBG("		      .size     = 0x%lx\n",
--			    lmb.reserved.region[i].size);
--	}
--#endif /* DEBUG */
--}
--
--static unsigned long __init lmb_addrs_overlap(unsigned long base1,
--		unsigned long size1, unsigned long base2, unsigned long size2)
--{
--	return ((base1 < (base2+size2)) && (base2 < (base1+size1)));
--}
--
--static long __init lmb_addrs_adjacent(unsigned long base1, unsigned long size1,
--		unsigned long base2, unsigned long size2)
--{
--	if (base2 == base1 + size1)
--		return 1;
--	else if (base1 == base2 + size2)
--		return -1;
--
--	return 0;
--}
--
--static long __init lmb_regions_adjacent(struct lmb_region *rgn,
--		unsigned long r1, unsigned long r2)
--{
--	unsigned long base1 = rgn->region[r1].base;
--	unsigned long size1 = rgn->region[r1].size;
--	unsigned long base2 = rgn->region[r2].base;
--	unsigned long size2 = rgn->region[r2].size;
--
--	return lmb_addrs_adjacent(base1, size1, base2, size2);
--}
--
--static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
--{
--	unsigned long i;
--
--	for (i = r; i < rgn->cnt - 1; i++) {
--		rgn->region[i].base = rgn->region[i + 1].base;
--		rgn->region[i].size = rgn->region[i + 1].size;
--	}
--	rgn->cnt--;
--}
--
--/* Assumption: base addr of region 1 < base addr of region 2 */
--static void __init lmb_coalesce_regions(struct lmb_region *rgn,
--		unsigned long r1, unsigned long r2)
--{
--	rgn->region[r1].size += rgn->region[r2].size;
--	lmb_remove_region(rgn, r2);
--}
--
--/* This routine called with relocation disabled. */
--void __init lmb_init(void)
--{
--	/* Create a dummy zero size LMB which will get coalesced away later.
--	 * This simplifies the lmb_add() code below...
--	 */
--	lmb.memory.region[0].base = 0;
--	lmb.memory.region[0].size = 0;
--	lmb.memory.cnt = 1;
--
--	/* Ditto. */
--	lmb.reserved.region[0].base = 0;
--	lmb.reserved.region[0].size = 0;
--	lmb.reserved.cnt = 1;
--}
--
--/* This routine may be called with relocation disabled. */
--void __init lmb_analyze(void)
--{
--	int i;
--
--	lmb.memory.size = 0;
--
--	for (i = 0; i < lmb.memory.cnt; i++)
--		lmb.memory.size += lmb.memory.region[i].size;
--}
--
--/* This routine called with relocation disabled. */
--static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base,
--				  unsigned long size)
--{
--	unsigned long coalesced = 0;
--	long adjacent, i;
--
--	/* First try and coalesce this LMB with another. */
--	for (i=0; i < rgn->cnt; i++) {
--		unsigned long rgnbase = rgn->region[i].base;
--		unsigned long rgnsize = rgn->region[i].size;
--
--		if ((rgnbase == base) && (rgnsize == size))
--			/* Already have this region, so we're done */
--			return 0;
--
--		adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize);
--		if ( adjacent > 0 ) {
--			rgn->region[i].base -= size;
--			rgn->region[i].size += size;
--			coalesced++;
--			break;
--		}
--		else if ( adjacent < 0 ) {
--			rgn->region[i].size += size;
--			coalesced++;
--			break;
--		}
--	}
--
--	if ((i < rgn->cnt-1) && lmb_regions_adjacent(rgn, i, i+1) ) {
--		lmb_coalesce_regions(rgn, i, i+1);
--		coalesced++;
--	}
--
--	if (coalesced)
--		return coalesced;
--	if (rgn->cnt >= MAX_LMB_REGIONS)
--		return -1;
--
--	/* Couldn't coalesce the LMB, so add it to the sorted table. */
--	for (i = rgn->cnt-1; i >= 0; i--) {
--		if (base < rgn->region[i].base) {
--			rgn->region[i+1].base = rgn->region[i].base;
--			rgn->region[i+1].size = rgn->region[i].size;
--		} else {
--			rgn->region[i+1].base = base;
--			rgn->region[i+1].size = size;
--			break;
--		}
--	}
--	rgn->cnt++;
--
--	return 0;
--}
--
--/* This routine may be called with relocation disabled. */
--long __init lmb_add(unsigned long base, unsigned long size)
--{
--	struct lmb_region *_rgn = &(lmb.memory);
--
--	/* On pSeries LPAR systems, the first LMB is our RMO region. */
--	if (base == 0)
--		lmb.rmo_size = size;
--
--	return lmb_add_region(_rgn, base, size);
--
--}
--
--long __init lmb_reserve(unsigned long base, unsigned long size)
--{
--	struct lmb_region *_rgn = &(lmb.reserved);
--
--	BUG_ON(0 == size);
--
--	return lmb_add_region(_rgn, base, size);
--}
--
--long __init lmb_overlaps_region(struct lmb_region *rgn, unsigned long base,
--				unsigned long size)
--{
--	unsigned long i;
--
--	for (i=0; i < rgn->cnt; i++) {
--		unsigned long rgnbase = rgn->region[i].base;
--		unsigned long rgnsize = rgn->region[i].size;
--		if ( lmb_addrs_overlap(base,size,rgnbase,rgnsize) ) {
--			break;
--		}
--	}
--
--	return (i < rgn->cnt) ? i : -1;
--}
--
--unsigned long __init lmb_alloc(unsigned long size, unsigned long align)
--{
--	return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
--}
--
--unsigned long __init lmb_alloc_base(unsigned long size, unsigned long align,
--				    unsigned long max_addr)
--{
--	unsigned long alloc;
--
--	alloc = __lmb_alloc_base(size, align, max_addr);
--
--	if (alloc == 0)
--		panic("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
--				size, max_addr);
--
--	return alloc;
--}
--
--unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
--				    unsigned long max_addr)
--{
--	long i, j;
--	unsigned long base = 0;
--
--	BUG_ON(0 == size);
--
--#ifdef CONFIG_PPC32
--	/* On 32-bit, make sure we allocate lowmem */
--	if (max_addr == LMB_ALLOC_ANYWHERE)
--		max_addr = __max_low_memory;
--#endif
--	for (i = lmb.memory.cnt-1; i >= 0; i--) {
--		unsigned long lmbbase = lmb.memory.region[i].base;
--		unsigned long lmbsize = lmb.memory.region[i].size;
--
--		if (max_addr == LMB_ALLOC_ANYWHERE)
--			base = _ALIGN_DOWN(lmbbase + lmbsize - size, align);
--		else if (lmbbase < max_addr) {
--			base = min(lmbbase + lmbsize, max_addr);
--			base = _ALIGN_DOWN(base - size, align);
--		} else
--			continue;
--
--		while ((lmbbase <= base) &&
--		       ((j = lmb_overlaps_region(&lmb.reserved, base, size)) >= 0) )
--			base = _ALIGN_DOWN(lmb.reserved.region[j].base - size,
--					   align);
--
--		if ((base != 0) && (lmbbase <= base))
--			break;
--	}
--
--	if (i < 0)
--		return 0;
--
--	lmb_add_region(&lmb.reserved, base, size);
--
--	return base;
--}
--
--/* You must call lmb_analyze() before this. */
--unsigned long __init lmb_phys_mem_size(void)
--{
--	return lmb.memory.size;
--}
--
--unsigned long __init lmb_end_of_DRAM(void)
--{
--	int idx = lmb.memory.cnt - 1;
--
--	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
--}
--
--/* You must call lmb_analyze() after this. */
--void __init lmb_enforce_memory_limit(unsigned long memory_limit)
--{
--	unsigned long i, limit;
--	struct lmb_property *p;
--
--	if (! memory_limit)
--		return;
--
--	/* Truncate the lmb regions to satisfy the memory limit. */
--	limit = memory_limit;
--	for (i = 0; i < lmb.memory.cnt; i++) {
--		if (limit > lmb.memory.region[i].size) {
--			limit -= lmb.memory.region[i].size;
--			continue;
--		}
--
--		lmb.memory.region[i].size = limit;
--		lmb.memory.cnt = i + 1;
--		break;
--	}
--
--	if (lmb.memory.region[0].size < lmb.rmo_size)
--		lmb.rmo_size = lmb.memory.region[0].size;
--
--	/* And truncate any reserves above the limit also. */
--	for (i = 0; i < lmb.reserved.cnt; i++) {
--		p = &lmb.reserved.region[i];
--
--		if (p->base > memory_limit)
--			p->size = 0;
--		else if ((p->base + p->size) > memory_limit)
--			p->size = memory_limit - p->base;
--
--		if (p->size == 0) {
--			lmb_remove_region(&lmb.reserved, i);
--			i--;
--		}
--	}
--}
--
--int __init lmb_is_reserved(unsigned long addr)
--{
--	int i;
--
--	for (i = 0; i < lmb.reserved.cnt; i++) {
--		unsigned long upper = lmb.reserved.region[i].base +
--				      lmb.reserved.region[i].size - 1;
--		if ((addr >= lmb.reserved.region[i].base) && (addr <= upper))
--			return 1;
--	}
--	return 0;
--}
---- a/arch/powerpc/mm/mem.c
-+++ b/arch/powerpc/mm/mem.c
-@@ -31,6 +31,7 @@
- #include <linux/initrd.h>
- #include <linux/pagemap.h>
- #include <linux/suspend.h>
-+#include <linux/lmb.h>
- 
- #include <asm/pgalloc.h>
- #include <asm/prom.h>
-@@ -42,7 +43,6 @@
- #include <asm/machdep.h>
- #include <asm/btext.h>
- #include <asm/tlb.h>
--#include <asm/lmb.h>
- #include <asm/sections.h>
- #include <asm/vdso.h>
- 
-@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start
- }
- #endif
- 
--int __devinit arch_add_memory(int nid, u64 start, u64 size)
-+int arch_add_memory(int nid, u64 start, u64 size)
- {
- 	struct pglist_data *pgdata;
- 	struct zone *zone;
-@@ -175,7 +175,6 @@ void show_mem(void)
- 
- 	printk("Mem-info:\n");
- 	show_free_areas();
--	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
- 	for_each_online_pgdat(pgdat) {
- 		unsigned long flags;
- 		pgdat_resize_lock(pgdat, &flags);
-@@ -217,9 +216,11 @@ void __init do_init_bootmem(void)
- 	unsigned long total_pages;
- 	int boot_mapsize;
- 
--	max_pfn = total_pages = lmb_end_of_DRAM() >> PAGE_SHIFT;
-+	max_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
-+	total_pages = (lmb_end_of_DRAM() - memstart_addr) >> PAGE_SHIFT;
- #ifdef CONFIG_HIGHMEM
- 	total_pages = total_lowmem >> PAGE_SHIFT;
-+	max_low_pfn = lowmem_end_addr >> PAGE_SHIFT;
- #endif
- 
- 	/*
-@@ -245,18 +246,18 @@ void __init do_init_bootmem(void)
- 	 * present.
- 	 */
- #ifdef CONFIG_HIGHMEM
--	free_bootmem_with_active_regions(0, total_lowmem >> PAGE_SHIFT);
-+	free_bootmem_with_active_regions(0, lowmem_end_addr >> PAGE_SHIFT);
- 
- 	/* reserve the sections we're already using */
- 	for (i = 0; i < lmb.reserved.cnt; i++) {
- 		unsigned long addr = lmb.reserved.region[i].base +
- 				     lmb_size_bytes(&lmb.reserved, i) - 1;
--		if (addr < total_lowmem)
-+		if (addr < lowmem_end_addr)
- 			reserve_bootmem(lmb.reserved.region[i].base,
- 					lmb_size_bytes(&lmb.reserved, i),
- 					BOOTMEM_DEFAULT);
--		else if (lmb.reserved.region[i].base < total_lowmem) {
--			unsigned long adjusted_size = total_lowmem -
-+		else if (lmb.reserved.region[i].base < lowmem_end_addr) {
-+			unsigned long adjusted_size = lowmem_end_addr -
- 				      lmb.reserved.region[i].base;
- 			reserve_bootmem(lmb.reserved.region[i].base,
- 					adjusted_size, BOOTMEM_DEFAULT);
-@@ -326,7 +327,7 @@ void __init paging_init(void)
- 	       (top_of_ram - total_ram) >> 20);
- 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
- #ifdef CONFIG_HIGHMEM
--	max_zone_pfns[ZONE_DMA] = total_lowmem >> PAGE_SHIFT;
-+	max_zone_pfns[ZONE_DMA] = lowmem_end_addr >> PAGE_SHIFT;
- 	max_zone_pfns[ZONE_HIGHMEM] = top_of_ram >> PAGE_SHIFT;
- #else
- 	max_zone_pfns[ZONE_DMA] = top_of_ram >> PAGE_SHIFT;
-@@ -381,7 +382,7 @@ void __init mem_init(void)
- 	{
- 		unsigned long pfn, highmem_mapnr;
- 
--		highmem_mapnr = total_lowmem >> PAGE_SHIFT;
-+		highmem_mapnr = lowmem_end_addr >> PAGE_SHIFT;
- 		for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) {
- 			struct page *page = pfn_to_page(pfn);
- 			if (lmb_is_reserved(pfn << PAGE_SHIFT))
---- a/arch/powerpc/mm/mmu_decl.h
-+++ b/arch/powerpc/mm/mmu_decl.h
-@@ -48,9 +48,11 @@ extern unsigned int num_tlbcam_entries;
- 
- extern unsigned long ioremap_bot;
- extern unsigned long __max_low_memory;
--extern unsigned long __initial_memory_limit;
-+extern phys_addr_t __initial_memory_limit_addr;
- extern unsigned long total_memory;
- extern unsigned long total_lowmem;
-+extern phys_addr_t memstart_addr;
-+extern phys_addr_t lowmem_end_addr;
- 
- /* ...and now those things that may be slightly different between processor
-  * architectures.  -- Dan
---- a/arch/powerpc/mm/numa.c
-+++ b/arch/powerpc/mm/numa.c
-@@ -17,8 +17,9 @@
- #include <linux/nodemask.h>
- #include <linux/cpu.h>
- #include <linux/notifier.h>
-+#include <linux/lmb.h>
- #include <asm/sparsemem.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/system.h>
- #include <asm/smp.h>
- 
---- a/arch/powerpc/mm/pgtable_32.c
-+++ b/arch/powerpc/mm/pgtable_32.c
-@@ -281,12 +281,13 @@ int map_page(unsigned long va, phys_addr
-  */
- void __init mapin_ram(void)
- {
--	unsigned long v, p, s, f;
-+	unsigned long v, s, f;
-+	phys_addr_t p;
- 	int ktext;
- 
- 	s = mmu_mapin_ram();
- 	v = KERNELBASE + s;
--	p = PPC_MEMSTART + s;
-+	p = memstart_addr + s;
- 	for (; s < total_lowmem; s += PAGE_SIZE) {
- 		ktext = ((char *) v >= _stext && (char *) v < etext);
- 		f = ktext ?_PAGE_RAM_TEXT : _PAGE_RAM;
---- a/arch/powerpc/mm/ppc_mmu_32.c
-+++ b/arch/powerpc/mm/ppc_mmu_32.c
-@@ -26,11 +26,11 @@
- #include <linux/mm.h>
- #include <linux/init.h>
- #include <linux/highmem.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/mmu.h>
- #include <asm/machdep.h>
--#include <asm/lmb.h>
- 
- #include "mmu_decl.h"
- 
-@@ -82,7 +82,6 @@ unsigned long __init mmu_mapin_ram(void)
- #else
- 	unsigned long tot, bl, done;
- 	unsigned long max_size = (256<<20);
--	unsigned long align;
- 
- 	if (__map_without_bats) {
- 		printk(KERN_DEBUG "RAM mapped without BATs\n");
-@@ -93,19 +92,13 @@ unsigned long __init mmu_mapin_ram(void)
- 
- 	/* Make sure we don't map a block larger than the
- 	   smallest alignment of the physical address. */
--	/* alignment of PPC_MEMSTART */
--	align = ~(PPC_MEMSTART-1) & PPC_MEMSTART;
--	/* set BAT block size to MIN(max_size, align) */
--	if (align && align < max_size)
--		max_size = align;
--
- 	tot = total_lowmem;
- 	for (bl = 128<<10; bl < max_size; bl <<= 1) {
- 		if (bl * 2 > tot)
- 			break;
- 	}
- 
--	setbat(2, KERNELBASE, PPC_MEMSTART, bl, _PAGE_RAM);
-+	setbat(2, KERNELBASE, 0, bl, _PAGE_RAM);
- 	done = (unsigned long)bat_addrs[2].limit - KERNELBASE + 1;
- 	if ((done < tot) && !bat_addrs[3].limit) {
- 		/* use BAT3 to cover a bit more */
-@@ -113,7 +106,7 @@ unsigned long __init mmu_mapin_ram(void)
- 		for (bl = 128<<10; bl < max_size; bl <<= 1)
- 			if (bl * 2 > tot)
- 				break;
--		setbat(3, KERNELBASE+done, PPC_MEMSTART+done, bl, _PAGE_RAM);
-+		setbat(3, KERNELBASE+done, done, bl, _PAGE_RAM);
- 		done = (unsigned long)bat_addrs[3].limit - KERNELBASE + 1;
- 	}
- 
-@@ -240,7 +233,7 @@ void __init MMU_init_hw(void)
- 	 */
- 	if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322);
- 	Hash = __va(lmb_alloc_base(Hash_size, Hash_size,
--				   __initial_memory_limit));
-+				   __initial_memory_limit_addr));
- 	cacheable_memzero(Hash, Hash_size);
- 	_SDR1 = __pa(Hash) | SDR1_LOW_BITS;
- 
---- a/arch/powerpc/mm/stab.c
-+++ b/arch/powerpc/mm/stab.c
-@@ -12,12 +12,14 @@
-  *      2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/lmb.h>
-+
- #include <asm/pgtable.h>
- #include <asm/mmu.h>
- #include <asm/mmu_context.h>
- #include <asm/paca.h>
- #include <asm/cputable.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/abs_addr.h>
- #include <asm/firmware.h>
- #include <asm/iseries/hv_call.h>
---- a/arch/powerpc/oprofile/cell/spu_task_sync.c
-+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
-@@ -68,7 +68,7 @@ static struct cached_info *get_cached_in
- 	if (spu_num >= num_spu_nodes) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Invalid index %d into spu info cache\n",
--		       __FUNCTION__, __LINE__, spu_num);
-+		       __func__, __LINE__, spu_num);
- 		ret_info = NULL;
- 		goto out;
- 	}
-@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu,
- 	if (!info) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: create vma_map failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		retval = -ENOMEM;
- 		goto err_alloc;
- 	}
-@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu,
- 	if (!new_map) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: create vma_map failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		retval = -ENOMEM;
- 		goto err_alloc;
- 	}
-@@ -171,7 +171,7 @@ static int release_cached_info(int spu_i
- 			printk(KERN_ERR "SPU_PROF: "
- 				"%s, line %d: "
- 				"Invalid index %d into spu info cache\n",
--				__FUNCTION__, __LINE__, spu_index);
-+				__func__, __LINE__, spu_index);
- 			goto out;
- 		}
- 		end = spu_index + 1;
-@@ -273,7 +273,7 @@ fail_no_image_cookie:
- 
- 	printk(KERN_ERR "SPU_PROF: "
- 		"%s, line %d: Cannot find dcookie for SPU binary\n",
--		__FUNCTION__, __LINE__);
-+		__func__, __LINE__);
- 	goto out;
- }
- 
-@@ -467,7 +467,7 @@ int spu_sync_stop(void)
- 	if (ret) {
- 		printk(KERN_ERR "SPU_PROF: "
- 			"%s, line %d: spu_switch_event_unregister returned %d\n",
--			__FUNCTION__, __LINE__, ret);
-+			__func__, __LINE__, ret);
- 		goto out;
- 	}
- 
---- a/arch/powerpc/oprofile/cell/vma_map.c
-+++ b/arch/powerpc/oprofile/cell/vma_map.c
-@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map
- 		kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
- 	if (!new) {
- 		printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		vma_map_free(map);
- 		return NULL;
- 	}
-@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma
- 	if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_ident parsing SPU ELF\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	if (ehdr.e_machine != EM_SPU) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_machine parsing SPU ELF\n",
--		       __FUNCTION__,  __LINE__);
-+		       __func__,  __LINE__);
- 		goto fail;
- 	}
- 	if (ehdr.e_type != ET_EXEC) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Unexpected e_type parsing SPU ELF\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	phdr_start = spu_elf_start + ehdr.e_phoff;
-@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma
- 	if (overlay_tbl_offset < 0) {
- 		printk(KERN_ERR "SPU_PROF: "
- 		       "%s, line %d: Error finding SPU overlay table\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		goto fail;
- 	}
- 	ovly_table = spu_elf_start + overlay_tbl_offset;
---- a/arch/powerpc/oprofile/op_model_cell.c
-+++ b/arch/powerpc/oprofile/op_model_cell.c
-@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 no
- 		 * failure to stop OProfile.
- 		 */
- 		printk(KERN_WARNING "%s: rtas returned: %d\n",
--		       __FUNCTION__, ret);
-+		       __func__, ret);
- }
- 
- static int pm_rtas_activate_signals(u32 node, u32 count)
-@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 
- 
- 		if (unlikely(ret)) {
- 			printk(KERN_WARNING "%s: rtas returned: %d\n",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			return -EIO;
- 		}
- 	}
-@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_coun
- 		if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
- 			printk(KERN_ERR
- 			       "%s: rtas token ibm,cbe-spu-perftools unknown\n",
--			       __FUNCTION__);
-+			       __func__);
- 			return -EIO;
- 		}
- 	}
-@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_coun
- 	if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
- 		printk(KERN_ERR
- 		       "%s: rtas token ibm,cbe-perftools unknown\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return -EIO;
- 	}
- 
-@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profilin
- 
- 	if (unlikely(ret)) {
- 		printk(KERN_WARNING "%s: rtas returned: %d\n",
--		       __FUNCTION__, ret);
-+		       __func__, ret);
- 		return -EIO;
- 	}
- 
-@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct 
- 		if (unlikely(ret != 0)) {
- 			printk(KERN_ERR
- 			       "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
--			       __FUNCTION__, ret);
-+			       __func__, ret);
- 			rtas_error = -EIO;
- 			goto out;
- 		}
-@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)
- 		if (unlikely(rtn_value != 0)) {
- 			printk(KERN_ERR
- 			       "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
--			       __FUNCTION__, rtn_value);
-+			       __func__, rtn_value);
- 		}
- 
- 		/* Deactivate the signals */
---- a/arch/powerpc/platforms/40x/ep405.c
-+++ b/arch/powerpc/platforms/40x/ep405.c
-@@ -29,6 +29,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static struct device_node *bcsr_node;
- static void __iomem *bcsr_regs;
-@@ -119,5 +120,6 @@ define_machine(ep405) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/kilauea.c
-+++ b/arch/powerpc/platforms/40x/kilauea.c
-@@ -1,7 +1,7 @@
- /*
-  * Kilauea board specific routines
-  *
-- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-  *
-  * Based on the Walnut code by
-  * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-@@ -20,6 +20,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id kilauea_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@ define_machine(kilauea) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/makalu.c
-+++ b/arch/powerpc/platforms/40x/makalu.c
-@@ -20,6 +20,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id makalu_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -54,5 +55,6 @@ define_machine(makalu) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/virtex.c
-+++ b/arch/powerpc/platforms/40x/virtex.c
-@@ -14,6 +14,7 @@
- #include <asm/prom.h>
- #include <asm/time.h>
- #include <asm/xilinx_intc.h>
-+#include <asm/ppc4xx.h>
- 
- static struct of_device_id xilinx_of_bus_ids[] __initdata = {
- 	{ .compatible = "xlnx,plb-v46-1.00.a", },
-@@ -48,5 +49,6 @@ define_machine(virtex) {
- 	.probe			= virtex_probe,
- 	.init_IRQ		= xilinx_intc_init_tree,
- 	.get_irq		= xilinx_intc_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/40x/walnut.c
-+++ b/arch/powerpc/platforms/40x/walnut.c
-@@ -26,6 +26,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id walnut_of_bus[] = {
- 	{ .compatible = "ibm,plb3", },
-@@ -61,5 +62,6 @@ define_machine(walnut) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.calibrate_decr	= generic_calibrate_decr,
-+	.restart		= ppc4xx_reset_system,
-+	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/44x.h
-+++ b/arch/powerpc/platforms/44x/44x.h
-@@ -3,6 +3,5 @@
- 
- extern u8 as1_readb(volatile u8 __iomem  *addr);
- extern void as1_writeb(u8 data, volatile u8 __iomem *addr);
--extern void ppc44x_reset_system(char *cmd);
- 
- #endif /* __POWERPC_PLATFORMS_44X_44X_H */
---- a/arch/powerpc/platforms/44x/Kconfig
-+++ b/arch/powerpc/platforms/44x/Kconfig
-@@ -67,6 +67,25 @@ config WARP
- 	  See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
- 	  Telephony Developers" link for more information.
- 
-+config CANYONLANDS
-+	bool "Canyonlands"
-+	depends on 44x
-+	default n
-+	select 460EX
-+	select PCI
-+	select PPC4xx_PCI_EXPRESS
-+	help
-+	  This option enables support for the AMCC PPC460EX evaluation board.
-+
-+config YOSEMITE
-+	bool "Yosemite"
-+	depends on 44x
-+	default n
-+	select 440EP
-+	select PCI
-+	help
-+	  This option enables support for the AMCC PPC440EP evaluation board.
-+
- #config LUAN
- #	bool "Luan"
- #	depends on 44x
-@@ -122,6 +141,14 @@ config 440SPe
- 	bool
- 	select IBM_NEW_EMAC_EMAC4
- 
-+config 460EX
-+	bool
-+	select PPC_FPU
-+	select IBM_NEW_EMAC_EMAC4
-+	select IBM_NEW_EMAC_RGMII
-+	select IBM_NEW_EMAC_ZMII
-+	select IBM_NEW_EMAC_TAH
-+
- # 44x errata/workaround config symbols, selected by the CPU models above
- config IBM440EP_ERR42
- 	bool
---- a/arch/powerpc/platforms/44x/Makefile
-+++ b/arch/powerpc/platforms/44x/Makefile
-@@ -1,9 +1,11 @@
--obj-$(CONFIG_44x)	:= misc_44x.o
-+obj-$(CONFIG_44x)	:= misc_44x.o idle.o
- obj-$(CONFIG_EBONY)	+= ebony.o
- obj-$(CONFIG_TAISHAN)	+= taishan.o
- obj-$(CONFIG_BAMBOO)	+= bamboo.o
-+obj-$(CONFIG_YOSEMITE)	+= bamboo.o
- obj-$(CONFIG_SEQUOIA)	+= sequoia.o
- obj-$(CONFIG_KATMAI)	+= katmai.o
- obj-$(CONFIG_RAINIER)	+= rainier.o
- obj-$(CONFIG_WARP)	+= warp.o
- obj-$(CONFIG_WARP)	+= warp-nand.o
-+obj-$(CONFIG_CANYONLANDS) += canyonlands.o
---- a/arch/powerpc/platforms/44x/bamboo.c
-+++ b/arch/powerpc/platforms/44x/bamboo.c
-@@ -22,8 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id bamboo_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -53,11 +52,11 @@ static int __init bamboo_probe(void)
- }
- 
- define_machine(bamboo) {
--	.name 				= "Bamboo",
--	.probe 				= bamboo_probe,
--	.progress 			= udbg_progress,
--	.init_IRQ 			= uic_init_tree,
--	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.name 			= "Bamboo",
-+	.probe 			= bamboo_probe,
-+	.progress 		= udbg_progress,
-+	.init_IRQ 		= uic_init_tree,
-+	.get_irq 		= uic_get_irq,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr 	= generic_calibrate_decr,
- };
---- /dev/null
-+++ b/arch/powerpc/platforms/44x/canyonlands.c
-@@ -0,0 +1,63 @@
-+/*
-+ * Canyonlands board specific routines
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * Based on the Katmai code by
-+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
-+ * Copyright 2007 IBM Corp.
-+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
-+ * Copyright 2007 IBM Corporation
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+#include <linux/init.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/machdep.h>
-+#include <asm/prom.h>
-+#include <asm/udbg.h>
-+#include <asm/time.h>
-+#include <asm/uic.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/ppc4xx.h>
-+
-+static __initdata struct of_device_id canyonlands_of_bus[] = {
-+	{ .compatible = "ibm,plb4", },
-+	{ .compatible = "ibm,opb", },
-+	{ .compatible = "ibm,ebc", },
-+	{},
-+};
-+
-+static int __init canyonlands_device_probe(void)
-+{
-+	of_platform_bus_probe(NULL, canyonlands_of_bus, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(canyonlands, canyonlands_device_probe);
-+
-+static int __init canyonlands_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	if (!of_flat_dt_is_compatible(root, "amcc,canyonlands"))
-+		return 0;
-+
-+	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-+
-+	return 1;
-+}
-+
-+define_machine(canyonlands) {
-+	.name 				= "Canyonlands",
-+	.probe 				= canyonlands_probe,
-+	.progress 			= udbg_progress,
-+	.init_IRQ 			= uic_init_tree,
-+	.get_irq 			= uic_get_irq,
-+	.restart			= ppc4xx_reset_system,
-+	.calibrate_decr			= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/44x/ebony.c
-+++ b/arch/powerpc/platforms/44x/ebony.c
-@@ -26,8 +26,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id ebony_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -66,6 +65,6 @@ define_machine(ebony) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.restart		= ppc44x_reset_system,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- /dev/null
-+++ b/arch/powerpc/platforms/44x/idle.c
-@@ -0,0 +1,67 @@
-+/*
-+ * Copyright 2008 IBM Corp. 
-+ *
-+ * Based on arch/powerpc/platforms/pasemi/idle.c: 
-+ * Copyright (C) 2006-2007 PA Semi, Inc
-+ *
-+ * Added by: Jerone Young <jyoung5@us.ibm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+
-+#include <linux/of.h>
-+#include <linux/kernel.h>
-+#include <asm/machdep.h>
-+
-+static int mode_spin;
-+
-+static void ppc44x_idle(void)
-+{
-+	unsigned long msr_save;
-+
-+	msr_save = mfmsr();
-+	/* set wait state MSR */
-+	mtmsr(msr_save|MSR_WE|MSR_EE|MSR_CE|MSR_DE);
-+	isync();
-+	/* return to initial state */
-+	mtmsr(msr_save);
-+	isync();
-+}
-+
-+int __init ppc44x_idle_init(void)
-+{
-+	if (!mode_spin) {
-+		/* If we are not setting spin mode 
-+                   then we set to wait mode */
-+		ppc_md.power_save = &ppc44x_idle;
-+	}
-+
-+	return 0;
-+}
-+
-+arch_initcall(ppc44x_idle_init);
-+
-+static int __init idle_param(char *p)
-+{ 
-+
-+	if (!strcmp("spin", p)) {
-+		mode_spin = 1;
-+		ppc_md.power_save = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+early_param("idle", idle_param);
---- a/arch/powerpc/platforms/44x/katmai.c
-+++ b/arch/powerpc/platforms/44x/katmai.c
-@@ -22,8 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id katmai_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -58,6 +57,6 @@ define_machine(katmai) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/misc_44x.S
-+++ b/arch/powerpc/platforms/44x/misc_44x.S
-@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)
- 	sync
- 	isync
- 	blr
--
--/*
-- * void ppc44x_reset_system(char *cmd)
-- *
-- * At present, this routine just applies a system reset.
-- */
--_GLOBAL(ppc44x_reset_system)
--	mfspr	r13,SPRN_DBCR0
--	oris	r13,r13,DBCR0_RST_SYSTEM@h
--	mtspr	SPRN_DBCR0,r13
--	b	.			/* Just in case the reset doesn't work */
---- a/arch/powerpc/platforms/44x/rainier.c
-+++ b/arch/powerpc/platforms/44x/rainier.c
-@@ -22,7 +22,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id rainier_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -57,6 +57,6 @@ define_machine(rainier) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/sequoia.c
-+++ b/arch/powerpc/platforms/44x/sequoia.c
-@@ -23,7 +23,7 @@
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
- 
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id sequoia_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -58,6 +58,6 @@ define_machine(sequoia) {
- 	.progress 			= udbg_progress,
- 	.init_IRQ 			= uic_init_tree,
- 	.get_irq 			= uic_get_irq,
--	.restart			= ppc44x_reset_system,
-+	.restart			= ppc4xx_reset_system,
- 	.calibrate_decr			= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/taishan.c
-+++ b/arch/powerpc/platforms/44x/taishan.c
-@@ -29,8 +29,7 @@
- #include <asm/time.h>
- #include <asm/uic.h>
- #include <asm/pci-bridge.h>
--
--#include "44x.h"
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id taishan_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -68,6 +67,6 @@ define_machine(taishan) {
- 	.progress		= udbg_progress,
- 	.init_IRQ		= uic_init_tree,
- 	.get_irq		= uic_get_irq,
--	.restart		= ppc44x_reset_system,
-+	.restart		= ppc4xx_reset_system,
- 	.calibrate_decr		= generic_calibrate_decr,
- };
---- a/arch/powerpc/platforms/44x/warp-nand.c
-+++ b/arch/powerpc/platforms/44x/warp-nand.c
-@@ -11,6 +11,7 @@
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/nand.h>
- #include <linux/mtd/ndfc.h>
-+#include <asm/machdep.h>
- 
- #ifdef CONFIG_MTD_NAND_NDFC
- 
-@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)
- 
- 	return 0;
- }
--device_initcall(warp_setup_nand_flash);
-+machine_device_initcall(warp, warp_setup_nand_flash);
- 
- #endif
---- a/arch/powerpc/platforms/44x/warp.c
-+++ b/arch/powerpc/platforms/44x/warp.c
-@@ -18,9 +18,7 @@
- #include <asm/udbg.h>
- #include <asm/time.h>
- #include <asm/uic.h>
--
--#include "44x.h"
--
-+#include <asm/ppc4xx.h>
- 
- static __initdata struct of_device_id warp_of_bus[] = {
- 	{ .compatible = "ibm,plb4", },
-@@ -49,7 +47,7 @@ define_machine(warp) {
- 	.progress 	= udbg_progress,
- 	.init_IRQ 	= uic_init_tree,
- 	.get_irq 	= uic_get_irq,
--	.restart	= ppc44x_reset_system,
-+	.restart	= ppc4xx_reset_system,
- 	.calibrate_decr = generic_calibrate_decr,
- };
- 
---- a/arch/powerpc/platforms/52xx/lite5200.c
-+++ b/arch/powerpc/platforms/52xx/lite5200.c
-@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)
- 	of_node_put(np);
- 	if (!cdm) {
- 		printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
-@@ -98,7 +98,7 @@ lite5200_fix_port_config(void)
- 	of_node_put(np);
- 	if (!gpio) {
- 		printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
--		       __FUNCTION__);
-+		       __func__);
- 		return;
- 	}
- 
---- a/arch/powerpc/platforms/82xx/Kconfig
-+++ b/arch/powerpc/platforms/82xx/Kconfig
-@@ -11,7 +11,6 @@ config MPC8272_ADS
- 	select 8260
- 	select FSL_SOC
- 	select PQ2_ADS_PCI_PIC if PCI
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This option enables support for the MPC8272 ADS board
- 
-@@ -22,7 +21,6 @@ config PQ2FADS
- 	select 8260
- 	select FSL_SOC
- 	select PQ2_ADS_PCI_PIC if PCI
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This option enables support for the PQ2FADS board
- 
-@@ -31,7 +29,6 @@ config EP8248E
- 	select 8272
- 	select 8260
- 	select FSL_SOC
--	select PPC_CPM_NEW_BINDING
- 	select MDIO_BITBANG
- 	help
- 	  This enables support for the Embedded Planet EP8248E board.
---- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
-@@ -46,6 +46,7 @@ static void __init mpc837x_rdb_setup_arc
- static struct of_device_id mpc837x_ids[] = {
- 	{ .type = "soc", },
- 	{ .compatible = "soc", },
-+	{ .compatible = "simple-bus", },
- 	{},
- };
- 
---- a/arch/powerpc/platforms/83xx/mpc83xx.h
-+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
-@@ -16,6 +16,7 @@
- #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
- #define MPC8315_SCCR_USB_MASK      0x00c00000
- #define MPC8315_SCCR_USB_DRCM_11   0x00c00000
-+#define MPC8315_SCCR_USB_DRCM_01   0x00400000
- #define MPC837X_SCCR_USB_DRCM_11   0x00c00000
- 
- /* system i/o configuration register low */
-@@ -37,6 +38,7 @@
- /* USB Control Register */
- #define FSL_USB2_CONTROL_OFFS      0x500
- #define CONTROL_UTMI_PHY_EN        0x00000200
-+#define CONTROL_REFSEL_24MHZ       0x00000040
- #define CONTROL_REFSEL_48MHZ       0x00000080
- #define CONTROL_PHY_CLK_SEL_ULPI   0x00000400
- #define CONTROL_OTG_PORT           0x00000020
---- a/arch/powerpc/platforms/83xx/usb.c
-+++ b/arch/powerpc/platforms/83xx/usb.c
-@@ -129,7 +129,7 @@ int mpc831x_usb_cfg(void)
- 	if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
- 		clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
- 		                MPC8315_SCCR_USB_MASK,
--		                MPC8315_SCCR_USB_DRCM_11);
-+		                MPC8315_SCCR_USB_DRCM_01);
- 	else
- 		clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
- 		                MPC83XX_SCCR_USB_MASK,
-@@ -164,9 +164,15 @@ int mpc831x_usb_cfg(void)
- 	/* Using on-chip PHY */
- 	if (prop && (!strcmp(prop, "utmi_wide") ||
- 		     !strcmp(prop, "utmi"))) {
--		/* Set UTMI_PHY_EN, REFSEL to 48MHZ */
-+		u32 refsel;
-+
-+		if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
-+			refsel = CONTROL_REFSEL_24MHZ;
-+		else
-+			refsel = CONTROL_REFSEL_48MHZ;
-+		/* Set UTMI_PHY_EN and REFSEL */
- 		out_be32(usb_regs + FSL_USB2_CONTROL_OFFS,
--				CONTROL_UTMI_PHY_EN | CONTROL_REFSEL_48MHZ);
-+				CONTROL_UTMI_PHY_EN | refsel);
- 	/* Using external UPLI PHY */
- 	} else if (prop && !strcmp(prop, "ulpi")) {
- 		/* Set PHY_CLK_SEL to ULPI */
---- a/arch/powerpc/platforms/85xx/Kconfig
-+++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -19,7 +19,6 @@ config MPC8540_ADS
- config MPC8560_ADS
- 	bool "Freescale MPC8560 ADS"
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select CPM2
- 	help
- 	  This option enables support for the MPC 8560 ADS board
-@@ -46,6 +45,12 @@ config MPC85xx_DS
- 	help
- 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
- 
-+config KSI8560
-+        bool "Emerson KSI8560"
-+        select DEFAULT_UIMAGE
-+        help
-+          This option enables support for the Emerson KSI8560 board
-+
- config STX_GP3
- 	bool "Silicon Turnkey Express GP3"
- 	help
-@@ -53,14 +58,12 @@ config STX_GP3
- 	  board.
- 	select CPM2
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 
- config TQM8540
- 	bool "TQ Components TQM8540"
- 	help
- 	  This option enables support for the TQ Components TQM8540 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 
- config TQM8541
-@@ -68,7 +71,6 @@ config TQM8541
- 	help
- 	  This option enables support for the TQ Components TQM8541 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -77,7 +79,6 @@ config TQM8555
- 	help
- 	  This option enables support for the TQ Components TQM8555 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -86,7 +87,6 @@ config TQM8560
- 	help
- 	  This option enables support for the TQ Components TQM8560 board.
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING
- 	select TQM85xx
- 	select CPM2
- 
-@@ -99,7 +99,6 @@ config SBC8548
- config SBC8560
- 	bool "Wind River SBC8560"
- 	select DEFAULT_UIMAGE
--	select PPC_CPM_NEW_BINDING if CPM2
- 	help
- 	  This option enables support for the Wind River SBC8560 board
- 
---- a/arch/powerpc/platforms/85xx/Makefile
-+++ b/arch/powerpc/platforms/85xx/Makefile
-@@ -10,3 +10,4 @@ obj-$(CONFIG_STX_GP3)	  += stx_gp3.o
- obj-$(CONFIG_TQM85xx)	  += tqm85xx.o
- obj-$(CONFIG_SBC8560)     += sbc8560.o
- obj-$(CONFIG_SBC8548)     += sbc8548.o
-+obj-$(CONFIG_KSI8560)	  += ksi8560.o
---- /dev/null
-+++ b/arch/powerpc/platforms/85xx/ksi8560.c
-@@ -0,0 +1,257 @@
-+/*
-+ * Board setup routines for the Emerson KSI8560
-+ *
-+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
-+ *
-+ * Based on mpc85xx_ads.c maintained by Kumar Gala
-+ *
-+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
-+ * the terms of the GNU General Public License version 2.  This program
-+ * is licensed "as is" without any warranty of any kind, whether express
-+ * or implied.
-+ *
-+ */
-+
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/pci.h>
-+#include <linux/kdev_t.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/system.h>
-+#include <asm/time.h>
-+#include <asm/machdep.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/mpic.h>
-+#include <mm/mmu_decl.h>
-+#include <asm/udbg.h>
-+#include <asm/prom.h>
-+
-+#include <sysdev/fsl_soc.h>
-+#include <sysdev/fsl_pci.h>
-+
-+#include <asm/cpm2.h>
-+#include <sysdev/cpm2_pic.h>
-+
-+
-+#define KSI8560_CPLD_HVR		0x04 /* Hardware Version Register */
-+#define KSI8560_CPLD_PVR		0x08 /* PLD Version Register */
-+#define KSI8560_CPLD_RCR1		0x30 /* Reset Command Register 1 */
-+
-+#define KSI8560_CPLD_RCR1_CPUHR		0x80 /* CPU Hard Reset */
-+
-+static void __iomem *cpld_base = NULL;
-+
-+static void machine_restart(char *cmd)
-+{
-+	if (cpld_base)
-+		out_8(cpld_base + KSI8560_CPLD_RCR1, KSI8560_CPLD_RCR1_CPUHR);
-+	else
-+		printk(KERN_ERR "Can't find CPLD base, hang forever\n");
-+
-+	for (;;);
-+}
-+
-+static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
-+{
-+	int cascade_irq;
-+
-+	while ((cascade_irq = cpm2_get_irq()) >= 0)
-+		generic_handle_irq(cascade_irq);
-+
-+	desc->chip->eoi(irq);
-+}
-+
-+static void __init ksi8560_pic_init(void)
-+{
-+	struct mpic *mpic;
-+	struct resource r;
-+	struct device_node *np;
-+#ifdef CONFIG_CPM2
-+	int irq;
-+#endif
-+
-+	np = of_find_node_by_type(NULL, "open-pic");
-+
-+	if (np == NULL) {
-+		printk(KERN_ERR "Could not find open-pic node\n");
-+		return;
-+	}
-+
-+	if (of_address_to_resource(np, 0, &r)) {
-+		printk(KERN_ERR "Could not map mpic register space\n");
-+		of_node_put(np);
-+		return;
-+	}
-+
-+	mpic = mpic_alloc(np, r.start,
-+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-+			0, 256, " OpenPIC  ");
-+	BUG_ON(mpic == NULL);
-+	of_node_put(np);
-+
-+	mpic_init(mpic);
-+
-+#ifdef CONFIG_CPM2
-+	/* Setup CPM2 PIC */
-+	np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
-+	if (np == NULL) {
-+		printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
-+		return;
-+	}
-+	irq = irq_of_parse_and_map(np, 0);
-+
-+	cpm2_pic_init(np);
-+	of_node_put(np);
-+	set_irq_chained_handler(irq, cpm2_cascade);
-+
-+	setup_irq(0, NULL);
-+#endif
-+}
-+
-+#ifdef CONFIG_CPM2
-+/*
-+ * Setup I/O ports
-+ */
-+struct cpm_pin {
-+	int port, pin, flags;
-+};
-+
-+static struct cpm_pin __initdata ksi8560_pins[] = {
-+	/* SCC1 */
-+	{3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+
-+	/* SCC2 */
-+	{3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+
-+	/* FCC1 */
-+	{0, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-+	{0, 18, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 19, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-+	{0, 26, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 28, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{0, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-+	{0, 30, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{0, 31, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
-+	{2, 23, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK9 */
-+	{2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK10 */
-+
-+};
-+
-+static void __init init_ioports(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(ksi8560_pins); i++) {
-+		struct cpm_pin *pin = &ksi8560_pins[i];
-+		cpm2_set_pin(pin->port, pin->pin, pin->flags);
-+	}
-+
-+	cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
-+	cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
-+	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK9, CPM_CLK_RX);
-+	cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_TX);
-+}
-+#endif
-+
-+/*
-+ * Setup the architecture
-+ */
-+static void __init ksi8560_setup_arch(void)
-+{
-+	struct device_node *cpld;
-+
-+	cpld = of_find_compatible_node(NULL, NULL, "emerson,KSI8560-cpld");
-+	if (cpld)
-+		cpld_base = of_iomap(cpld, 0);
-+	else
-+		printk(KERN_ERR "Can't find CPLD in device tree\n");
-+
-+	if (ppc_md.progress)
-+		ppc_md.progress("ksi8560_setup_arch()", 0);
-+
-+#ifdef CONFIG_CPM2
-+	cpm2_reset();
-+	init_ioports();
-+#endif
-+}
-+
-+static void ksi8560_show_cpuinfo(struct seq_file *m)
-+{
-+	uint pvid, svid, phid1;
-+	uint memsize = total_memory;
-+
-+	pvid = mfspr(SPRN_PVR);
-+	svid = mfspr(SPRN_SVR);
-+
-+	seq_printf(m, "Vendor\t\t: Emerson Network Power\n");
-+	seq_printf(m, "Board\t\t: KSI8560\n");
-+
-+	if (cpld_base) {
-+		seq_printf(m, "Hardware rev\t: %d\n",
-+					in_8(cpld_base + KSI8560_CPLD_HVR));
-+		seq_printf(m, "CPLD rev\t: %d\n",
-+					in_8(cpld_base + KSI8560_CPLD_PVR));
-+	} else
-+		seq_printf(m, "Unknown Hardware and CPLD revs\n");
-+
-+	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
-+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-+
-+	/* Display cpu Pll setting */
-+	phid1 = mfspr(SPRN_HID1);
-+	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-+
-+	/* Display the amount of memory */
-+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
-+}
-+
-+static struct of_device_id __initdata of_bus_ids[] = {
-+	{ .type = "soc", },
-+	{ .name = "cpm", },
-+	{ .name = "localbus", },
-+	{},
-+};
-+
-+static int __init declare_of_platform_devices(void)
-+{
-+	of_platform_bus_probe(NULL, of_bus_ids, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(ksi8560, declare_of_platform_devices);
-+
-+/*
-+ * Called very early, device-tree isn't unflattened
-+ */
-+static int __init ksi8560_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	return of_flat_dt_is_compatible(root, "emerson,KSI8560");
-+}
-+
-+define_machine(ksi8560) {
-+	.name			= "KSI8560",
-+	.probe			= ksi8560_probe,
-+	.setup_arch		= ksi8560_setup_arch,
-+	.init_IRQ		= ksi8560_pic_init,
-+	.show_cpuinfo		= ksi8560_show_cpuinfo,
-+	.get_irq		= mpic_get_irq,
-+	.restart		= machine_restart,
-+	.calibrate_decr		= generic_calibrate_decr,
-+};
---- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
-+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
-@@ -165,7 +165,7 @@ static void __init init_ioports(void)
- 	int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
--		struct cpm_pin *pin = &mpc8560_ads_pins[i];
-+		const struct cpm_pin *pin = &mpc8560_ads_pins[i];
- 		cpm2_set_pin(pin->port, pin->pin, pin->flags);
- 	}
- 
---- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
-+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
-@@ -19,6 +19,7 @@
- #include <linux/delay.h>
- #include <linux/seq_file.h>
- #include <linux/interrupt.h>
-+#include <linux/of_platform.h>
- 
- #include <asm/system.h>
- #include <asm/time.h>
-@@ -36,7 +37,7 @@
- #undef DEBUG
- 
- #ifdef DEBUG
--#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)
-+#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
- #else
- #define DBG(fmt, args...)
- #endif
-@@ -183,6 +184,18 @@ static int __init mpc8544_ds_probe(void)
- 	}
- }
- 
-+static struct of_device_id mpc85xxds_ids[] = {
-+	{ .type = "soc", },
-+	{ .compatible = "soc", },
-+	{},
-+};
-+
-+static int __init mpc85xxds_publish_devices(void)
-+{
-+	return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);
-+}
-+machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
-+
- /*
-  * Called very early, device-tree isn't unflattened
-  */
---- a/arch/powerpc/platforms/86xx/Kconfig
-+++ b/arch/powerpc/platforms/86xx/Kconfig
-@@ -11,6 +11,12 @@ config MPC8641_HPCN
- 	help
- 	  This option enables support for the MPC8641 HPCN board.
- 
-+config SBC8641D
-+	bool "Wind River SBC8641D"
-+	select DEFAULT_UIMAGE
-+	help
-+	  This option enables support for the WRS SBC8641D board.
-+
- config MPC8610_HPCD
- 	bool "Freescale MPC8610 HPCD"
- 	select DEFAULT_UIMAGE
-@@ -24,7 +30,7 @@ config MPC8641
- 	select FSL_PCI if PCI
- 	select PPC_UDBG_16550
- 	select MPIC
--	default y if MPC8641_HPCN
-+	default y if MPC8641_HPCN || SBC8641D
- 
- config MPC8610
- 	bool
---- a/arch/powerpc/platforms/86xx/Makefile
-+++ b/arch/powerpc/platforms/86xx/Makefile
-@@ -4,4 +4,5 @@
- 
- obj-$(CONFIG_SMP)		+= mpc86xx_smp.o
- obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o
-+obj-$(CONFIG_SBC8641D)		+= sbc8641d.o
- obj-$(CONFIG_MPC8610_HPCD)	+= mpc8610_hpcd.o
---- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
-+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
-@@ -52,7 +52,7 @@ static int __init mpc8610_declare_of_pla
- }
- machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
- 
--void __init
-+static void __init
- mpc86xx_hpcd_init_irq(void)
- {
- 	struct mpic *mpic1;
-@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(voi
- 	return 0;
- }
- 
--long __init
-+static long __init
- mpc86xx_time_init(void)
- {
- 	unsigned int temp;
---- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
-+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
-@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigne
- }
- #endif	/* CONFIG_PCI */
- 
--void __init
-+static void __init
- mpc86xx_hpcn_init_irq(void)
- {
- 	struct mpic *mpic1;
-@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void)
- }
- 
- 
--void
-+static void
- mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
- {
- 	struct device_node *root;
-@@ -190,13 +190,19 @@ static int __init mpc86xx_hpcn_probe(voi
- {
- 	unsigned long root = of_get_flat_dt_root();
- 
--	if (of_flat_dt_is_compatible(root, "mpc86xx"))
-+	if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn"))
- 		return 1;	/* Looks good */
- 
-+	/* Be nice and don't give silent boot death.  Delete this in 2.6.27 */
-+	if (of_flat_dt_is_compatible(root, "mpc86xx")) {
-+		pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n");
-+		return 1;
-+	}
-+
- 	return 0;
- }
- 
--long __init
-+static long __init
- mpc86xx_time_init(void)
- {
- 	unsigned int temp;
---- /dev/null
-+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
-@@ -0,0 +1,164 @@
-+/*
-+ * SBC8641D board specific routines
-+ *
-+ * Copyright 2008 Wind River Systems Inc.
-+ *
-+ * By Paul Gortmaker (see MAINTAINERS for contact information)
-+ *
-+ * Based largely on the 8641 HPCN support by Freescale Semiconductor Inc.
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/pci.h>
-+#include <linux/kdev_t.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/system.h>
-+#include <asm/time.h>
-+#include <asm/machdep.h>
-+#include <asm/pci-bridge.h>
-+#include <asm/mpc86xx.h>
-+#include <asm/prom.h>
-+#include <mm/mmu_decl.h>
-+#include <asm/udbg.h>
-+
-+#include <asm/mpic.h>
-+
-+#include <sysdev/fsl_pci.h>
-+#include <sysdev/fsl_soc.h>
-+
-+#include "mpc86xx.h"
-+
-+static void __init
-+sbc8641_init_irq(void)
-+{
-+	struct mpic *mpic1;
-+	struct device_node *np;
-+	struct resource res;
-+
-+	/* Determine PIC address. */
-+	np = of_find_node_by_type(NULL, "open-pic");
-+	if (np == NULL)
-+		return;
-+	of_address_to_resource(np, 0, &res);
-+
-+	/* Alloc mpic structure and per isu has 16 INT entries. */
-+	mpic1 = mpic_alloc(np, res.start,
-+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-+			0, 256, " MPIC     ");
-+	of_node_put(np);
-+	BUG_ON(mpic1 == NULL);
-+
-+	mpic_init(mpic1);
-+}
-+
-+static void __init
-+sbc8641_setup_arch(void)
-+{
-+#ifdef CONFIG_PCI
-+	struct device_node *np;
-+#endif
-+
-+	if (ppc_md.progress)
-+		ppc_md.progress("sbc8641_setup_arch()", 0);
-+
-+#ifdef CONFIG_PCI
-+	for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie")
-+		fsl_add_bridge(np, 0);
-+#endif
-+
-+	printk("SBC8641 board from Wind River\n");
-+
-+#ifdef CONFIG_SMP
-+	mpc86xx_smp_init();
-+#endif
-+}
-+
-+
-+static void
-+sbc8641_show_cpuinfo(struct seq_file *m)
-+{
-+	struct device_node *root;
-+	uint memsize = total_memory;
-+	const char *model = "";
-+	uint svid = mfspr(SPRN_SVR);
-+
-+	seq_printf(m, "Vendor\t\t: Wind River Systems\n");
-+
-+	root = of_find_node_by_path("/");
-+	if (root)
-+		model = of_get_property(root, "model", NULL);
-+	seq_printf(m, "Machine\t\t: %s\n", model);
-+	of_node_put(root);
-+
-+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
-+}
-+
-+
-+/*
-+ * Called very early, device-tree isn't unflattened
-+ */
-+static int __init sbc8641_probe(void)
-+{
-+	unsigned long root = of_get_flat_dt_root();
-+
-+	if (of_flat_dt_is_compatible(root, "wind,sbc8641"))
-+		return 1;	/* Looks good */
-+
-+	return 0;
-+}
-+
-+static long __init
-+mpc86xx_time_init(void)
-+{
-+	unsigned int temp;
-+
-+	/* Set the time base to zero */
-+	mtspr(SPRN_TBWL, 0);
-+	mtspr(SPRN_TBWU, 0);
-+
-+	temp = mfspr(SPRN_HID0);
-+	temp |= HID0_TBEN;
-+	mtspr(SPRN_HID0, temp);
-+	asm volatile("isync");
-+
-+	return 0;
-+}
-+
-+static __initdata struct of_device_id of_bus_ids[] = {
-+	{ .compatible = "simple-bus", },
-+	{},
-+};
-+
-+static int __init declare_of_platform_devices(void)
-+{
-+	of_platform_bus_probe(NULL, of_bus_ids, NULL);
-+
-+	return 0;
-+}
-+machine_device_initcall(sbc8641, declare_of_platform_devices);
-+
-+define_machine(sbc8641) {
-+	.name			= "SBC8641D",
-+	.probe			= sbc8641_probe,
-+	.setup_arch		= sbc8641_setup_arch,
-+	.init_IRQ		= sbc8641_init_irq,
-+	.show_cpuinfo		= sbc8641_show_cpuinfo,
-+	.get_irq		= mpic_get_irq,
-+	.restart		= fsl_rstcr_restart,
-+	.time_init		= mpc86xx_time_init,
-+	.calibrate_decr		= generic_calibrate_decr,
-+	.progress		= udbg_progress,
-+#ifdef CONFIG_PCI
-+	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
-+#endif
-+};
---- a/arch/powerpc/platforms/8xx/Kconfig
-+++ b/arch/powerpc/platforms/8xx/Kconfig
-@@ -18,7 +18,6 @@ config MPC8XXFADS
- config MPC86XADS
- 	bool "MPC86XADS"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  MPC86x Application Development System by Freescale Semiconductor.
- 	  The MPC86xADS is meant to serve as a platform for s/w and h/w
-@@ -27,7 +26,6 @@ config MPC86XADS
- config MPC885ADS
- 	bool "MPC885ADS"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  Freescale Semiconductor MPC885 Application Development System (ADS).
- 	  Also known as DUET.
-@@ -37,7 +35,6 @@ config MPC885ADS
- config PPC_EP88XC
- 	bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	help
- 	  This enables support for the Embedded Planet EP88xC board.
- 
-@@ -47,7 +44,6 @@ config PPC_EP88XC
- config PPC_ADDER875
- 	bool "Analogue & Micro Adder 875"
- 	select CPM1
--	select PPC_CPM_NEW_BINDING
- 	select REDBOOT
- 	help
- 	  This enables support for the Analogue & Micro Adder 875
---- a/arch/powerpc/platforms/8xx/m8xx_setup.c
-+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
-@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)
- 
- 	/* Processor frequency is MHz.
- 	 */
--	ppc_tb_freq = 50000000;
--	if (!get_freq("bus-frequency", &ppc_tb_freq)) {
--		printk(KERN_ERR "WARNING: Estimating decrementer frequency "
--		                "(not found)\n");
--	}
--	ppc_tb_freq /= 16;
- 	ppc_proc_freq = 50000000;
- 	if (!get_freq("clock-frequency", &ppc_proc_freq))
- 		printk(KERN_ERR "WARNING: Estimating processor frequency "
- 		                "(not found)\n");
- 
-+	ppc_tb_freq = ppc_proc_freq / 16;
- 	printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
- 
- 	/* Perform some more timer/timebase initialization.  This used
---- a/arch/powerpc/platforms/Kconfig
-+++ b/arch/powerpc/platforms/Kconfig
-@@ -290,13 +290,7 @@ config CPM2
- config PPC_CPM_NEW_BINDING
- 	bool
- 	depends on CPM1 || CPM2
--	help
--	  Select this if your board has been converted to use the new
--	  device tree bindings for CPM, and no longer needs the
--	  ioport callbacks or the platform device glue code.
--
--	  The fs_enet and cpm_uart drivers will be built as
--	  of_platform devices.
-+	default y
- 
- config AXON_RAM
- 	tristate "Axon DDR2 memory device driver"
---- a/arch/powerpc/platforms/Kconfig.cputype
-+++ b/arch/powerpc/platforms/Kconfig.cputype
-@@ -41,11 +41,13 @@ config 40x
- 	bool "AMCC 40x"
- 	select PPC_DCR_NATIVE
- 	select PPC_UDBG_16550
-+	select 4xx_SOC
- 
- config 44x
- 	bool "AMCC 44x"
- 	select PPC_DCR_NATIVE
- 	select PPC_UDBG_16550
-+	select 4xx_SOC
- 
- config E200
- 	bool "Freescale e200"
---- a/arch/powerpc/platforms/cell/iommu.c
-+++ b/arch/powerpc/platforms/cell/iommu.c
-@@ -28,13 +28,13 @@
- #include <linux/notifier.h>
- #include <linux/of.h>
- #include <linux/of_platform.h>
-+#include <linux/lmb.h>
- 
- #include <asm/prom.h>
- #include <asm/iommu.h>
- #include <asm/machdep.h>
- #include <asm/pci-bridge.h>
- #include <asm/udbg.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- #include <asm/cell-regs.h>
- 
-@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct
- 	segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
- 
- 	pr_debug("%s: iommu[%d]: segments: %lu\n",
--			__FUNCTION__, iommu->nid, segments);
-+			__func__, iommu->nid, segments);
- 
- 	/* set up the segment table */
- 	stab_size = segments * sizeof(unsigned long);
-@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_p
- 				(1 << 12) / sizeof(unsigned long));
- 
- 	ptab_size = segments * pages_per_segment * sizeof(unsigned long);
--	pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __FUNCTION__,
-+	pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __func__,
- 			iommu->nid, ptab_size, get_order(ptab_size));
- 	page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
- 	BUG_ON(!page);
-@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_p
- 	n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
- 
- 	pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
--			__FUNCTION__, iommu->nid, iommu->stab, ptab,
-+			__func__, iommu->nid, iommu->stab, ptab,
- 			n_pte_pages);
- 
- 	/* initialise the STEs */
-@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(s
- 
- 	if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
- 		panic("%s: missing IOC register mappings for node %d\n",
--		      __FUNCTION__, iommu->nid);
-+		      __func__, iommu->nid);
- 
- 	iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
- 	iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
---- a/arch/powerpc/platforms/cell/pervasive.c
-+++ b/arch/powerpc/platforms/cell/pervasive.c
-@@ -65,7 +65,7 @@ static void cbe_power_save(void)
- 		break;
- 	default:
- 		printk(KERN_WARNING "%s: unknown configuration\n",
--			__FUNCTION__);
-+			__func__);
- 		break;
- 	}
- 	mtspr(SPRN_TSC_CELL, thread_switch_control);
---- a/arch/powerpc/platforms/cell/ras.c
-+++ b/arch/powerpc/platforms/cell/ras.c
-@@ -132,7 +132,7 @@ static int __init cbe_ptcal_enable_on_no
- 				(unsigned int)(addr >> 32),
- 				(unsigned int)(addr & 0xffffffff))) {
- 		printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",
--				__FUNCTION__, nid);
-+				__func__, nid);
- 		goto out_free_pages;
- 	}
- 
-@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void)
- 	if (!size)
- 		return -ENODEV;
- 
--	pr_debug("%s: enabling PTCAL, size = 0x%x\n", __FUNCTION__, *size);
-+	pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
- 	order = get_order(*size);
- 	of_node_put(np);
- 
-@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void)
- 		const u32 *nid = of_get_property(np, "node-id", NULL);
- 		if (!nid) {
- 			printk(KERN_ERR "%s: node %s is missing node-id?\n",
--					__FUNCTION__, np->full_name);
-+					__func__, np->full_name);
- 			continue;
- 		}
- 		cbe_ptcal_enable_on_node(*nid, order);
-@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void)
- 	struct ptcal_area *area, *tmp;
- 	int ret = 0;
- 
--	pr_debug("%s: disabling PTCAL\n", __FUNCTION__);
-+	pr_debug("%s: disabling PTCAL\n", __func__);
- 
- 	list_for_each_entry_safe(area, tmp, &ptcal_list, list) {
- 		/* disable ptcal on this node */
- 		if (rtas_call(ptcal_stop_tok, 1, 1, NULL, area->nid)) {
- 			printk(KERN_ERR "%s: error disabling PTCAL "
--					"on node %d!\n", __FUNCTION__,
-+					"on node %d!\n", __func__,
- 					area->nid);
- 			ret = -EIO;
- 			continue;
---- a/arch/powerpc/platforms/cell/spu_base.c
-+++ b/arch/powerpc/platforms/cell/spu_base.c
-@@ -165,7 +165,7 @@ static int __spu_trap_data_seg(struct sp
- 	struct spu_slb slb;
- 	int psize;
- 
--	pr_debug("%s\n", __FUNCTION__);
-+	pr_debug("%s\n", __func__);
- 
- 	slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
- 
-@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct sp
- extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
- static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
- {
--	pr_debug("%s, %lx, %lx\n", __FUNCTION__, dsisr, ea);
-+	pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea);
- 
- 	/* Handle kernel space hash faults immediately.
- 	   User hash faults need to be deferred to process context. */
-@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data)
- 		__spu_trap_data_seg(spu, dar);
- 
- 	spin_unlock(&spu->register_lock);
--	pr_debug("%s: %lx %lx %lx %lx\n", __FUNCTION__, mask, stat,
-+	pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat,
- 			dar, dsisr);
- 
- 	if (stat & CLASS1_STORAGE_FAULT_INTR)
-@@ -726,7 +726,7 @@ static int __init init_spu_base(void)
- 
- 	if (ret < 0) {
- 		printk(KERN_WARNING "%s: Error initializing spus\n",
--			__FUNCTION__);
-+			__func__);
- 		goto out_unregister_sysdev_class;
- 	}
- 
---- a/arch/powerpc/platforms/cell/spu_callbacks.c
-+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
-@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall
- 	long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
- 
- 	if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
--		pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret);
-+		pr_debug("%s: invalid syscall #%ld", __func__, s->nr_ret);
- 		return -ENOSYS;
- 	}
- 
---- a/arch/powerpc/platforms/cell/spu_manage.c
-+++ b/arch/powerpc/platforms/cell/spu_manage.c
-@@ -92,7 +92,7 @@ static int __init spu_map_interrupts_old
- 
- 	tmp = of_get_property(np->parent->parent, "node-id", NULL);
- 	if (!tmp) {
--		printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
-+		printk(KERN_WARNING "%s: can't find node-id\n", __func__);
- 		nid = spu->node;
- 	} else
- 		nid = tmp[0];
-@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int 
- 		ret = fn(node);
- 		if (ret) {
- 			printk(KERN_WARNING "%s: Error initializing %s\n",
--				__FUNCTION__, node->name);
-+				__func__, node->name);
- 			break;
- 		}
- 		n++;
-@@ -327,7 +327,7 @@ static int __init of_create_spu(struct s
- 		if (!legacy_map) {
- 			legacy_map = 1;
- 			printk(KERN_WARNING "%s: Legacy device tree found, "
--				"trying to map old style\n", __FUNCTION__);
-+				"trying to map old style\n", __func__);
- 		}
- 		ret = spu_map_device_old(spu);
- 		if (ret) {
-@@ -342,7 +342,7 @@ static int __init of_create_spu(struct s
- 		if (!legacy_irq) {
- 			legacy_irq = 1;
- 			printk(KERN_WARNING "%s: Legacy device tree found, "
--				"trying old style irq\n", __FUNCTION__);
-+				"trying old style irq\n", __func__);
- 		}
- 		ret = spu_map_interrupts_old(spu, spe);
- 		if (ret) {
---- a/arch/powerpc/platforms/cell/spufs/coredump.c
-+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
-@@ -133,8 +133,6 @@ static struct spu_context *coredump_next
- 		if (ctx->flags & SPU_CREATE_NOSCHED)
- 			continue;
- 
--		/* start searching the next fd next time we're called */
--		(*fd)++;
- 		break;
- 	}
- 
-@@ -157,6 +155,9 @@ int spufs_coredump_extra_notes_size(void
- 			break;
- 
- 		size += rc;
-+
-+		/* start searching the next fd next time */
-+		fd++;
- 	}
- 
- 	return size;
-@@ -239,6 +240,9 @@ int spufs_coredump_extra_notes_write(str
- 		}
- 
- 		spu_release_saved(ctx);
-+
-+		/* start searching the next fd next time */
-+		fd++;
- 	}
- 
- 	return 0;
---- a/arch/powerpc/platforms/cell/spufs/file.c
-+++ b/arch/powerpc/platforms/cell/spufs/file.c
-@@ -1337,7 +1337,7 @@ static u64 spufs_signal1_type_get(struct
- 	return ctx->ops->signal1_type_get(ctx);
- }
- DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
--		       spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
-+		       spufs_signal1_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
- 
- 
- static int spufs_signal2_type_set(void *data, u64 val)
-@@ -1359,7 +1359,7 @@ static u64 spufs_signal2_type_get(struct
- 	return ctx->ops->signal2_type_get(ctx);
- }
- DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
--		       spufs_signal2_type_set, "%llu", SPU_ATTR_ACQUIRE);
-+		       spufs_signal2_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
- 
- #if SPUFS_MMAP_4K
- static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
-@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu)
- 
- 	wake_up_all(&ctx->mfc_wq);
- 
--	pr_debug("%s %s\n", __FUNCTION__, spu->name);
-+	pr_debug("%s %s\n", __func__, spu->name);
- 	if (ctx->mfc_fasync) {
- 		u32 free_elements, tagstatus;
- 		unsigned int mask;
-@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struc
- 	if (tagstatus & ctx->tagwait)
- 		mask |= POLLIN | POLLRDNORM;
- 
--	pr_debug("%s: free %d tagstatus %d tagwait %d\n", __FUNCTION__,
-+	pr_debug("%s: free %d tagstatus %d tagwait %d\n", __func__,
- 		free_elements, tagstatus, ctx->tagwait);
- 
- 	return mask;
---- a/arch/powerpc/platforms/cell/spufs/run.c
-+++ b/arch/powerpc/platforms/cell/spufs/run.c
-@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu
- 			!= MFC_CNTL_PURGE_DMA_COMPLETE) {
- 		if (time_after(jiffies, timeout)) {
- 			printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
--					__FUNCTION__);
-+					__func__);
- 			ret = -EIO;
- 			goto out;
- 		}
-@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu
- 				status_loading) {
- 		if (time_after(jiffies, timeout)) {
- 			printk(KERN_ERR "%s: timeout waiting for loader\n",
--					__FUNCTION__);
-+					__func__);
- 			ret = -EIO;
- 			goto out_drop_priv;
- 		}
-@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu
- 	if (!(status & SPU_STATUS_RUNNING)) {
- 		/* If isolated LOAD has failed: run SPU, we will get a stop-and
- 		 * signal later. */
--		pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
-+		pr_debug("%s: isolated LOAD failed\n", __func__);
- 		ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
- 		ret = -EACCES;
- 		goto out_drop_priv;
-@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu
- 
- 	if (!(status & SPU_STATUS_ISOLATED_STATE)) {
- 		/* This isn't allowed by the CBEA, but check anyway */
--		pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
-+		pr_debug("%s: SPU fell out of isolated mode?\n", __func__);
- 		ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
- 		ret = -EINVAL;
- 		goto out_drop_priv;
-@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct 
- 		break;
- 	default:
- 		printk(KERN_WARNING "%s: unexpected return code %ld\n",
--			__FUNCTION__, *spu_ret);
-+			__func__, *spu_ret);
- 		ret = 0;
- 	}
- 	return ret;
-@@ -323,6 +323,10 @@ static int spu_process_callback(struct s
- 			return -EINTR;
- 	}
- 
-+	/* need to re-get the ls, as it may have changed when we released the
-+	 * spu */
-+	ls = (void __iomem *)ctx->ops->get_ls(ctx);
-+
- 	/* write result, jump over indirect pointer */
- 	memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
- 	ctx->ops->npc_write(ctx, npc);
---- a/arch/powerpc/platforms/cell/spufs/switch.c
-+++ b/arch/powerpc/platforms/cell/spufs/switch.c
-@@ -1815,6 +1815,7 @@ static void save_csa(struct spu_state *p
- 	save_mfc_csr_ato(prev, spu);	/* Step 24. */
- 	save_mfc_tclass_id(prev, spu);	/* Step 25. */
- 	set_mfc_tclass_id(prev, spu);	/* Step 26. */
-+	save_mfc_cmd(prev, spu);	/* Step 26a - moved from 44. */
- 	purge_mfc_queue(prev, spu);	/* Step 27. */
- 	wait_purge_complete(prev, spu);	/* Step 28. */
- 	setup_mfc_sr1(prev, spu);	/* Step 30. */
-@@ -1831,7 +1832,6 @@ static void save_csa(struct spu_state *p
- 	save_ppuint_mb(prev, spu);	/* Step 41. */
- 	save_ch_part1(prev, spu);	/* Step 42. */
- 	save_spu_mb(prev, spu);	        /* Step 43. */
--	save_mfc_cmd(prev, spu);	/* Step 44. */
- 	reset_ch(prev, spu);	        /* Step 45. */
- }
- 
---- a/arch/powerpc/platforms/celleb/beat.c
-+++ b/arch/powerpc/platforms/celleb/beat.c
-@@ -48,6 +48,7 @@ void beat_power_off(void)
- }
- 
- u64 beat_halt_code = 0x1000000000000000UL;
-+EXPORT_SYMBOL(beat_halt_code);
- 
- void beat_halt(void)
- {
-@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char *buf, size_
- 		len = count;
- 		if (len > BEAT_NVRW_CNT)
- 			len = BEAT_NVRW_CNT;
--		if (beat_eeprom_read(i, len, p)) {
-+		if (beat_eeprom_read(i, len, p))
- 			return -EIO;
--		}
- 
- 		p += len;
- 		i += len;
-@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char *buf, size
- 		len = count;
- 		if (len > BEAT_NVRW_CNT)
- 			len = BEAT_NVRW_CNT;
--		if (beat_eeprom_write(i, len, p)) {
-+		if (beat_eeprom_write(i, len, p))
- 			return -EIO;
--		}
- 
- 		p += len;
- 		i += len;
-@@ -149,13 +148,14 @@ int64_t beat_get_term_char(u64 vterm, u6
- 	u64 db[2];
- 	s64 ret;
- 
--	ret = beat_get_characters_from_console(vterm, len, (u8*)db);
-+	ret = beat_get_characters_from_console(vterm, len, (u8 *)db);
- 	if (ret == 0) {
- 		*t1 = db[0];
- 		*t2 = db[1];
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(beat_get_term_char);
- 
- int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
- {
-@@ -163,8 +163,9 @@ int64_t beat_put_term_char(u64 vterm, u6
- 
- 	db[0] = t1;
- 	db[1] = t2;
--	return beat_put_characters_to_console(vterm, len, (u8*)db);
-+	return beat_put_characters_to_console(vterm, len, (u8 *)db);
- }
-+EXPORT_SYMBOL(beat_put_term_char);
- 
- void beat_power_save(void)
- {
-@@ -261,7 +262,3 @@ static int __init beat_event_init(void)
- }
- 
- device_initcall(beat_event_init);
--
--EXPORT_SYMBOL(beat_get_term_char);
--EXPORT_SYMBOL(beat_put_term_char);
--EXPORT_SYMBOL(beat_halt_code);
---- a/arch/powerpc/platforms/celleb/beat.h
-+++ b/arch/powerpc/platforms/celleb/beat.h
-@@ -21,8 +21,8 @@
- #ifndef _CELLEB_BEAT_H
- #define _CELLEB_BEAT_H
- 
--int64_t beat_get_term_char(uint64_t,uint64_t*,uint64_t*,uint64_t*);
--int64_t beat_put_term_char(uint64_t,uint64_t,uint64_t,uint64_t);
-+int64_t beat_get_term_char(uint64_t, uint64_t *, uint64_t *, uint64_t *);
-+int64_t beat_put_term_char(uint64_t, uint64_t, uint64_t, uint64_t);
- int64_t beat_repository_encode(int, const char *, uint64_t[4]);
- void beat_restart(char *);
- void beat_power_off(void);
---- a/arch/powerpc/platforms/celleb/beat_wrapper.h
-+++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
-@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to
- 	u64 b[2];
- 
- 	memcpy(b, buffer, len);
--	return beat_hcall_norets(HV_put_characters_to_console, termno, len,					 b[0], b[1]);
-+	return beat_hcall_norets(HV_put_characters_to_console, termno, len,
-+		b[0], b[1]);
- }
- 
- static inline s64 beat_get_spe_privileged_state_1_registers(
---- a/arch/powerpc/platforms/celleb/htab.c
-+++ b/arch/powerpc/platforms/celleb/htab.c
-@@ -35,9 +35,9 @@
- #include "beat_wrapper.h"
- 
- #ifdef DEBUG_LOW
--#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
-+#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0)
- #else
--#define DBG_LOW(fmt...) do { } while(0)
-+#define DBG_LOW(fmt...) do { } while (0)
- #endif
- 
- static DEFINE_SPINLOCK(beat_htab_lock);
-@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsign
- 		hpte_r &= ~_PAGE_COHERENT;
- 
- 	spin_lock(&beat_htab_lock);
--	if ((lpar_rc = beat_read_mask(hpte_group)) == 0) {
-+	lpar_rc = beat_read_mask(hpte_group);
-+	if (lpar_rc == 0) {
- 		if (!(vflags & HPTE_V_BOLTED))
- 			DBG_LOW(" full\n");
- 		spin_unlock(&beat_htab_lock);
---- a/arch/powerpc/platforms/celleb/interrupt.c
-+++ b/arch/powerpc/platforms/celleb/interrupt.c
-@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_l
- static uint64_t	beatic_irq_mask_enable[(MAX_IRQS+255)/64];
- static uint64_t	beatic_irq_mask_ack[(MAX_IRQS+255)/64];
- 
--static struct irq_host *beatic_host = NULL;
-+static struct irq_host *beatic_host;
- 
- /*
-  * In this implementation, "virq" == "IRQ plug number",
-@@ -49,13 +49,13 @@ static inline void beatic_update_irq_mas
- 
- 	off = (irq_plug / 256) * 4;
- 	masks[0] = beatic_irq_mask_enable[off + 0]
--	           & beatic_irq_mask_ack[off + 0];
-+		& beatic_irq_mask_ack[off + 0];
- 	masks[1] = beatic_irq_mask_enable[off + 1]
--	           & beatic_irq_mask_ack[off + 1];
-+		& beatic_irq_mask_ack[off + 1];
- 	masks[2] = beatic_irq_mask_enable[off + 2]
--	           & beatic_irq_mask_ack[off + 2];
-+		& beatic_irq_mask_ack[off + 2];
- 	masks[3] = beatic_irq_mask_enable[off + 3]
--	           & beatic_irq_mask_ack[off + 3];
-+		& beatic_irq_mask_ack[off + 3];
- 	if (beat_set_interrupt_mask(irq_plug&~255UL,
- 		masks[0], masks[1], masks[2], masks[3]) != 0)
- 		panic("Failed to set mask IRQ!");
-@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int 
- 	s64 err;
- 	unsigned long flags;
- 
--	if ((err = beat_downcount_of_interrupt(irq_plug)) != 0) {
-+	err = beat_downcount_of_interrupt(irq_plug);
-+	if (err != 0) {
- 		if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
- 			panic("Failed to downcount IRQ! Error = %16lx", err);
- 
-@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct ir
- 	struct irq_desc *desc = get_irq_desc(virq);
- 	int64_t	err;
- 
--	if ((err = beat_construct_and_connect_irq_plug(virq, hw)) < 0)
-+	err = beat_construct_and_connect_irq_plug(virq, hw);
-+	if (err < 0)
- 		return -EIO;
- 
- 	desc->status |= IRQ_LEVEL;
-@@ -202,22 +204,22 @@ static inline unsigned int beatic_get_ir
- 		beat_detect_pending_interrupts(i, pending);
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[0] & beatic_irq_mask_enable[i/64+0]
--			               & beatic_irq_mask_ack[i/64+0]));
-+				       & beatic_irq_mask_ack[i/64+0]));
- 		if (ub != 64)
- 			return i + ub + 0;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[1] & beatic_irq_mask_enable[i/64+1]
--			               & beatic_irq_mask_ack[i/64+1]));
-+				       & beatic_irq_mask_ack[i/64+1]));
- 		if (ub != 64)
- 			return i + ub + 64;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[2] & beatic_irq_mask_enable[i/64+2]
--			               & beatic_irq_mask_ack[i/64+2]));
-+				       & beatic_irq_mask_ack[i/64+2]));
- 		if (ub != 64)
- 			return i + ub + 128;
- 		__asm__ ("cntlzd %0,%1":"=r"(ub):
- 			"r"(pending[3] & beatic_irq_mask_enable[i/64+3]
--			               & beatic_irq_mask_ack[i/64+3]));
-+				       & beatic_irq_mask_ack[i/64+3]));
- 		if (ub != 64)
- 			return i + ub + 192;
- 	}
-@@ -250,7 +252,7 @@ void __init beatic_init_IRQ(void)
- 
- 	/* Allocate an irq host */
- 	beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
--					 &beatic_pic_host_ops,
-+				     &beatic_pic_host_ops,
- 					 0);
- 	BUG_ON(beatic_host == NULL);
- 	irq_set_default_host(beatic_host);
---- a/arch/powerpc/platforms/celleb/scc_epci.c
-+++ b/arch/powerpc/platforms/celleb/scc_epci.c
-@@ -161,9 +161,9 @@ static PCI_IO_ADDR celleb_epci_make_conf
- 	if (bus != hose->bus)
- 		addr = celleb_epci_get_epci_cfg(hose) +
- 		       (((bus->number & 0xff) << 16)
--		        | ((devfn & 0xff) << 8)
--		        | (where & 0xff)
--		        | 0x01000000);
-+			| ((devfn & 0xff) << 8)
-+			| (where & 0xff)
-+			| 0x01000000);
- 	else
- 		addr = celleb_epci_get_epci_cfg(hose) +
- 		       (((devfn & 0xff) << 8) | (where & 0xff));
-@@ -174,7 +174,7 @@ static PCI_IO_ADDR celleb_epci_make_conf
- }
- 
- static int celleb_epci_read_config(struct pci_bus *bus,
--			unsigned int devfn, int where, int size, u32 * val)
-+			unsigned int devfn, int where, int size, u32 *val)
- {
- 	PCI_IO_ADDR epci_base;
- 	PCI_IO_ADDR addr;
---- a/arch/powerpc/platforms/celleb/scc_sio.c
-+++ b/arch/powerpc/platforms/celleb/scc_sio.c
-@@ -28,7 +28,7 @@
- 
- /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
-     mmio=0xfff000-0x1000,0xff2000-0x1000 */
--static int txx9_serial_bitmap __initdata = 0;
-+static int txx9_serial_bitmap __initdata;
- 
- static struct {
- 	uint32_t offset;
-@@ -84,7 +84,7 @@ static int __init txx9_serial_config(cha
- 	int	i;
- 
- 	for (;;) {
--		switch(get_option(&ptr, &i)) {
-+		switch (get_option(&ptr, &i)) {
- 		default:
- 			return 0;
- 		case 2:
---- a/arch/powerpc/platforms/celleb/spu_priv1.c
-+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
-@@ -183,8 +183,7 @@ static u64 resource_allocation_enable_ge
- 	return enable;
- }
- 
--const struct spu_priv1_ops spu_priv1_beat_ops =
--{
-+const struct spu_priv1_ops spu_priv1_beat_ops = {
- 	.int_mask_and = int_mask_and,
- 	.int_mask_or = int_mask_or,
- 	.int_mask_set = int_mask_set,
---- a/arch/powerpc/platforms/celleb/udbg_beat.c
-+++ b/arch/powerpc/platforms/celleb/udbg_beat.c
-@@ -54,7 +54,8 @@ static int udbg_getc_poll_beat(void)
- 	if (inbuflen == 0) {
- 		/* get some more chars. */
- 		inbuflen = 0;
--		rc = beat_get_term_char(celleb_vtermno, &inbuflen, inbuf+0, inbuf+1);
-+		rc = beat_get_term_char(celleb_vtermno, &inbuflen,
-+					inbuf+0, inbuf+1);
- 		if (rc != 0)
- 			inbuflen = 0;	/* otherwise inbuflen is garbage */
- 	}
-@@ -78,7 +79,7 @@ static int udbg_getc_beat(void)
- 		if (ch == -1) {
- 			/* This shouldn't be needed...but... */
- 			volatile unsigned long delay;
--			for (delay=0; delay < 2000000; delay++)
-+			for (delay = 0; delay < 2000000; delay++)
- 				;
- 		} else {
- 			return ch;
---- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
-+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
-@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ
- 	}
- 
- 	if (mpic_paddr == 0) {
--		printk("%s: No tsi108 PIC found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 PIC found !\n", __func__);
- 		return;
- 	}
- 
--	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __FUNCTION__,
-+	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,
- 	    (u32) mpic_paddr);
- 
- 	mpic = mpic_alloc(tsi_pic, mpic_paddr,
-@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ
- #ifdef CONFIG_PCI
- 	tsi_pci = of_find_node_by_type(NULL, "pci");
- 	if (tsi_pci == NULL) {
--		printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 pci node found !\n", __func__);
- 		return;
- 	}
- 	cascade_node = of_find_node_by_type(NULL, "pic-router");
- 	if (cascade_node == NULL) {
--		printk("%s: No tsi108 pci cascade node found !\n", __FUNCTION__);
-+		printk("%s: No tsi108 pci cascade node found !\n", __func__);
- 		return;
- 	}
- 
- 	cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
--	DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __FUNCTION__,
-+	DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
- 	    (u32) cascade_pci_irq);
- 	tsi108_pci_int_init(cascade_node);
- 	set_irq_data(cascade_pci_irq, mpic);
---- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(
- 	 * ioremap mpp and gpp registers in case they are later
- 	 * needed by prpmc2800_reset_board().
- 	 */
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
- 	reg = of_get_property(np, "reg", NULL);
- 	paddr = of_translate_address(np, reg);
- 	of_node_put(np);
- 	mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
- 	reg = of_get_property(np, "reg", NULL);
- 	paddr = of_translate_address(np, reg);
- 	of_node_put(np);
---- a/arch/powerpc/platforms/iseries/exception.S
-+++ b/arch/powerpc/platforms/iseries/exception.S
-@@ -38,11 +38,19 @@
- 
- 	.globl system_reset_iSeries
- system_reset_iSeries:
--	mfspr	r13,SPRN_SPRG3		/* Get paca address */
-+	mfspr	r13,SPRN_SPRG3		/* Get alpaca address */
-+	LOAD_REG_IMMEDIATE(r23, alpaca)
-+	li	r0,ALPACA_SIZE
-+	sub	r23,r13,r23
-+	divdu	r23,r23,r0		/* r23 has cpu number */
-+	LOAD_REG_IMMEDIATE(r13, paca)
-+	mulli	r0,r23,PACA_SIZE
-+	add	r13,r13,r0
-+	mtspr	SPRN_SPRG3,r13		/* Save it away for the future */
- 	mfmsr	r24
- 	ori	r24,r24,MSR_RI
- 	mtmsrd	r24			/* RI on */
--	lhz	r24,PACAPACAINDEX(r13)	/* Get processor # */
-+	mr	r24,r23
- 	cmpwi	0,r24,0			/* Are we processor 0? */
- 	bne	1f
- 	b	.__start_initialization_iSeries	/* Start up the first processor */
---- a/arch/powerpc/platforms/iseries/ipl_parms.h
-+++ b/arch/powerpc/platforms/iseries/ipl_parms.h
-@@ -65,6 +65,4 @@ struct ItIplParmsReal {
- 	u64	xRsvd13;		// Reserved			x38-x3F
- };
- 
--extern struct ItIplParmsReal	xItIplParmsReal;
--
- #endif /* _ISERIES_IPL_PARMS_H */
---- a/arch/powerpc/platforms/iseries/lpardata.c
-+++ b/arch/powerpc/platforms/iseries/lpardata.c
-@@ -14,10 +14,10 @@
- #include <asm/ptrace.h>
- #include <asm/abs_addr.h>
- #include <asm/lppaca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #include <asm/paca.h>
- #include <asm/iseries/lpar_map.h>
- #include <asm/iseries/it_lp_queue.h>
-+#include <asm/iseries/alpaca.h>
- 
- #include "naca.h"
- #include "vpd_areas.h"
-@@ -31,7 +31,7 @@
- /* The HvReleaseData is the root of the information shared between
-  * the hypervisor and Linux.
-  */
--struct HvReleaseData hvReleaseData = {
-+const struct HvReleaseData hvReleaseData = {
- 	.xDesc = 0xc8a5d9c4,	/* "HvRD" ebcdic */
- 	.xSize = sizeof(struct HvReleaseData),
- 	.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
-@@ -61,6 +61,63 @@ struct naca_struct naca = {
- 	.xRamDiskSize = 0,
- };
- 
-+struct ItLpRegSave {
-+	u32	xDesc;		// Eye catcher  "LpRS" ebcdic	000-003
-+	u16	xSize;		// Size of this class		004-005
-+	u8	xInUse;         // Area is live                 006-007
-+	u8	xRsvd1[9];	// Reserved			007-00F
-+
-+	u8      xFixedRegSave[352]; // Fixed Register Save Area 010-16F
-+	u32	xCTRL;		// Control Register		170-173
-+	u32	xDEC;		// Decrementer			174-177
-+	u32	xFPSCR;		// FP Status and Control Reg	178-17B
-+	u32	xPVR;		// Processor Version Number	17C-17F
-+
-+	u64	xMMCR0;		// Monitor Mode Control Reg 0	180-187
-+	u32	xPMC1;		// Perf Monitor Counter 1	188-18B
-+	u32	xPMC2;		// Perf Monitor Counter 2	18C-18F
-+	u32	xPMC3;		// Perf Monitor Counter 3	190-193
-+	u32	xPMC4;		// Perf Monitor Counter 4	194-197
-+	u32	xPIR;		// Processor ID Reg		198-19B
-+
-+	u32	xMMCR1;		// Monitor Mode Control Reg 1	19C-19F
-+	u32	xMMCRA;		// Monitor Mode Control Reg A	1A0-1A3
-+	u32	xPMC5;		// Perf Monitor Counter 5	1A4-1A7
-+	u32	xPMC6;		// Perf Monitor Counter 6	1A8-1AB
-+	u32	xPMC7;		// Perf Monitor Counter 7	1AC-1AF
-+	u32	xPMC8;		// Perf Monitor Counter 8	1B0-1B3
-+	u32	xTSC;		// Thread Switch Control	1B4-1B7
-+	u32	xTST;		// Thread Switch Timeout	1B8-1BB
-+	u32	xRsvd;          // Reserved                     1BC-1BF
-+
-+	u64	xACCR;		// Address Compare Control Reg	1C0-1C7
-+	u64	xIMR;		// Instruction Match Register	1C8-1CF
-+	u64	xSDR1;		// Storage Description Reg 1	1D0-1D7
-+	u64	xSPRG0;		// Special Purpose Reg General0	1D8-1DF
-+	u64	xSPRG1;		// Special Purpose Reg General1	1E0-1E7
-+	u64	xSPRG2;		// Special Purpose Reg General2	1E8-1EF
-+	u64	xSPRG3;		// Special Purpose Reg General3	1F0-1F7
-+	u64	xTB;		// Time Base Register		1F8-1FF
-+
-+	u64	xFPR[32];	// Floating Point Registers	200-2FF
-+
-+	u64	xMSR;		// Machine State Register	300-307
-+	u64	xNIA;		// Next Instruction Address	308-30F
-+
-+	u64	xDABR;		// Data Address Breakpoint Reg	310-317
-+	u64	xIABR;		// Inst Address Breakpoint Reg	318-31F
-+
-+	u64	xHID0;		// HW Implementation Dependent0	320-327
-+
-+	u64	xHID4;		// HW Implementation Dependent4	328-32F
-+	u64	xSCOMd;		// SCON Data Reg (SPRG4)	330-337
-+	u64	xSCOMc;		// SCON Command Reg (SPRG5)	338-33F
-+	u64	xSDAR;		// Sample Data Address Register	340-347
-+	u64	xSIAR;		// Sample Inst Address Register	348-34F
-+
-+	u8	xRsvd3[176];	// Reserved			350-3FF
-+};
-+
- extern void system_reset_iSeries(void);
- extern void machine_check_iSeries(void);
- extern void data_access_iSeries(void);
-@@ -129,7 +186,7 @@ struct ItLpNaca itLpNaca = {
- };
- 
- /* May be filled in by the hypervisor so cannot end up in the BSS */
--struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
-+static struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));
- 
- /* May be filled in by the hypervisor so cannot end up in the BSS */
- struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
-@@ -152,13 +209,54 @@ u64    xMsVpd[3400] __attribute__((__sec
- 
- /* Space for Recovery Log Buffer */
- /* May be filled in by the hypervisor so cannot end up in the BSS */
--u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
-+static u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));
- 
--struct SpCommArea xSpCommArea = {
-+static const struct SpCommArea xSpCommArea = {
- 	.xDesc = 0xE2D7C3C2,
- 	.xFormat = 1,
- };
- 
-+static const struct ItLpRegSave iseries_reg_save[] = {
-+	[0 ... (NR_CPUS-1)] = {
-+		.xDesc = 0xd397d9e2,	/* "LpRS" */
-+		.xSize = sizeof(struct ItLpRegSave),
-+	},
-+};
-+
-+#define ALPACA_INIT(number)						\
-+{									\
-+	.lppaca_ptr = &lppaca[number],					\
-+	.reg_save_ptr = &iseries_reg_save[number],			\
-+}
-+
-+const struct alpaca alpaca[] = {
-+	ALPACA_INIT( 0),
-+#if NR_CPUS > 1
-+	ALPACA_INIT( 1), ALPACA_INIT( 2), ALPACA_INIT( 3),
-+#if NR_CPUS > 4
-+	ALPACA_INIT( 4), ALPACA_INIT( 5), ALPACA_INIT( 6), ALPACA_INIT( 7),
-+#if NR_CPUS > 8
-+	ALPACA_INIT( 8), ALPACA_INIT( 9), ALPACA_INIT(10), ALPACA_INIT(11),
-+	ALPACA_INIT(12), ALPACA_INIT(13), ALPACA_INIT(14), ALPACA_INIT(15),
-+	ALPACA_INIT(16), ALPACA_INIT(17), ALPACA_INIT(18), ALPACA_INIT(19),
-+	ALPACA_INIT(20), ALPACA_INIT(21), ALPACA_INIT(22), ALPACA_INIT(23),
-+	ALPACA_INIT(24), ALPACA_INIT(25), ALPACA_INIT(26), ALPACA_INIT(27),
-+	ALPACA_INIT(28), ALPACA_INIT(29), ALPACA_INIT(30), ALPACA_INIT(31),
-+#if NR_CPUS > 32
-+	ALPACA_INIT(32), ALPACA_INIT(33), ALPACA_INIT(34), ALPACA_INIT(35),
-+	ALPACA_INIT(36), ALPACA_INIT(37), ALPACA_INIT(38), ALPACA_INIT(39),
-+	ALPACA_INIT(40), ALPACA_INIT(41), ALPACA_INIT(42), ALPACA_INIT(43),
-+	ALPACA_INIT(44), ALPACA_INIT(45), ALPACA_INIT(46), ALPACA_INIT(47),
-+	ALPACA_INIT(48), ALPACA_INIT(49), ALPACA_INIT(50), ALPACA_INIT(51),
-+	ALPACA_INIT(52), ALPACA_INIT(53), ALPACA_INIT(54), ALPACA_INIT(55),
-+	ALPACA_INIT(56), ALPACA_INIT(57), ALPACA_INIT(58), ALPACA_INIT(59),
-+	ALPACA_INIT(60), ALPACA_INIT(61), ALPACA_INIT(62), ALPACA_INIT(63),
-+#endif
-+#endif
-+#endif
-+#endif
-+};
-+
- /* The LparMap data is now located at offset 0x6000 in head.S
-  * It was put there so that the HvReleaseData could address it
-  * with a 32-bit offset as required by the iSeries hypervisor
-@@ -167,7 +265,7 @@ struct SpCommArea xSpCommArea = {
-  * the Naca via the HvReleaseData area.  The HvReleaseData has the
-  * offset into the Naca of the pointer to the ItVpdAreas.
-  */
--struct ItVpdAreas itVpdAreas = {
-+const struct ItVpdAreas itVpdAreas = {
- 	.xSlicDesc = 0xc9a3e5c1,		/* "ItVA" */
- 	.xSlicSize = sizeof(struct ItVpdAreas),
- 	.xSlicVpdEntries = ItVpdMaxEntries,	/* # VPD array entries */
-@@ -185,7 +283,7 @@ struct ItVpdAreas itVpdAreas = {
- 	.xSlicVpdLens = {			/* VPD lengths */
- 	        0,0,0,		        /*  0 - 2 */
- 		sizeof(xItExtVpdPanel), /*       3 Extended VPD   */
--		sizeof(struct paca_struct),	/*       4 length of Paca  */
-+		sizeof(struct alpaca),	/*       4 length of (fake) Paca  */
- 		0,			/*       5 */
- 		sizeof(struct ItIplParmsReal),/* 6 length of IPL parms */
- 		26992,			/*	 7 length of MS VPD */
-@@ -203,7 +301,7 @@ struct ItVpdAreas itVpdAreas = {
- 	.xSlicVpdAdrs = {			/* VPD addresses */
- 		0,0,0,			/*	 0 -  2 */
- 		&xItExtVpdPanel,        /*       3 Extended VPD */
--		&paca[0],		/*       4 first Paca */
-+		&alpaca[0],		/*       4 first (fake) Paca */
- 		0,			/*       5 */
- 		&xItIplParmsReal,	/*	 6 IPL parms */
- 		&xMsVpd,		/*	 7 MS Vpd */
-@@ -219,10 +317,3 @@ struct ItVpdAreas itVpdAreas = {
- 		0,0
- 	}
- };
--
--struct ItLpRegSave iseries_reg_save[] = {
--	[0 ... (NR_CPUS-1)] = {
--		.xDesc = 0xd397d9e2,	/* "LpRS" */
--		.xSize = sizeof(struct ItLpRegSave),
--	},
--};
---- a/arch/powerpc/platforms/iseries/naca.h
-+++ b/arch/powerpc/platforms/iseries/naca.h
-@@ -14,7 +14,7 @@
- 
- struct naca_struct {
- 	/* Kernel only data - undefined for user space */
--	void *xItVpdAreas;              /* VPD Data                  0x00 */
-+	const void *xItVpdAreas;	/* VPD Data                  0x00 */
- 	void *xRamDisk;                 /* iSeries ramdisk           0x08 */
- 	u64   xRamDiskSize;		/* In pages                  0x10 */
- };
---- a/arch/powerpc/platforms/iseries/pci.c
-+++ b/arch/powerpc/platforms/iseries/pci.c
-@@ -23,6 +23,7 @@
- 
- #undef DEBUG
- 
-+#include <linux/jiffies.h>
- #include <linux/kernel.h>
- #include <linux/list.h>
- #include <linux/string.h>
-@@ -586,7 +587,7 @@ static inline struct device_node *xlate_
- 		static unsigned long last_jiffies;
- 		static int num_printed;
- 
--		if ((jiffies - last_jiffies) > 60 * HZ) {
-+		if (time_after(jiffies, last_jiffies + 60 * HZ)) {
- 			last_jiffies = jiffies;
- 			num_printed = 0;
- 		}
---- a/arch/powerpc/platforms/iseries/release_data.h
-+++ b/arch/powerpc/platforms/iseries/release_data.h
-@@ -58,6 +58,6 @@ struct HvReleaseData {
- 	char	xRsvd3[20];	/* Reserved			x2C-x3F */
- };
- 
--extern struct HvReleaseData	hvReleaseData;
-+extern const struct HvReleaseData	hvReleaseData;
- 
- #endif /* _ISERIES_RELEASE_DATA_H */
---- a/arch/powerpc/platforms/iseries/spcomm_area.h
-+++ b/arch/powerpc/platforms/iseries/spcomm_area.h
-@@ -31,6 +31,4 @@ struct SpCommArea {
- 	u8	xRsvd2[80];		// Reserved				030-07F
- };
- 
--extern struct SpCommArea xSpCommArea;
--
- #endif /* _ISERIES_SPCOMM_AREA_H */
---- a/arch/powerpc/platforms/iseries/vpd_areas.h
-+++ b/arch/powerpc/platforms/iseries/vpd_areas.h
-@@ -80,9 +80,9 @@ struct ItVpdAreas {
- 	u32	xPlicDmaLens[ItDmaMaxEntries];// Array of DMA lengths	080-0A7
- 	u32	xPlicDmaToks[ItDmaMaxEntries];// Array of DMA tokens	0A8-0CF
- 	u32	xSlicVpdLens[ItVpdMaxEntries];// Array of VPD lengths	0D0-12F
--	void	*xSlicVpdAdrs[ItVpdMaxEntries];// Array of VPD buffers	130-1EF
-+	const void *xSlicVpdAdrs[ItVpdMaxEntries];// Array of VPD buffers 130-1EF
- };
- 
--extern struct ItVpdAreas	itVpdAreas;
-+extern const struct ItVpdAreas	itVpdAreas;
- 
- #endif /* _ISERIES_VPD_AREAS_H */
---- a/arch/powerpc/platforms/maple/pci.c
-+++ b/arch/powerpc/platforms/maple/pci.c
-@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct 
- 	}
- 	return irq;
- }
--
--/* XXX: To remove once all firmwares are ok */
--static void fixup_maple_ide(struct pci_dev* dev)
--{
--	if (!machine_is(maple))
--		return;
--
--#if 0 /* Enable this to enable IDE port 0 */
--	{
--		u8 v;
--
--		pci_read_config_byte(dev, 0x40, &v);
--		v |= 2;
--		pci_write_config_byte(dev, 0x40, v);
--	}
--#endif
--#if 0 /* fix bus master base */
--	pci_write_config_dword(dev, 0x20, 0xcc01);
--	printk("old ide resource: %lx -> %lx \n",
--	       dev->resource[4].start, dev->resource[4].end);
--	dev->resource[4].start = 0xcc00;
--	dev->resource[4].end = 0xcc10;
--#endif
--#if 0 /* Enable this to fixup IDE sense/polarity of irqs in IO-APICs */
--	{
--		struct pci_dev *apicdev;
--		u32 v;
--
--		apicdev = pci_get_slot (dev->bus, PCI_DEVFN(5,0));
--		if (apicdev == NULL)
--			printk("IDE Fixup IRQ: Can't find IO-APIC !\n");
--		else {
--			pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*14);
--			pci_read_config_dword(apicdev, 0xf4, &v);
--			v &= ~0x00000022;
--			pci_write_config_dword(apicdev, 0xf4, v);
--			pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*15);
--			pci_read_config_dword(apicdev, 0xf4, &v);
--			v &= ~0x00000022;
--			pci_write_config_dword(apicdev, 0xf4, v);
--			pci_dev_put(apicdev);
--		}
--	}
--#endif
--}
--DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
--			 fixup_maple_ide);
---- a/arch/powerpc/platforms/maple/setup.c
-+++ b/arch/powerpc/platforms/maple/setup.c
-@@ -43,6 +43,7 @@
- #include <linux/smp.h>
- #include <linux/bitops.h>
- #include <linux/of_device.h>
-+#include <linux/lmb.h>
- 
- #include <asm/processor.h>
- #include <asm/sections.h>
-@@ -57,7 +58,6 @@
- #include <asm/dma.h>
- #include <asm/cputable.h>
- #include <asm/time.h>
--#include <asm/lmb.h>
- #include <asm/mpic.h>
- #include <asm/rtas.h>
- #include <asm/udbg.h>
-@@ -319,7 +319,7 @@ static int __init maple_probe(void)
- 	return 1;
- }
- 
--define_machine(maple_md) {
-+define_machine(maple) {
- 	.name			= "Maple",
- 	.probe			= maple_probe,
- 	.setup_arch		= maple_setup_arch,
---- a/arch/powerpc/platforms/pasemi/dma_lib.c
-+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-  */
- 
-+#include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/pci.h>
-@@ -26,6 +27,8 @@
- 
- #define MAX_TXCH 64
- #define MAX_RXCH 64
-+#define MAX_FLAGS 64
-+#define MAX_FUN 8
- 
- static struct pasdma_status *dma_status;
- 
-@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev;
- 
- static DECLARE_BITMAP(txch_free, MAX_TXCH);
- static DECLARE_BITMAP(rxch_free, MAX_RXCH);
-+static DECLARE_BITMAP(flags_free, MAX_FLAGS);
-+static DECLARE_BITMAP(fun_free, MAX_FUN);
- 
- /* pasemi_read_iob_reg - read IOB register
-  * @reg: Register to read (offset into PCI CFG space)
-@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_d
- }
- EXPORT_SYMBOL(pasemi_dma_free_buf);
- 
-+/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel syncronization
-+ *
-+ * Allocates a flag for use with channel syncronization (event descriptors).
-+ * Returns allocated flag (0-63), < 0 on error.
-+ */
-+int pasemi_dma_alloc_flag(void)
-+{
-+	int bit;
-+
-+retry:
-+	bit = find_next_bit(flags_free, MAX_FLAGS, 0);
-+	if (bit >= MAX_FLAGS)
-+		return -ENOSPC;
-+	if (!test_and_clear_bit(bit, flags_free))
-+		goto retry;
-+
-+	return bit;
-+}
-+EXPORT_SYMBOL(pasemi_dma_alloc_flag);
-+
-+
-+/* pasemi_dma_free_flag - Deallocates a flag (event)
-+ * @flag: Flag number to deallocate
-+ *
-+ * Frees up a flag so it can be reused for other purposes.
-+ */
-+void pasemi_dma_free_flag(int flag)
-+{
-+	BUG_ON(test_bit(flag, flags_free));
-+	BUG_ON(flag >= MAX_FLAGS);
-+	set_bit(flag, flags_free);
-+}
-+EXPORT_SYMBOL(pasemi_dma_free_flag);
-+
-+
-+/* pasemi_dma_set_flag - Sets a flag (event) to 1
-+ * @flag: Flag number to set active
-+ *
-+ * Sets the flag provided to 1.
-+ */
-+void pasemi_dma_set_flag(int flag)
-+{
-+	BUG_ON(flag >= MAX_FLAGS);
-+	if (flag < 32)
-+		pasemi_write_dma_reg(PAS_DMA_TXF_SFLG0, 1 << flag);
-+	else
-+		pasemi_write_dma_reg(PAS_DMA_TXF_SFLG1, 1 << flag);
-+}
-+EXPORT_SYMBOL(pasemi_dma_set_flag);
-+
-+/* pasemi_dma_clear_flag - Sets a flag (event) to 0
-+ * @flag: Flag number to set inactive
-+ *
-+ * Sets the flag provided to 0.
-+ */
-+void pasemi_dma_clear_flag(int flag)
-+{
-+	BUG_ON(flag >= MAX_FLAGS);
-+	if (flag < 32)
-+		pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 1 << flag);
-+	else
-+		pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 1 << flag);
-+}
-+EXPORT_SYMBOL(pasemi_dma_clear_flag);
-+
-+/* pasemi_dma_alloc_fun - Allocate a function engine
-+ *
-+ * Allocates a function engine to use for crypto/checksum offload
-+ * Returns allocated engine (0-8), < 0 on error.
-+ */
-+int pasemi_dma_alloc_fun(void)
-+{
-+	int bit;
-+
-+retry:
-+	bit = find_next_bit(fun_free, MAX_FLAGS, 0);
-+	if (bit >= MAX_FLAGS)
-+		return -ENOSPC;
-+	if (!test_and_clear_bit(bit, fun_free))
-+		goto retry;
-+
-+	return bit;
-+}
-+EXPORT_SYMBOL(pasemi_dma_alloc_fun);
-+
-+
-+/* pasemi_dma_free_fun - Deallocates a function engine
-+ * @flag: Engine number to deallocate
-+ *
-+ * Frees up a function engine so it can be used for other purposes.
-+ */
-+void pasemi_dma_free_fun(int fun)
-+{
-+	BUG_ON(test_bit(fun, fun_free));
-+	BUG_ON(fun >= MAX_FLAGS);
-+	set_bit(fun, fun_free);
-+}
-+EXPORT_SYMBOL(pasemi_dma_free_fun);
-+
-+
- static void *map_onedev(struct pci_dev *p, int index)
- {
- 	struct device_node *dn;
-@@ -410,6 +515,7 @@ int pasemi_dma_init(void)
- 	struct resource res;
- 	struct device_node *dn;
- 	int i, intf, err = 0;
-+	unsigned long timeout;
- 	u32 tmp;
- 
- 	if (!machine_is(pasemi))
-@@ -478,6 +584,44 @@ int pasemi_dma_init(void)
- 	for (i = 0; i < MAX_RXCH; i++)
- 		__set_bit(i, rxch_free);
- 
-+	timeout = jiffies + HZ;
-+	pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
-+	while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
-+		if (time_after(jiffies, timeout)) {
-+			pr_warning("Warning: Could not disable RX section\n");
-+			break;
-+		}
-+	}
-+
-+	timeout = jiffies + HZ;
-+	pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
-+	while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
-+		if (time_after(jiffies, timeout)) {
-+			pr_warning("Warning: Could not disable TX section\n");
-+			break;
-+		}
-+	}
-+
-+	/* setup resource allocations for the different DMA sections */
-+	tmp = pasemi_read_dma_reg(PAS_DMA_COM_CFG);
-+	pasemi_write_dma_reg(PAS_DMA_COM_CFG, tmp | 0x18000000);
-+
-+	/* enable tx section */
-+	pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
-+
-+	/* enable rx section */
-+	pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
-+
-+	for (i = 0; i < MAX_FLAGS; i++)
-+		__set_bit(i, flags_free);
-+
-+	for (i = 0; i < MAX_FUN; i++)
-+		__set_bit(i, fun_free);
-+
-+	/* clear all status flags */
-+	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 0xffffffff);
-+	pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 0xffffffff);
-+
- 	printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
- 		"(%d tx, %d rx channels)\n", num_txch, num_rxch);
- 
---- a/arch/powerpc/platforms/pasemi/iommu.c
-+++ b/arch/powerpc/platforms/pasemi/iommu.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2005-2007, PA Semi, Inc
-+ * Copyright (C) 2005-2008, PA Semi, Inc
-  *
-  * Maintained by: Olof Johansson <olof@lixom.net>
-  *
-@@ -27,7 +27,6 @@
- #include <asm/abs_addr.h>
- #include <asm/firmware.h>
- 
--
- #define IOBMAP_PAGE_SHIFT	12
- #define IOBMAP_PAGE_SIZE	(1 << IOBMAP_PAGE_SHIFT)
- #define IOBMAP_PAGE_MASK	(IOBMAP_PAGE_SIZE - 1)
-@@ -35,13 +34,13 @@
- #define IOB_BASE		0xe0000000
- #define IOB_SIZE		0x3000
- /* Configuration registers */
--#define IOBCAP_REG		0x10
--#define IOBCOM_REG		0x40
-+#define IOBCAP_REG		0x40
-+#define IOBCOM_REG		0x100
- /* Enable IOB address translation */
- #define IOBCOM_ATEN		0x00000100
- 
- /* Address decode configuration register */
--#define IOB_AD_REG		0x53
-+#define IOB_AD_REG		0x14c
- /* IOBCOM_AD_REG fields */
- #define IOB_AD_VGPRT		0x00000e00
- #define IOB_AD_VGAEN		0x00000100
-@@ -56,13 +55,13 @@
- #define IOB_AD_TRNG_2G		0x00000001
- #define IOB_AD_TRNG_128G	0x00000003
- 
--#define IOB_TABLEBASE_REG	0x55
-+#define IOB_TABLEBASE_REG	0x154
- 
- /* Base of the 64 4-byte L1 registers */
--#define IOB_XLT_L1_REGBASE	0xac0
-+#define IOB_XLT_L1_REGBASE	0x2b00
- 
- /* Register to invalidate TLB entries */
--#define IOB_AT_INVAL_TLB_REG	0xb40
-+#define IOB_AT_INVAL_TLB_REG	0x2d00
- 
- /* The top two bits of the level 1 entry contains valid and type flags */
- #define IOBMAP_L1E_V		0x40000000
-@@ -76,7 +75,7 @@
- #define IOBMAP_L2E_V		0x80000000
- #define IOBMAP_L2E_V_CACHED	0xc0000000
- 
--static u32 __iomem *iob;
-+static void __iomem *iob;
- static u32 iob_l1_emptyval;
- static u32 iob_l2_emptyval;
- static u32 *iob_l2_base;
-@@ -219,7 +218,7 @@ int __init iob_init(struct device_node *
- 	for (i = 0; i < 64; i++) {
- 		/* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
- 		regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);
--		out_le32(iob+IOB_XLT_L1_REGBASE+i, regword);
-+		out_le32(iob+IOB_XLT_L1_REGBASE+i*4, regword);
- 	}
- 
- 	/* set 2GB translation window, based at 0 */
---- a/arch/powerpc/platforms/powermac/setup.c
-+++ b/arch/powerpc/platforms/powermac/setup.c
-@@ -53,6 +53,7 @@
- #include <linux/suspend.h>
- #include <linux/of_device.h>
- #include <linux/of_platform.h>
-+#include <linux/lmb.h>
- 
- #include <asm/reg.h>
- #include <asm/sections.h>
-@@ -74,7 +75,6 @@
- #include <asm/iommu.h>
- #include <asm/smu.h>
- #include <asm/pmc.h>
--#include <asm/lmb.h>
- #include <asm/udbg.h>
- 
- #include "pmac.h"
---- a/arch/powerpc/platforms/ps3/device-init.c
-+++ b/arch/powerpc/platforms/ps3/device-init.c
-@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_
- }
- 
- /**
-- * ps3_register_repository_device - Register a device from the repositiory info.
-- *
-+ * ps3_setup_dynamic_device - Setup a dynamic device from the repository
-  */
- 
--static int ps3_register_repository_device(
--	const struct ps3_repository_device *repo)
-+static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo)
- {
- 	int result;
- 
- 	switch (repo->dev_type) {
--	case PS3_DEV_TYPE_SB_GELIC:
--		result = ps3_setup_gelic_device(repo);
--		if (result) {
--			pr_debug("%s:%d ps3_setup_gelic_device failed\n",
--				__func__, __LINE__);
--		}
--		break;
--	case PS3_DEV_TYPE_SB_USB:
--
--		/* Each USB device has both an EHCI and an OHCI HC */
--
--		result = ps3_setup_ehci_device(repo);
--
--		if (result) {
--			pr_debug("%s:%d ps3_setup_ehci_device failed\n",
--				__func__, __LINE__);
--		}
--
--		result = ps3_setup_ohci_device(repo);
--
--		if (result) {
--			pr_debug("%s:%d ps3_setup_ohci_device failed\n",
--				__func__, __LINE__);
--		}
--		break;
- 	case PS3_DEV_TYPE_STOR_DISK:
- 		result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
- 
-@@ -572,6 +545,48 @@ static int ps3_register_repository_devic
- 	return result;
- }
- 
-+/**
-+ * ps3_setup_static_device - Setup a static device from the repository
-+ */
-+
-+static int __init ps3_setup_static_device(const struct ps3_repository_device *repo)
-+{
-+	int result;
-+
-+	switch (repo->dev_type) {
-+	case PS3_DEV_TYPE_SB_GELIC:
-+		result = ps3_setup_gelic_device(repo);
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_gelic_device failed\n",
-+				__func__, __LINE__);
-+		}
-+		break;
-+	case PS3_DEV_TYPE_SB_USB:
-+
-+		/* Each USB device has both an EHCI and an OHCI HC */
-+
-+		result = ps3_setup_ehci_device(repo);
-+
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_ehci_device failed\n",
-+				__func__, __LINE__);
-+		}
-+
-+		result = ps3_setup_ohci_device(repo);
-+
-+		if (result) {
-+			pr_debug("%s:%d ps3_setup_ohci_device failed\n",
-+				__func__, __LINE__);
-+		}
-+		break;
-+
-+	default:
-+		return ps3_setup_dynamic_device(repo);
-+	}
-+
-+	return result;
-+}
-+
- static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
- {
- 	struct ps3_repository_device repo;
-@@ -601,7 +616,7 @@ found:
- 		pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
- 			 __func__, __LINE__, bus_id, dev_id, retries);
- 
--	ps3_register_repository_device(&repo);
-+	ps3_setup_dynamic_device(&repo);
- 	return;
- }
- 
-@@ -905,8 +920,7 @@ static int __init ps3_register_devices(v
- 
- 	ps3_register_graphics_devices();
- 
--	ps3_repository_find_devices(PS3_BUS_TYPE_SB,
--		ps3_register_repository_device);
-+	ps3_repository_find_devices(PS3_BUS_TYPE_SB, ps3_setup_static_device);
- 
- 	ps3_register_sound_devices();
- 
---- a/arch/powerpc/platforms/ps3/htab.c
-+++ b/arch/powerpc/platforms/ps3/htab.c
-@@ -19,9 +19,10 @@
-  */
- 
- #include <linux/kernel.h>
-+#include <linux/lmb.h>
- 
- #include <asm/machdep.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/udbg.h>
- #include <asm/lv1call.h>
- #include <asm/ps3fb.h>
---- a/arch/powerpc/platforms/ps3/interrupt.c
-+++ b/arch/powerpc/platforms/ps3/interrupt.c
-@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)
- 	asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
- 	plug &= 0x3f;
- 
--	if (unlikely(plug) == NO_IRQ) {
-+	if (unlikely(plug == NO_IRQ)) {
- 		pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
- 			__LINE__, pd->thread_id);
- 		dump_bmp(&per_cpu(ps3_private, 0));
---- a/arch/powerpc/platforms/ps3/mm.c
-+++ b/arch/powerpc/platforms/ps3/mm.c
-@@ -21,9 +21,10 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/memory_hotplug.h>
-+#include <linux/lmb.h>
- 
- #include <asm/firmware.h>
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- #include <asm/udbg.h>
- #include <asm/lv1call.h>
- 
---- a/arch/powerpc/platforms/ps3/os-area.c
-+++ b/arch/powerpc/platforms/ps3/os-area.c
-@@ -24,8 +24,9 @@
- #include <linux/fs.h>
- #include <linux/syscalls.h>
- #include <linux/ctype.h>
-+#include <linux/lmb.h>
- 
--#include <asm/lmb.h>
-+#include <asm/prom.h>
- 
- #include "platform.h"
- 
---- a/arch/powerpc/platforms/ps3/setup.c
-+++ b/arch/powerpc/platforms/ps3/setup.c
-@@ -95,6 +95,14 @@ static void ps3_power_off(void)
- 	ps3_sys_manager_power_off(); /* never returns */
- }
- 
-+static void ps3_halt(void)
-+{
-+	DBG("%s:%d\n", __func__, __LINE__);
-+
-+	smp_send_stop();
-+	ps3_sys_manager_halt(); /* never returns */
-+}
-+
- static void ps3_panic(char *str)
- {
- 	DBG("%s:%d %s\n", __func__, __LINE__, str);
-@@ -105,7 +113,8 @@ static void ps3_panic(char *str)
- 	printk("   Please press POWER button.\n");
- 	printk("\n");
- 
--	while(1);
-+	while(1)
-+		lv1_pause(1);
- }
- 
- #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
-@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_p
- 
- 	p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
- 	if (!p->address) {
--		printk(KERN_ERR "%s: Cannot allocate %s\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
- 		       p->name);
- 		return;
- 	}
-@@ -266,6 +275,7 @@ define_machine(ps3) {
- 	.progress			= ps3_progress,
- 	.restart			= ps3_restart,
- 	.power_off			= ps3_power_off,
-+	.halt				= ps3_halt,
- #if defined(CONFIG_KEXEC)
- 	.kexec_cpu_down			= ps3_kexec_cpu_down,
- 	.machine_kexec			= default_machine_kexec,
---- a/arch/powerpc/platforms/ps3/spu.c
-+++ b/arch/powerpc/platforms/ps3/spu.c
-@@ -27,6 +27,7 @@
- #include <asm/spu.h>
- #include <asm/spu_priv1.h>
- #include <asm/lv1call.h>
-+#include <asm/ps3.h>
- 
- #include "../cell/spufs/spufs.h"
- #include "platform.h"
-@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe
- 	pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
- }
- 
-+inline u64 ps3_get_spe_id(void *arg)
-+{
-+	return spu_pdata(arg)->spe_id;
-+}
-+EXPORT_SYMBOL_GPL(ps3_get_spe_id);
-+
- static unsigned long get_vas_id(void)
- {
- 	unsigned long id;
---- a/arch/powerpc/platforms/pseries/Makefile
-+++ b/arch/powerpc/platforms/pseries/Makefile
-@@ -18,3 +18,4 @@ obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug-cpu
- obj-$(CONFIG_HVC_CONSOLE)	+= hvconsole.o
- obj-$(CONFIG_HVCS)		+= hvcserver.o
- obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
-+obj-$(CONFIG_PHYP_DUMP)	+= phyp_dump.o
---- a/arch/powerpc/platforms/pseries/eeh.c
-+++ b/arch/powerpc/platforms/pseries/eeh.c
-@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct dev
- 	unsigned int rets[3];
- 	struct eeh_early_enable_info *info = data;
- 	int ret;
--	const char *status = of_get_property(dn, "status", NULL);
- 	const u32 *class_code = of_get_property(dn, "class-code", NULL);
- 	const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
- 	const u32 *device_id = of_get_property(dn, "device-id", NULL);
-@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct dev
- 	pdn->eeh_freeze_count = 0;
- 	pdn->eeh_false_positives = 0;
- 
--	if (status && strncmp(status, "ok", 2) != 0)
--		return NULL;	/* ignore devices with bad status */
-+	if (!of_device_is_available(dn))
-+		return NULL;
- 
- 	/* Ignore bad nodes. */
- 	if (!class_code || !vendor_id || !device_id)
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -40,6 +40,7 @@
- #include <asm/smp.h>
- 
- #include "plpar_wrappers.h"
-+#include "pseries.h"
- 
- #ifdef DEBUG_LOW
- #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
-@@ -203,7 +204,6 @@ void __init find_udbg_vterm(void)
- 	struct device_node *stdout_node;
- 	const u32 *termno;
- 	const char *name;
--	int add_console;
- 
- 	/* find the boot console from /chosen/stdout */
- 	if (!of_chosen)
-@@ -219,8 +219,6 @@ void __init find_udbg_vterm(void)
- 		printk(KERN_WARNING "stdout node missing 'name' property!\n");
- 		goto out;
- 	}
--	/* The user has requested a console so this is already set up. */
--	add_console = !strstr(cmd_line, "console=");
- 
- 	/* Check if it's a virtual terminal */
- 	if (strncmp(name, "vty", 3) != 0)
-@@ -234,15 +232,13 @@ void __init find_udbg_vterm(void)
- 		udbg_putc = udbg_putcLP;
- 		udbg_getc = udbg_getcLP;
- 		udbg_getc_poll = udbg_getc_pollLP;
--		if (add_console)
--			add_preferred_console("hvc", termno[0] & 0xff, NULL);
-+		add_preferred_console("hvc", termno[0] & 0xff, NULL);
- 	} else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) {
- 		vtermno = termno[0];
- 		udbg_putc = udbg_hvsi_putc;
- 		udbg_getc = udbg_hvsi_getc;
- 		udbg_getc_poll = udbg_hvsi_getc_poll;
--		if (add_console)
--			add_preferred_console("hvsi", termno[0] & 0xff, NULL);
-+		add_preferred_console("hvsi", termno[0] & 0xff, NULL);
- 	}
- out:
- 	of_node_put(stdout_node);
-@@ -520,6 +516,20 @@ static void pSeries_lpar_hpte_invalidate
- 	BUG_ON(lpar_rc != H_SUCCESS);
- }
- 
-+static void pSeries_lpar_hpte_removebolted(unsigned long ea,
-+					   int psize, int ssize)
-+{
-+	unsigned long slot, vsid, va;
-+
-+	vsid = get_kernel_vsid(ea, ssize);
-+	va = hpt_va(ea, vsid, ssize);
-+
-+	slot = pSeries_lpar_hpte_find(va, psize, ssize);
-+	BUG_ON(slot == -1);
-+
-+	pSeries_lpar_hpte_invalidate(slot, va, psize, ssize, 0);
-+}
-+
- /* Flag bits for H_BULK_REMOVE */
- #define HBR_REQUEST	0x4000000000000000UL
- #define HBR_RESPONSE	0x8000000000000000UL
-@@ -597,6 +607,7 @@ void __init hpte_init_lpar(void)
- 	ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
- 	ppc_md.hpte_insert	= pSeries_lpar_hpte_insert;
- 	ppc_md.hpte_remove	= pSeries_lpar_hpte_remove;
-+	ppc_md.hpte_removebolted = pSeries_lpar_hpte_removebolted;
- 	ppc_md.flush_hash_range	= pSeries_lpar_flush_hash_range;
- 	ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
- }
---- a/arch/powerpc/platforms/pseries/pci_dlpar.c
-+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
-@@ -123,7 +123,7 @@ pcibios_pci_config_bridge(struct pci_dev
- 	/* Add to children of PCI bridge dev->bus */
- 	child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
- 	if (!child_bus) {
--		printk (KERN_ERR "%s: could not add second bus\n", __FUNCTION__);
-+		printk (KERN_ERR "%s: could not add second bus\n", __func__);
- 		return -EIO;
- 	}
- 	sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
---- /dev/null
-+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
-@@ -0,0 +1,507 @@
-+/*
-+ * Hypervisor-assisted dump
-+ *
-+ * Linas Vepstas, Manish Ahuja 2008
-+ * Copyright 2008 IBM Corp.
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kobject.h>
-+#include <linux/mm.h>
-+#include <linux/of.h>
-+#include <linux/pfn.h>
-+#include <linux/swap.h>
-+#include <linux/sysfs.h>
-+
-+#include <asm/page.h>
-+#include <asm/phyp_dump.h>
-+#include <asm/machdep.h>
-+#include <asm/prom.h>
-+#include <asm/rtas.h>
-+
-+/* Variables, used to communicate data between early boot and late boot */
-+static struct phyp_dump phyp_dump_vars;
-+struct phyp_dump *phyp_dump_info = &phyp_dump_vars;
-+
-+static int ibm_configure_kernel_dump;
-+/* ------------------------------------------------- */
-+/* RTAS interfaces to declare the dump regions */
-+
-+struct dump_section {
-+	u32 dump_flags;
-+	u16 source_type;
-+	u16 error_flags;
-+	u64 source_address;
-+	u64 source_length;
-+	u64 length_copied;
-+	u64 destination_address;
-+};
-+
-+struct phyp_dump_header {
-+	u32 version;
-+	u16 num_of_sections;
-+	u16 status;
-+
-+	u32 first_offset_section;
-+	u32 dump_disk_section;
-+	u64 block_num_dd;
-+	u64 num_of_blocks_dd;
-+	u32 offset_dd;
-+	u32 maxtime_to_auto;
-+	/* No dump disk path string used */
-+
-+	struct dump_section cpu_data;
-+	struct dump_section hpte_data;
-+	struct dump_section kernel_data;
-+};
-+
-+/* The dump header *must be* in low memory, so .bss it */
-+static struct phyp_dump_header phdr;
-+
-+#define NUM_DUMP_SECTIONS	3
-+#define DUMP_HEADER_VERSION	0x1
-+#define DUMP_REQUEST_FLAG	0x1
-+#define DUMP_SOURCE_CPU		0x0001
-+#define DUMP_SOURCE_HPTE	0x0002
-+#define DUMP_SOURCE_RMO		0x0011
-+#define DUMP_ERROR_FLAG		0x2000
-+#define DUMP_TRIGGERED		0x4000
-+#define DUMP_PERFORMED		0x8000
-+
-+
-+/**
-+ * init_dump_header() - initialize the header declaring a dump
-+ * Returns: length of dump save area.
-+ *
-+ * When the hypervisor saves crashed state, it needs to put
-+ * it somewhere. The dump header tells the hypervisor where
-+ * the data can be saved.
-+ */
-+static unsigned long init_dump_header(struct phyp_dump_header *ph)
-+{
-+	unsigned long addr_offset = 0;
-+
-+	/* Set up the dump header */
-+	ph->version = DUMP_HEADER_VERSION;
-+	ph->num_of_sections = NUM_DUMP_SECTIONS;
-+	ph->status = 0;
-+
-+	ph->first_offset_section =
-+		(u32)offsetof(struct phyp_dump_header, cpu_data);
-+	ph->dump_disk_section = 0;
-+	ph->block_num_dd = 0;
-+	ph->num_of_blocks_dd = 0;
-+	ph->offset_dd = 0;
-+
-+	ph->maxtime_to_auto = 0; /* disabled */
-+
-+	/* The first two sections are mandatory */
-+	ph->cpu_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->cpu_data.source_type = DUMP_SOURCE_CPU;
-+	ph->cpu_data.source_address = 0;
-+	ph->cpu_data.source_length = phyp_dump_info->cpu_state_size;
-+	ph->cpu_data.destination_address = addr_offset;
-+	addr_offset += phyp_dump_info->cpu_state_size;
-+
-+	ph->hpte_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->hpte_data.source_type = DUMP_SOURCE_HPTE;
-+	ph->hpte_data.source_address = 0;
-+	ph->hpte_data.source_length = phyp_dump_info->hpte_region_size;
-+	ph->hpte_data.destination_address = addr_offset;
-+	addr_offset += phyp_dump_info->hpte_region_size;
-+
-+	/* This section describes the low kernel region */
-+	ph->kernel_data.dump_flags = DUMP_REQUEST_FLAG;
-+	ph->kernel_data.source_type = DUMP_SOURCE_RMO;
-+	ph->kernel_data.source_address = PHYP_DUMP_RMR_START;
-+	ph->kernel_data.source_length = PHYP_DUMP_RMR_END;
-+	ph->kernel_data.destination_address = addr_offset;
-+	addr_offset += ph->kernel_data.source_length;
-+
-+	return addr_offset;
-+}
-+
-+static void print_dump_header(const struct phyp_dump_header *ph)
-+{
-+#ifdef DEBUG
-+	printk(KERN_INFO "dump header:\n");
-+	/* setup some ph->sections required */
-+	printk(KERN_INFO "version = %d\n", ph->version);
-+	printk(KERN_INFO "Sections = %d\n", ph->num_of_sections);
-+	printk(KERN_INFO "Status = 0x%x\n", ph->status);
-+
-+	/* No ph->disk, so all should be set to 0 */
-+	printk(KERN_INFO "Offset to first section 0x%x\n",
-+		ph->first_offset_section);
-+	printk(KERN_INFO "dump disk sections should be zero\n");
-+	printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section);
-+	printk(KERN_INFO "block num = %ld\n", ph->block_num_dd);
-+	printk(KERN_INFO "number of blocks = %ld\n", ph->num_of_blocks_dd);
-+	printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd);
-+	printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
-+
-+	/*set cpu state and hpte states as well scratch pad area */
-+	printk(KERN_INFO " CPU AREA \n");
-+	printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
-+	printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
-+	printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
-+	printk(KERN_INFO "cpu source_address =%lx\n",
-+		ph->cpu_data.source_address);
-+	printk(KERN_INFO "cpu source_length =%lx\n",
-+		ph->cpu_data.source_length);
-+	printk(KERN_INFO "cpu length_copied =%lx\n",
-+		ph->cpu_data.length_copied);
-+
-+	printk(KERN_INFO " HPTE AREA \n");
-+	printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
-+	printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
-+	printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
-+	printk(KERN_INFO "HPTE source_address =%lx\n",
-+		ph->hpte_data.source_address);
-+	printk(KERN_INFO "HPTE source_length =%lx\n",
-+		ph->hpte_data.source_length);
-+	printk(KERN_INFO "HPTE length_copied =%lx\n",
-+		ph->hpte_data.length_copied);
-+
-+	printk(KERN_INFO " SRSD AREA \n");
-+	printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
-+	printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
-+	printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
-+	printk(KERN_INFO "SRSD source_address =%lx\n",
-+		ph->kernel_data.source_address);
-+	printk(KERN_INFO "SRSD source_length =%lx\n",
-+		ph->kernel_data.source_length);
-+	printk(KERN_INFO "SRSD length_copied =%lx\n",
-+		ph->kernel_data.length_copied);
-+#endif
-+}
-+
-+static ssize_t show_phyp_dump_active(struct kobject *kobj,
-+			struct kobj_attribute *attr, char *buf)
-+{
-+
-+	/* create filesystem entry so kdump is phyp-dump aware */
-+	return sprintf(buf, "%lx\n", phyp_dump_info->phyp_dump_at_boot);
-+}
-+
-+static struct kobj_attribute pdl = __ATTR(phyp_dump_active, 0600,
-+					show_phyp_dump_active,
-+					NULL);
-+
-+static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
-+{
-+	int rc;
-+
-+	/* Add addr value if not initialized before */
-+	if (ph->cpu_data.destination_address == 0) {
-+		ph->cpu_data.destination_address += addr;
-+		ph->hpte_data.destination_address += addr;
-+		ph->kernel_data.destination_address += addr;
-+	}
-+
-+	/* ToDo Invalidate kdump and free memory range. */
-+
-+	do {
-+		rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
-+				1, ph, sizeof(struct phyp_dump_header));
-+	} while (rtas_busy_delay(rc));
-+
-+	if (rc) {
-+		printk(KERN_ERR "phyp-dump: unexpected error (%d) on "
-+						"register\n", rc);
-+		print_dump_header(ph);
-+		return;
-+	}
-+
-+	rc = sysfs_create_file(kernel_kobj, &pdl.attr);
-+	if (rc)
-+		printk(KERN_ERR "phyp-dump: unable to create sysfs"
-+				" file (%d)\n", rc);
-+}
-+
-+static
-+void invalidate_last_dump(struct phyp_dump_header *ph, unsigned long addr)
-+{
-+	int rc;
-+
-+	/* Add addr value if not initialized before */
-+	if (ph->cpu_data.destination_address == 0) {
-+		ph->cpu_data.destination_address += addr;
-+		ph->hpte_data.destination_address += addr;
-+		ph->kernel_data.destination_address += addr;
-+	}
-+
-+	do {
-+		rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
-+				2, ph, sizeof(struct phyp_dump_header));
-+	} while (rtas_busy_delay(rc));
-+
-+	if (rc) {
-+		printk(KERN_ERR "phyp-dump: unexpected error (%d) "
-+						"on invalidate\n", rc);
-+		print_dump_header(ph);
-+	}
-+}
-+
-+/* ------------------------------------------------- */
-+/**
-+ * release_memory_range -- release memory previously lmb_reserved
-+ * @start_pfn: starting physical frame number
-+ * @nr_pages: number of pages to free.
-+ *
-+ * This routine will release memory that had been previously
-+ * lmb_reserved in early boot. The released memory becomes
-+ * available for genreal use.
-+ */
-+static void release_memory_range(unsigned long start_pfn,
-+			unsigned long nr_pages)
-+{
-+	struct page *rpage;
-+	unsigned long end_pfn;
-+	long i;
-+
-+	end_pfn = start_pfn + nr_pages;
-+
-+	for (i = start_pfn; i <= end_pfn; i++) {
-+		rpage = pfn_to_page(i);
-+		if (PageReserved(rpage)) {
-+			ClearPageReserved(rpage);
-+			init_page_count(rpage);
-+			__free_page(rpage);
-+			totalram_pages++;
-+		}
-+	}
-+}
-+
-+/**
-+ * track_freed_range -- Counts the range being freed.
-+ * Once the counter goes to zero, it re-registers dump for
-+ * future use.
-+ */
-+static void
-+track_freed_range(unsigned long addr, unsigned long length)
-+{
-+	static unsigned long scratch_area_size, reserved_area_size;
-+
-+	if (addr < phyp_dump_info->init_reserve_start)
-+		return;
-+
-+	if ((addr >= phyp_dump_info->init_reserve_start) &&
-+	    (addr <= phyp_dump_info->init_reserve_start +
-+	     phyp_dump_info->init_reserve_size))
-+		reserved_area_size += length;
-+
-+	if ((addr >= phyp_dump_info->reserved_scratch_addr) &&
-+	    (addr <= phyp_dump_info->reserved_scratch_addr +
-+	     phyp_dump_info->reserved_scratch_size))
-+		scratch_area_size += length;
-+
-+	if ((reserved_area_size == phyp_dump_info->init_reserve_size) &&
-+	    (scratch_area_size == phyp_dump_info->reserved_scratch_size)) {
-+
-+		invalidate_last_dump(&phdr,
-+				phyp_dump_info->reserved_scratch_addr);
-+		register_dump_area(&phdr,
-+				phyp_dump_info->reserved_scratch_addr);
-+	}
-+}
-+
-+/* ------------------------------------------------- */
-+/**
-+ * sysfs_release_region -- sysfs interface to release memory range.
-+ *
-+ * Usage:
-+ *   "echo <start addr> <length> > /sys/kernel/release_region"
-+ *
-+ * Example:
-+ *   "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
-+ *
-+ * will release 256MB starting at 1GB.
-+ */
-+static ssize_t store_release_region(struct kobject *kobj,
-+				struct kobj_attribute *attr,
-+				const char *buf, size_t count)
-+{
-+	unsigned long start_addr, length, end_addr;
-+	unsigned long start_pfn, nr_pages;
-+	ssize_t ret;
-+
-+	ret = sscanf(buf, "%lx %lx", &start_addr, &length);
-+	if (ret != 2)
-+		return -EINVAL;
-+
-+	track_freed_range(start_addr, length);
-+
-+	/* Range-check - don't free any reserved memory that
-+	 * wasn't reserved for phyp-dump */
-+	if (start_addr < phyp_dump_info->init_reserve_start)
-+		start_addr = phyp_dump_info->init_reserve_start;
-+
-+	end_addr = phyp_dump_info->init_reserve_start +
-+			phyp_dump_info->init_reserve_size;
-+	if (start_addr+length > end_addr)
-+		length = end_addr - start_addr;
-+
-+	/* Release the region of memory assed in by user */
-+	start_pfn = PFN_DOWN(start_addr);
-+	nr_pages = PFN_DOWN(length);
-+	release_memory_range(start_pfn, nr_pages);
-+
-+	return count;
-+}
-+
-+static ssize_t show_release_region(struct kobject *kobj,
-+			struct kobj_attribute *attr, char *buf)
-+{
-+	u64 second_addr_range;
-+
-+	/* total reserved size - start of scratch area */
-+	second_addr_range = phyp_dump_info->init_reserve_size -
-+				phyp_dump_info->reserved_scratch_size;
-+	return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:"
-+			    " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n",
-+		phdr.cpu_data.destination_address,
-+		phdr.cpu_data.length_copied,
-+		phdr.hpte_data.destination_address,
-+		phdr.hpte_data.length_copied,
-+		phdr.kernel_data.destination_address,
-+		phdr.kernel_data.length_copied,
-+		phyp_dump_info->init_reserve_start,
-+		second_addr_range);
-+}
-+
-+static struct kobj_attribute rr = __ATTR(release_region, 0600,
-+					show_release_region,
-+					store_release_region);
-+
-+static int __init phyp_dump_setup(void)
-+{
-+	struct device_node *rtas;
-+	const struct phyp_dump_header *dump_header = NULL;
-+	unsigned long dump_area_start;
-+	unsigned long dump_area_length;
-+	int header_len = 0;
-+	int rc;
-+
-+	/* If no memory was reserved in early boot, there is nothing to do */
-+	if (phyp_dump_info->init_reserve_size == 0)
-+		return 0;
-+
-+	/* Return if phyp dump not supported */
-+	if (!phyp_dump_info->phyp_dump_configured)
-+		return -ENOSYS;
-+
-+	/* Is there dump data waiting for us? If there isn't,
-+	 * then register a new dump area, and release all of
-+	 * the rest of the reserved ram.
-+	 *
-+	 * The /rtas/ibm,kernel-dump rtas node is present only
-+	 * if there is dump data waiting for us.
-+	 */
-+	rtas = of_find_node_by_path("/rtas");
-+	if (rtas) {
-+		dump_header = of_get_property(rtas, "ibm,kernel-dump",
-+						&header_len);
-+		of_node_put(rtas);
-+	}
-+
-+	print_dump_header(dump_header);
-+	dump_area_length = init_dump_header(&phdr);
-+	/* align down */
-+	dump_area_start = phyp_dump_info->init_reserve_start & PAGE_MASK;
-+
-+	if (dump_header == NULL) {
-+		register_dump_area(&phdr, dump_area_start);
-+		return 0;
-+	}
-+
-+	/* re-register the dump area, if old dump was invalid */
-+	if ((dump_header) && (dump_header->status & DUMP_ERROR_FLAG)) {
-+		invalidate_last_dump(&phdr, dump_area_start);
-+		register_dump_area(&phdr, dump_area_start);
-+		return 0;
-+	}
-+
-+	if (dump_header) {
-+		phyp_dump_info->reserved_scratch_addr =
-+				dump_header->cpu_data.destination_address;
-+		phyp_dump_info->reserved_scratch_size =
-+				dump_header->cpu_data.source_length +
-+				dump_header->hpte_data.source_length +
-+				dump_header->kernel_data.source_length;
-+	}
-+
-+	/* Should we create a dump_subsys, analogous to s390/ipl.c ? */
-+	rc = sysfs_create_file(kernel_kobj, &rr.attr);
-+	if (rc)
-+		printk(KERN_ERR "phyp-dump: unable to create sysfs file (%d)\n",
-+									rc);
-+
-+	/* ToDo: re-register the dump area, for next time. */
-+	return 0;
-+}
-+machine_subsys_initcall(pseries, phyp_dump_setup);
-+
-+int __init early_init_dt_scan_phyp_dump(unsigned long node,
-+		const char *uname, int depth, void *data)
-+{
-+	const unsigned int *sizes;
-+
-+	phyp_dump_info->phyp_dump_configured = 0;
-+	phyp_dump_info->phyp_dump_is_active = 0;
-+
-+	if (depth != 1 || strcmp(uname, "rtas") != 0)
-+		return 0;
-+
-+	if (of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL))
-+		phyp_dump_info->phyp_dump_configured++;
-+
-+	if (of_get_flat_dt_prop(node, "ibm,dump-kernel", NULL))
-+		phyp_dump_info->phyp_dump_is_active++;
-+
-+	sizes = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump-sizes",
-+				    NULL);
-+	if (!sizes)
-+		return 0;
-+
-+	if (sizes[0] == 1)
-+		phyp_dump_info->cpu_state_size = *((unsigned long *)&sizes[1]);
-+
-+	if (sizes[3] == 2)
-+		phyp_dump_info->hpte_region_size =
-+						*((unsigned long *)&sizes[4]);
-+	return 1;
-+}
-+
-+/* Look for phyp_dump= cmdline option */
-+static int __init early_phyp_dump_enabled(char *p)
-+{
-+	phyp_dump_info->phyp_dump_at_boot = 1;
-+
-+        if (!p)
-+                return 0;
-+
-+        if (strncmp(p, "1", 1) == 0)
-+		phyp_dump_info->phyp_dump_at_boot = 1;
-+        else if (strncmp(p, "0", 1) == 0)
-+		phyp_dump_info->phyp_dump_at_boot = 0;
-+
-+        return 0;
-+}
-+early_param("phyp_dump", early_phyp_dump_enabled);
-+
-+/* Look for phyp_dump_reserve_size= cmdline option */
-+static int __init early_phyp_dump_reserve_size(char *p)
-+{
-+        if (p)
-+		phyp_dump_info->reserve_bootvar = memparse(p, &p);
-+
-+        return 0;
-+}
-+early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);
---- a/arch/powerpc/platforms/pseries/pseries.h
-+++ b/arch/powerpc/platforms/pseries/pseries.h
-@@ -38,4 +38,6 @@ extern void pSeries_final_fixup(void);
- /* Poweron flag used for enabling auto ups restart */
- extern unsigned long rtas_poweron_auto;
- 
-+extern void find_udbg_vterm(void);
-+
- #endif /* _PSERIES_PSERIES_H */
---- a/arch/powerpc/platforms/pseries/reconfig.c
-+++ b/arch/powerpc/platforms/pseries/reconfig.c
-@@ -222,14 +222,14 @@ static char * parse_next_property(char *
- 	tmp = strchr(buf, ' ');
- 	if (!tmp) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	*tmp = '\0';
- 
- 	if (++tmp >= end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 
-@@ -238,12 +238,12 @@ static char * parse_next_property(char *
- 	*length = simple_strtoul(tmp, &tmp, 10);
- 	if (*length == -1) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	if (*tmp != ' ' || ++tmp >= end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 
-@@ -252,12 +252,12 @@ static char * parse_next_property(char *
- 	tmp += *length;
- 	if (tmp > end) {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	else if (tmp < end && *tmp != ' ' && *tmp != '\0') {
- 		printk(KERN_ERR "property parse failed in %s at line %d\n",
--		       __FUNCTION__, __LINE__);
-+		       __func__, __LINE__);
- 		return NULL;
- 	}
- 	tmp++;
---- a/arch/powerpc/platforms/pseries/scanlog.c
-+++ b/arch/powerpc/platforms/pseries/scanlog.c
-@@ -195,31 +195,30 @@ const struct file_operations scanlog_fop
- static int __init scanlog_init(void)
- {
- 	struct proc_dir_entry *ent;
-+	void *data;
-+	int err = -ENOMEM;
- 
- 	ibm_scan_log_dump = rtas_token("ibm,scan-log-dump");
--	if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE) {
--		printk(KERN_ERR "scan-log-dump not implemented on this system\n");
--		return -EIO;
--	}
-+	if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE)
-+		return -ENODEV;
- 
--        ent = create_proc_entry("ppc64/rtas/scan-log-dump",  S_IRUSR, NULL);
--	if (ent) {
--		ent->proc_fops = &scanlog_fops;
--		/* Ideally we could allocate a buffer < 4G */
--		ent->data = kmalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
--		if (!ent->data) {
--			printk(KERN_ERR "Failed to allocate a buffer\n");
--			remove_proc_entry("scan-log-dump", ent->parent);
--			return -ENOMEM;
--		}
--		((unsigned int *)ent->data)[0] = 0;
--	} else {
--		printk(KERN_ERR "Failed to create ppc64/scan-log-dump proc entry\n");
--		return -EIO;
--	}
-+	/* Ideally we could allocate a buffer < 4G */
-+	data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
-+	if (!data)
-+		goto err;
-+
-+	ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
-+			  &scanlog_fops);
-+	if (!ent)
-+		goto err;
-+
-+	ent->data = data;
- 	proc_ppc64_scan_log_dump = ent;
- 
- 	return 0;
-+err:
-+	kfree(data);
-+	return err;
- }
- 
- static void __exit scanlog_cleanup(void)
---- a/arch/powerpc/platforms/pseries/setup.c
-+++ b/arch/powerpc/platforms/pseries/setup.c
-@@ -76,9 +76,6 @@
- #define DBG(fmt...)
- #endif
- 
--/* move those away to a .h */
--extern void find_udbg_vterm(void);
--
- int fwnmi_active;  /* TRUE if an FWNMI handler is present */
- 
- static void pseries_shared_idle_sleep(void);
-@@ -127,14 +124,60 @@ void pseries_8259_cascade(unsigned int i
- 	desc->chip->eoi(irq);
- }
- 
--static void __init pseries_mpic_init_IRQ(void)
-+static void __init pseries_setup_i8259_cascade(void)
- {
--	struct device_node *np, *old, *cascade = NULL;
--        const unsigned int *addrp;
-+	struct device_node *np, *old, *found = NULL;
-+	unsigned int cascade;
-+	const u32 *addrp;
- 	unsigned long intack = 0;
-+	int naddr;
-+
-+	for_each_node_by_type(np, "interrupt-controller") {
-+		if (of_device_is_compatible(np, "chrp,iic")) {
-+			found = np;
-+			break;
-+		}
-+	}
-+
-+	if (found == NULL) {
-+		printk(KERN_DEBUG "pic: no ISA interrupt controller\n");
-+		return;
-+	}
-+
-+	cascade = irq_of_parse_and_map(found, 0);
-+	if (cascade == NO_IRQ) {
-+		printk(KERN_ERR "pic: failed to map cascade interrupt");
-+		return;
-+	}
-+	pr_debug("pic: cascade mapped to irq %d\n", cascade);
-+
-+	for (old = of_node_get(found); old != NULL ; old = np) {
-+		np = of_get_parent(old);
-+		of_node_put(old);
-+		if (np == NULL)
-+			break;
-+		if (strcmp(np->name, "pci") != 0)
-+			continue;
-+		addrp = of_get_property(np, "8259-interrupt-acknowledge", NULL);
-+		if (addrp == NULL)
-+			continue;
-+		naddr = of_n_addr_cells(np);
-+		intack = addrp[naddr-1];
-+		if (naddr > 1)
-+			intack |= ((unsigned long)addrp[naddr-2]) << 32;
-+	}
-+	if (intack)
-+		printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
-+	i8259_init(found, intack);
-+	of_node_put(found);
-+	set_irq_chained_handler(cascade, pseries_8259_cascade);
-+}
-+
-+static void __init pseries_mpic_init_IRQ(void)
-+{
-+	struct device_node *np;
- 	const unsigned int *opprop;
- 	unsigned long openpic_addr = 0;
--	unsigned int cascade_irq;
- 	int naddr, n, i, opplen;
- 	struct mpic *mpic;
- 
-@@ -167,43 +210,13 @@ static void __init pseries_mpic_init_IRQ
- 	mpic_init(mpic);
- 
- 	/* Look for cascade */
--	for_each_node_by_type(np, "interrupt-controller")
--		if (of_device_is_compatible(np, "chrp,iic")) {
--			cascade = np;
--			break;
--		}
--	if (cascade == NULL)
--		return;
--
--	cascade_irq = irq_of_parse_and_map(cascade, 0);
--	if (cascade_irq == NO_IRQ) {
--		printk(KERN_ERR "mpic: failed to map cascade interrupt");
--		return;
--	}
-+	pseries_setup_i8259_cascade();
-+}
- 
--	/* Check ACK type */
--	for (old = of_node_get(cascade); old != NULL ; old = np) {
--		np = of_get_parent(old);
--		of_node_put(old);
--		if (np == NULL)
--			break;
--		if (strcmp(np->name, "pci") != 0)
--			continue;
--		addrp = of_get_property(np, "8259-interrupt-acknowledge",
--					    NULL);
--		if (addrp == NULL)
--			continue;
--		naddr = of_n_addr_cells(np);
--		intack = addrp[naddr-1];
--		if (naddr > 1)
--			intack |= ((unsigned long)addrp[naddr-2]) << 32;
--	}
--	if (intack)
--		printk(KERN_DEBUG "mpic: PCI 8259 intack at 0x%016lx\n",
--		       intack);
--	i8259_init(cascade, intack);
--	of_node_put(cascade);
--	set_irq_chained_handler(cascade_irq, pseries_8259_cascade);
-+static void __init pseries_xics_init_IRQ(void)
-+{
-+	xics_init_IRQ();
-+	pseries_setup_i8259_cascade();
- }
- 
- static void pseries_lpar_enable_pmcs(void)
-@@ -235,7 +248,7 @@ static void __init pseries_discover_pic(
- 			smp_init_pseries_mpic();
- 			return;
- 		} else if (strstr(typep, "ppc-xicp")) {
--			ppc_md.init_IRQ       = xics_init_IRQ;
-+			ppc_md.init_IRQ       = pseries_xics_init_IRQ;
- 			setup_kexec_cpu_down_xics();
- 			smp_init_pseries_xics();
- 			return;
-@@ -393,6 +406,7 @@ static void pseries_dedicated_idle_sleep
- { 
- 	unsigned int cpu = smp_processor_id();
- 	unsigned long start_snooze;
-+	unsigned long in_purr, out_purr;
- 
- 	/*
- 	 * Indicate to the HV that we are idle. Now would be
-@@ -400,6 +414,7 @@ static void pseries_dedicated_idle_sleep
- 	 */
- 	get_lppaca()->idle = 1;
- 	get_lppaca()->donate_dedicated_cpu = 1;
-+	in_purr = mfspr(SPRN_PURR);
- 
- 	/*
- 	 * We come in with interrupts disabled, and need_resched()
-@@ -432,6 +447,8 @@ static void pseries_dedicated_idle_sleep
- 
- out:
- 	HMT_medium();
-+	out_purr = mfspr(SPRN_PURR);
-+	get_lppaca()->wait_state_cycles += out_purr - in_purr;
- 	get_lppaca()->donate_dedicated_cpu = 0;
- 	get_lppaca()->idle = 0;
- }
---- a/arch/powerpc/platforms/pseries/xics.c
-+++ b/arch/powerpc/platforms/pseries/xics.c
-@@ -516,6 +516,8 @@ static struct irq_chip xics_pic_lpar = {
- 	.set_affinity = xics_set_affinity
- };
- 
-+/* Points to the irq_chip we're actually using */
-+static struct irq_chip *xics_irq_chip;
- 
- static int xics_host_match(struct irq_host *h, struct device_node *node)
- {
-@@ -526,23 +528,13 @@ static int xics_host_match(struct irq_ho
- 	return !of_device_is_compatible(node, "chrp,iic");
- }
- 
--static int xics_host_map_direct(struct irq_host *h, unsigned int virq,
--				irq_hw_number_t hw)
-+static int xics_host_map(struct irq_host *h, unsigned int virq,
-+			 irq_hw_number_t hw)
- {
--	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
-+	pr_debug("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
- 
- 	get_irq_desc(virq)->status |= IRQ_LEVEL;
--	set_irq_chip_and_handler(virq, &xics_pic_direct, handle_fasteoi_irq);
--	return 0;
--}
--
--static int xics_host_map_lpar(struct irq_host *h, unsigned int virq,
--			      irq_hw_number_t hw)
--{
--	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);
--
--	get_irq_desc(virq)->status |= IRQ_LEVEL;
--	set_irq_chip_and_handler(virq, &xics_pic_lpar, handle_fasteoi_irq);
-+	set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
- 	return 0;
- }
- 
-@@ -561,27 +553,20 @@ static int xics_host_xlate(struct irq_ho
- 	return 0;
- }
- 
--static struct irq_host_ops xics_host_direct_ops = {
--	.match = xics_host_match,
--	.map = xics_host_map_direct,
--	.xlate = xics_host_xlate,
--};
--
--static struct irq_host_ops xics_host_lpar_ops = {
-+static struct irq_host_ops xics_host_ops = {
- 	.match = xics_host_match,
--	.map = xics_host_map_lpar,
-+	.map = xics_host_map,
- 	.xlate = xics_host_xlate,
- };
- 
- static void __init xics_init_host(void)
- {
--	struct irq_host_ops *ops;
--
- 	if (firmware_has_feature(FW_FEATURE_LPAR))
--		ops = &xics_host_lpar_ops;
-+		xics_irq_chip = &xics_pic_lpar;
- 	else
--		ops = &xics_host_direct_ops;
--	xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, ops,
-+		xics_irq_chip = &xics_pic_direct;
-+
-+	xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, &xics_host_ops,
- 				   XICS_IRQ_SPURIOUS);
- 	BUG_ON(xics_host == NULL);
- 	irq_set_default_host(xics_host);
-@@ -655,52 +640,6 @@ static void __init xics_init_one_node(st
- 	}
- }
- 
--
--static void __init xics_setup_8259_cascade(void)
--{
--	struct device_node *np, *old, *found = NULL;
--	int cascade, naddr;
--	const u32 *addrp;
--	unsigned long intack = 0;
--
--	for_each_node_by_type(np, "interrupt-controller")
--		if (of_device_is_compatible(np, "chrp,iic")) {
--			found = np;
--			break;
--		}
--	if (found == NULL) {
--		printk(KERN_DEBUG "xics: no ISA interrupt controller\n");
--		return;
--	}
--	cascade = irq_of_parse_and_map(found, 0);
--	if (cascade == NO_IRQ) {
--		printk(KERN_ERR "xics: failed to map cascade interrupt");
--		return;
--	}
--	pr_debug("xics: cascade mapped to irq %d\n", cascade);
--
--	for (old = of_node_get(found); old != NULL ; old = np) {
--		np = of_get_parent(old);
--		of_node_put(old);
--		if (np == NULL)
--			break;
--		if (strcmp(np->name, "pci") != 0)
--			continue;
--		addrp = of_get_property(np, "8259-interrupt-acknowledge", NULL);
--		if (addrp == NULL)
--			continue;
--		naddr = of_n_addr_cells(np);
--		intack = addrp[naddr-1];
--		if (naddr > 1)
--			intack |= ((unsigned long)addrp[naddr-2]) << 32;
--	}
--	if (intack)
--		printk(KERN_DEBUG "xics: PCI 8259 intack at 0x%016lx\n", intack);
--	i8259_init(found, intack);
--	of_node_put(found);
--	set_irq_chained_handler(cascade, pseries_8259_cascade);
--}
--
- void __init xics_init_IRQ(void)
- {
- 	struct device_node *np;
-@@ -733,8 +672,6 @@ void __init xics_init_IRQ(void)
- 
- 	xics_setup_cpu();
- 
--	xics_setup_8259_cascade();
--
- 	ppc64_boot_msg(0x21, "XICS Done");
- }
- 
---- a/arch/powerpc/platforms/pseries/xics.h
-+++ b/arch/powerpc/platforms/pseries/xics.h
-@@ -28,7 +28,4 @@ struct xics_ipi_struct {
- 
- extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
- 
--struct irq_desc;
--extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc);
--
- #endif /* _POWERPC_KERNEL_XICS_H */
---- a/arch/powerpc/sysdev/Makefile
-+++ b/arch/powerpc/sysdev/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_U3_DART)		+= dart_iommu.o
- obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
- obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
- obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o
-+obj-$(CONFIG_FSL_LBC)		+= fsl_lbc.o
- obj-$(CONFIG_RAPIDIO)		+= fsl_rio.o
- obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
- obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
-@@ -27,6 +28,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indire
- obj-$(CONFIG_PPC_I8259)		+= i8259.o
- obj-$(CONFIG_IPIC)		+= ipic.o
- obj-$(CONFIG_4xx)		+= uic.o
-+obj-$(CONFIG_4xx_SOC)		+= ppc4xx_soc.o
- obj-$(CONFIG_XILINX_VIRTEX)	+= xilinx_intc.o
- obj-$(CONFIG_OF_RTC)		+= of_rtc.o
- ifeq ($(CONFIG_PCI),y)
---- a/arch/powerpc/sysdev/cpm1.c
-+++ b/arch/powerpc/sysdev/cpm1.c
-@@ -44,9 +44,6 @@
- 
- #define CPM_MAP_SIZE    (0x4000)
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--static void m8xx_cpm_dpinit(void);
--#endif
- cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */
- immap_t __iomem *mpc8xx_immr;
- static cpic8xx_t __iomem *cpic_reg;
-@@ -229,12 +226,7 @@ void __init cpm_reset(void)
- 	out_be32(&siu_conf->sc_sdcr, 1);
- 	immr_unmap(siu_conf);
- 
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- 	cpm_muram_init();
--#else
--	/* Reclaim the DP memory for our use. */
--	m8xx_cpm_dpinit();
--#endif
- }
- 
- static DEFINE_SPINLOCK(cmd_lock);
-@@ -257,7 +249,7 @@ int cpm_command(u32 command, u8 opcode)
- 		if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
- 			goto out;
- 
--	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
-+	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
- 	ret = -EIO;
- out:
- 	spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -293,110 +285,6 @@ cpm_setbrg(uint brg, uint rate)
- 			      CPM_BRG_EN | CPM_BRG_DIV16);
- }
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--/*
-- * dpalloc / dpfree bits.
-- */
--static spinlock_t cpm_dpmem_lock;
--/*
-- * 16 blocks should be enough to satisfy all requests
-- * until the memory subsystem goes up...
-- */
--static rh_block_t cpm_boot_dpmem_rh_block[16];
--static rh_info_t cpm_dpmem_info;
--
--#define CPM_DPMEM_ALIGNMENT	8
--static u8 __iomem *dpram_vbase;
--static phys_addr_t dpram_pbase;
--
--static void m8xx_cpm_dpinit(void)
--{
--	spin_lock_init(&cpm_dpmem_lock);
--
--	dpram_vbase = cpmp->cp_dpmem;
--	dpram_pbase = get_immrbase() + offsetof(immap_t, im_cpm.cp_dpmem);
--
--	/* Initialize the info header */
--	rh_init(&cpm_dpmem_info, CPM_DPMEM_ALIGNMENT,
--			sizeof(cpm_boot_dpmem_rh_block) /
--			sizeof(cpm_boot_dpmem_rh_block[0]),
--			cpm_boot_dpmem_rh_block);
--
--	/*
--	 * Attach the usable dpmem area.
--	 * XXX: This is actually crap.  CPM_DATAONLY_BASE and
--	 * CPM_DATAONLY_SIZE are a subset of the available dparm.  It varies
--	 * with the processor and the microcode patches applied / activated.
--	 * But the following should be at least safe.
--	 */
--	rh_attach_region(&cpm_dpmem_info, CPM_DATAONLY_BASE, CPM_DATAONLY_SIZE);
--}
--
--/*
-- * Allocate the requested size worth of DP memory.
-- * This function returns an offset into the DPRAM area.
-- * Use cpm_dpram_addr() to get the virtual address of the area.
-- */
--unsigned long cpm_dpalloc(uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc(&cpm_dpmem_info, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return (uint)start;
--}
--EXPORT_SYMBOL(cpm_dpalloc);
--
--int cpm_dpfree(unsigned long offset)
--{
--	int ret;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	ret = rh_free(&cpm_dpmem_info, offset);
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return ret;
--}
--EXPORT_SYMBOL(cpm_dpfree);
--
--unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc_fixed(&cpm_dpmem_info, offset, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return start;
--}
--EXPORT_SYMBOL(cpm_dpalloc_fixed);
--
--void cpm_dpdump(void)
--{
--	rh_dump(&cpm_dpmem_info);
--}
--EXPORT_SYMBOL(cpm_dpdump);
--
--void *cpm_dpram_addr(unsigned long offset)
--{
--	return (void *)(dpram_vbase + offset);
--}
--EXPORT_SYMBOL(cpm_dpram_addr);
--
--uint cpm_dpram_phys(u8 *addr)
--{
--	return (dpram_pbase + (uint)(addr - dpram_vbase));
--}
--EXPORT_SYMBOL(cpm_dpram_phys);
--#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
--
- struct cpm_ioport16 {
- 	__be16 dir, par, odr_sor, dat, intr;
- 	__be16 res[3];
---- a/arch/powerpc/sysdev/cpm2.c
-+++ b/arch/powerpc/sysdev/cpm2.c
-@@ -46,10 +46,6 @@
- 
- #include <sysdev/fsl_soc.h>
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--static void cpm2_dpinit(void);
--#endif
--
- cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
- 
- /* We allocate this here because it is used almost exclusively for
-@@ -71,15 +67,17 @@ void __init cpm2_reset(void)
- 
- 	/* Reclaim the DP memory for our use.
- 	 */
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- 	cpm_muram_init();
--#else
--	cpm2_dpinit();
--#endif
- 
- 	/* Tell everyone where the comm processor resides.
- 	 */
- 	cpmp = &cpm2_immr->im_cpm;
-+
-+#ifndef CONFIG_PPC_EARLY_DEBUG_CPM
-+	/* Reset the CPM.
-+	 */
-+	cpm_command(CPM_CR_RST, 0);
-+#endif
- }
- 
- static DEFINE_SPINLOCK(cmd_lock);
-@@ -99,7 +97,7 @@ int cpm_command(u32 command, u8 opcode)
- 		if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
- 			goto out;
- 
--	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
-+	printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
- 	ret = -EIO;
- out:
- 	spin_unlock_irqrestore(&cmd_lock, flags);
-@@ -347,95 +345,6 @@ int cpm2_smc_clk_setup(enum cpm_clk_targ
- 	return ret;
- }
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--/*
-- * dpalloc / dpfree bits.
-- */
--static spinlock_t cpm_dpmem_lock;
--/* 16 blocks should be enough to satisfy all requests
-- * until the memory subsystem goes up... */
--static rh_block_t cpm_boot_dpmem_rh_block[16];
--static rh_info_t cpm_dpmem_info;
--static u8 __iomem *im_dprambase;
--
--static void cpm2_dpinit(void)
--{
--	spin_lock_init(&cpm_dpmem_lock);
--
--	/* initialize the info header */
--	rh_init(&cpm_dpmem_info, 1,
--			sizeof(cpm_boot_dpmem_rh_block) /
--			sizeof(cpm_boot_dpmem_rh_block[0]),
--			cpm_boot_dpmem_rh_block);
--
--	im_dprambase = cpm2_immr;
--
--	/* Attach the usable dpmem area */
--	/* XXX: This is actually crap. CPM_DATAONLY_BASE and
--	 * CPM_DATAONLY_SIZE is only a subset of the available dpram. It
--	 * varies with the processor and the microcode patches activated.
--	 * But the following should be at least safe.
--	 */
--	rh_attach_region(&cpm_dpmem_info, CPM_DATAONLY_BASE, CPM_DATAONLY_SIZE);
--}
--
--/* This function returns an index into the DPRAM area.
-- */
--unsigned long cpm_dpalloc(uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc(&cpm_dpmem_info, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return (uint)start;
--}
--EXPORT_SYMBOL(cpm_dpalloc);
--
--int cpm_dpfree(unsigned long offset)
--{
--	int ret;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	ret = rh_free(&cpm_dpmem_info, offset);
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return ret;
--}
--EXPORT_SYMBOL(cpm_dpfree);
--
--/* not sure if this is ever needed */
--unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align)
--{
--	unsigned long start;
--	unsigned long flags;
--
--	spin_lock_irqsave(&cpm_dpmem_lock, flags);
--	cpm_dpmem_info.alignment = align;
--	start = rh_alloc_fixed(&cpm_dpmem_info, offset, size, "commproc");
--	spin_unlock_irqrestore(&cpm_dpmem_lock, flags);
--
--	return start;
--}
--EXPORT_SYMBOL(cpm_dpalloc_fixed);
--
--void cpm_dpdump(void)
--{
--	rh_dump(&cpm_dpmem_info);
--}
--EXPORT_SYMBOL(cpm_dpdump);
--
--void *cpm_dpram_addr(unsigned long offset)
--{
--	return (void *)(im_dprambase + offset);
--}
--EXPORT_SYMBOL(cpm_dpram_addr);
--#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
--
- struct cpm2_ioports {
- 	u32 dir, par, sor, odr, dat;
- 	u32 res[3];
---- a/arch/powerpc/sysdev/cpm_common.c
-+++ b/arch/powerpc/sysdev/cpm_common.c
-@@ -58,7 +58,6 @@ void __init udbg_init_cpm(void)
- }
- #endif
- 
--#ifdef CONFIG_PPC_CPM_NEW_BINDING
- static spinlock_t cpm_muram_lock;
- static rh_block_t cpm_boot_muram_rh_block[16];
- static rh_info_t cpm_muram_info;
-@@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *a
- 	return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
- }
- EXPORT_SYMBOL(cpm_muram_dma);
--
--#endif /* CONFIG_PPC_CPM_NEW_BINDING */
---- a/arch/powerpc/sysdev/dart_iommu.c
-+++ b/arch/powerpc/sysdev/dart_iommu.c
-@@ -37,6 +37,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/vmalloc.h>
- #include <linux/suspend.h>
-+#include <linux/lmb.h>
- #include <asm/io.h>
- #include <asm/prom.h>
- #include <asm/iommu.h>
-@@ -44,7 +45,6 @@
- #include <asm/machdep.h>
- #include <asm/abs_addr.h>
- #include <asm/cacheflush.h>
--#include <asm/lmb.h>
- #include <asm/ppc-pci.h>
- 
- #include "dart.h"
---- /dev/null
-+++ b/arch/powerpc/sysdev/fsl_lbc.c
-@@ -0,0 +1,129 @@
-+/*
-+ * Freescale LBC and UPM routines.
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/of.h>
-+#include <asm/fsl_lbc.h>
-+
-+spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
-+
-+struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-+EXPORT_SYMBOL(fsl_lbc_regs);
-+
-+static char __initdata *compat_lbc[] = {
-+	"fsl,pq2-localbus",
-+	"fsl,pq2pro-localbus",
-+	"fsl,pq3-localbus",
-+	"fsl,elbc",
-+};
-+
-+static int __init fsl_lbc_init(void)
-+{
-+	struct device_node *lbus;
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(compat_lbc); i++) {
-+		lbus = of_find_compatible_node(NULL, NULL, compat_lbc[i]);
-+		if (lbus)
-+			goto found;
-+	}
-+	return -ENODEV;
-+
-+found:
-+	fsl_lbc_regs = of_iomap(lbus, 0);
-+	of_node_put(lbus);
-+	if (!fsl_lbc_regs)
-+		return -ENOMEM;
-+	return 0;
-+}
-+arch_initcall(fsl_lbc_init);
-+
-+/**
-+ * fsl_lbc_find - find Localbus bank
-+ * @addr_base:	base address of the memory bank
-+ *
-+ * This function walks LBC banks comparing "Base address" field of the BR
-+ * registers with the supplied addr_base argument. When bases match this
-+ * function returns bank number (starting with 0), otherwise it returns
-+ * appropriate errno value.
-+ */
-+int fsl_lbc_find(phys_addr_t addr_base)
-+{
-+	int i;
-+
-+	if (!fsl_lbc_regs)
-+		return -ENODEV;
-+
-+	for (i = 0; i < ARRAY_SIZE(fsl_lbc_regs->bank); i++) {
-+		__be32 br = in_be32(&fsl_lbc_regs->bank[i].br);
-+		__be32 or = in_be32(&fsl_lbc_regs->bank[i].or);
-+
-+		if (br & BR_V && (br & or & BR_BA) == addr_base)
-+			return i;
-+	}
-+
-+	return -ENOENT;
-+}
-+EXPORT_SYMBOL(fsl_lbc_find);
-+
-+/**
-+ * fsl_upm_find - find pre-programmed UPM via base address
-+ * @addr_base:	base address of the memory bank controlled by the UPM
-+ * @upm:	pointer to the allocated fsl_upm structure
-+ *
-+ * This function fills fsl_upm structure so you can use it with the rest of
-+ * UPM API. On success this function returns 0, otherwise it returns
-+ * appropriate errno value.
-+ */
-+int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)
-+{
-+	int bank;
-+	__be32 br;
-+
-+	bank = fsl_lbc_find(addr_base);
-+	if (bank < 0)
-+		return bank;
-+
-+	br = in_be32(&fsl_lbc_regs->bank[bank].br);
-+
-+	switch (br & BR_MSEL) {
-+	case BR_MS_UPMA:
-+		upm->mxmr = &fsl_lbc_regs->mamr;
-+		break;
-+	case BR_MS_UPMB:
-+		upm->mxmr = &fsl_lbc_regs->mbmr;
-+		break;
-+	case BR_MS_UPMC:
-+		upm->mxmr = &fsl_lbc_regs->mcmr;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	switch (br & BR_PS) {
-+	case BR_PS_8:
-+		upm->width = 8;
-+		break;
-+	case BR_PS_16:
-+		upm->width = 16;
-+		break;
-+	case BR_PS_32:
-+		upm->width = 32;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(fsl_upm_find);
---- a/arch/powerpc/sysdev/fsl_soc.c
-+++ b/arch/powerpc/sysdev/fsl_soc.c
-@@ -75,6 +75,33 @@ phys_addr_t get_immrbase(void)
- 
- EXPORT_SYMBOL(get_immrbase);
- 
-+static u32 sysfreq = -1;
-+
-+u32 fsl_get_sys_freq(void)
-+{
-+	struct device_node *soc;
-+	const u32 *prop;
-+	int size;
-+
-+	if (sysfreq != -1)
-+		return sysfreq;
-+
-+	soc = of_find_node_by_type(NULL, "soc");
-+	if (!soc)
-+		return -1;
-+
-+	prop = of_get_property(soc, "clock-frequency", &size);
-+	if (!prop || size != sizeof(*prop) || *prop == 0)
-+		prop = of_get_property(soc, "bus-frequency", &size);
-+
-+	if (prop && size == sizeof(*prop))
-+		sysfreq = *prop;
-+
-+	of_node_put(soc);
-+	return sysfreq;
-+}
-+EXPORT_SYMBOL(fsl_get_sys_freq);
-+
- #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
- 
- static u32 brgfreq = -1;
-@@ -516,9 +543,9 @@ arch_initcall(fsl_i2c_of_init);
- static int __init mpc83xx_wdt_init(void)
- {
- 	struct resource r;
--	struct device_node *soc, *np;
-+	struct device_node *np;
- 	struct platform_device *dev;
--	const unsigned int *freq;
-+	u32 freq = fsl_get_sys_freq();
- 	int ret;
- 
- 	np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
-@@ -528,19 +555,6 @@ static int __init mpc83xx_wdt_init(void)
- 		goto nodev;
- 	}
- 
--	soc = of_find_node_by_type(NULL, "soc");
--
--	if (!soc) {
--		ret = -ENODEV;
--		goto nosoc;
--	}
--
--	freq = of_get_property(soc, "bus-frequency", NULL);
--	if (!freq) {
--		ret = -ENODEV;
--		goto err;
--	}
--
- 	memset(&r, 0, sizeof(r));
- 
- 	ret = of_address_to_resource(np, 0, &r);
-@@ -553,20 +567,16 @@ static int __init mpc83xx_wdt_init(void)
- 		goto err;
- 	}
- 
--	ret = platform_device_add_data(dev, freq, sizeof(int));
-+	ret = platform_device_add_data(dev, &freq, sizeof(freq));
- 	if (ret)
- 		goto unreg;
- 
--	of_node_put(soc);
- 	of_node_put(np);
--
- 	return 0;
- 
- unreg:
- 	platform_device_unregister(dev);
- err:
--	of_node_put(soc);
--nosoc:
- 	of_node_put(np);
- nodev:
- 	return ret;
-@@ -735,547 +745,6 @@ err:
- 
- arch_initcall(fsl_usb_of_init);
- 
--#ifndef CONFIG_PPC_CPM_NEW_BINDING
--#ifdef CONFIG_CPM2
--
--extern void init_scc_ioports(struct fs_uart_platform_info*);
--
--static const char fcc_regs[] = "fcc_regs";
--static const char fcc_regs_c[] = "fcc_regs_c";
--static const char fcc_pram[] = "fcc_pram";
--static char bus_id[9][BUS_ID_SIZE];
--
--static int __init fs_enet_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *fs_enet_dev;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
--	     i++) {
--		struct resource r[4];
--		struct device_node *phy, *mdio;
--		struct fs_platform_info fs_enet_data;
--		const unsigned int *id, *phy_addr, *phy_irq;
--		const void *mac_addr;
--		const phandle *ph;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&fs_enet_data, 0, sizeof(fs_enet_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--		r[0].name = fcc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = fcc_pram;
--
--		ret = of_address_to_resource(np, 2, &r[2]);
--		if (ret)
--			goto err;
--		r[2].name = fcc_regs_c;
--		fs_enet_data.fcc_regs_c = r[2].start;
--
--		of_irq_to_resource(np, 0, &r[3]);
--
--		fs_enet_dev =
--		    platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);
--
--		if (IS_ERR(fs_enet_dev)) {
--			ret = PTR_ERR(fs_enet_dev);
--			goto err;
--		}
--
--		model = of_get_property(np, "model", NULL);
--		if (model == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		mac_addr = of_get_mac_address(np);
--		if (mac_addr)
--			memcpy(fs_enet_data.macaddr, mac_addr, 6);
--
--		ph = of_get_property(np, "phy-handle", NULL);
--		phy = of_find_node_by_phandle(*ph);
--
--		if (phy == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		phy_addr = of_get_property(phy, "reg", NULL);
--		fs_enet_data.phy_addr = *phy_addr;
--
--		phy_irq = of_get_property(phy, "interrupts", NULL);
--
--		id = of_get_property(np, "device-id", NULL);
--		fs_enet_data.fs_no = *id;
--		strcpy(fs_enet_data.fs_type, model);
--
--		mdio = of_get_parent(phy);
--                ret = of_address_to_resource(mdio, 0, &res);
--                if (ret) {
--                        of_node_put(phy);
--                        of_node_put(mdio);
--                        goto unreg;
--                }
--
--		fs_enet_data.clk_rx = *((u32 *)of_get_property(np,
--						"rx-clock", NULL));
--		fs_enet_data.clk_tx = *((u32 *)of_get_property(np,
--						"tx-clock", NULL));
--
--		if (strstr(model, "FCC")) {
--			int fcc_index = *id - 1;
--			const unsigned char *mdio_bb_prop;
--
--			fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);
--			fs_enet_data.rx_ring = 32;
--			fs_enet_data.tx_ring = 32;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 0;
--			fs_enet_data.napi_weight = 17;
--			fs_enet_data.mem_offset = FCC_MEM_OFFSET(fcc_index);
--			fs_enet_data.cp_page = CPM_CR_FCC_PAGE(fcc_index);
--			fs_enet_data.cp_block = CPM_CR_FCC_SBLOCK(fcc_index);
--
--			snprintf((char*)&bus_id[(*id)], BUS_ID_SIZE, "%x:%02x",
--							(u32)res.start, fs_enet_data.phy_addr);
--			fs_enet_data.bus_id = (char*)&bus_id[(*id)];
--			fs_enet_data.init_ioports = init_fcc_ioports;
--
--			mdio_bb_prop = of_get_property(phy, "bitbang", NULL);
--			if (mdio_bb_prop) {
--				struct platform_device *fs_enet_mdio_bb_dev;
--				struct fs_mii_bb_platform_info fs_enet_mdio_bb_data;
--
--				fs_enet_mdio_bb_dev =
--					platform_device_register_simple("fsl-bb-mdio",
--							i, NULL, 0);
--				memset(&fs_enet_mdio_bb_data, 0,
--						sizeof(struct fs_mii_bb_platform_info));
--				fs_enet_mdio_bb_data.mdio_dat.bit =
--					mdio_bb_prop[0];
--				fs_enet_mdio_bb_data.mdio_dir.bit =
--					mdio_bb_prop[1];
--				fs_enet_mdio_bb_data.mdc_dat.bit =
--					mdio_bb_prop[2];
--				fs_enet_mdio_bb_data.mdio_port =
--					mdio_bb_prop[3];
--				fs_enet_mdio_bb_data.mdc_port =
--					mdio_bb_prop[4];
--				fs_enet_mdio_bb_data.delay =
--					mdio_bb_prop[5];
--
--				fs_enet_mdio_bb_data.irq[0] = phy_irq[0];
--				fs_enet_mdio_bb_data.irq[1] = -1;
--				fs_enet_mdio_bb_data.irq[2] = -1;
--				fs_enet_mdio_bb_data.irq[3] = phy_irq[0];
--				fs_enet_mdio_bb_data.irq[31] = -1;
--
--				fs_enet_mdio_bb_data.mdio_dat.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdatc;
--				fs_enet_mdio_bb_data.mdio_dir.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdirc;
--				fs_enet_mdio_bb_data.mdc_dat.offset =
--					(u32)&cpm2_immr->im_ioport.iop_pdatc;
--
--				ret = platform_device_add_data(
--						fs_enet_mdio_bb_dev,
--						&fs_enet_mdio_bb_data,
--						sizeof(struct fs_mii_bb_platform_info));
--				if (ret)
--					goto unreg;
--			}
--
--			of_node_put(phy);
--			of_node_put(mdio);
--
--			ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
--						     sizeof(struct
--							    fs_platform_info));
--			if (ret)
--				goto unreg;
--		}
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(fs_enet_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_of_init);
--
--static const char scc_regs[] = "regs";
--static const char scc_pram[] = "pram";
--
--static int __init cpm_uart_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *cpm_uart_dev;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
--	     i++) {
--		struct resource r[3];
--		struct fs_uart_platform_info cpm_uart_data;
--		const int *id;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--
--		r[0].name = scc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = scc_pram;
--
--		of_irq_to_resource(np, 0, &r[2]);
--
--		cpm_uart_dev =
--		    platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);
--
--		if (IS_ERR(cpm_uart_dev)) {
--			ret = PTR_ERR(cpm_uart_dev);
--			goto err;
--		}
--
--		id = of_get_property(np, "device-id", NULL);
--		cpm_uart_data.fs_no = *id;
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(cpm_uart_data.fs_type, model);
--
--		cpm_uart_data.uart_clk = ppc_proc_freq;
--
--		cpm_uart_data.tx_num_fifo = 4;
--		cpm_uart_data.tx_buf_size = 32;
--		cpm_uart_data.rx_num_fifo = 4;
--		cpm_uart_data.rx_buf_size = 32;
--		cpm_uart_data.clk_rx = *((u32 *)of_get_property(np,
--						"rx-clock", NULL));
--		cpm_uart_data.clk_tx = *((u32 *)of_get_property(np,
--						"tx-clock", NULL));
--
--		ret =
--		    platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
--					     sizeof(struct
--						    fs_uart_platform_info));
--		if (ret)
--			goto unreg;
--	}
--
--	return 0;
--
--unreg:
--	platform_device_unregister(cpm_uart_dev);
--err:
--	return ret;
--}
--
--arch_initcall(cpm_uart_of_init);
--#endif /* CONFIG_CPM2 */
--
--#ifdef CONFIG_8xx
--
--extern void init_scc_ioports(struct fs_platform_info*);
--extern int platform_device_skip(const char *model, int id);
--
--static int __init fs_enet_mdio_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *mdio_dev;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "mdio", "fs_enet")) != NULL;
--	     i++) {
--		struct fs_mii_fec_platform_info mdio_data;
--
--		memset(&res, 0, sizeof(res));
--		memset(&mdio_data, 0, sizeof(mdio_data));
--
--		ret = of_address_to_resource(np, 0, &res);
--		if (ret)
--			goto err;
--
--		mdio_dev =
--		    platform_device_register_simple("fsl-cpm-fec-mdio",
--						    res.start, &res, 1);
--		if (IS_ERR(mdio_dev)) {
--			ret = PTR_ERR(mdio_dev);
--			goto err;
--		}
--
--		mdio_data.mii_speed = ((((ppc_proc_freq + 4999999) / 2500000) / 2) & 0x3F) << 1;
--
--		ret =
--		    platform_device_add_data(mdio_dev, &mdio_data,
--					     sizeof(struct fs_mii_fec_platform_info));
--		if (ret)
--			goto unreg;
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(mdio_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_mdio_of_init);
--
--static const char *enet_regs = "regs";
--static const char *enet_pram = "pram";
--static const char *enet_irq = "interrupt";
--static char bus_id[9][BUS_ID_SIZE];
--
--static int __init fs_enet_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *fs_enet_dev = NULL;
--	struct resource res;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
--	     i++) {
--		struct resource r[4];
--		struct device_node *phy = NULL, *mdio = NULL;
--		struct fs_platform_info fs_enet_data;
--		const unsigned int *id;
--		const unsigned int *phy_addr;
--		const void *mac_addr;
--		const phandle *ph;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&fs_enet_data, 0, sizeof(fs_enet_data));
--
--		model = of_get_property(np, "model", NULL);
--		if (model == NULL) {
--			ret = -ENODEV;
--			goto unreg;
--		}
--
--		id = of_get_property(np, "device-id", NULL);
--		fs_enet_data.fs_no = *id;
--
--		if (platform_device_skip(model, *id))
--			continue;
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--		r[0].name = enet_regs;
--
--		mac_addr = of_get_mac_address(np);
--		if (mac_addr)
--			memcpy(fs_enet_data.macaddr, mac_addr, 6);
--
--		ph = of_get_property(np, "phy-handle", NULL);
--		if (ph != NULL)
--			phy = of_find_node_by_phandle(*ph);
--
--		if (phy != NULL) {
--			phy_addr = of_get_property(phy, "reg", NULL);
--			fs_enet_data.phy_addr = *phy_addr;
--			fs_enet_data.has_phy = 1;
--
--			mdio = of_get_parent(phy);
--			ret = of_address_to_resource(mdio, 0, &res);
--			if (ret) {
--				of_node_put(phy);
--				of_node_put(mdio);
--                                goto unreg;
--			}
--		}
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(fs_enet_data.fs_type, model);
--
--		if (strstr(model, "FEC")) {
--			r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
--			r[1].flags = IORESOURCE_IRQ;
--			r[1].name = enet_irq;
--
--			fs_enet_dev =
--				    platform_device_register_simple("fsl-cpm-fec", i, &r[0], 2);
--
--			if (IS_ERR(fs_enet_dev)) {
--				ret = PTR_ERR(fs_enet_dev);
--				goto err;
--			}
--
--			fs_enet_data.rx_ring = 128;
--			fs_enet_data.tx_ring = 16;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 1;
--			fs_enet_data.napi_weight = 17;
--
--			snprintf((char*)&bus_id[i], BUS_ID_SIZE, "%x:%02x",
--							(u32)res.start, fs_enet_data.phy_addr);
--			fs_enet_data.bus_id = (char*)&bus_id[i];
--			fs_enet_data.init_ioports = init_fec_ioports;
--		}
--		if (strstr(model, "SCC")) {
--			ret = of_address_to_resource(np, 1, &r[1]);
--			if (ret)
--				goto err;
--			r[1].name = enet_pram;
--
--			r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
--			r[2].flags = IORESOURCE_IRQ;
--			r[2].name = enet_irq;
--
--			fs_enet_dev =
--				    platform_device_register_simple("fsl-cpm-scc", i, &r[0], 3);
--
--			if (IS_ERR(fs_enet_dev)) {
--				ret = PTR_ERR(fs_enet_dev);
--				goto err;
--			}
--
--			fs_enet_data.rx_ring = 64;
--			fs_enet_data.tx_ring = 8;
--			fs_enet_data.rx_copybreak = 240;
--			fs_enet_data.use_napi = 1;
--			fs_enet_data.napi_weight = 17;
--
--			snprintf((char*)&bus_id[i], BUS_ID_SIZE, "%s", "fixed@10:1");
--                        fs_enet_data.bus_id = (char*)&bus_id[i];
--			fs_enet_data.init_ioports = init_scc_ioports;
--		}
--
--		of_node_put(phy);
--		of_node_put(mdio);
--
--		ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
--					     sizeof(struct
--						    fs_platform_info));
--		if (ret)
--			goto unreg;
--	}
--	return 0;
--
--unreg:
--	platform_device_unregister(fs_enet_dev);
--err:
--	return ret;
--}
--
--arch_initcall(fs_enet_of_init);
--
--static int __init fsl_pcmcia_of_init(void)
--{
--	struct device_node *np;
--	/*
--	 * Register all the devices which type is "pcmcia"
--	 */
--	for_each_compatible_node(np, "pcmcia", "fsl,pq-pcmcia")
--		of_platform_device_create(np, "m8xx-pcmcia", NULL);
--	return 0;
--}
--
--arch_initcall(fsl_pcmcia_of_init);
--
--static const char *smc_regs = "regs";
--static const char *smc_pram = "pram";
--
--static int __init cpm_smc_uart_of_init(void)
--{
--	struct device_node *np;
--	unsigned int i;
--	struct platform_device *cpm_uart_dev;
--	int ret;
--
--	for (np = NULL, i = 0;
--	     (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
--	     i++) {
--		struct resource r[3];
--		struct fs_uart_platform_info cpm_uart_data;
--		const int *id;
--		const char *model;
--
--		memset(r, 0, sizeof(r));
--		memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
--
--		ret = of_address_to_resource(np, 0, &r[0]);
--		if (ret)
--			goto err;
--
--		r[0].name = smc_regs;
--
--		ret = of_address_to_resource(np, 1, &r[1]);
--		if (ret)
--			goto err;
--		r[1].name = smc_pram;
--
--		r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
--		r[2].flags = IORESOURCE_IRQ;
--
--		cpm_uart_dev =
--		    platform_device_register_simple("fsl-cpm-smc:uart", i, &r[0], 3);
--
--		if (IS_ERR(cpm_uart_dev)) {
--			ret = PTR_ERR(cpm_uart_dev);
--			goto err;
--		}
--
--		model = of_get_property(np, "model", NULL);
--		strcpy(cpm_uart_data.fs_type, model);
--
--		id = of_get_property(np, "device-id", NULL);
--		cpm_uart_data.fs_no = *id;
--		cpm_uart_data.uart_clk = ppc_proc_freq;
--
--		cpm_uart_data.tx_num_fifo = 4;
--		cpm_uart_data.tx_buf_size = 32;
--		cpm_uart_data.rx_num_fifo = 4;
--		cpm_uart_data.rx_buf_size = 32;
--
--		ret =
--		    platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
--					     sizeof(struct
--						    fs_uart_platform_info));
--		if (ret)
--			goto unreg;
--	}
--
--	return 0;
--
--unreg:
--	platform_device_unregister(cpm_uart_dev);
--err:
--	return ret;
--}
--
--arch_initcall(cpm_smc_uart_of_init);
--
--#endif /* CONFIG_8xx */
--#endif /* CONFIG_PPC_CPM_NEW_BINDING */
--
- static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
- 				   struct spi_board_info *board_infos,
- 				   unsigned int num_board_infos,
-@@ -1371,25 +840,9 @@ int __init fsl_spi_init(struct spi_board
- 	sysclk = get_brgfreq();
- #endif
- 	if (sysclk == -1) {
--		struct device_node *np;
--		const u32 *freq;
--		int size;
--
--		np = of_find_node_by_type(NULL, "soc");
--		if (!np)
-+		sysclk = fsl_get_sys_freq();
-+		if (sysclk == -1)
- 			return -ENODEV;
--
--		freq = of_get_property(np, "clock-frequency", &size);
--		if (!freq || size != sizeof(*freq) || *freq == 0) {
--			freq = of_get_property(np, "bus-frequency", &size);
--			if (!freq || size != sizeof(*freq) || *freq == 0) {
--				of_node_put(np);
--				return -ENODEV;
--			}
--		}
--
--		sysclk = *freq;
--		of_node_put(np);
- 	}
- 
- 	ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
---- a/arch/powerpc/sysdev/fsl_soc.h
-+++ b/arch/powerpc/sysdev/fsl_soc.h
-@@ -7,6 +7,7 @@
- extern phys_addr_t get_immrbase(void);
- extern u32 get_brgfreq(void);
- extern u32 get_baudrate(void);
-+extern u32 fsl_get_sys_freq(void);
- 
- struct spi_board_info;
- 
---- a/arch/powerpc/sysdev/mpic.c
-+++ b/arch/powerpc/sysdev/mpic.c
-@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic
- 	switch(type) {
- #ifdef CONFIG_PPC_DCR
- 	case mpic_access_dcr:
--		return dcr_write(rb->dhost, reg, value);
-+		dcr_write(rb->dhost, reg, value);
-+		break;
- #endif
- 	case mpic_access_mmio_be:
--		return out_be32(rb->base + (reg >> 2), value);
-+		out_be32(rb->base + (reg >> 2), value);
-+		break;
- 	case mpic_access_mmio_le:
- 	default:
--		return out_le32(rb->base + (reg >> 2), value);
-+		out_le32(rb->base + (reg >> 2), value);
-+		break;
- 	}
- }
- 
-@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct d
- 				const char *name)
- {
- 	struct mpic	*mpic;
--	u32		reg;
-+	u32		greg_feature;
- 	const char	*vers;
- 	int		i;
- 	int		intvec_top;
-@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct d
- 
- 	/* Look for protected sources */
- 	if (node) {
--		unsigned int psize, bits, mapsize;
-+		int psize;
-+		unsigned int bits, mapsize;
- 		const u32 *psrc =
- 			of_get_property(node, "protected-sources", &psize);
- 		if (psrc) {
-@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct d
- 	 * in, try to obtain one
- 	 */
- 	if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
--		const u32 *reg;
--		reg = of_get_property(node, "reg", NULL);
-+		const u32 *reg = of_get_property(node, "reg", NULL);
- 		BUG_ON(reg == NULL);
- 		paddr = of_translate_address(node, reg);
- 		BUG_ON(paddr == OF_BAD_ADDR);
-@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct d
- 	 * MPICs, num sources as well. On ISU MPICs, sources are counted
- 	 * as ISUs are added
- 	 */
--	reg = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
--	mpic->num_cpus = ((reg & MPIC_GREG_FEATURE_LAST_CPU_MASK)
-+	greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
-+	mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
- 			  >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
- 	if (isu_size == 0)
--		mpic->num_sources = ((reg & MPIC_GREG_FEATURE_LAST_SRC_MASK)
--				     >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
-+		mpic->num_sources =
-+			((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
-+			 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
- 
- 	/* Map the per-CPU registers */
- 	for (i = 0; i < mpic->num_cpus; i++) {
-@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct d
- 	mpic->isu_mask = (1 << mpic->isu_shift) - 1;
- 
- 	/* Display version */
--	switch (reg & MPIC_GREG_FEATURE_VERSION_MASK) {
-+	switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) {
- 	case 1:
- 		vers = "1.0";
- 		break;
-@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct m
- 
- void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
- {
--	int is_ipi;
-+	unsigned int is_ipi;
- 	struct mpic *mpic = mpic_find(irq, &is_ipi);
- 	unsigned int src = mpic_irq_to_hw(irq);
- 	unsigned long flags;
-@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int 
- 
- unsigned int mpic_irq_get_priority(unsigned int irq)
- {
--	int is_ipi;
-+	unsigned int is_ipi;
- 	struct mpic *mpic = mpic_find(irq, &is_ipi);
- 	unsigned int src = mpic_irq_to_hw(irq);
- 	unsigned long flags;
-@@ -1406,11 +1410,6 @@ void mpic_cpu_set_priority(int prio)
- 	mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio);
- }
- 
--/*
-- * XXX: someone who knows mpic should check this.
-- * do we need to eoi the ipi including for kexec cpu here (see xics comments)?
-- * or can we reset the mpic in the new kernel?
-- */
- void mpic_teardown_this_cpu(int secondary)
- {
- 	struct mpic *mpic = mpic_primary;
-@@ -1430,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondar
- 
- 	/* Set current processor priority to max */
- 	mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);
-+	/* We need to EOI the IPI since not all platforms reset the MPIC
-+	 * on boot and new interrupts wouldn't get delivered otherwise.
-+	 */
-+	mpic_eoi(mpic);
- 
- 	spin_unlock_irqrestore(&mpic_lock, flags);
- }
---- a/arch/powerpc/sysdev/mv64x60_dev.c
-+++ b/arch/powerpc/sysdev/mv64x60_dev.c
-@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_se
- 	if (err)
- 		return err;
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	port_number = *(int *)prop;
-@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_se
- 
- 	pdata.cache_mgmt = 1; /* All current revs need this set */
- 
-+	pdata.max_idle = 40; /* default */
- 	prop = of_get_property(np, "max_idle", NULL);
- 	if (prop)
- 		pdata.max_idle = *prop;
-@@ -205,30 +206,24 @@ error:
- /*
-  * Create mv64x60_eth platform devices
-  */
--static int __init eth_register_shared_pdev(struct device_node *np)
-+static struct platform_device * __init mv64x60_eth_register_shared_pdev(
-+						struct device_node *np, int id)
- {
- 	struct platform_device *pdev;
- 	struct resource r[1];
- 	int err;
- 
--	np = of_get_parent(np);
--	if (!np)
--		return -ENODEV;
--
- 	err = of_address_to_resource(np, 0, &r[0]);
--	of_node_put(np);
- 	if (err)
--		return err;
-+		return ERR_PTR(err);
- 
--	pdev = platform_device_register_simple(MV643XX_ETH_SHARED_NAME, 0,
-+	pdev = platform_device_register_simple(MV643XX_ETH_SHARED_NAME, id,
- 					       r, 1);
--	if (IS_ERR(pdev))
--		return PTR_ERR(pdev);
--
--	return 0;
-+	return pdev;
- }
- 
--static int __init mv64x60_eth_device_setup(struct device_node *np, int id)
-+static int __init mv64x60_eth_device_setup(struct device_node *np, int id,
-+					   struct platform_device *shared_pdev)
- {
- 	struct resource r[1];
- 	struct mv643xx_eth_platform_data pdata;
-@@ -239,16 +234,12 @@ static int __init mv64x60_eth_device_set
- 	const phandle *ph;
- 	int err;
- 
--	/* only register the shared platform device the first time through */
--	if (id == 0 && (err = eth_register_shared_pdev(np)))
--		return err;
--
- 	memset(r, 0, sizeof(r));
- 	of_irq_to_resource(np, 0, &r[0]);
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "reg", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.port_number = *prop;
-@@ -301,7 +292,7 @@ static int __init mv64x60_eth_device_set
- 
- 	of_node_put(phy);
- 
--	pdev = platform_device_alloc(MV643XX_ETH_NAME, pdata.port_number);
-+	pdev = platform_device_alloc(MV643XX_ETH_NAME, id);
- 	if (!pdev)
- 		return -ENOMEM;
- 
-@@ -345,21 +336,19 @@ static int __init mv64x60_i2c_device_set
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
-+	pdata.freq_m = 8;	/* default */
- 	prop = of_get_property(np, "freq_m", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.freq_m = *prop;
- 
-+	pdata.freq_m = 3;	/* default */
- 	prop = of_get_property(np, "freq_n", NULL);
- 	if (!prop)
- 		return -ENODEV;
- 	pdata.freq_n = *prop;
- 
--	prop = of_get_property(np, "timeout", NULL);
--	if (prop)
--		pdata.timeout = *prop;
--	else
--		pdata.timeout = 1000;	/* 1 second */
-+	pdata.timeout = 1000;				/* default: 1 second */
- 
- 	pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
- 	if (!pdev)
-@@ -401,10 +390,7 @@ static int __init mv64x60_wdt_device_set
- 
- 	memset(&pdata, 0, sizeof(pdata));
- 
--	prop = of_get_property(np, "timeout", NULL);
--	if (!prop)
--		return -ENODEV;
--	pdata.timeout = *prop;
-+	pdata.timeout = 10;			/* Default: 10 seconds */
- 
- 	np = of_get_parent(np);
- 	if (!np)
-@@ -441,27 +427,43 @@ error:
- 
- static int __init mv64x60_device_setup(void)
- {
--	struct device_node *np = NULL;
--	int id;
-+	struct device_node *np, *np2;
-+	struct platform_device *pdev;
-+	int id, id2;
- 	int err;
- 
- 	id = 0;
--	for_each_compatible_node(np, "serial", "marvell,mpsc")
-+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
- 		if ((err = mv64x60_mpsc_device_setup(np, id++)))
- 			goto error;
- 
- 	id = 0;
--	for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
--		if ((err = mv64x60_eth_device_setup(np, id++)))
-+	id2 = 0;
-+	for_each_compatible_node(np, NULL, "marvell,mv64360-eth-group") {
-+		pdev = mv64x60_eth_register_shared_pdev(np, id++);
-+		if (IS_ERR(pdev)) {
-+			err = PTR_ERR(pdev);
- 			goto error;
-+		}
-+		for_each_child_of_node(np, np2) {
-+			if (!of_device_is_compatible(np2,
-+					"marvell,mv64360-eth"))
-+				continue;
-+			err = mv64x60_eth_device_setup(np2, id2++, pdev);
-+			if (err) {
-+				of_node_put(np2);
-+				goto error;
-+			}
-+		}
-+	}
- 
- 	id = 0;
--	for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
-+	for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
- 		if ((err = mv64x60_i2c_device_setup(np, id++)))
- 			goto error;
- 
- 	/* support up to one watchdog timer */
--	np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt");
-+	np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
- 	if (np) {
- 		if ((err = mv64x60_wdt_device_setup(np, id)))
- 			goto error;
-@@ -489,10 +491,10 @@ static int __init mv64x60_add_mpsc_conso
- 	if (!np)
- 		goto not_mpsc;
- 
--	if (!of_device_is_compatible(np, "marvell,mpsc"))
-+	if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
- 		goto not_mpsc;
- 
--	prop = of_get_property(np, "block-index", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
- 	if (!prop)
- 		goto not_mpsc;
- 
---- a/arch/powerpc/sysdev/mv64x60_pci.c
-+++ b/arch/powerpc/sysdev/mv64x60_pci.c
-@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(voi
- 	struct platform_device *pdev;
- 	const unsigned int *prop;
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
- 	if (!np)
- 		return 0;
- 
- 	prop = of_get_property(np, "hs_reg_valid", NULL);
- 	of_node_put(np);
- 
--	pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0);
-+	pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
- 	if (IS_ERR(pdev))
- 		return PTR_ERR(pdev);
- 
-@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
- {
- 	struct device_node *np;
- 
--	for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
-+	for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
- 		mv64x60_add_bridge(np);
- }
---- a/arch/powerpc/sysdev/mv64x60_pic.c
-+++ b/arch/powerpc/sysdev/mv64x60_pic.c
-@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
- 	const unsigned int *reg;
- 	unsigned long flags;
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
- 	reg = of_get_property(np, "reg", &size);
- 	paddr = of_translate_address(np, reg);
- 	mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
- 	of_node_put(np);
- 
--	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
-+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
- 	reg = of_get_property(np, "reg", &size);
- 	paddr = of_translate_address(np, reg);
- 	mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
---- a/arch/powerpc/sysdev/mv64x60_udbg.c
-+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
-@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
- 	if (!stdout)
- 		return;
- 
--	for_each_compatible_node(np, "serial", "marvell,mpsc") {
-+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
- 		if (np == stdout)
- 			break;
- 	}
---- a/arch/powerpc/sysdev/ppc4xx_pci.c
-+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
-@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bri
-  *
-  * ibm,plb-pciex-440spe
-  * ibm,plb-pciex-405ex
-+ * ibm,plb-pciex-460ex
-  *
-  * Anything else will be rejected for now as they are all subtly
-  * different unfortunately.
-@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_i
- 	int time_out = 20;
- 
- 	/* Set PLL clock receiver to LVPECL */
--	mtdcri(SDR0, PESDR0_PLLLCT1, mfdcri(SDR0, PESDR0_PLLLCT1) | 1 << 28);
-+	dcri_clrset(SDR0, PESDR0_PLLLCT1, 0, 1 << 28);
- 
- 	/* Shouldn't we do all the calibration stuff etc... here ? */
- 	if (ppc440spe_pciex_check_reset(np))
-@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_i
- 	}
- 
- 	/* De-assert reset of PCIe PLL, wait for lock */
--	mtdcri(SDR0, PESDR0_PLLLCT1,
--	       mfdcri(SDR0, PESDR0_PLLLCT1) & ~(1 << 24));
-+	dcri_clrset(SDR0, PESDR0_PLLLCT1, 1 << 24, 0);
- 	udelay(3);
- 
- 	while (time_out) {
-@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw(
- 		mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
- 		       0x35000000);
- 	}
--	val = mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET);
--	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
--	       (val & ~(1 << 24 | 1 << 16)) | 1 << 12);
-+	dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET,
-+			(1 << 24) | (1 << 16), 1 << 12);
- 
- 	return 0;
- }
-@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440s
- 	.setup_utl	= ppc440speB_pciex_init_utl,
- };
- 
-+static int __init ppc460ex_pciex_core_init(struct device_node *np)
-+{
-+	/* Nothing to do, return 2 ports */
-+	return 2;
-+}
-+
-+static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
-+{
-+	u32 val;
-+	u32 utlset1;
-+
-+	if (port->endpoint)
-+		val = PTYPE_LEGACY_ENDPOINT << 20;
-+	else
-+		val = PTYPE_ROOT_PORT << 20;
-+
-+	if (port->index == 0) {
-+		val |= LNKW_X1 << 12;
-+		utlset1 = 0x20000000;
-+	} else {
-+		val |= LNKW_X4 << 12;
-+		utlset1 = 0x20101101;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_DLPSET, val);
-+	mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET1, utlset1);
-+	mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET2, 0x01210000);
-+
-+	switch (port->index) {
-+	case 0:
-+		mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
-+
-+		mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);
-+		break;
-+
-+	case 1:
-+		mtdcri(SDR0, PESDR1_460EX_L0CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L1CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L2CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L3CDRCTL, 0x00003230);
-+		mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000136);
-+		mtdcri(SDR0, PESDR1_460EX_L0CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);
-+		mtdcri(SDR0, PESDR1_460EX_L3CLK, 0x00000006);
-+
-+		mtdcri(SDR0, PESDR1_460EX_PHY_CTL_RST,0x10000000);
-+		break;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
-+	       mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) |
-+	       (PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTPYN));
-+
-+	/* Poll for PHY reset */
-+	/* XXX FIXME add timeout */
-+	switch (port->index) {
-+	case 0:
-+		while (!(mfdcri(SDR0, PESDR0_460EX_RSTSTA) & 0x1))
-+			udelay(10);
-+		break;
-+	case 1:
-+		while (!(mfdcri(SDR0, PESDR1_460EX_RSTSTA) & 0x1))
-+			udelay(10);
-+		break;
-+	}
-+
-+	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
-+	       (mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) &
-+		~(PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTDL)) |
-+	       PESDRx_RCSSET_RSTPYN);
-+
-+	port->has_ibpre = 1;
-+
-+	return 0;
-+}
-+
-+static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port)
-+{
-+	dcr_write(port->dcrs, DCRO_PEGPL_SPECIAL, 0x0);
-+
-+	/*
-+	 * Set buffer allocations and then assert VRB and TXE.
-+	 */
-+	out_be32(port->utl_base + PEUTL_PBCTL,	0x0800000c);
-+	out_be32(port->utl_base + PEUTL_OUTTR,	0x08000000);
-+	out_be32(port->utl_base + PEUTL_INTR,	0x02000000);
-+	out_be32(port->utl_base + PEUTL_OPDBSZ,	0x04000000);
-+	out_be32(port->utl_base + PEUTL_PBBSZ,	0x00000000);
-+	out_be32(port->utl_base + PEUTL_IPHBSZ,	0x02000000);
-+	out_be32(port->utl_base + PEUTL_IPDBSZ,	0x04000000);
-+	out_be32(port->utl_base + PEUTL_RCIRQEN,0x00f00000);
-+	out_be32(port->utl_base + PEUTL_PCTL,	0x80800066);
-+
-+	return 0;
-+}
-+
-+static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =
-+{
-+	.core_init	= ppc460ex_pciex_core_init,
-+	.port_init_hw	= ppc460ex_pciex_init_port_hw,
-+	.setup_utl	= ppc460ex_pciex_init_utl,
-+};
-+
- #endif /* CONFIG_44x */
- 
- #ifdef CONFIG_40x
-@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(s
- 	 * PCIe boards don't show this problem.
- 	 * This has to be re-tested and fixed in a later release!
- 	 */
--#if 0 /* XXX FIXME: Not resetting the PHY will leave all resources
--       * configured as done previously by U-Boot. Then Linux will currently
--       * not reassign them. So the PHY reset is now done always. This will
--       * lead to problems with the Atheros PCIe board again.
--       */
- 	val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
- 	if (!(val & 0x00001000))
- 		ppc405ex_pcie_phy_reset(port);
--#else
--	ppc405ex_pcie_phy_reset(port);
--#endif
- 
- 	dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000);  /* guarded on */
- 
-@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_cor
- 		else
- 			ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
- 	}
-+	if (of_device_is_compatible(np, "ibm,plb-pciex-460ex"))
-+		ppc4xx_pciex_hwops = &ppc460ex_pcie_hwops;
- #endif /* CONFIG_44x    */
- #ifdef CONFIG_40x
- 	if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
-@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init
- 		port->link = 0;
- 	}
- 
--	mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
--	       mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) | 1 << 20);
-+	dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET, 0, 1 << 20);
- 	msleep(100);
- 
- 	return 0;
---- a/arch/powerpc/sysdev/ppc4xx_pci.h
-+++ b/arch/powerpc/sysdev/ppc4xx_pci.h
-@@ -271,6 +271,59 @@
- #define PESDR1_405EX_PHYSTA		0x044C
- 
- /*
-+ * 460EX additional DCRs
-+ */
-+#define PESDR0_460EX_L0BIST		0x0308
-+#define PESDR0_460EX_L0BISTSTS		0x0309
-+#define PESDR0_460EX_L0CDRCTL		0x030A
-+#define PESDR0_460EX_L0DRV		0x030B
-+#define PESDR0_460EX_L0REC		0x030C
-+#define PESDR0_460EX_L0LPB		0x030D
-+#define PESDR0_460EX_L0CLK		0x030E
-+#define PESDR0_460EX_PHY_CTL_RST	0x030F
-+#define PESDR0_460EX_RSTSTA		0x0310
-+#define PESDR0_460EX_OBS		0x0311
-+#define PESDR0_460EX_L0ERRC		0x0320
-+
-+#define PESDR1_460EX_L0BIST		0x0348
-+#define PESDR1_460EX_L1BIST		0x0349
-+#define PESDR1_460EX_L2BIST		0x034A
-+#define PESDR1_460EX_L3BIST		0x034B
-+#define PESDR1_460EX_L0BISTSTS		0x034C
-+#define PESDR1_460EX_L1BISTSTS		0x034D
-+#define PESDR1_460EX_L2BISTSTS		0x034E
-+#define PESDR1_460EX_L3BISTSTS		0x034F
-+#define PESDR1_460EX_L0CDRCTL		0x0350
-+#define PESDR1_460EX_L1CDRCTL		0x0351
-+#define PESDR1_460EX_L2CDRCTL		0x0352
-+#define PESDR1_460EX_L3CDRCTL		0x0353
-+#define PESDR1_460EX_L0DRV		0x0354
-+#define PESDR1_460EX_L1DRV		0x0355
-+#define PESDR1_460EX_L2DRV		0x0356
-+#define PESDR1_460EX_L3DRV		0x0357
-+#define PESDR1_460EX_L0REC		0x0358
-+#define PESDR1_460EX_L1REC		0x0359
-+#define PESDR1_460EX_L2REC		0x035A
-+#define PESDR1_460EX_L3REC		0x035B
-+#define PESDR1_460EX_L0LPB		0x035C
-+#define PESDR1_460EX_L1LPB		0x035D
-+#define PESDR1_460EX_L2LPB		0x035E
-+#define PESDR1_460EX_L3LPB		0x035F
-+#define PESDR1_460EX_L0CLK		0x0360
-+#define PESDR1_460EX_L1CLK		0x0361
-+#define PESDR1_460EX_L2CLK		0x0362
-+#define PESDR1_460EX_L3CLK		0x0363
-+#define PESDR1_460EX_PHY_CTL_RST	0x0364
-+#define PESDR1_460EX_RSTSTA		0x0365
-+#define PESDR1_460EX_OBS		0x0366
-+#define PESDR1_460EX_L0ERRC		0x0368
-+#define PESDR1_460EX_L1ERRC		0x0369
-+#define PESDR1_460EX_L2ERRC		0x036A
-+#define PESDR1_460EX_L3ERRC		0x036B
-+#define PESDR0_460EX_IHS1		0x036C
-+#define PESDR0_460EX_IHS2		0x036D
-+
-+/*
-  * Of the above, some are common offsets from the base
-  */
- #define PESDRn_UTLSET1			0x00
-@@ -353,6 +406,12 @@
- #define PECFG_POM2LAL		0x390
- #define PECFG_POM2LAH		0x394
- 
-+/* SDR Bit Mappings */
-+#define PESDRx_RCSSET_HLDPLB	0x10000000
-+#define PESDRx_RCSSET_RSTGU	0x01000000
-+#define PESDRx_RCSSET_RDY       0x00100000
-+#define PESDRx_RCSSET_RSTDL     0x00010000
-+#define PESDRx_RCSSET_RSTPYN    0x00001000
- 
- enum
- {
---- /dev/null
-+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
-@@ -0,0 +1,200 @@
-+/*
-+ * IBM/AMCC PPC4xx SoC setup code
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * L2 cache routines cloned from arch/ppc/syslib/ibm440gx_common.c which is:
-+ *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
-+ *   Copyright (c) 2003 - 2006 Zultys Technologies
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ */
-+
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/of_platform.h>
-+
-+#include <asm/dcr.h>
-+#include <asm/dcr-regs.h>
-+#include <asm/reg.h>
-+
-+static u32 dcrbase_l2c;
-+
-+/*
-+ * L2-cache
-+ */
-+
-+/* Issue L2C diagnostic command */
-+static inline u32 l2c_diag(u32 addr)
-+{
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, addr);
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_DIAG);
-+	while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
-+		;
-+
-+	return mfdcr(dcrbase_l2c + DCRN_L2C0_DATA);
-+}
-+
-+static irqreturn_t l2c_error_handler(int irq, void *dev)
-+{
-+	u32 sr = mfdcr(dcrbase_l2c + DCRN_L2C0_SR);
-+
-+	if (sr & L2C_SR_CPE) {
-+		/* Read cache trapped address */
-+		u32 addr = l2c_diag(0x42000000);
-+		printk(KERN_EMERG "L2C: Cache Parity Error, addr[16:26] = 0x%08x\n",
-+		       addr);
-+	}
-+	if (sr & L2C_SR_TPE) {
-+		/* Read tag trapped address */
-+		u32 addr = l2c_diag(0x82000000) >> 16;
-+		printk(KERN_EMERG "L2C: Tag Parity Error, addr[16:26] = 0x%08x\n",
-+		       addr);
-+	}
-+
-+	/* Clear parity errors */
-+	if (sr & (L2C_SR_CPE | L2C_SR_TPE)){
-+		mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
-+		mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
-+	} else {
-+		printk(KERN_EMERG "L2C: LRU error\n");
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int __init ppc4xx_l2c_probe(void)
-+{
-+	struct device_node *np;
-+	u32 r;
-+	unsigned long flags;
-+	int irq;
-+	const u32 *dcrreg;
-+	u32 dcrbase_isram;
-+	int len;
-+	const u32 *prop;
-+	u32 l2_size;
-+
-+	np = of_find_compatible_node(NULL, NULL, "ibm,l2-cache");
-+	if (!np)
-+		return 0;
-+
-+	/* Get l2 cache size */
-+	prop = of_get_property(np, "cache-size", NULL);
-+	if (prop == NULL) {
-+		printk(KERN_ERR "%s: Can't get cache-size!\n", np->full_name);
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+	l2_size = prop[0];
-+
-+	/* Map DCRs */
-+	dcrreg = of_get_property(np, "dcr-reg", &len);
-+	if (!dcrreg || (len != 4 * sizeof(u32))) {
-+		printk(KERN_ERR "%s: Can't get DCR register base !",
-+		       np->full_name);
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+	dcrbase_isram = dcrreg[0];
-+	dcrbase_l2c = dcrreg[2];
-+
-+	/* Get and map irq number from device tree */
-+	irq = irq_of_parse_and_map(np, 0);
-+	if (irq == NO_IRQ) {
-+		printk(KERN_ERR "irq_of_parse_and_map failed\n");
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+
-+	/* Install error handler */
-+	if (request_irq(irq, l2c_error_handler, IRQF_DISABLED, "L2C", 0) < 0) {
-+		printk(KERN_ERR "Cannot install L2C error handler"
-+		       ", cache is not enabled\n");
-+		of_node_put(np);
-+		return -ENODEV;
-+	}
-+
-+	local_irq_save(flags);
-+	asm volatile ("sync" ::: "memory");
-+
-+	/* Disable SRAM */
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_DPC,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_DPC) & ~SRAM_DPC_ENABLE);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB0CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB0CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB1CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB1CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB2CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB2CR) & ~SRAM_SBCR_BU_MASK);
-+	mtdcr(dcrbase_isram + DCRN_SRAM0_SB3CR,
-+	      mfdcr(dcrbase_isram + DCRN_SRAM0_SB3CR) & ~SRAM_SBCR_BU_MASK);
-+
-+	/* Enable L2_MODE without ICU/DCU */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG) &
-+		~(L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_SS_MASK);
-+	r |= L2C_CFG_L2M | L2C_CFG_SS_256;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
-+
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
-+
-+	/* Hardware Clear Command */
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_HCC);
-+	while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
-+		;
-+
-+	/* Clear Cache Parity and Tag Errors */
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
-+
-+	/* Enable 64G snoop region starting at 0 */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP0) &
-+		~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
-+	r |= L2C_SNP_SSR_32G | L2C_SNP_ESR;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_SNP0, r);
-+
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP1) &
-+		~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
-+	r |= 0x80000000 | L2C_SNP_SSR_32G | L2C_SNP_ESR;
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_SNP1, r);
-+
-+	asm volatile ("sync" ::: "memory");
-+
-+	/* Enable ICU/DCU ports */
-+	r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG);
-+	r &= ~(L2C_CFG_DCW_MASK | L2C_CFG_PMUX_MASK | L2C_CFG_PMIM
-+	       | L2C_CFG_TPEI | L2C_CFG_CPEI | L2C_CFG_NAM | L2C_CFG_NBRM);
-+	r |= L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_TPC | L2C_CFG_CPC | L2C_CFG_FRAN
-+		| L2C_CFG_CPIM | L2C_CFG_TPIM | L2C_CFG_LIM | L2C_CFG_SMCM;
-+
-+	/* Check for 460EX/GT special handling */
-+	if (of_device_is_compatible(np, "ibm,l2-cache-460ex"))
-+		r |= L2C_CFG_RDBW;
-+
-+	mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
-+
-+	asm volatile ("sync; isync" ::: "memory");
-+	local_irq_restore(flags);
-+
-+	printk(KERN_INFO "%dk L2-cache enabled\n", l2_size >> 10);
-+
-+	of_node_put(np);
-+	return 0;
-+}
-+arch_initcall(ppc4xx_l2c_probe);
-+
-+/*
-+ * At present, this routine just applies a system reset.
-+ */
-+void ppc4xx_reset_system(char *cmd)
-+{
-+	mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_RST_SYSTEM);
-+	while (1)
-+		;	/* Just in case the reset doesn't work */
-+}
---- a/arch/powerpc/sysdev/qe_lib/qe.c
-+++ b/arch/powerpc/sysdev/qe_lib/qe.c
-@@ -55,7 +55,7 @@ struct qe_snum {
- /* We allocate this here because it is used almost exclusively for
-  * the communication processor devices.
-  */
--struct qe_immap *qe_immr = NULL;
-+struct qe_immap __iomem *qe_immr;
- EXPORT_SYMBOL(qe_immr);
- 
- static struct qe_snum snums[QE_NUM_OF_SNUM];	/* Dynamically allocated SNUMs */
-@@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
-  */
- static unsigned int brg_clk = 0;
- 
--unsigned int get_brg_clk(void)
-+unsigned int qe_get_brg_clk(void)
- {
- 	struct device_node *qe;
- 	unsigned int size;
-@@ -180,6 +180,7 @@ unsigned int get_brg_clk(void)
- 
- 	return brg_clk;
- }
-+EXPORT_SYMBOL(qe_get_brg_clk);
- 
- /* Program the BRG to the given sampling rate and multiplier
-  *
-@@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigne
- 	if ((brg < QE_BRG1) || (brg > QE_BRG16))
- 		return -EINVAL;
- 
--	divisor = get_brg_clk() / (rate * multiplier);
-+	divisor = qe_get_brg_clk() / (rate * multiplier);
- 
- 	if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
- 		div16 = QE_BRGC_DIV16;
-@@ -415,12 +416,6 @@ void qe_muram_dump(void)
- }
- EXPORT_SYMBOL(qe_muram_dump);
- 
--void *qe_muram_addr(unsigned long offset)
--{
--	return (void *)&qe_immr->muram[offset];
--}
--EXPORT_SYMBOL(qe_muram_addr);
--
- /* The maximum number of RISCs we support */
- #define MAX_QE_RISC     2
- 
---- a/arch/powerpc/sysdev/qe_lib/qe_io.c
-+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
-@@ -22,6 +22,7 @@
- #include <linux/ioport.h>
- 
- #include <asm/io.h>
-+#include <asm/qe.h>
- #include <asm/prom.h>
- #include <sysdev/fsl_soc.h>
- 
-@@ -41,7 +42,7 @@ struct port_regs {
- #endif
- };
- 
--static struct port_regs *par_io = NULL;
-+static struct port_regs __iomem *par_io;
- static int num_par_io_ports = 0;
- 
- int par_io_init(struct device_node *np)
-@@ -165,7 +166,7 @@ int par_io_of_config(struct device_node 
- 	}
- 
- 	ph = of_get_property(np, "pio-handle", NULL);
--	if (ph == 0) {
-+	if (ph == NULL) {
- 		printk(KERN_ERR "pio-handle not available \n");
- 		return -1;
- 	}
-@@ -200,7 +201,7 @@ static void dump_par_io(void)
- {
- 	unsigned int i;
- 
--	printk(KERN_INFO "%s: par_io=%p\n", __FUNCTION__, par_io);
-+	printk(KERN_INFO "%s: par_io=%p\n", __func__, par_io);
- 	for (i = 0; i < num_par_io_ports; i++) {
- 		printk(KERN_INFO "	cpodr[%u]=%08x\n", i,
- 			in_be32(&par_io[i].cpodr));
---- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
-+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
-@@ -148,57 +148,57 @@ int ucc_fast_init(struct ucc_fast_info *
- 
- 	/* check if the UCC port number is in range. */
- 	if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
--		printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: illegal UCC number\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	/* Check that 'max_rx_buf_length' is properly aligned (4). */
- 	if (uf_info->max_rx_buf_length & (UCC_FAST_MRBLR_ALIGNMENT - 1)) {
- 		printk(KERN_ERR "%s: max_rx_buf_length not aligned\n",
--			__FUNCTION__);
-+			__func__);
- 		return -EINVAL;
- 	}
- 
- 	/* Validate Virtual Fifo register values */
- 	if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) {
--		printk(KERN_ERR "%s: urfs is too small\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfs is too small\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfs is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfs is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfet is not aligned.\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfet is not aligned.\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: urfset is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: urfset is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utfs is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utfs is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utfet is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utfet is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
--		printk(KERN_ERR "%s: utftt is not aligned\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: utftt is not aligned\n", __func__);
- 		return -EINVAL;
- 	}
- 
- 	uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
- 	if (!uccf) {
- 		printk(KERN_ERR "%s: Cannot allocate private data\n",
--			__FUNCTION__);
-+			__func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	/* Set the PHY base address */
- 	uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
- 	if (uccf->uf_regs == NULL) {
--		printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	/* Set UCC to fast type */
- 	ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
- 	if (ret) {
--		printk(KERN_ERR "%s: cannot set UCC type\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot set UCC type\n", __func__);
- 		ucc_fast_free(uccf);
- 		return ret;
- 	}
-@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 	    qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
- 	if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
- 		printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
--			__FUNCTION__);
-+			__func__);
- 		uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
- 		ucc_fast_free(uccf);
- 		return -ENOMEM;
-@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 			   UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
- 	if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
- 		printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
--			__FUNCTION__);
-+			__func__);
- 		uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
- 		ucc_fast_free(uccf);
- 		return -ENOMEM;
-@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 		    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
- 					COMM_DIR_RX)) {
- 			printk(KERN_ERR "%s: illegal value for RX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_fast_free(uccf);
- 			return -EINVAL;
- 		}
-@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info *
- 		    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
- 					COMM_DIR_TX)) {
- 			printk(KERN_ERR "%s: illegal value for TX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_fast_free(uccf);
- 			return -EINVAL;
- 		}
---- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
-+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
-@@ -142,7 +142,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 
- 	/* check if the UCC port number is in range. */
- 	if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
--		printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: illegal UCC number\n", __func__);
- 		return -EINVAL;
- 	}
- 
-@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
- 	if (!uccs) {
- 		printk(KERN_ERR "%s: Cannot allocate private data\n",
--			__FUNCTION__);
-+			__func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	/* Set the PHY base address */
- 	uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
- 	if (uccs->us_regs == NULL) {
--		printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
-+		printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
- 		return -ENOMEM;
- 	}
- 
-@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	uccs->us_pram_offset =
- 		qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
- 	if (IS_ERR_VALUE(uccs->us_pram_offset)) {
--		printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __func__);
- 		ucc_slow_free(uccs);
- 		return -ENOMEM;
- 	}
-@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 	/* Set UCC to slow type */
- 	ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
- 	if (ret) {
--		printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot set UCC type", __func__);
- 		ucc_slow_free(uccs);
- 		return ret;
- 	}
-@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
- 				QE_ALIGNMENT_OF_BD);
- 	if (IS_ERR_VALUE(uccs->rx_base_offset)) {
--		printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __FUNCTION__,
-+		printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __func__,
- 			us_info->rx_bd_ring_len);
- 		uccs->rx_base_offset = 0;
- 		ucc_slow_free(uccs);
-@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
- 			QE_ALIGNMENT_OF_BD);
- 	if (IS_ERR_VALUE(uccs->tx_base_offset)) {
--		printk(KERN_ERR "%s: cannot allocate TX BDs", __FUNCTION__);
-+		printk(KERN_ERR "%s: cannot allocate TX BDs", __func__);
- 		uccs->tx_base_offset = 0;
- 		ucc_slow_free(uccs);
- 		return -ENOMEM;
-@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
- 					COMM_DIR_RX)) {
- 			printk(KERN_ERR "%s: illegal value for RX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_slow_free(uccs);
- 			return -EINVAL;
- 		}
-@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info *
- 		if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
- 					COMM_DIR_TX)) {
- 			printk(KERN_ERR "%s: illegal value for TX clock\n",
--			       __FUNCTION__);
-+			       __func__);
- 			ucc_slow_free(uccs);
- 			return -EINVAL;
- 		}
---- a/arch/powerpc/sysdev/rtc_cmos_setup.c
-+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
-@@ -56,3 +56,5 @@ static int  __init add_rtc(void)
- 	return 0;
- }
- fs_initcall(add_rtc);
-+
-+MODULE_LICENSE("GPL");
---- a/arch/powerpc/sysdev/tsi108_dev.c
-+++ b/arch/powerpc/sysdev/tsi108_dev.c
-@@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(voi
- 
- 		ret = of_address_to_resource(np, 0, &r[0]);
- 		DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
--			__FUNCTION__,r[0].name, r[0].start, r[0].end);
-+			__func__,r[0].name, r[0].start, r[0].end);
- 		if (ret)
- 			goto err;
- 
-@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(voi
- 		r[1].end = irq_of_parse_and_map(np, 0);
- 		r[1].flags = IORESOURCE_IRQ;
- 		DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
--			__FUNCTION__,r[1].name, r[1].start, r[1].end);
-+			__func__,r[1].name, r[1].start, r[1].end);
- 
- 		tsi_eth_dev =
- 		    platform_device_register_simple("tsi-ethernet", i++, &r[0],
---- a/arch/powerpc/sysdev/tsi108_pci.c
-+++ b/arch/powerpc/sysdev/tsi108_pci.c
-@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct devic
- 	/* PCI Config mapping */
- 	tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
- 	tsi108_pci_cfg_phys = cfg_phys;
--	DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __FUNCTION__,
-+	DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __func__,
- 	    tsi108_pci_cfg_base);
- 
- 	/* Fetch host bridge registers address */
-@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq
- static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
- 			  irq_hw_number_t hw)
- {	unsigned int irq;
--	DBG("%s(%d, 0x%lx)\n", __FUNCTION__, virq, hw);
-+	DBG("%s(%d, 0x%lx)\n", __func__, virq, hw);
- 	if ((virq >= 1) && (virq <= 4)){
- 		irq = virq + IRQ_PCI_INTAD_BASE - 1;
- 		get_irq_desc(irq)->status |= IRQ_LEVEL;
---- a/arch/powerpc/xmon/xmon.c
-+++ b/arch/powerpc/xmon/xmon.c
-@@ -45,7 +45,6 @@
- #ifdef CONFIG_PPC64
- #include <asm/hvcall.h>
- #include <asm/paca.h>
--#include <asm/iseries/it_lp_reg_save.h>
- #endif
- 
- #include "nonstdio.h"
-@@ -1244,15 +1243,12 @@ static void get_function_bounds(unsigned
- 
- static int xmon_depth_to_print = 64;
- 
--#ifdef CONFIG_PPC64
--#define LRSAVE_OFFSET		0x10
--#define REG_FRAME_MARKER	0x7265677368657265ul	/* "regshere" */
--#define MARKER_OFFSET		0x60
-+#define LRSAVE_OFFSET		(STACK_FRAME_LR_SAVE * sizeof(unsigned long))
-+#define MARKER_OFFSET		(STACK_FRAME_MARKER * sizeof(unsigned long))
-+
-+#ifdef __powerpc64__
- #define REGS_OFFSET		0x70
- #else
--#define LRSAVE_OFFSET		4
--#define REG_FRAME_MARKER	0x72656773
--#define MARKER_OFFSET		8
- #define REGS_OFFSET		16
- #endif
- 
-@@ -1318,7 +1314,7 @@ static void xmon_show_stack(unsigned lon
- 		/* Look for "regshere" marker to see if this is
- 		   an exception frame. */
- 		if (mread(sp + MARKER_OFFSET, &marker, sizeof(unsigned long))
--		    && marker == REG_FRAME_MARKER) {
-+		    && marker == STACK_FRAME_REGS_MARKER) {
- 			if (mread(sp + REGS_OFFSET, &regs, sizeof(regs))
- 			    != sizeof(regs)) {
- 				printf("Couldn't read registers at %lx\n",
-@@ -1598,7 +1594,6 @@ void super_regs(void)
- 		if (firmware_has_feature(FW_FEATURE_ISERIES)) {
- 			struct paca_struct *ptrPaca;
- 			struct lppaca *ptrLpPaca;
--			struct ItLpRegSave *ptrLpRegSave;
- 
- 			/* Dump out relevant Paca data areas. */
- 			printf("Paca: \n");
-@@ -1611,15 +1606,6 @@ void super_regs(void)
- 			printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
- 			       ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
- 			printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
--
--			printf("  Local Processor Register Save Area (LpRegSave): \n");
--			ptrLpRegSave = ptrPaca->reg_save_ptr;
--			printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx \n",
--			       ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
--			printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx \n",
--			       ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
--			printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",
--			       ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
- 		}
- #endif
- 
---- a/arch/ppc/8xx_io/commproc.c
-+++ b/arch/ppc/8xx_io/commproc.c
-@@ -43,7 +43,7 @@
- ({									\
- 	u32 offset = offsetof(immap_t, member);				\
- 	void *addr = ioremap (IMAP_ADDR + offset,			\
--			      sizeof( ((immap_t*)0)->member));		\
-+			      FIELD_SIZEOF(immap_t, member));		\
- 	addr;								\
- })
- 
---- a/arch/ppc/8xx_io/fec.c
-+++ b/arch/ppc/8xx_io/fec.c
-@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_i
- #ifdef	CONFIG_USE_MDIO
- 			fec_enet_mii(dev);
- #else
--printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__);
-+printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__);
- #endif	/* CONFIG_USE_MDIO */
- 		}
- 
-@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, 
- 		fecp->fec_ecntrl = ecntrl;	/* restore old settings */
- 	}
- #else
--printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
-+printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__);
- #endif	/* CONFIG_USE_MDIO */
- 
- #ifndef CONFIG_RPXCLASSIC
---- a/arch/ppc/kernel/head.S
-+++ b/arch/ppc/kernel/head.S
-@@ -701,23 +701,6 @@ load_up_altivec:
- 	b	fast_exception_return
- 
- /*
-- * AltiVec unavailable trap from kernel - print a message, but let
-- * the task use AltiVec in the kernel until it returns to user mode.
-- */
--KernelAltiVec:
--	lwz	r3,_MSR(r1)
--	oris	r3,r3,MSR_VEC@h
--	stw	r3,_MSR(r1)	/* enable use of AltiVec after return */
--	lis	r3,87f@h
--	ori	r3,r3,87f@l
--	mr	r4,r2		/* current */
--	lwz	r5,_NIP(r1)
--	bl	printk
--	b	ret_from_except
--87:	.string	"AltiVec used in kernel  (task=%p, pc=%x)  \n"
--	.align	4,0
--
--/*
-  * giveup_altivec(tsk)
-  * Disable AltiVec for the task given as the argument,
-  * and save the AltiVec registers in its thread_struct.
---- a/arch/ppc/mm/init.c
-+++ b/arch/ppc/mm/init.c
-@@ -109,7 +109,6 @@ void show_mem(void)
- 
- 	printk("Mem-info:\n");
- 	show_free_areas();
--	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
- 	i = max_mapnr;
- 	while (i-- > 0) {
- 		total++;
---- a/arch/ppc/platforms/radstone_ppc7d.c
-+++ b/arch/ppc/platforms/radstone_ppc7d.c
-@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
- {
- 	int irq;
- 
--	pr_debug("%s\n", __FUNCTION__);
-+	pr_debug("%s\n", __func__);
- 	i8259_init(0, 0);
- 	mv64360_init_irq();
- 
-@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct p
- 	};
- 	const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
- 
--	pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__,
-+	pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__,
- 		 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
- 
- 	return PCI_IRQ_TABLE_LOOKUP;
-@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)
- 	u32 data;
- 	u8 data8;
- 
--	pr_debug("%s: enter\n", __FUNCTION__);
-+	pr_debug("%s: enter\n", __func__);
- 
- 	/* Wait for debugger? */
- 	if (ppc7d_wait_debugger) {
-@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)
-         ppc_md.set_rtc_time = ppc7d_set_rtc_time;
-         ppc_md.get_rtc_time = ppc7d_get_rtc_time;
- 
--	pr_debug("%s: exit\n", __FUNCTION__);
-+	pr_debug("%s: exit\n", __func__);
- }
- 
- /* Called from machine_init(), early, before any of the __init functions
---- a/arch/ppc/syslib/mpc52xx_setup.c
-+++ b/arch/ppc/syslib/mpc52xx_setup.c
-@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_i
- 
- int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
- {
--	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
-+	static DEFINE_SPINLOCK(lock);
- 	struct mpc52xx_cdm __iomem *cdm;
- 	unsigned long flags;
- 	u16 mclken_div;
---- a/arch/sparc64/Kconfig
-+++ b/arch/sparc64/Kconfig
-@@ -16,6 +16,7 @@ config SPARC64
- 	bool
- 	default y
- 	select HAVE_IDE
-+	select HAVE_LMB
- 	help
- 	  SPARC is a family of RISC microprocessors designed and marketed by
- 	  Sun Microsystems, incorporated.  This port covers the newer 64-bit
---- a/drivers/block/viodasd.c
-+++ b/drivers/block/viodasd.c
-@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
- enum {
- 	PARTITION_SHIFT = 3,
- 	MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
--	MAX_DISK_NAME = sizeof(((struct gendisk *)0)->disk_name)
-+	MAX_DISK_NAME = FIELD_SIZEOF(struct gendisk, disk_name)
- };
- 
- static DEFINE_SPINLOCK(viodasd_spinlock);
---- a/drivers/char/hvc_beat.c
-+++ b/drivers/char/hvc_beat.c
-@@ -78,8 +78,8 @@ static int hvc_beat_put_chars(uint32_t v
- 	for (rest = cnt; rest > 0; rest -= nlen) {
- 		nlen = (rest > 16) ? 16 : rest;
- 		memcpy(kb, buf, nlen);
--		beat_put_term_char(vtermno, rest, kb[0], kb[1]);
--		rest -= nlen;
-+		beat_put_term_char(vtermno, nlen, kb[0], kb[1]);
-+		buf += nlen;
- 	}
- 	return cnt;
- }
---- a/drivers/char/xilinx_hwicap/buffer_icap.c
-+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
-@@ -74,7 +74,7 @@
- 
- /**
-  * buffer_icap_get_status - Get the contents of the status register.
-- * @base_address: is the base address of the device
-+ * @drvdata: a pointer to the drvdata.
-  *
-  * The status register contains the ICAP status and the done bit.
-  *
-@@ -88,9 +88,9 @@
-  * D1 - Always 1
-  * D0 - Done bit
-  **/
--static inline u32 buffer_icap_get_status(void __iomem *base_address)
-+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata)
- {
--	return in_be32(base_address + XHI_STATUS_REG_OFFSET);
-+	return in_be32(drvdata->base_address + XHI_STATUS_REG_OFFSET);
- }
- 
- /**
-@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(v
-  **/
- static inline bool buffer_icap_busy(void __iomem *base_address)
- {
--	return (buffer_icap_get_status(base_address) & 1) == XHI_NOT_FINISHED;
--}
--
--/**
-- * buffer_icap_busy - Return true if the icap device is not busy
-- * @base_address: is the base address of the device
-- *
-- * The queries the low order bit of the status register, which
-- * indicates whether the current configuration or readback operation
-- * has completed.
-- **/
--static inline bool buffer_icap_done(void __iomem *base_address)
--{
--	return (buffer_icap_get_status(base_address) & 1) == XHI_FINISHED;
-+	u32 status = in_be32(base_address + XHI_STATUS_REG_OFFSET);
-+	return (status & 1) == XHI_NOT_FINISHED;
- }
- 
- /**
---- a/drivers/char/xilinx_hwicap/buffer_icap.h
-+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
-@@ -44,8 +44,6 @@
- #include <asm/io.h>
- #include "xilinx_hwicap.h"
- 
--void buffer_icap_reset(struct hwicap_drvdata *drvdata);
--
- /* Loads a partial bitstream from system memory. */
- int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
- 			     u32 Size);
-@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct
- int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
- 			     u32 Size);
- 
-+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata);
-+void buffer_icap_reset(struct hwicap_drvdata *drvdata);
-+
- #endif
---- a/drivers/char/xilinx_hwicap/fifo_icap.c
-+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
-@@ -78,13 +78,6 @@
- #define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
- #define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */
- 
--/* Status Register (SR) */
--#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
--#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
--#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
--#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
--#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
--
- 
- #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
- #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */
-@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readb
- }
- 
- /**
-+ * fifo_icap_get_status - Get the contents of the status register.
-+ * @drvdata: a pointer to the drvdata.
-+ *
-+ * The status register contains the ICAP status and the done bit.
-+ *
-+ * D8 - cfgerr
-+ * D7 - dalign
-+ * D6 - rip
-+ * D5 - in_abort_l
-+ * D4 - Always 1
-+ * D3 - Always 1
-+ * D2 - Always 1
-+ * D1 - Always 1
-+ * D0 - Done bit
-+ **/
-+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata)
-+{
-+	u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
-+	dev_dbg(drvdata->dev, "Getting status = %x\n", status);
-+	return status;
-+}
-+
-+/**
-  * fifo_icap_busy - Return true if the ICAP is still processing a transaction.
-  * @drvdata: a pointer to the drvdata.
-  **/
- static inline u32 fifo_icap_busy(struct hwicap_drvdata *drvdata)
- {
- 	u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
--	dev_dbg(drvdata->dev, "Getting status = %x\n", status);
- 	return (status & XHI_SR_DONE_MASK) ? 0 : 1;
- }
- 
---- a/drivers/char/xilinx_hwicap/fifo_icap.h
-+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
-@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(
- 		u32 *FrameBuffer,
- 		u32 NumWords);
- 
-+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata);
- void fifo_icap_reset(struct hwicap_drvdata *drvdata);
- void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
- 
---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
-+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
-@@ -36,7 +36,7 @@
-  *****************************************************************************/
- 
- /*
-- * This is the code behind /dev/xilinx_icap -- it allows a user-space
-+ * This is the code behind /dev/icap* -- it allows a user-space
-  * application to use the Xilinx ICAP subsystem.
-  *
-  * The following operations are possible:
-@@ -67,7 +67,7 @@
-  * user-space application code that uses this device.  The simplest
-  * way to use this interface is simply:
-  *
-- * cp foo.bit /dev/xilinx_icap
-+ * cp foo.bit /dev/icap0
-  *
-  * Note that unless foo.bit is an appropriately constructed partial
-  * bitstream, this has a high likelyhood of overwriting the design
-@@ -105,18 +105,14 @@
- #include "buffer_icap.h"
- #include "fifo_icap.h"
- 
--#define DRIVER_NAME "xilinx_icap"
-+#define DRIVER_NAME "icap"
- 
- #define HWICAP_REGS   (0x10000)
- 
--/* dynamically allocate device number */
--static int xhwicap_major;
--static int xhwicap_minor;
-+#define XHWICAP_MAJOR 259
-+#define XHWICAP_MINOR 0
- #define HWICAP_DEVICES 1
- 
--module_param(xhwicap_major, int, S_IRUGO);
--module_param(xhwicap_minor, int, S_IRUGO);
--
- /* An array, which is set to true when the device is registered. */
- static bool probed_devices[HWICAP_DEVICES];
- static struct mutex icap_sem;
-@@ -250,8 +246,26 @@ static int hwicap_get_configuration_regi
- 	 * Create the data to be written to the ICAP.
- 	 */
- 	buffer[index++] = XHI_DUMMY_PACKET;
-+	buffer[index++] = XHI_NOOP_PACKET;
- 	buffer[index++] = XHI_SYNC_PACKET;
- 	buffer[index++] = XHI_NOOP_PACKET;
-+	buffer[index++] = XHI_NOOP_PACKET;
-+
-+	/*
-+	 * Write the data to the FIFO and initiate the transfer of data present
-+	 * in the FIFO to the ICAP device.
-+	 */
-+	status = drvdata->config->set_configuration(drvdata,
-+						    &buffer[0], index);
-+	if (status)
-+		return status;
-+
-+	/* If the syncword was not found, then we need to start over. */
-+	status = drvdata->config->get_status(drvdata);
-+	if ((status & XHI_SR_DALIGN_MASK) != XHI_SR_DALIGN_MASK)
-+		return -EIO;
-+
-+	index = 0;
- 	buffer[index++] = hwicap_type_1_read(reg) | 1;
- 	buffer[index++] = XHI_NOOP_PACKET;
- 	buffer[index++] = XHI_NOOP_PACKET;
-@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct
- 	probed_devices[id] = 1;
- 	mutex_unlock(&icap_sem);
- 
--	devt = MKDEV(xhwicap_major, xhwicap_minor + id);
-+	devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR + id);
- 
- 	drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
- 	if (!drvdata) {
-@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct
- static struct hwicap_driver_config buffer_icap_config = {
- 	.get_configuration = buffer_icap_get_configuration,
- 	.set_configuration = buffer_icap_set_configuration,
-+	.get_status = buffer_icap_get_status,
- 	.reset = buffer_icap_reset,
- };
- 
- static struct hwicap_driver_config fifo_icap_config = {
- 	.get_configuration = fifo_icap_get_configuration,
- 	.set_configuration = fifo_icap_set_configuration,
-+	.get_status = fifo_icap_get_status,
- 	.reset = fifo_icap_reset,
- };
- 
-@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struc
- 	dev_set_drvdata(dev, NULL);
- 
- 	mutex_lock(&icap_sem);
--	probed_devices[MINOR(dev->devt)-xhwicap_minor] = 0;
-+	probed_devices[MINOR(dev->devt)-XHWICAP_MINOR] = 0;
- 	mutex_unlock(&icap_sem);
- 	return 0;		/* success */
- }
-@@ -830,23 +846,12 @@ static int __init hwicap_module_init(voi
- 	icap_class = class_create(THIS_MODULE, "xilinx_config");
- 	mutex_init(&icap_sem);
- 
--	if (xhwicap_major) {
--		devt = MKDEV(xhwicap_major, xhwicap_minor);
--		retval = register_chrdev_region(
--				devt,
--				HWICAP_DEVICES,
--				DRIVER_NAME);
--		if (retval < 0)
--			return retval;
--	} else {
--		retval = alloc_chrdev_region(&devt,
--				xhwicap_minor,
--				HWICAP_DEVICES,
--				DRIVER_NAME);
--		if (retval < 0)
--			return retval;
--		xhwicap_major = MAJOR(devt);
--	}
-+	devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
-+	retval = register_chrdev_region(devt,
-+					HWICAP_DEVICES,
-+					DRIVER_NAME);
-+	if (retval < 0)
-+		return retval;
- 
- 	retval = platform_driver_register(&hwicap_platform_driver);
- 
-@@ -871,7 +876,7 @@ static int __init hwicap_module_init(voi
- 
- static void __exit hwicap_module_cleanup(void)
- {
--	dev_t devt = MKDEV(xhwicap_major, xhwicap_minor);
-+	dev_t devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
- 
- 	class_destroy(icap_class);
- 
---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
-+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
-@@ -65,10 +65,27 @@ struct hwicap_drvdata {
- };
- 
- struct hwicap_driver_config {
-+	/* Read configuration data given by size into the data buffer.
-+	   Return 0 if successful. */
- 	int (*get_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
- 			u32 size);
-+	/* Write configuration data given by size from the data buffer.
-+	   Return 0 if successful. */
- 	int (*set_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
- 			u32 size);
-+	/* Get the status register, bit pattern given by:
-+	 * D8 - 0 = configuration error
-+	 * D7 - 1 = alignment found
-+	 * D6 - 1 = readback in progress
-+	 * D5 - 0 = abort in progress
-+	 * D4 - Always 1
-+	 * D3 - Always 1
-+	 * D2 - Always 1
-+	 * D1 - Always 1
-+	 * D0 - 1 = operation completed
-+	 */
-+	u32 (*get_status)(struct hwicap_drvdata *drvdata);
-+	/* Reset the hw */
- 	void (*reset)(struct hwicap_drvdata *drvdata);
- };
- 
-@@ -163,6 +180,13 @@ struct config_registers {
- /* Constant to use for CRC check when CRC has been disabled */
- #define XHI_DISABLED_AUTO_CRC       0x0000DEFCUL
- 
-+/* Meanings of the bits returned by get_status */
-+#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
-+#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
-+#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
-+#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
-+#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
-+
- /**
-  * hwicap_type_1_read - Generates a Type 1 read packet header.
-  * @reg: is the address of the register to be read back.
---- a/drivers/mtd/nand/fsl_elbc_nand.c
-+++ b/drivers/mtd/nand/fsl_elbc_nand.c
-@@ -36,207 +36,12 @@
- #include <linux/mtd/partitions.h>
- 
- #include <asm/io.h>
--
-+#include <asm/fsl_lbc.h>
- 
- #define MAX_BANKS 8
- #define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */
- #define FCM_TIMEOUT_MSECS 500 /* Maximum number of mSecs to wait for FCM */
- 
--struct elbc_bank {
--	__be32 br;             /**< Base Register  */
--#define BR_BA           0xFFFF8000
--#define BR_BA_SHIFT             15
--#define BR_PS           0x00001800
--#define BR_PS_SHIFT             11
--#define BR_PS_8         0x00000800  /* Port Size 8 bit */
--#define BR_PS_16        0x00001000  /* Port Size 16 bit */
--#define BR_PS_32        0x00001800  /* Port Size 32 bit */
--#define BR_DECC         0x00000600
--#define BR_DECC_SHIFT            9
--#define BR_DECC_OFF     0x00000000  /* HW ECC checking and generation off */
--#define BR_DECC_CHK     0x00000200  /* HW ECC checking on, generation off */
--#define BR_DECC_CHK_GEN 0x00000400  /* HW ECC checking and generation on */
--#define BR_WP           0x00000100
--#define BR_WP_SHIFT              8
--#define BR_MSEL         0x000000E0
--#define BR_MSEL_SHIFT            5
--#define BR_MS_GPCM      0x00000000  /* GPCM */
--#define BR_MS_FCM       0x00000020  /* FCM */
--#define BR_MS_SDRAM     0x00000060  /* SDRAM */
--#define BR_MS_UPMA      0x00000080  /* UPMA */
--#define BR_MS_UPMB      0x000000A0  /* UPMB */
--#define BR_MS_UPMC      0x000000C0  /* UPMC */
--#define BR_V            0x00000001
--#define BR_V_SHIFT               0
--#define BR_RES          ~(BR_BA|BR_PS|BR_DECC|BR_WP|BR_MSEL|BR_V)
--
--	__be32 or;             /**< Base Register  */
--#define OR0 0x5004
--#define OR1 0x500C
--#define OR2 0x5014
--#define OR3 0x501C
--#define OR4 0x5024
--#define OR5 0x502C
--#define OR6 0x5034
--#define OR7 0x503C
--
--#define OR_FCM_AM               0xFFFF8000
--#define OR_FCM_AM_SHIFT                 15
--#define OR_FCM_BCTLD            0x00001000
--#define OR_FCM_BCTLD_SHIFT              12
--#define OR_FCM_PGS              0x00000400
--#define OR_FCM_PGS_SHIFT                10
--#define OR_FCM_CSCT             0x00000200
--#define OR_FCM_CSCT_SHIFT                9
--#define OR_FCM_CST              0x00000100
--#define OR_FCM_CST_SHIFT                 8
--#define OR_FCM_CHT              0x00000080
--#define OR_FCM_CHT_SHIFT                 7
--#define OR_FCM_SCY              0x00000070
--#define OR_FCM_SCY_SHIFT                 4
--#define OR_FCM_SCY_1            0x00000010
--#define OR_FCM_SCY_2            0x00000020
--#define OR_FCM_SCY_3            0x00000030
--#define OR_FCM_SCY_4            0x00000040
--#define OR_FCM_SCY_5            0x00000050
--#define OR_FCM_SCY_6            0x00000060
--#define OR_FCM_SCY_7            0x00000070
--#define OR_FCM_RST              0x00000008
--#define OR_FCM_RST_SHIFT                 3
--#define OR_FCM_TRLX             0x00000004
--#define OR_FCM_TRLX_SHIFT                2
--#define OR_FCM_EHTR             0x00000002
--#define OR_FCM_EHTR_SHIFT                1
--};
--
--struct elbc_regs {
--	struct elbc_bank bank[8];
--	u8 res0[0x28];
--	__be32 mar;             /**< UPM Address Register */
--	u8 res1[0x4];
--	__be32 mamr;            /**< UPMA Mode Register */
--	__be32 mbmr;            /**< UPMB Mode Register */
--	__be32 mcmr;            /**< UPMC Mode Register */
--	u8 res2[0x8];
--	__be32 mrtpr;           /**< Memory Refresh Timer Prescaler Register */
--	__be32 mdr;             /**< UPM Data Register */
--	u8 res3[0x4];
--	__be32 lsor;            /**< Special Operation Initiation Register */
--	__be32 lsdmr;           /**< SDRAM Mode Register */
--	u8 res4[0x8];
--	__be32 lurt;            /**< UPM Refresh Timer */
--	__be32 lsrt;            /**< SDRAM Refresh Timer */
--	u8 res5[0x8];
--	__be32 ltesr;           /**< Transfer Error Status Register */
--#define LTESR_BM   0x80000000
--#define LTESR_FCT  0x40000000
--#define LTESR_PAR  0x20000000
--#define LTESR_WP   0x04000000
--#define LTESR_ATMW 0x00800000
--#define LTESR_ATMR 0x00400000
--#define LTESR_CS   0x00080000
--#define LTESR_CC   0x00000001
--#define LTESR_NAND_MASK (LTESR_FCT | LTESR_PAR | LTESR_CC)
--	__be32 ltedr;           /**< Transfer Error Disable Register */
--	__be32 lteir;           /**< Transfer Error Interrupt Register */
--	__be32 lteatr;          /**< Transfer Error Attributes Register */
--	__be32 ltear;           /**< Transfer Error Address Register */
--	u8 res6[0xC];
--	__be32 lbcr;            /**< Configuration Register */
--#define LBCR_LDIS  0x80000000
--#define LBCR_LDIS_SHIFT    31
--#define LBCR_BCTLC 0x00C00000
--#define LBCR_BCTLC_SHIFT   22
--#define LBCR_AHD   0x00200000
--#define LBCR_LPBSE 0x00020000
--#define LBCR_LPBSE_SHIFT   17
--#define LBCR_EPAR  0x00010000
--#define LBCR_EPAR_SHIFT    16
--#define LBCR_BMT   0x0000FF00
--#define LBCR_BMT_SHIFT      8
--#define LBCR_INIT  0x00040000
--	__be32 lcrr;            /**< Clock Ratio Register */
--#define LCRR_DBYP    0x80000000
--#define LCRR_DBYP_SHIFT      31
--#define LCRR_BUFCMDC 0x30000000
--#define LCRR_BUFCMDC_SHIFT   28
--#define LCRR_ECL     0x03000000
--#define LCRR_ECL_SHIFT       24
--#define LCRR_EADC    0x00030000
--#define LCRR_EADC_SHIFT      16
--#define LCRR_CLKDIV  0x0000000F
--#define LCRR_CLKDIV_SHIFT     0
--	u8 res7[0x8];
--	__be32 fmr;             /**< Flash Mode Register */
--#define FMR_CWTO     0x0000F000
--#define FMR_CWTO_SHIFT       12
--#define FMR_BOOT     0x00000800
--#define FMR_ECCM     0x00000100
--#define FMR_AL       0x00000030
--#define FMR_AL_SHIFT          4
--#define FMR_OP       0x00000003
--#define FMR_OP_SHIFT          0
--	__be32 fir;             /**< Flash Instruction Register */
--#define FIR_OP0      0xF0000000
--#define FIR_OP0_SHIFT        28
--#define FIR_OP1      0x0F000000
--#define FIR_OP1_SHIFT        24
--#define FIR_OP2      0x00F00000
--#define FIR_OP2_SHIFT        20
--#define FIR_OP3      0x000F0000
--#define FIR_OP3_SHIFT        16
--#define FIR_OP4      0x0000F000
--#define FIR_OP4_SHIFT        12
--#define FIR_OP5      0x00000F00
--#define FIR_OP5_SHIFT         8
--#define FIR_OP6      0x000000F0
--#define FIR_OP6_SHIFT         4
--#define FIR_OP7      0x0000000F
--#define FIR_OP7_SHIFT         0
--#define FIR_OP_NOP   0x0	/* No operation and end of sequence */
--#define FIR_OP_CA    0x1        /* Issue current column address */
--#define FIR_OP_PA    0x2        /* Issue current block+page address */
--#define FIR_OP_UA    0x3        /* Issue user defined address */
--#define FIR_OP_CM0   0x4        /* Issue command from FCR[CMD0] */
--#define FIR_OP_CM1   0x5        /* Issue command from FCR[CMD1] */
--#define FIR_OP_CM2   0x6        /* Issue command from FCR[CMD2] */
--#define FIR_OP_CM3   0x7        /* Issue command from FCR[CMD3] */
--#define FIR_OP_WB    0x8        /* Write FBCR bytes from FCM buffer */
--#define FIR_OP_WS    0x9        /* Write 1 or 2 bytes from MDR[AS] */
--#define FIR_OP_RB    0xA        /* Read FBCR bytes to FCM buffer */
--#define FIR_OP_RS    0xB        /* Read 1 or 2 bytes to MDR[AS] */
--#define FIR_OP_CW0   0xC        /* Wait then issue FCR[CMD0] */
--#define FIR_OP_CW1   0xD        /* Wait then issue FCR[CMD1] */
--#define FIR_OP_RBW   0xE        /* Wait then read FBCR bytes */
--#define FIR_OP_RSW   0xE        /* Wait then read 1 or 2 bytes */
--	__be32 fcr;             /**< Flash Command Register */
--#define FCR_CMD0     0xFF000000
--#define FCR_CMD0_SHIFT       24
--#define FCR_CMD1     0x00FF0000
--#define FCR_CMD1_SHIFT       16
--#define FCR_CMD2     0x0000FF00
--#define FCR_CMD2_SHIFT        8
--#define FCR_CMD3     0x000000FF
--#define FCR_CMD3_SHIFT        0
--	__be32 fbar;            /**< Flash Block Address Register */
--#define FBAR_BLK     0x00FFFFFF
--	__be32 fpar;            /**< Flash Page Address Register */
--#define FPAR_SP_PI   0x00007C00
--#define FPAR_SP_PI_SHIFT     10
--#define FPAR_SP_MS   0x00000200
--#define FPAR_SP_CI   0x000001FF
--#define FPAR_SP_CI_SHIFT      0
--#define FPAR_LP_PI   0x0003F000
--#define FPAR_LP_PI_SHIFT     12
--#define FPAR_LP_MS   0x00000800
--#define FPAR_LP_CI   0x000007FF
--#define FPAR_LP_CI_SHIFT      0
--	__be32 fbcr;            /**< Flash Byte Count Register */
--#define FBCR_BC      0x00000FFF
--	u8 res11[0x8];
--	u8 res8[0xF00];
--};
--
- struct fsl_elbc_ctrl;
- 
- /* mtd information per set */
-@@ -261,7 +66,7 @@ struct fsl_elbc_ctrl {
- 
- 	/* device info */
- 	struct device *dev;
--	struct elbc_regs __iomem *regs;
-+	struct fsl_lbc_regs __iomem *regs;
- 	int irq;
- 	wait_queue_head_t irq_wait;
- 	unsigned int irq_status; /* status read from LTESR by irq handler */
-@@ -322,7 +127,7 @@ static void set_addr(struct mtd_info *mt
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	int buf_num;
- 
- 	ctrl->page = page_addr;
-@@ -363,7 +168,7 @@ static int fsl_elbc_run_command(struct m
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	/* Setup the FMR[OP] to execute without write protection */
- 	out_be32(&lbc->fmr, priv->fmr | 3);
-@@ -406,7 +211,7 @@ static void fsl_elbc_do_read(struct nand
- {
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	if (priv->page_size) {
- 		out_be32(&lbc->fir,
-@@ -439,7 +244,7 @@ static void fsl_elbc_cmdfunc(struct mtd_
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	ctrl->use_mdr = 0;
- 
-@@ -775,7 +580,7 @@ static int fsl_elbc_wait(struct mtd_info
- {
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	if (ctrl->status != LTESR_CC)
- 		return NAND_STATUS_FAIL;
-@@ -807,7 +612,7 @@ static int fsl_elbc_chip_init_tail(struc
- 	struct nand_chip *chip = mtd->priv;
- 	struct fsl_elbc_mtd *priv = chip->priv;
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	unsigned int al;
- 
- 	/* calculate FMR Address Length field */
-@@ -922,7 +727,7 @@ static void fsl_elbc_write_page(struct m
- static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
- {
- 	struct fsl_elbc_ctrl *ctrl = priv->ctrl;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	struct nand_chip *chip = &priv->chip;
- 
- 	dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
-@@ -986,7 +791,7 @@ static int fsl_elbc_chip_remove(struct f
- static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
-                                struct device_node *node)
- {
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	struct fsl_elbc_mtd *priv;
- 	struct resource res;
- #ifdef CONFIG_MTD_PARTITIONS
-@@ -1083,7 +888,7 @@ err:
- 
- static int __devinit fsl_elbc_ctrl_init(struct fsl_elbc_ctrl *ctrl)
- {
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 
- 	/* clear event registers */
- 	setbits32(&lbc->ltesr, LTESR_NAND_MASK);
-@@ -1128,7 +933,7 @@ static int __devexit fsl_elbc_ctrl_remov
- static irqreturn_t fsl_elbc_ctrl_irq(int irqno, void *data)
- {
- 	struct fsl_elbc_ctrl *ctrl = data;
--	struct elbc_regs __iomem *lbc = ctrl->regs;
-+	struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
- 	__be32 status = in_be32(&lbc->ltesr) & LTESR_NAND_MASK;
- 
- 	if (status) {
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -219,7 +219,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o
- obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
- obj-$(CONFIG_DM9000) += dm9000.o
- obj-$(CONFIG_FEC_8XX) += fec_8xx/
--obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
-+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
-+pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
- obj-$(CONFIG_MLX4_CORE) += mlx4/
- obj-$(CONFIG_ENC28J60) += enc28j60.o
- 
---- a/drivers/net/iseries_veth.c
-+++ b/drivers/net/iseries_veth.c
-@@ -308,7 +308,8 @@ static void veth_complete_allocation(voi
- 
- static int veth_allocate_events(HvLpIndex rlp, int number)
- {
--	struct veth_allocation vc = { COMPLETION_INITIALIZER(vc.c), 0 };
-+	struct veth_allocation vc =
-+		{ COMPLETION_INITIALIZER_ONSTACK(vc.c), 0 };
- 
- 	mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
- 			    sizeof(struct veth_lpevent), number,
---- a/drivers/net/pasemi_mac.c
-+++ b/drivers/net/pasemi_mac.c
-@@ -55,15 +55,10 @@
-  * - Multiqueue RX/TX
-  */
- 
--
--/* Must be a power of two */
--#define RX_RING_SIZE 2048
--#define TX_RING_SIZE 4096
--
- #define LRO_MAX_AGGR 64
- 
- #define PE_MIN_MTU	64
--#define PE_MAX_MTU	1500
-+#define PE_MAX_MTU	9000
- #define PE_DEF_MTU	ETH_DATA_LEN
- 
- #define DEFAULT_MSG_ENABLE	  \
-@@ -76,16 +71,6 @@
- 	 NETIF_MSG_RX_ERR	| \
- 	 NETIF_MSG_TX_ERR)
- 
--#define TX_DESC(tx, num)	((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
--#define TX_DESC_INFO(tx, num)	((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
--#define RX_DESC(rx, num)	((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
--#define RX_DESC_INFO(rx, num)	((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
--#define RX_BUFF(rx, num)	((rx)->buffers[(num) & (RX_RING_SIZE-1)])
--
--#define RING_USED(ring)		(((ring)->next_to_fill - (ring)->next_to_clean) \
--				 & ((ring)->size - 1))
--#define RING_AVAIL(ring)	((ring->size) - RING_USED(ring))
--
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
- MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
-@@ -94,6 +79,8 @@ static int debug = -1;	/* -1 == use DEFA
- module_param(debug, int, 0);
- MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
- 
-+extern const struct ethtool_ops pasemi_mac_ethtool_ops;
-+
- static int translation_enabled(void)
- {
- #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
-@@ -322,6 +309,104 @@ static int pasemi_mac_unmap_tx_skb(struc
- 	return (nfrags + 3) & ~1;
- }
- 
-+static struct pasemi_mac_csring *pasemi_mac_setup_csring(struct pasemi_mac *mac)
-+{
-+	struct pasemi_mac_csring *ring;
-+	u32 val;
-+	unsigned int cfg;
-+	int chno;
-+
-+	ring = pasemi_dma_alloc_chan(TXCHAN, sizeof(struct pasemi_mac_csring),
-+				       offsetof(struct pasemi_mac_csring, chan));
-+
-+	if (!ring) {
-+		dev_err(&mac->pdev->dev, "Can't allocate checksum channel\n");
-+		goto out_chan;
-+	}
-+
-+	chno = ring->chan.chno;
-+
-+	ring->size = CS_RING_SIZE;
-+	ring->next_to_fill = 0;
-+
-+	/* Allocate descriptors */
-+	if (pasemi_dma_alloc_ring(&ring->chan, CS_RING_SIZE))
-+		goto out_ring_desc;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_BASEL(chno),
-+		      PAS_DMA_TXCHAN_BASEL_BRBL(ring->chan.ring_dma));
-+	val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->chan.ring_dma >> 32);
-+	val |= PAS_DMA_TXCHAN_BASEU_SIZ(CS_RING_SIZE >> 3);
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_BASEU(chno), val);
-+
-+	ring->events[0] = pasemi_dma_alloc_flag();
-+	ring->events[1] = pasemi_dma_alloc_flag();
-+	if (ring->events[0] < 0 || ring->events[1] < 0)
-+		goto out_flags;
-+
-+	pasemi_dma_clear_flag(ring->events[0]);
-+	pasemi_dma_clear_flag(ring->events[1]);
-+
-+	ring->fun = pasemi_dma_alloc_fun();
-+	if (ring->fun < 0)
-+		goto out_fun;
-+
-+	cfg = PAS_DMA_TXCHAN_CFG_TY_FUNC | PAS_DMA_TXCHAN_CFG_UP |
-+	      PAS_DMA_TXCHAN_CFG_TATTR(ring->fun) |
-+	      PAS_DMA_TXCHAN_CFG_LPSQ | PAS_DMA_TXCHAN_CFG_LPDQ;
-+
-+	if (translation_enabled())
-+		cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_CFG(chno), cfg);
-+
-+	/* enable channel */
-+	pasemi_dma_start_chan(&ring->chan, PAS_DMA_TXCHAN_TCMDSTA_SZ |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DB |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DE |
-+					   PAS_DMA_TXCHAN_TCMDSTA_DA);
-+
-+	return ring;
-+
-+out_fun:
-+out_flags:
-+	if (ring->events[0] >= 0)
-+		pasemi_dma_free_flag(ring->events[0]);
-+	if (ring->events[1] >= 0)
-+		pasemi_dma_free_flag(ring->events[1]);
-+	pasemi_dma_free_ring(&ring->chan);
-+out_ring_desc:
-+	pasemi_dma_free_chan(&ring->chan);
-+out_chan:
-+
-+	return NULL;
-+}
-+
-+static void pasemi_mac_setup_csrings(struct pasemi_mac *mac)
-+{
-+	int i;
-+	mac->cs[0] = pasemi_mac_setup_csring(mac);
-+	if (mac->type == MAC_TYPE_XAUI)
-+		mac->cs[1] = pasemi_mac_setup_csring(mac);
-+	else
-+		mac->cs[1] = 0;
-+
-+	for (i = 0; i < MAX_CS; i++)
-+		if (mac->cs[i])
-+			mac->num_cs++;
-+}
-+
-+static void pasemi_mac_free_csring(struct pasemi_mac_csring *csring)
-+{
-+	pasemi_dma_stop_chan(&csring->chan);
-+	pasemi_dma_free_flag(csring->events[0]);
-+	pasemi_dma_free_flag(csring->events[1]);
-+	pasemi_dma_free_ring(&csring->chan);
-+	pasemi_dma_free_chan(&csring->chan);
-+	pasemi_dma_free_fun(csring->fun);
-+}
-+
- static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
- {
- 	struct pasemi_mac_rxring *ring;
-@@ -445,7 +530,7 @@ pasemi_mac_setup_tx_resources(const stru
- 	cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
- 	      PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
- 	      PAS_DMA_TXCHAN_CFG_UP |
--	      PAS_DMA_TXCHAN_CFG_WT(2);
-+	      PAS_DMA_TXCHAN_CFG_WT(4);
- 
- 	if (translation_enabled())
- 		cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
-@@ -810,13 +895,21 @@ restart:
- 		u64 mactx = TX_DESC(txring, i);
- 		struct sk_buff *skb;
- 
--		skb = TX_DESC_INFO(txring, i+1).skb;
--		nr_frags = TX_DESC_INFO(txring, i).dma;
--
- 		if ((mactx  & XCT_MACTX_E) ||
- 		    (*chan->status & PAS_STATUS_ERROR))
- 			pasemi_mac_tx_error(mac, mactx);
- 
-+		/* Skip over control descriptors */
-+		if (!(mactx & XCT_MACTX_LLEN_M)) {
-+			TX_DESC(txring, i) = 0;
-+			TX_DESC(txring, i+1) = 0;
-+			buf_count = 2;
-+			continue;
-+		}
-+
-+		skb = TX_DESC_INFO(txring, i+1).skb;
-+		nr_frags = TX_DESC_INFO(txring, i).dma;
-+
- 		if (unlikely(mactx & XCT_MACTX_O))
- 			/* Not yet transmitted */
- 			break;
-@@ -1041,13 +1134,7 @@ static int pasemi_mac_open(struct net_de
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int flags;
--	int ret;
--
--	/* enable rx section */
--	write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
--
--	/* enable tx section */
--	write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
-+	int i, ret;
- 
- 	flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
- 		PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
-@@ -1064,6 +1151,19 @@ static int pasemi_mac_open(struct net_de
- 	if (!mac->tx)
- 		goto out_tx_ring;
- 
-+	/* We might already have allocated rings in case mtu was changed
-+	 * before interface was brought up.
-+	 */
-+	if (dev->mtu > 1500 && !mac->num_cs) {
-+		pasemi_mac_setup_csrings(mac);
-+		if (!mac->num_cs)
-+			goto out_tx_ring;
-+	}
-+
-+	/* Zero out rmon counters */
-+	for (i = 0; i < 32; i++)
-+		write_mac_reg(mac, PAS_MAC_RMON(i), 0);
-+
- 	/* 0x3ff with 33MHz clock is about 31us */
- 	write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
- 		      PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));
-@@ -1247,7 +1347,7 @@ static int pasemi_mac_close(struct net_d
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int sta;
--	int rxch, txch;
-+	int rxch, txch, i;
- 
- 	rxch = rx_ring(mac)->chan.chno;
- 	txch = tx_ring(mac)->chan.chno;
-@@ -1292,6 +1392,13 @@ static int pasemi_mac_close(struct net_d
- 	free_irq(mac->tx->chan.irq, mac->tx);
- 	free_irq(mac->rx->chan.irq, mac->rx);
- 
-+	for (i = 0; i < mac->num_cs; i++) {
-+		pasemi_mac_free_csring(mac->cs[i]);
-+		mac->cs[i] = NULL;
-+	}
-+
-+	mac->num_cs = 0;
-+
- 	/* Free resources */
- 	pasemi_mac_free_rx_resources(mac);
- 	pasemi_mac_free_tx_resources(mac);
-@@ -1299,35 +1406,113 @@ static int pasemi_mac_close(struct net_d
- 	return 0;
- }
- 
-+static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
-+				    const dma_addr_t *map,
-+				    const unsigned int *map_size,
-+				    struct pasemi_mac_txring *txring,
-+				    struct pasemi_mac_csring *csring)
-+{
-+	u64 fund;
-+	dma_addr_t cs_dest;
-+	const int nh_off = skb_network_offset(skb);
-+	const int nh_len = skb_network_header_len(skb);
-+	const int nfrags = skb_shinfo(skb)->nr_frags;
-+	int cs_size, i, fill, hdr, cpyhdr, evt;
-+	dma_addr_t csdma;
-+
-+	fund = XCT_FUN_ST | XCT_FUN_RR_8BRES |
-+	       XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
-+	       XCT_FUN_CRM_SIG | XCT_FUN_LLEN(skb->len - nh_off) |
-+	       XCT_FUN_SHL(nh_len >> 2) | XCT_FUN_SE;
-+
-+	switch (ip_hdr(skb)->protocol) {
-+	case IPPROTO_TCP:
-+		fund |= XCT_FUN_SIG_TCP4;
-+		/* TCP checksum is 16 bytes into the header */
-+		cs_dest = map[0] + skb_transport_offset(skb) + 16;
-+		break;
-+	case IPPROTO_UDP:
-+		fund |= XCT_FUN_SIG_UDP4;
-+		/* UDP checksum is 6 bytes into the header */
-+		cs_dest = map[0] + skb_transport_offset(skb) + 6;
-+		break;
-+	default:
-+		BUG();
-+	}
-+
-+	/* Do the checksum offloaded */
-+	fill = csring->next_to_fill;
-+	hdr = fill;
-+
-+	CS_DESC(csring, fill++) = fund;
-+	/* Room for 8BRES. Checksum result is really 2 bytes into it */
-+	csdma = csring->chan.ring_dma + (fill & (CS_RING_SIZE-1)) * 8 + 2;
-+	CS_DESC(csring, fill++) = 0;
-+
-+	CS_DESC(csring, fill) = XCT_PTR_LEN(map_size[0]-nh_off) | XCT_PTR_ADDR(map[0]+nh_off);
-+	for (i = 1; i <= nfrags; i++)
-+		CS_DESC(csring, fill+i) = XCT_PTR_LEN(map_size[i]) | XCT_PTR_ADDR(map[i]);
-+
-+	fill += i;
-+	if (fill & 1)
-+		fill++;
-+
-+	/* Copy the result into the TCP packet */
-+	cpyhdr = fill;
-+	CS_DESC(csring, fill++) = XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
-+				  XCT_FUN_LLEN(2) | XCT_FUN_SE;
-+	CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(cs_dest) | XCT_PTR_T;
-+	CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(csdma);
-+	fill++;
-+
-+	evt = !csring->last_event;
-+	csring->last_event = evt;
-+
-+	/* Event handshaking with MAC TX */
-+	CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_SET | CTRL_CMD_REG(csring->events[evt]);
-+	CS_DESC(csring, fill++) = 0;
-+	CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_WCLR | CTRL_CMD_REG(csring->events[!evt]);
-+	CS_DESC(csring, fill++) = 0;
-+	csring->next_to_fill = fill & (CS_RING_SIZE-1);
-+
-+	cs_size = fill - hdr;
-+	write_dma_reg(PAS_DMA_TXCHAN_INCR(csring->chan.chno), (cs_size) >> 1);
-+
-+	/* TX-side event handshaking */
-+	fill = txring->next_to_fill;
-+	TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_WSET | CTRL_CMD_REG(csring->events[evt]);
-+	TX_DESC(txring, fill++) = 0;
-+	TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
-+				  CTRL_CMD_ETYPE_CLR | CTRL_CMD_REG(csring->events[!evt]);
-+	TX_DESC(txring, fill++) = 0;
-+	txring->next_to_fill = fill;
-+
-+	write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
-+
-+	return;
-+}
-+
- static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
- {
--	struct pasemi_mac *mac = netdev_priv(dev);
--	struct pasemi_mac_txring *txring;
--	u64 dflags, mactx;
-+	struct pasemi_mac * const mac = netdev_priv(dev);
-+	struct pasemi_mac_txring * const txring = tx_ring(mac);
-+	struct pasemi_mac_csring *csring;
-+	u64 dflags = 0;
-+	u64 mactx;
- 	dma_addr_t map[MAX_SKB_FRAGS+1];
- 	unsigned int map_size[MAX_SKB_FRAGS+1];
- 	unsigned long flags;
- 	int i, nfrags;
- 	int fill;
-+	const int nh_off = skb_network_offset(skb);
-+	const int nh_len = skb_network_header_len(skb);
- 
--	dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
--
--	if (skb->ip_summed == CHECKSUM_PARTIAL) {
--		const unsigned char *nh = skb_network_header(skb);
-+	prefetch(&txring->ring_info);
- 
--		switch (ip_hdr(skb)->protocol) {
--		case IPPROTO_TCP:
--			dflags |= XCT_MACTX_CSUM_TCP;
--			dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
--			dflags |= XCT_MACTX_IPO(nh - skb->data);
--			break;
--		case IPPROTO_UDP:
--			dflags |= XCT_MACTX_CSUM_UDP;
--			dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
--			dflags |= XCT_MACTX_IPO(nh - skb->data);
--			break;
--		}
--	}
-+	dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
- 
- 	nfrags = skb_shinfo(skb)->nr_frags;
- 
-@@ -1350,24 +1535,46 @@ static int pasemi_mac_start_tx(struct sk
- 		}
- 	}
- 
--	mactx = dflags | XCT_MACTX_LLEN(skb->len);
-+	if (skb->ip_summed == CHECKSUM_PARTIAL && skb->len <= 1540) {
-+		switch (ip_hdr(skb)->protocol) {
-+		case IPPROTO_TCP:
-+			dflags |= XCT_MACTX_CSUM_TCP;
-+			dflags |= XCT_MACTX_IPH(nh_len >> 2);
-+			dflags |= XCT_MACTX_IPO(nh_off);
-+			break;
-+		case IPPROTO_UDP:
-+			dflags |= XCT_MACTX_CSUM_UDP;
-+			dflags |= XCT_MACTX_IPH(nh_len >> 2);
-+			dflags |= XCT_MACTX_IPO(nh_off);
-+			break;
-+		default:
-+			WARN_ON(1);
-+		}
-+	}
- 
--	txring = tx_ring(mac);
-+	mactx = dflags | XCT_MACTX_LLEN(skb->len);
- 
- 	spin_lock_irqsave(&txring->lock, flags);
- 
--	fill = txring->next_to_fill;
--
- 	/* Avoid stepping on the same cache line that the DMA controller
- 	 * is currently about to send, so leave at least 8 words available.
- 	 * Total free space needed is mactx + fragments + 8
- 	 */
--	if (RING_AVAIL(txring) < nfrags + 10) {
-+	if (RING_AVAIL(txring) < nfrags + 14) {
- 		/* no room -- stop the queue and wait for tx intr */
- 		netif_stop_queue(dev);
- 		goto out_err;
- 	}
- 
-+	/* Queue up checksum + event descriptors, if needed */
-+	if (mac->num_cs && skb->ip_summed == CHECKSUM_PARTIAL && skb->len > 1540) {
-+		csring = mac->cs[mac->last_cs];
-+		mac->last_cs = (mac->last_cs + 1) % mac->num_cs;
-+
-+		pasemi_mac_queue_csdesc(skb, map, map_size, txring, csring);
-+	}
-+
-+	fill = txring->next_to_fill;
- 	TX_DESC(txring, fill) = mactx;
- 	TX_DESC_INFO(txring, fill).dma = nfrags;
- 	fill++;
-@@ -1441,12 +1648,33 @@ static int pasemi_mac_poll(struct napi_s
- 	return pkts;
- }
- 
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+/*
-+ * Polling 'interrupt' - used by things like netconsole to send skbs
-+ * without having to re-enable interrupts. It's not called while
-+ * the interrupt routine is executing.
-+ */
-+static void pasemi_mac_netpoll(struct net_device *dev)
-+{
-+	const struct pasemi_mac *mac = netdev_priv(dev);
-+
-+	disable_irq(mac->tx->chan.irq);
-+	pasemi_mac_tx_intr(mac->tx->chan.irq, mac->tx);
-+	enable_irq(mac->tx->chan.irq);
-+
-+	disable_irq(mac->rx->chan.irq);
-+	pasemi_mac_rx_intr(mac->rx->chan.irq, mac->rx);
-+	enable_irq(mac->rx->chan.irq);
-+}
-+#endif
-+
- static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
- {
- 	struct pasemi_mac *mac = netdev_priv(dev);
- 	unsigned int reg;
--	unsigned int rcmdsta;
-+	unsigned int rcmdsta = 0;
- 	int running;
-+	int ret = 0;
- 
- 	if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
- 		return -EINVAL;
-@@ -1468,6 +1696,16 @@ static int pasemi_mac_change_mtu(struct 
- 		pasemi_mac_pause_rxint(mac);
- 		pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
- 		pasemi_mac_free_rx_buffers(mac);
-+
-+	}
-+
-+	/* Setup checksum channels if large MTU and none already allocated */
-+	if (new_mtu > 1500 && !mac->num_cs) {
-+		pasemi_mac_setup_csrings(mac);
-+		if (!mac->num_cs) {
-+			ret = -ENOMEM;
-+			goto out;
-+		}
- 	}
- 
- 	/* Change maxf, i.e. what size frames are accepted.
-@@ -1482,6 +1720,7 @@ static int pasemi_mac_change_mtu(struct 
- 	/* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
- 	mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
- 
-+out:
- 	if (running) {
- 		write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
- 			      rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);
-@@ -1494,7 +1733,7 @@ static int pasemi_mac_change_mtu(struct 
- 		pasemi_mac_intf_enable(mac);
- 	}
- 
--	return 0;
-+	return ret;
- }
- 
- static int __devinit
-@@ -1528,7 +1767,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c
- 	netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
- 
- 	dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
--			NETIF_F_HIGHDMA;
-+			NETIF_F_HIGHDMA | NETIF_F_GSO;
- 
- 	mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
- 	mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;
-@@ -1588,8 +1827,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c
- 	dev->mtu = PE_DEF_MTU;
- 	/* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
- 	mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+	dev->poll_controller = pasemi_mac_netpoll;
-+#endif
- 
- 	dev->change_mtu = pasemi_mac_change_mtu;
-+	dev->ethtool_ops = &pasemi_mac_ethtool_ops;
- 
- 	if (err)
- 		goto out;
---- a/drivers/net/pasemi_mac.h
-+++ b/drivers/net/pasemi_mac.h
-@@ -26,7 +26,14 @@
- #include <linux/spinlock.h>
- #include <linux/phy.h>
- 
-+/* Must be a power of two */
-+#define RX_RING_SIZE 2048
-+#define TX_RING_SIZE 4096
-+#define CS_RING_SIZE (TX_RING_SIZE*2)
-+
-+
- #define MAX_LRO_DESCRIPTORS 8
-+#define MAX_CS	2
- 
- struct pasemi_mac_txring {
- 	struct pasemi_dmachan chan; /* Must be first */
-@@ -51,6 +58,15 @@ struct pasemi_mac_rxring {
- 	struct pasemi_mac *mac;	/* Needed in intr handler */
- };
- 
-+struct pasemi_mac_csring {
-+	struct pasemi_dmachan chan;
-+	unsigned int	size;
-+	unsigned int	next_to_fill;
-+	int		events[2];
-+	int		last_event;
-+	int		fun;
-+};
-+
- struct pasemi_mac {
- 	struct net_device *netdev;
- 	struct pci_dev *pdev;
-@@ -60,10 +76,12 @@ struct pasemi_mac {
- 	struct napi_struct napi;
- 
- 	int		bufsz; /* RX ring buffer size */
-+	int		last_cs;
-+	int		num_cs;
-+	u32		dma_if;
- 	u8		type;
- #define MAC_TYPE_GMAC	1
- #define MAC_TYPE_XAUI	2
--	u32	dma_if;
- 
- 	u8		mac_addr[6];
- 
-@@ -74,6 +92,7 @@ struct pasemi_mac {
- 
- 	struct pasemi_mac_txring *tx;
- 	struct pasemi_mac_rxring *rx;
-+	struct pasemi_mac_csring *cs[MAX_CS];
- 	char		tx_irq_name[10];		/* "eth%d tx" */
- 	char		rx_irq_name[10];		/* "eth%d rx" */
- 	int	link;
-@@ -90,6 +109,16 @@ struct pasemi_mac_buffer {
- 	dma_addr_t	dma;
- };
- 
-+#define TX_DESC(tx, num)	((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
-+#define TX_DESC_INFO(tx, num)	((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
-+#define RX_DESC(rx, num)	((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
-+#define RX_DESC_INFO(rx, num)	((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
-+#define RX_BUFF(rx, num)	((rx)->buffers[(num) & (RX_RING_SIZE-1)])
-+#define CS_DESC(cs, num)	((cs)->chan.ring_virt[(num) & (CS_RING_SIZE-1)])
-+
-+#define RING_USED(ring)	(((ring)->next_to_fill - (ring)->next_to_clean) \
-+				& ((ring)->size - 1))
-+#define RING_AVAIL(ring)	((ring->size) - RING_USED(ring))
- 
- /* PCI register offsets and formats */
- 
-@@ -101,6 +130,7 @@ enum {
- 	PAS_MAC_CFG_ADR0 = 0x8c,
- 	PAS_MAC_CFG_ADR1 = 0x90,
- 	PAS_MAC_CFG_TXP = 0x98,
-+	PAS_MAC_CFG_RMON = 0x100,
- 	PAS_MAC_IPC_CHNL = 0x208,
- };
- 
-@@ -172,6 +202,8 @@ enum {
- #define PAS_MAC_CFG_TXP_TIFG(x)		(((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
- 					 PAS_MAC_CFG_TXP_TIFG_M)
- 
-+#define PAS_MAC_RMON(r)			(0x100+(r)*4)
-+
- #define PAS_MAC_IPC_CHNL_DCHNO_M	0x003f0000
- #define PAS_MAC_IPC_CHNL_DCHNO_S	16
- #define PAS_MAC_IPC_CHNL_DCHNO(x)	(((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \
-@@ -181,4 +213,5 @@ enum {
- #define PAS_MAC_IPC_CHNL_BCH(x)		(((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
- 					 PAS_MAC_IPC_CHNL_BCH_M)
- 
-+
- #endif /* PASEMI_MAC_H */
---- /dev/null
-+++ b/drivers/net/pasemi_mac_ethtool.c
-@@ -0,0 +1,159 @@
-+/*
-+ * Copyright (C) 2006-2008 PA Semi, Inc
-+ *
-+ * Ethtool hooks for the PA Semi PWRficient onchip 1G/10G Ethernet MACs
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+
-+
-+#include <linux/netdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/pci.h>
-+#include <linux/inet_lro.h>
-+
-+#include <asm/pasemi_dma.h>
-+#include "pasemi_mac.h"
-+
-+static struct {
-+	const char str[ETH_GSTRING_LEN];
-+} ethtool_stats_keys[] = {
-+	{ "rx-drops" },
-+	{ "rx-bytes" },
-+	{ "rx-packets" },
-+	{ "rx-broadcast-packets" },
-+	{ "rx-multicast-packets" },
-+	{ "rx-crc-errors" },
-+	{ "rx-undersize-errors" },
-+	{ "rx-oversize-errors" },
-+	{ "rx-short-fragment-errors" },
-+	{ "rx-jabber-errors" },
-+	{ "rx-64-byte-packets" },
-+	{ "rx-65-127-byte-packets" },
-+	{ "rx-128-255-byte-packets" },
-+	{ "rx-256-511-byte-packets" },
-+	{ "rx-512-1023-byte-packets" },
-+	{ "rx-1024-1518-byte-packets" },
-+	{ "rx-pause-frames" },
-+	{ "tx-bytes" },
-+	{ "tx-packets" },
-+	{ "tx-broadcast-packets" },
-+	{ "tx-multicast-packets" },
-+	{ "tx-collisions" },
-+	{ "tx-late-collisions" },
-+	{ "tx-excessive-collisions" },
-+	{ "tx-crc-errors" },
-+	{ "tx-undersize-errors" },
-+	{ "tx-oversize-errors" },
-+	{ "tx-64-byte-packets" },
-+	{ "tx-65-127-byte-packets" },
-+	{ "tx-128-255-byte-packets" },
-+	{ "tx-256-511-byte-packets" },
-+	{ "tx-512-1023-byte-packets" },
-+	{ "tx-1024-1518-byte-packets" },
-+};
-+
-+static int
-+pasemi_mac_ethtool_get_settings(struct net_device *netdev,
-+			       struct ethtool_cmd *cmd)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	struct phy_device *phydev = mac->phydev;
-+
-+	return phy_ethtool_gset(phydev, cmd);
-+}
-+
-+static void
-+pasemi_mac_ethtool_get_drvinfo(struct net_device *netdev,
-+			       struct ethtool_drvinfo *drvinfo)
-+{
-+	struct pasemi_mac *mac;
-+	mac = netdev_priv(netdev);
-+
-+	/* clear and fill out info */
-+	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
-+	strncpy(drvinfo->driver, "pasemi_mac", 12);
-+	strcpy(drvinfo->version, "N/A");
-+	strcpy(drvinfo->fw_version, "N/A");
-+	strncpy(drvinfo->bus_info, pci_name(mac->pdev), 32);
-+}
-+
-+static u32
-+pasemi_mac_ethtool_get_msglevel(struct net_device *netdev)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	return mac->msg_enable;
-+}
-+
-+static void
-+pasemi_mac_ethtool_set_msglevel(struct net_device *netdev,
-+				u32 level)
-+{
-+	struct pasemi_mac *mac = netdev_priv(netdev);
-+	mac->msg_enable = level;
-+}
-+
-+
-+static void
-+pasemi_mac_ethtool_get_ringparam(struct net_device *netdev,
-+				 struct ethtool_ringparam *ering)
-+{
-+	struct pasemi_mac *mac = netdev->priv;
-+
-+	ering->tx_max_pending = TX_RING_SIZE/2;
-+	ering->tx_pending = RING_USED(mac->tx)/2;
-+	ering->rx_max_pending = RX_RING_SIZE/4;
-+	ering->rx_pending = RING_USED(mac->rx)/4;
-+}
-+
-+static int pasemi_mac_get_sset_count(struct net_device *netdev, int sset)
-+{
-+	switch (sset) {
-+	case ETH_SS_STATS:
-+		return ARRAY_SIZE(ethtool_stats_keys);
-+	default:
-+		return -EOPNOTSUPP;
-+	}
-+}
-+
-+static void pasemi_mac_get_ethtool_stats(struct net_device *netdev,
-+		struct ethtool_stats *stats, u64 *data)
-+{
-+	struct pasemi_mac *mac = netdev->priv;
-+	int i;
-+
-+	data[0] = pasemi_read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if))
-+			>> PAS_DMA_RXINT_RCMDSTA_DROPS_S;
-+	for (i = 0; i < 32; i++)
-+		data[1+i] = pasemi_read_mac_reg(mac->dma_if, PAS_MAC_RMON(i));
-+}
-+
-+static void pasemi_mac_get_strings(struct net_device *netdev, u32 stringset,
-+				   u8 *data)
-+{
-+	memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
-+}
-+
-+const struct ethtool_ops pasemi_mac_ethtool_ops = {
-+	.get_settings		= pasemi_mac_ethtool_get_settings,
-+	.get_drvinfo		= pasemi_mac_ethtool_get_drvinfo,
-+	.get_msglevel		= pasemi_mac_ethtool_get_msglevel,
-+	.set_msglevel		= pasemi_mac_ethtool_set_msglevel,
-+	.get_link		= ethtool_op_get_link,
-+	.get_ringparam          = pasemi_mac_ethtool_get_ringparam,
-+	.get_strings		= pasemi_mac_get_strings,
-+	.get_sset_count		= pasemi_mac_get_sset_count,
-+	.get_ethtool_stats	= pasemi_mac_get_ethtool_stats,
-+};
-+
---- a/drivers/net/ps3_gelic_net.c
-+++ b/drivers/net/ps3_gelic_net.c
-@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_dev
- 	return 0;
- }
- 
-+static void gelic_net_get_wol(struct net_device *netdev,
-+			      struct ethtool_wolinfo *wol)
-+{
-+	if (0 <= ps3_compare_firmware_version(2, 2, 0))
-+		wol->supported = WAKE_MAGIC;
-+	else
-+		wol->supported = 0;
-+
-+	wol->wolopts = ps3_sys_manager_get_wol() ? wol->supported : 0;
-+	memset(&wol->sopass, 0, sizeof(wol->sopass));
-+}
-+static int gelic_net_set_wol(struct net_device *netdev,
-+			     struct ethtool_wolinfo *wol)
-+{
-+	int status;
-+	struct gelic_card *card;
-+	u64 v1, v2;
-+
-+	if (ps3_compare_firmware_version(2, 2, 0) < 0 ||
-+	    !capable(CAP_NET_ADMIN))
-+		return -EPERM;
-+
-+	if (wol->wolopts & ~WAKE_MAGIC)
-+		return -EINVAL;
-+
-+	card = netdev_card(netdev);
-+	if (wol->wolopts & WAKE_MAGIC) {
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_MAGIC_PACKET,
-+					 0, GELIC_LV1_WOL_MP_ENABLE,
-+					 &v1, &v2);
-+		if (status) {
-+			pr_info("%s: enabling WOL failed %d\n", __func__,
-+				status);
-+			status = -EIO;
-+			goto done;
-+		}
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_ADD_MATCH_ADDR,
-+					 0, GELIC_LV1_WOL_MATCH_ALL,
-+					 &v1, &v2);
-+		if (!status)
-+			ps3_sys_manager_set_wol(1);
-+		else {
-+			pr_info("%s: enabling WOL filter failed %d\n",
-+				__func__, status);
-+			status = -EIO;
-+		}
-+	} else {
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_MAGIC_PACKET,
-+					 0, GELIC_LV1_WOL_MP_DISABLE,
-+					 &v1, &v2);
-+		if (status) {
-+			pr_info("%s: disabling WOL failed %d\n", __func__,
-+				status);
-+			status = -EIO;
-+			goto done;
-+		}
-+		status = lv1_net_control(bus_id(card), dev_id(card),
-+					 GELIC_LV1_SET_WOL,
-+					 GELIC_LV1_WOL_DELETE_MATCH_ADDR,
-+					 0, GELIC_LV1_WOL_MATCH_ALL,
-+					 &v1, &v2);
-+		if (!status)
-+			ps3_sys_manager_set_wol(0);
-+		else {
-+			pr_info("%s: removing WOL filter failed %d\n",
-+				__func__, status);
-+			status = -EIO;
-+		}
-+	}
-+done:
-+	return status;
-+}
-+
- static struct ethtool_ops gelic_ether_ethtool_ops = {
- 	.get_drvinfo	= gelic_net_get_drvinfo,
- 	.get_settings	= gelic_ether_get_settings,
-@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_et
- 	.set_tx_csum	= ethtool_op_set_tx_csum,
- 	.get_rx_csum	= gelic_net_get_rx_csum,
- 	.set_rx_csum	= gelic_net_set_rx_csum,
-+	.get_wol	= gelic_net_get_wol,
-+	.set_wol	= gelic_net_set_wol,
- };
- 
- /**
---- a/drivers/net/ps3_gelic_net.h
-+++ b/drivers/net/ps3_gelic_net.h
-@@ -182,12 +182,32 @@ enum gelic_lv1_net_control_code {
- 	GELIC_LV1_GET_ETH_PORT_STATUS	= 2,
- 	GELIC_LV1_SET_NEGOTIATION_MODE	= 3,
- 	GELIC_LV1_GET_VLAN_ID		= 4,
-+	GELIC_LV1_SET_WOL		= 5,
- 	GELIC_LV1_GET_CHANNEL           = 6,
- 	GELIC_LV1_POST_WLAN_CMD		= 9,
- 	GELIC_LV1_GET_WLAN_CMD_RESULT	= 10,
- 	GELIC_LV1_GET_WLAN_EVENT	= 11
- };
- 
-+/* for GELIC_LV1_SET_WOL */
-+enum gelic_lv1_wol_command {
-+	GELIC_LV1_WOL_MAGIC_PACKET	= 1,
-+	GELIC_LV1_WOL_ADD_MATCH_ADDR	= 6,
-+	GELIC_LV1_WOL_DELETE_MATCH_ADDR	= 7,
-+};
-+
-+/* for GELIC_LV1_WOL_MAGIC_PACKET */
-+enum gelic_lv1_wol_mp_arg {
-+	GELIC_LV1_WOL_MP_DISABLE	= 0,
-+	GELIC_LV1_WOL_MP_ENABLE		= 1,
-+};
-+
-+/* for GELIC_LV1_WOL_{ADD,DELETE}_MATCH_ADDR */
-+enum gelic_lv1_wol_match_arg {
-+	GELIC_LV1_WOL_MATCH_INDIVIDUAL	= 0,
-+	GELIC_LV1_WOL_MATCH_ALL		= 1,
-+};
-+
- /* status returened from GET_ETH_PORT_STATUS */
- enum gelic_lv1_ether_port_status {
- 	GELIC_LV1_ETHER_LINK_UP		= 0x0000000000000001L,
---- a/drivers/net/ucc_geth.c
-+++ b/drivers/net/ucc_geth.c
-@@ -3853,7 +3853,13 @@ static int ucc_geth_probe(struct of_devi
- 
- 	ugeth_vdbg("%s: IN", __FUNCTION__);
- 
--	prop = of_get_property(np, "device-id", NULL);
-+	prop = of_get_property(np, "cell-index", NULL);
-+	if (!prop) {
-+		prop = of_get_property(np, "device-id", NULL);
-+		if (!prop)
-+			return -ENODEV;
-+	}
-+
- 	ucc_num = *prop - 1;
- 	if ((ucc_num < 0) || (ucc_num > 7))
- 		return -ENODEV;
---- a/drivers/net/ucc_geth_mii.c
-+++ b/drivers/net/ucc_geth_mii.c
-@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_devi
- 		if ((res.start >= tempres.start) &&
- 		    (res.end <= tempres.end)) {
- 			/* set this UCC to be the MII master */
--			const u32 *id = of_get_property(tempnp, "device-id", NULL);
--			if (id == NULL)
--				goto bus_register_fail;
-+			const u32 *id;
-+
-+			id = of_get_property(tempnp, "cell-index", NULL);
-+			if (!id) {
-+				id = of_get_property(tempnp, "device-id", NULL);
-+				if (!id)
-+					goto bus_register_fail;
-+			}
- 
- 			ucc_set_qe_mux_mii_mng(*id - 1);
- 
---- a/drivers/of/Kconfig
-+++ b/drivers/of/Kconfig
-@@ -1,3 +1,15 @@
- config OF_DEVICE
- 	def_bool y
- 	depends on OF && (SPARC || PPC_OF)
-+
-+config OF_GPIO
-+	def_bool y
-+	depends on OF && PPC_OF && HAVE_GPIO_LIB
-+	help
-+	  OpenFirmware GPIO accessors
-+
-+config OF_I2C
-+	def_bool y
-+	depends on OF && I2C
-+	help
-+	  OpenFirmware I2C accessors
---- a/drivers/of/Makefile
-+++ b/drivers/of/Makefile
-@@ -1,2 +1,4 @@
- obj-y = base.o
- obj-$(CONFIG_OF_DEVICE) += device.o platform.o
-+obj-$(CONFIG_OF_GPIO)   += gpio.o
-+obj-$(CONFIG_OF_I2C)	+= i2c.o
---- a/drivers/of/base.c
-+++ b/drivers/of/base.c
-@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct
- EXPORT_SYMBOL(of_device_is_compatible);
- 
- /**
-+ *  of_device_is_available - check if a device is available for use
-+ *
-+ *  @device: Node to check for availability
-+ *
-+ *  Returns 1 if the status property is absent or set to "okay" or "ok",
-+ *  0 otherwise
-+ */
-+int of_device_is_available(const struct device_node *device)
-+{
-+	const char *status;
-+	int statlen;
-+
-+	status = of_get_property(device, "status", &statlen);
-+	if (status == NULL)
-+		return 1;
-+
-+	if (statlen > 0) {
-+		if (!strcmp(status, "okay") || !strcmp(status, "ok"))
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(of_device_is_available);
-+
-+/**
-  *	of_get_parent - Get a node's parent if any
-  *	@node:	Node to get parent
-  *
---- /dev/null
-+++ b/drivers/of/gpio.c
-@@ -0,0 +1,242 @@
-+/*
-+ * OF helpers for the GPIO API
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <asm/prom.h>
-+
-+/**
-+ * of_get_gpio - Get a GPIO number from the device tree to use with GPIO API
-+ * @np:		device node to get GPIO from
-+ * @index:	index of the GPIO
-+ *
-+ * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
-+ * value on the error condition.
-+ */
-+int of_get_gpio(struct device_node *np, int index)
-+{
-+	int ret = -EINVAL;
-+	struct device_node *gc;
-+	struct of_gpio_chip *of_gc = NULL;
-+	int size;
-+	const u32 *gpios;
-+	u32 nr_cells;
-+	int i;
-+	const void *gpio_spec;
-+	const u32 *gpio_cells;
-+	int gpio_index = 0;
-+
-+	gpios = of_get_property(np, "gpios", &size);
-+	if (!gpios) {
-+		ret = -ENOENT;
-+		goto err0;
-+	}
-+	nr_cells = size / sizeof(u32);
-+
-+	for (i = 0; i < nr_cells; gpio_index++) {
-+		const phandle *gpio_phandle;
-+
-+		gpio_phandle = gpios + i;
-+		gpio_spec = gpio_phandle + 1;
-+
-+		/* one cell hole in the gpios = <>; */
-+		if (!*gpio_phandle) {
-+			if (gpio_index == index)
-+				return -ENOENT;
-+			i++;
-+			continue;
-+		}
-+
-+		gc = of_find_node_by_phandle(*gpio_phandle);
-+		if (!gc) {
-+			pr_debug("%s: could not find phandle for gpios\n",
-+				 np->full_name);
-+			goto err0;
-+		}
-+
-+		of_gc = gc->data;
-+		if (!of_gc) {
-+			pr_debug("%s: gpio controller %s isn't registered\n",
-+				 np->full_name, gc->full_name);
-+			goto err1;
-+		}
-+
-+		gpio_cells = of_get_property(gc, "#gpio-cells", &size);
-+		if (!gpio_cells || size != sizeof(*gpio_cells) ||
-+				*gpio_cells != of_gc->gpio_cells) {
-+			pr_debug("%s: wrong #gpio-cells for %s\n",
-+				 np->full_name, gc->full_name);
-+			goto err1;
-+		}
-+
-+		/* Next phandle is at phandle cells + #gpio-cells */
-+		i += sizeof(*gpio_phandle) / sizeof(u32) + *gpio_cells;
-+		if (i >= nr_cells + 1) {
-+			pr_debug("%s: insufficient gpio-spec length\n",
-+				 np->full_name);
-+			goto err1;
-+		}
-+
-+		if (gpio_index == index)
-+			break;
-+
-+		of_gc = NULL;
-+		of_node_put(gc);
-+	}
-+
-+	if (!of_gc) {
-+		ret = -ENOENT;
-+		goto err0;
-+	}
-+
-+	ret = of_gc->xlate(of_gc, np, gpio_spec);
-+	if (ret < 0)
-+		goto err1;
-+
-+	ret += of_gc->gc.base;
-+err1:
-+	of_node_put(gc);
-+err0:
-+	pr_debug("%s exited with status %d\n", __func__, ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(of_get_gpio);
-+
-+/**
-+ * of_gpio_simple_xlate - translate gpio_spec to the GPIO number
-+ * @of_gc:	pointer to the of_gpio_chip structure
-+ * @np:		device node of the GPIO chip
-+ * @gpio_spec:	gpio specifier as found in the device tree
-+ *
-+ * This is simple translation function, suitable for the most 1:1 mapped
-+ * gpio chips. This function performs only one sanity check: whether gpio
-+ * is less than ngpios (that is specified in the gpio_chip).
-+ */
-+int of_gpio_simple_xlate(struct of_gpio_chip *of_gc, struct device_node *np,
-+			 const void *gpio_spec)
-+{
-+	const u32 *gpio = gpio_spec;
-+
-+	if (*gpio > of_gc->gc.ngpio)
-+		return -EINVAL;
-+
-+	return *gpio;
-+}
-+EXPORT_SYMBOL(of_gpio_simple_xlate);
-+
-+/* Should be sufficient for now, later we'll use dynamic bases. */
-+#if defined(CONFIG_PPC32) || defined(CONFIG_SPARC32)
-+#define GPIOS_PER_CHIP 32
-+#else
-+#define GPIOS_PER_CHIP 64
-+#endif
-+
-+static int of_get_gpiochip_base(struct device_node *np)
-+{
-+	struct device_node *gc = NULL;
-+	int gpiochip_base = 0;
-+
-+	while ((gc = of_find_all_nodes(gc))) {
-+		if (!of_get_property(gc, "gpio-controller", NULL))
-+			continue;
-+
-+		if (gc != np) {
-+			gpiochip_base += GPIOS_PER_CHIP;
-+			continue;
-+		}
-+
-+		of_node_put(gc);
-+
-+		if (gpiochip_base >= ARCH_NR_GPIOS)
-+			return -ENOSPC;
-+
-+		return gpiochip_base;
-+	}
-+
-+	return -ENOENT;
-+}
-+
-+/**
-+ * of_mm_gpiochip_add - Add memory mapped GPIO chip (bank)
-+ * @np:		device node of the GPIO chip
-+ * @mm_gc:	pointer to the of_mm_gpio_chip allocated structure
-+ *
-+ * To use this function you should allocate and fill mm_gc with:
-+ *
-+ * 1) In the gpio_chip structure:
-+ *    - all the callbacks
-+ *
-+ * 2) In the of_gpio_chip structure:
-+ *    - gpio_cells
-+ *    - xlate callback (optional)
-+ *
-+ * 3) In the of_mm_gpio_chip structure:
-+ *    - save_regs callback (optional)
-+ *
-+ * If succeeded, this function will map bank's memory and will
-+ * do all necessary work for you. Then you'll able to use .regs
-+ * to manage GPIOs from the callbacks.
-+ */
-+int of_mm_gpiochip_add(struct device_node *np,
-+		       struct of_mm_gpio_chip *mm_gc)
-+{
-+	int ret = -ENOMEM;
-+	struct of_gpio_chip *of_gc = &mm_gc->of_gc;
-+	struct gpio_chip *gc = &of_gc->gc;
-+
-+	gc->label = kstrdup(np->full_name, GFP_KERNEL);
-+	if (!gc->label)
-+		goto err0;
-+
-+	mm_gc->regs = of_iomap(np, 0);
-+	if (!mm_gc->regs)
-+		goto err1;
-+
-+	gc->base = of_get_gpiochip_base(np);
-+	if (gc->base < 0) {
-+		ret = gc->base;
-+		goto err1;
-+	}
-+
-+	if (!of_gc->xlate)
-+		of_gc->xlate = of_gpio_simple_xlate;
-+
-+	if (mm_gc->save_regs)
-+		mm_gc->save_regs(mm_gc);
-+
-+	np->data = of_gc;
-+
-+	ret = gpiochip_add(gc);
-+	if (ret)
-+		goto err2;
-+
-+	/* We don't want to lose the node and its ->data */
-+	of_node_get(np);
-+
-+	pr_debug("%s: registered as generic GPIO chip, base is %d\n",
-+		 np->full_name, gc->base);
-+	return 0;
-+err2:
-+	np->data = NULL;
-+	iounmap(mm_gc->regs);
-+err1:
-+	kfree(gc->label);
-+err0:
-+	pr_err("%s: GPIO chip registration failed with status %d\n",
-+	       np->full_name, ret);
-+	return ret;
-+}
-+EXPORT_SYMBOL(of_mm_gpiochip_add);
---- /dev/null
-+++ b/drivers/of/i2c.c
-@@ -0,0 +1,115 @@
-+/*
-+ * OF helpers for the I2C API
-+ *
-+ * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
-+ *
-+ * Based on a previous patch from Jon Smirl <jonsmirl@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#include <linux/i2c.h>
-+#include <linux/of.h>
-+
-+struct i2c_driver_device {
-+	char    *of_device;
-+	char    *i2c_type;
-+};
-+
-+static struct i2c_driver_device i2c_devices[] = {
-+	{ "dallas,ds1374", "rtc-ds1374" },
-+};
-+
-+static int of_find_i2c_driver(struct device_node *node,
-+			      struct i2c_board_info *info)
-+{
-+	int i, cplen;
-+	const char *compatible;
-+	const char *p;
-+
-+	/* 1. search for exception list entry */
-+	for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
-+		if (!of_device_is_compatible(node, i2c_devices[i].of_device))
-+			continue;
-+		if (strlcpy(info->type, i2c_devices[i].i2c_type,
-+			    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+			return -ENOMEM;
-+
-+		return 0;
-+	}
-+
-+	compatible = of_get_property(node, "compatible", &cplen);
-+	if (!compatible)
-+		return -ENODEV;
-+
-+	/* 2. search for linux,<i2c-type> entry */
-+	p = compatible;
-+	while (cplen > 0) {
-+		if (!strncmp(p, "linux,", 6)) {
-+			p += 6;
-+			if (strlcpy(info->type, p,
-+				    I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+				return -ENOMEM;
-+			return 0;
-+		}
-+
-+		i = strlen(p) + 1;
-+		p += i;
-+		cplen -= i;
-+	}
-+
-+	/* 3. take fist compatible entry and strip manufacturer */
-+	p = strchr(compatible, ',');
-+	if (!p)
-+		return -ENODEV;
-+	p++;
-+	if (strlcpy(info->type, p, I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-+		return -ENOMEM;
-+	return 0;
-+}
-+
-+void of_register_i2c_devices(struct i2c_adapter *adap,
-+			     struct device_node *adap_node)
-+{
-+	void *result;
-+	struct device_node *node;
-+
-+	for_each_child_of_node(adap_node, node) {
-+		struct i2c_board_info info = {};
-+		const u32 *addr;
-+		int len;
-+
-+		addr = of_get_property(node, "reg", &len);
-+		if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
-+			printk(KERN_ERR
-+			       "of-i2c: invalid i2c device entry\n");
-+			continue;
-+		}
-+
-+		info.irq = irq_of_parse_and_map(node, 0);
-+		if (info.irq == NO_IRQ)
-+			info.irq = -1;
-+
-+		if (of_find_i2c_driver(node, &info) < 0) {
-+			irq_dispose_mapping(info.irq);
-+			continue;
-+		}
-+
-+		info.addr = *addr;
-+
-+		request_module(info.type);
-+
-+		result = i2c_new_device(adap, &info);
-+		if (result == NULL) {
-+			printk(KERN_ERR
-+			       "of-i2c: Failed to load driver for %s\n",
-+			       info.type);
-+			irq_dispose_mapping(info.irq);
-+			continue;
-+		}
-+	}
-+}
-+EXPORT_SYMBOL(of_register_i2c_devices);
---- a/drivers/ps3/ps3-sys-manager.c
-+++ b/drivers/ps3/ps3-sys-manager.c
-@@ -24,6 +24,7 @@
- #include <linux/reboot.h>
- 
- #include <asm/firmware.h>
-+#include <asm/lv1call.h>
- #include <asm/ps3.h>
- 
- #include "vuart.h"
-@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op {
-  * controller, and bluetooth controller.
-  * @PS3_SM_WAKE_RTC:
-  * @PS3_SM_WAKE_RTC_ERROR:
-+ * @PS3_SM_WAKE_W_O_L: Ether or wireless LAN.
-  * @PS3_SM_WAKE_P_O_R: Power on reset.
-  *
-  * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
-@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source {
- 	PS3_SM_WAKE_DEFAULT   = 0,
- 	PS3_SM_WAKE_RTC       = 0x00000040,
- 	PS3_SM_WAKE_RTC_ERROR = 0x00000080,
-+	PS3_SM_WAKE_W_O_L     = 0x00000400,
- 	PS3_SM_WAKE_P_O_R     = 0x80000000,
- };
- 
- /**
-+ * user_wake_sources - User specified wakeup sources.
-+ *
-+ * Logical OR of enum ps3_sys_manager_wake_source types.
-+ */
-+
-+static u32 user_wake_sources = PS3_SM_WAKE_DEFAULT;
-+
-+/**
-  * enum ps3_sys_manager_cmd - Command from system manager to guest.
-  *
-  * The guest completes the actions needed, then acks or naks the command via
-@@ -581,6 +592,23 @@ fail_id:
- 	return -EIO;
- }
- 
-+static void ps3_sys_manager_fin(struct ps3_system_bus_device *dev)
-+{
-+	ps3_sys_manager_send_request_shutdown(dev);
-+
-+	pr_emerg("System Halted, OK to turn off power\n");
-+
-+	while (ps3_sys_manager_handle_msg(dev)) {
-+		/* pause until next DEC interrupt */
-+		lv1_pause(0);
-+	}
-+
-+	while (1) {
-+		/* pause, ignoring DEC interrupt */
-+		lv1_pause(1);
-+	}
-+}
-+
- /**
-  * ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
-  *
-@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_
- 	ps3_vuart_cancel_async(dev);
- 
- 	ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,
--		PS3_SM_WAKE_DEFAULT);
--	ps3_sys_manager_send_request_shutdown(dev);
--
--	pr_emerg("System Halted, OK to turn off power\n");
-+		user_wake_sources);
- 
--	while (1)
--		ps3_sys_manager_handle_msg(dev);
-+	ps3_sys_manager_fin(dev);
- }
- 
- /**
-@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restar
- 
- 	ps3_sys_manager_send_attr(dev, 0);
- 	ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
--		PS3_SM_WAKE_DEFAULT);
--	ps3_sys_manager_send_request_shutdown(dev);
-+		user_wake_sources);
- 
--	pr_emerg("System Halted, OK to turn off power\n");
-+	ps3_sys_manager_fin(dev);
-+}
-+
-+/**
-+ * ps3_sys_manager_get_wol - Get wake-on-lan setting.
-+ */
-+
-+int ps3_sys_manager_get_wol(void)
-+{
-+	pr_debug("%s:%d\n", __func__, __LINE__);
-+
-+	return (user_wake_sources & PS3_SM_WAKE_W_O_L) != 0;
-+}
-+EXPORT_SYMBOL_GPL(ps3_sys_manager_get_wol);
-+
-+/**
-+ * ps3_sys_manager_set_wol - Set wake-on-lan setting.
-+ */
-+
-+void ps3_sys_manager_set_wol(int state)
-+{
-+	static DEFINE_MUTEX(mutex);
-+
-+	mutex_lock(&mutex);
-+
-+	pr_debug("%s:%d: %d\n", __func__, __LINE__, state);
- 
--	while (1)
--		ps3_sys_manager_handle_msg(dev);
-+	if (state)
-+		user_wake_sources |= PS3_SM_WAKE_W_O_L;
-+	else
-+		user_wake_sources &= ~PS3_SM_WAKE_W_O_L;
-+	mutex_unlock(&mutex);
- }
-+EXPORT_SYMBOL_GPL(ps3_sys_manager_set_wol);
- 
- /**
-  * ps3_sys_manager_work - Asynchronous read handler.
---- a/drivers/ps3/sys-manager-core.c
-+++ b/drivers/ps3/sys-manager-core.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <linux/kernel.h>
-+#include <asm/lv1call.h>
- #include <asm/ps3.h>
- 
- /**
-@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void)
- 	if (ps3_sys_manager_ops.power_off)
- 		ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
- 
--	printk(KERN_EMERG "System Halted, OK to turn off power\n");
--	local_irq_disable();
--	while (1)
--		(void)0;
-+	ps3_sys_manager_halt();
- }
- 
- void ps3_sys_manager_restart(void)
-@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void)
- 	if (ps3_sys_manager_ops.restart)
- 		ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
- 
--	printk(KERN_EMERG "System Halted, OK to turn off power\n");
-+	ps3_sys_manager_halt();
-+}
-+
-+void ps3_sys_manager_halt(void)
-+{
-+	pr_emerg("System Halted, OK to turn off power\n");
- 	local_irq_disable();
- 	while (1)
--		(void)0;
-+		lv1_pause(1);
- }
-+
---- a/drivers/serial/cpm_uart/cpm_uart.h
-+++ b/drivers/serial/cpm_uart/cpm_uart.h
-@@ -92,6 +92,9 @@ extern struct uart_cpm_port cpm_uart_por
- 
- /* these are located in their respective files */
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd);
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np);
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram);
- int cpm_uart_init_portdesc(void);
- int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con);
- void cpm_uart_freebuf(struct uart_cpm_port *pinfo);
---- a/drivers/serial/cpm_uart/cpm_uart_core.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
-@@ -966,24 +966,23 @@ static int cpm_uart_init_port(struct dev
- 	if (!mem)
- 		return -ENOMEM;
- 
--	pram = of_iomap(np, 1);
--	if (!pram) {
--		ret = -ENOMEM;
--		goto out_mem;
--	}
--
- 	if (of_device_is_compatible(np, "fsl,cpm1-scc-uart") ||
- 	    of_device_is_compatible(np, "fsl,cpm2-scc-uart")) {
- 		pinfo->sccp = mem;
--		pinfo->sccup = pram;
-+		pinfo->sccup = pram = cpm_uart_map_pram(pinfo, np);
- 	} else if (of_device_is_compatible(np, "fsl,cpm1-smc-uart") ||
- 	           of_device_is_compatible(np, "fsl,cpm2-smc-uart")) {
- 		pinfo->flags |= FLAG_SMC;
- 		pinfo->smcp = mem;
--		pinfo->smcup = pram;
-+		pinfo->smcup = pram = cpm_uart_map_pram(pinfo, np);
- 	} else {
- 		ret = -ENODEV;
--		goto out_pram;
-+		goto out_mem;
-+	}
-+
-+	if (!pram) {
-+		ret = -ENOMEM;
-+		goto out_mem;
- 	}
- 
- 	pinfo->tx_nrfifos = TX_NUM_FIFO;
-@@ -1007,7 +1006,7 @@ static int cpm_uart_init_port(struct dev
- 	return cpm_uart_request_port(&pinfo->port);
- 
- out_pram:
--	iounmap(pram);
-+	cpm_uart_unmap_pram(pinfo, pram);
- out_mem:
- 	iounmap(mem);
- 	return ret;
---- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
-@@ -45,6 +45,8 @@
- #include <linux/serial_core.h>
- #include <linux/kernel.h>
- 
-+#include <linux/of.h>
-+
- #include "cpm_uart.h"
- 
- /**************************************************************/
-@@ -54,6 +56,18 @@ void cpm_line_cr_cmd(struct uart_cpm_por
- {
- 	cpm_command(port->command, cmd);
- }
-+
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np)
-+{
-+	return of_iomap(np, 1);
-+}
-+
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
-+{
-+	iounmap(pram);
-+}
-+
- #else
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
- {
---- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
-+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
-@@ -41,6 +41,9 @@
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/fs_pd.h>
-+#ifdef CONFIG_PPC_CPM_NEW_BINDING
-+#include <asm/prom.h>
-+#endif
- 
- #include <linux/serial_core.h>
- #include <linux/kernel.h>
-@@ -54,6 +57,55 @@ void cpm_line_cr_cmd(struct uart_cpm_por
- {
- 	cpm_command(port->command, cmd);
- }
-+
-+void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port,
-+				struct device_node *np)
-+{
-+	void __iomem *pram;
-+	unsigned long offset;
-+	struct resource res;
-+	unsigned long len;
-+
-+	/* Don't remap parameter RAM if it has already been initialized
-+	 * during console setup.
-+	 */
-+	if (IS_SMC(port) && port->smcup)
-+		return port->smcup;
-+	else if (!IS_SMC(port) && port->sccup)
-+		return port->sccup;
-+
-+	if (of_address_to_resource(np, 1, &res))
-+		return NULL;
-+
-+	len = 1 + res.end - res.start;
-+	pram = ioremap(res.start, len);
-+	if (!pram)
-+		return NULL;
-+
-+	if (!IS_SMC(port))
-+		return pram;
-+
-+	if (len != 2) {
-+		printk(KERN_WARNING "cpm_uart[%d]: device tree references "
-+			"SMC pram, using boot loader/wrapper pram mapping. "
-+			"Please fix your device tree to reference the pram "
-+			"base register instead.\n",
-+			port->port.line);
-+		return pram;
-+	}
-+
-+	offset = cpm_dpalloc(PROFF_SMC_SIZE, 64);
-+	out_be16(pram, offset);
-+	iounmap(pram);
-+	return cpm_muram_addr(offset);
-+}
-+
-+void cpm_uart_unmap_pram(struct uart_cpm_port *port, void __iomem *pram)
-+{
-+	if (!IS_SMC(port))
-+		iounmap(pram);
-+}
-+
- #else
- void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
- {
---- a/drivers/serial/of_serial.c
-+++ b/drivers/serial/of_serial.c
-@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_
- 	port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
- 		| UPF_FIXED_PORT;
- 	port->dev = &ofdev->dev;
--	port->custom_divisor = *clk / (16 * (*spd));
-+	/* If current-speed was set, then try not to change it. */
-+	if (spd)
-+		port->custom_divisor = *clk / (16 * (*spd));
- 
- 	return 0;
- }
---- a/drivers/serial/ucc_uart.c
-+++ b/drivers/serial/ucc_uart.c
-@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_devi
- 
- 	/* Get the UCC number (device ID) */
- 	/* UCCs are numbered 1-7 */
--	iprop = of_get_property(np, "device-id", NULL);
--	if (!iprop || (*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
--		dev_err(&ofdev->dev,
--			"missing or invalid UCC specified in device tree\n");
-+	iprop = of_get_property(np, "cell-index", NULL);
-+	if (!iprop) {
-+		iprop = of_get_property(np, "device-id", NULL);
-+		if (!iprop) {
-+			dev_err(&ofdev->dev, "UCC is unspecified in "
-+				"device tree\n");
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
-+		dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
- 		kfree(qe_port);
- 		return -ENODEV;
- 	}
---- a/include/asm-powerpc/Kbuild
-+++ b/include/asm-powerpc/Kbuild
-@@ -1,5 +1,6 @@
- include include/asm-generic/Kbuild.asm
- 
-+header-y += a.out.h
- header-y += auxvec.h
- header-y += ioctls.h
- header-y += mman.h
-@@ -23,7 +24,6 @@ header-y += sigcontext.h
- header-y += statfs.h
- header-y += ps3fb.h
- 
--unifdef-y += a.out.h
- unifdef-y += asm-compat.h
- unifdef-y += bootx.h
- unifdef-y += byteorder.h
---- a/include/asm-powerpc/abs_addr.h
-+++ b/include/asm-powerpc/abs_addr.h
-@@ -12,10 +12,11 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/lmb.h>
-+
- #include <asm/types.h>
- #include <asm/page.h>
- #include <asm/prom.h>
--#include <asm/lmb.h>
- #include <asm/firmware.h>
- 
- struct mschunks_map {
---- a/include/asm-powerpc/bitops.h
-+++ b/include/asm-powerpc/bitops.h
-@@ -312,24 +312,26 @@ static __inline__ int fls(unsigned int x
- 	asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x));
- 	return 32 - lz;
- }
-+
-+/*
-+ * 64-bit can do this using one cntlzd (count leading zeroes doubleword)
-+ * instruction; for 32-bit we use the generic version, which does two
-+ * 32-bit fls calls.
-+ */
-+#ifdef __powerpc64__
-+static __inline__ int fls64(__u64 x)
-+{
-+	int lz;
-+
-+	asm ("cntlzd %0,%1" : "=r" (lz) : "r" (x));
-+	return 64 - lz;
-+}
-+#else
- #include <asm-generic/bitops/fls64.h>
-+#endif /* __powerpc64__ */
- 
- #include <asm-generic/bitops/hweight.h>
--
--#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
--unsigned long find_next_zero_bit(const unsigned long *addr,
--				 unsigned long size, unsigned long offset);
--/**
-- * find_first_bit - find the first set bit in a memory region
-- * @addr: The address to start the search at
-- * @size: The maximum size to search
-- *
-- * Returns the bit-number of the first set bit, not the number of the byte
-- * containing a bit.
-- */
--#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
--unsigned long find_next_bit(const unsigned long *addr,
--			    unsigned long size, unsigned long offset);
-+#include <asm-generic/bitops/find.h>
- 
- /* Little-endian versions */
- 
---- a/include/asm-powerpc/cpm.h
-+++ b/include/asm-powerpc/cpm.h
-@@ -4,6 +4,20 @@
- #include <linux/compiler.h>
- #include <linux/types.h>
- 
-+/* Opcodes common to CPM1 and CPM2
-+*/
-+#define CPM_CR_INIT_TRX		((ushort)0x0000)
-+#define CPM_CR_INIT_RX		((ushort)0x0001)
-+#define CPM_CR_INIT_TX		((ushort)0x0002)
-+#define CPM_CR_HUNT_MODE	((ushort)0x0003)
-+#define CPM_CR_STOP_TX		((ushort)0x0004)
-+#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
-+#define CPM_CR_RESTART_TX	((ushort)0x0006)
-+#define CPM_CR_CLOSE_RX_BD	((ushort)0x0007)
-+#define CPM_CR_SET_GADDR	((ushort)0x0008)
-+#define CPM_CR_SET_TIMER	((ushort)0x0008)
-+#define CPM_CR_STOP_IDMA	((ushort)0x000b)
-+
- /* Buffer descriptors used by many of the CPM protocols. */
- typedef struct cpm_buf_desc {
- 	ushort	cbd_sc;		/* Status and Control */
---- a/include/asm-powerpc/cpm1.h
-+++ b/include/asm-powerpc/cpm1.h
-@@ -28,19 +28,6 @@
- #define CPM_CR_CHAN	((ushort)0x00f0)
- #define CPM_CR_FLG	((ushort)0x0001)
- 
--/* Some commands (there are more...later)
--*/
--#define CPM_CR_INIT_TRX		((ushort)0x0000)
--#define CPM_CR_INIT_RX		((ushort)0x0001)
--#define CPM_CR_INIT_TX		((ushort)0x0002)
--#define CPM_CR_HUNT_MODE	((ushort)0x0003)
--#define CPM_CR_STOP_TX		((ushort)0x0004)
--#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
--#define CPM_CR_RESTART_TX	((ushort)0x0006)
--#define CPM_CR_CLOSE_RX_BD	((ushort)0x0007)
--#define CPM_CR_SET_GADDR	((ushort)0x0008)
--#define CPM_CR_SET_TIMER	CPM_CR_SET_GADDR
--
- /* Channel numbers.
- */
- #define CPM_CR_CH_SCC1		((ushort)0x0000)
---- a/include/asm-powerpc/cpm2.h
-+++ b/include/asm-powerpc/cpm2.h
-@@ -71,18 +71,9 @@
- 
- #define CPM_CR_FCC_PAGE(x)	(x + 0x04)
- 
--/* Some opcodes (there are more...later)
-+/* CPM2-specific opcodes (see cpm.h for common opcodes)
- */
--#define CPM_CR_INIT_TRX		((ushort)0x0000)
--#define CPM_CR_INIT_RX		((ushort)0x0001)
--#define CPM_CR_INIT_TX		((ushort)0x0002)
--#define CPM_CR_HUNT_MODE	((ushort)0x0003)
--#define CPM_CR_STOP_TX		((ushort)0x0004)
--#define CPM_CR_GRA_STOP_TX	((ushort)0x0005)
--#define CPM_CR_RESTART_TX	((ushort)0x0006)
--#define CPM_CR_SET_GADDR	((ushort)0x0008)
- #define CPM_CR_START_IDMA	((ushort)0x0009)
--#define CPM_CR_STOP_IDMA	((ushort)0x000b)
- 
- #define mk_cr_cmd(PG, SBC, MCN, OP) \
- 	((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
---- a/include/asm-powerpc/cputhreads.h
-+++ b/include/asm-powerpc/cputhreads.h
-@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_
- 
- 	res = CPU_MASK_NONE;
- 	for (i = 0; i < NR_CPUS; i += threads_per_core) {
--		cpus_shift_right(tmp, threads_core_mask, i);
-+		cpus_shift_left(tmp, threads_core_mask, i);
- 		if (cpus_intersects(threads, tmp))
- 			cpu_set(i, res);
- 	}
---- a/include/asm-powerpc/dcr-native.h
-+++ b/include/asm-powerpc/dcr-native.h
-@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_add
- 	spin_unlock_irqrestore(&dcr_ind_lock, flags);
- }
- 
-+static inline void __dcri_clrset(int base_addr, int base_data, int reg,
-+				 unsigned clr, unsigned set)
-+{
-+	unsigned long flags;
-+	unsigned int val;
-+
-+	spin_lock_irqsave(&dcr_ind_lock, flags);
-+	__mtdcr(base_addr, reg);
-+	val = (__mfdcr(base_data) & ~clr) | set;
-+	__mtdcr(base_data, val);
-+	spin_unlock_irqrestore(&dcr_ind_lock, flags);
-+}
-+
- #define mfdcri(base, reg)	__mfdcri(DCRN_ ## base ## _CONFIG_ADDR,	\
- 					 DCRN_ ## base ## _CONFIG_DATA,	\
- 					 reg)
-@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_add
- 					 DCRN_ ## base ## _CONFIG_DATA,	\
- 					 reg, data)
- 
-+#define dcri_clrset(base, reg, clr, set)	__dcri_clrset(DCRN_ ## base ## _CONFIG_ADDR,	\
-+							      DCRN_ ## base ## _CONFIG_DATA,	\
-+							      reg, clr, set)
-+
- #endif /* __ASSEMBLY__ */
- #endif /* __KERNEL__ */
- #endif /* _ASM_POWERPC_DCR_NATIVE_H */
---- a/include/asm-powerpc/dcr-regs.h
-+++ b/include/asm-powerpc/dcr-regs.h
-@@ -68,4 +68,82 @@
- #define SDR0_UART3		0x0123
- #define SDR0_CUST0		0x4000
- 
-+/*
-+ * All those DCR register addresses are offsets from the base address
-+ * for the SRAM0 controller (e.g. 0x20 on 440GX). The base address is
-+ * excluded here and configured in the device tree.
-+ */
-+#define DCRN_SRAM0_SB0CR	0x00
-+#define DCRN_SRAM0_SB1CR	0x01
-+#define DCRN_SRAM0_SB2CR	0x02
-+#define DCRN_SRAM0_SB3CR	0x03
-+#define  SRAM_SBCR_BU_MASK	0x00000180
-+#define  SRAM_SBCR_BS_64KB	0x00000800
-+#define  SRAM_SBCR_BU_RO	0x00000080
-+#define  SRAM_SBCR_BU_RW	0x00000180
-+#define DCRN_SRAM0_BEAR		0x04
-+#define DCRN_SRAM0_BESR0	0x05
-+#define DCRN_SRAM0_BESR1	0x06
-+#define DCRN_SRAM0_PMEG		0x07
-+#define DCRN_SRAM0_CID		0x08
-+#define DCRN_SRAM0_REVID	0x09
-+#define DCRN_SRAM0_DPC		0x0a
-+#define  SRAM_DPC_ENABLE	0x80000000
-+
-+/*
-+ * All those DCR register addresses are offsets from the base address
-+ * for the SRAM0 controller (e.g. 0x30 on 440GX). The base address is
-+ * excluded here and configured in the device tree.
-+ */
-+#define DCRN_L2C0_CFG		0x00
-+#define  L2C_CFG_L2M		0x80000000
-+#define  L2C_CFG_ICU		0x40000000
-+#define  L2C_CFG_DCU		0x20000000
-+#define  L2C_CFG_DCW_MASK	0x1e000000
-+#define  L2C_CFG_TPC		0x01000000
-+#define  L2C_CFG_CPC		0x00800000
-+#define  L2C_CFG_FRAN		0x00200000
-+#define  L2C_CFG_SS_MASK	0x00180000
-+#define  L2C_CFG_SS_256		0x00000000
-+#define  L2C_CFG_CPIM		0x00040000
-+#define  L2C_CFG_TPIM		0x00020000
-+#define  L2C_CFG_LIM		0x00010000
-+#define  L2C_CFG_PMUX_MASK	0x00007000
-+#define  L2C_CFG_PMUX_SNP	0x00000000
-+#define  L2C_CFG_PMUX_IF	0x00001000
-+#define  L2C_CFG_PMUX_DF	0x00002000
-+#define  L2C_CFG_PMUX_DS	0x00003000
-+#define  L2C_CFG_PMIM		0x00000800
-+#define  L2C_CFG_TPEI		0x00000400
-+#define  L2C_CFG_CPEI		0x00000200
-+#define  L2C_CFG_NAM		0x00000100
-+#define  L2C_CFG_SMCM		0x00000080
-+#define  L2C_CFG_NBRM		0x00000040
-+#define  L2C_CFG_RDBW		0x00000008	/* only 460EX/GT */
-+#define DCRN_L2C0_CMD		0x01
-+#define  L2C_CMD_CLR		0x80000000
-+#define  L2C_CMD_DIAG		0x40000000
-+#define  L2C_CMD_INV		0x20000000
-+#define  L2C_CMD_CCP		0x10000000
-+#define  L2C_CMD_CTE		0x08000000
-+#define  L2C_CMD_STRC		0x04000000
-+#define  L2C_CMD_STPC		0x02000000
-+#define  L2C_CMD_RPMC		0x01000000
-+#define  L2C_CMD_HCC		0x00800000
-+#define DCRN_L2C0_ADDR		0x02
-+#define DCRN_L2C0_DATA		0x03
-+#define DCRN_L2C0_SR		0x04
-+#define  L2C_SR_CC		0x80000000
-+#define  L2C_SR_CPE		0x40000000
-+#define  L2C_SR_TPE		0x20000000
-+#define  L2C_SR_LRU		0x10000000
-+#define  L2C_SR_PCS		0x08000000
-+#define DCRN_L2C0_REVID		0x05
-+#define DCRN_L2C0_SNP0		0x06
-+#define DCRN_L2C0_SNP1		0x07
-+#define  L2C_SNP_BA_MASK	0xffff0000
-+#define  L2C_SNP_SSR_MASK	0x0000f000
-+#define  L2C_SNP_SSR_32G	0x0000f000
-+#define  L2C_SNP_ESR		0x00000800
-+
- #endif /* __DCR_REGS_H__ */
---- a/include/asm-powerpc/exception.h
-+++ b/include/asm-powerpc/exception.h
-@@ -228,18 +228,18 @@ label##_pSeries:							\
- BEGIN_FW_FTR_SECTION;				\
- 	stb	r11,PACAHARDIRQEN(r13);		\
- END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);	\
-+	TRACE_DISABLE_INTS;			\
- BEGIN_FW_FTR_SECTION;				\
- 	mfmsr	r10;				\
- 	ori	r10,r10,MSR_EE;			\
- 	mtmsrd	r10,1;				\
- END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
--
- #else
- #define DISABLE_INTS				\
- 	li	r11,0;				\
- 	stb	r11,PACASOFTIRQEN(r13);		\
--	stb	r11,PACAHARDIRQEN(r13)
--
-+	stb	r11,PACAHARDIRQEN(r13);		\
-+	TRACE_DISABLE_INTS
- #endif /* CONFIG_PPC_ISERIES */
- 
- #define ENABLE_INTS				\
---- /dev/null
-+++ b/include/asm-powerpc/fsl_lbc.h
-@@ -0,0 +1,311 @@
-+/* Freescale Local Bus Controller
-+ *
-+ * Copyright (c) 2006-2007 Freescale Semiconductor
-+ *
-+ * Authors: Nick Spence <nick.spence@freescale.com>,
-+ *          Scott Wood <scottwood@freescale.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __ASM_FSL_LBC_H
-+#define __ASM_FSL_LBC_H
-+
-+#include <linux/types.h>
-+#include <linux/spinlock.h>
-+#include <asm/io.h>
-+
-+struct fsl_lbc_bank {
-+	__be32 br;             /**< Base Register  */
-+#define BR_BA           0xFFFF8000
-+#define BR_BA_SHIFT             15
-+#define BR_PS           0x00001800
-+#define BR_PS_SHIFT             11
-+#define BR_PS_8         0x00000800  /* Port Size 8 bit */
-+#define BR_PS_16        0x00001000  /* Port Size 16 bit */
-+#define BR_PS_32        0x00001800  /* Port Size 32 bit */
-+#define BR_DECC         0x00000600
-+#define BR_DECC_SHIFT            9
-+#define BR_DECC_OFF     0x00000000  /* HW ECC checking and generation off */
-+#define BR_DECC_CHK     0x00000200  /* HW ECC checking on, generation off */
-+#define BR_DECC_CHK_GEN 0x00000400  /* HW ECC checking and generation on */
-+#define BR_WP           0x00000100
-+#define BR_WP_SHIFT              8
-+#define BR_MSEL         0x000000E0
-+#define BR_MSEL_SHIFT            5
-+#define BR_MS_GPCM      0x00000000  /* GPCM */
-+#define BR_MS_FCM       0x00000020  /* FCM */
-+#define BR_MS_SDRAM     0x00000060  /* SDRAM */
-+#define BR_MS_UPMA      0x00000080  /* UPMA */
-+#define BR_MS_UPMB      0x000000A0  /* UPMB */
-+#define BR_MS_UPMC      0x000000C0  /* UPMC */
-+#define BR_V            0x00000001
-+#define BR_V_SHIFT               0
-+#define BR_RES          ~(BR_BA|BR_PS|BR_DECC|BR_WP|BR_MSEL|BR_V)
-+
-+	__be32 or;             /**< Base Register  */
-+#define OR0 0x5004
-+#define OR1 0x500C
-+#define OR2 0x5014
-+#define OR3 0x501C
-+#define OR4 0x5024
-+#define OR5 0x502C
-+#define OR6 0x5034
-+#define OR7 0x503C
-+
-+#define OR_FCM_AM               0xFFFF8000
-+#define OR_FCM_AM_SHIFT                 15
-+#define OR_FCM_BCTLD            0x00001000
-+#define OR_FCM_BCTLD_SHIFT              12
-+#define OR_FCM_PGS              0x00000400
-+#define OR_FCM_PGS_SHIFT                10
-+#define OR_FCM_CSCT             0x00000200
-+#define OR_FCM_CSCT_SHIFT                9
-+#define OR_FCM_CST              0x00000100
-+#define OR_FCM_CST_SHIFT                 8
-+#define OR_FCM_CHT              0x00000080
-+#define OR_FCM_CHT_SHIFT                 7
-+#define OR_FCM_SCY              0x00000070
-+#define OR_FCM_SCY_SHIFT                 4
-+#define OR_FCM_SCY_1            0x00000010
-+#define OR_FCM_SCY_2            0x00000020
-+#define OR_FCM_SCY_3            0x00000030
-+#define OR_FCM_SCY_4            0x00000040
-+#define OR_FCM_SCY_5            0x00000050
-+#define OR_FCM_SCY_6            0x00000060
-+#define OR_FCM_SCY_7            0x00000070
-+#define OR_FCM_RST              0x00000008
-+#define OR_FCM_RST_SHIFT                 3
-+#define OR_FCM_TRLX             0x00000004
-+#define OR_FCM_TRLX_SHIFT                2
-+#define OR_FCM_EHTR             0x00000002
-+#define OR_FCM_EHTR_SHIFT                1
-+};
-+
-+struct fsl_lbc_regs {
-+	struct fsl_lbc_bank bank[8];
-+	u8 res0[0x28];
-+	__be32 mar;             /**< UPM Address Register */
-+	u8 res1[0x4];
-+	__be32 mamr;            /**< UPMA Mode Register */
-+#define MxMR_OP_NO	(0 << 28) /**< normal operation */
-+#define MxMR_OP_WA	(1 << 28) /**< write array */
-+#define MxMR_OP_RA	(2 << 28) /**< read array */
-+#define MxMR_OP_RP	(3 << 28) /**< run pattern */
-+#define MxMR_MAD	0x3f      /**< machine address */
-+	__be32 mbmr;            /**< UPMB Mode Register */
-+	__be32 mcmr;            /**< UPMC Mode Register */
-+	u8 res2[0x8];
-+	__be32 mrtpr;           /**< Memory Refresh Timer Prescaler Register */
-+	__be32 mdr;             /**< UPM Data Register */
-+	u8 res3[0x4];
-+	__be32 lsor;            /**< Special Operation Initiation Register */
-+	__be32 lsdmr;           /**< SDRAM Mode Register */
-+	u8 res4[0x8];
-+	__be32 lurt;            /**< UPM Refresh Timer */
-+	__be32 lsrt;            /**< SDRAM Refresh Timer */
-+	u8 res5[0x8];
-+	__be32 ltesr;           /**< Transfer Error Status Register */
-+#define LTESR_BM   0x80000000
-+#define LTESR_FCT  0x40000000
-+#define LTESR_PAR  0x20000000
-+#define LTESR_WP   0x04000000
-+#define LTESR_ATMW 0x00800000
-+#define LTESR_ATMR 0x00400000
-+#define LTESR_CS   0x00080000
-+#define LTESR_CC   0x00000001
-+#define LTESR_NAND_MASK (LTESR_FCT | LTESR_PAR | LTESR_CC)
-+	__be32 ltedr;           /**< Transfer Error Disable Register */
-+	__be32 lteir;           /**< Transfer Error Interrupt Register */
-+	__be32 lteatr;          /**< Transfer Error Attributes Register */
-+	__be32 ltear;           /**< Transfer Error Address Register */
-+	u8 res6[0xC];
-+	__be32 lbcr;            /**< Configuration Register */
-+#define LBCR_LDIS  0x80000000
-+#define LBCR_LDIS_SHIFT    31
-+#define LBCR_BCTLC 0x00C00000
-+#define LBCR_BCTLC_SHIFT   22
-+#define LBCR_AHD   0x00200000
-+#define LBCR_LPBSE 0x00020000
-+#define LBCR_LPBSE_SHIFT   17
-+#define LBCR_EPAR  0x00010000
-+#define LBCR_EPAR_SHIFT    16
-+#define LBCR_BMT   0x0000FF00
-+#define LBCR_BMT_SHIFT      8
-+#define LBCR_INIT  0x00040000
-+	__be32 lcrr;            /**< Clock Ratio Register */
-+#define LCRR_DBYP    0x80000000
-+#define LCRR_DBYP_SHIFT      31
-+#define LCRR_BUFCMDC 0x30000000
-+#define LCRR_BUFCMDC_SHIFT   28
-+#define LCRR_ECL     0x03000000
-+#define LCRR_ECL_SHIFT       24
-+#define LCRR_EADC    0x00030000
-+#define LCRR_EADC_SHIFT      16
-+#define LCRR_CLKDIV  0x0000000F
-+#define LCRR_CLKDIV_SHIFT     0
-+	u8 res7[0x8];
-+	__be32 fmr;             /**< Flash Mode Register */
-+#define FMR_CWTO     0x0000F000
-+#define FMR_CWTO_SHIFT       12
-+#define FMR_BOOT     0x00000800
-+#define FMR_ECCM     0x00000100
-+#define FMR_AL       0x00000030
-+#define FMR_AL_SHIFT          4
-+#define FMR_OP       0x00000003
-+#define FMR_OP_SHIFT          0
-+	__be32 fir;             /**< Flash Instruction Register */
-+#define FIR_OP0      0xF0000000
-+#define FIR_OP0_SHIFT        28
-+#define FIR_OP1      0x0F000000
-+#define FIR_OP1_SHIFT        24
-+#define FIR_OP2      0x00F00000
-+#define FIR_OP2_SHIFT        20
-+#define FIR_OP3      0x000F0000
-+#define FIR_OP3_SHIFT        16
-+#define FIR_OP4      0x0000F000
-+#define FIR_OP4_SHIFT        12
-+#define FIR_OP5      0x00000F00
-+#define FIR_OP5_SHIFT         8
-+#define FIR_OP6      0x000000F0
-+#define FIR_OP6_SHIFT         4
-+#define FIR_OP7      0x0000000F
-+#define FIR_OP7_SHIFT         0
-+#define FIR_OP_NOP   0x0	/* No operation and end of sequence */
-+#define FIR_OP_CA    0x1        /* Issue current column address */
-+#define FIR_OP_PA    0x2        /* Issue current block+page address */
-+#define FIR_OP_UA    0x3        /* Issue user defined address */
-+#define FIR_OP_CM0   0x4        /* Issue command from FCR[CMD0] */
-+#define FIR_OP_CM1   0x5        /* Issue command from FCR[CMD1] */
-+#define FIR_OP_CM2   0x6        /* Issue command from FCR[CMD2] */
-+#define FIR_OP_CM3   0x7        /* Issue command from FCR[CMD3] */
-+#define FIR_OP_WB    0x8        /* Write FBCR bytes from FCM buffer */
-+#define FIR_OP_WS    0x9        /* Write 1 or 2 bytes from MDR[AS] */
-+#define FIR_OP_RB    0xA        /* Read FBCR bytes to FCM buffer */
-+#define FIR_OP_RS    0xB        /* Read 1 or 2 bytes to MDR[AS] */
-+#define FIR_OP_CW0   0xC        /* Wait then issue FCR[CMD0] */
-+#define FIR_OP_CW1   0xD        /* Wait then issue FCR[CMD1] */
-+#define FIR_OP_RBW   0xE        /* Wait then read FBCR bytes */
-+#define FIR_OP_RSW   0xE        /* Wait then read 1 or 2 bytes */
-+	__be32 fcr;             /**< Flash Command Register */
-+#define FCR_CMD0     0xFF000000
-+#define FCR_CMD0_SHIFT       24
-+#define FCR_CMD1     0x00FF0000
-+#define FCR_CMD1_SHIFT       16
-+#define FCR_CMD2     0x0000FF00
-+#define FCR_CMD2_SHIFT        8
-+#define FCR_CMD3     0x000000FF
-+#define FCR_CMD3_SHIFT        0
-+	__be32 fbar;            /**< Flash Block Address Register */
-+#define FBAR_BLK     0x00FFFFFF
-+	__be32 fpar;            /**< Flash Page Address Register */
-+#define FPAR_SP_PI   0x00007C00
-+#define FPAR_SP_PI_SHIFT     10
-+#define FPAR_SP_MS   0x00000200
-+#define FPAR_SP_CI   0x000001FF
-+#define FPAR_SP_CI_SHIFT      0
-+#define FPAR_LP_PI   0x0003F000
-+#define FPAR_LP_PI_SHIFT     12
-+#define FPAR_LP_MS   0x00000800
-+#define FPAR_LP_CI   0x000007FF
-+#define FPAR_LP_CI_SHIFT      0
-+	__be32 fbcr;            /**< Flash Byte Count Register */
-+#define FBCR_BC      0x00000FFF
-+	u8 res11[0x8];
-+	u8 res8[0xF00];
-+};
-+
-+extern struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-+extern spinlock_t fsl_lbc_lock;
-+
-+/*
-+ * FSL UPM routines
-+ */
-+struct fsl_upm {
-+	__be32 __iomem *mxmr;
-+	int width;
-+};
-+
-+extern int fsl_lbc_find(phys_addr_t addr_base);
-+extern int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm);
-+
-+/**
-+ * fsl_upm_start_pattern - start UPM patterns execution
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ * @pat_offset:	UPM pattern offset for the command to be executed
-+ *
-+ * This routine programmes UPM so the next memory access that hits an UPM
-+ * will trigger pattern execution, starting at pat_offset.
-+ */
-+static inline void fsl_upm_start_pattern(struct fsl_upm *upm, u8 pat_offset)
-+{
-+	clrsetbits_be32(upm->mxmr, MxMR_MAD, MxMR_OP_RP | pat_offset);
-+}
-+
-+/**
-+ * fsl_upm_end_pattern - end UPM patterns execution
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ *
-+ * This routine reverts UPM to normal operation mode.
-+ */
-+static inline void fsl_upm_end_pattern(struct fsl_upm *upm)
-+{
-+	clrbits32(upm->mxmr, MxMR_OP_RP);
-+
-+	while (in_be32(upm->mxmr) & MxMR_OP_RP)
-+		cpu_relax();
-+}
-+
-+/**
-+ * fsl_upm_run_pattern - actually run an UPM pattern
-+ * @upm:	pointer to the fsl_upm structure obtained via fsl_upm_find
-+ * @io_base:	remapped pointer to where memory access should happen
-+ * @mar:	MAR register content during pattern execution
-+ *
-+ * This function triggers dummy write to the memory specified by the io_base,
-+ * thus UPM pattern actually executed. Note that mar usage depends on the
-+ * pre-programmed AMX bits in the UPM RAM.
-+ */
-+static inline int fsl_upm_run_pattern(struct fsl_upm *upm,
-+				      void __iomem *io_base, u32 mar)
-+{
-+	int ret = 0;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&fsl_lbc_lock, flags);
-+
-+	out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width));
-+
-+	switch (upm->width) {
-+	case 8:
-+		out_8(io_base, 0x0);
-+		break;
-+	case 16:
-+		out_be16(io_base, 0x0);
-+		break;
-+	case 32:
-+		out_be32(io_base, 0x0);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	spin_unlock_irqrestore(&fsl_lbc_lock, flags);
-+
-+	return ret;
-+}
-+
-+#endif /* __ASM_FSL_LBC_H */
---- /dev/null
-+++ b/include/asm-powerpc/gpio.h
-@@ -0,0 +1,56 @@
-+/*
-+ * Generic GPIO API implementation for PowerPC.
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef __ASM_POWERPC_GPIO_H
-+#define __ASM_POWERPC_GPIO_H
-+
-+#include <linux/errno.h>
-+#include <asm-generic/gpio.h>
-+
-+#ifdef CONFIG_HAVE_GPIO_LIB
-+
-+/*
-+ * We don't (yet) implement inlined/rapid versions for on-chip gpios.
-+ * Just call gpiolib.
-+ */
-+static inline int gpio_get_value(unsigned int gpio)
-+{
-+	return __gpio_get_value(gpio);
-+}
-+
-+static inline void gpio_set_value(unsigned int gpio, int value)
-+{
-+	__gpio_set_value(gpio, value);
-+}
-+
-+static inline int gpio_cansleep(unsigned int gpio)
-+{
-+	return __gpio_cansleep(gpio);
-+}
-+
-+/*
-+ * Not implemented, yet.
-+ */
-+static inline int gpio_to_irq(unsigned int gpio)
-+{
-+	return -ENOSYS;
-+}
-+
-+static inline int irq_to_gpio(unsigned int irq)
-+{
-+	return -EINVAL;
-+}
-+
-+#endif /* CONFIG_HAVE_GPIO_LIB */
-+
-+#endif /* __ASM_POWERPC_GPIO_H */
---- a/include/asm-powerpc/hw_irq.h
-+++ b/include/asm-powerpc/hw_irq.h
-@@ -27,7 +27,7 @@ static inline unsigned long local_get_fl
- 	return flags;
- }
- 
--static inline unsigned long local_irq_disable(void)
-+static inline unsigned long raw_local_irq_disable(void)
- {
- 	unsigned long flags, zero;
- 
-@@ -39,14 +39,15 @@ static inline unsigned long local_irq_di
- 	return flags;
- }
- 
--extern void local_irq_restore(unsigned long);
-+extern void raw_local_irq_restore(unsigned long);
- extern void iseries_handle_interrupts(void);
- 
--#define local_irq_enable()	local_irq_restore(1)
--#define local_save_flags(flags)	((flags) = local_get_flags())
--#define local_irq_save(flags)	((flags) = local_irq_disable())
-+#define raw_local_irq_enable()		raw_local_irq_restore(1)
-+#define raw_local_save_flags(flags)	((flags) = local_get_flags())
-+#define raw_local_irq_save(flags)	((flags) = raw_local_irq_disable())
- 
--#define irqs_disabled()		(local_get_flags() == 0)
-+#define raw_irqs_disabled()		(local_get_flags() == 0)
-+#define raw_irqs_disabled_flags(flags)	((flags) == 0)
- 
- #define __hard_irq_enable()	__mtmsrd(mfmsr() | MSR_EE, 1)
- #define __hard_irq_disable()	__mtmsrd(mfmsr() & ~MSR_EE, 1)
---- a/include/asm-powerpc/immap_qe.h
-+++ b/include/asm-powerpc/immap_qe.h
-@@ -20,6 +20,7 @@
- #ifdef __KERNEL__
- 
- #include <linux/kernel.h>
-+#include <asm/io.h>
- 
- #define QE_IMMAP_SIZE	(1024 * 1024)	/* 1MB from 1MB+IMMR */
- 
-@@ -468,7 +469,7 @@ struct qe_immap {
- 	u8			res18[0xC0000];	/* 0x140000 - 0x200000 */
- } __attribute__ ((packed));
- 
--extern struct qe_immap *qe_immr;
-+extern struct qe_immap __iomem *qe_immr;
- extern phys_addr_t get_qe_base(void);
- 
- static inline unsigned long immrbar_virt_to_phys(void *address)
---- a/include/asm-powerpc/irqflags.h
-+++ b/include/asm-powerpc/irqflags.h
-@@ -2,30 +2,43 @@
-  * include/asm-powerpc/irqflags.h
-  *
-  * IRQ flags handling
-- *
-- * This file gets included from lowlevel asm headers too, to provide
-- * wrapped versions of the local_irq_*() APIs, based on the
-- * raw_local_irq_*() macros from the lowlevel headers.
-  */
- #ifndef _ASM_IRQFLAGS_H
- #define _ASM_IRQFLAGS_H
- 
-+#ifndef __ASSEMBLY__
- /*
-  * Get definitions for raw_local_save_flags(x), etc.
-  */
- #include <asm-powerpc/hw_irq.h>
- 
-+#else
-+#ifdef CONFIG_TRACE_IRQFLAGS
- /*
-- * Do the CPU's IRQ-state tracing from assembly code. We call a
-- * C function, so save all the C-clobbered registers:
-+ * Most of the CPU's IRQ-state tracing is done from assembly code; we
-+ * have to call a C function so call a wrapper that saves all the
-+ * C-clobbered registers.
-  */
--#ifdef CONFIG_TRACE_IRQFLAGS
--
--#error No support on PowerPC yet for CONFIG_TRACE_IRQFLAGS
--
-+#define TRACE_ENABLE_INTS	bl .trace_hardirqs_on
-+#define TRACE_DISABLE_INTS	bl .trace_hardirqs_off
-+#define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)	\
-+	cmpdi	en, 0;				\
-+	bne	95f;				\
-+	stb	en,PACASOFTIRQEN(r13);		\
-+	bl	.trace_hardirqs_off;		\
-+	b	skip;				\
-+95:	bl	.trace_hardirqs_on;		\
-+	li	en,1;
-+#define TRACE_AND_RESTORE_IRQ(en)		\
-+	TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f);	\
-+96:	stb	en,PACASOFTIRQEN(r13)
- #else
--# define TRACE_IRQS_ON
--# define TRACE_IRQS_OFF
-+#define TRACE_ENABLE_INTS
-+#define TRACE_DISABLE_INTS
-+#define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip)
-+#define TRACE_AND_RESTORE_IRQ(en)		\
-+	stb	en,PACASOFTIRQEN(r13)
-+#endif
- #endif
- 
- #endif
---- /dev/null
-+++ b/include/asm-powerpc/iseries/alpaca.h
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright © 2008  Stephen Rothwell IBM Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ */
-+#ifndef _ASM_POWERPC_ISERIES_ALPACA_H
-+#define _ASM_POWERPC_ISERIES_ALPACA_H
-+
-+/*
-+ * This is the part of the paca that the iSeries hypervisor
-+ * needs to be statically initialised. Immediately after boot
-+ * we switch to the normal Linux paca.
-+ */
-+struct alpaca {
-+	struct lppaca *lppaca_ptr;	/* Pointer to LpPaca for PLIC */
-+	const void *reg_save_ptr;	/* Pointer to LpRegSave for PLIC */
-+};
-+
-+#endif /* _ASM_POWERPC_ISERIES_ALPACA_H */
---- a/include/asm-powerpc/iseries/it_lp_reg_save.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--/*
-- * Copyright (C) 2001  Mike Corrigan IBM Corporation
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-- */
--#ifndef _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
--#define _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H
--
--/*
-- * This control block contains the data that is shared between PLIC
-- * and the OS
-- */
--
--struct ItLpRegSave {
--	u32	xDesc;		// Eye catcher  "LpRS" ebcdic	000-003
--	u16	xSize;		// Size of this class		004-005
--	u8	xInUse;         // Area is live                 006-007
--	u8	xRsvd1[9];	// Reserved			007-00F
--
--	u8      xFixedRegSave[352]; // Fixed Register Save Area 010-16F
--	u32	xCTRL;		// Control Register		170-173
--	u32	xDEC;		// Decrementer			174-177
--	u32	xFPSCR;		// FP Status and Control Reg	178-17B
--	u32	xPVR;		// Processor Version Number	17C-17F
--
--	u64	xMMCR0;		// Monitor Mode Control Reg 0	180-187
--	u32	xPMC1;		// Perf Monitor Counter 1	188-18B
--	u32	xPMC2;		// Perf Monitor Counter 2	18C-18F
--	u32	xPMC3;		// Perf Monitor Counter 3	190-193
--	u32	xPMC4;		// Perf Monitor Counter 4	194-197
--	u32	xPIR;		// Processor ID Reg		198-19B
--
--	u32	xMMCR1;		// Monitor Mode Control Reg 1	19C-19F
--	u32	xMMCRA;		// Monitor Mode Control Reg A	1A0-1A3
--	u32	xPMC5;		// Perf Monitor Counter 5	1A4-1A7
--	u32	xPMC6;		// Perf Monitor Counter 6	1A8-1AB
--	u32	xPMC7;		// Perf Monitor Counter 7	1AC-1AF
--	u32	xPMC8;		// Perf Monitor Counter 8	1B0-1B3
--	u32	xTSC;		// Thread Switch Control	1B4-1B7
--	u32	xTST;		// Thread Switch Timeout	1B8-1BB
--	u32	xRsvd;          // Reserved                     1BC-1BF
--
--	u64	xACCR;		// Address Compare Control Reg	1C0-1C7
--	u64	xIMR;		// Instruction Match Register	1C8-1CF
--	u64	xSDR1;		// Storage Description Reg 1	1D0-1D7
--	u64	xSPRG0;		// Special Purpose Reg General0	1D8-1DF
--	u64	xSPRG1;		// Special Purpose Reg General1	1E0-1E7
--	u64	xSPRG2;		// Special Purpose Reg General2	1E8-1EF
--	u64	xSPRG3;		// Special Purpose Reg General3	1F0-1F7
--	u64	xTB;		// Time Base Register		1F8-1FF
--
--	u64	xFPR[32];	// Floating Point Registers	200-2FF
--
--	u64	xMSR;		// Machine State Register	300-307
--	u64	xNIA;		// Next Instruction Address	308-30F
--
--	u64	xDABR;		// Data Address Breakpoint Reg	310-317
--	u64	xIABR;		// Inst Address Breakpoint Reg	318-31F
--
--	u64	xHID0;		// HW Implementation Dependent0	320-327
--
--	u64	xHID4;		// HW Implementation Dependent4	328-32F
--	u64	xSCOMd;		// SCON Data Reg (SPRG4)	330-337
--	u64	xSCOMc;		// SCON Command Reg (SPRG5)	338-33F
--	u64	xSDAR;		// Sample Data Address Register	340-347
--	u64	xSIAR;		// Sample Inst Address Register	348-34F
--
--	u8	xRsvd3[176];	// Reserved			350-3FF
--};
--
--extern struct ItLpRegSave iseries_reg_save[];
--
--#endif /* _ASM_POWERPC_ISERIES_IT_LP_REG_SAVE_H */
---- a/include/asm-powerpc/lmb.h
-+++ b/include/asm-powerpc/lmb.h
-@@ -1,81 +1,15 @@
- #ifndef _ASM_POWERPC_LMB_H
- #define _ASM_POWERPC_LMB_H
--#ifdef __KERNEL__
- 
--/*
-- * Definitions for talking to the Open Firmware PROM on
-- * Power Macintosh computers.
-- *
-- * Copyright (C) 2001 Peter Bergner, IBM Corp.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version
-- * 2 of the License, or (at your option) any later version.
-- */
-+#include <asm/udbg.h>
- 
--#include <linux/init.h>
--#include <asm/prom.h>
-+#define LMB_DBG(fmt...) udbg_printf(fmt)
- 
--#define MAX_LMB_REGIONS 128
-+#ifdef CONFIG_PPC32
-+extern phys_addr_t lowmem_end_addr;
-+#define LMB_REAL_LIMIT	lowmem_end_addr
-+#else
-+#define LMB_REAL_LIMIT	0
-+#endif
- 
--struct lmb_property {
--	unsigned long base;
--	unsigned long size;
--};
--
--struct lmb_region {
--	unsigned long cnt;
--	unsigned long size;
--	struct lmb_property region[MAX_LMB_REGIONS+1];
--};
--
--struct lmb {
--	unsigned long debug;
--	unsigned long rmo_size;
--	struct lmb_region memory;
--	struct lmb_region reserved;
--};
--
--extern struct lmb lmb;
--
--extern void __init lmb_init(void);
--extern void __init lmb_analyze(void);
--extern long __init lmb_add(unsigned long base, unsigned long size);
--extern long __init lmb_reserve(unsigned long base, unsigned long size);
--extern unsigned long __init lmb_alloc(unsigned long size, unsigned long align);
--extern unsigned long __init lmb_alloc_base(unsigned long size,
--		unsigned long align, unsigned long max_addr);
--extern unsigned long __init __lmb_alloc_base(unsigned long size,
--		unsigned long align, unsigned long max_addr);
--extern unsigned long __init lmb_phys_mem_size(void);
--extern unsigned long __init lmb_end_of_DRAM(void);
--extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
--extern int __init lmb_is_reserved(unsigned long addr);
--
--extern void lmb_dump_all(void);
--
--static inline unsigned long
--lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
--{
--	return type->region[region_nr].size;
--}
--static inline unsigned long
--lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
--{
--	return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
--}
--static inline unsigned long
--lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
--{
--	return type->region[region_nr].base >> PAGE_SHIFT;
--}
--static inline unsigned long
--lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
--{
--	return lmb_start_pfn(type, region_nr) +
--	       lmb_size_pages(type, region_nr);
--}
--
--#endif /* __KERNEL__ */
- #endif /* _ASM_POWERPC_LMB_H */
---- a/include/asm-powerpc/machdep.h
-+++ b/include/asm-powerpc/machdep.h
-@@ -68,6 +68,8 @@ struct machdep_calls {
- 				       unsigned long vflags,
- 				       int psize, int ssize);
- 	long		(*hpte_remove)(unsigned long hpte_group);
-+	void            (*hpte_removebolted)(unsigned long ea,
-+					     int psize, int ssize);
- 	void		(*flush_hash_range)(unsigned long number, int local);
- 
- 	/* special for kexec, to be called in real mode, linar mapping is
-@@ -196,9 +198,6 @@ struct machdep_calls {
- 	   May be NULL. */
- 	void		(*init)(void);
- 
--	void		(*setup_io_mappings)(void);
--
--	void		(*early_serial_map)(void);
- 	void		(*kgdb_map_scc)(void);
- 
- 	/*
---- a/include/asm-powerpc/macio.h
-+++ b/include/asm-powerpc/macio.h
-@@ -2,7 +2,7 @@
- #define __MACIO_ASIC_H__
- #ifdef __KERNEL__
- 
--#include <asm/of_device.h>
-+#include <linux/of_device.h>
- 
- extern struct bus_type macio_bus_type;
- 
---- a/include/asm-powerpc/mmu-40x.h
-+++ b/include/asm-powerpc/mmu-40x.h
-@@ -53,8 +53,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--typedef unsigned long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-44x.h
-+++ b/include/asm-powerpc/mmu-44x.h
-@@ -53,8 +53,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--typedef unsigned long long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-8xx.h
-+++ b/include/asm-powerpc/mmu-8xx.h
-@@ -136,8 +136,6 @@
- #define SPRN_M_TW	799
- 
- #ifndef __ASSEMBLY__
--typedef unsigned long phys_addr_t;
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-fsl-booke.h
-+++ b/include/asm-powerpc/mmu-fsl-booke.h
-@@ -73,12 +73,6 @@
- 
- #ifndef __ASSEMBLY__
- 
--#ifndef CONFIG_PHYS_64BIT
--typedef unsigned long phys_addr_t;
--#else
--typedef unsigned long long phys_addr_t;
--#endif
--
- typedef struct {
- 	unsigned long id;
- 	unsigned long vdso_base;
---- a/include/asm-powerpc/mmu-hash32.h
-+++ b/include/asm-powerpc/mmu-hash32.h
-@@ -84,8 +84,6 @@ typedef struct {
- 	unsigned long vdso_base;
- } mm_context_t;
- 
--typedef unsigned long phys_addr_t;
--
- #endif /* !__ASSEMBLY__ */
- 
- #endif /* _ASM_POWERPC_MMU_HASH32_H_ */
---- a/include/asm-powerpc/mmu-hash64.h
-+++ b/include/asm-powerpc/mmu-hash64.h
-@@ -469,9 +469,6 @@ static inline unsigned long get_vsid(uns
- 				 VSID_MODULUS_256M)
- #define KERNEL_VSID(ea)		VSID_SCRAMBLE(GET_ESID(ea))
- 
--/* Physical address used by some IO functions */
--typedef unsigned long phys_addr_t;
--
- #endif /* __ASSEMBLY__ */
- 
- #endif /* _ASM_POWERPC_MMU_HASH64_H_ */
---- a/include/asm-powerpc/paca.h
-+++ b/include/asm-powerpc/paca.h
-@@ -42,10 +42,7 @@ struct task_struct;
-  * Defines the layout of the paca.
-  *
-  * This structure is not directly accessed by firmware or the service
-- * processor except for the first two pointers that point to the
-- * lppaca area and the ItLpRegSave area for this CPU.  The lppaca
-- * object is currently contained within the PACA but it doesn't need
-- * to be.
-+ * processor.
-  */
- struct paca_struct {
- 	/*
-@@ -55,14 +52,7 @@ struct paca_struct {
- 	 * avoid cacheline bouncing.
- 	 */
- 
--	/*
--	 * MAGIC: These first two pointers can't be moved - they're
--	 * accessed by the firmware
--	 */
- 	struct lppaca *lppaca_ptr;	/* Pointer to LpPaca for PLIC */
--#ifdef CONFIG_PPC_ISERIES
--	void *reg_save_ptr; /* Pointer to LpRegSave for PLIC */
--#endif /* CONFIG_PPC_ISERIES */
- 
- 	/*
- 	 * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 
---- a/include/asm-powerpc/page.h
-+++ b/include/asm-powerpc/page.h
-@@ -53,6 +53,7 @@
- 
- #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)
- #define KERNELBASE      (PAGE_OFFSET + PHYSICAL_START)
-+#define LOAD_OFFSET	PAGE_OFFSET
- 
- #ifdef CONFIG_FLATMEM
- #define pfn_valid(pfn)		((pfn) < max_mapnr)
---- a/include/asm-powerpc/page_32.h
-+++ b/include/asm-powerpc/page_32.h
-@@ -3,8 +3,6 @@
- 
- #define VM_DATA_DEFAULT_FLAGS	VM_DATA_DEFAULT_FLAGS32
- 
--#define PPC_MEMSTART	0
--
- #ifdef CONFIG_NOT_COHERENT_CACHE
- #define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES
- #endif
---- a/include/asm-powerpc/pasemi_dma.h
-+++ b/include/asm-powerpc/pasemi_dma.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2006 PA Semi, Inc
-+ * Copyright (C) 2006-2008 PA Semi, Inc
-  *
-  * Hardware register layout and descriptor formats for the on-board
-  * DMA engine on PA Semi PWRficient. Used by ethernet, function and security
-@@ -40,6 +40,11 @@ enum {
- 	PAS_DMA_COM_TXSTA = 0x104,	/* Transmit Status Register   */
- 	PAS_DMA_COM_RXCMD = 0x108,	/* Receive Command Register   */
- 	PAS_DMA_COM_RXSTA = 0x10c,	/* Receive Status Register    */
-+	PAS_DMA_COM_CFG   = 0x114,	/* Common config reg	      */
-+	PAS_DMA_TXF_SFLG0 = 0x140,	/* Set flags                  */
-+	PAS_DMA_TXF_SFLG1 = 0x144,	/* Set flags                  */
-+	PAS_DMA_TXF_CFLG0 = 0x148,	/* Set flags                  */
-+	PAS_DMA_TXF_CFLG1 = 0x14c,	/* Set flags                  */
- };
- 
- 
-@@ -123,11 +128,16 @@ enum {
- #define    PAS_DMA_TXCHAN_TCMDSTA_DA	0x00000100
- #define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
- #define    PAS_DMA_TXCHAN_CFG_TY_IFACE	0x00000000	/* Type = interface */
-+#define    PAS_DMA_TXCHAN_CFG_TY_COPY	0x00000001	/* Type = copy only */
-+#define    PAS_DMA_TXCHAN_CFG_TY_FUNC	0x00000002	/* Type = function */
-+#define    PAS_DMA_TXCHAN_CFG_TY_XOR	0x00000003	/* Type = xor only */
- #define    PAS_DMA_TXCHAN_CFG_TATTR_M	0x0000003c
- #define    PAS_DMA_TXCHAN_CFG_TATTR_S	2
- #define    PAS_DMA_TXCHAN_CFG_TATTR(x)	(((x) << PAS_DMA_TXCHAN_CFG_TATTR_S) & \
- 					 PAS_DMA_TXCHAN_CFG_TATTR_M)
--#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000001c0
-+#define    PAS_DMA_TXCHAN_CFG_LPDQ	0x00000800
-+#define    PAS_DMA_TXCHAN_CFG_LPSQ	0x00000400
-+#define    PAS_DMA_TXCHAN_CFG_WT_M	0x000003c0
- #define    PAS_DMA_TXCHAN_CFG_WT_S	6
- #define    PAS_DMA_TXCHAN_CFG_WT(x)	(((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
- 					 PAS_DMA_TXCHAN_CFG_WT_M)
-@@ -394,11 +404,62 @@ enum {
- 				 XCT_COPY_LLEN_M)
- #define XCT_COPY_SE		0x0000000000000001ull
- 
-+/* Function descriptor fields */
-+#define XCT_FUN_T		0x8000000000000000ull
-+#define XCT_FUN_ST		0x4000000000000000ull
-+#define XCT_FUN_RR_M		0x3000000000000000ull
-+#define XCT_FUN_RR_NORES	0x0000000000000000ull
-+#define XCT_FUN_RR_8BRES	0x1000000000000000ull
-+#define XCT_FUN_RR_24BRES	0x2000000000000000ull
-+#define XCT_FUN_RR_40BRES	0x3000000000000000ull
-+#define XCT_FUN_I		0x0800000000000000ull
-+#define XCT_FUN_O		0x0400000000000000ull
-+#define XCT_FUN_E		0x0200000000000000ull
-+#define XCT_FUN_FUN_M		0x01c0000000000000ull
-+#define XCT_FUN_FUN_S		54
-+#define XCT_FUN_FUN(x)		((((long)(x)) << XCT_FUN_FUN_S) & XCT_FUN_FUN_M)
-+#define XCT_FUN_CRM_M		0x0038000000000000ull
-+#define XCT_FUN_CRM_NOP		0x0000000000000000ull
-+#define XCT_FUN_CRM_SIG		0x0008000000000000ull
-+#define XCT_FUN_LLEN_M		0x0007ffff00000000ull
-+#define XCT_FUN_LLEN_S		32
-+#define XCT_FUN_LLEN(x)		((((long)(x)) << XCT_FUN_LLEN_S) & XCT_FUN_LLEN_M)
-+#define XCT_FUN_SHL_M		0x00000000f8000000ull
-+#define XCT_FUN_SHL_S		27
-+#define XCT_FUN_SHL(x)		((((long)(x)) << XCT_FUN_SHL_S) & XCT_FUN_SHL_M)
-+#define XCT_FUN_CHL_M		0x0000000007c00000ull
-+#define XCT_FUN_HSZ_M		0x00000000003c0000ull
-+#define XCT_FUN_ALG_M		0x0000000000038000ull
-+#define XCT_FUN_HP		0x0000000000004000ull
-+#define XCT_FUN_BCM_M		0x0000000000003800ull
-+#define XCT_FUN_BCP_M		0x0000000000000600ull
-+#define XCT_FUN_SIG_M		0x00000000000001f0ull
-+#define XCT_FUN_SIG_TCP4	0x0000000000000140ull
-+#define XCT_FUN_SIG_TCP6	0x0000000000000150ull
-+#define XCT_FUN_SIG_UDP4	0x0000000000000160ull
-+#define XCT_FUN_SIG_UDP6	0x0000000000000170ull
-+#define XCT_FUN_A		0x0000000000000008ull
-+#define XCT_FUN_C		0x0000000000000004ull
-+#define XCT_FUN_AL2		0x0000000000000002ull
-+#define XCT_FUN_SE		0x0000000000000001ull
-+
-+/* Function descriptor 8byte result fields */
-+#define XCT_FUNRES_8B_CS_M	0x0000ffff00000000ull
-+#define XCT_FUNRES_8B_CS_S	32
-+#define XCT_FUNRES_8B_CRC_M	0x00000000ffffffffull
-+#define XCT_FUNRES_8B_CRC_S	0
-+
- /* Control descriptor fields */
- #define CTRL_CMD_T		0x8000000000000000ull
- #define CTRL_CMD_META_EVT	0x2000000000000000ull
- #define CTRL_CMD_O		0x0400000000000000ull
--#define CTRL_CMD_REG_M		0x000000000000000full
-+#define CTRL_CMD_ETYPE_M	0x0038000000000000ull
-+#define CTRL_CMD_ETYPE_EXT	0x0000000000000000ull
-+#define CTRL_CMD_ETYPE_WSET	0x0020000000000000ull
-+#define CTRL_CMD_ETYPE_WCLR	0x0028000000000000ull
-+#define CTRL_CMD_ETYPE_SET	0x0030000000000000ull
-+#define CTRL_CMD_ETYPE_CLR	0x0038000000000000ull
-+#define CTRL_CMD_REG_M		0x000000000000007full
- #define CTRL_CMD_REG_S		0
- #define CTRL_CMD_REG(x)		((((long)(x)) << CTRL_CMD_REG_S) & \
- 				 CTRL_CMD_REG_M)
-@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct
- extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
- 				dma_addr_t *handle);
- 
-+/* Routines to allocate flags (events) for channel syncronization */
-+extern int  pasemi_dma_alloc_flag(void);
-+extern void pasemi_dma_free_flag(int flag);
-+extern void pasemi_dma_set_flag(int flag);
-+extern void pasemi_dma_clear_flag(int flag);
-+
-+/* Routines to allocate function engines */
-+extern int  pasemi_dma_alloc_fun(void);
-+extern void pasemi_dma_free_fun(int fun);
-+
- /* Initialize the library, must be called before any other functions */
- extern int pasemi_dma_init(void);
- 
---- a/include/asm-powerpc/pci-bridge.h
-+++ b/include/asm-powerpc/pci-bridge.h
-@@ -117,7 +117,7 @@ struct pci_controller {
- 
- #ifndef CONFIG_PPC64
- 
--static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
-+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
- {
- 	return bus->sysdata;
- }
-@@ -235,7 +235,7 @@ extern void pcibios_fixup_new_pci_device
- 
- extern int pcibios_remove_root_bus(struct pci_controller *phb);
- 
--static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
-+static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
- {
- 	struct device_node *busdn = bus->sysdata;
- 
---- a/include/asm-powerpc/pgtable-ppc32.h
-+++ b/include/asm-powerpc/pgtable-ppc32.h
-@@ -98,9 +98,6 @@ extern int icache_44x_need_flush;
- #define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)
- #define FIRST_USER_ADDRESS	0
- 
--#define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)
--#define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS)
--
- #define pte_ERROR(e) \
- 	printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
- 		(unsigned long long)pte_val(e))
-@@ -420,7 +417,8 @@ extern int icache_44x_need_flush;
- #define _PAGE_IO	(_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
- #define _PAGE_RAM	(_PAGE_KERNEL | _PAGE_HWEXEC)
- 
--#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH)
-+#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\
-+	defined(CONFIG_KPROBES)
- /* We want the debuggers to be able to set breakpoints anywhere, so
-  * don't write protect the kernel text */
- #define _PAGE_RAM_TEXT	_PAGE_RAM
-@@ -692,7 +690,7 @@ extern pgprot_t phys_mem_access_prot(str
- #define pmd_page_vaddr(pmd)	\
- 	((unsigned long) (pmd_val(pmd) & PAGE_MASK))
- #define pmd_page(pmd)		\
--	(mem_map + (__pa(pmd_val(pmd)) >> PAGE_SHIFT))
-+	pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))
- #endif
- 
- /* to find an entry in a kernel page-table-directory */
---- /dev/null
-+++ b/include/asm-powerpc/phyp_dump.h
-@@ -0,0 +1,47 @@
-+/*
-+ * Hypervisor-assisted dump
-+ *
-+ * Linas Vepstas, Manish Ahuja 2008
-+ * Copyright 2008 IBM Corp.
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifndef _PPC64_PHYP_DUMP_H
-+#define _PPC64_PHYP_DUMP_H
-+
-+#ifdef CONFIG_PHYP_DUMP
-+
-+/* The RMR region will be saved for later dumping
-+ * whenever the kernel crashes. Set this to 256MB. */
-+#define PHYP_DUMP_RMR_START 0x0
-+#define PHYP_DUMP_RMR_END   (1UL<<28)
-+
-+struct phyp_dump {
-+	/* Memory that is reserved during very early boot. */
-+	unsigned long init_reserve_start;
-+	unsigned long init_reserve_size;
-+	/* cmd line options during boot */
-+	unsigned long reserve_bootvar;
-+	unsigned long phyp_dump_at_boot;
-+	/* Check status during boot if dump supported, active & present*/
-+	unsigned long phyp_dump_configured;
-+	unsigned long phyp_dump_is_active;
-+	/* store cpu & hpte size */
-+	unsigned long cpu_state_size;
-+	unsigned long hpte_region_size;
-+	/* previous scratch area values */
-+	unsigned long reserved_scratch_addr;
-+	unsigned long reserved_scratch_size;
-+};
-+
-+extern struct phyp_dump *phyp_dump_info;
-+
-+int early_init_dt_scan_phyp_dump(unsigned long node,
-+		const char *uname, int depth, void *data);
-+
-+#endif /* CONFIG_PHYP_DUMP */
-+#endif /* _PPC64_PHYP_DUMP_H */
---- a/include/asm-powerpc/pmi.h
-+++ b/include/asm-powerpc/pmi.h
-@@ -29,8 +29,6 @@
- 
- #ifdef __KERNEL__
- 
--#include <asm/of_device.h>
--
- #define PMI_TYPE_FREQ_CHANGE	0x01
- #define PMI_READ_TYPE		0
- #define PMI_READ_DATA0		1
---- /dev/null
-+++ b/include/asm-powerpc/ppc4xx.h
-@@ -0,0 +1,18 @@
-+/*
-+ * PPC4xx Prototypes and definitions
-+ *
-+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
-+ *
-+ * This is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef __ASM_POWERPC_PPC4xx_H__
-+#define __ASM_POWERPC_PPC4xx_H__
-+
-+extern void ppc4xx_reset_system(char *cmd);
-+
-+#endif /* __ASM_POWERPC_PPC4xx_H__ */
---- a/include/asm-powerpc/ps3.h
-+++ b/include/asm-powerpc/ps3.h
-@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {
- };
- 
- void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
--void ps3_sys_manager_power_off(void);
--void ps3_sys_manager_restart(void);
-+void __noreturn ps3_sys_manager_power_off(void);
-+void __noreturn ps3_sys_manager_restart(void);
-+void __noreturn ps3_sys_manager_halt(void);
-+int ps3_sys_manager_get_wol(void);
-+void ps3_sys_manager_set_wol(int state);
- 
- struct ps3_prealloc {
-     const char *name;
---- a/include/asm-powerpc/ptrace.h
-+++ b/include/asm-powerpc/ptrace.h
-@@ -58,6 +58,11 @@ struct pt_regs {
- #define __ARCH_WANT_COMPAT_SYS_PTRACE
- 
- #define STACK_FRAME_OVERHEAD	112	/* size of minimum stack frame */
-+#define STACK_FRAME_LR_SAVE	2	/* Location of LR in stack frame */
-+#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x7265677368657265)
-+#define STACK_INT_FRAME_SIZE	(sizeof(struct pt_regs) + \
-+					STACK_FRAME_OVERHEAD + 288)
-+#define STACK_FRAME_MARKER	12
- 
- /* Size of dummy stack frame allocated when calling signal handler. */
- #define __SIGNAL_FRAMESIZE	128
-@@ -66,6 +71,10 @@ struct pt_regs {
- #else /* __powerpc64__ */
- 
- #define STACK_FRAME_OVERHEAD	16	/* size of minimum stack frame */
-+#define STACK_FRAME_LR_SAVE	1	/* Location of LR in stack frame */
-+#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x72656773)
-+#define STACK_INT_FRAME_SIZE	(sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)
-+#define STACK_FRAME_MARKER	2
- 
- /* Size of stack frame allocated when calling signal handler. */
- #define __SIGNAL_FRAMESIZE	64
---- a/include/asm-powerpc/qe.h
-+++ b/include/asm-powerpc/qe.h
-@@ -85,6 +85,7 @@ extern int par_io_data_set(u8 port, u8 p
- /* QE internal API */
- int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
- enum qe_clock qe_clock_source(const char *source);
-+unsigned int qe_get_brg_clk(void);
- int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
- int qe_get_snum(void);
- void qe_put_snum(u8 snum);
-@@ -92,7 +93,16 @@ unsigned long qe_muram_alloc(int size, i
- int qe_muram_free(unsigned long offset);
- unsigned long qe_muram_alloc_fixed(unsigned long offset, int size);
- void qe_muram_dump(void);
--void *qe_muram_addr(unsigned long offset);
-+
-+static inline void __iomem *qe_muram_addr(unsigned long offset)
-+{
-+	return (void __iomem *)&qe_immr->muram[offset];
-+}
-+
-+static inline unsigned long qe_muram_offset(void __iomem *addr)
-+{
-+	return addr - (void __iomem *)qe_immr->muram;
-+}
- 
- /* Structure that defines QE firmware binary files.
-  *
---- a/include/asm-powerpc/rwsem.h
-+++ b/include/asm-powerpc/rwsem.h
-@@ -32,11 +32,20 @@ struct rw_semaphore {
- #define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
- 	spinlock_t		wait_lock;
- 	struct list_head	wait_list;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+	struct lockdep_map	dep_map;
-+#endif
- };
- 
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }
-+#else
-+# define __RWSEM_DEP_MAP_INIT(lockname)
-+#endif
-+
- #define __RWSEM_INITIALIZER(name) \
--	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
--	  LIST_HEAD_INIT((name).wait_list) }
-+	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
-+	  LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
- 
- #define DECLARE_RWSEM(name)		\
- 	struct rw_semaphore name = __RWSEM_INITIALIZER(name)
-@@ -46,12 +55,15 @@ extern struct rw_semaphore *rwsem_down_w
- extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
- extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
- 
--static inline void init_rwsem(struct rw_semaphore *sem)
--{
--	sem->count = RWSEM_UNLOCKED_VALUE;
--	spin_lock_init(&sem->wait_lock);
--	INIT_LIST_HEAD(&sem->wait_list);
--}
-+extern void __init_rwsem(struct rw_semaphore *sem, const char *name,
-+			 struct lock_class_key *key);
-+
-+#define init_rwsem(sem)					\
-+	do {						\
-+		static struct lock_class_key __key;	\
-+							\
-+		__init_rwsem((sem), #sem, &__key);	\
-+	} while (0)
- 
- /*
-  * lock for reading
-@@ -78,7 +90,7 @@ static inline int __down_read_trylock(st
- /*
-  * lock for writing
-  */
--static inline void __down_write(struct rw_semaphore *sem)
-+static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
- {
- 	int tmp;
- 
-@@ -88,6 +100,11 @@ static inline void __down_write(struct r
- 		rwsem_down_write_failed(sem);
- }
- 
-+static inline void __down_write(struct rw_semaphore *sem)
-+{
-+	__down_write_nested(sem, 0);
-+}
-+
- static inline int __down_write_trylock(struct rw_semaphore *sem)
- {
- 	int tmp;
---- a/include/asm-powerpc/sparsemem.h
-+++ b/include/asm-powerpc/sparsemem.h
-@@ -15,6 +15,7 @@
- 
- #ifdef CONFIG_MEMORY_HOTPLUG
- extern void create_section_mapping(unsigned long start, unsigned long end);
-+extern int remove_section_mapping(unsigned long start, unsigned long end);
- #ifdef CONFIG_NUMA
- extern int hot_add_scn_to_nid(unsigned long scn_addr);
- #else
---- a/include/asm-powerpc/spinlock.h
-+++ b/include/asm-powerpc/spinlock.h
-@@ -19,6 +19,7 @@
-  *
-  * (the type definitions are in asm/spinlock_types.h)
-  */
-+#include <linux/irqflags.h>
- #ifdef CONFIG_PPC64
- #include <asm/paca.h>
- #include <asm/hvcall.h>
---- a/include/asm-powerpc/string.h
-+++ b/include/asm-powerpc/string.h
-@@ -7,6 +7,7 @@
- #define __HAVE_ARCH_STRNCPY
- #define __HAVE_ARCH_STRLEN
- #define __HAVE_ARCH_STRCMP
-+#define __HAVE_ARCH_STRNCMP
- #define __HAVE_ARCH_STRCAT
- #define __HAVE_ARCH_MEMSET
- #define __HAVE_ARCH_MEMCPY
-@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char *
- extern char * strncpy(char *,const char *, __kernel_size_t);
- extern __kernel_size_t strlen(const char *);
- extern int strcmp(const char *,const char *);
-+extern int strncmp(const char *, const char *, __kernel_size_t);
- extern char * strcat(char *, const char *);
- extern void * memset(void *,int,__kernel_size_t);
- extern void * memcpy(void *,const void *,__kernel_size_t);
---- a/include/asm-powerpc/types.h
-+++ b/include/asm-powerpc/types.h
-@@ -84,6 +84,13 @@ typedef unsigned long long u64;
- 
- typedef __vector128 vector128;
- 
-+/* Physical address used by some IO functions */
-+#if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)
-+typedef u64 phys_addr_t;
-+#else
-+typedef u32 phys_addr_t;
-+#endif
-+
- #ifdef __powerpc64__
- typedef u64 dma_addr_t;
- #else
---- /dev/null
-+++ b/include/asm-sparc64/lmb.h
-@@ -0,0 +1,10 @@
-+#ifndef _SPARC64_LMB_H
-+#define _SPARC64_LMB_H
-+
-+#include <asm/oplib.h>
-+
-+#define LMB_DBG(fmt...) prom_printf(fmt)
-+
-+#define LMB_REAL_LIMIT	0
-+
-+#endif /* !(_SPARC64_LMB_H) */
---- /dev/null
-+++ b/include/linux/lmb.h
-@@ -0,0 +1,85 @@
-+#ifndef _LINUX_LMB_H
-+#define _LINUX_LMB_H
-+#ifdef __KERNEL__
-+
-+/*
-+ * Logical memory blocks.
-+ *
-+ * Copyright (C) 2001 Peter Bergner, IBM Corp.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+
-+#define MAX_LMB_REGIONS 128
-+
-+struct lmb_property {
-+	u64 base;
-+	u64 size;
-+};
-+
-+struct lmb_region {
-+	unsigned long cnt;
-+	u64 size;
-+	struct lmb_property region[MAX_LMB_REGIONS+1];
-+};
-+
-+struct lmb {
-+	unsigned long debug;
-+	u64 rmo_size;
-+	struct lmb_region memory;
-+	struct lmb_region reserved;
-+};
-+
-+extern struct lmb lmb;
-+
-+extern void __init lmb_init(void);
-+extern void __init lmb_analyze(void);
-+extern long __init lmb_add(u64 base, u64 size);
-+extern long __init lmb_reserve(u64 base, u64 size);
-+extern u64 __init lmb_alloc_nid(u64 size, u64 align, int nid,
-+				u64 (*nid_range)(u64, u64, int *));
-+extern u64 __init lmb_alloc(u64 size, u64 align);
-+extern u64 __init lmb_alloc_base(u64 size,
-+		u64, u64 max_addr);
-+extern u64 __init __lmb_alloc_base(u64 size,
-+		u64 align, u64 max_addr);
-+extern u64 __init lmb_phys_mem_size(void);
-+extern u64 __init lmb_end_of_DRAM(void);
-+extern void __init lmb_enforce_memory_limit(u64 memory_limit);
-+extern int __init lmb_is_reserved(u64 addr);
-+
-+extern void lmb_dump_all(void);
-+
-+static inline u64
-+lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return type->region[region_nr].size;
-+}
-+static inline u64
-+lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
-+}
-+static inline u64
-+lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return type->region[region_nr].base >> PAGE_SHIFT;
-+}
-+static inline u64
-+lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
-+{
-+	return lmb_start_pfn(type, region_nr) +
-+	       lmb_size_pages(type, region_nr);
-+}
-+
-+#include <asm/lmb.h>
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _LINUX_LMB_H */
---- a/include/linux/of.h
-+++ b/include/linux/of.h
-@@ -62,6 +62,7 @@ extern struct property *of_find_property
- 					 int *lenp);
- extern int of_device_is_compatible(const struct device_node *device,
- 				   const char *);
-+extern int of_device_is_available(const struct device_node *device);
- extern const void *of_get_property(const struct device_node *node,
- 				const char *name,
- 				int *lenp);
---- /dev/null
-+++ b/include/linux/of_gpio.h
-@@ -0,0 +1,69 @@
-+/*
-+ * OF helpers for the GPIO API
-+ *
-+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
-+ *
-+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef __LINUX_OF_GPIO_H
-+#define __LINUX_OF_GPIO_H
-+
-+#include <linux/errno.h>
-+#include <asm/gpio.h>
-+
-+#ifdef CONFIG_OF_GPIO
-+
-+/*
-+ * Generic OF GPIO chip
-+ */
-+struct of_gpio_chip {
-+	struct gpio_chip gc;
-+	int gpio_cells;
-+	int (*xlate)(struct of_gpio_chip *of_gc, struct device_node *np,
-+		     const void *gpio_spec);
-+};
-+
-+static inline struct of_gpio_chip *to_of_gpio_chip(struct gpio_chip *gc)
-+{
-+	return container_of(gc, struct of_gpio_chip, gc);
-+}
-+
-+/*
-+ * OF GPIO chip for memory mapped banks
-+ */
-+struct of_mm_gpio_chip {
-+	struct of_gpio_chip of_gc;
-+	void (*save_regs)(struct of_mm_gpio_chip *mm_gc);
-+	void __iomem *regs;
-+};
-+
-+static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
-+{
-+	struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
-+
-+	return container_of(of_gc, struct of_mm_gpio_chip, of_gc);
-+}
-+
-+extern int of_get_gpio(struct device_node *np, int index);
-+extern int of_mm_gpiochip_add(struct device_node *np,
-+			      struct of_mm_gpio_chip *mm_gc);
-+extern int of_gpio_simple_xlate(struct of_gpio_chip *of_gc,
-+				struct device_node *np,
-+				const void *gpio_spec);
-+#else
-+
-+/* Drivers may not strictly depend on the GPIO support, so let them link. */
-+static inline int of_get_gpio(struct device_node *np, int index)
-+{
-+	return -ENOSYS;
-+}
-+
-+#endif /* CONFIG_OF_GPIO */
-+
-+#endif /* __LINUX_OF_GPIO_H */
---- /dev/null
-+++ b/include/linux/of_i2c.h
-@@ -0,0 +1,24 @@
-+/*
-+ * Generic I2C API implementation for PowerPC.
-+ *
-+ * Copyright (c) 2008 Jochen Friedrich <jochen@scram.de>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef __LINUX_OF_I2C_H
-+#define __LINUX_OF_I2C_H
-+
-+#include <linux/i2c.h>
-+
-+#ifdef CONFIG_OF_I2C
-+
-+void of_register_i2c_devices(struct i2c_adapter *adap,
-+			     struct device_node *adap_node);
-+
-+#endif /* CONFIG_OF_I2C */
-+
-+#endif /* __LINUX_OF_I2C_H */
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -141,4 +141,7 @@ config HAS_DMA
- config CHECK_SIGNATURE
- 	bool
- 
-+config HAVE_LMB
-+	boolean
-+
- endmenu
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-i
- 
- lib-$(CONFIG_GENERIC_BUG) += bug.o
- 
-+obj-$(CONFIG_HAVE_LMB) += lmb.o
-+
- hostprogs-y	:= gen_crc32table
- clean-files	:= crc32table.h
- 
---- /dev/null
-+++ b/lib/lmb.c
-@@ -0,0 +1,428 @@
-+/*
-+ * Procedures for maintaining information about logical memory blocks.
-+ *
-+ * Peter Bergner, IBM Corp.	June 2001.
-+ * Copyright (C) 2001 Peter Bergner.
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/bitops.h>
-+#include <linux/lmb.h>
-+
-+#define LMB_ALLOC_ANYWHERE	0
-+
-+struct lmb lmb;
-+
-+void lmb_dump_all(void)
-+{
-+#ifdef DEBUG
-+	unsigned long i;
-+
-+	pr_debug("lmb_dump_all:\n");
-+	pr_debug("    memory.cnt		  = 0x%lx\n", lmb.memory.cnt);
-+	pr_debug("    memory.size		  = 0x%llx\n",
-+	    (unsigned long long)lmb.memory.size);
-+	for (i=0; i < lmb.memory.cnt ;i++) {
-+		pr_debug("    memory.region[0x%x].base       = 0x%llx\n",
-+		    i, (unsigned long long)lmb.memory.region[i].base);
-+		pr_debug("		      .size     = 0x%llx\n",
-+		    (unsigned long long)lmb.memory.region[i].size);
-+	}
-+
-+	pr_debug("    reserved.cnt	  = 0x%lx\n", lmb.reserved.cnt);
-+	pr_debug("    reserved.size	  = 0x%lx\n", lmb.reserved.size);
-+	for (i=0; i < lmb.reserved.cnt ;i++) {
-+		pr_debug("    reserved.region[0x%x].base       = 0x%llx\n",
-+		    i, (unsigned long long)lmb.reserved.region[i].base);
-+		pr_debug("		      .size     = 0x%llx\n",
-+		    (unsigned long long)lmb.reserved.region[i].size);
-+	}
-+#endif /* DEBUG */
-+}
-+
-+static unsigned long __init lmb_addrs_overlap(u64 base1, u64 size1,
-+		u64 base2, u64 size2)
-+{
-+	return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
-+}
-+
-+static long __init lmb_addrs_adjacent(u64 base1, u64 size1,
-+		u64 base2, u64 size2)
-+{
-+	if (base2 == base1 + size1)
-+		return 1;
-+	else if (base1 == base2 + size2)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static long __init lmb_regions_adjacent(struct lmb_region *rgn,
-+		unsigned long r1, unsigned long r2)
-+{
-+	u64 base1 = rgn->region[r1].base;
-+	u64 size1 = rgn->region[r1].size;
-+	u64 base2 = rgn->region[r2].base;
-+	u64 size2 = rgn->region[r2].size;
-+
-+	return lmb_addrs_adjacent(base1, size1, base2, size2);
-+}
-+
-+static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
-+{
-+	unsigned long i;
-+
-+	for (i = r; i < rgn->cnt - 1; i++) {
-+		rgn->region[i].base = rgn->region[i + 1].base;
-+		rgn->region[i].size = rgn->region[i + 1].size;
-+	}
-+	rgn->cnt--;
-+}
-+
-+/* Assumption: base addr of region 1 < base addr of region 2 */
-+static void __init lmb_coalesce_regions(struct lmb_region *rgn,
-+		unsigned long r1, unsigned long r2)
-+{
-+	rgn->region[r1].size += rgn->region[r2].size;
-+	lmb_remove_region(rgn, r2);
-+}
-+
-+void __init lmb_init(void)
-+{
-+	/* Create a dummy zero size LMB which will get coalesced away later.
-+	 * This simplifies the lmb_add() code below...
-+	 */
-+	lmb.memory.region[0].base = 0;
-+	lmb.memory.region[0].size = 0;
-+	lmb.memory.cnt = 1;
-+
-+	/* Ditto. */
-+	lmb.reserved.region[0].base = 0;
-+	lmb.reserved.region[0].size = 0;
-+	lmb.reserved.cnt = 1;
-+}
-+
-+void __init lmb_analyze(void)
-+{
-+	int i;
-+
-+	lmb.memory.size = 0;
-+
-+	for (i = 0; i < lmb.memory.cnt; i++)
-+		lmb.memory.size += lmb.memory.region[i].size;
-+}
-+
-+static long __init lmb_add_region(struct lmb_region *rgn, u64 base, u64 size)
-+{
-+	unsigned long coalesced = 0;
-+	long adjacent, i;
-+
-+	if ((rgn->cnt == 1) && (rgn->region[0].size == 0)) {
-+		rgn->region[0].base = base;
-+		rgn->region[0].size = size;
-+		return 0;
-+	}
-+
-+	/* First try and coalesce this LMB with another. */
-+	for (i = 0; i < rgn->cnt; i++) {
-+		u64 rgnbase = rgn->region[i].base;
-+		u64 rgnsize = rgn->region[i].size;
-+
-+		if ((rgnbase == base) && (rgnsize == size))
-+			/* Already have this region, so we're done */
-+			return 0;
-+
-+		adjacent = lmb_addrs_adjacent(base, size, rgnbase, rgnsize);
-+		if (adjacent > 0) {
-+			rgn->region[i].base -= size;
-+			rgn->region[i].size += size;
-+			coalesced++;
-+			break;
-+		} else if (adjacent < 0) {
-+			rgn->region[i].size += size;
-+			coalesced++;
-+			break;
-+		}
-+	}
-+
-+	if ((i < rgn->cnt - 1) && lmb_regions_adjacent(rgn, i, i+1)) {
-+		lmb_coalesce_regions(rgn, i, i+1);
-+		coalesced++;
-+	}
-+
-+	if (coalesced)
-+		return coalesced;
-+	if (rgn->cnt >= MAX_LMB_REGIONS)
-+		return -1;
-+
-+	/* Couldn't coalesce the LMB, so add it to the sorted table. */
-+	for (i = rgn->cnt - 1; i >= 0; i--) {
-+		if (base < rgn->region[i].base) {
-+			rgn->region[i+1].base = rgn->region[i].base;
-+			rgn->region[i+1].size = rgn->region[i].size;
-+		} else {
-+			rgn->region[i+1].base = base;
-+			rgn->region[i+1].size = size;
-+			break;
-+		}
-+	}
-+
-+	if (base < rgn->region[0].base) {
-+		rgn->region[0].base = base;
-+		rgn->region[0].size = size;
-+	}
-+	rgn->cnt++;
-+
-+	return 0;
-+}
-+
-+long __init lmb_add(u64 base, u64 size)
-+{
-+	struct lmb_region *_rgn = &lmb.memory;
-+
-+	/* On pSeries LPAR systems, the first LMB is our RMO region. */
-+	if (base == 0)
-+		lmb.rmo_size = size;
-+
-+	return lmb_add_region(_rgn, base, size);
-+
-+}
-+
-+long __init lmb_reserve(u64 base, u64 size)
-+{
-+	struct lmb_region *_rgn = &lmb.reserved;
-+
-+	BUG_ON(0 == size);
-+
-+	return lmb_add_region(_rgn, base, size);
-+}
-+
-+long __init lmb_overlaps_region(struct lmb_region *rgn, u64 base, u64 size)
-+{
-+	unsigned long i;
-+
-+	for (i = 0; i < rgn->cnt; i++) {
-+		u64 rgnbase = rgn->region[i].base;
-+		u64 rgnsize = rgn->region[i].size;
-+		if (lmb_addrs_overlap(base, size, rgnbase, rgnsize))
-+			break;
-+	}
-+
-+	return (i < rgn->cnt) ? i : -1;
-+}
-+
-+static u64 lmb_align_down(u64 addr, u64 size)
-+{
-+	return addr & ~(size - 1);
-+}
-+
-+static u64 lmb_align_up(u64 addr, u64 size)
-+{
-+	return (addr + (size - 1)) & ~(size - 1);
-+}
-+
-+static u64 __init lmb_alloc_nid_unreserved(u64 start, u64 end,
-+					   u64 size, u64 align)
-+{
-+	u64 base, res_base;
-+	long j;
-+
-+	base = lmb_align_down((end - size), align);
-+	while (start <= base) {
-+		j = lmb_overlaps_region(&lmb.reserved, base, size);
-+		if (j < 0) {
-+			/* this area isn't reserved, take it */
-+			if (lmb_add_region(&lmb.reserved, base,
-+					   lmb_align_up(size, align)) < 0)
-+				base = ~(u64)0;
-+			return base;
-+		}
-+		res_base = lmb.reserved.region[j].base;
-+		if (res_base < size)
-+			break;
-+		base = lmb_align_down(res_base - size, align);
-+	}
-+
-+	return ~(u64)0;
-+}
-+
-+static u64 __init lmb_alloc_nid_region(struct lmb_property *mp,
-+				       u64 (*nid_range)(u64, u64, int *),
-+				       u64 size, u64 align, int nid)
-+{
-+	u64 start, end;
-+
-+	start = mp->base;
-+	end = start + mp->size;
-+
-+	start = lmb_align_up(start, align);
-+	while (start < end) {
-+		u64 this_end;
-+		int this_nid;
-+
-+		this_end = nid_range(start, end, &this_nid);
-+		if (this_nid == nid) {
-+			u64 ret = lmb_alloc_nid_unreserved(start, this_end,
-+							   size, align);
-+			if (ret != ~(u64)0)
-+				return ret;
-+		}
-+		start = this_end;
-+	}
-+
-+	return ~(u64)0;
-+}
-+
-+u64 __init lmb_alloc_nid(u64 size, u64 align, int nid,
-+			 u64 (*nid_range)(u64 start, u64 end, int *nid))
-+{
-+	struct lmb_region *mem = &lmb.memory;
-+	int i;
-+
-+	for (i = 0; i < mem->cnt; i++) {
-+		u64 ret = lmb_alloc_nid_region(&mem->region[i],
-+					       nid_range,
-+					       size, align, nid);
-+		if (ret != ~(u64)0)
-+			return ret;
-+	}
-+
-+	return lmb_alloc(size, align);
-+}
-+
-+u64 __init lmb_alloc(u64 size, u64 align)
-+{
-+	return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
-+}
-+
-+u64 __init lmb_alloc_base(u64 size, u64 align, u64 max_addr)
-+{
-+	u64 alloc;
-+
-+	alloc = __lmb_alloc_base(size, align, max_addr);
-+
-+	if (alloc == 0)
-+		panic("ERROR: Failed to allocate 0x%llx bytes below 0x%llx.\n",
-+		      (unsigned long long) size, (unsigned long long) max_addr);
-+
-+	return alloc;
-+}
-+
-+u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr)
-+{
-+	long i, j;
-+	u64 base = 0;
-+	u64 res_base;
-+
-+	BUG_ON(0 == size);
-+
-+	/* On some platforms, make sure we allocate lowmem */
-+	/* Note that LMB_REAL_LIMIT may be LMB_ALLOC_ANYWHERE */
-+	if (max_addr == LMB_ALLOC_ANYWHERE)
-+		max_addr = LMB_REAL_LIMIT;
-+
-+	for (i = lmb.memory.cnt - 1; i >= 0; i--) {
-+		u64 lmbbase = lmb.memory.region[i].base;
-+		u64 lmbsize = lmb.memory.region[i].size;
-+
-+		if (lmbsize < size)
-+			continue;
-+		if (max_addr == LMB_ALLOC_ANYWHERE)
-+			base = lmb_align_down(lmbbase + lmbsize - size, align);
-+		else if (lmbbase < max_addr) {
-+			base = min(lmbbase + lmbsize, max_addr);
-+			base = lmb_align_down(base - size, align);
-+		} else
-+			continue;
-+
-+		while (base && lmbbase <= base) {
-+			j = lmb_overlaps_region(&lmb.reserved, base, size);
-+			if (j < 0) {
-+				/* this area isn't reserved, take it */
-+				if (lmb_add_region(&lmb.reserved, base,
-+						   size) < 0)
-+					return 0;
-+				return base;
-+			}
-+			res_base = lmb.reserved.region[j].base;
-+			if (res_base < size)
-+				break;
-+			base = lmb_align_down(res_base - size, align);
-+		}
-+	}
-+	return 0;
-+}
-+
-+/* You must call lmb_analyze() before this. */
-+u64 __init lmb_phys_mem_size(void)
-+{
-+	return lmb.memory.size;
-+}
-+
-+u64 __init lmb_end_of_DRAM(void)
-+{
-+	int idx = lmb.memory.cnt - 1;
-+
-+	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
-+}
-+
-+/* You must call lmb_analyze() after this. */
-+void __init lmb_enforce_memory_limit(u64 memory_limit)
-+{
-+	unsigned long i;
-+	u64 limit;
-+	struct lmb_property *p;
-+
-+	if (!memory_limit)
-+		return;
-+
-+	/* Truncate the lmb regions to satisfy the memory limit. */
-+	limit = memory_limit;
-+	for (i = 0; i < lmb.memory.cnt; i++) {
-+		if (limit > lmb.memory.region[i].size) {
-+			limit -= lmb.memory.region[i].size;
-+			continue;
-+		}
-+
-+		lmb.memory.region[i].size = limit;
-+		lmb.memory.cnt = i + 1;
-+		break;
-+	}
-+
-+	if (lmb.memory.region[0].size < lmb.rmo_size)
-+		lmb.rmo_size = lmb.memory.region[0].size;
-+
-+	/* And truncate any reserves above the limit also. */
-+	for (i = 0; i < lmb.reserved.cnt; i++) {
-+		p = &lmb.reserved.region[i];
-+
-+		if (p->base > memory_limit)
-+			p->size = 0;
-+		else if ((p->base + p->size) > memory_limit)
-+			p->size = memory_limit - p->base;
-+
-+		if (p->size == 0) {
-+			lmb_remove_region(&lmb.reserved, i);
-+			i--;
-+		}
-+	}
-+}
-+
-+int __init lmb_is_reserved(u64 addr)
-+{
-+	int i;
-+
-+	for (i = 0; i < lmb.reserved.cnt; i++) {
-+		u64 upper = lmb.reserved.region[i].base +
-+			lmb.reserved.region[i].size - 1;
-+		if ((addr >= lmb.reserved.region[i].base) && (addr <= upper))
-+			return 1;
-+	}
-+	return 0;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index 395495ab1c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];	/* initially all NULL */
- static DEFINE_MUTEX(table_lock);
-@@ -903,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
-@@ -1315,3 +1316,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
deleted file mode 100644
index d1d162b02a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -775,7 +775,7 @@ static int noinline init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch b/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
deleted file mode 100644
index 20bf1efabc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/fs/jffs2/erase.c
-+++ b/fs/jffs2/erase.c
-@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
- {
- 	int ret;
- 	uint32_t bad_offset;
-+	static char s[]="|/-\\", *p=s;
-+
- #ifdef __ECOS
-        ret = jffs2_flash_erase(c, jeb);
-        if (!ret) {
-@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
- 
- 	D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
- 				jeb->offset, jeb->offset, jeb->offset + c->sector_size));
-+
-+	printk("%c\b", *p);
-+	if (*++p==0)
-+	p=s;
-+
- 	instr = kmalloc(sizeof(struct erase_info) + sizeof(struct erase_priv_struct), GFP_KERNEL);
- 	if (!instr) {
- 		printk(KERN_WARNING "kmalloc for struct erase_info in jffs2_erase_block failed. Refiling block for later\n");
diff --git a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
deleted file mode 100644
index cd5d6864fa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/include/linux/time.h
-+++ b/include/linux/time.h
-@@ -1,6 +1,10 @@
- #ifndef _LINUX_TIME_H
- #define _LINUX_TIME_H
- 
-+#ifndef __KERNEL__
-+#include <time.h>
-+#else
-+
- #include <linux/types.h>
- 
- #ifdef __KERNEL__
-@@ -232,4 +236,6 @@ struct itimerval {
-  */
- #define TIMER_ABSTIME			0x01
- 
-+#endif /* __KERNEL__ DEBIAN */
-+
- #endif
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -1,6 +1,14 @@
- #ifndef _LINUX_TYPES_H
- #define _LINUX_TYPES_H
- 
-+/* Debian: Use userland types instead.  */
-+#ifndef __KERNEL__
-+# include <sys/types.h>
-+/* For other kernel headers.  */
-+# include <linux/posix_types.h>
-+# include <asm/types.h>
-+#else
-+
- #ifdef	__KERNEL__
- 
- #define DECLARE_BITMAP(name,bits) \
-@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
- 
- #endif /* __KERNEL_STRICT_NAMES */
- 
-+#endif /* __KERNEL__ DEBIAN */
-+
- /*
-  * Below are truly Linux-specific types that should never collide with
-  * any application/library that wants linux/types.h.
diff --git a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
deleted file mode 100644
index 88c0421f03..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -28,6 +28,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #define KSYM_NAME_LEN		128
- 
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -93,6 +93,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
deleted file mode 100644
index c0bbf2c6ef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED ) 
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = dev->priv;
-+       local_info_t *local = iface->local;
-+               
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
deleted file mode 100644
index 8fc9381a69..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/904-ls_time_locale.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -125,7 +125,7 @@ parse() {
- 			str="${ftype} ${name} ${location} ${str}"
- 			;;
- 		"nod")
--			local dev=`LC_ALL=C ls -l "${location}"`
-+			local dev=`LC_ALL=C ls -l --time-style=locale "${location}"`
- 			local maj=`field 5 ${dev}`
- 			local min=`field 6 ${dev}`
- 			maj=${maj%,}
-@@ -135,7 +135,7 @@ parse() {
- 			str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
- 			;;
- 		"slink")
--			local target=`field 11 $(LC_ALL=C ls -l "${location}")`
-+			local target=`field 11 $(LC_ALL=C ls -l --time-style=locale "${location}")`
- 			str="${ftype} ${name} ${target} ${str}"
- 			;;
- 		*)
diff --git a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch b/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch
deleted file mode 100644
index 128e0db949..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/906-msdosfs_header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/include/linux/msdos_fs.h
-+++ b/include/linux/msdos_fs.h
-@@ -57,11 +57,13 @@
- #define MSDOS_DOT	".          "	/* ".", padded to MSDOS_NAME chars */
- #define MSDOS_DOTDOT	"..         "	/* "..", padded to MSDOS_NAME chars */
- 
-+#ifdef __KERNEL__
- /* media of boot sector */
- static inline int fat_valid_media(u8 media)
- {
- 	return 0xf8 <= media || media == 0xf0;
- }
-+#endif
- 
- #define FAT_FIRST_ENT(s, x)	((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
- 	MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
diff --git a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch b/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
deleted file mode 100644
index 29725148b0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -627,12 +627,10 @@ static int __devinit m25p_probe(struct s
- 		struct mtd_partition	*parts = NULL;
- 		int			nr_parts = 0;
- 
--#ifdef CONFIG_MTD_CMDLINE_PARTS
--		static const char *part_probes[] = { "cmdlinepart", NULL, };
-+		static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL, };
- 
- 		nr_parts = parse_mtd_partitions(&flash->mtd,
- 				part_probes, &parts, 0);
--#endif
- 
- 		if (nr_parts <= 0 && data && data->parts) {
- 			parts = data->parts;
diff --git a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
deleted file mode 100644
index a80482842d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- /dev/null
-+++ b/include/linux/spi/spi_gpio.h
-@@ -0,0 +1,72 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio.c
-@@ -0,0 +1,249 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -100,6 +100,19 @@ config SPI_BUTTERFLY
- 	  inexpensive battery powered microcontroller evaluation board.
- 	  This same cable can be used to flash new firmware.
- 
-+config SPI_GPIO
-+	tristate "GPIO API based bitbanging SPI controller"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This is a platform driver that can be used for bitbanging
-+	  an SPI bus over GPIO pins.
-+	  Select this if you have any SPI device that is connected via
-+	  GPIO pins.
-+	  The module will be called spi_gpio.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.
- obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
-+obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
deleted file mode 100644
index b775a0e6bf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/922-gpiommc.patch
+++ /dev/null
@@ -1,818 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,605 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -130,3 +130,27 @@ config MMC_SPI
- 
- 	  If unsure, or if your system has no SPI master driver, say N.
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)		+= omap.o
- obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
- obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
- obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o
--
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,69 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
diff --git a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index c84f62b447..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -140,6 +140,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -230,6 +232,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -290,6 +294,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -349,6 +355,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -474,6 +482,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -510,6 +520,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
deleted file mode 100644
index 25abf821df..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/930-ppc_big_endian_io_memory_accessors.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From a.othieno@bluewin.ch Tue Oct 11 07:50:21 2005
-From: Arthur Othieno <a.othieno@bluewin.ch>
-Subject: Big-endian I/O memory accessors.
-Date: Tue, 11 Oct 2005 07:50:21 +1000
-X-Patchwork-ID: 2759
-
-From: Arthur Othieno <a.othieno@bluewin.ch>
-
-I/O memory accessors. Big endian version. For those busses/devices
-that do export big-endian I/O memory.
-
-Of notable relevance/reference:
-
-  http://lwn.net/Articles/132804/
-  http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019798.html
-  http://ozlabs.org/pipermail/linuxppc-embedded/2005-August/019752.html
-
-Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
----
-
-Paulus, 
-
-A similar patch for ppc64 made it upstream with your big ppc64 merge.
-This one is still sitting in http://patchwork.ozlabs.org/linuxppc/
-and didn't make it with the ppc32 equivalent. Thanks.
-
-
- include/asm-ppc/io.h |   20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-
----
---- a/include/asm-ppc/io.h
-+++ b/include/asm-ppc/io.h
-@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void
- 	return readw(addr);
- }
- 
-+static inline unsigned int ioread16be(void __iomem *addr)
-+{
-+	return in_be16(addr);
-+}
-+
- static inline unsigned int ioread32(void __iomem *addr)
- {
- 	return readl(addr);
- }
- 
-+static inline unsigned int ioread32be(void __iomem *addr)
-+{
-+	return in_be32(addr);
-+}
-+
- static inline void iowrite8(u8 val, void __iomem *addr)
- {
- 	writeb(val, addr);
-@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo
- 	writew(val, addr);
- }
- 
-+static inline void iowrite16be(u16 val, void __iomem *addr)
-+{
-+	out_be16(addr, val);
-+}
-+
- static inline void iowrite32(u32 val, void __iomem *addr)
- {
- 	writel(val, addr);
- }
- 
-+static inline void iowrite32be(u32 val, void __iomem *addr)
-+{
-+	out_be32(addr, val);
-+}
-+
- static inline void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
- {
- 	_insb(addr, dst, count);
diff --git a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
deleted file mode 100644
index 3fd993812a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -12,7 +12,7 @@
- #
- #   http://www.arm.linux.org.uk/developer/machines/?action=new
- #
--# Last update: Sat Jan 26 14:45:34 2008
-+# Last update: Sat Apr 19 15:13:28 2008
- #
- # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
- #
-@@ -381,13 +381,13 @@ ks8695p			ARCH_KS8695P		KS8695P			363
- se4000			ARCH_SE4000		SE4000			364
- quadriceps		ARCH_QUADRICEPS		QUADRICEPS		365
- bronco			ARCH_BRONCO		BRONCO			366
--esl_wireless_tab	ARCH_ESL_WIRELESS_TABLETESL_WIRELESS_TABLET	367
-+esl_wireless_tab	ARCH_ESL_WIRELESS_TAB	ESL_WIRELESS_TAB	367
- esl_sofcomp		ARCH_ESL_SOFCOMP	ESL_SOFCOMP		368
- s5c7375			ARCH_S5C7375		S5C7375			369
- spearhead		ARCH_SPEARHEAD		SPEARHEAD		370
- pantera			ARCH_PANTERA		PANTERA			371
- prayoglite		ARCH_PRAYOGLITE		PRAYOGLITE		372
--gumstix			ARCH_GUMSTIK		GUMSTIK			373
-+gumstix			ARCH_GUMSTIX		GUMSTIX			373
- rcube			ARCH_RCUBE		RCUBE			374
- rea_olv			ARCH_REA_OLV		REA_OLV			375
- pxa_iphone		ARCH_PXA_IPHONE		PXA_IPHONE		376
-@@ -1463,7 +1463,7 @@ artemis			MACH_ARTEMIS		ARTEMIS			1462
- htctitan		MACH_HTCTITAN		HTCTITAN		1463
- qranium			MACH_QRANIUM		QRANIUM			1464
- adx_wsc2		MACH_ADX_WSC2		ADX_WSC2		1465
--adx_medinet		MACH_ADX_MEDINET	ADX_MEDINET		1466
-+adx_medcom		MACH_ADX_MEDINET	ADX_MEDINET		1466
- bboard			MACH_BBOARD		BBOARD			1467
- cambria			MACH_CAMBRIA		CAMBRIA			1468
- mt7xxx			MACH_MT7XXX		MT7XXX			1469
-@@ -1611,3 +1611,112 @@ kb9263			MACH_KB9263		KB9263			1612
- mt7108			MACH_MT7108		MT7108			1613
- smtr2440		MACH_SMTR2440		SMTR2440		1614
- manao			MACH_MANAO		MANAO			1615
-+cm_x300			MACH_CM_X300		CM_X300			1616
-+gulfstream_kp		MACH_GULFSTREAM_KP	GULFSTREAM_KP		1617
-+lanreadyfn522		MACH_LANREADYFN522	LANREADYFN522		1618
-+arma37			MACH_ARMA37		ARMA37			1619
-+mendel			MACH_MENDEL		MENDEL			1620
-+pelco_iliad		MACH_PELCO_ILIAD	PELCO_ILIAD		1621
-+unit2p			MACH_UNIT2P		UNIT2P			1622
-+inc20otter		MACH_INC20OTTER		INC20OTTER		1623
-+at91sam9g20ek		MACH_AT91SAM9G20EK	AT91SAM9G20EK		1624
-+sc_ge2			MACH_STORCENTER		STORCENTER		1625
-+smdk6410		MACH_SMDK6410		SMDK6410		1626
-+u300			MACH_U300		U300			1627
-+u500			MACH_U500		U500			1628
-+ds9260			MACH_DS9260		DS9260			1629
-+riverrock		MACH_RIVERROCK		RIVERROCK		1630
-+scibath			MACH_SCIBATH		SCIBATH			1631
-+at91sam7se		MACH_AT91SAM7SE512EK	AT91SAM7SE512EK		1632
-+wrt350n_v2		MACH_WRT350N_V2		WRT350N_V2		1633
-+multimedia		MACH_MULTIMEDIA		MULTIMEDIA		1634
-+marvin			MACH_MARVIN		MARVIN			1635
-+x500			MACH_X500		X500			1636
-+awlug4lcu		MACH_AWLUG4LCU		AWLUG4LCU		1637
-+palermoc		MACH_PALERMOC		PALERMOC		1638
-+omap_ldp		MACH_OMAP_LDP		OMAP_LDP		1639
-+ip500			MACH_IP500		IP500			1640
-+mx35ads			MACH_MACH_MX35ADS	MACH_MX35ADS		1641
-+ase2			MACH_ASE2		ASE2			1642
-+mx35evb			MACH_MX35EVB		MX35EVB			1643
-+aml_m8050		MACH_AML_M8050		AML_M8050		1644
-+mx35_3ds		MACH_MX35_3DS		MX35_3DS		1645
-+mars			MACH_MARS		MARS			1646
-+ntosd_644xa		MACH_NTOSD_644XA	NTOSD_644XA		1647
-+badger			MACH_BADGER		BADGER			1648
-+trizeps4wl		MACH_TRIZEPS4WL		TRIZEPS4WL		1649
-+trizeps5		MACH_TRIZEPS5		TRIZEPS5		1650
-+marlin			MACH_MARLIN		MARLIN			1651
-+ts7800			MACH_TS7800		TS7800			1652
-+hpipaq214		MACH_HPIPAQ214		HPIPAQ214		1653
-+at572d940dcm		MACH_AT572D940DCM	AT572D940DCM		1654
-+ne1board		MACH_NE1BOARD		NE1BOARD		1655
-+zante			MACH_ZANTE		ZANTE			1656
-+sffsdr			MACH_SFFSDR		SFFSDR			1657
-+tw2662			MACH_TW2662		TW2662			1658
-+vf10xx			MACH_VF10XX		VF10XX			1659
-+zoran43xx		MACH_ZORAN43XX		ZORAN43XX		1660
-+sonix926		MACH_SONIX926		SONIX926		1661
-+celestialsemi		MACH_CELESTIALSEMI	CELESTIALSEMI		1662
-+cc9m2443		MACH_CC9M2443		CC9M2443		1663
-+tw5334			MACH_TW5334		TW5334			1664
-+omap_htcartemis		MACH_HTCARTEMIS		HTCARTEMIS		1665
-+nal_hlite		MACH_NAL_HLITE		NAL_HLITE		1666
-+htcvogue		MACH_HTCVOGUE		HTCVOGUE		1667
-+smartweb		MACH_SMARTWEB		SMARTWEB		1668
-+mv86xx			MACH_MV86XX		MV86XX			1669
-+mv87xx			MACH_MV87XX		MV87XX			1670
-+songyoungho		MACH_SONGYOUNGHO	SONGYOUNGHO		1671
-+younghotema		MACH_YOUNGHOTEMA	YOUNGHOTEMA		1672
-+pcm037			MACH_PCM037		PCM037			1673
-+mmvp			MACH_MMVP		MMVP			1674
-+mmap			MACH_MMAP		MMAP			1675
-+ptid2410		MACH_PTID2410		PTID2410		1676
-+james_926		MACH_JAMES_926		JAMES_926		1677
-+fm6000			MACH_FM6000		FM6000			1678
-+db88f6281_bp		MACH_DB88F6281_BP	DB88F6281_BP		1680
-+rd88f6192_nas		MACH_RD88F6192_NAS	RD88F6192_NAS		1681
-+rd88f6281		MACH_RD88F6281		RD88F6281		1682
-+db78x00_bp		MACH_DB78X00_BP		DB78X00_BP		1683
-+smdk2416		MACH_SMDK2416		SMDK2416		1685
-+oce_spider_si		MACH_OCE_SPIDER_SI	OCE_SPIDER_SI		1686
-+oce_spider_sk		MACH_OCE_SPIDER_SK	OCE_SPIDER_SK		1687
-+rovern6			MACH_ROVERN6		ROVERN6			1688
-+pelco_evolution		MACH_PELCO_EVOLUTION	PELCO_EVOLUTION		1689
-+wbd111			MACH_WBD111		WBD111			1690
-+elaracpe		MACH_ELARACPE		ELARACPE		1691
-+mabv3			MACH_MABV3		MABV3			1692
-+mv2120			MACH_MV2120		MV2120			1693
-+csb737			MACH_CSB737		CSB737			1695
-+mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
-+g900			MACH_G900		G900			1697
-+apf27			MACH_APF27		APF27			1698
-+ggus2000		MACH_GGUS2000		GGUS2000		1699
-+omap_2430_mimic		MACH_OMAP_2430_MIMIC	OMAP_2430_MIMIC		1700
-+imx27lite		MACH_IMX27LITE		IMX27LITE		1701
-+almex			MACH_ALMEX		ALMEX			1702
-+control			MACH_CONTROL		CONTROL			1703
-+mba2410			MACH_MBA2410		MBA2410			1704
-+volcano			MACH_VOLCANO		VOLCANO			1705
-+zenith			MACH_ZENITH		ZENITH			1706
-+muchip			MACH_MUCHIP		MUCHIP			1707
-+magellan		MACH_MAGELLAN		MAGELLAN		1708
-+usb_a9260		MACH_USB_A9260		USB_A9260		1709
-+usb_a9263		MACH_USB_A9263		USB_A9263		1710
-+qil_a9260		MACH_QIL_A9260		QIL_A9260		1711
-+cme9210			MACH_CME9210		CME9210			1712
-+hczh4			MACH_HCZH4		HCZH4			1713
-+spearbasic		MACH_SPEARBASIC		SPEARBASIC		1714
-+dep2440			MACH_DEP2440		DEP2440			1715
-+hdl_gxr			MACH_HDL_GXR		HDL_GXR			1716
-+hdl_gt			MACH_HDL_GT		HDL_GT			1717
-+hdl_4g			MACH_HDL_4G		HDL_4G			1718
-+s3c6000			MACH_S3C6000		S3C6000			1719
-+mmsp2_mdk		MACH_MMSP2_MDK		MMSP2_MDK		1720
-+mpx220			MACH_MPX220		MPX220			1721
-+kzm_arm11_01		MACH_KZM_ARM11_01	KZM_ARM11_01		1722
-+htc_polaris		MACH_HTC_POLARIS	HTC_POLARIS		1723
-+htc_kaiser		MACH_HTC_KAISER		HTC_KAISER		1724
-+lg_ks20			MACH_LG_KS20		LG_KS20			1725
-+hhgps			MACH_HHGPS		HHGPS			1726
-+nokia_n810_wimax	MACH_NOKIA_N810_WIMAX	NOKIA_N810_WIMAX	1727
diff --git a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
deleted file mode 100644
index 8da25daa75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-Date: Mon, 28 Apr 2008 09:14:44 +0000 (-0700)
-Subject: gpiolib: better rmmod infrastructure
-X-Git-Tag: v2.6.26-rc1~851
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=438d8908b379b6322fc3b28d45c9ebdddf58bc20
-
-gpiolib: better rmmod infrastructure
-
-As long as one or more GPIOs on a gpio chip are used its driver should not be
-unloaded.  The existing mechanism (gpiochip_remove failure) doesn't address
-that, since rmmod can no longer be made to fail by having the cleanup code
-report errors.  Module usecounts are the solution.
-
-Assuming standard "initialize struct to zero" policies, this change won't
-affect SOC platform drivers.  However, drivers for external chips (on I2C and
-SPI busses) should be updated if they can be built as modules.
-
-Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-[ gpio_ensure_requested() needs to update module usecounts too ]
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct
- 	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
- 		pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
- 		desc_set_label(desc, "[auto]");
-+		if (!try_module_get(desc->chip->owner))
-+			pr_err("GPIO-%d: module can't be gotten \n",
-+					(int)(desc - gpio_desc));
- 	}
- }
- 
-@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const ch
- 	if (desc->chip == NULL)
- 		goto done;
- 
-+	if (!try_module_get(desc->chip->owner))
-+		goto done;
-+
- 	/* NOTE:  gpio_request() can be called in early boot,
- 	 * before IRQs are enabled.
- 	 */
-@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const ch
- 	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
- 		desc_set_label(desc, label ? : "?");
- 		status = 0;
--	} else
-+	} else {
- 		status = -EBUSY;
-+		module_put(desc->chip->owner);
-+	}
- 
- done:
- 	if (status)
-@@ -209,9 +217,10 @@ void gpio_free(unsigned gpio)
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
- 	desc = &gpio_desc[gpio];
--	if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags))
-+	if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags)) {
- 		desc_set_label(desc, NULL);
--	else
-+		module_put(desc->chip->owner);
-+	} else
- 		WARN_ON(extra_checks);
- 
- 	spin_unlock_irqrestore(&gpio_lock, flags);
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -17,6 +17,7 @@
- #endif
- 
- struct seq_file;
-+struct module;
- 
- /**
-  * struct gpio_chip - abstract a GPIO controller
-@@ -48,6 +49,7 @@ struct seq_file;
-  */
- struct gpio_chip {
- 	char			*label;
-+	struct module		*owner;
- 
- 	int			(*direction_input)(struct gpio_chip *chip,
- 						unsigned offset);
diff --git a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
deleted file mode 100644
index 771b743baf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-Date: Mon, 28 Apr 2008 09:14:46 +0000 (-0700)
-Subject: gpio: define gpio_is_valid()
-X-Git-Tag: v2.6.26-rc1~849
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e6de1808f8ebfeb7e49f3c5a30cb8f2032beb287
-
-gpio: define gpio_is_valid()
-
-Introduce a gpio_is_valid() predicate; use it in gpiolib.
-
-Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
-    [ use inline function; follow the gpio_* naming convention;
-      work without gpiolib; all programming interfaces need docs ]
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/Documentation/gpio.txt
-+++ b/Documentation/gpio.txt
-@@ -107,6 +107,16 @@ type of GPIO controller, and on one part
- The numbers need not be contiguous; either of those platforms could also
- use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders.
- 
-+If you want to initialize a structure with an invalid GPIO number, use
-+some negative number (perhaps "-EINVAL"); that will never be valid.  To
-+test if a number could reference a GPIO, you may use this predicate:
-+
-+	int gpio_is_valid(int number);
-+
-+A number that's not valid will be rejected by calls which may request
-+or free GPIOs (see below).  Other numbers may also be rejected; for
-+example, a number might be valid but unused on a given board.
-+
- Whether a platform supports multiple GPIO controllers is currently a
- platform-specific implementation issue.
- 
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
- 	 * dynamic allocation.  We don't currently support that.
- 	 */
- 
--	if (chip->base < 0 || (chip->base  + chip->ngpio) >= ARCH_NR_GPIOS) {
-+	if (chip->base < 0 || !gpio_is_valid(chip->base  + chip->ngpio)) {
- 		status = -EINVAL;
- 		goto fail;
- 	}
-@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const ch
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto done;
- 	desc = &gpio_desc[gpio];
- 	if (desc->chip == NULL)
-@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
- 	unsigned long		flags;
- 	struct gpio_desc	*desc;
- 
--	if (gpio >= ARCH_NR_GPIOS) {
-+	if (!gpio_is_valid(gpio)) {
- 		WARN_ON(extra_checks);
- 		return;
- 	}
-@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct
- {
- 	unsigned gpio = chip->base + offset;
- 
--	if (gpio >= ARCH_NR_GPIOS || gpio_desc[gpio].chip != chip)
-+	if (!gpio_is_valid(gpio) || gpio_desc[gpio].chip != chip)
- 		return NULL;
- 	if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
- 		return NULL;
-@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto fail;
- 	chip = desc->chip;
- 	if (!chip || !chip->get || !chip->direction_input)
-@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio,
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
--	if (gpio >= ARCH_NR_GPIOS)
-+	if (!gpio_is_valid(gpio))
- 		goto fail;
- 	chip = desc->chip;
- 	if (!chip || !chip->set || !chip->direction_output)
-@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file 
- 
- 	/* REVISIT this isn't locked against gpio_chip removal ... */
- 
--	for (gpio = 0; gpio < ARCH_NR_GPIOS; gpio++) {
-+	for (gpio = 0; gpio_is_valid(gpio); gpio++) {
- 		if (chip == gpio_desc[gpio].chip)
- 			continue;
- 		chip = gpio_desc[gpio].chip;
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -16,6 +16,12 @@
- #define ARCH_NR_GPIOS		256
- #endif
- 
-+static inline int gpio_is_valid(int number)
-+{
-+	/* only some non-negative numbers are valid */
-+	return ((unsigned)number) < ARCH_NR_GPIOS;
-+}
-+
- struct seq_file;
- struct module;
- 
-@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio
- 
- #else
- 
-+static inline int __gpio_is_valid(int number)
-+{
-+	/* only non-negative numbers are valid */
-+	return number >= 0;
-+}
-+
-+#ifndef gpio_is_valid
-+#define gpio_is_valid	__gpio_is_valid
-+#endif
-+
- /* platforms that don't directly support access to GPIOs through I2C, SPI,
-  * or other blocking infrastructure can use these wrappers.
-  */
diff --git a/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch b/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch
deleted file mode 100644
index 0960f6764d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/962-backport_gpiolib_dynamic_gpio_number_allocation.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Mon, 28 Apr 2008 09:14:46 +0000 (-0700)
-Subject: gpiolib: dynamic gpio number allocation
-X-Git-Tag: v2.6.26-rc1~848
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8d0aab2f16c4fa170f32e7a74a52cd0122bbafef
-
-gpiolib: dynamic gpio number allocation
-
-If gpio_chip->base is negative during registration, gpiolib performs dynamic
-base allocation.  This is useful for devices that aren't always present, such
-as GPIOs on hotplugged devices rather than mainboards.  (This behavior was
-previously specified but not implemented.)
-
-To avoid using any numbers that may have been explicitly assigned but not yet
-registered, this dynamic allocation assigns GPIO numbers from the biggest
-number on down, instead of from the smallest on up.
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -80,6 +80,33 @@ static inline struct gpio_chip *gpio_to_
- 	return gpio_desc[gpio].chip;
- }
- 
-+/* dynamic allocation of GPIOs, e.g. on a hotplugged device */
-+static int gpiochip_find_base(int ngpio)
-+{
-+	int i;
-+	int spare = 0;
-+	int base = -ENOSPC;
-+
-+	for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
-+		struct gpio_chip *chip = gpio_desc[i].chip;
-+
-+		if (!chip) {
-+			spare++;
-+			if (spare == ngpio) {
-+				base = i;
-+				break;
-+			}
-+		} else {
-+			spare = 0;
-+			i -= chip->ngpio - 1;
-+		}
-+	}
-+
-+	if (gpio_is_valid(base))
-+		pr_debug("%s: found new base at %d\n", __func__, base);
-+	return base;
-+}
-+
- /**
-  * gpiochip_add() - register a gpio_chip
-  * @chip: the chip to register, with chip->base initialized
-@@ -88,38 +115,49 @@ static inline struct gpio_chip *gpio_to_
-  * Returns a negative errno if the chip can't be registered, such as
-  * because the chip->base is invalid or already associated with a
-  * different chip.  Otherwise it returns zero as a success code.
-+ *
-+ * If chip->base is negative, this requests dynamic assignment of
-+ * a range of valid GPIOs.
-  */
- int gpiochip_add(struct gpio_chip *chip)
- {
- 	unsigned long	flags;
- 	int		status = 0;
- 	unsigned	id;
-+	int		base = chip->base;
- 
--	/* NOTE chip->base negative is reserved to mean a request for
--	 * dynamic allocation.  We don't currently support that.
--	 */
--
--	if (chip->base < 0 || !gpio_is_valid(chip->base  + chip->ngpio)) {
-+	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
-+			&& base >= 0) {
- 		status = -EINVAL;
- 		goto fail;
- 	}
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
- 
-+	if (base < 0) {
-+		base = gpiochip_find_base(chip->ngpio);
-+		if (base < 0) {
-+			status = base;
-+			goto fail_unlock;
-+		}
-+		chip->base = base;
-+	}
-+
- 	/* these GPIO numbers must not be managed by another gpio_chip */
--	for (id = chip->base; id < chip->base + chip->ngpio; id++) {
-+	for (id = base; id < base + chip->ngpio; id++) {
- 		if (gpio_desc[id].chip != NULL) {
- 			status = -EBUSY;
- 			break;
- 		}
- 	}
- 	if (status == 0) {
--		for (id = chip->base; id < chip->base + chip->ngpio; id++) {
-+		for (id = base; id < base + chip->ngpio; id++) {
- 			gpio_desc[id].chip = chip;
- 			gpio_desc[id].flags = 0;
- 		}
- 	}
- 
-+fail_unlock:
- 	spin_unlock_irqrestore(&gpio_lock, flags);
- fail:
- 	/* failures here can mean systems won't boot... */
diff --git a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch b/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch
deleted file mode 100644
index abf77c3559..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Mon, 28 Apr 2008 09:14:47 +0000 (-0700)
-Subject: gpiochip_reserve()
-X-Git-Tag: v2.6.26-rc1~847
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=169b6a7a6e91e1ea32136681b475cbaf2074bf35
-
-gpiochip_reserve()
-
-Add a new function gpiochip_reserve() to reserve ranges of gpios that platform
-code has pre-allocated.  That is, this marks gpio numbers which will be
-claimed by drivers that haven't yet been loaded, and thus are not available
-for dynamic gpio number allocation.
-
-[akpm@linux-foundation.org: remove unneeded __must_check]
-[david-b@pacbell.net: don't export gpiochip_reserve (section fix)]
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -43,6 +43,7 @@ struct gpio_desc {
- /* flag symbols are bit numbers */
- #define FLAG_REQUESTED	0
- #define FLAG_IS_OUT	1
-+#define FLAG_RESERVED	2
- 
- #ifdef CONFIG_DEBUG_FS
- 	const char		*label;
-@@ -88,9 +89,10 @@ static int gpiochip_find_base(int ngpio)
- 	int base = -ENOSPC;
- 
- 	for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
--		struct gpio_chip *chip = gpio_desc[i].chip;
-+		struct gpio_desc *desc = &gpio_desc[i];
-+		struct gpio_chip *chip = desc->chip;
- 
--		if (!chip) {
-+		if (!chip && !test_bit(FLAG_RESERVED, &desc->flags)) {
- 			spare++;
- 			if (spare == ngpio) {
- 				base = i;
-@@ -98,7 +100,8 @@ static int gpiochip_find_base(int ngpio)
- 			}
- 		} else {
- 			spare = 0;
--			i -= chip->ngpio - 1;
-+			if (chip)
-+				i -= chip->ngpio - 1;
- 		}
- 	}
- 
-@@ -108,6 +111,47 @@ static int gpiochip_find_base(int ngpio)
- }
- 
- /**
-+ * gpiochip_reserve() - reserve range of gpios to use with platform code only
-+ * @start: starting gpio number
-+ * @ngpio: number of gpios to reserve
-+ * Context: platform init, potentially before irqs or kmalloc will work
-+ *
-+ * Returns a negative errno if any gpio within the range is already reserved
-+ * or registered, else returns zero as a success code.  Use this function
-+ * to mark a range of gpios as unavailable for dynamic gpio number allocation,
-+ * for example because its driver support is not yet loaded.
-+ */
-+int __init gpiochip_reserve(int start, int ngpio)
-+{
-+	int ret = 0;
-+	unsigned long flags;
-+	int i;
-+
-+	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
-+		return -EINVAL;
-+
-+	spin_lock_irqsave(&gpio_lock, flags);
-+
-+	for (i = start; i < start + ngpio; i++) {
-+		struct gpio_desc *desc = &gpio_desc[i];
-+
-+		if (desc->chip || test_bit(FLAG_RESERVED, &desc->flags)) {
-+			ret = -EBUSY;
-+			goto err;
-+		}
-+
-+		set_bit(FLAG_RESERVED, &desc->flags);
-+	}
-+
-+	pr_debug("%s: reserved gpios from %d to %d\n",
-+		 __func__, start, start + ngpio - 1);
-+err:
-+	spin_unlock_irqrestore(&gpio_lock, flags);
-+
-+	return ret;
-+}
-+
-+/**
-  * gpiochip_add() - register a gpio_chip
-  * @chip: the chip to register, with chip->base initialized
-  * Context: potentially before irqs or kmalloc will work
---- a/include/asm-generic/gpio.h
-+++ b/include/asm-generic/gpio.h
-@@ -74,6 +74,7 @@ struct gpio_chip {
- 
- extern const char *gpiochip_is_requested(struct gpio_chip *chip,
- 			unsigned offset);
-+extern int __init __must_check gpiochip_reserve(int start, int ngpio);
- 
- /* add/remove chips */
- extern int gpiochip_add(struct gpio_chip *chip);
diff --git a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch b/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
deleted file mode 100644
index c875a0d4ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/964-backport_gpiolib_fix_off_by_one_errors.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Trent Piepho <xyzzy@speakeasy.org>
-Date: Fri, 23 May 2008 20:04:44 +0000 (-0700)
-Subject: gpiolib: fix off by one errors
-X-Git-Tag: v2.6.26-rc4~31
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bff5fda972dc23bd1806a47c2098ae173585d013
-
-gpiolib: fix off by one errors
-
-The last gpio belonging to a chip is chip->base + chip->ngpios - 1.  Some
-places in the code, but not all, forgot the critical minus one.
-
-Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
-Acked-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -127,7 +127,7 @@ int __init gpiochip_reserve(int start, i
- 	unsigned long flags;
- 	int i;
- 
--	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
-+	if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio - 1))
- 		return -EINVAL;
- 
- 	spin_lock_irqsave(&gpio_lock, flags);
-@@ -170,7 +170,7 @@ int gpiochip_add(struct gpio_chip *chip)
- 	unsigned	id;
- 	int		base = chip->base;
- 
--	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
-+	if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio - 1))
- 			&& base >= 0) {
- 		status = -EINVAL;
- 		goto fail;
-@@ -207,7 +207,7 @@ fail:
- 	/* failures here can mean systems won't boot... */
- 	if (status)
- 		pr_err("gpiochip_add: gpios %d..%d (%s) not registered\n",
--			chip->base, chip->base + chip->ngpio,
-+			chip->base, chip->base + chip->ngpio - 1,
- 			chip->label ? : "generic");
- 	return status;
- }
diff --git a/target/linux/generic-2.6/patches-2.6.25/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.25/971-ocf_20100325.patch
deleted file mode 100644
index 61be88ab84..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -669,6 +679,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -136,6 +136,7 @@ static int dupfd(struct file *file, unsi
- 
- 	return fd;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
- {
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR 7
- #define PC110PAD_MINOR 9
- /*#define ADB_MOUSE_MINOR 10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR 135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -8,6 +8,7 @@
- #define _LINUX_RANDOM_H
- 
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- 
- /* ioctl()'s for the random number generator */
- 
-@@ -32,6 +33,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -48,6 +73,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -377,6 +377,7 @@ struct task_struct *find_task_by_pid_typ
- {
- 	return pid_task(find_pid_ns(nr, ns), type);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- EXPORT_SYMBOL(find_task_by_pid_type_ns);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch b/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch
deleted file mode 100644
index d5bb40f3e9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/981-backport_usb_serial_sierrawireless_ids.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/usb/serial/sierra.c
-+++ b/drivers/usb/serial/sierra.c
-@@ -166,14 +166,19 @@ static struct usb_device_id id_table [] 
- 	{ USB_DEVICE(0x1199, 0x6815) },	/* Sierra Wireless MC8775 */
- 	{ USB_DEVICE(0x03f0, 0x1e1d) },	/* HP hs2300 a.k.a MC8775 */
- 	{ USB_DEVICE(0x1199, 0x6820) },	/* Sierra Wireless AirCard 875 */
-+	{ USB_DEVICE(0x1199, 0x6821) },	/* Sierra Wireless AirCard 875U */
- 	{ USB_DEVICE(0x1199, 0x6832) },	/* Sierra Wireless MC8780*/
- 	{ USB_DEVICE(0x1199, 0x6833) },	/* Sierra Wireless MC8781*/
-+	{ USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless MC8785 Composite*/
-+	{ USB_DEVICE(0x1199, 0x683C), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless MC8790 Composite*/
- 	{ USB_DEVICE(0x1199, 0x6850) },	/* Sierra Wireless AirCard 880 */
- 	{ USB_DEVICE(0x1199, 0x6851) },	/* Sierra Wireless AirCard 881 */
- 	{ USB_DEVICE(0x1199, 0x6852) },	/* Sierra Wireless AirCard 880 E */
- 	{ USB_DEVICE(0x1199, 0x6853) },	/* Sierra Wireless AirCard 881 E */
- 	{ USB_DEVICE(0x1199, 0x6855) },	/* Sierra Wireless AirCard 880 U */
- 	{ USB_DEVICE(0x1199, 0x6856) },	/* Sierra Wireless AirCard 881 U */
-+	{ USB_DEVICE(0x1199, 0x6859), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */
-+	{ USB_DEVICE(0x1199, 0x685A), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 885 E */
- 
- 	{ USB_DEVICE(0x1199, 0x6468) }, /* Sierra Wireless MP3G - EVDO */
- 	{ USB_DEVICE(0x1199, 0x6469) }, /* Sierra Wireless MP3G - UMTS/HSPA */
diff --git a/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch
deleted file mode 100644
index d61546d317..0000000000
--- a/target/linux/generic-2.6/patches-2.6.25/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -797,10 +797,7 @@ static int noinline init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.30/000-bzip_lzma_remove_nasty_hack.patch b/target/linux/generic-2.6/patches-2.6.30/000-bzip_lzma_remove_nasty_hack.patch
deleted file mode 100644
index 33572b8905..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/000-bzip_lzma_remove_nasty_hack.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From b1af4315d823a2b6659c5b14bc17f7bc61878ef4 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 6 Aug 2009 15:09:31 -0700
-Subject: [PATCH] bzip2/lzma: remove nasty uncompressed size hack in pre-boot environment
-
-decompress_bunzip2 and decompress_unlzma have a nasty hack that subtracts
-4 from the input length if being called in the pre-boot environment.
-
-This is a nasty hack because it relies on the fact that flush = NULL only
-when called from the pre-boot environment (i.e.
-arch/x86/boot/compressed/misc.c).  initramfs.c/do_mounts_rd.c pass in a
-flush buffer (flush != NULL).
-
-This hack prevents the decompressors from being used with flush = NULL by
-other callers unless knowledge of the hack is propagated to them.
-
-This patch removes the hack by making decompress (called only from the
-pre-boot environment) a wrapper function that subtracts 4 from the input
-length before calling the decompressor.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- lib/decompress_bunzip2.c |   22 ++++++++++++++++------
- lib/decompress_unlzma.c  |   21 ++++++++++++++++-----
- 2 files changed, 32 insertions(+), 11 deletions(-)
-
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -45,9 +45,11 @@
- */
- 
- 
--#ifndef STATIC
-+#ifdef STATIC
-+#define PREBOOT
-+#else
- #include <linux/decompress/bunzip2.h>
--#endif /* !STATIC */
-+#endif /* STATIC */
- 
- #include <linux/decompress/mm.h>
- #include <linux/slab.h>
-@@ -681,9 +683,7 @@ STATIC int INIT bunzip2(unsigned char *b
- 	set_error_fn(error_fn);
- 	if (flush)
- 		outbuf = malloc(BZIP2_IOBUF_SIZE);
--	else
--		len -= 4; /* Uncompressed size hack active in pre-boot
--			     environment */
-+
- 	if (!outbuf) {
- 		error("Could not allocate output bufer");
- 		return -1;
-@@ -733,4 +733,14 @@ exit_0:
- 	return i;
- }
- 
--#define decompress bunzip2
-+#ifdef PREBOOT
-+STATIC int INIT decompress(unsigned char *buf, int len,
-+			int(*fill)(void*, unsigned int),
-+			int(*flush)(void*, unsigned int),
-+			unsigned char *outbuf,
-+			int *pos,
-+			void(*error_fn)(char *x))
-+{
-+	return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error_fn);
-+}
-+#endif
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -29,7 +29,9 @@
-  *Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
--#ifndef STATIC
-+#ifdef STATIC
-+#define PREBOOT
-+#else
- #include <linux/decompress/unlzma.h>
- #endif /* STATIC */
- 
-@@ -543,9 +545,7 @@ STATIC inline int INIT unlzma(unsigned c
- 	int ret = -1;
- 
- 	set_error_fn(error_fn);
--	if (!flush)
--		in_len -= 4; /* Uncompressed size hack active in pre-boot
--				environment */
-+
- 	if (buf)
- 		inbuf = buf;
- 	else
-@@ -645,4 +645,15 @@ exit_0:
- 	return ret;
- }
- 
--#define decompress unlzma
-+#ifdef PREBOOT
-+STATIC int INIT decompress(unsigned char *buf, int in_len,
-+			      int(*fill)(void*, unsigned int),
-+			      int(*flush)(void*, unsigned int),
-+			      unsigned char *output,
-+			      int *posp,
-+			      void(*error_fn)(char *x)
-+	)
-+{
-+	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
-+}
-+#endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.30/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.30/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.30/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index 857834f21b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -34,7 +34,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -86,12 +85,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -291,17 +287,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -343,10 +339,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.30/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.30/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index db2fe538e5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -40,27 +40,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -85,10 +93,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -115,25 +119,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -200,6 +204,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -287,7 +295,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -297,7 +305,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -339,7 +346,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.30/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.30/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c00058..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.30/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.30/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 0991681346..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.30/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.30/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.30/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.30/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index 64705d2a94..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -53,8 +53,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -77,7 +75,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -114,6 +114,9 @@ config DECOMPRESS_BZIP2
- config DECOMPRESS_LZMA
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -51,6 +51,7 @@
- #include <linux/decompress/bunzip2.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- #include <linux/slab.h>
- 
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -22,6 +22,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- #include <linux/slab.h>
- 
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -35,6 +35,7 @@
- #include <linux/decompress/unlzma.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- #include <linux/slab.h>
- 
-@@ -523,7 +524,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -656,4 +657,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.30/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.30/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.30/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbbd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.30/013-gcc4_inline_fix.patch
deleted file mode 100644
index 642f11b21f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -187,7 +187,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.30/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.30/014-samsung_flash
deleted file mode 100644
index 5c835081b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/014-samsung_flash
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -386,12 +387,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.30/015-arm_export___cpu_flush_dcache_page.patch b/target/linux/generic-2.6/patches-2.6.30/015-arm_export___cpu_flush_dcache_page.patch
deleted file mode 100644
index d778a1f7f6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/015-arm_export___cpu_flush_dcache_page.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ba9b42e4ff5eb68f9c946378229d7e45299d7151 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk@dyn-67.arm.linux.org.uk>
-Date: Sun, 5 Jul 2009 10:50:37 +0100
-Subject: [PATCH] [ARM] export __cpu_flush_dcache_page
-
-Now required for libsas:
-
-  Kernel: arch/arm/boot/Image is ready
-  Kernel: arch/arm/boot/zImage is ready
-  Building modules, stage 2.
-  MODPOST 1096 modules
-ERROR: "xscale_flush_kern_dcache_page" [drivers/scsi/libsas/libsas.ko] undefined!
-
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/mm/proc-syms.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/arch/arm/mm/proc-syms.c
-+++ b/arch/arm/mm/proc-syms.c
-@@ -27,6 +27,7 @@ EXPORT_SYMBOL(__cpuc_flush_kern_all);
- EXPORT_SYMBOL(__cpuc_flush_user_all);
- EXPORT_SYMBOL(__cpuc_flush_user_range);
- EXPORT_SYMBOL(__cpuc_coherent_kern_range);
-+EXPORT_SYMBOL(__cpuc_flush_dcache_page);
- EXPORT_SYMBOL(dmac_inv_range);  /* because of flush_ioremap_region() */
- #else
- EXPORT_SYMBOL(cpu_cache);
diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
deleted file mode 100644
index caabacc335..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	void			(*mach_setup)(void);
-+	char			*mach_name;
-+	struct list_head	list;
-+};
-+
-+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_set_name(char *name) __init;
-+
-+extern char *mips_machine_name;
-+
-+#define MIPS_MACHINE(_type, _name, _setup) 			\
-+static char machine_name_##_type[] __initdata = _name;		\
-+static struct mips_machine machine_##_type __initdata =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};								\
-+								\
-+static int __init register_machine_##_type(void)		\
-+{								\
-+	mips_machine_register(&machine_##_type);		\
-+	return 0;						\
-+}								\
-+								\
-+pure_initcall(register_machine_##_type)
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
-+
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,74 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+
-+#include <asm/mips_machine.h>
-+#include <asm/bootinfo.h>
-+
-+static struct list_head mips_machines __initdata =
-+		LIST_HEAD_INIT(mips_machines);
-+
-+char *mips_machine_name = "Unknown";
-+
-+static struct mips_machine * __init mips_machine_find(unsigned long machtype)
-+{
-+	struct list_head *this;
-+
-+	list_for_each(this, &mips_machines) {
-+		struct mips_machine *mach;
-+
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_type == machtype)
-+			return mach;
-+	}
-+
-+	return NULL;
-+}
-+
-+void __init mips_machine_register(struct mips_machine *mach)
-+{
-+	list_add_tail(&mach->list, &mips_machines);
-+}
-+
-+void __init mips_machine_set_name(char *name)
-+{
-+	unsigned int len;
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	len = strlen(name);
-+	p = kmalloc(len + 1, GFP_KERNEL);
-+	if (p) {
-+		strncpy(p, name, len);
-+		p[len] = '\0';
-+		mips_machine_name = p;
-+	} else {
-+		printk(KERN_WARNING "MIPS: no memory for machine_name\n");
-+	}
-+}
-+
-+void __init mips_machine_setup(unsigned long machtype)
-+{
-+	struct mips_machine *mach;
-+
-+	mach = mips_machine_find(machtype);
-+	if (!mach) {
-+		printk(KERN_ALERT "MIPS: no machine registered for "
-+			"machtype %lu\n", machtype);
-+		return;
-+	}
-+
-+	mips_machine_set_name(mach->mach_name);
-+	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mach->mach_setup)
-+		mach->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -85,6 +85,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -803,6 +803,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -14,6 +14,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -33,8 +34,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+#ifdef CONFIG_MIPS_MACHINE
-+		seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
-+#endif
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 7433686857..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -806,6 +806,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 80c34046a0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -85,6 +85,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -101,6 +102,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch
deleted file mode 100644
index 128ed54ecb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
-Subject: [PATCH] fix __ndelay build error and add 'ull' suffix for 32-bit kernel
-
-Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
----
- arch/mips/lib/delay.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/lib/delay.c
-+++ b/arch/mips/lib/delay.c
-@@ -43,7 +43,7 @@ void __udelay(unsigned long us)
- {
- 	unsigned int lpj = current_cpu_data.udelay_val;
- 
--	__delay((us * 0x000010c7 * HZ * lpj) >> 32);
-+	__delay((us * 0x000010c7ull * HZ * lpj) >> 32);
- }
- EXPORT_SYMBOL(__udelay);
- 
-@@ -51,6 +51,6 @@ void __ndelay(unsigned long ns)
- {
- 	unsigned int lpj = current_cpu_data.udelay_val;
- 
--	__delay((us * 0x00000005 * HZ * lpj) >> 32);
-+	__delay((ns * 0x00000005ull * HZ * lpj) >> 32);
- }
- EXPORT_SYMBOL(__ndelay);
diff --git a/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
deleted file mode 100644
index 47ff7073d5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -791,6 +791,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -56,6 +56,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,10 +72,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.30/026-mips_fix_loading_of_modules_with_unresolved_weak_sy.patch b/target/linux/generic-2.6/patches-2.6.30/026-mips_fix_loading_of_modules_with_unresolved_weak_sy.patch
deleted file mode 100644
index 20c6132e4f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/026-mips_fix_loading_of_modules_with_unresolved_weak_sy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 819b4bda18d62b52d04789c4a8d4fc3fbf9ce242 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 13 Jul 2009 10:46:49 +0200
-Subject: [PATCH] MIPS: fix loading of modules with unresolved weak symbols
-
-Loading of modules with unresolved weak symbols fails on MIPS
-since '88173507e4fc1e7ecd111b0565e8cba0cb7dae6d'.
-
-Modules: handle symbols that have a zero value
-
-The module subsystem cannot handle symbols that are zero.  If symbols
-are present that have a zero value then the module resolver prints out a
-message that these symbols are unresolved.
-
-We have to use IS_ERR_VALUE() to check that a symbol has been resolved
-or not.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- arch/mips/kernel/module.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -303,7 +303,7 @@ int apply_relocate(Elf_Shdr *sechdrs, co
- 		/* This is the symbol it is referring to */
- 		sym = (Elf_Sym *)sechdrs[symindex].sh_addr
- 			+ ELF_MIPS_R_SYM(rel[i]);
--		if (!sym->st_value) {
-+		if (IS_ERR_VALUE(sym->st_value)) {
- 			/* Ignore unresolved weak symbol */
- 			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
- 				continue;
-@@ -343,7 +343,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs
- 		/* This is the symbol it is referring to */
- 		sym = (Elf_Sym *)sechdrs[symindex].sh_addr
- 			+ ELF_MIPS_R_SYM(rel[i]);
--		if (!sym->st_value) {
-+		if (IS_ERR_VALUE(sym->st_value)) {
- 			/* Ignore unresolved weak symbol */
- 			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
- 				continue;
diff --git a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch
deleted file mode 100644
index 019489f94e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,369 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,116 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,23 +168,101 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
- 	/* FIXME: If module_region == mod->init_region, trim exception
-            table entries. */
- }
- 
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -97,27 +285,37 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	*plt_offset += 4 * sizeof(int);
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	return 0;
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
-+
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		printk(KERN_ERR "module %s: dangerous relocation\n", me->name);
-@@ -125,17 +323,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +612,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch
deleted file mode 100644
index 725f3dce09..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/028-module_exports.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -4,6 +4,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef VMLINUX_SYMBOL
- #define VMLINUX_SYMBOL(_sym_) _sym_
- #endif
-@@ -176,35 +197,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -245,7 +266,13 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
-+	}								\
-+									\
-+	/DISCARD/ : {							\
-+		SYMTAB_DISCARD						\
-+		SYMTAB_DISCARD_GPL					\
-+		SYMTAB_DISCARD_STR					\
- 	}								\
- 									\
- 	/* __*init sections */						\
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -187,16 +187,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
---- a/Makefile
-+++ b/Makefile
-@@ -994,7 +994,7 @@ prepare: prepare0
- # Leave this as default for preprocessing vmlinux.lds.S, which is now
- # done in arch/$(ARCH)/kernel/Makefile
- 
--export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
-+export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) $(EXTRA_LDSFLAGS)
- 
- # The asm symlink changes when $(ARCH) changes.
- # Detect this and ask user to run make mrproper
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -78,18 +78,6 @@ SECTIONS
- #endif
- 	}
- 
--	/DISCARD/ : {			/* Exit code and data		*/
--		EXIT_TEXT
--		EXIT_DATA
--		*(.exitcall.exit)
--		*(.ARM.exidx.exit.text)
--		*(.ARM.extab.exit.text)
--#ifndef CONFIG_MMU
--		*(.fixup)
--		*(__ex_table)
--#endif
--	}
--
- 	.text : {			/* Real text segment		*/
- 		_text = .;		/* Text and read-only data	*/
- 			__exception_text_start = .;
-@@ -194,6 +182,20 @@ SECTIONS
- 		*(COMMON)
- 		_end = .;
- 	}
-+
-+	/DISCARD/ : {			/* Exit code and data		*/
-+		EXIT_TEXT
-+		EXIT_DATA
-+		*(.discard)
-+		*(.exitcall.exit)
-+		*(.ARM.exidx.exit.text)
-+		*(.ARM.extab.exit.text)
-+#ifndef CONFIG_MMU
-+		*(.fixup)
-+		*(__ex_table)
-+#endif
-+	}
-+
- 					/* Stabs debugging sections.	*/
- 	.stab 0 : { *(.stab) }
- 	.stabstr 0 : { *(.stabstr) }
---- a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
- #endif
- SECTIONS
- {
--	/* Sections to be discarded. */
--	/DISCARD/ : {
--	*(.exitcall.exit)
--	EXIT_DATA
--	}
--
- 	. = KERNELBASE;
- 
- /*
-@@ -295,6 +289,12 @@ SECTIONS
- 		__bss_stop = .;
- 	}
- 
-+	/* Sections to be discarded. */
-+	/DISCARD/ : {
-+	*(.exitcall.exit)
-+	EXIT_DATA
-+	}
-+
- 	. = ALIGN(PAGE_SIZE);
- 	_end = . ;
- 	PROVIDE32 (end = .);
diff --git a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch b/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
deleted file mode 100644
index 0eebacfa3f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
+++ /dev/null
@@ -1,608 +0,0 @@
-This patch updates kernel part of kexec for MIPS platform to support
-kdump, 64-bit, SMP and simplify code adaptation to new boards. It does
-the following:
-
-- hooks for machine-specific actions are introduced
-(_machine_kexec_prepare,
-  _machine_kexec_shutdown, _machine_crash_shutdown);
-- kexec reboot on SMP machine is implemented;
-- add boot parameters passing to new kernel (array kexec_args[] is
-copied to
-  registers a0-a3 on reboot );
-- crash dump functionality is added (boot kernel with non-default physical
-  start, parse "crashkernel=..." command line parameter, copy_oldmem_page()
-  is implemeted to read memory dump after reboot-on-crashi,
-crash_setup_regs()
-  is updated to correctly store registers on crash);
-
-kexec/kdump funtionality was tested on several Cavium Octeon boards
-(mips64 SMP). The way we do it was the following:
-- _machine_kexec_prepare was find kexec segment with command line and
-save it's pointed into internal bootloader structure.
-- _machine_kexec_shutdown was used to stop boards IO and make all non-boot
-CPUs spin in function relocated_kexec_smp_wait()
-- _machine_crash_shutdown just calls default_machine_crash_shutdown()
-We tested 1) 'common' kexec reboot (by 'kexec -e'), 2) kexec-on-panic
-('kexec -p ...') and 3) access to/proc/vmcore (with gdb).
-
-Signed-off-by: Maxim Syrchin <[11]msyrchin at ru.mvista.com>
----
-arch/mips/Kconfig                  |   23 +++++++++
-arch/mips/Makefile                 |    4 ++
-arch/mips/kernel/Makefile          |    3 +-
-arch/mips/kernel/crash.c           |   91 ++++++++++++++++++++++++++++++++++
-arch/mips/kernel/crash_dump.c      |   96 ++++++++++++++++++++++++++++++++++++
-arch/mips/kernel/machine_kexec.c   |   52 ++++++++++++++++++-
-arch/mips/kernel/relocate_kernel.S |   93 ++++++++++++++++++++++++++++++++++-
-arch/mips/kernel/setup.c           |   10 +++-
-arch/mips/include/asm/kexec.h           |   21 ++++++++-
-9 files changed, 386 insertions(+), 7 deletions(-)
-create mode 100644 arch/mips/kernel/crash.c
-create mode 100644 arch/mips/kernel/crash_dump.c
-
----
- arch/mips/Kconfig                  |   23 	23 +	0 -	0 !
- arch/mips/Makefile                 |    4 	4 +	0 -	0 !
- arch/mips/kernel/Makefile          |    3 	2 +	1 -	0 !
- arch/mips/kernel/crash.c           |   90 	90 +	0 -	0 !
- arch/mips/kernel/crash_dump.c      |   96 	96 +	0 -	0 !
- arch/mips/kernel/machine_kexec.c   |   66 	60 +	6 -	0 !
- arch/mips/kernel/relocate_kernel.S |   96 	95 +	1 -	0 !
- arch/mips/kernel/setup.c           |   10 	9 +	1 -	0 !
- arch/mips/include/asm/kexec.h      |   21 	20 +	1 -	0 !
- 9 files changed, 399 insertions(+), 10 deletions(-)
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -1966,6 +1966,29 @@ config KEXEC
- 	  support.  As of this writing the exact hardware interface is
- 	  strongly in flux, so no good recommendation can be made.
- 
-+config CRASH_DUMP
-+    bool "kernel crash dumps (EXPERIMENTAL)"
-+    depends on EXPERIMENTAL
-+    help
-+      Generate crash dump after being started by kexec.
-+          This should be normally only set in special crash dump kernels
-+      which are loaded in the main kernel with kexec-tools into
-+      a specially reserved region and then later executed after
-+      a crash by kdump/kexec. The crash dump kernel must be compiled
-+          to a memory address not used by the main kernel or BIOS using
-+          PHYSICAL_START.
-+
-+config PHYSICAL_START
-+    hex "Physical address where the kernel is loaded"
-+    default "0xffffffff84000000"
-+    depends on CRASH_DUMP
-+    help
-+      This gives the CKSEG0 or KSEG0 address where the kernel is loaded.
-+      If you plan to use kernel for capturing the crash dump change
-+      this value to start of the reserved region (the "X" value as
-+      specified in the "crashkernel=[12]YM at XM" command line boot parameter
-+      passed to the panic-ed kernel).
-+
- config SECCOMP
- 	bool "Enable seccomp to safely compute untrusted bytecode"
- 	depends on PROC_FS
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -603,6 +603,10 @@ else
- load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000
- endif
- 
-+ifdef CONFIG_PHYSICAL_START
-+load-y			= $(CONFIG_PHYSICAL_START)
-+endif
-+
- cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic
- drivers-$(CONFIG_PCI)		+= arch/mips/pci/
- 
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -83,7 +83,8 @@ obj-$(CONFIG_I8253)		+= i8253.o
- 
- obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
--obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
-+obj-$(CONFIG_KEXEC)        += machine_kexec.o relocate_kernel.o crash.o
-+obj-$(CONFIG_CRASH_DUMP)    += crash_dump.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
---- /dev/null
-+++ b/arch/mips/kernel/crash.c
-@@ -0,0 +1,90 @@
-+/*
-+ * Architecture specific (MIPS) functions for kexec based crash dumps.
-+ *
-+ * Copyright (C) 2005, IBM Corp.
-+ * Copyright (C) 2008, MontaVista Software Inc.
-+ *
-+ * This source code is licensed under the GNU General Public License,
-+ * Version 2.  See the file COPYING for more details.
-+ *
-+ */
-+
-+#undef DEBUG
-+
-+#include <linux/kernel.h>
-+#include <linux/smp.h>
-+#include <linux/reboot.h>
-+#include <linux/kexec.h>
-+#include <linux/bootmem.h>
-+#include <linux/crash_dump.h>
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+#include <linux/types.h>
-+#include <linux/sched.h>
-+
-+
-+
-+/* This keeps a track of which one is crashing cpu. */
-+int crashing_cpu = -1;
-+static cpumask_t cpus_in_crash = CPU_MASK_NONE;
-+
-+#ifdef CONFIG_SMP
-+
-+void crash_shutdown_secondary(void *ignore)
-+{
-+    struct pt_regs* regs;
-+    int cpu = smp_processor_id();
-+
-+    regs = task_pt_regs(current);
-+    if (!cpu_online(cpu))
-+        return;
-+
-+    local_irq_disable();
-+    if (!cpu_isset(cpu, cpus_in_crash))
-+        crash_save_cpu(regs, cpu);
-+    cpu_set(cpu, cpus_in_crash);
-+
-+    while(!atomic_read(&kexec_ready_to_reboot)) {
-+        cpu_relax();
-+    }
-+    relocated_kexec_smp_wait(NULL);
-+    /* NOTREACHED */
-+}
-+
-+static void crash_kexec_prepare_cpus(void)
-+{
-+    unsigned int msecs;
-+
-+    unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */
-+
-+    smp_call_function (crash_shutdown_secondary, NULL, 0);
-+    smp_wmb();
-+
-+    /*
-+     * FIXME: Until we will have the way to stop other CPUSs reliabally,
-+     * the crash CPU will send an IPI and wait for other CPUs to
-+     * respond.
-+     * Delay of at least 10 seconds.
-+     */
-+    printk(KERN_EMERG "Sending IPI to other cpus...\n");
-+    msecs = 10000;
-+    while ((cpus_weight(cpus_in_crash) < ncpus) && (--msecs > 0)) {
-+        cpu_relax();
-+        mdelay(1);
-+    }
-+
-+}
-+
-+#else
-+static void crash_kexec_prepare_cpus(void) {}
-+#endif
-+
-+void default_machine_crash_shutdown(struct pt_regs *regs)
-+{
-+    local_irq_disable();
-+    crashing_cpu = smp_processor_id();
-+    crash_save_cpu(regs, crashing_cpu);
-+    crash_kexec_prepare_cpus();
-+    cpu_set(crashing_cpu, cpus_in_crash);
-+}
---- /dev/null
-+++ b/arch/mips/kernel/crash_dump.c
-@@ -0,0 +1,96 @@
-+/*
-+ * Routines for doing kexec-based kdump.
-+ *
-+ * Copyright (C) 2005, IBM Corp.
-+ * Copyright (C) 2008, MontaVista Software Inc.
-+ *
-+ * This source code is licensed under the GNU General Public License,
-+ * Version 2.  See the file COPYING for more details.
-+ */
-+
-+#include <linux/highmem.h>
-+#include <linux/bootmem.h>
-+#include <linux/crash_dump.h>
-+#include <asm/uaccess.h>
-+
-+#ifdef CONFIG_PROC_VMCORE
-+static int __init parse_elfcorehdr(char *p)
-+{
-+    if (p)
-+        elfcorehdr_addr = memparse(p, &p);
-+    return 1;
-+}
-+__setup("elfcorehdr=", parse_elfcorehdr);
-+#endif
-+
-+static int __init parse_savemaxmem(char *p)
-+{
-+    if (p)
-+        saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT) - 1;
-+
-+    return 1;
-+}
-+__setup("savemaxmem=", parse_savemaxmem);
-+
-+
-+static void *kdump_buf_page;
-+
-+/**
-+ * copy_oldmem_page - copy one page from "oldmem"
-+ * @pfn: page frame number to be copied
-+ * @buf: target memory address for the copy; this can be in kernel address
-+ *    space or user address space (see @userbuf)
-+ * @csize: number of bytes to copy
-+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
-+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
-+ *    otherwise @buf is in kernel address space, use memcpy().
-+ *
-+ * Copy a page from "oldmem". For this page, there is no pte mapped
-+ * in the current kernel.
-+ *
-+ * Calling copy_to_user() in atomic context is not desirable. Hence first
-+ * copying the data to a pre-allocated kernel page and then copying to user
-+ * space in non-atomic context.
-+ */
-+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
-+                               size_t csize, unsigned long offset, int userbuf)
-+{
-+    void  *vaddr;
-+
-+    if (!csize)
-+        return 0;
-+
-+    vaddr = kmap_atomic_pfn(pfn, KM_PTE0);
-+
-+    if (!userbuf) {
-+        memcpy(buf, (vaddr + offset), csize);
-+        kunmap_atomic(vaddr, KM_PTE0);
-+    } else {
-+        if (!kdump_buf_page) {
-+            printk(KERN_WARNING "Kdump: Kdump buffer page not"
-+                " allocated\n");
-+            return -EFAULT;
-+        }
-+        copy_page(kdump_buf_page, vaddr);
-+        kunmap_atomic(vaddr, KM_PTE0);
-+        if (copy_to_user(buf, (kdump_buf_page + offset), csize))
-+            return -EFAULT;
-+    }
-+
-+    return csize;
-+}
-+
-+static int __init kdump_buf_page_init(void)
-+{
-+    int ret = 0;
-+
-+    kdump_buf_page = kmalloc(PAGE_SIZE, GFP_KERNEL);
-+    if (!kdump_buf_page) {
-+        printk(KERN_WARNING "Kdump: Failed to allocate kdump buffer"
-+             " page\n");
-+        ret = -ENOMEM;
-+    }
-+
-+    return ret;
-+}
-+arch_initcall(kdump_buf_page_init);
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -19,9 +19,25 @@ extern const size_t relocate_new_kernel_
- extern unsigned long kexec_start_address;
- extern unsigned long kexec_indirection_page;
- 
-+extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;
-+
-+int (*_machine_kexec_prepare)(struct kimage *) = NULL;
-+void (*_machine_kexec_shutdown)(void) = NULL;
-+void (*_machine_crash_shutdown)(struct pt_regs *regs) = NULL;
-+#ifdef CONFIG_SMP
-+void (*relocated_kexec_smp_wait) (void *);
-+atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
-+#endif
-+
- int
- machine_kexec_prepare(struct kimage *kimage)
- {
-+	kexec_args[0] = fw_arg0;
-+	kexec_args[1] = fw_arg1;
-+	kexec_args[2] = fw_arg2;
-+	kexec_args[3] = fw_arg3;
-+	if (_machine_kexec_prepare)
-+        	return _machine_kexec_prepare(kimage);
- 	return 0;
- }
- 
-@@ -33,13 +49,18 @@ machine_kexec_cleanup(struct kimage *kim
- void
- machine_shutdown(void)
- {
-+    if (_machine_kexec_shutdown)
-+        _machine_kexec_shutdown();
- }
- 
- void
- machine_crash_shutdown(struct pt_regs *regs)
- {
-+    if (_machine_crash_shutdown)
-+        _machine_crash_shutdown(regs);
-+    else
-+        default_machine_crash_shutdown(regs);
- }
--
- typedef void (*noretfun_t)(void) __attribute__((noreturn));
- 
- void
-@@ -63,7 +84,7 @@ machine_kexec(struct kimage *image)
- 	 * The generic kexec code builds a page list with physical
- 	 * addresses. they are directly accessible through KSEG0 (or
- 	 * CKSEG0 or XPHYS if on 64bit system), hence the
--	 * pys_to_virt() call.
-+     * phys_to_virt() call.
- 	 */
- 	for (ptr = &image->head; (entry = *ptr) && !(entry &IND_DONE);
- 	     ptr = (entry & IND_INDIRECTION) ?
-@@ -78,8 +99,39 @@ machine_kexec(struct kimage *image)
- 	 */
- 	local_irq_disable();
- 
--	printk("Will call new kernel at %08lx\n", image->start);
--	printk("Bye ...\n");
-+	printk(KERN_EMERG "Will call new kernel at %08lx\n", image->start);
-+	printk(KERN_EMERG "Bye ...\n");
- 	__flush_cache_all();
--	((noretfun_t) reboot_code_buffer)();
-+#ifdef CONFIG_SMP
-+    /* All secondary cpus now may jump to kexec_wait cycle */
-+    relocated_kexec_smp_wait = (void *)(reboot_code_buffer +
-+        (kexec_smp_wait - relocate_new_kernel));
-+    smp_wmb();
-+    atomic_set(&kexec_ready_to_reboot,1);
-+#endif
-+
-+    	((noretfun_t) reboot_code_buffer)();
-+	printk(KERN_EMERG "Bye ...\n");
-+}
-+
-+/* crashkernel=[13]size at addr specifies the location to reserve for
-+ * a crash kernel.  By reserving this memory we guarantee
-+ * that linux never sets it up as a DMA target.
-+ * Useful for holding code to do something appropriate
-+ * after a kernel panic.
-+ */
-+static int __init parse_crashkernel_cmdline(char *arg)
-+{
-+    unsigned long size, base;
-+    size = memparse(arg, &arg);
-+    if (*arg == '@') {
-+        base = memparse(arg+1, &arg);
-+        /* FIXME: Do I want a sanity check
-+         * to validate the memory range?
-+         */
-+        crashk_res.start = base;
-+        crashk_res.end   = base + size - 1;
-+    }
-+    return 0;
- }
-+early_param("crashkernel", parse_crashkernel_cmdline);
---- a/arch/mips/kernel/relocate_kernel.S
-+++ b/arch/mips/kernel/relocate_kernel.S
-@@ -14,7 +14,13 @@
- #include <asm/stackframe.h>
- #include <asm/addrspace.h>
- 
-+
- LEAF(relocate_new_kernel)
-+     PTR_L a0,    arg0
-+     PTR_L a1,    arg1
-+     PTR_L a2,    arg2
-+     PTR_L a3,    arg3
-+
- 	PTR_L		s0, kexec_indirection_page
- 	PTR_L		s1, kexec_start_address
- 
-@@ -26,7 +32,6 @@ process_entry:
- 	and		s3, s2, 0x1
- 	beq		s3, zero, 1f
- 	and		s4, s2, ~0x1	/* store destination addr in s4 */
--	move		a0, s4
- 	b		process_entry
- 
- 1:
-@@ -40,6 +45,7 @@ process_entry:
- 	/* done page */
- 	and		s3, s2, 0x4
- 	beq		s3, zero, 1f
-+	nop
- 	b		done
- 1:
- 	/* source page */
-@@ -56,14 +62,102 @@ copy_word:
- 	PTR_ADD		s2, s2, SZREG
- 	LONG_SUB	s6, s6, 1
- 	beq		s6, zero, process_entry
-+	nop
- 	b		copy_word
-+	nop
- 	b		process_entry
- 
- done:
-+#ifdef CONFIG_SMP
-+    /* kexec_flag reset is signal to other CPUs what kernel
-+        was moved to it's location. Note - we need relocated address
-+        of kexec_flag.  */
-+
-+     bal        1f
-+ 1:     move        t1,ra;
-+     PTR_LA        t2,1b
-+     PTR_LA        t0,kexec_flag
-+     PTR_SUB        t0,t0,t2;
-+     PTR_ADD        t0,t1,t0;
-+     LONG_S        zero,(t0)
-+#endif
-+
-+     /* Some platforms need I-cache to be flushed before
-+     * jumping to new kernel.
-+      */
-+
- 	/* jump to kexec_start_address */
- 	j		s1
- 	END(relocate_new_kernel)
- 
-+#ifdef CONFIG_SMP
-+/*
-+ * Other CPUs should wait until code is relocated and
-+ * then start at entry point.
-+ */
-+LEAF(kexec_smp_wait)
-+    PTR_L        a0, s_arg0
-+    PTR_L        a1, s_arg1
-+    PTR_L        a2, s_arg2
-+    PTR_L        a3, s_arg3
-+    PTR_L        s1, kexec_start_address
-+
-+    /* Non-relocated address works for args and kexec_start_address ( old
-+     * kernel is not overwritten). But we need relocated address of
-+     * kexec_flag.
-+     */
-+
-+    bal        1f
-+1:    move        t1,ra;
-+    PTR_LA        t2,1b
-+    PTR_LA        t0,kexec_flag
-+    PTR_SUB        t0,t0,t2;
-+    PTR_ADD        t0,t1,t0;
-+
-+1:    LONG_L        s0, (t0)
-+    bne        s0, zero,1b
-+
-+    j        s1
-+    END(kexec_smp_wait)
-+#endif
-+
-+
-+#ifdef __mips64
-+       /* all PTR's must be aligned to 8 byte in 64-bit mode */
-+       .align  3
-+#endif
-+
-+/* All parameters to new kernel are passed in registers a0-a3.
-+ * kexec_args[0..3] are uses to prepare register values.
-+ */
-+
-+kexec_args:
-+    EXPORT(kexec_args)
-+arg0:    PTR        0x0
-+arg1:    PTR        0x0
-+arg2:    PTR        0x0
-+arg3:    PTR        0x0
-+    .size    kexec_args,PTRSIZE*4
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * Secondary CPUs may have different kernel parameters in
-+ * their registers a0-a3. secondary_kexec_args[0..3] are used
-+ * to prepare register values.
-+ */
-+secondary_kexec_args:
-+    EXPORT(secondary_kexec_args)
-+s_arg0:    PTR        0x0
-+s_arg1:    PTR        0x0
-+s_arg2:    PTR        0x0
-+s_arg3:    PTR        0x0
-+    .size    secondary_kexec_args,PTRSIZE*4
-+kexec_flag:
-+    LONG        0x1
-+
-+#endif
-+
-+
- kexec_start_address:
- 	EXPORT(kexec_start_address)
- 	PTR		0x0
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -21,7 +21,7 @@
- #include <linux/console.h>
- #include <linux/pfn.h>
- #include <linux/debugfs.h>
--
-+#include <linux/kexec.h>
- #include <asm/addrspace.h>
- #include <asm/bootinfo.h>
- #include <asm/bugs.h>
-@@ -489,6 +489,11 @@ static void __init arch_mem_init(char **
- 	}
- 
- 	bootmem_init();
-+#ifdef CONFIG_CRASH_DUMP
-+    if (crashk_res.start != crashk_res.end)
-+        reserve_bootmem(crashk_res.start,
-+                crashk_res.end - crashk_res.start + 1);
-+#endif
- 	sparse_init();
- 	paging_init();
- }
-@@ -543,6 +548,9 @@ static void __init resource_init(void)
- 		 */
- 		request_resource(res, &code_resource);
- 		request_resource(res, &data_resource);
-+#ifdef CONFIG_KEXEC
-+        request_resource(res, &crashk_res);
-+#endif
- 	}
- }
- 
---- a/arch/mips/include/asm/kexec.h
-+++ b/arch/mips/include/asm/kexec.h
-@@ -9,6 +9,8 @@
- #ifndef _MIPS_KEXEC
- # define _MIPS_KEXEC
- 
-+#include <asm/stacktrace.h>
-+
- /* Maximum physical address we can use pages from */
- #define KEXEC_SOURCE_MEMORY_LIMIT (0x20000000)
- /* Maximum address we can reach in physical address mode */
-@@ -24,7 +26,24 @@
- static inline void crash_setup_regs(struct pt_regs *newregs,
- 				    struct pt_regs *oldregs)
- {
--	/* Dummy implementation for now */
-+    if (oldregs)
-+        memcpy(newregs, oldregs, sizeof(*newregs));
-+    else
-+        prepare_frametrace(newregs);
- }
- 
-+#ifdef CONFIG_KEXEC
-+struct kimage;
-+extern unsigned long kexec_args[4];
-+extern int (*_machine_kexec_prepare)(struct kimage *);
-+extern void (*_machine_kexec_shutdown)(void);
-+extern void (*_machine_crash_shutdown)(struct pt_regs *regs);
-+extern void default_machine_crash_shutdown(struct pt_regs *regs);
-+#ifdef CONFIG_SMP
-+extern const unsigned char kexec_smp_wait[];
-+extern unsigned long secondary_kexec_args[4];
-+extern void (*relocated_kexec_smp_wait) (void *);
-+extern atomic_t kexec_ready_to_reboot;
-+#endif
-+#endif
- #endif /* !_MIPS_KEXEC */
diff --git a/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch
deleted file mode 100644
index de1a424035..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -98,6 +98,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1860,7 +1861,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2466,6 +2469,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 42d2dbd202..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/031-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -120,6 +120,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.30/032-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.30/032-ppc_gcc_build_fix.patch
deleted file mode 100644
index 3151eee26e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/032-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -813,3 +813,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -188,3 +188,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.30/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.30/060-block2mtd_init.patch
deleted file mode 100644
index 50df4aae0f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/060-block2mtd_init.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
deleted file mode 100644
index 34c1f5addf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
+++ /dev/null
@@ -1,633 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_TESTS
- 	  should normally be compiled as kernel modules. The modules perform
- 	  various checks and verifications when loaded.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -37,7 +39,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -512,6 +514,155 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part,
-+		int index)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, index, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		/* find the index of the last partition */
-+		if (!list_empty(&mtd_partitions))
-+			index = list_first_entry(&mtd_partitions, struct mtd_part, list)->index + 1;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart, index);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -527,14 +678,29 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, j, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
--	for (i = 0; i < nbparts; i++) {
--		slave = add_one_partition(master, parts + i, i, cur_offset);
-+	for (i = 0, j = 0; i < nbparts; i++) {
-+		slave = add_one_partition(master, parts + i, j++, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs") && slave->registered) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i], j);
-+			if (ret == 0)
-+				j++;
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -542,6 +708,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -17,6 +17,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -750,6 +751,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,6 +34,7 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
-@@ -41,6 +42,7 @@ struct mtd_partition {
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
- 	struct mtd_info **mtdp;		/* pointer to store the MTD object */
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -50,6 +52,7 @@ struct mtd_partition {
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -95,6 +95,7 @@ struct otp_info {
- #define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout)
- #define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
- #define MTDFILEMODE		_IO('M', 19)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.30/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.30/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 8b6256af8f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -574,6 +574,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			*priv;
- };
- 
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -71,7 +71,18 @@ static int __devinit plat_nand_probe(str
- 	platform_set_drvdata(pdev, data);
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 3ec97c6d8c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -180,6 +180,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/090-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.30/090-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index be2c7d7323..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/090-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -492,8 +492,7 @@ int nand_correct_data(struct mtd_info *m
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index 8100b1285c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -117,6 +117,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -88,6 +88,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -203,6 +203,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
deleted file mode 100644
index 926966ced0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -87,6 +87,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP)
- 	    || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -137,13 +140,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -153,6 +178,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -200,7 +227,6 @@ unconditional(const struct ipt_ip *ip)
- 			return 0;
- 
- 	return 1;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -318,8 +344,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	datalen = skb->len - ip->ihl * 4;
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
-@@ -337,13 +383,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -976,6 +1015,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -986,6 +1026,14 @@ copy_entries_to_user(unsigned int total_
- 			goto free_counters;
- 		}
- 
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
-+
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
- 		     i += m->u.match_size) {
diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
deleted file mode 100644
index 3bd7a8fbb6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1260 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,571 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	dev->trans_start = jiffies;
-+	imq_nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
-+	return 0;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -119,6 +119,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -152,6 +152,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -28,6 +28,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -333,6 +336,9 @@ struct sk_buff {
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48];
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
- 
- 	unsigned int		len,
- 				data_len;
-@@ -363,6 +369,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -383,6 +392,9 @@ struct sk_buff {
- 	__u8			requeue:1;
- #endif
- 	/* 0/13/14 bit hole */
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
- 
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
-@@ -423,6 +435,12 @@ extern void skb_dma_unmap(struct device 
- 			  enum dma_data_direction dir);
- #endif
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1931,6 +1949,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -96,6 +96,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1678,7 +1681,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1749,8 +1756,7 @@ u16 skb_tx_hash(const struct net_device 
- }
- EXPORT_SYMBOL(skb_tx_hash);
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	const struct net_device_ops *ops = dev->netdev_ops;
- 	u16 queue_index = 0;
-@@ -1763,6 +1769,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- /**
-  *	dev_queue_xmit - transmit a buffer
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1102,6 +1102,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice(struct net_device *dev);
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -71,6 +71,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -90,6 +93,80 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, struct sk_buff *old)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!old->cb_next) {
-+		new->cb_next = 0;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -389,6 +466,15 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		printk(KERN_WARNING "kfree_skb: skb->cb_next: %08x\n",
-+			skb->cb_next);
-+		skb_restore_cb(skb);
-+	}
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -526,6 +612,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum_start		= old->csum_start;
- 	new->csum_offset	= old->csum_offset;
- 	new->local_df		= old->local_df;
-@@ -2769,6 +2858,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.30/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.30/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch
deleted file mode 100644
index bf123ce780..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -182,8 +182,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb->dst;
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.30/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.30/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch
deleted file mode 100644
index 6ea9ba51ee..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch
deleted file mode 100644
index 25567f8488..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -115,8 +115,8 @@ int kmem_ptr_validate(struct kmem_cache 
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.30/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.30/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.30/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.30/205-skb_padding.patch
deleted file mode 100644
index 06b494b91b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1369,11 +1369,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1463,9 +1470,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1538,7 +1545,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -327,9 +327,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.30/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.30/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.30/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.30/209-mini_fo.patch
deleted file mode 100644
index bb6f381a14..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/209-mini_fo.patch
+++ /dev/null
@@ -1,7780 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -168,6 +168,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6faa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.30/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index 8bd9ba3244..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.30/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.30/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.30/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.30/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.30/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224cc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.30/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.30/220-sound_kconfig.patch
deleted file mode 100644
index f374009a65..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -7,7 +7,7 @@ config SND_PCM
- 	select SND_TIMER
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index fa891e0f3d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.30/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.30/222-partial_eraseblock_write.patch
deleted file mode 100644
index dfabeaa9ad..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -228,13 +230,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -242,7 +291,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -476,18 +543,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch
deleted file mode 100644
index d86fcf3bc2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -31,6 +31,8 @@ struct sockaddr_ll
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -46,6 +48,7 @@ struct sockaddr_ll
- #define PACKET_VERSION			10
- #define PACKET_HDRLEN			11
- #define PACKET_RESERVE			12
-+#define PACKET_RECV_TYPE		13
- 
- struct tpacket_stats
- {
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -192,6 +192,7 @@ struct packet_sock {
- 	unsigned int		tp_hdrlen;
- 	unsigned int		tp_reserve;
- #endif
-+	unsigned int		pkt_type;
- };
- 
- struct packet_skb_cb {
-@@ -282,6 +283,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -289,6 +291,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -301,7 +304,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (dev_net(dev) != sock_net(sk))
-@@ -486,12 +489,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -608,12 +611,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1412,6 +1416,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1543,6 +1557,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.30/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.30/250-pppoe_header_pad.patch
deleted file mode 100644
index 042546f317..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.30/251-atm.patch b/target/linux/generic-2.6/patches-2.6.30/251-atm.patch
deleted file mode 100644
index 238d6f81c4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/251-atm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/linux/atm.h
-+++ b/include/linux/atm.h
-@@ -139,6 +139,9 @@ struct atm_trafprm {
- 	int		min_pcr;	/* minimum PCR in cells per second */
- 	int		max_cdv;	/* maximum CDV in microseconds */
- 	int		max_sdu;	/* maximum SDU in bytes */
-+	int		scr;		/* sustained rate in cells per second */
-+	int		mbs;		/* maximum burst size (MBS) in cells */
-+	int		cdv;		/* Cell delay varition */
-         /* extra params for ABR */
-         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
-         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
deleted file mode 100644
index ad9e9badd3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/260-extend_pfifo_fast.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -371,16 +371,50 @@ static const u8 prio2band[TC_PRIO_MAX+1]
- 
- #define PFIFO_FAST_BANDS 3
- 
-+struct pfifo_fast_sched_data {
-+	struct tcf_proto *filter_list;
-+	struct sk_buff_head list[PFIFO_FAST_BANDS];
-+};
-+
- static inline struct sk_buff_head *prio2list(struct sk_buff *skb,
- 					     struct Qdisc *qdisc)
- {
--	struct sk_buff_head *list = qdisc_priv(qdisc);
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	return list + prio2band[skb->priority & TC_PRIO_MAX];
- }
- 
-+static int pfifo_fast_filter(struct sk_buff *skb, struct Qdisc* qdisc)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	int result = 0, ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+	struct tcf_result res;
-+
-+	if (q->filter_list != NULL)
-+		result = tc_classify(skb, q->filter_list, &res);
-+	if (result >= 0) {
-+		switch (result) {
-+		case TC_ACT_STOLEN:
-+		case TC_ACT_QUEUED:
-+			ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+		case TC_ACT_SHOT:
-+			kfree_skb(skb);
-+			return ret;
-+		}
-+	}
-+#endif
-+	return 0;
-+}
-+
- static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc* qdisc)
- {
- 	struct sk_buff_head *list = prio2list(skb, qdisc);
-+	int ret;
-+
-+	ret = pfifo_fast_filter(skb, qdisc);
-+	if (ret)
-+		return ret;
- 
- 	if (skb_queue_len(list) < qdisc_dev(qdisc)->tx_queue_len) {
- 		qdisc->q.qlen++;
-@@ -392,8 +426,9 @@ static int pfifo_fast_enqueue(struct sk_
- 
- static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- 		if (!skb_queue_empty(list + prio)) {
-@@ -420,8 +455,9 @@ static struct sk_buff *pfifo_fast_peek(s
- 
- static void pfifo_fast_reset(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		__qdisc_reset_queue(qdisc, list + prio);
-@@ -444,8 +480,9 @@ nla_put_failure:
- 
- static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		skb_queue_head_init(list + prio);
-@@ -453,9 +490,36 @@ static int pfifo_fast_init(struct Qdisc 
- 	return 0;
- }
- 
-+static int pfifo_fast_change_class(struct Qdisc *qdisc, u32 classid, u32 parentid,
-+			    struct nlattr **tca, unsigned long *arg)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static unsigned long pfifo_fast_get(struct Qdisc *qdisc, u32 classid)
-+{
-+	return 0;
-+}
-+
-+static struct tcf_proto **pfifo_fast_find_tcf(struct Qdisc *qdisc, unsigned long cl)
-+{
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+
-+	if (cl)
-+		return NULL;
-+	return &q->filter_list;
-+}
-+
-+static const struct Qdisc_class_ops pfifo_fast_class_ops = {
-+	.get		=	pfifo_fast_get,
-+	.change		=	pfifo_fast_change_class,
-+	.tcf_chain	=	pfifo_fast_find_tcf,
-+};
-+
- static struct Qdisc_ops pfifo_fast_ops __read_mostly = {
- 	.id		=	"pfifo_fast",
--	.priv_size	=	PFIFO_FAST_BANDS * sizeof(struct sk_buff_head),
-+	.cl_ops		=	&pfifo_fast_class_ops,
-+	.priv_size	=	sizeof(struct pfifo_fast_sched_data),
- 	.enqueue	=	pfifo_fast_enqueue,
- 	.dequeue	=	pfifo_fast_dequeue,
- 	.peek		=	pfifo_fast_peek,
-@@ -735,3 +799,18 @@ void dev_shutdown(struct net_device *dev
- 	shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
- 	WARN_ON(timer_pending(&dev->watchdog_timer));
- }
-+
-+#ifdef CONFIG_NET_SCHED
-+static int __init sch_generic_init(void)
-+{
-+	return register_qdisc(&pfifo_fast_ops);
-+}
-+
-+static void __exit sch_generic_exit(void)
-+{
-+	unregister_qdisc(&pfifo_fast_ops);
-+}
-+
-+module_init(sch_generic_init)
-+module_exit(sch_generic_exit)
-+#endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/270-sched_bfs.patch b/target/linux/generic-2.6/patches-2.6.30/270-sched_bfs.patch
deleted file mode 100644
index f521b3239c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/270-sched_bfs.patch
+++ /dev/null
@@ -1,6411 +0,0 @@
-This patch adds support for bfs v230, modified for diff size reduction
-
---- a/Documentation/sysctl/kernel.txt
-+++ b/Documentation/sysctl/kernel.txt
-@@ -27,6 +27,7 @@ show up in /proc/sys/kernel:
- - domainname
- - hostname
- - hotplug
-+- iso_cpu
- - java-appletviewer           [ binfmt_java, obsolete ]
- - java-interpreter            [ binfmt_java, obsolete ]
- - kstack_depth_to_print       [ X86 only ]
-@@ -48,6 +49,7 @@ show up in /proc/sys/kernel:
- - randomize_va_space
- - real-root-dev               ==> Documentation/initrd.txt
- - reboot-cmd                  [ SPARC only ]
-+- rr_interval
- - rtsig-max
- - rtsig-nr
- - sem
-@@ -170,6 +172,16 @@ Default value is "/sbin/hotplug".
- 
- ==============================================================
- 
-+iso_cpu: (BFS only)
-+
-+This sets the percentage cpu that the unprivileged SCHED_ISO tasks can
-+run effectively at realtime priority, averaged over a rolling five
-+seconds over the -whole- system, meaning all cpus.
-+
-+Set to 70 (percent) by default.
-+
-+==============================================================
-+
- l2cr: (PPC only)
- 
- This flag controls the L2 cache of G3 processor boards. If
-@@ -322,6 +334,19 @@ rebooting. ???
- 
- ==============================================================
- 
-+rr_interval: (BFS only)
-+
-+This is the smallest duration that any cpu process scheduling unit
-+will run for. Increasing this value can increase throughput of cpu
-+bound tasks substantially but at the expense of increased latencies
-+overall. This value is in milliseconds and the default value chosen
-+depends on the number of cpus available at scheduler initialisation
-+with a minimum of 6.
-+
-+Valid values are from 1-5000.
-+
-+==============================================================
-+
- rtsig-max & rtsig-nr:
- 
- The file rtsig-max can be used to tune the maximum number
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -119,9 +119,10 @@ extern struct cred init_cred;
- 	.usage		= ATOMIC_INIT(2),				\
- 	.flags		= PF_KTHREAD,					\
- 	.lock_depth	= -1,						\
--	.prio		= MAX_PRIO-20,					\
-+	.prio		= NORMAL_PRIO,					\
- 	.static_prio	= MAX_PRIO-20,					\
--	.normal_prio	= MAX_PRIO-20,					\
-+	.normal_prio	= NORMAL_PRIO,					\
-+	.deadline	= 0,						\
- 	.policy		= SCHED_NORMAL,					\
- 	.cpus_allowed	= CPU_MASK_ALL,					\
- 	.mm		= NULL,						\
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -36,9 +36,12 @@
- #define SCHED_FIFO		1
- #define SCHED_RR		2
- #define SCHED_BATCH		3
--/* SCHED_ISO: reserved but not implemented yet */
-+#define SCHED_ISO		4
- #define SCHED_IDLE		5
- 
-+#define SCHED_MAX		(SCHED_IDLE)
-+#define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
-+
- #ifdef __KERNEL__
- 
- struct sched_param {
-@@ -1042,10 +1045,13 @@ struct sched_entity {
- 	struct load_weight	load;		/* for load-balancing */
- 	struct rb_node		run_node;
- 	struct list_head	group_node;
-+#ifdef CONFIG_SCHED_CFS
- 	unsigned int		on_rq;
- 
- 	u64			exec_start;
-+#endif
- 	u64			sum_exec_runtime;
-+#ifdef CONFIG_SCHED_CFS
- 	u64			vruntime;
- 	u64			prev_sum_exec_runtime;
- 
-@@ -1096,6 +1102,7 @@ struct sched_entity {
- 	/* rq "owned" by this entity/group: */
- 	struct cfs_rq		*my_q;
- #endif
-+#endif
- };
- 
- struct sched_rt_entity {
-@@ -1123,17 +1130,19 @@ struct task_struct {
- 
- 	int lock_depth;		/* BKL lock depth */
- 
--#ifdef CONFIG_SMP
--#ifdef __ARCH_WANT_UNLOCKED_CTXSW
- 	int oncpu;
--#endif
--#endif
--
- 	int prio, static_prio, normal_prio;
- 	unsigned int rt_priority;
- 	const struct sched_class *sched_class;
- 	struct sched_entity se;
- 	struct sched_rt_entity rt;
-+	unsigned long deadline;
-+#ifdef CONFIG_SCHED_BFS
-+	int load_weight;	/* for niceness load balancing purposes */
-+	int first_time_slice;
-+	unsigned long long timestamp, last_ran;
-+	unsigned long utime_pc, stime_pc;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_NOTIFIERS
- 	/* list of struct preempt_notifier: */
-@@ -1156,6 +1165,9 @@ struct task_struct {
- 
- 	unsigned int policy;
- 	cpumask_t cpus_allowed;
-+#ifdef CONFIG_HOTPLUG_CPU
-+	cpumask_t unplugged_mask;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_RCU
- 	int rcu_read_lock_nesting;
-@@ -1446,11 +1458,19 @@ struct task_struct {
-  * priority to a value higher than any user task. Note:
-  * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.
-  */
--
-+#define PRIO_RANGE		(40)
- #define MAX_USER_RT_PRIO	100
- #define MAX_RT_PRIO		MAX_USER_RT_PRIO
--
-+#ifdef CONFIG_SCHED_BFS
-+#define MAX_PRIO		(MAX_RT_PRIO + PRIO_RANGE)
-+#define ISO_PRIO		(MAX_RT_PRIO)
-+#define NORMAL_PRIO		(MAX_RT_PRIO + 1)
-+#define IDLE_PRIO		(MAX_RT_PRIO + 2)
-+#define PRIO_LIMIT		((IDLE_PRIO) + 1)
-+#else
- #define MAX_PRIO		(MAX_RT_PRIO + 40)
-+#define NORMAL_PRIO	(MAX_RT_PRIO - 20)
-+#endif
- #define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
- 
- static inline int rt_prio(int prio)
-@@ -1734,7 +1754,7 @@ task_sched_runtime(struct task_struct *t
- extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
- 
- /* sched_exec is called by processes performing an exec */
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) && defined(CONFIG_SCHED_CFS)
- extern void sched_exec(void);
- #else
- #define sched_exec()   {}
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -435,9 +435,22 @@ config LOG_BUF_SHIFT
- config HAVE_UNSTABLE_SCHED_CLOCK
- 	bool
- 
-+choice
-+	prompt "Scheduler"
-+	default SCHED_CFS
-+
-+	config SCHED_CFS
-+		bool "CFS"
-+
-+	config SCHED_BFS
-+		bool "BFS"
-+
-+endchoice
-+
- config GROUP_SCHED
- 	bool "Group CPU scheduler"
- 	depends on EXPERIMENTAL
-+	depends on SCHED_CFS
- 	default n
- 	help
- 	  This feature lets CPU scheduler recognize task groups and control CPU
-@@ -488,6 +501,7 @@ endchoice
- 
- menuconfig CGROUPS
- 	boolean "Control Group support"
-+	depends on SCHED_CFS
- 	help
- 	  This option adds support for grouping sets of processes together, for
- 	  use with process control subsystems such as Cpusets, CFS, memory
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -2,7 +2,7 @@
- # Makefile for the linux kernel.
- #
- 
--obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
-+obj-y     = $(if $(CONFIG_SCHED_CFS),sched.o,sched_bfs.o) fork.o exec_domain.o panic.o printk.o \
- 	    cpu.o exit.o itimer.o time.o softirq.o resource.o \
- 	    sysctl.o capability.o ptrace.o timer.o user.o \
- 	    signal.o sys.o kmod.o workqueue.o pid.o \
-@@ -103,6 +103,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER
- # I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
- # to get a correct value for the wait-channel (WCHAN in ps). --davidm
- CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
-+CFLAGS_sched_bfs.o := $(PROFILING) -fno-omit-frame-pointer
- endif
- 
- $(obj)/configs.o: $(obj)/config_data.h
---- a/kernel/kthread.c
-+++ b/kernel/kthread.c
-@@ -15,7 +15,11 @@
- #include <linux/mutex.h>
- #include <trace/sched.h>
- 
-+#ifdef CONFIG_SCHED_BFS
-+#define KTHREAD_NICE_LEVEL (0)
-+#else
- #define KTHREAD_NICE_LEVEL (-5)
-+#endif
- 
- static DEFINE_SPINLOCK(kthread_create_lock);
- static LIST_HEAD(kthread_create_list);
---- /dev/null
-+++ b/kernel/sched_bfs.c
-@@ -0,0 +1,6059 @@
-+/*
-+ *  kernel/sched_bfs.c, was sched.c
-+ *
-+ *  Kernel scheduler and related syscalls
-+ *
-+ *  Copyright (C) 1991-2002  Linus Torvalds
-+ *
-+ *  1996-12-23  Modified by Dave Grothe to fix bugs in semaphores and
-+ *		make semaphores SMP safe
-+ *  1998-11-19	Implemented schedule_timeout() and related stuff
-+ *		by Andrea Arcangeli
-+ *  2002-01-04	New ultra-scalable O(1) scheduler by Ingo Molnar:
-+ *		hybrid priority-list and round-robin design with
-+ *		an array-switch method of distributing timeslices
-+ *		and per-CPU runqueues.  Cleanups and useful suggestions
-+ *		by Davide Libenzi, preemptible kernel bits by Robert Love.
-+ *  2003-09-03	Interactivity tuning by Con Kolivas.
-+ *  2004-04-02	Scheduler domains code by Nick Piggin
-+ *  2007-04-15  Work begun on replacing all interactivity tuning with a
-+ *              fair scheduling design by Con Kolivas.
-+ *  2007-05-05  Load balancing (smp-nice) and other improvements
-+ *              by Peter Williams
-+ *  2007-05-06  Interactivity improvements to CFS by Mike Galbraith
-+ *  2007-07-01  Group scheduling enhancements by Srivatsa Vaddagiri
-+ *  2007-11-29  RT balancing improvements by Steven Rostedt, Gregory Haskins,
-+ *              Thomas Gleixner, Mike Kravetz
-+ *  now		Brainfuck deadline scheduling policy by Con Kolivas deletes
-+ *              a whole lot of those previous things.
-+ */
-+
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/nmi.h>
-+#include <linux/init.h>
-+#include <asm/uaccess.h>
-+#include <linux/highmem.h>
-+#include <linux/smp_lock.h>
-+#include <asm/mmu_context.h>
-+#include <linux/interrupt.h>
-+#include <linux/capability.h>
-+#include <linux/completion.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/debug_locks.h>
-+#include <linux/perf_counter.h>
-+#include <linux/security.h>
-+#include <linux/notifier.h>
-+#include <linux/profile.h>
-+#include <linux/freezer.h>
-+#include <linux/vmalloc.h>
-+#include <linux/blkdev.h>
-+#include <linux/delay.h>
-+#include <linux/smp.h>
-+#include <linux/threads.h>
-+#include <linux/timer.h>
-+#include <linux/rcupdate.h>
-+#include <linux/cpu.h>
-+#include <linux/cpuset.h>
-+#include <linux/cpumask.h>
-+#include <linux/percpu.h>
-+#include <linux/kthread.h>
-+#include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
-+#include <linux/syscalls.h>
-+#include <linux/times.h>
-+#include <linux/tsacct_kern.h>
-+#include <linux/kprobes.h>
-+#include <linux/delayacct.h>
-+#include <linux/reciprocal_div.h>
-+#include <linux/log2.h>
-+#include <linux/bootmem.h>
-+#include <linux/ftrace.h>
-+
-+#include <asm/tlb.h>
-+#include <asm/unistd.h>
-+
-+#define CREATE_TRACE_POINTS
-+#include <trace/events/sched.h>
-+
-+#define rt_prio(prio)		unlikely((prio) < MAX_RT_PRIO)
-+#define rt_task(p)		rt_prio((p)->prio)
-+#define rt_queue(rq)		rt_prio((rq)->rq_prio)
-+#define batch_task(p)		(unlikely((p)->policy == SCHED_BATCH))
-+#define is_rt_policy(policy)	((policy) == SCHED_FIFO || \
-+					(policy) == SCHED_RR)
-+#define has_rt_policy(p)	unlikely(is_rt_policy((p)->policy))
-+#define idleprio_task(p)	unlikely((p)->policy == SCHED_IDLE)
-+#define iso_task(p)		unlikely((p)->policy == SCHED_ISO)
-+#define iso_queue(rq)		unlikely((rq)->rq_policy == SCHED_ISO)
-+#define ISO_PERIOD		((5 * HZ * num_online_cpus()) + 1)
-+
-+/*
-+ * Convert user-nice values [ -20 ... 0 ... 19 ]
-+ * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
-+ * and back.
-+ */
-+#define NICE_TO_PRIO(nice)	(MAX_RT_PRIO + (nice) + 20)
-+#define PRIO_TO_NICE(prio)	((prio) - MAX_RT_PRIO - 20)
-+#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)
-+
-+/*
-+ * 'User priority' is the nice value converted to something we
-+ * can work with better when scaling various scheduler parameters,
-+ * it's a [ 0 ... 39 ] range.
-+ */
-+#define USER_PRIO(p)		((p)-MAX_RT_PRIO)
-+#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)
-+#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))
-+#define SCHED_PRIO(p)		((p)+MAX_RT_PRIO)
-+
-+/* Some helpers for converting to/from various scales.*/
-+#define JIFFIES_TO_NS(TIME)	((TIME) * (1000000000 / HZ))
-+#define MS_TO_NS(TIME)		((TIME) * 1000000)
-+#define MS_TO_US(TIME)		((TIME) * 1000)
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * Divide a load by a sched group cpu_power : (load / sg->__cpu_power)
-+ * Since cpu_power is a 'constant', we can use a reciprocal divide.
-+ */
-+static inline u32 sg_div_cpu_power(const struct sched_group *sg, u32 load)
-+{
-+	return reciprocal_divide(load, sg->reciprocal_cpu_power);
-+}
-+
-+/*
-+ * Each time a sched group cpu_power is changed,
-+ * we must compute its reciprocal value
-+ */
-+static inline void sg_inc_cpu_power(struct sched_group *sg, u32 val)
-+{
-+	sg->__cpu_power += val;
-+	sg->reciprocal_cpu_power = reciprocal_value(sg->__cpu_power);
-+}
-+#endif
-+
-+/*
-+ * This is the time all tasks within the same priority round robin.
-+ * Value is in ms and set to a minimum of 6ms. Scales with number of cpus.
-+ * Tunable via /proc interface.
-+ */
-+int rr_interval __read_mostly = 6;
-+
-+/*
-+ * sched_iso_cpu - sysctl which determines the cpu percentage SCHED_ISO tasks
-+ * are allowed to run five seconds as real time tasks. This is the total over
-+ * all online cpus.
-+ */
-+int sched_iso_cpu __read_mostly = 70;
-+
-+int prio_ratios[PRIO_RANGE] __read_mostly;
-+
-+static inline unsigned long timeslice(void)
-+{
-+	return MS_TO_US(rr_interval);
-+}
-+
-+struct global_rq {
-+	spinlock_t lock;
-+	unsigned long nr_running;
-+	unsigned long nr_uninterruptible;
-+	unsigned long long nr_switches;
-+	struct list_head queue[PRIO_LIMIT];
-+	DECLARE_BITMAP(prio_bitmap, PRIO_LIMIT + 1);
-+	unsigned long iso_ticks;
-+	unsigned short iso_refractory;
-+#ifdef CONFIG_SMP
-+	unsigned long qnr; /* queued not running */
-+	cpumask_t cpu_idle_map;
-+#endif
-+};
-+
-+static struct global_rq grq;
-+
-+/*
-+ * This is the main, per-CPU runqueue data structure.
-+ * All this is protected by the global_rq lock.
-+ */
-+struct rq {
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	unsigned char in_nohz_recently;
-+#endif
-+#endif
-+
-+	struct task_struct *curr, *idle;
-+	struct mm_struct *prev_mm;
-+	struct list_head queue; /* Place to store currently running task */
-+
-+	/* Stored data about rq->curr to work outside grq lock */
-+	unsigned long rq_deadline;
-+	unsigned int rq_policy;
-+	int rq_time_slice;
-+	int rq_prio;
-+
-+	/* Accurate timekeeping data */
-+	u64 timekeep_clock;
-+	unsigned long user_pc, nice_pc, irq_pc, softirq_pc, system_pc,
-+			iowait_pc, idle_pc;
-+	atomic_t nr_iowait;
-+
-+	int cpu;		/* cpu of this runqueue */
-+	int online;
-+
-+#ifdef CONFIG_SMP
-+	struct root_domain *rd;
-+	struct sched_domain *sd;
-+
-+	struct list_head migration_queue;
-+#endif
-+
-+	u64 clock;
-+#ifdef CONFIG_SCHEDSTATS
-+
-+	/* latency stats */
-+	struct sched_info rq_sched_info;
-+	unsigned long long rq_cpu_time;
-+	/* could above be rq->cfs_rq.exec_clock + rq->rt_rq.rt_runtime ? */
-+
-+	/* sys_sched_yield() stats */
-+	unsigned int yld_count;
-+
-+	/* schedule() stats */
-+	unsigned int sched_switch;
-+	unsigned int sched_count;
-+	unsigned int sched_goidle;
-+
-+	/* try_to_wake_up() stats */
-+	unsigned int ttwu_count;
-+	unsigned int ttwu_local;
-+
-+	/* BKL stats */
-+	unsigned int bkl_count;
-+#endif
-+};
-+
-+static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp;
-+static DEFINE_MUTEX(sched_hotcpu_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+/*
-+ * We add the notion of a root-domain which will be used to define per-domain
-+ * variables. Each exclusive cpuset essentially defines an island domain by
-+ * fully partitioning the member cpus from any other cpuset. Whenever a new
-+ * exclusive cpuset is created, we also create and attach a new root-domain
-+ * object.
-+ *
-+ */
-+struct root_domain {
-+	atomic_t refcount;
-+	cpumask_var_t span;
-+	cpumask_var_t online;
-+
-+	/*
-+	 * The "RT overload" flag: it gets set if a CPU has more than
-+	 * one runnable RT task.
-+	 */
-+	cpumask_var_t rto_mask;
-+	atomic_t rto_count;
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+	/*
-+	 * Preferred wake up cpu nominated by sched_mc balance that will be
-+	 * used when most cpus are idle in the system indicating overall very
-+	 * low system utilisation. Triggered at POWERSAVINGS_BALANCE_WAKEUP(2)
-+	 */
-+	unsigned int sched_mc_preferred_wakeup_cpu;
-+#endif
-+};
-+
-+/*
-+ * By default the system creates a single root-domain with all cpus as
-+ * members (mimicking the global state we have today).
-+ */
-+static struct root_domain def_root_domain;
-+
-+#endif
-+
-+static inline int cpu_of(struct rq *rq)
-+{
-+#ifdef CONFIG_SMP
-+	return rq->cpu;
-+#else
-+	return 0;
-+#endif
-+}
-+
-+/*
-+ * The domain tree (rq->sd) is protected by RCU's quiescent state transition.
-+ * See detach_destroy_domains: synchronize_sched for details.
-+ *
-+ * The domain tree of any CPU may only be accessed from within
-+ * preempt-disabled sections.
-+ */
-+#define for_each_domain(cpu, __sd) \
-+	for (__sd = rcu_dereference(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
-+
-+#define cpu_rq(cpu)		(&per_cpu(runqueues, (cpu)))
-+#define this_rq()		(&__get_cpu_var(runqueues))
-+#define task_rq(p)		cpu_rq(task_cpu(p))
-+#define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
-+
-+#include "sched_stats.h"
-+
-+#ifndef prepare_arch_switch
-+# define prepare_arch_switch(next)	do { } while (0)
-+#endif
-+#ifndef finish_arch_switch
-+# define finish_arch_switch(prev)	do { } while (0)
-+#endif
-+
-+inline void update_rq_clock(struct rq *rq)
-+{
-+	rq->clock = sched_clock_cpu(cpu_of(rq));
-+}
-+
-+static inline int task_running(struct task_struct *p)
-+{
-+	return (!!p->oncpu);
-+}
-+
-+static inline void grq_lock(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock(&grq.lock);
-+}
-+
-+static inline void grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock(&grq.lock);
-+}
-+
-+static inline void grq_lock_irq(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irq(&grq.lock);
-+}
-+
-+static inline void time_lock_grq(struct rq *rq)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	update_rq_clock(rq);
-+}
-+
-+static inline void grq_unlock_irq(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irq(&grq.lock);
-+}
-+
-+static inline void grq_lock_irqsave(unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irqsave(&grq.lock, *flags);
-+}
-+
-+static inline void grq_unlock_irqrestore(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irqrestore(&grq.lock, *flags);
-+}
-+
-+static inline struct rq
-+*task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	grq_lock_irqsave(flags);
-+	return task_rq(p);
-+}
-+
-+static inline struct rq
-+*time_task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	struct rq *rq = task_grq_lock(p, flags);
-+	update_rq_clock(rq);
-+	return rq;
-+}
-+
-+static inline void task_grq_unlock(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	grq_unlock_irqrestore(flags);
-+}
-+
-+/**
-+ * runqueue_is_locked
-+ *
-+ * Returns true if the global runqueue is locked.
-+ * This interface allows printk to be called with the runqueue lock
-+ * held and know whether or not it is OK to wake up the klogd.
-+ */
-+int runqueue_is_locked(void)
-+{
-+	return spin_is_locked(&grq.lock);
-+}
-+
-+void task_rq_unlock_wait(struct task_struct *p)
-+	__releases(grq.lock)
-+{
-+	smp_mb(); /* spin-unlock-wait is not a full memory barrier */
-+	spin_unlock_wait(&grq.lock);
-+}
-+
-+static inline void time_grq_lock(struct rq *rq, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	spin_lock_irqsave(&grq.lock, *flags);
-+	update_rq_clock(rq);
-+}
-+
-+static inline struct rq *__task_grq_lock(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	return task_rq(p);
-+}
-+
-+static inline void __task_grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	grq_unlock();
-+}
-+
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+	/* this is a valid case when another task releases the spinlock */
-+	grq.lock.owner = current;
-+#endif
-+	/*
-+	 * If we are tracking spinlock dependencies then we have to
-+	 * fix up the runqueue lock - which gets 'carried over' from
-+	 * prev into current:
-+	 */
-+	spin_acquire(&grq.lock.dep_map, 0, 0, _THIS_IP_);
-+
-+	grq_unlock_irq();
-+}
-+
-+#else /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	grq_unlock_irq();
-+#else
-+	grq_unlock();
-+#endif
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+	smp_wmb();
-+#ifndef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_enable();
-+#endif
-+}
-+#endif /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+/*
-+ * A task that is queued will be on the grq run list.
-+ * A task that is not running or queued will not be on the grq run list.
-+ * A task that is currently running will have ->oncpu set and be queued
-+ * temporarily in its own rq queue.
-+ * A task that is running and no longer queued will be seen only on
-+ * context switch exit.
-+ */
-+
-+static inline int task_queued(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list));
-+}
-+
-+static inline int task_queued_only(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list) && !task_running(p));
-+}
-+
-+/*
-+ * Removing from the global runqueue. Enter with grq locked.
-+ */
-+static void dequeue_task(struct task_struct *p)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (list_empty(grq.queue + p->prio))
-+		__clear_bit(p->prio, grq.prio_bitmap);
-+}
-+
-+static inline void reset_first_time_slice(struct task_struct *p)
-+{
-+	if (unlikely(p->first_time_slice))
-+		p->first_time_slice = 0;
-+}
-+
-+static int idleprio_suitable(struct task_struct *p)
-+{
-+	return (!freezing(p) && !signal_pending(p) &&
-+		!(task_contributes_to_load(p)) && !(p->flags & (PF_EXITING)));
-+}
-+
-+static int isoprio_suitable(void)
-+{
-+	return !grq.iso_refractory;
-+}
-+
-+/*
-+ * Adding to the global runqueue. Enter with grq locked.
-+ */
-+static void enqueue_task(struct task_struct *p)
-+{
-+	if (!rt_task(p)) {
-+		/* Check it hasn't gotten rt from PI */
-+		if ((idleprio_task(p) && idleprio_suitable(p)) ||
-+		   (iso_task(p) && isoprio_suitable()))
-+			p->prio = p->normal_prio;
-+		else
-+			p->prio = NORMAL_PRIO;
-+	}
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add_tail(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+/* Only idle task does this as a real time task*/
-+static inline void enqueue_task_head(struct task_struct *p)
-+{
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+static inline void requeue_task(struct task_struct *p)
-+{
-+	sched_info_queued(p);
-+}
-+
-+static inline int pratio(struct task_struct *p)
-+{
-+	return prio_ratios[TASK_USER_PRIO(p)];
-+}
-+
-+/*
-+ * task_timeslice - all tasks of all priorities get the exact same timeslice
-+ * length. CPU distribution is handled by giving different deadlines to
-+ * tasks of different priorities.
-+ */
-+static inline int task_timeslice(struct task_struct *p)
-+{
-+	return (rr_interval * pratio(p) / 100);
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void inc_qnr(void)
-+{
-+	grq.qnr++;
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+	grq.qnr--;
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.qnr;
-+}
-+#else
-+static inline void inc_qnr(void)
-+{
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.nr_running;
-+}
-+#endif
-+
-+/*
-+ * activate_idle_task - move idle task to the _front_ of runqueue.
-+ */
-+static inline void activate_idle_task(struct task_struct *p)
-+{
-+	enqueue_task_head(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+static inline int normal_prio(struct task_struct *p)
-+{
-+	if (has_rt_policy(p))
-+		return MAX_RT_PRIO - 1 - p->rt_priority;
-+	if (idleprio_task(p))
-+		return IDLE_PRIO;
-+	if (iso_task(p))
-+		return ISO_PRIO;
-+	return NORMAL_PRIO;
-+}
-+
-+/*
-+ * Calculate the current priority, i.e. the priority
-+ * taken into account by the scheduler. This value might
-+ * be boosted by RT tasks as it will be RT if the task got
-+ * RT-boosted. If not then it returns p->normal_prio.
-+ */
-+static int effective_prio(struct task_struct *p)
-+{
-+	p->normal_prio = normal_prio(p);
-+	/*
-+	 * If we are RT tasks or we were boosted to RT priority,
-+	 * keep the priority unchanged. Otherwise, update priority
-+	 * to the normal priority:
-+	 */
-+	if (!rt_prio(p->prio))
-+		return p->normal_prio;
-+	return p->prio;
-+}
-+
-+/*
-+ * activate_task - move a task to the runqueue. Enter with grq locked. The rq
-+ * doesn't really matter but gives us the local clock.
-+ */
-+static void activate_task(struct task_struct *p, struct rq *rq)
-+{
-+	u64 now = rq->clock;
-+
-+	/*
-+	 * Sleep time is in units of nanosecs, so shift by 20 to get a
-+	 * milliseconds-range estimation of the amount of time that the task
-+	 * spent sleeping:
-+	 */
-+	if (unlikely(prof_on == SLEEP_PROFILING)) {
-+		if (p->state == TASK_UNINTERRUPTIBLE)
-+			profile_hits(SLEEP_PROFILING, (void *)get_wchan(p),
-+				     (now - p->timestamp) >> 20);
-+	}
-+
-+	p->prio = effective_prio(p);
-+	p->timestamp = now;
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible--;
-+	enqueue_task(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+/*
-+ * deactivate_task - If it's running, it's not on the grq and we can just
-+ * decrement the nr_running.
-+ */
-+static inline void deactivate_task(struct task_struct *p)
-+{
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible++;
-+	grq.nr_running--;
-+}
-+
-+#ifdef CONFIG_SMP
-+void set_task_cpu(struct task_struct *p, unsigned int cpu)
-+{
-+	trace_sched_migrate_task(p, cpu);
-+	/*
-+	 * After ->cpu is set up to a new value, task_grq_lock(p, ...) can be
-+	 * successfuly executed on another CPU. We must ensure that updates of
-+	 * per-task data have been completed by this moment.
-+	 */
-+	smp_wmb();
-+	task_thread_info(p)->cpu = cpu;
-+}
-+#endif
-+
-+/*
-+ * Move a task off the global queue and take it to a cpu for it will
-+ * become the running task.
-+ */
-+static inline void take_task(struct rq *rq, struct task_struct *p)
-+{
-+	set_task_cpu(p, rq->cpu);
-+	dequeue_task(p);
-+	list_add(&p->rt.run_list, &rq->queue);
-+	dec_qnr();
-+}
-+
-+/*
-+ * Returns a descheduling task to the grq runqueue unless it is being
-+ * deactivated.
-+ */
-+static inline void return_task(struct task_struct *p, int deactivate)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (deactivate)
-+		deactivate_task(p);
-+	else {
-+		inc_qnr();
-+		enqueue_task(p);
-+	}
-+}
-+
-+/*
-+ * resched_task - mark a task 'to be rescheduled now'.
-+ *
-+ * On UP this means the setting of the need_resched flag, on SMP it
-+ * might also involve a cross-CPU call to trigger the scheduler on
-+ * the target CPU.
-+ */
-+#ifdef CONFIG_SMP
-+
-+#ifndef tsk_is_polling
-+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-+#endif
-+
-+static void resched_task(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	assert_spin_locked(&grq.lock);
-+
-+	if (unlikely(test_tsk_thread_flag(p, TIF_NEED_RESCHED)))
-+		return;
-+
-+	set_tsk_thread_flag(p, TIF_NEED_RESCHED);
-+
-+	cpu = task_cpu(p);
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(p))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#else
-+static inline void resched_task(struct task_struct *p)
-+{
-+	assert_spin_locked(&grq.lock);
-+	set_tsk_need_resched(p);
-+}
-+#endif
-+
-+/**
-+ * task_curr - is this task currently executing on a CPU?
-+ * @p: the task in question.
-+ */
-+inline int task_curr(const struct task_struct *p)
-+{
-+	return cpu_curr(task_cpu(p)) == p;
-+}
-+
-+#ifdef CONFIG_SMP
-+struct migration_req {
-+	struct list_head list;
-+
-+	struct task_struct *task;
-+	int dest_cpu;
-+
-+	struct completion done;
-+};
-+
-+/*
-+ * wait_task_context_switch -	wait for a thread to complete at least one
-+ *				context switch.
-+ *
-+ * @p must not be current.
-+ */
-+void wait_task_context_switch(struct task_struct *p)
-+{
-+	unsigned long nvcsw, nivcsw, flags;
-+	int running;
-+	struct rq *rq;
-+
-+	nvcsw	= p->nvcsw;
-+	nivcsw	= p->nivcsw;
-+	for (;;) {
-+		/*
-+		 * The runqueue is assigned before the actual context
-+		 * switch. We need to take the runqueue lock.
-+		 *
-+		 * We could check initially without the lock but it is
-+		 * very likely that we need to take the lock in every
-+		 * iteration.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		running = task_running(p);
-+		task_grq_unlock(&flags);
-+
-+		if (likely(!running))
-+			break;
-+		/*
-+		 * The switch count is incremented before the actual
-+		 * context switch. We thus wait for two switches to be
-+		 * sure at least one completed.
-+		 */
-+		if ((p->nvcsw - nvcsw) > 1)
-+			break;
-+		if ((p->nivcsw - nivcsw) > 1)
-+			break;
-+
-+		cpu_relax();
-+	}
-+}
-+
-+/*
-+ * wait_task_inactive - wait for a thread to unschedule.
-+ *
-+ * If @match_state is nonzero, it's the @p->state value just checked and
-+ * not expected to change.  If it changes, i.e. @p might have woken up,
-+ * then return zero.  When we succeed in waiting for @p to be off its CPU,
-+ * we return a positive number (its total switch count).  If a second call
-+ * a short while later returns the same number, the caller can be sure that
-+ * @p has remained unscheduled the whole time.
-+ *
-+ * The caller must ensure that the task *will* unschedule sometime soon,
-+ * else this function might spin for a *long* time. This function can't
-+ * be called with interrupts off, or it may introduce deadlock with
-+ * smp_call_function() if an IPI is sent by the same process we are
-+ * waiting to become inactive.
-+ */
-+unsigned long wait_task_inactive(struct task_struct *p, long match_state)
-+{
-+	unsigned long flags;
-+	int running, on_rq;
-+	unsigned long ncsw;
-+	struct rq *rq;
-+
-+	for (;;) {
-+		/*
-+		 * We do the initial early heuristics without holding
-+		 * any task-queue locks at all. We'll only try to get
-+		 * the runqueue lock when things look like they will
-+		 * work out!
-+		 */
-+		rq = task_rq(p);
-+
-+		/*
-+		 * If the task is actively running on another CPU
-+		 * still, just relax and busy-wait without holding
-+		 * any locks.
-+		 *
-+		 * NOTE! Since we don't hold any locks, it's not
-+		 * even sure that "rq" stays as the right runqueue!
-+		 * But we don't care, since this will
-+		 * return false if the runqueue has changed and p
-+		 * is actually now running somewhere else!
-+		 */
-+		while (task_running(p) && p == rq->curr) {
-+			if (match_state && unlikely(p->state != match_state))
-+				return 0;
-+			cpu_relax();
-+		}
-+
-+		/*
-+		 * Ok, time to look more closely! We need the grq
-+		 * lock now, to be *sure*. If we're wrong, we'll
-+		 * just go back and repeat.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		trace_sched_wait_task(rq, p);
-+		running = task_running(p);
-+		on_rq = task_queued(p);
-+		ncsw = 0;
-+		if (!match_state || p->state == match_state)
-+			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
-+		task_grq_unlock(&flags);
-+
-+		/*
-+		 * If it changed from the expected state, bail out now.
-+		 */
-+		if (unlikely(!ncsw))
-+			break;
-+
-+		/*
-+		 * Was it really running after all now that we
-+		 * checked with the proper locks actually held?
-+		 *
-+		 * Oops. Go back and try again..
-+		 */
-+		if (unlikely(running)) {
-+			cpu_relax();
-+			continue;
-+		}
-+
-+		/*
-+		 * It's not enough that it's not actively running,
-+		 * it must be off the runqueue _entirely_, and not
-+		 * preempted!
-+		 *
-+		 * So if it was still runnable (but just not actively
-+		 * running right now), it's preempted, and we should
-+		 * yield - it could be a while.
-+		 */
-+		if (unlikely(on_rq)) {
-+			schedule_timeout_uninterruptible(1);
-+			continue;
-+		}
-+
-+		/*
-+		 * Ahh, all good. It wasn't running, and it wasn't
-+		 * runnable, which means that it will never become
-+		 * running in the future either. We're all done!
-+		 */
-+		break;
-+	}
-+
-+	return ncsw;
-+}
-+
-+/***
-+ * kick_process - kick a running thread to enter/exit the kernel
-+ * @p: the to-be-kicked thread
-+ *
-+ * Cause a process which is running on another CPU to enter
-+ * kernel-mode, without any delay. (to get signals handled.)
-+ *
-+ * NOTE: this function doesnt have to take the runqueue lock,
-+ * because all it wants to ensure is that the remote task enters
-+ * the kernel. If the IPI races and the task has been migrated
-+ * to another CPU then no harm is done and the purpose has been
-+ * achieved as well.
-+ */
-+void kick_process(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if ((cpu != smp_processor_id()) && task_curr(p))
-+		smp_send_reschedule(cpu);
-+	preempt_enable();
-+}
-+EXPORT_SYMBOL_GPL(kick_process);
-+#endif
-+
-+#define rq_idle(rq)	((rq)->rq_prio == PRIO_LIMIT)
-+
-+/*
-+ * RT tasks preempt purely on priority. SCHED_NORMAL tasks preempt on the
-+ * basis of earlier deadlines. SCHED_BATCH and SCHED_IDLE don't preempt,
-+ * they cooperatively multitask.
-+ */
-+static inline int task_preempts_curr(struct task_struct *p, struct rq *rq)
-+{
-+	int preempts = 0;
-+
-+	if (p->prio < rq->rq_prio)
-+		preempts = 1;
-+	else if (p->policy == SCHED_NORMAL && (p->prio == rq->rq_prio &&
-+		 time_before(p->deadline, rq->rq_deadline)))
-+			preempts = 1;
-+	return preempts;
-+}
-+
-+/*
-+ * Wake up *any* suitable cpu to schedule this task.
-+ */
-+static void try_preempt(struct task_struct *p)
-+{
-+	struct rq *highest_prio_rq, *this_rq;
-+	unsigned long latest_deadline, cpu;
-+	int highest_prio;
-+	cpumask_t tmp;
-+
-+	/* Try the task's previous rq first and as a fallback */
-+	this_rq = task_rq(p);
-+
-+	if (cpu_isset(this_rq->cpu, p->cpus_allowed)) {
-+		highest_prio_rq = this_rq;
-+		/* If this_rq is idle, use that. */
-+		if (rq_idle(this_rq))
-+			goto found_rq;
-+	} else
-+		highest_prio_rq = cpu_rq(any_online_cpu(p->cpus_allowed));
-+	latest_deadline = this_rq->rq_deadline;
-+	highest_prio = this_rq->rq_prio;
-+
-+	cpus_and(tmp, cpu_online_map, p->cpus_allowed);
-+
-+	for_each_cpu_mask(cpu, tmp) {
-+		struct rq *rq;
-+		int rq_prio;
-+
-+		rq = cpu_rq(cpu);
-+
-+		if (rq_idle(rq)) {
-+			/* found an idle rq, use that one */
-+			highest_prio_rq = rq;
-+			goto found_rq;
-+		}
-+
-+		rq_prio = rq->rq_prio;
-+		if (rq_prio > highest_prio ||
-+			(rq_prio == highest_prio &&
-+			time_after(rq->rq_deadline, latest_deadline))) {
-+				highest_prio = rq_prio;
-+				latest_deadline = rq->rq_deadline;
-+				highest_prio_rq = rq;
-+		}
-+	}
-+
-+	if (!task_preempts_curr(p, highest_prio_rq))
-+		return;
-+found_rq:
-+	resched_task(highest_prio_rq->curr);
-+	return;
-+}
-+
-+/**
-+ * task_oncpu_function_call - call a function on the cpu on which a task runs
-+ * @p:		the task to evaluate
-+ * @func:	the function to be called
-+ * @info:	the function call argument
-+ *
-+ * Calls the function @func when the task is currently running. This might
-+ * be on the current CPU, which just calls the function directly
-+ */
-+void task_oncpu_function_call(struct task_struct *p,
-+			      void (*func) (void *info), void *info)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if (task_curr(p))
-+		smp_call_function_single(cpu, func, info, 1);
-+	preempt_enable();
-+}
-+
-+#ifdef CONFIG_SMP
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return (cpus_intersects(p->cpus_allowed, grq.cpu_idle_map));
-+}
-+#else
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return 0;
-+}
-+#endif
-+
-+/***
-+ * try_to_wake_up - wake up a thread
-+ * @p: the to-be-woken-up thread
-+ * @state: the mask of task states that can be woken
-+ * @sync: do a synchronous wakeup?
-+ *
-+ * Put it on the run-queue if it's not already there. The "current"
-+ * thread is always on the run-queue (except when the actual
-+ * re-schedule is in progress), and as such you're allowed to do
-+ * the simpler "current->state = TASK_RUNNING" to mark yourself
-+ * runnable without the overhead of this.
-+ *
-+ * returns failure only if the task is already active.
-+ */
-+static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
-+{
-+	unsigned long flags;
-+	int success = 0;
-+	long old_state;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags);
-+	old_state = p->state;
-+	if (!(old_state & state))
-+		goto out_unlock;
-+
-+	/*
-+	 * Note this catches tasks that are running and queued, but returns
-+	 * false during the context switch when they're running and no
-+	 * longer queued.
-+	 */
-+	if (task_queued(p))
-+		goto out_running;
-+
-+	activate_task(p, rq);
-+	/*
-+	 * Sync wakeups (i.e. those types of wakeups where the waker
-+	 * has indicated that it will leave the CPU in short order)
-+	 * don't trigger a preemption if there are no idle cpus,
-+	 * instead waiting for current to deschedule.
-+	 */
-+	if (!sync || (sync && suitable_idle_cpus(p)))
-+		try_preempt(p);
-+	success = 1;
-+
-+out_running:
-+	trace_sched_wakeup(rq, p, success);
-+	p->state = TASK_RUNNING;
-+out_unlock:
-+	task_grq_unlock(&flags);
-+	return success;
-+}
-+
-+/**
-+ * wake_up_process - Wake up a specific process
-+ * @p: The process to be woken up.
-+ *
-+ * Attempt to wake up the nominated process and move it to the set of runnable
-+ * processes.  Returns 1 if the process was woken up, 0 if it was already
-+ * running.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+int wake_up_process(struct task_struct *p)
-+{
-+	return try_to_wake_up(p, TASK_ALL, 0);
-+}
-+EXPORT_SYMBOL(wake_up_process);
-+
-+int wake_up_state(struct task_struct *p, unsigned int state)
-+{
-+	return try_to_wake_up(p, state, 0);
-+}
-+
-+/*
-+ * Perform scheduler related setup for a newly forked process p.
-+ * p is forked by current.
-+ */
-+void sched_fork(struct task_struct *p, int clone_flags)
-+{
-+	int cpu = get_cpu();
-+	struct rq *rq;
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&p->preempt_notifiers);
-+#endif
-+	/*
-+	 * We mark the process as running here, but have not actually
-+	 * inserted it onto the runqueue yet. This guarantees that
-+	 * nobody will actually run it, and a signal or other external
-+	 * event cannot wake it up and insert it on the runqueue either.
-+	 */
-+	p->state = TASK_RUNNING;
-+	set_task_cpu(p, cpu);
-+
-+	/* Should be reset in fork.c but done here for ease of bfs patching */
-+	p->se.sum_exec_runtime = p->stime_pc = p->utime_pc = 0;
-+
-+	/*
-+	 * Make sure we do not leak PI boosting priority to the child:
-+	 */
-+	p->prio = current->normal_prio;
-+
-+	INIT_LIST_HEAD(&p->rt.run_list);
-+#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
-+	if (unlikely(sched_info_on()))
-+		memset(&p->sched_info, 0, sizeof(p->sched_info));
-+#endif
-+
-+	p->oncpu = 0;
-+
-+#ifdef CONFIG_PREEMPT
-+	/* Want to start with kernel preemption disabled. */
-+	task_thread_info(p)->preempt_count = 1;
-+#endif
-+	if (unlikely(p->policy == SCHED_FIFO))
-+		goto out;
-+	/*
-+	 * Share the timeslice between parent and child, thus the
-+	 * total amount of pending timeslices in the system doesn't change,
-+	 * resulting in more scheduling fairness. If it's negative, it won't
-+	 * matter since that's the same as being 0. current's time_slice is
-+	 * actually in rq_time_slice when it's running.
-+	 */
-+	local_irq_disable();
-+	rq = task_rq(current);
-+	if (likely(rq->rq_time_slice > 0)) {
-+		rq->rq_time_slice /= 2;
-+		/*
-+		 * The remainder of the first timeslice might be recovered by
-+		 * the parent if the child exits early enough.
-+		 */
-+		p->first_time_slice = 1;
-+	}
-+	p->rt.time_slice = rq->rq_time_slice;
-+	local_irq_enable();
-+out:
-+	put_cpu();
-+}
-+
-+/*
-+ * wake_up_new_task - wake up a newly created task for the first time.
-+ *
-+ * This function will do some initial scheduler statistics housekeeping
-+ * that must be done for every newly created context, then puts the task
-+ * on the runqueue and wakes it.
-+ */
-+void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags); ;
-+	parent = p->parent;
-+	BUG_ON(p->state != TASK_RUNNING);
-+	set_task_cpu(p, task_cpu(parent));
-+
-+	activate_task(p, rq);
-+	trace_sched_wakeup_new(rq, p, 1);
-+	if (!(clone_flags & CLONE_VM) && rq->curr == parent &&
-+		!suitable_idle_cpus(p)) {
-+		/*
-+		 * The VM isn't cloned, so we're in a good position to
-+		 * do child-runs-first in anticipation of an exec. This
-+		 * usually avoids a lot of COW overhead.
-+		 */
-+			resched_task(parent);
-+	} else
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+}
-+
-+/*
-+ * Potentially available exiting-child timeslices are
-+ * retrieved here - this way the parent does not get
-+ * penalized for creating too many threads.
-+ *
-+ * (this cannot be used to 'generate' timeslices
-+ * artificially, because any timeslice recovered here
-+ * was given away by the parent in the first place.)
-+ */
-+void sched_exit(struct task_struct *p)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (p->first_time_slice) {
-+		parent = p->parent;
-+		rq = task_grq_lock(parent, &flags);
-+		parent->rt.time_slice += p->rt.time_slice;
-+		if (unlikely(parent->rt.time_slice > timeslice()))
-+			parent->rt.time_slice = timeslice();
-+		task_grq_unlock(&flags);
-+	}
-+}
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+
-+/**
-+ * preempt_notifier_register - tell me when current is being preempted & rescheduled
-+ * @notifier: notifier struct to register
-+ */
-+void preempt_notifier_register(struct preempt_notifier *notifier)
-+{
-+	hlist_add_head(&notifier->link, &current->preempt_notifiers);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_register);
-+
-+/**
-+ * preempt_notifier_unregister - no longer interested in preemption notifications
-+ * @notifier: notifier struct to unregister
-+ *
-+ * This is safe to call from within a preemption notifier.
-+ */
-+void preempt_notifier_unregister(struct preempt_notifier *notifier)
-+{
-+	hlist_del(&notifier->link);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_unregister);
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_in(notifier, raw_smp_processor_id());
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_out(notifier, next);
-+}
-+
-+#else /* !CONFIG_PREEMPT_NOTIFIERS */
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+}
-+
-+#endif /* CONFIG_PREEMPT_NOTIFIERS */
-+
-+/**
-+ * prepare_task_switch - prepare to switch tasks
-+ * @rq: the runqueue preparing to switch
-+ * @next: the task we are going to switch to.
-+ *
-+ * This is called with the rq lock held and interrupts off. It must
-+ * be paired with a subsequent finish_task_switch after the context
-+ * switch.
-+ *
-+ * prepare_task_switch sets up locking and calls architecture specific
-+ * hooks.
-+ */
-+static inline void
-+prepare_task_switch(struct rq *rq, struct task_struct *prev,
-+		    struct task_struct *next)
-+{
-+	fire_sched_out_preempt_notifiers(prev, next);
-+	prepare_lock_switch(rq, next);
-+	prepare_arch_switch(next);
-+}
-+
-+/**
-+ * finish_task_switch - clean up after a task-switch
-+ * @rq: runqueue associated with task-switch
-+ * @prev: the thread we just switched away from.
-+ *
-+ * finish_task_switch must be called after the context switch, paired
-+ * with a prepare_task_switch call before the context switch.
-+ * finish_task_switch will reconcile locking set up by prepare_task_switch,
-+ * and do any other architecture-specific cleanup actions.
-+ *
-+ * Note that we may have delayed dropping an mm in context_switch(). If
-+ * so, we finish that here outside of the runqueue lock.  (Doing it
-+ * with the lock held can cause deadlocks; see schedule() for
-+ * details.)
-+ */
-+static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct mm_struct *mm = rq->prev_mm;
-+	long prev_state;
-+
-+	rq->prev_mm = NULL;
-+
-+	/*
-+	 * A task struct has one reference for the use as "current".
-+	 * If a task dies, then it sets TASK_DEAD in tsk->state and calls
-+	 * schedule one last time. The schedule call will never return, and
-+	 * the scheduled task must drop that reference.
-+	 * The test for TASK_DEAD must occur while the runqueue locks are
-+	 * still held, otherwise prev could be scheduled on another cpu, die
-+	 * there before we look at prev->state, and then the reference would
-+	 * be dropped twice.
-+	 *		Manfred Spraul <manfred@colorfullife.com>
-+	 */
-+	prev_state = prev->state;
-+	finish_arch_switch(prev);
-+	perf_counter_task_sched_in(current, cpu_of(rq));
-+	finish_lock_switch(rq, prev);
-+
-+	fire_sched_in_preempt_notifiers(current);
-+	if (mm)
-+		mmdrop(mm);
-+	if (unlikely(prev_state == TASK_DEAD)) {
-+		/*
-+		 * Remove function-return probe instances associated with this
-+		 * task and put them back on the free list.
-+	 	 */
-+		kprobe_flush_task(prev);
-+		put_task_struct(prev);
-+	}
-+}
-+
-+/**
-+ * schedule_tail - first thing a freshly forked thread must call.
-+ * @prev: the thread we just switched away from.
-+ */
-+asmlinkage void schedule_tail(struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct rq *rq = this_rq();
-+
-+	finish_task_switch(rq, prev);
-+#ifdef __ARCH_WANT_UNLOCKED_CTXSW
-+	/* In this case, finish_task_switch does not reenable preemption */
-+	preempt_enable();
-+#endif
-+	if (current->set_child_tid)
-+		put_user(current->pid, current->set_child_tid);
-+}
-+
-+/*
-+ * context_switch - switch to the new MM and the new
-+ * thread's register state.
-+ */
-+static inline void
-+context_switch(struct rq *rq, struct task_struct *prev,
-+	       struct task_struct *next)
-+{
-+	struct mm_struct *mm, *oldmm;
-+
-+	prepare_task_switch(rq, prev, next);
-+	trace_sched_switch(rq, prev, next);
-+	mm = next->mm;
-+	oldmm = prev->active_mm;
-+	/*
-+	 * For paravirt, this is coupled with an exit in switch_to to
-+	 * combine the page table reload and the switch backend into
-+	 * one hypercall.
-+	 */
-+	arch_enter_lazy_cpu_mode();
-+
-+	if (unlikely(!mm)) {
-+		next->active_mm = oldmm;
-+		atomic_inc(&oldmm->mm_count);
-+		enter_lazy_tlb(oldmm, next);
-+	} else
-+		switch_mm(oldmm, mm, next);
-+
-+	if (unlikely(!prev->mm)) {
-+		prev->active_mm = NULL;
-+		rq->prev_mm = oldmm;
-+	}
-+	/*
-+	 * Since the runqueue lock will be released by the next
-+	 * task (which is an invalid locking op but in the case
-+	 * of the scheduler it's an obvious special-case), so we
-+	 * do an early lockdep release here:
-+	 */
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+#endif
-+
-+	/* Here we just switch the register state and the stack. */
-+	switch_to(prev, next, prev);
-+
-+	barrier();
-+	/*
-+	 * this_rq must be evaluated again because prev may have moved
-+	 * CPUs since it called schedule(), thus the 'rq' on its stack
-+	 * frame will be invalid.
-+	 */
-+	finish_task_switch(this_rq(), prev);
-+}
-+
-+/*
-+ * nr_running, nr_uninterruptible and nr_context_switches:
-+ *
-+ * externally visible scheduler statistics: current number of runnable
-+ * threads, current number of uninterruptible-sleeping threads, total
-+ * number of context switches performed since bootup. All are measured
-+ * without grabbing the grq lock but the occasional inaccurate result
-+ * doesn't matter so long as it's positive.
-+ */
-+unsigned long nr_running(void)
-+{
-+	long nr = grq.nr_running;
-+
-+	if (unlikely(nr < 0))
-+		nr = 0;
-+	return (unsigned long)nr;
-+}
-+
-+unsigned long nr_uninterruptible(void)
-+{
-+	unsigned long nu = grq.nr_uninterruptible;
-+
-+	if (unlikely(nu < 0))
-+		nu = 0;
-+	return nu;
-+}
-+
-+unsigned long long nr_context_switches(void)
-+{
-+	long long ns = grq.nr_switches;
-+
-+	/* This is of course impossible */
-+	if (unlikely(ns < 0))
-+		ns = 1;
-+	return (long long)ns;
-+}
-+
-+unsigned long nr_iowait(void)
-+{
-+	unsigned long i, sum = 0;
-+
-+	for_each_possible_cpu(i)
-+		sum += atomic_read(&cpu_rq(i)->nr_iowait);
-+
-+	return sum;
-+}
-+
-+unsigned long nr_active(void)
-+{
-+	return nr_running() + nr_uninterruptible();
-+}
-+
-+DEFINE_PER_CPU(struct kernel_stat, kstat);
-+
-+EXPORT_PER_CPU_SYMBOL(kstat);
-+
-+/*
-+ * On each tick, see what percentage of that tick was attributed to each
-+ * component and add the percentage to the _pc values. Once a _pc value has
-+ * accumulated one tick's worth, account for that. This means the total
-+ * percentage of load components will always be 100 per tick.
-+ */
-+static void pc_idle_time(struct rq *rq, unsigned long pc)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t tmp = cputime_to_cputime64(jiffies_to_cputime(1));
-+
-+	if (atomic_read(&rq->nr_iowait) > 0) {
-+		rq->iowait_pc += pc;
-+		if (rq->iowait_pc >= 100) {
-+			rq->iowait_pc %= 100;
-+			cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
-+		}
-+	} else {
-+		rq->idle_pc += pc;
-+		if (rq->idle_pc >= 100) {
-+			rq->idle_pc %= 100;
-+			cpustat->idle = cputime64_add(cpustat->idle, tmp);
-+		}
-+	}
-+}
-+
-+static void
-+pc_system_time(struct rq *rq, struct task_struct *p, int hardirq_offset,
-+	       unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->stime_pc += pc;
-+	if (p->stime_pc >= 100) {
-+		p->stime_pc -= 100;
-+		p->stime = cputime_add(p->stime, one_jiffy);
-+		p->stimescaled = cputime_add(p->stimescaled, one_jiffy_scaled);
-+		account_group_system_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (hardirq_count() - hardirq_offset)
-+		rq->irq_pc += pc;
-+	else if (softirq_count()) {
-+		rq->softirq_pc += pc;
-+		if (rq->softirq_pc >= 100) {
-+			rq->softirq_pc %= 100;
-+			cpustat->softirq = cputime64_add(cpustat->softirq, tmp);
-+		}
-+	} else {
-+		rq->system_pc += pc;
-+		if (rq->system_pc >= 100) {
-+			rq->system_pc %= 100;
-+			cpustat->system = cputime64_add(cpustat->system, tmp);
-+		}
-+	}
-+}
-+
-+static void pc_user_time(struct rq *rq, struct task_struct *p,
-+			 unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->utime_pc += pc;
-+	if (p->utime_pc >= 100) {
-+		p->utime_pc -= 100;
-+		p->utime = cputime_add(p->utime, one_jiffy);
-+		p->utimescaled = cputime_add(p->utimescaled, one_jiffy_scaled);
-+		account_group_user_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (TASK_NICE(p) > 0 || idleprio_task(p)) {
-+		rq->nice_pc += pc;
-+		if (rq->nice_pc >= 100) {
-+			rq->nice_pc %= 100;
-+			cpustat->nice = cputime64_add(cpustat->nice, tmp);
-+		}
-+	} else {
-+		rq->user_pc += pc;
-+		if (rq->user_pc >= 100) {
-+			rq->user_pc %= 100;
-+			cpustat->user = cputime64_add(cpustat->user, tmp);
-+		}
-+	}
-+}
-+
-+/* Convert nanoseconds to percentage of one tick. */
-+#define NS_TO_PC(NS)	(NS * 100 / JIFFIES_TO_NS(1))
-+
-+/*
-+ * This is called on clock ticks and on context switches.
-+ * Bank in p->se.sum_exec_runtime the ns elapsed since the last tick or switch.
-+ * CPU scheduler quota accounting is also performed here in microseconds.
-+ * The value returned from sched_clock() occasionally gives bogus values so
-+ * some sanity checking is required. Time is supposed to be banked all the
-+ * time so default to half a tick to make up for when sched_clock reverts
-+ * to just returning jiffies, and for hardware that can't do tsc.
-+ */
-+static void
-+update_cpu_clock(struct rq *rq, struct task_struct *p, int tick)
-+{
-+	long time_diff = rq->clock - p->last_ran;
-+	long account_ns = rq->clock - rq->timekeep_clock;
-+	struct task_struct *idle = rq->idle;
-+	unsigned long account_pc;
-+
-+	/*
-+	 * There should be less than or equal to one jiffy worth, and not
-+	 * negative/overflow. time_diff is only used for internal scheduler
-+	 * time_slice accounting.
-+	 */
-+	if (time_diff <= 0)
-+		time_diff = JIFFIES_TO_NS(1) / 2;
-+	else if (time_diff > JIFFIES_TO_NS(1))
-+		time_diff = JIFFIES_TO_NS(1);
-+
-+	if (unlikely(account_ns < 0))
-+		account_ns = 0;
-+
-+	account_pc = NS_TO_PC(account_ns);
-+
-+	if (tick) {
-+		int user_tick = user_mode(get_irq_regs());
-+
-+		/* Accurate tick timekeeping */
-+		if (user_tick)
-+			pc_user_time(rq, p, account_pc, account_ns);
-+		else if (p != idle || (irq_count() != HARDIRQ_OFFSET))
-+			pc_system_time(rq, p, HARDIRQ_OFFSET,
-+				       account_pc, account_ns);
-+		else
-+			pc_idle_time(rq, account_pc);
-+	} else {
-+		/* Accurate subtick timekeeping */
-+		if (p == idle)
-+			pc_idle_time(rq, account_pc);
-+		else
-+			pc_user_time(rq, p, account_pc, account_ns);
-+	}
-+
-+	/* time_slice accounting is done in usecs to avoid overflow on 32bit */
-+	if (rq->rq_policy != SCHED_FIFO && p != idle)
-+		rq->rq_time_slice -= time_diff / 1000;
-+	p->last_ran = rq->timekeep_clock = rq->clock;
-+}
-+
-+/*
-+ * Return any ns on the sched_clock that have not yet been accounted in
-+ * @p in case that task is currently running.
-+ *
-+ * Called with task_grq_lock() held on @rq.
-+ */
-+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
-+{
-+	u64 ns = 0;
-+
-+	if (p == rq->curr) {
-+		update_rq_clock(rq);
-+		ns = rq->clock - p->last_ran;
-+		if ((s64)ns < 0)
-+			ns = 0;
-+	}
-+
-+	return ns;
-+}
-+
-+unsigned long long task_delta_exec(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return accounted runtime for the task.
-+ * In case the task is currently running, return the runtime plus current's
-+ * pending runtime that have not been accounted yet.
-+ */
-+unsigned long long task_sched_runtime(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return sum_exec_runtime for the thread group.
-+ * In case the task is currently running, return the sum plus current's
-+ * pending runtime that have not been accounted yet.
-+ *
-+ * Note that the thread group might have other running tasks as well,
-+ * so the return value not includes other pending runtime that other
-+ * running tasks might have.
-+ */
-+unsigned long long thread_group_sched_runtime(struct task_struct *p)
-+{
-+	struct task_cputime totals;
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	thread_group_cputime(p, &totals);
-+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/* Compatibility crap for removal */
-+void account_user_time(struct task_struct *p, cputime_t cputime,
-+		       cputime_t cputime_scaled)
-+{
-+}
-+
-+void account_idle_time(cputime_t cputime)
-+{
-+}
-+
-+/*
-+ * Account guest cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @cputime: the cpu time spent in virtual machine since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ */
-+static void account_guest_time(struct task_struct *p, cputime_t cputime,
-+			       cputime_t cputime_scaled)
-+{
-+	cputime64_t tmp;
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+
-+	tmp = cputime_to_cputime64(cputime);
-+
-+	/* Add guest time to process. */
-+	p->utime = cputime_add(p->utime, cputime);
-+	p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
-+	account_group_user_time(p, cputime);
-+	p->gtime = cputime_add(p->gtime, cputime);
-+
-+	/* Add guest time to cpustat. */
-+	cpustat->user = cputime64_add(cpustat->user, tmp);
-+	cpustat->guest = cputime64_add(cpustat->guest, tmp);
-+}
-+
-+/*
-+ * Account system cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @hardirq_offset: the offset to subtract from hardirq_count()
-+ * @cputime: the cpu time spent in kernel space since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ * This is for guest only now.
-+ */
-+void account_system_time(struct task_struct *p, int hardirq_offset,
-+			 cputime_t cputime, cputime_t cputime_scaled)
-+{
-+
-+	if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0))
-+		account_guest_time(p, cputime, cputime_scaled);
-+}
-+
-+/*
-+ * Account for involuntary wait time.
-+ * @steal: the cpu time spent in involuntary wait
-+ */
-+void account_steal_time(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+
-+	cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-+}
-+
-+/*
-+ * Account for idle time.
-+ * @cputime: the cpu time spent in idle wait
-+ */
-+static void account_idle_times(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+	struct rq *rq = this_rq();
-+
-+	if (atomic_read(&rq->nr_iowait) > 0)
-+		cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
-+	else
-+		cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-+}
-+
-+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
-+
-+void account_process_tick(struct task_struct *p, int user_tick)
-+{
-+}
-+
-+/*
-+ * Account multiple ticks of steal time.
-+ * @p: the process from which the cpu time has been stolen
-+ * @ticks: number of stolen ticks
-+ */
-+void account_steal_ticks(unsigned long ticks)
-+{
-+	account_steal_time(jiffies_to_cputime(ticks));
-+}
-+
-+/*
-+ * Account multiple ticks of idle time.
-+ * @ticks: number of stolen ticks
-+ */
-+void account_idle_ticks(unsigned long ticks)
-+{
-+	account_idle_times(jiffies_to_cputime(ticks));
-+}
-+#endif
-+
-+/*
-+ * Functions to test for when SCHED_ISO tasks have used their allocated
-+ * quota as real time scheduling and convert them back to SCHED_NORMAL.
-+ * Where possible, the data is tested lockless, to avoid grabbing grq_lock
-+ * because the occasional inaccurate result won't matter. However the
-+ * data is only ever modified under lock.
-+ */
-+static void set_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 1;
-+	grq_unlock();
-+}
-+
-+static void clear_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 0;
-+	grq_unlock();
-+}
-+
-+/*
-+ * Test if SCHED_ISO tasks have run longer than their alloted period as RT
-+ * tasks and set the refractory flag if necessary. There is 10% hysteresis
-+ * for unsetting the flag.
-+ */
-+static unsigned int test_ret_isorefractory(struct rq *rq)
-+{
-+	if (likely(!grq.iso_refractory)) {
-+		if (grq.iso_ticks / ISO_PERIOD > sched_iso_cpu)
-+			set_iso_refractory();
-+	} else {
-+		if (grq.iso_ticks / ISO_PERIOD < (sched_iso_cpu * 90 / 100))
-+			clear_iso_refractory();
-+	}
-+	return grq.iso_refractory;
-+}
-+
-+static void iso_tick(void)
-+{
-+	grq_lock();
-+	grq.iso_ticks += 100;
-+	grq_unlock();
-+}
-+
-+/* No SCHED_ISO task was running so decrease rq->iso_ticks */
-+static inline void no_iso_tick(void)
-+{
-+	if (grq.iso_ticks) {
-+		grq_lock();
-+		grq.iso_ticks = grq.iso_ticks * (ISO_PERIOD - 1) / ISO_PERIOD;
-+		grq_unlock();
-+	}
-+}
-+
-+static int rq_running_iso(struct rq *rq)
-+{
-+	return rq->rq_prio == ISO_PRIO;
-+}
-+
-+/* This manages tasks that have run out of timeslice during a scheduler_tick */
-+static void task_running_tick(struct rq *rq)
-+{
-+	struct task_struct *p;
-+
-+	/*
-+	 * If a SCHED_ISO task is running we increment the iso_ticks. In
-+	 * order to prevent SCHED_ISO tasks from causing starvation in the
-+	 * presence of true RT tasks we account those as iso_ticks as well.
-+	 */
-+	if ((rt_queue(rq) || (iso_queue(rq) && !grq.iso_refractory))) {
-+		if (grq.iso_ticks <= (ISO_PERIOD * 100) - 100)
-+			iso_tick();
-+	} else
-+		no_iso_tick();
-+
-+	if (iso_queue(rq)) {
-+		if (unlikely(test_ret_isorefractory(rq))) {
-+			if (rq_running_iso(rq)) {
-+				/*
-+				 * SCHED_ISO task is running as RT and limit
-+				 * has been hit. Force it to reschedule as
-+				 * SCHED_NORMAL by zeroing its time_slice
-+				 */
-+				rq->rq_time_slice = 0;
-+			}
-+		}
-+	}
-+
-+	/* SCHED_FIFO tasks never run out of timeslice. */
-+	if (rq_idle(rq) || rq->rq_time_slice > 0 || rq->rq_policy == SCHED_FIFO)
-+		return;
-+
-+	/* p->rt.time_slice <= 0. We only modify task_struct under grq lock */
-+	grq_lock();
-+	p = rq->curr;
-+	if (likely(task_running(p))) {
-+		requeue_task(p);
-+		set_tsk_need_resched(p);
-+	}
-+	grq_unlock();
-+}
-+
-+void wake_up_idle_cpu(int cpu);
-+
-+/*
-+ * This function gets called by the timer code, with HZ frequency.
-+ * We call it with interrupts disabled. The data modified is all
-+ * local to struct rq so we don't need to grab grq lock.
-+ */
-+void scheduler_tick(void)
-+{
-+	int cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(cpu);
-+
-+	sched_clock_tick();
-+	update_rq_clock(rq);
-+	update_cpu_clock(rq, rq->curr, 1);
-+	if (!rq_idle(rq))
-+		task_running_tick(rq);
-+	else {
-+		no_iso_tick();
-+		if (unlikely(queued_notrunning()))
-+			set_tsk_need_resched(rq->idle);
-+	}
-+}
-+
-+notrace unsigned long get_parent_ip(unsigned long addr)
-+{
-+	if (in_lock_functions(addr)) {
-+		addr = CALLER_ADDR2;
-+		if (in_lock_functions(addr))
-+			addr = CALLER_ADDR3;
-+	}
-+	return addr;
-+}
-+
-+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
-+				defined(CONFIG_PREEMPT_TRACER))
-+void __kprobes add_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((preempt_count() < 0)))
-+		return;
-+#endif
-+	preempt_count() += val;
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Spinlock count overflowing soon?
-+	 */
-+	DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >=
-+				PREEMPT_MASK - 10);
-+#endif
-+	if (preempt_count() == val)
-+		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+}
-+EXPORT_SYMBOL(add_preempt_count);
-+
-+void __kprobes sub_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
-+		return;
-+	/*
-+	 * Is the spinlock portion underflowing?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((val < PREEMPT_MASK) &&
-+			!(preempt_count() & PREEMPT_MASK)))
-+		return;
-+#endif
-+
-+	if (preempt_count() == val)
-+		trace_preempt_on(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+	preempt_count() -= val;
-+}
-+EXPORT_SYMBOL(sub_preempt_count);
-+#endif
-+
-+/*
-+ * Deadline is "now" in jiffies + (offset by priority). Setting the deadline
-+ * is the key to everything. It distributes cpu fairly amongst tasks of the
-+ * same nice value, it proportions cpu according to nice level, it means the
-+ * task that last woke up the longest ago has the earliest deadline, thus
-+ * ensuring that interactive tasks get low latency on wake up.
-+ */
-+static inline int prio_deadline_diff(struct task_struct *p)
-+{
-+	return (pratio(p) * rr_interval * HZ / 1000 / 100) ? : 1;
-+}
-+
-+static inline int longest_deadline(void)
-+{
-+	return (prio_ratios[39] * rr_interval * HZ / 1000 / 100);
-+}
-+
-+/*
-+ * SCHED_IDLE tasks still have a deadline set, but offset by to nice +19.
-+ * This allows nice levels to work between IDLEPRIO tasks and gives a
-+ * deadline longer than nice +19 for when they're scheduled as SCHED_NORMAL
-+ * tasks.
-+ */
-+static inline void time_slice_expired(struct task_struct *p)
-+{
-+	reset_first_time_slice(p);
-+	p->rt.time_slice = timeslice();
-+	p->deadline = jiffies + prio_deadline_diff(p);
-+	if (idleprio_task(p))
-+		p->deadline += longest_deadline();
-+}
-+
-+static inline void check_deadline(struct task_struct *p)
-+{
-+	if (p->rt.time_slice <= 0)
-+		time_slice_expired(p);
-+}
-+
-+/*
-+ * O(n) lookup of all tasks in the global runqueue. The real brainfuck
-+ * of lock contention and O(n). It's not really O(n) as only the queued,
-+ * but not running tasks are scanned, and is O(n) queued in the worst case
-+ * scenario only because the right task can be found before scanning all of
-+ * them.
-+ * Tasks are selected in this order:
-+ * Real time tasks are selected purely by their static priority and in the
-+ * order they were queued, so the lowest value idx, and the first queued task
-+ * of that priority value is chosen.
-+ * If no real time tasks are found, the SCHED_ISO priority is checked, and
-+ * all SCHED_ISO tasks have the same priority value, so they're selected by
-+ * the earliest deadline value.
-+ * If no SCHED_ISO tasks are found, SCHED_NORMAL tasks are selected by the
-+ * earliest deadline.
-+ * Finally if no SCHED_NORMAL tasks are found, SCHED_IDLEPRIO tasks are
-+ * selected by the earliest deadline.
-+ */
-+static inline struct
-+task_struct *earliest_deadline_task(struct rq *rq, struct task_struct *idle)
-+{
-+	unsigned long dl, earliest_deadline = 0; /* Initialise to silence compiler */
-+	struct task_struct *p, *edt;
-+	unsigned int cpu = rq->cpu;
-+	struct list_head *queue;
-+	int idx = 0;
-+
-+	edt = idle;
-+retry:
-+	idx = find_next_bit(grq.prio_bitmap, PRIO_LIMIT, idx);
-+	if (idx >= PRIO_LIMIT)
-+		goto out;
-+	queue = &grq.queue[idx];
-+	list_for_each_entry(p, queue, rt.run_list) {
-+		/* Make sure cpu affinity is ok */
-+		if (!cpu_isset(cpu, p->cpus_allowed))
-+			continue;
-+		if (idx < MAX_RT_PRIO) {
-+			/* We found an rt task */
-+			edt = p;
-+			goto out_take;
-+		}
-+
-+		/*
-+		 * No rt task, select the earliest deadline task now.
-+		 * On the 1st run the 2nd condition is never used, so
-+		 * there is no need to initialise earliest_deadline
-+		 * before. Normalise all old deadlines to now.
-+		 */
-+		if (time_before(p->deadline, jiffies))
-+			dl = jiffies;
-+		else
-+			dl = p->deadline;
-+
-+		if (edt == idle ||
-+		    time_before(dl, earliest_deadline)) {
-+			earliest_deadline = dl;
-+			edt = p;
-+		}
-+	}
-+	if (edt == idle) {
-+		if (++idx < PRIO_LIMIT)
-+			goto retry;
-+		goto out;
-+	}
-+out_take:
-+	take_task(rq, edt);
-+out:
-+	return edt;
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_set(cpu, grq.cpu_idle_map);
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_clear(cpu, grq.cpu_idle_map);
-+}
-+
-+#else /* CONFIG_SMP */
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+}
-+#endif /* !CONFIG_SMP */
-+
-+/*
-+ * Print scheduling while atomic bug:
-+ */
-+static noinline void __schedule_bug(struct task_struct *prev)
-+{
-+	struct pt_regs *regs = get_irq_regs();
-+
-+	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
-+		prev->comm, prev->pid, preempt_count());
-+
-+	debug_show_held_locks(prev);
-+	print_modules();
-+	if (irqs_disabled())
-+		print_irqtrace_events(prev);
-+
-+	if (regs)
-+		show_regs(regs);
-+	else
-+		dump_stack();
-+}
-+
-+/*
-+ * Various schedule()-time debugging checks and statistics:
-+ */
-+static inline void schedule_debug(struct task_struct *prev)
-+{
-+	/*
-+	 * Test if we are atomic. Since do_exit() needs to call into
-+	 * schedule() atomically, we ignore that path for now.
-+	 * Otherwise, whine if we are scheduling when we should not be.
-+	 */
-+	if (unlikely(in_atomic_preempt_off() && !prev->exit_state))
-+		__schedule_bug(prev);
-+
-+	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
-+
-+	schedstat_inc(this_rq(), sched_count);
-+#ifdef CONFIG_SCHEDSTATS
-+	if (unlikely(prev->lock_depth >= 0)) {
-+		schedstat_inc(this_rq(), bkl_count);
-+		schedstat_inc(prev, sched_info.bkl_count);
-+	}
-+#endif
-+}
-+
-+/*
-+ * schedule() is the main scheduler function.
-+ */
-+asmlinkage void __sched __schedule(void)
-+{
-+	struct task_struct *prev, *next, *idle;
-+	int deactivate = 0, cpu;
-+	long *switch_count;
-+	struct rq *rq;
-+	u64 now;
-+
-+	cpu = smp_processor_id();
-+	rq = this_rq();
-+	rcu_qsctr_inc(cpu);
-+	prev = rq->curr;
-+	switch_count = &prev->nivcsw;
-+
-+	release_kernel_lock(prev);
-+need_resched_nonpreemptible:
-+
-+	schedule_debug(prev);
-+	idle = rq->idle;
-+	/*
-+	 * The idle thread is not allowed to schedule!
-+	 * Remove this check after it has been exercised a bit.
-+	 */
-+	if (unlikely(prev == idle) && prev->state != TASK_RUNNING) {
-+		printk(KERN_ERR "bad: scheduling from the idle thread!\n");
-+		dump_stack();
-+	}
-+
-+	grq_lock_irq();
-+	update_rq_clock(rq);
-+	now = rq->clock;
-+	update_cpu_clock(rq, prev, 0);
-+
-+	clear_tsk_need_resched(prev);
-+
-+	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
-+		if (unlikely(signal_pending_state(prev->state, prev)))
-+			prev->state = TASK_RUNNING;
-+		else
-+			deactivate = 1;
-+		switch_count = &prev->nvcsw;
-+	}
-+
-+	if (prev != idle) {
-+		/* Update all the information stored on struct rq */
-+		prev->rt.time_slice = rq->rq_time_slice;
-+		prev->deadline = rq->rq_deadline;
-+		check_deadline(prev);
-+		return_task(prev, deactivate);
-+	}
-+
-+	if (likely(queued_notrunning())) {
-+		next = earliest_deadline_task(rq, idle);
-+	} else {
-+		next = idle;
-+		schedstat_inc(rq, sched_goidle);
-+	}
-+
-+	if (next == rq->idle)
-+		set_cpuidle_map(cpu);
-+	else
-+		clear_cpuidle_map(cpu);
-+
-+	prefetch(next);
-+	prefetch_stack(next);
-+
-+	prev->timestamp = prev->last_ran = now;
-+
-+	if (likely(prev != next)) {
-+		rq->rq_time_slice = next->rt.time_slice;
-+		rq->rq_deadline = next->deadline;
-+		rq->rq_prio = next->prio;
-+
-+		sched_info_switch(prev, next);
-+		grq.nr_switches++;
-+		next->oncpu = 1;
-+		prev->oncpu = 0;
-+		rq->curr = next;
-+		++*switch_count;
-+
-+		context_switch(rq, prev, next); /* unlocks the rq */
-+		/*
-+		 * the context switch might have flipped the stack from under
-+		 * us, hence refresh the local variables.
-+		 */
-+		cpu = smp_processor_id();
-+		rq = cpu_rq(cpu);
-+	} else
-+		grq_unlock_irq();
-+
-+	if (unlikely(reacquire_kernel_lock(current) < 0))
-+		goto need_resched_nonpreemptible;
-+}
-+
-+asmlinkage void __sched schedule(void)
-+{
-+need_resched:
-+	preempt_disable();
-+	__schedule();
-+	preempt_enable_no_resched();
-+	if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
-+		goto need_resched;
-+}
-+EXPORT_SYMBOL(schedule);
-+
-+#ifdef CONFIG_SMP
-+int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_PREEMPT
-+/*
-+ * this is the entry point to schedule() from in-kernel preemption
-+ * off of preempt_enable. Kernel preemptions off return from interrupt
-+ * occur there and call schedule directly.
-+ */
-+asmlinkage void __sched preempt_schedule(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/*
-+	 * If there is a non-zero preempt_count or interrupts are disabled,
-+	 * we do not want to preempt the current task. Just return..
-+	 */
-+	if (likely(ti->preempt_count || irqs_disabled()))
-+		return;
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+EXPORT_SYMBOL(preempt_schedule);
-+
-+/*
-+ * this is the entry point to schedule() from kernel preemption
-+ * off of irq context.
-+ * Note, that this is called and return with irqs disabled. This will
-+ * protect us against recursive calling from irq.
-+ */
-+asmlinkage void __sched preempt_schedule_irq(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/* Catch callers which need to be fixed */
-+	BUG_ON(ti->preempt_count || !irqs_disabled());
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		local_irq_enable();
-+		schedule();
-+		local_irq_disable();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+
-+#endif /* CONFIG_PREEMPT */
-+
-+int default_wake_function(wait_queue_t *curr, unsigned mode, int sync,
-+			  void *key)
-+{
-+	return try_to_wake_up(curr->private, mode, sync);
-+}
-+EXPORT_SYMBOL(default_wake_function);
-+
-+/*
-+ * The core wakeup function.  Non-exclusive wakeups (nr_exclusive == 0) just
-+ * wake everything up.  If it's an exclusive wakeup (nr_exclusive == small +ve
-+ * number) then we wake all the non-exclusive tasks and one exclusive task.
-+ *
-+ * There are circumstances in which we can try to wake a task which has already
-+ * started to run but is not in state TASK_RUNNING.  try_to_wake_up() returns
-+ * zero in this (rare) case, and we handle it by continuing to scan the queue.
-+ */
-+void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
-+		      int nr_exclusive, int sync, void *key)
-+{
-+	struct list_head *tmp, *next;
-+
-+	list_for_each_safe(tmp, next, &q->task_list) {
-+		wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list);
-+		unsigned flags = curr->flags;
-+
-+		if (curr->func(curr, mode, sync, key) &&
-+				(flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
-+			break;
-+	}
-+}
-+
-+/**
-+ * __wake_up - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: is directly passed to the wakeup function
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, 0, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL(__wake_up);
-+
-+/*
-+ * Same as __wake_up but called with the spinlock in wait_queue_head_t held.
-+ */
-+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode)
-+{
-+	__wake_up_common(q, mode, 1, 0, NULL);
-+}
-+
-+void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key)
-+{
-+	__wake_up_common(q, mode, 1, 0, key);
-+}
-+
-+/**
-+ * __wake_up_sync_key - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: opaque value to be passed to wakeup targets
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync_key);
-+
-+/**
-+ * __wake_up_sync - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ */
-+void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, NULL);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync);	/* For internal use only */
-+
-+/**
-+ * complete: - signals a single thread waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up a single thread waiting on this completion. Threads will be
-+ * awakened in the same order in which they were queued.
-+ *
-+ * See also complete_all(), wait_for_completion() and related routines.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done++;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 1, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete);
-+
-+/**
-+ * complete_all: - signals all threads waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up all threads waiting on this particular completion event.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete_all(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done += UINT_MAX/2;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 0, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete_all);
-+
-+static inline long __sched
-+do_wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	if (!x->done) {
-+		DECLARE_WAITQUEUE(wait, current);
-+
-+		wait.flags |= WQ_FLAG_EXCLUSIVE;
-+		__add_wait_queue_tail(&x->wait, &wait);
-+		do {
-+			if (signal_pending_state(state, current)) {
-+				timeout = -ERESTARTSYS;
-+				break;
-+			}
-+			__set_current_state(state);
-+			spin_unlock_irq(&x->wait.lock);
-+			timeout = schedule_timeout(timeout);
-+			spin_lock_irq(&x->wait.lock);
-+		} while (!x->done && timeout);
-+		__remove_wait_queue(&x->wait, &wait);
-+		if (!x->done)
-+			return timeout;
-+	}
-+	x->done--;
-+	return timeout ?: 1;
-+}
-+
-+static long __sched
-+wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	might_sleep();
-+
-+	spin_lock_irq(&x->wait.lock);
-+	timeout = do_wait_for_common(x, timeout, state);
-+	spin_unlock_irq(&x->wait.lock);
-+	return timeout;
-+}
-+
-+/**
-+ * wait_for_completion: - waits for completion of a task
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It is NOT
-+ * interruptible and there is no timeout.
-+ *
-+ * See also similar routines (i.e. wait_for_completion_timeout()) with timeout
-+ * and interrupt capability. Also see complete().
-+ */
-+void __sched wait_for_completion(struct completion *x)
-+{
-+	wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion);
-+
-+/**
-+ * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. The timeout is in jiffies. It is not
-+ * interruptible.
-+ */
-+unsigned long __sched
-+wait_for_completion_timeout(struct completion *x, unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_timeout);
-+
-+/**
-+ * wait_for_completion_interruptible: - waits for completion of a task (w/intr)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits for completion of a specific task to be signaled. It is
-+ * interruptible.
-+ */
-+int __sched wait_for_completion_interruptible(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible);
-+
-+/**
-+ * wait_for_completion_interruptible_timeout: - waits for completion (w/(to,intr))
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. It is interruptible. The timeout is in jiffies.
-+ */
-+unsigned long __sched
-+wait_for_completion_interruptible_timeout(struct completion *x,
-+					  unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_INTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
-+
-+/**
-+ * wait_for_completion_killable: - waits for completion of a task (killable)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It can be
-+ * interrupted by a kill signal.
-+ */
-+int __sched wait_for_completion_killable(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_killable);
-+
-+/**
-+ *	try_wait_for_completion - try to decrement a completion without blocking
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if a decrement cannot be done without blocking
-+ *		 1 if a decrement succeeded.
-+ *
-+ *	If a completion is being used as a counting completion,
-+ *	attempt to decrement the counter without blocking. This
-+ *	enables us to avoid waiting if the resource the completion
-+ *	is protecting is not available.
-+ */
-+bool try_wait_for_completion(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	else
-+		x->done--;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(try_wait_for_completion);
-+
-+/**
-+ *	completion_done - Test to see if a completion has any waiters
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if there are waiters (wait_for_completion() in progress)
-+ *		 1 if there are no waiters.
-+ *
-+ */
-+bool completion_done(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(completion_done);
-+
-+static long __sched
-+sleep_on_common(wait_queue_head_t *q, int state, long timeout)
-+{
-+	unsigned long flags;
-+	wait_queue_t wait;
-+
-+	init_waitqueue_entry(&wait, current);
-+
-+	__set_current_state(state);
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__add_wait_queue(q, &wait);
-+	spin_unlock(&q->lock);
-+	timeout = schedule_timeout(timeout);
-+	spin_lock_irq(&q->lock);
-+	__remove_wait_queue(q, &wait);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+
-+	return timeout;
-+}
-+
-+void __sched interruptible_sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on);
-+
-+long __sched
-+interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_INTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on_timeout);
-+
-+void __sched sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(sleep_on);
-+
-+long __sched sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_UNINTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(sleep_on_timeout);
-+
-+#ifdef CONFIG_RT_MUTEXES
-+
-+/*
-+ * rt_mutex_setprio - set the current priority of a task
-+ * @p: task
-+ * @prio: prio value (kernel-internal form)
-+ *
-+ * This function changes the 'effective' priority of a task. It does
-+ * not touch ->normal_prio like __setscheduler().
-+ *
-+ * Used by the rt_mutex code to implement priority inheritance logic.
-+ */
-+void rt_mutex_setprio(struct task_struct *p, int prio)
-+{
-+	unsigned long flags;
-+	int queued, oldprio;
-+	struct rq *rq;
-+
-+	BUG_ON(prio < 0 || prio > MAX_PRIO);
-+
-+	rq = time_task_grq_lock(p, &flags);
-+
-+	oldprio = p->prio;
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	p->prio = prio;
-+	if (task_running(p) && prio > oldprio)
-+		resched_task(p);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	task_grq_unlock(&flags);
-+}
-+
-+#endif
-+
-+/*
-+ * Adjust the deadline for when the priority is to change, before it's
-+ * changed.
-+ */
-+static void adjust_deadline(struct task_struct *p, int new_prio)
-+{
-+	p->deadline += (prio_ratios[USER_PRIO(new_prio)] - pratio(p)) *
-+			rr_interval * HZ / 1000 / 100;
-+}
-+
-+void set_user_nice(struct task_struct *p, long nice)
-+{
-+	int queued, new_static;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (TASK_NICE(p) == nice || nice < -20 || nice > 19)
-+		return;
-+	new_static = NICE_TO_PRIO(nice);
-+	/*
-+	 * We have to be careful, if called from sys_setpriority(),
-+	 * the task might be in the middle of scheduling on another CPU.
-+	 */
-+	rq = time_task_grq_lock(p, &flags);
-+	/*
-+	 * The RT priorities are set via sched_setscheduler(), but we still
-+	 * allow the 'normal' nice value to be set - but as expected
-+	 * it wont have any effect on scheduling until the task is
-+	 * not SCHED_NORMAL/SCHED_BATCH:
-+	 */
-+	if (has_rt_policy(p)) {
-+		p->static_prio = new_static;
-+		goto out_unlock;
-+	}
-+	queued = task_queued_only(p);
-+	/*
-+	 * If p is actually running, we don't need to do anything when
-+	 * changing the priority because the grq is unaffected.
-+	 */
-+	if (queued)
-+		dequeue_task(p);
-+
-+	adjust_deadline(p, new_static);
-+	p->static_prio = new_static;
-+	p->prio = effective_prio(p);
-+
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	/* Just resched the task, schedule() will know what to do. */
-+	if (task_running(p))
-+		resched_task(p);
-+out_unlock:
-+	task_grq_unlock(&flags);
-+}
-+EXPORT_SYMBOL(set_user_nice);
-+
-+/*
-+ * can_nice - check if a task can reduce its nice value
-+ * @p: task
-+ * @nice: nice value
-+ */
-+int can_nice(const struct task_struct *p, const int nice)
-+{
-+	/* convert nice value [19,-20] to rlimit style value [1,40] */
-+	int nice_rlim = 20 - nice;
-+
-+	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
-+		capable(CAP_SYS_NICE));
-+}
-+
-+#ifdef __ARCH_WANT_SYS_NICE
-+
-+/*
-+ * sys_nice - change the priority of the current process.
-+ * @increment: priority increment
-+ *
-+ * sys_setpriority is a more generic, but much slower function that
-+ * does similar things.
-+ */
-+SYSCALL_DEFINE1(nice, int, increment)
-+{
-+	long nice, retval;
-+
-+	/*
-+	 * Setpriority might change our priority at the same moment.
-+	 * We don't have to worry. Conceptually one call occurs first
-+	 * and we have a single winner.
-+	 */
-+	if (increment < -40)
-+		increment = -40;
-+	if (increment > 40)
-+		increment = 40;
-+
-+	nice = TASK_NICE(current) + increment;
-+	if (nice < -20)
-+		nice = -20;
-+	if (nice > 19)
-+		nice = 19;
-+
-+	if (increment < 0 && !can_nice(current, nice))
-+		return -EPERM;
-+
-+	retval = security_task_setnice(current, nice);
-+	if (retval)
-+		return retval;
-+
-+	set_user_nice(current, nice);
-+	return 0;
-+}
-+
-+#endif
-+
-+/**
-+ * task_prio - return the priority value of a given task.
-+ * @p: the task in question.
-+ *
-+ * This is the priority value as seen by users in /proc.
-+ * RT tasks are offset by -100. Normal tasks are centered
-+ * around 1, value goes from 0 (SCHED_ISO) up to 82 (nice +19
-+ * SCHED_IDLE).
-+ */
-+int task_prio(const struct task_struct *p)
-+{
-+	int delta, prio = p->prio - MAX_RT_PRIO;
-+
-+	/* rt tasks and iso tasks */
-+	if (prio <= 0)
-+		goto out;
-+
-+	delta = (p->deadline - jiffies) * 40 / longest_deadline();
-+	if (delta > 0 && delta <= 80)
-+		prio += delta;
-+out:
-+	return prio;
-+}
-+
-+/**
-+ * task_nice - return the nice value of a given task.
-+ * @p: the task in question.
-+ */
-+int task_nice(const struct task_struct *p)
-+{
-+	return TASK_NICE(p);
-+}
-+EXPORT_SYMBOL_GPL(task_nice);
-+
-+/**
-+ * idle_cpu - is a given cpu idle currently?
-+ * @cpu: the processor in question.
-+ */
-+int idle_cpu(int cpu)
-+{
-+	return cpu_curr(cpu) == cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * idle_task - return the idle task for a given cpu.
-+ * @cpu: the processor in question.
-+ */
-+struct task_struct *idle_task(int cpu)
-+{
-+	return cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * find_process_by_pid - find a process with a matching PID value.
-+ * @pid: the pid in question.
-+ */
-+static inline struct task_struct *find_process_by_pid(pid_t pid)
-+{
-+	return pid ? find_task_by_vpid(pid) : current;
-+}
-+
-+/* Actually do priority change: must hold grq lock. */
-+static void __setscheduler(struct task_struct *p, int policy, int prio)
-+{
-+	BUG_ON(task_queued_only(p));
-+
-+	p->policy = policy;
-+	p->rt_priority = prio;
-+	p->normal_prio = normal_prio(p);
-+	/* we are holding p->pi_lock already */
-+	p->prio = rt_mutex_getprio(p);
-+	/*
-+	 * Reschedule if running. schedule() will know if it can continue
-+	 * running or not.
-+	 */
-+	if (task_running(p))
-+		resched_task(p);
-+}
-+
-+/*
-+ * check the target process has a UID that matches the current process's
-+ */
-+static bool check_same_owner(struct task_struct *p)
-+{
-+	const struct cred *cred = current_cred(), *pcred;
-+	bool match;
-+
-+	rcu_read_lock();
-+	pcred = __task_cred(p);
-+	match = (cred->euid == pcred->euid ||
-+		 cred->euid == pcred->uid);
-+	rcu_read_unlock();
-+	return match;
-+}
-+
-+static int __sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param, bool user)
-+{
-+	struct sched_param zero_param = { .sched_priority = 0 };
-+	int queued, retval, oldprio, oldpolicy = -1;
-+	unsigned long flags, rlim_rtprio = 0;
-+	struct rq *rq;
-+
-+	/* may grab non-irq protected spin_locks */
-+	BUG_ON(in_interrupt());
-+
-+	if (is_rt_policy(policy) && !capable(CAP_SYS_NICE)) {
-+		unsigned long lflags;
-+
-+		if (!lock_task_sighand(p, &lflags))
-+			return -ESRCH;
-+		rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-+		unlock_task_sighand(p, &lflags);
-+		if (rlim_rtprio)
-+			goto recheck;
-+		/*
-+		 * If the caller requested an RT policy without having the
-+		 * necessary rights, we downgrade the policy to SCHED_ISO.
-+		 * We also set the parameter to zero to pass the checks.
-+		 */
-+		policy = SCHED_ISO;
-+		param = &zero_param;
-+	}
-+recheck:
-+	/* double check policy once rq lock held */
-+	if (policy < 0)
-+		policy = oldpolicy = p->policy;
-+	else if (!SCHED_RANGE(policy))
-+		return -EINVAL;
-+	/*
-+	 * Valid priorities for SCHED_FIFO and SCHED_RR are
-+	 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL and
-+	 * SCHED_BATCH is 0.
-+	 */
-+	if (param->sched_priority < 0 ||
-+	    (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
-+	    (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
-+		return -EINVAL;
-+	if (is_rt_policy(policy) != (param->sched_priority != 0))
-+		return -EINVAL;
-+
-+	/*
-+	 * Allow unprivileged RT tasks to decrease priority:
-+	 */
-+	if (user && !capable(CAP_SYS_NICE)) {
-+		if (is_rt_policy(policy)) {
-+			/* can't set/change the rt policy */
-+			if (policy != p->policy && !rlim_rtprio)
-+				return -EPERM;
-+
-+			/* can't increase priority */
-+			if (param->sched_priority > p->rt_priority &&
-+			    param->sched_priority > rlim_rtprio)
-+				return -EPERM;
-+		} else {
-+			switch (p->policy) {
-+				/*
-+				 * Can only downgrade policies but not back to
-+				 * SCHED_NORMAL
-+				 */
-+				case SCHED_ISO:
-+					if (policy == SCHED_ISO)
-+						goto out;
-+					if (policy == SCHED_NORMAL)
-+						return -EPERM;
-+					break;
-+				case SCHED_BATCH:
-+					if (policy == SCHED_BATCH)
-+						goto out;
-+					if (policy != SCHED_IDLE)
-+					    	return -EPERM;
-+					break;
-+				case SCHED_IDLE:
-+					if (policy == SCHED_IDLE)
-+						goto out;
-+					return -EPERM;
-+				default:
-+					break;
-+			}
-+		}
-+
-+		/* can't change other user's priorities */
-+		if (!check_same_owner(p))
-+			return -EPERM;
-+	}
-+
-+	retval = security_task_setscheduler(p, policy, param);
-+	if (retval)
-+		return retval;
-+	/*
-+	 * make sure no PI-waiters arrive (or leave) while we are
-+	 * changing the priority of the task:
-+	 */
-+	spin_lock_irqsave(&p->pi_lock, flags);
-+	/*
-+	 * To be able to change p->policy safely, the apropriate
-+	 * runqueue lock must be held.
-+	 */
-+	rq = __task_grq_lock(p);
-+	/* recheck policy now with rq lock held */
-+	if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+		policy = oldpolicy = -1;
-+		goto recheck;
-+	}
-+	update_rq_clock(rq);
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	oldprio = p->prio;
-+	__setscheduler(p, policy, param->sched_priority);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+	__task_grq_unlock();
-+	spin_unlock_irqrestore(&p->pi_lock, flags);
-+
-+	rt_mutex_adjust_pi(p);
-+out:
-+	return 0;
-+}
-+
-+/**
-+ * sched_setscheduler - change the scheduling policy and/or RT priority of a thread.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * NOTE that the task may be already dead.
-+ */
-+int sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, true);
-+}
-+
-+EXPORT_SYMBOL_GPL(sched_setscheduler);
-+
-+/**
-+ * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * Just like sched_setscheduler, only don't bother checking if the
-+ * current context has permission.  For example, this is needed in
-+ * stop_machine(): we create temporary high priority worker threads,
-+ * but our caller might not have that capability.
-+ */
-+int sched_setscheduler_nocheck(struct task_struct *p, int policy,
-+			       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, false);
-+}
-+
-+static int
-+do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
-+{
-+	struct sched_param lparam;
-+	struct task_struct *p;
-+	int retval;
-+
-+	if (!param || pid < 0)
-+		return -EINVAL;
-+	if (copy_from_user(&lparam, param, sizeof(struct sched_param)))
-+		return -EFAULT;
-+
-+	rcu_read_lock();
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (p != NULL)
-+		retval = sched_setscheduler(p, policy, &lparam);
-+	rcu_read_unlock();
-+
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_setscheduler - set/change the scheduler policy and RT priority
-+ * @pid: the pid in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ */
-+asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
-+				       struct sched_param __user *param)
-+{
-+	/* negative values for policy are not valid */
-+	if (policy < 0)
-+		return -EINVAL;
-+
-+	return do_sched_setscheduler(pid, policy, param);
-+}
-+
-+/**
-+ * sys_sched_setparam - set/change the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the new RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	return do_sched_setscheduler(pid, -1, param);
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the policy (scheduling class) of a thread
-+ * @pid: the pid in question.
-+ */
-+SYSCALL_DEFINE1(sched_getscheduler, pid_t, pid)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (p) {
-+		retval = security_task_getscheduler(p);
-+		if (!retval)
-+			retval = p->policy;
-+	}
-+	read_unlock(&tasklist_lock);
-+
-+out_nounlock:
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	struct sched_param lp;
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (!param || pid < 0)
-+		goto out_nounlock;
-+
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	retval = -ESRCH;
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	lp.sched_priority = p->rt_priority;
-+	read_unlock(&tasklist_lock);
-+
-+	/*
-+	 * This one might sleep, we cannot do it with a spinlock held ...
-+	 */
-+	retval = copy_to_user(param, &lp, sizeof(*param)) ? -EFAULT : 0;
-+
-+out_nounlock:
-+	return retval;
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
-+{
-+	cpumask_var_t cpus_allowed, new_mask;
-+	struct task_struct *p;
-+	int retval;
-+
-+	get_online_cpus();
-+	read_lock(&tasklist_lock);
-+
-+	p = find_process_by_pid(pid);
-+	if (!p) {
-+		read_unlock(&tasklist_lock);
-+		put_online_cpus();
-+		return -ESRCH;
-+	}
-+
-+	/*
-+	 * It is not safe to call set_cpus_allowed with the
-+	 * tasklist_lock held. We will bump the task_struct's
-+	 * usage count and then drop tasklist_lock.
-+	 */
-+	get_task_struct(p);
-+	read_unlock(&tasklist_lock);
-+
-+	if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_put_task;
-+	}
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_free_cpus_allowed;
-+	}
-+	retval = -EPERM;
-+	if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
-+		goto out_unlock;
-+
-+	retval = security_task_setscheduler(p, 0, NULL);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpuset_cpus_allowed(p, cpus_allowed);
-+	cpumask_and(new_mask, in_mask, cpus_allowed);
-+again:
-+	retval = set_cpus_allowed_ptr(p, new_mask);
-+
-+	if (!retval) {
-+		cpuset_cpus_allowed(p, cpus_allowed);
-+		if (!cpumask_subset(new_mask, cpus_allowed)) {
-+			/*
-+			 * We must have raced with a concurrent cpuset
-+			 * update. Just reset the cpus_allowed to the
-+			 * cpuset's cpus_allowed
-+			 */
-+			cpumask_copy(new_mask, cpus_allowed);
-+			goto again;
-+		}
-+	}
-+out_unlock:
-+	free_cpumask_var(new_mask);
-+out_free_cpus_allowed:
-+	free_cpumask_var(cpus_allowed);
-+out_put_task:
-+	put_task_struct(p);
-+	put_online_cpus();
-+	return retval;
-+}
-+
-+static int get_user_cpu_mask(unsigned long __user *user_mask_ptr, unsigned len,
-+			     cpumask_t *new_mask)
-+{
-+	if (len < sizeof(cpumask_t)) {
-+		memset(new_mask, 0, sizeof(cpumask_t));
-+	} else if (len > sizeof(cpumask_t)) {
-+		len = sizeof(cpumask_t);
-+	}
-+	return copy_from_user(new_mask, user_mask_ptr, len) ? -EFAULT : 0;
-+}
-+
-+
-+/**
-+ * sys_sched_setaffinity - set the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to the new cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_setaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	cpumask_var_t new_mask;
-+	int retval;
-+
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	retval = get_user_cpu_mask(user_mask_ptr, len, new_mask);
-+	if (retval == 0)
-+		retval = sched_setaffinity(pid, new_mask);
-+	free_cpumask_var(new_mask);
-+	return retval;
-+}
-+
-+long sched_getaffinity(pid_t pid, cpumask_t *mask)
-+{
-+	struct task_struct *p;
-+	int retval;
-+
-+	mutex_lock(&sched_hotcpu_mutex);
-+	read_lock(&tasklist_lock);
-+
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpus_and(*mask, p->cpus_allowed, cpu_online_map);
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	mutex_unlock(&sched_hotcpu_mutex);
-+	if (retval)
-+		return retval;
-+
-+	return 0;
-+}
-+
-+/**
-+ * sys_sched_getaffinity - get the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to hold the current cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	int ret;
-+	cpumask_var_t mask;
-+
-+	if (len < cpumask_size())
-+		return -EINVAL;
-+
-+	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	ret = sched_getaffinity(pid, mask);
-+	if (ret == 0) {
-+		if (copy_to_user(user_mask_ptr, mask, cpumask_size()))
-+			ret = -EFAULT;
-+		else
-+			ret = cpumask_size();
-+	}
-+	free_cpumask_var(mask);
-+
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_yield - yield the current processor to other threads.
-+ *
-+ * This function yields the current CPU to other tasks. It does this by
-+ * refilling the timeslice, resetting the deadline and scheduling away.
-+ */
-+SYSCALL_DEFINE0(sched_yield)
-+{
-+	struct task_struct *p;
-+
-+	grq_lock_irq();
-+	p = current;
-+	schedstat_inc(this_rq(), yld_count);
-+	update_rq_clock(task_rq(p));
-+	time_slice_expired(p);
-+	requeue_task(p);
-+
-+	/*
-+	 * Since we are going to call schedule() anyway, there's
-+	 * no need to preempt or enable interrupts:
-+	 */
-+	__release(grq.lock);
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+	_raw_spin_unlock(&grq.lock);
-+	preempt_enable_no_resched();
-+
-+	schedule();
-+
-+	return 0;
-+}
-+
-+static inline int should_resched(void)
-+{
-+	return need_resched() && !(preempt_count() & PREEMPT_ACTIVE);
-+}
-+
-+static void __cond_resched(void)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+	__might_sleep(__FILE__, __LINE__);
-+#endif
-+	/*
-+	 * The BKS might be reacquired before we have dropped
-+	 * PREEMPT_ACTIVE, which could trigger a second
-+	 * cond_resched() call.
-+	 */
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+	} while (need_resched());
-+}
-+
-+int __sched _cond_resched(void)
-+{
-+	if (should_resched()) {
-+		__cond_resched();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(_cond_resched);
-+
-+/*
-+ * cond_resched_lock() - if a reschedule is pending, drop the given lock,
-+ * call schedule, and on return reacquire the lock.
-+ *
-+ * This works OK both with and without CONFIG_PREEMPT.  We do strange low-level
-+ * operations here to prevent schedule() from being called twice (once via
-+ * spin_unlock(), once by hand).
-+ */
-+int cond_resched_lock(spinlock_t *lock)
-+{
-+	int resched = should_resched();
-+	int ret = 0;
-+
-+	if (spin_needbreak(lock) || resched) {
-+		spin_unlock(lock);
-+		if (resched)
-+			__cond_resched();
-+		else
-+			cpu_relax();
-+		ret = 1;
-+		spin_lock(lock);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL(cond_resched_lock);
-+
-+int __sched cond_resched_softirq(void)
-+{
-+	BUG_ON(!in_softirq());
-+
-+	if (should_resched()) {
-+		local_bh_enable();
-+		__cond_resched();
-+		local_bh_disable();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(cond_resched_softirq);
-+
-+/**
-+ * yield - yield the current processor to other threads.
-+ *
-+ * This is a shortcut for kernel-space yielding - it marks the
-+ * thread runnable and calls sys_sched_yield().
-+ */
-+void __sched yield(void)
-+{
-+	set_current_state(TASK_RUNNING);
-+	sys_sched_yield();
-+}
-+EXPORT_SYMBOL(yield);
-+
-+/*
-+ * This task is about to go to sleep on IO.  Increment rq->nr_iowait so
-+ * that process accounting knows that this is a task in IO wait state.
-+ *
-+ * But don't do that if it is a deliberate, throttling IO wait (this task
-+ * has set its backing_dev_info: the queue against which it should throttle)
-+ */
-+void __sched io_schedule(void)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	schedule();
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+}
-+EXPORT_SYMBOL(io_schedule);
-+
-+long __sched io_schedule_timeout(long timeout)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+	long ret;
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	ret = schedule_timeout(timeout);
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_max - return maximum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the maximum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_max, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = MAX_USER_RT_PRIO-1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_min - return minimum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the minimum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_min, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = 1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_rr_get_interval - return the default timeslice of a process.
-+ * @pid: pid of the process.
-+ * @interval: userspace pointer to the timeslice value.
-+ *
-+ * this syscall writes the default timeslice value of a given process
-+ * into the user-space timespec buffer. A value of '0' means infinity.
-+ */
-+SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
-+		struct timespec __user *, interval)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+	struct timespec t;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	t = ns_to_timespec(p->policy == SCHED_FIFO ? 0 :
-+			   MS_TO_NS(task_timeslice(p)));
-+	read_unlock(&tasklist_lock);
-+	retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
-+out_nounlock:
-+	return retval;
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-+
-+void sched_show_task(struct task_struct *p)
-+{
-+	unsigned long free = 0;
-+	unsigned state;
-+
-+	state = p->state ? __ffs(p->state) + 1 : 0;
-+	printk(KERN_INFO "%-13.13s %c", p->comm,
-+		state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-+#if BITS_PER_LONG == 32
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT " running  ");
-+	else
-+		printk(KERN_CONT " %08lx ", thread_saved_pc(p));
-+#else
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT "  running task    ");
-+	else
-+		printk(KERN_CONT " %016lx ", thread_saved_pc(p));
-+#endif
-+#ifdef CONFIG_DEBUG_STACK_USAGE
-+	free = stack_not_used(p);
-+#endif
-+	printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
-+		task_pid_nr(p), task_pid_nr(p->real_parent),
-+		(unsigned long)task_thread_info(p)->flags);
-+
-+	show_stack(p, NULL);
-+}
-+
-+void show_state_filter(unsigned long state_filter)
-+{
-+	struct task_struct *g, *p;
-+
-+#if BITS_PER_LONG == 32
-+	printk(KERN_INFO
-+		"  task                PC stack   pid father\n");
-+#else
-+	printk(KERN_INFO
-+		"  task                        PC stack   pid father\n");
-+#endif
-+	read_lock(&tasklist_lock);
-+	do_each_thread(g, p) {
-+		/*
-+		 * reset the NMI-timeout, listing all files on a slow
-+		 * console might take alot of time:
-+		 */
-+		touch_nmi_watchdog();
-+		if (!state_filter || (p->state & state_filter))
-+			sched_show_task(p);
-+	} while_each_thread(g, p);
-+
-+	touch_all_softlockup_watchdogs();
-+
-+	read_unlock(&tasklist_lock);
-+	/*
-+	 * Only show locks if all tasks are dumped:
-+	 */
-+	if (state_filter == -1)
-+		debug_show_all_locks();
-+}
-+
-+/**
-+ * init_idle - set up an idle thread for a given CPU
-+ * @idle: task in question
-+ * @cpu: cpu the idle task belongs to
-+ *
-+ * NOTE: this function does not set the idle thread's NEED_RESCHED
-+ * flag, to make booting more robust.
-+ */
-+void __cpuinit init_idle(struct task_struct *idle, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	unsigned long flags;
-+
-+	time_grq_lock(rq, &flags);
-+	idle->timestamp = idle->last_ran = rq->clock;
-+	idle->state = TASK_RUNNING;
-+	/* Setting prio to illegal value shouldn't matter when never queued */
-+	idle->prio = rq->rq_prio = PRIO_LIMIT;
-+	rq->rq_deadline = idle->deadline;
-+	rq->rq_policy = idle->policy;
-+	rq->rq_time_slice = idle->rt.time_slice;
-+	idle->cpus_allowed = cpumask_of_cpu(cpu);
-+	set_task_cpu(idle, cpu);
-+	rq->curr = rq->idle = idle;
-+	idle->oncpu = 1;
-+	set_cpuidle_map(cpu);
-+#ifdef CONFIG_HOTPLUG_CPU
-+	idle->unplugged_mask = CPU_MASK_NONE;
-+#endif
-+	grq_unlock_irqrestore(&flags);
-+
-+	/* Set the preempt count _outside_ the spinlocks! */
-+#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-+	task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
-+#else
-+	task_thread_info(idle)->preempt_count = 0;
-+#endif
-+	ftrace_graph_init_task(idle);
-+}
-+
-+/*
-+ * In a system that switches off the HZ timer nohz_cpu_mask
-+ * indicates which cpus entered this state. This is used
-+ * in the rcu update to wait only for active cpus. For system
-+ * which do not switch off the HZ timer nohz_cpu_mask should
-+ * always be CPU_BITS_NONE.
-+ */
-+cpumask_var_t nohz_cpu_mask;
-+
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+static struct {
-+	atomic_t load_balancer;
-+	cpumask_var_t cpu_mask;
-+	cpumask_var_t ilb_grp_nohz_mask;
-+} nohz ____cacheline_aligned = {
-+	.load_balancer = ATOMIC_INIT(-1),
-+};
-+
-+int get_nohz_load_balancer(void)
-+{
-+	return atomic_read(&nohz.load_balancer);
-+}
-+
-+/*
-+ * This routine will try to nominate the ilb (idle load balancing)
-+ * owner among the cpus whose ticks are stopped. ilb owner will do the idle
-+ * load balancing on behalf of all those cpus. If all the cpus in the system
-+ * go into this tickless mode, then there will be no ilb owner (as there is
-+ * no need for one) and all the cpus will sleep till the next wakeup event
-+ * arrives...
-+ *
-+ * For the ilb owner, tick is not stopped. And this tick will be used
-+ * for idle load balancing. ilb owner will still be part of
-+ * nohz.cpu_mask..
-+ *
-+ * While stopping the tick, this cpu will become the ilb owner if there
-+ * is no other owner. And will be the owner till that cpu becomes busy
-+ * or if all cpus in the system stop their ticks at which point
-+ * there is no need for ilb owner.
-+ *
-+ * When the ilb owner becomes busy, it nominates another owner, during the
-+ * next busy scheduler_tick()
-+ */
-+int select_nohz_load_balancer(int stop_tick)
-+{
-+	int cpu = smp_processor_id();
-+
-+	if (stop_tick) {
-+		cpu_rq(cpu)->in_nohz_recently = 1;
-+
-+		if (!cpu_active(cpu)) {
-+			if (atomic_read(&nohz.load_balancer) != cpu)
-+				return 0;
-+
-+			/*
-+			 * If we are going offline and still the leader,
-+			 * give up!
-+			 */
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+
-+			return 0;
-+		}
-+
-+		cpumask_set_cpu(cpu, nohz.cpu_mask);
-+
-+		/* time for ilb owner also to sleep */
-+		if (cpumask_weight(nohz.cpu_mask) == num_online_cpus()) {
-+			if (atomic_read(&nohz.load_balancer) == cpu)
-+				atomic_set(&nohz.load_balancer, -1);
-+			return 0;
-+		}
-+
-+		if (atomic_read(&nohz.load_balancer) == -1) {
-+			/* make me the ilb owner */
-+			if (atomic_cmpxchg(&nohz.load_balancer, -1, cpu) == -1)
-+				return 1;
-+		} else if (atomic_read(&nohz.load_balancer) == cpu)
-+			return 1;
-+	} else {
-+		if (!cpumask_test_cpu(cpu, nohz.cpu_mask))
-+			return 0;
-+
-+		cpumask_clear_cpu(cpu, nohz.cpu_mask);
-+
-+		if (atomic_read(&nohz.load_balancer) == cpu)
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * When add_timer_on() enqueues a timer into the timer wheel of an
-+ * idle CPU then this timer might expire before the next timer event
-+ * which is scheduled to wake up that CPU. In case of a completely
-+ * idle system the next event might even be infinite time into the
-+ * future. wake_up_idle_cpu() ensures that the CPU is woken up and
-+ * leaves the inner idle loop so the newly added timer is taken into
-+ * account when the CPU goes back to idle and evaluates the timer
-+ * wheel for the next timer event.
-+ */
-+void wake_up_idle_cpu(int cpu)
-+{
-+	struct task_struct *idle;
-+	struct rq *rq;
-+
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	rq = cpu_rq(cpu);
-+	idle = rq->idle;
-+
-+	/*
-+	 * This is safe, as this function is called with the timer
-+	 * wheel base lock of (cpu) held. When the CPU is on the way
-+	 * to idle and has not yet set rq->curr to idle then it will
-+	 * be serialized on the timer wheel base lock and take the new
-+	 * timer into account automatically.
-+	 */
-+	if (unlikely(rq->curr != idle))
-+		return;
-+
-+	/*
-+	 * We can set TIF_RESCHED on the idle task of the other CPU
-+	 * lockless. The worst case is that the other CPU runs the
-+	 * idle task through an additional NOOP schedule()
-+	 */
-+	set_tsk_need_resched(idle);
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(idle))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#endif /* CONFIG_NO_HZ */
-+
-+/*
-+ * Change a given task's CPU affinity. Migrate the thread to a
-+ * proper CPU and schedule it away if the CPU it's executing on
-+ * is removed from the allowed bitmask.
-+ *
-+ * NOTE: the caller must have a valid reference to the task, the
-+ * task must not exit() & deallocate itself prematurely. The
-+ * call is not atomic; no spinlocks may be held.
-+ */
-+int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
-+{
-+	unsigned long flags;
-+	int running = 0;
-+	int queued = 0;
-+	struct rq *rq;
-+	int ret = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	if (!cpumask_intersects(new_mask, cpu_online_mask)) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (unlikely((p->flags & PF_THREAD_BOUND) && p != current &&
-+		     !cpumask_equal(&p->cpus_allowed, new_mask))) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	queued = task_queued_only(p);
-+
-+	cpumask_copy(&p->cpus_allowed, new_mask);
-+	p->rt.nr_cpus_allowed = cpumask_weight(new_mask);
-+
-+	/* Can the task run on the task's current CPU? If so, we're done */
-+	if (cpumask_test_cpu(task_cpu(p), new_mask))
-+		goto out;
-+
-+	/* Reschedule the task, schedule() will know if it can keep running */
-+	if (task_running(p))
-+		running = 1;
-+	else
-+		set_task_cpu(p, cpumask_any_and(cpu_online_mask, new_mask));
-+
-+out:
-+	if (queued)
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+
-+	/* This might be a flaky way of changing cpus! */
-+	if (running)
-+		schedule();
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/* Schedules idle task to be the next runnable task on current CPU.
-+ * It does so by boosting its priority to highest possible.
-+ * Used by CPU offline code.
-+ */
-+void sched_idle_next(void)
-+{
-+	int this_cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(this_cpu);
-+	struct task_struct *idle = rq->idle;
-+	unsigned long flags;
-+
-+	/* cpu has to be offline */
-+	BUG_ON(cpu_online(this_cpu));
-+
-+	/*
-+	 * Strictly not necessary since rest of the CPUs are stopped by now
-+	 * and interrupts disabled on the current cpu.
-+	 */
-+	time_grq_lock(rq, &flags);
-+
-+	__setscheduler(idle, SCHED_FIFO, MAX_RT_PRIO - 1);
-+
-+	activate_idle_task(idle);
-+	set_tsk_need_resched(rq->curr);
-+
-+	grq_unlock_irqrestore(&flags);
-+}
-+
-+/*
-+ * Ensures that the idle task is using init_mm right before its cpu goes
-+ * offline.
-+ */
-+void idle_task_exit(void)
-+{
-+	struct mm_struct *mm = current->active_mm;
-+
-+	BUG_ON(cpu_online(smp_processor_id()));
-+
-+	if (mm != &init_mm)
-+		switch_mm(mm, &init_mm, current);
-+	mmdrop(mm);
-+}
-+
-+#endif /* CONFIG_HOTPLUG_CPU */
-+
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
-+
-+static struct ctl_table sd_ctl_dir[] = {
-+	{
-+		.procname	= "sched_domain",
-+		.mode		= 0555,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table sd_ctl_root[] = {
-+	{
-+		.ctl_name	= CTL_KERN,
-+		.procname	= "kernel",
-+		.mode		= 0555,
-+		.child		= sd_ctl_dir,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table *sd_alloc_ctl_entry(int n)
-+{
-+	struct ctl_table *entry =
-+		kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
-+
-+	return entry;
-+}
-+
-+static void sd_free_ctl_entry(struct ctl_table **tablep)
-+{
-+	struct ctl_table *entry;
-+
-+	/*
-+	 * In the intermediate directories, both the child directory and
-+	 * procname are dynamically allocated and could fail but the mode
-+	 * will always be set. In the lowest directory the names are
-+	 * static strings and all have proc handlers.
-+	 */
-+	for (entry = *tablep; entry->mode; entry++) {
-+		if (entry->child)
-+			sd_free_ctl_entry(&entry->child);
-+		if (entry->proc_handler == NULL)
-+			kfree(entry->procname);
-+	}
-+
-+	kfree(*tablep);
-+	*tablep = NULL;
-+}
-+
-+static void
-+set_table_entry(struct ctl_table *entry,
-+		const char *procname, void *data, int maxlen,
-+		mode_t mode, proc_handler *proc_handler)
-+{
-+	entry->procname = procname;
-+	entry->data = data;
-+	entry->maxlen = maxlen;
-+	entry->mode = mode;
-+	entry->proc_handler = proc_handler;
-+}
-+
-+static struct ctl_table *
-+sd_alloc_ctl_domain_table(struct sched_domain *sd)
-+{
-+	struct ctl_table *table = sd_alloc_ctl_entry(13);
-+
-+	if (table == NULL)
-+		return NULL;
-+
-+	set_table_entry(&table[0], "min_interval", &sd->min_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[1], "max_interval", &sd->max_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[2], "busy_idx", &sd->busy_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[3], "idle_idx", &sd->idle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[4], "newidle_idx", &sd->newidle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[5], "wake_idx", &sd->wake_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[6], "forkexec_idx", &sd->forkexec_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[7], "busy_factor", &sd->busy_factor,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[8], "imbalance_pct", &sd->imbalance_pct,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[9], "cache_nice_tries",
-+		&sd->cache_nice_tries,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[10], "flags", &sd->flags,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[11], "name", sd->name,
-+		CORENAME_MAX_SIZE, 0444, proc_dostring);
-+	/* &table[12] is terminator */
-+
-+	return table;
-+}
-+
-+static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
-+{
-+	struct ctl_table *entry, *table;
-+	struct sched_domain *sd;
-+	int domain_num = 0, i;
-+	char buf[32];
-+
-+	for_each_domain(cpu, sd)
-+		domain_num++;
-+	entry = table = sd_alloc_ctl_entry(domain_num + 1);
-+	if (table == NULL)
-+		return NULL;
-+
-+	i = 0;
-+	for_each_domain(cpu, sd) {
-+		snprintf(buf, 32, "domain%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_domain_table(sd);
-+		entry++;
-+		i++;
-+	}
-+	return table;
-+}
-+
-+static struct ctl_table_header *sd_sysctl_header;
-+static void register_sched_domain_sysctl(void)
-+{
-+	int i, cpu_num = num_online_cpus();
-+	struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
-+	char buf[32];
-+
-+	WARN_ON(sd_ctl_dir[0].child);
-+	sd_ctl_dir[0].child = entry;
-+
-+	if (entry == NULL)
-+		return;
-+
-+	for_each_online_cpu(i) {
-+		snprintf(buf, 32, "cpu%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_cpu_table(i);
-+		entry++;
-+	}
-+
-+	WARN_ON(sd_sysctl_header);
-+	sd_sysctl_header = register_sysctl_table(sd_ctl_root);
-+}
-+
-+/* may be called multiple times per register */
-+static void unregister_sched_domain_sysctl(void)
-+{
-+	if (sd_sysctl_header)
-+		unregister_sysctl_table(sd_sysctl_header);
-+	sd_sysctl_header = NULL;
-+	if (sd_ctl_dir[0].child)
-+		sd_free_ctl_entry(&sd_ctl_dir[0].child);
-+}
-+#else
-+static void register_sched_domain_sysctl(void)
-+{
-+}
-+static void unregister_sched_domain_sysctl(void)
-+{
-+}
-+#endif
-+
-+static void set_rq_online(struct rq *rq)
-+{
-+	if (!rq->online) {
-+		cpumask_set_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 1;
-+	}
-+}
-+
-+static void set_rq_offline(struct rq *rq)
-+{
-+	if (rq->online) {
-+		cpumask_clear_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 0;
-+	}
-+}
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * This cpu is going down, so walk over the tasklist and find tasks that can
-+ * only run on this cpu and remove their affinity. Store their value in
-+ * unplugged_mask so it can be restored once their correct cpu is online. No
-+ * need to do anything special since they'll just move on next reschedule if
-+ * they're running.
-+ */
-+static void remove_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		cpumask_t cpus_remaining;
-+
-+		cpus_and(cpus_remaining, p->cpus_allowed, cpu_online_map);
-+		cpu_clear(cpu, cpus_remaining);
-+		if (cpus_empty(cpus_remaining)) {
-+			p->unplugged_mask = p->cpus_allowed;
-+			p->cpus_allowed = cpu_possible_map;
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+
-+/*
-+ * This cpu is coming up so add it to the cpus_allowed.
-+ */
-+static void add_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		/* Have we taken all the cpus from the unplugged_mask back */
-+		if (cpus_empty(p->unplugged_mask))
-+			continue;
-+
-+		/* Was this cpu in the unplugged_mask mask */
-+		if (cpu_isset(cpu, p->unplugged_mask)) {
-+			cpu_set(cpu, p->cpus_allowed);
-+			if (cpus_subset(p->unplugged_mask, p->cpus_allowed)) {
-+				/*
-+				 * Have we set more than the unplugged_mask?
-+				 * If so, that means we have remnants set from
-+				 * the unplug/plug cycle and need to remove
-+				 * them. Then clear the unplugged_mask as we've
-+				 * set all the cpus back.
-+				 */
-+				p->cpus_allowed = p->unplugged_mask;
-+				cpus_clear(p->unplugged_mask);
-+			}
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+#else
-+static void add_cpu(unsigned long cpu)
-+{
-+}
-+#endif
-+
-+/*
-+ * migration_call - callback that gets triggered when a CPU is added.
-+ */
-+static int __cpuinit
-+migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
-+{
-+	int cpu = (long)hcpu;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	switch (action) {
-+
-+	case CPU_UP_PREPARE:
-+	case CPU_UP_PREPARE_FROZEN:
-+		break;
-+
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		/* Update our root-domain */
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+
-+			set_rq_online(rq);
-+		}
-+		add_cpu(cpu);
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+	case CPU_UP_CANCELED:
-+	case CPU_UP_CANCELED_FROZEN:
-+		break;
-+
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		cpuset_lock(); /* around calls to cpuset_cpus_allowed_lock() */
-+		rq = cpu_rq(cpu);
-+		/* Idle task back to normal (off runqueue, low prio) */
-+		grq_lock_irq();
-+		remove_cpu(cpu);
-+		deactivate_task(rq->idle);
-+		rq->idle->static_prio = MAX_PRIO;
-+		__setscheduler(rq->idle, SCHED_NORMAL, 0);
-+		rq->idle->prio = PRIO_LIMIT;
-+		update_rq_clock(rq);
-+		grq_unlock_irq();
-+		cpuset_unlock();
-+		break;
-+
-+	case CPU_DYING:
-+	case CPU_DYING_FROZEN:
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+			set_rq_offline(rq);
-+		}
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+#endif
-+	}
-+	return NOTIFY_OK;
-+}
-+
-+/*
-+ * Register at high priority so that task migration (migrate_all_tasks)
-+ * happens before everything else.  This has to be lower priority than
-+ * the notifier in the perf_counter subsystem, though.
-+ */
-+static struct notifier_block __cpuinitdata migration_notifier = {
-+	.notifier_call = migration_call,
-+	.priority = 10
-+};
-+
-+int __init migration_init(void)
-+{
-+	void *cpu = (void *)(long)smp_processor_id();
-+	int err;
-+
-+	/* Start one for the boot CPU: */
-+	err = migration_call(&migration_notifier, CPU_UP_PREPARE, cpu);
-+	BUG_ON(err == NOTIFY_BAD);
-+	migration_call(&migration_notifier, CPU_ONLINE, cpu);
-+	register_cpu_notifier(&migration_notifier);
-+
-+	return 0;
-+}
-+early_initcall(migration_init);
-+#endif
-+
-+/*
-+ * sched_domains_mutex serializes calls to arch_init_sched_domains,
-+ * detach_destroy_domains and partition_sched_domains.
-+ */
-+static DEFINE_MUTEX(sched_domains_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+
-+static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
-+				  struct cpumask *groupmask)
-+{
-+	struct sched_group *group = sd->groups;
-+	char str[256];
-+
-+	cpulist_scnprintf(str, sizeof(str), sched_domain_span(sd));
-+	cpumask_clear(groupmask);
-+
-+	printk(KERN_DEBUG "%*s domain %d: ", level, "", level);
-+
-+	if (!(sd->flags & SD_LOAD_BALANCE)) {
-+		printk("does not load-balance\n");
-+		if (sd->parent)
-+			printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
-+					" has parent");
-+		return -1;
-+	}
-+
-+	printk(KERN_CONT "span %s level %s\n", str, sd->name);
-+
-+	if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
-+		printk(KERN_ERR "ERROR: domain->span does not contain "
-+				"CPU%d\n", cpu);
-+	}
-+	if (!cpumask_test_cpu(cpu, sched_group_cpus(group))) {
-+		printk(KERN_ERR "ERROR: domain->groups does not contain"
-+				" CPU%d\n", cpu);
-+	}
-+
-+	printk(KERN_DEBUG "%*s groups:", level + 1, "");
-+	do {
-+		if (!group) {
-+			printk("\n");
-+			printk(KERN_ERR "ERROR: group is NULL\n");
-+			break;
-+		}
-+
-+		if (!group->__cpu_power) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: domain->cpu_power not "
-+					"set\n");
-+			break;
-+		}
-+
-+		if (!cpumask_weight(sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: empty group\n");
-+			break;
-+		}
-+
-+		if (cpumask_intersects(groupmask, sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: repeated CPUs\n");
-+			break;
-+		}
-+
-+		cpumask_or(groupmask, groupmask, sched_group_cpus(group));
-+
-+		cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
-+
-+		printk(KERN_CONT " %s", str);
-+		if (group->__cpu_power != SCHED_LOAD_SCALE) {
-+			printk(KERN_CONT " (__cpu_power = %d)",
-+				group->__cpu_power);
-+		}
-+
-+		group = group->next;
-+	} while (group != sd->groups);
-+	printk(KERN_CONT "\n");
-+
-+	if (!cpumask_equal(sched_domain_span(sd), groupmask))
-+		printk(KERN_ERR "ERROR: groups don't span domain->span\n");
-+
-+	if (sd->parent &&
-+	    !cpumask_subset(groupmask, sched_domain_span(sd->parent)))
-+		printk(KERN_ERR "ERROR: parent span is not a superset "
-+			"of domain->span\n");
-+	return 0;
-+}
-+
-+static void sched_domain_debug(struct sched_domain *sd, int cpu)
-+{
-+	cpumask_var_t groupmask;
-+	int level = 0;
-+
-+	if (!sd) {
-+		printk(KERN_DEBUG "CPU%d attaching NULL sched-domain.\n", cpu);
-+		return;
-+	}
-+
-+	printk(KERN_DEBUG "CPU%d attaching sched-domain:\n", cpu);
-+
-+	if (!alloc_cpumask_var(&groupmask, GFP_KERNEL)) {
-+		printk(KERN_DEBUG "Cannot load-balance (out of memory)\n");
-+		return;
-+	}
-+
-+	for (;;) {
-+		if (sched_domain_debug_one(sd, cpu, level, groupmask))
-+			break;
-+		level++;
-+		sd = sd->parent;
-+		if (!sd)
-+			break;
-+	}
-+	free_cpumask_var(groupmask);
-+}
-+#else /* !CONFIG_SCHED_DEBUG */
-+# define sched_domain_debug(sd, cpu) do { } while (0)
-+#endif /* CONFIG_SCHED_DEBUG */
-+
-+static int sd_degenerate(struct sched_domain *sd)
-+{
-+	if (cpumask_weight(sched_domain_span(sd)) == 1)
-+		return 1;
-+
-+	/* Following flags need at least 2 groups */
-+	if (sd->flags & (SD_LOAD_BALANCE |
-+			 SD_BALANCE_NEWIDLE |
-+			 SD_BALANCE_FORK |
-+			 SD_BALANCE_EXEC |
-+			 SD_SHARE_CPUPOWER |
-+			 SD_SHARE_PKG_RESOURCES)) {
-+		if (sd->groups != sd->groups->next)
-+			return 0;
-+	}
-+
-+	/* Following flags don't use groups */
-+	if (sd->flags & (SD_WAKE_IDLE |
-+			 SD_WAKE_AFFINE |
-+			 SD_WAKE_BALANCE))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static int
-+sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
-+{
-+	unsigned long cflags = sd->flags, pflags = parent->flags;
-+
-+	if (sd_degenerate(parent))
-+		return 1;
-+
-+	if (!cpumask_equal(sched_domain_span(sd), sched_domain_span(parent)))
-+		return 0;
-+
-+	/* Does parent contain flags not in child? */
-+	/* WAKE_BALANCE is a subset of WAKE_AFFINE */
-+	if (cflags & SD_WAKE_AFFINE)
-+		pflags &= ~SD_WAKE_BALANCE;
-+	/* Flags needing groups don't count if only 1 group in parent */
-+	if (parent->groups == parent->groups->next) {
-+		pflags &= ~(SD_LOAD_BALANCE |
-+				SD_BALANCE_NEWIDLE |
-+				SD_BALANCE_FORK |
-+				SD_BALANCE_EXEC |
-+				SD_SHARE_CPUPOWER |
-+				SD_SHARE_PKG_RESOURCES);
-+		if (nr_node_ids == 1)
-+			pflags &= ~SD_SERIALIZE;
-+	}
-+	if (~cflags & pflags)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void free_rootdomain(struct root_domain *rd)
-+{
-+	free_cpumask_var(rd->rto_mask);
-+	free_cpumask_var(rd->online);
-+	free_cpumask_var(rd->span);
-+	kfree(rd);
-+}
-+
-+static void rq_attach_root(struct rq *rq, struct root_domain *rd)
-+{
-+	struct root_domain *old_rd = NULL;
-+	unsigned long flags;
-+
-+	grq_lock_irqsave(&flags);
-+
-+	if (rq->rd) {
-+		old_rd = rq->rd;
-+
-+		if (cpumask_test_cpu(rq->cpu, old_rd->online))
-+			set_rq_offline(rq);
-+
-+		cpumask_clear_cpu(rq->cpu, old_rd->span);
-+
-+		/*
-+		 * If we dont want to free the old_rt yet then
-+		 * set old_rd to NULL to skip the freeing later
-+		 * in this function:
-+		 */
-+		if (!atomic_dec_and_test(&old_rd->refcount))
-+			old_rd = NULL;
-+	}
-+
-+	atomic_inc(&rd->refcount);
-+	rq->rd = rd;
-+
-+	cpumask_set_cpu(rq->cpu, rd->span);
-+	if (cpumask_test_cpu(rq->cpu, cpu_online_mask))
-+		set_rq_online(rq);
-+
-+	grq_unlock_irqrestore(&flags);
-+
-+	if (old_rd)
-+		free_rootdomain(old_rd);
-+}
-+
-+static int init_rootdomain(struct root_domain *rd, bool bootmem)
-+{
-+	gfp_t gfp = GFP_KERNEL;
-+
-+	memset(rd, 0, sizeof(*rd));
-+
-+	if (bootmem)
-+		gfp = GFP_NOWAIT;
-+
-+	if (!alloc_cpumask_var(&rd->span, gfp))
-+		goto out;
-+	if (!alloc_cpumask_var(&rd->online, gfp))
-+		goto free_span;
-+	if (!alloc_cpumask_var(&rd->rto_mask, gfp))
-+		goto free_online;
-+
-+	return 0;
-+
-+free_online:
-+	free_cpumask_var(rd->online);
-+free_span:
-+	free_cpumask_var(rd->span);
-+out:
-+	return -ENOMEM;
-+}
-+
-+static void init_defrootdomain(void)
-+{
-+	init_rootdomain(&def_root_domain, true);
-+
-+	atomic_set(&def_root_domain.refcount, 1);
-+}
-+
-+static struct root_domain *alloc_rootdomain(void)
-+{
-+	struct root_domain *rd;
-+
-+	rd = kmalloc(sizeof(*rd), GFP_KERNEL);
-+	if (!rd)
-+		return NULL;
-+
-+	if (init_rootdomain(rd, false) != 0) {
-+		kfree(rd);
-+		return NULL;
-+	}
-+
-+	return rd;
-+}
-+
-+/*
-+ * Attach the domain 'sd' to 'cpu' as its base domain. Callers must
-+ * hold the hotplug lock.
-+ */
-+static void
-+cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	struct sched_domain *tmp;
-+
-+	/* Remove the sched domains which do not contribute to scheduling. */
-+	for (tmp = sd; tmp; ) {
-+		struct sched_domain *parent = tmp->parent;
-+		if (!parent)
-+			break;
-+
-+		if (sd_parent_degenerate(tmp, parent)) {
-+			tmp->parent = parent->parent;
-+			if (parent->parent)
-+				parent->parent->child = tmp;
-+		} else
-+			tmp = tmp->parent;
-+	}
-+
-+	if (sd && sd_degenerate(sd)) {
-+		sd = sd->parent;
-+		if (sd)
-+			sd->child = NULL;
-+	}
-+
-+	sched_domain_debug(sd, cpu);
-+
-+	rq_attach_root(rq, rd);
-+	rcu_assign_pointer(rq->sd, sd);
-+}
-+
-+/* cpus with isolated domains */
-+static cpumask_var_t cpu_isolated_map;
-+
-+/* Setup the mask of cpus configured for isolated domains */
-+static int __init isolated_cpu_setup(char *str)
-+{
-+	cpulist_parse(str, cpu_isolated_map);
-+	return 1;
-+}
-+
-+__setup("isolcpus=", isolated_cpu_setup);
-+
-+/*
-+ * init_sched_build_groups takes the cpumask we wish to span, and a pointer
-+ * to a function which identifies what group(along with sched group) a CPU
-+ * belongs to. The return value of group_fn must be a >= 0 and < nr_cpu_ids
-+ * (due to the fact that we keep track of groups covered with a struct cpumask).
-+ *
-+ * init_sched_build_groups will build a circular linked list of the groups
-+ * covered by the given span, and will set each group's ->cpumask correctly,
-+ * and ->cpu_power to 0.
-+ */
-+static void
-+init_sched_build_groups(const struct cpumask *span,
-+			const struct cpumask *cpu_map,
-+			int (*group_fn)(int cpu, const struct cpumask *cpu_map,
-+					struct sched_group **sg,
-+					struct cpumask *tmpmask),
-+			struct cpumask *covered, struct cpumask *tmpmask)
-+{
-+	struct sched_group *first = NULL, *last = NULL;
-+	int i;
-+
-+	cpumask_clear(covered);
-+
-+	for_each_cpu(i, span) {
-+		struct sched_group *sg;
-+		int group = group_fn(i, cpu_map, &sg, tmpmask);
-+		int j;
-+
-+		if (cpumask_test_cpu(i, covered))
-+			continue;
-+
-+		cpumask_clear(sched_group_cpus(sg));
-+		sg->__cpu_power = 0;
-+
-+		for_each_cpu(j, span) {
-+			if (group_fn(j, cpu_map, NULL, tmpmask) != group)
-+				continue;
-+
-+			cpumask_set_cpu(j, covered);
-+			cpumask_set_cpu(j, sched_group_cpus(sg));
-+		}
-+		if (!first)
-+			first = sg;
-+		if (last)
-+			last->next = sg;
-+		last = sg;
-+	}
-+	last->next = first;
-+}
-+
-+#define SD_NODES_PER_DOMAIN 16
-+
-+#ifdef CONFIG_NUMA
-+
-+/**
-+ * find_next_best_node - find the next node to include in a sched_domain
-+ * @node: node whose sched_domain we're building
-+ * @used_nodes: nodes already in the sched_domain
-+ *
-+ * Find the next node to include in a given scheduling domain. Simply
-+ * finds the closest node not already in the @used_nodes map.
-+ *
-+ * Should use nodemask_t.
-+ */
-+static int find_next_best_node(int node, nodemask_t *used_nodes)
-+{
-+	int i, n, val, min_val, best_node = 0;
-+
-+	min_val = INT_MAX;
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Start at @node */
-+		n = (node + i) % nr_node_ids;
-+
-+		if (!nr_cpus_node(n))
-+			continue;
-+
-+		/* Skip already used nodes */
-+		if (node_isset(n, *used_nodes))
-+			continue;
-+
-+		/* Simple min distance search */
-+		val = node_distance(node, n);
-+
-+		if (val < min_val) {
-+			min_val = val;
-+			best_node = n;
-+		}
-+	}
-+
-+	node_set(best_node, *used_nodes);
-+	return best_node;
-+}
-+
-+/**
-+ * sched_domain_node_span - get a cpumask for a node's sched_domain
-+ * @node: node whose cpumask we're constructing
-+ * @span: resulting cpumask
-+ *
-+ * Given a node, construct a good cpumask for its sched_domain to span. It
-+ * should be one that prevents unnecessary balancing, but also spreads tasks
-+ * out optimally.
-+ */
-+static void sched_domain_node_span(int node, struct cpumask *span)
-+{
-+	nodemask_t used_nodes;
-+	int i;
-+
-+	cpumask_clear(span);
-+	nodes_clear(used_nodes);
-+
-+	cpumask_or(span, span, cpumask_of_node(node));
-+	node_set(node, used_nodes);
-+
-+	for (i = 1; i < SD_NODES_PER_DOMAIN; i++) {
-+		int next_node = find_next_best_node(node, &used_nodes);
-+
-+		cpumask_or(span, span, cpumask_of_node(next_node));
-+	}
-+}
-+#endif /* CONFIG_NUMA */
-+
-+int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
-+
-+/*
-+ * The cpus mask in sched_group and sched_domain hangs off the end.
-+ *
-+ * ( See the the comments in include/linux/sched.h:struct sched_group
-+ *   and struct sched_domain. )
-+ */
-+struct static_sched_group {
-+	struct sched_group sg;
-+	DECLARE_BITMAP(cpus, CONFIG_NR_CPUS);
-+};
-+
-+struct static_sched_domain {
-+	struct sched_domain sd;
-+	DECLARE_BITMAP(span, CONFIG_NR_CPUS);
-+};
-+
-+/*
-+ * SMT sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_SMT
-+static DEFINE_PER_CPU(struct static_sched_domain, cpu_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_cpus);
-+
-+static int
-+cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map,
-+		 struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_cpus, cpu).sg;
-+	return cpu;
-+}
-+#endif /* CONFIG_SCHED_SMT */
-+
-+/*
-+ * multi-core sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_MC
-+static DEFINE_PER_CPU(struct static_sched_domain, core_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);
-+#endif /* CONFIG_SCHED_MC */
-+
-+#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, group).sg;
-+	return group;
-+}
-+#elif defined(CONFIG_SCHED_MC)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, cpu).sg;
-+	return cpu;
-+}
-+#endif
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);
-+
-+static int
-+cpu_to_phys_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+#ifdef CONFIG_SCHED_MC
-+	cpumask_and(mask, cpu_coregroup_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_SMT)
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#else
-+	group = cpu;
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_phys, group).sg;
-+	return group;
-+}
-+
-+/**
-+ * group_first_cpu - Returns the first cpu in the cpumask of a sched_group.
-+ * @group: The group whose first cpu is to be returned.
-+ */
-+static inline unsigned int group_first_cpu(struct sched_group *group)
-+{
-+	return cpumask_first(sched_group_cpus(group));
-+}
-+
-+#ifdef CONFIG_NUMA
-+/*
-+ * The init_sched_build_groups can't handle what we want to do with node
-+ * groups, so roll our own. Now each node has its own list of groups which
-+ * gets dynamically allocated.
-+ */
-+static DEFINE_PER_CPU(struct static_sched_domain, node_domains);
-+static struct sched_group ***sched_group_nodes_bycpu;
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, allnodes_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_allnodes);
-+
-+static int cpu_to_allnodes_group(int cpu, const struct cpumask *cpu_map,
-+				 struct sched_group **sg,
-+				 struct cpumask *nodemask)
-+{
-+	int group;
-+
-+	cpumask_and(nodemask, cpumask_of_node(cpu_to_node(cpu)), cpu_map);
-+	group = cpumask_first(nodemask);
-+
-+	if (sg)
-+		*sg = &per_cpu(sched_group_allnodes, group).sg;
-+	return group;
-+}
-+
-+static void init_numa_sched_groups_power(struct sched_group *group_head)
-+{
-+	struct sched_group *sg = group_head;
-+	int j;
-+
-+	if (!sg)
-+		return;
-+	do {
-+		for_each_cpu(j, sched_group_cpus(sg)) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(phys_domains, j).sd;
-+			if (j != group_first_cpu(sd->groups)) {
-+				/*
-+				 * Only add "power" once for each
-+				 * physical package.
-+				 */
-+				continue;
-+			}
-+
-+			sg_inc_cpu_power(sg, sd->groups->__cpu_power);
-+		}
-+		sg = sg->next;
-+	} while (sg != group_head);
-+}
-+#endif /* CONFIG_NUMA */
-+
-+#ifdef CONFIG_NUMA
-+/* Free memory allocated for various sched_group structures */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+	int cpu, i;
-+
-+	for_each_cpu(cpu, cpu_map) {
-+		struct sched_group **sched_group_nodes
-+			= sched_group_nodes_bycpu[cpu];
-+
-+		if (!sched_group_nodes)
-+			continue;
-+
-+		for (i = 0; i < nr_node_ids; i++) {
-+			struct sched_group *oldsg, *sg = sched_group_nodes[i];
-+
-+			cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+			if (cpumask_empty(nodemask))
-+				continue;
-+
-+			if (sg == NULL)
-+				continue;
-+			sg = sg->next;
-+next_sg:
-+			oldsg = sg;
-+			sg = sg->next;
-+			kfree(oldsg);
-+			if (oldsg != sched_group_nodes[i])
-+				goto next_sg;
-+		}
-+		kfree(sched_group_nodes);
-+		sched_group_nodes_bycpu[cpu] = NULL;
-+	}
-+}
-+#else /* !CONFIG_NUMA */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+}
-+#endif /* CONFIG_NUMA */
-+
-+/*
-+ * Initialize sched groups cpu_power.
-+ *
-+ * cpu_power indicates the capacity of sched group, which is used while
-+ * distributing the load between different sched groups in a sched domain.
-+ * Typically cpu_power for all the groups in a sched domain will be same unless
-+ * there are asymmetries in the topology. If there are asymmetries, group
-+ * having more cpu_power will pickup more load compared to the group having
-+ * less cpu_power.
-+ *
-+ * cpu_power will be a multiple of SCHED_LOAD_SCALE. This multiple represents
-+ * the maximum number of tasks a group can handle in the presence of other idle
-+ * or lightly loaded groups in the same sched domain.
-+ */
-+static void init_sched_groups_power(int cpu, struct sched_domain *sd)
-+{
-+	struct sched_domain *child;
-+	struct sched_group *group;
-+
-+	WARN_ON(!sd || !sd->groups);
-+
-+	if (cpu != group_first_cpu(sd->groups))
-+		return;
-+
-+	child = sd->child;
-+
-+	sd->groups->__cpu_power = 0;
-+
-+	/*
-+	 * For perf policy, if the groups in child domain share resources
-+	 * (for example cores sharing some portions of the cache hierarchy
-+	 * or SMT), then set this domain groups cpu_power such that each group
-+	 * can handle only one task, when there are other idle groups in the
-+	 * same sched domain.
-+	 */
-+	if (!child || (!(sd->flags & SD_POWERSAVINGS_BALANCE) &&
-+		       (child->flags &
-+			(SD_SHARE_CPUPOWER | SD_SHARE_PKG_RESOURCES)))) {
-+		sg_inc_cpu_power(sd->groups, SCHED_LOAD_SCALE);
-+		return;
-+	}
-+
-+	/*
-+	 * add cpu_power of each child group to this groups cpu_power
-+	 */
-+	group = child->groups;
-+	do {
-+		sg_inc_cpu_power(sd->groups, group->__cpu_power);
-+		group = group->next;
-+	} while (group != child->groups);
-+}
-+
-+/*
-+ * Initializers for schedule domains
-+ * Non-inlined to reduce accumulated stack pressure in build_sched_domains()
-+ */
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+# define SD_INIT_NAME(sd, type)		sd->name = #type
-+#else
-+# define SD_INIT_NAME(sd, type)		do { } while (0)
-+#endif
-+
-+#define	SD_INIT(sd, type)	sd_init_##type(sd)
-+
-+#define SD_INIT_FUNC(type)	\
-+static noinline void sd_init_##type(struct sched_domain *sd)	\
-+{								\
-+	memset(sd, 0, sizeof(*sd));				\
-+	*sd = SD_##type##_INIT;					\
-+	sd->level = SD_LV_##type;				\
-+	SD_INIT_NAME(sd, type);					\
-+}
-+
-+SD_INIT_FUNC(CPU)
-+#ifdef CONFIG_NUMA
-+ SD_INIT_FUNC(ALLNODES)
-+ SD_INIT_FUNC(NODE)
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+ SD_INIT_FUNC(SIBLING)
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+ SD_INIT_FUNC(MC)
-+#endif
-+
-+static int default_relax_domain_level = -1;
-+
-+static int __init setup_relax_domain_level(char *str)
-+{
-+	unsigned long val;
-+
-+	val = simple_strtoul(str, NULL, 0);
-+	if (val < SD_LV_MAX)
-+		default_relax_domain_level = val;
-+
-+	return 1;
-+}
-+__setup("relax_domain_level=", setup_relax_domain_level);
-+
-+static void set_domain_attribute(struct sched_domain *sd,
-+				 struct sched_domain_attr *attr)
-+{
-+	int request;
-+
-+	if (!attr || attr->relax_domain_level < 0) {
-+		if (default_relax_domain_level < 0)
-+			return;
-+		else
-+			request = default_relax_domain_level;
-+	} else
-+		request = attr->relax_domain_level;
-+	if (request < sd->level) {
-+		/* turn off idle balance on this domain */
-+		sd->flags &= ~(SD_WAKE_IDLE|SD_BALANCE_NEWIDLE);
-+	} else {
-+		/* turn on idle balance on this domain */
-+		sd->flags |= (SD_WAKE_IDLE_FAR|SD_BALANCE_NEWIDLE);
-+	}
-+}
-+
-+/*
-+ * Build sched domains for a given set of cpus and attach the sched domains
-+ * to the individual cpus
-+ */
-+static int __build_sched_domains(const struct cpumask *cpu_map,
-+				 struct sched_domain_attr *attr)
-+{
-+	int i, err = -ENOMEM;
-+	struct root_domain *rd;
-+	cpumask_var_t nodemask, this_sibling_map, this_core_map, send_covered,
-+		tmpmask;
-+#ifdef CONFIG_NUMA
-+	cpumask_var_t domainspan, covered, notcovered;
-+	struct sched_group **sched_group_nodes = NULL;
-+	int sd_allnodes = 0;
-+
-+	if (!alloc_cpumask_var(&domainspan, GFP_KERNEL))
-+		goto out;
-+	if (!alloc_cpumask_var(&covered, GFP_KERNEL))
-+		goto free_domainspan;
-+	if (!alloc_cpumask_var(&notcovered, GFP_KERNEL))
-+		goto free_covered;
-+#endif
-+
-+	if (!alloc_cpumask_var(&nodemask, GFP_KERNEL))
-+		goto free_notcovered;
-+	if (!alloc_cpumask_var(&this_sibling_map, GFP_KERNEL))
-+		goto free_nodemask;
-+	if (!alloc_cpumask_var(&this_core_map, GFP_KERNEL))
-+		goto free_this_sibling_map;
-+	if (!alloc_cpumask_var(&send_covered, GFP_KERNEL))
-+		goto free_this_core_map;
-+	if (!alloc_cpumask_var(&tmpmask, GFP_KERNEL))
-+		goto free_send_covered;
-+
-+#ifdef CONFIG_NUMA
-+	/*
-+	 * Allocate the per-node list of sched groups
-+	 */
-+	sched_group_nodes = kcalloc(nr_node_ids, sizeof(struct sched_group *),
-+				    GFP_KERNEL);
-+	if (!sched_group_nodes) {
-+		printk(KERN_WARNING "Can not alloc sched group node list\n");
-+		goto free_tmpmask;
-+	}
-+#endif
-+
-+	rd = alloc_rootdomain();
-+	if (!rd) {
-+		printk(KERN_WARNING "Cannot alloc root domain\n");
-+		goto free_sched_groups;
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	sched_group_nodes_bycpu[cpumask_first(cpu_map)] = sched_group_nodes;
-+#endif
-+
-+	/*
-+	 * Set up domains for cpus specified by the cpu_map.
-+	 */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = NULL, *p;
-+
-+		cpumask_and(nodemask, cpumask_of_node(cpu_to_node(i)), cpu_map);
-+
-+#ifdef CONFIG_NUMA
-+		if (cpumask_weight(cpu_map) >
-+				SD_NODES_PER_DOMAIN*cpumask_weight(nodemask)) {
-+			sd = &per_cpu(allnodes_domains, i).sd;
-+			SD_INIT(sd, ALLNODES);
-+			set_domain_attribute(sd, attr);
-+			cpumask_copy(sched_domain_span(sd), cpu_map);
-+			cpu_to_allnodes_group(i, cpu_map, &sd->groups, tmpmask);
-+			p = sd;
-+			sd_allnodes = 1;
-+		} else
-+			p = NULL;
-+
-+		sd = &per_cpu(node_domains, i).sd;
-+		SD_INIT(sd, NODE);
-+		set_domain_attribute(sd, attr);
-+		sched_domain_node_span(cpu_to_node(i), sched_domain_span(sd));
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpumask_and(sched_domain_span(sd),
-+			    sched_domain_span(sd), cpu_map);
-+#endif
-+
-+		p = sd;
-+		sd = &per_cpu(phys_domains, i).sd;
-+		SD_INIT(sd, CPU);
-+		set_domain_attribute(sd, attr);
-+		cpumask_copy(sched_domain_span(sd), nodemask);
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpu_to_phys_group(i, cpu_map, &sd->groups, tmpmask);
-+
-+#ifdef CONFIG_SCHED_MC
-+		p = sd;
-+		sd = &per_cpu(core_domains, i).sd;
-+		SD_INIT(sd, MC);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd), cpu_map,
-+						   cpu_coregroup_mask(i));
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_core_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+		p = sd;
-+		sd = &per_cpu(cpu_domains, i).sd;
-+		SD_INIT(sd, SIBLING);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd),
-+			    topology_thread_cpumask(i), cpu_map);
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_cpu_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+	}
-+
-+#ifdef CONFIG_SCHED_SMT
-+	/* Set up CPU (sibling) groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_sibling_map,
-+			    topology_thread_cpumask(i), cpu_map);
-+		if (i != cpumask_first(this_sibling_map))
-+			continue;
-+
-+		init_sched_build_groups(this_sibling_map, cpu_map,
-+					&cpu_to_cpu_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+#ifdef CONFIG_SCHED_MC
-+	/* Set up multi-core groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_core_map, cpu_coregroup_mask(i), cpu_map);
-+		if (i != cpumask_first(this_core_map))
-+			continue;
-+
-+		init_sched_build_groups(this_core_map, cpu_map,
-+					&cpu_to_core_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+	/* Set up physical groups */
-+	for (i = 0; i < nr_node_ids; i++) {
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask))
-+			continue;
-+
-+		init_sched_build_groups(nodemask, cpu_map,
-+					&cpu_to_phys_group,
-+					send_covered, tmpmask);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	/* Set up node groups */
-+	if (sd_allnodes) {
-+		init_sched_build_groups(cpu_map, cpu_map,
-+					&cpu_to_allnodes_group,
-+					send_covered, tmpmask);
-+	}
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Set up node groups */
-+		struct sched_group *sg, *prev;
-+		int j;
-+
-+		cpumask_clear(covered);
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask)) {
-+			sched_group_nodes[i] = NULL;
-+			continue;
-+		}
-+
-+		sched_domain_node_span(i, domainspan);
-+		cpumask_and(domainspan, domainspan, cpu_map);
-+
-+		sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
-+				  GFP_KERNEL, i);
-+		if (!sg) {
-+			printk(KERN_WARNING "Can not alloc domain group for "
-+				"node %d\n", i);
-+			goto error;
-+		}
-+		sched_group_nodes[i] = sg;
-+		for_each_cpu(j, nodemask) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(node_domains, j).sd;
-+			sd->groups = sg;
-+		}
-+		sg->__cpu_power = 0;
-+		cpumask_copy(sched_group_cpus(sg), nodemask);
-+		sg->next = sg;
-+		cpumask_or(covered, covered, nodemask);
-+		prev = sg;
-+
-+		for (j = 0; j < nr_node_ids; j++) {
-+			int n = (i + j) % nr_node_ids;
-+
-+			cpumask_complement(notcovered, covered);
-+			cpumask_and(tmpmask, notcovered, cpu_map);
-+			cpumask_and(tmpmask, tmpmask, domainspan);
-+			if (cpumask_empty(tmpmask))
-+				break;
-+
-+			cpumask_and(tmpmask, tmpmask, cpumask_of_node(n));
-+			if (cpumask_empty(tmpmask))
-+				continue;
-+
-+			sg = kmalloc_node(sizeof(struct sched_group) +
-+					  cpumask_size(),
-+					  GFP_KERNEL, i);
-+			if (!sg) {
-+				printk(KERN_WARNING
-+				"Can not alloc domain group for node %d\n", j);
-+				goto error;
-+			}
-+			sg->__cpu_power = 0;
-+			cpumask_copy(sched_group_cpus(sg), tmpmask);
-+			sg->next = prev->next;
-+			cpumask_or(covered, covered, tmpmask);
-+			prev->next = sg;
-+			prev = sg;
-+		}
-+	}
-+#endif
-+
-+	/* Calculate CPU power for physical packages and nodes */
-+#ifdef CONFIG_SCHED_SMT
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(cpu_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(core_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(phys_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	for (i = 0; i < nr_node_ids; i++)
-+		init_numa_sched_groups_power(sched_group_nodes[i]);
-+
-+	if (sd_allnodes) {
-+		struct sched_group *sg;
-+
-+		cpu_to_allnodes_group(cpumask_first(cpu_map), cpu_map, &sg,
-+								tmpmask);
-+		init_numa_sched_groups_power(sg);
-+	}
-+#endif
-+
-+	/* Attach the domains */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd;
-+#ifdef CONFIG_SCHED_SMT
-+		sd = &per_cpu(cpu_domains, i).sd;
-+#elif defined(CONFIG_SCHED_MC)
-+		sd = &per_cpu(core_domains, i).sd;
-+#else
-+		sd = &per_cpu(phys_domains, i).sd;
-+#endif
-+		cpu_attach_domain(sd, rd, i);
-+	}
-+
-+	err = 0;
-+
-+free_tmpmask:
-+	free_cpumask_var(tmpmask);
-+free_send_covered:
-+	free_cpumask_var(send_covered);
-+free_this_core_map:
-+	free_cpumask_var(this_core_map);
-+free_this_sibling_map:
-+	free_cpumask_var(this_sibling_map);
-+free_nodemask:
-+	free_cpumask_var(nodemask);
-+free_notcovered:
-+#ifdef CONFIG_NUMA
-+	free_cpumask_var(notcovered);
-+free_covered:
-+	free_cpumask_var(covered);
-+free_domainspan:
-+	free_cpumask_var(domainspan);
-+out:
-+#endif
-+	return err;
-+
-+free_sched_groups:
-+#ifdef CONFIG_NUMA
-+	kfree(sched_group_nodes);
-+#endif
-+	goto free_tmpmask;
-+
-+#ifdef CONFIG_NUMA
-+error:
-+	free_sched_groups(cpu_map, tmpmask);
-+	free_rootdomain(rd);
-+	goto free_tmpmask;
-+#endif
-+}
-+
-+static int build_sched_domains(const struct cpumask *cpu_map)
-+{
-+	return __build_sched_domains(cpu_map, NULL);
-+}
-+
-+static struct cpumask *doms_cur;	/* current sched domains */
-+static int ndoms_cur;		/* number of sched domains in 'doms_cur' */
-+static struct sched_domain_attr *dattr_cur;
-+				/* attribues of custom domains in 'doms_cur' */
-+
-+/*
-+ * Special case: If a kmalloc of a doms_cur partition (array of
-+ * cpumask) fails, then fallback to a single sched domain,
-+ * as determined by the single cpumask fallback_doms.
-+ */
-+static cpumask_var_t fallback_doms;
-+
-+/*
-+ * arch_update_cpu_topology lets virtualized architectures update the
-+ * cpu core maps. It is supposed to return 1 if the topology changed
-+ * or 0 if it stayed the same.
-+ */
-+int __attribute__((weak)) arch_update_cpu_topology(void)
-+{
-+	return 0;
-+}
-+
-+/*
-+ * Set up scheduler domains and groups. Callers must hold the hotplug lock.
-+ * For now this just excludes isolated cpus, but could be used to
-+ * exclude other special cases in the future.
-+ */
-+static int arch_init_sched_domains(const struct cpumask *cpu_map)
-+{
-+	int err;
-+
-+	arch_update_cpu_topology();
-+	ndoms_cur = 1;
-+	doms_cur = kmalloc(cpumask_size(), GFP_KERNEL);
-+	if (!doms_cur)
-+		doms_cur = fallback_doms;
-+	cpumask_andnot(doms_cur, cpu_map, cpu_isolated_map);
-+	dattr_cur = NULL;
-+	err = build_sched_domains(doms_cur);
-+	register_sched_domain_sysctl();
-+
-+	return err;
-+}
-+
-+static void arch_destroy_sched_domains(const struct cpumask *cpu_map,
-+				       struct cpumask *tmpmask)
-+{
-+	free_sched_groups(cpu_map, tmpmask);
-+}
-+
-+/*
-+ * Detach sched domains from a group of cpus specified in cpu_map
-+ * These cpus will now be attached to the NULL domain
-+ */
-+static void detach_destroy_domains(const struct cpumask *cpu_map)
-+{
-+	/* Save because hotplug lock held. */
-+	static DECLARE_BITMAP(tmpmask, CONFIG_NR_CPUS);
-+	int i;
-+
-+	for_each_cpu(i, cpu_map)
-+		cpu_attach_domain(NULL, &def_root_domain, i);
-+	synchronize_sched();
-+	arch_destroy_sched_domains(cpu_map, to_cpumask(tmpmask));
-+}
-+
-+/* handle null as "default" */
-+static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,
-+			struct sched_domain_attr *new, int idx_new)
-+{
-+	struct sched_domain_attr tmp;
-+
-+	/* fast path */
-+	if (!new && !cur)
-+		return 1;
-+
-+	tmp = SD_ATTR_INIT;
-+	return !memcmp(cur ? (cur + idx_cur) : &tmp,
-+			new ? (new + idx_new) : &tmp,
-+			sizeof(struct sched_domain_attr));
-+}
-+
-+/*
-+ * Partition sched domains as specified by the 'ndoms_new'
-+ * cpumasks in the array doms_new[] of cpumasks. This compares
-+ * doms_new[] to the current sched domain partitioning, doms_cur[].
-+ * It destroys each deleted domain and builds each new domain.
-+ *
-+ * 'doms_new' is an array of cpumask's of length 'ndoms_new'.
-+ * The masks don't intersect (don't overlap.) We should setup one
-+ * sched domain for each mask. CPUs not in any of the cpumasks will
-+ * not be load balanced. If the same cpumask appears both in the
-+ * current 'doms_cur' domains and in the new 'doms_new', we can leave
-+ * it as it is.
-+ *
-+ * The passed in 'doms_new' should be kmalloc'd. This routine takes
-+ * ownership of it and will kfree it when done with it. If the caller
-+ * failed the kmalloc call, then it can pass in doms_new == NULL &&
-+ * ndoms_new == 1, and partition_sched_domains() will fallback to
-+ * the single partition 'fallback_doms', it also forces the domains
-+ * to be rebuilt.
-+ *
-+ * If doms_new == NULL it will be replaced with cpu_online_mask.
-+ * ndoms_new == 0 is a special case for destroying existing domains,
-+ * and it will not create the default domain.
-+ *
-+ * Call with hotplug lock held
-+ */
-+/* FIXME: Change to struct cpumask *doms_new[] */
-+void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
-+			     struct sched_domain_attr *dattr_new)
-+{
-+	int i, j, n;
-+	int new_topology;
-+
-+	mutex_lock(&sched_domains_mutex);
-+
-+	/* always unregister in case we don't destroy any domains */
-+	unregister_sched_domain_sysctl();
-+
-+	/* Let architecture update cpu core mappings. */
-+	new_topology = arch_update_cpu_topology();
-+
-+	n = doms_new ? ndoms_new : 0;
-+
-+	/* Destroy deleted domains */
-+	for (i = 0; i < ndoms_cur; i++) {
-+		for (j = 0; j < n && !new_topology; j++) {
-+			if (cpumask_equal(&doms_cur[i], &doms_new[j])
-+			    && dattrs_equal(dattr_cur, i, dattr_new, j))
-+				goto match1;
-+		}
-+		/* no match - a current sched domain not in new doms_new[] */
-+		detach_destroy_domains(doms_cur + i);
-+match1:
-+		;
-+	}
-+
-+	if (doms_new == NULL) {
-+		ndoms_cur = 0;
-+		doms_new = fallback_doms;
-+		cpumask_andnot(&doms_new[0], cpu_online_mask, cpu_isolated_map);
-+		WARN_ON_ONCE(dattr_new);
-+	}
-+
-+	/* Build new domains */
-+	for (i = 0; i < ndoms_new; i++) {
-+		for (j = 0; j < ndoms_cur && !new_topology; j++) {
-+			if (cpumask_equal(&doms_new[i], &doms_cur[j])
-+			    && dattrs_equal(dattr_new, i, dattr_cur, j))
-+				goto match2;
-+		}
-+		/* no match - add a new doms_new */
-+		__build_sched_domains(doms_new + i,
-+					dattr_new ? dattr_new + i : NULL);
-+match2:
-+		;
-+	}
-+
-+	/* Remember the new sched domains */
-+	if (doms_cur != fallback_doms)
-+		kfree(doms_cur);
-+	kfree(dattr_cur);	/* kfree(NULL) is safe */
-+	doms_cur = doms_new;
-+	dattr_cur = dattr_new;
-+	ndoms_cur = ndoms_new;
-+
-+	register_sched_domain_sysctl();
-+
-+	mutex_unlock(&sched_domains_mutex);
-+}
-+
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+static void arch_reinit_sched_domains(void)
-+{
-+	get_online_cpus();
-+
-+	/* Destroy domains first to force the rebuild */
-+	partition_sched_domains(0, NULL, NULL);
-+
-+	rebuild_sched_domains();
-+	put_online_cpus();
-+}
-+
-+static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)
-+{
-+	unsigned int level = 0;
-+
-+	if (sscanf(buf, "%u", &level) != 1)
-+		return -EINVAL;
-+
-+	/*
-+	 * level is always be positive so don't check for
-+	 * level < POWERSAVINGS_BALANCE_NONE which is 0
-+	 * What happens on 0 or 1 byte write,
-+	 * need to check for count as well?
-+	 */
-+
-+	if (level >= MAX_POWERSAVINGS_BALANCE_LEVELS)
-+		return -EINVAL;
-+
-+	if (smt)
-+		sched_smt_power_savings = level;
-+	else
-+		sched_mc_power_savings = level;
-+
-+	arch_reinit_sched_domains();
-+
-+	return count;
-+}
-+
-+#ifdef CONFIG_SCHED_MC
-+static ssize_t sched_mc_power_savings_show(struct sysdev_class *class,
-+					   char *page)
-+{
-+	return sprintf(page, "%u\n", sched_mc_power_savings);
-+}
-+static ssize_t sched_mc_power_savings_store(struct sysdev_class *class,
-+					    const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 0);
-+}
-+static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644,
-+			 sched_mc_power_savings_show,
-+			 sched_mc_power_savings_store);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev,
-+					    char *page)
-+{
-+	return sprintf(page, "%u\n", sched_smt_power_savings);
-+}
-+static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev,
-+					     const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 1);
-+}
-+static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644,
-+		   sched_smt_power_savings_show,
-+		   sched_smt_power_savings_store);
-+#endif
-+
-+int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)
-+{
-+	int err = 0;
-+
-+#ifdef CONFIG_SCHED_SMT
-+	if (smt_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_smt_power_savings.attr);
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	if (!err && mc_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_mc_power_savings.attr);
-+#endif
-+	return err;
-+}
-+#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
-+
-+#ifndef CONFIG_CPUSETS
-+/*
-+ * Add online and remove offline CPUs from the scheduler domains.
-+ * When cpusets are enabled they take over this function.
-+ */
-+static int update_sched_domains(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		partition_sched_domains(1, NULL, NULL);
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+#endif
-+
-+static int update_runtime(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_DOWN_PREPARE:
-+	case CPU_DOWN_PREPARE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	case CPU_DOWN_FAILED:
-+	case CPU_DOWN_FAILED_FROZEN:
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+void __init sched_init_smp(void)
-+{
-+	cpumask_var_t non_isolated_cpus;
-+
-+	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
-+
-+#if defined(CONFIG_NUMA)
-+	sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
-+								GFP_KERNEL);
-+	BUG_ON(sched_group_nodes_bycpu == NULL);
-+#endif
-+	get_online_cpus();
-+	mutex_lock(&sched_domains_mutex);
-+	arch_init_sched_domains(cpu_online_mask);
-+	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);
-+	if (cpumask_empty(non_isolated_cpus))
-+		cpumask_set_cpu(smp_processor_id(), non_isolated_cpus);
-+	mutex_unlock(&sched_domains_mutex);
-+	put_online_cpus();
-+
-+#ifndef CONFIG_CPUSETS
-+	/* XXX: Theoretical race here - CPU may be hotplugged now */
-+	hotcpu_notifier(update_sched_domains, 0);
-+#endif
-+
-+	/* RT runtime code needs to handle some hotplug events */
-+	hotcpu_notifier(update_runtime, 0);
-+
-+	/* Move init over to a non-isolated CPU */
-+	if (set_cpus_allowed_ptr(current, non_isolated_cpus) < 0)
-+		BUG();
-+	free_cpumask_var(non_isolated_cpus);
-+
-+	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
-+
-+	/*
-+	 * Assume that every added cpu gives us slightly less overall latency
-+	 * allowing us to increase the base rr_interval, but in a non linear
-+	 * fashion.
-+	 */
-+	rr_interval *= 1 + ilog2(num_online_cpus());
-+}
-+#else
-+void __init sched_init_smp(void)
-+{
-+}
-+#endif /* CONFIG_SMP */
-+
-+unsigned int sysctl_timer_migration = 1;
-+
-+int in_sched_functions(unsigned long addr)
-+{
-+	return in_lock_functions(addr) ||
-+		(addr >= (unsigned long)__sched_text_start
-+		&& addr < (unsigned long)__sched_text_end);
-+}
-+
-+void __init sched_init(void)
-+{
-+	int i;
-+	int highest_cpu = 0;
-+
-+	prio_ratios[0] = 100;
-+	for (i = 1 ; i < PRIO_RANGE ; i++)
-+		prio_ratios[i] = prio_ratios[i - 1] * 11 / 10;
-+
-+#ifdef CONFIG_SMP
-+	init_defrootdomain();
-+	cpus_clear(grq.cpu_idle_map);
-+#endif
-+	spin_lock_init(&grq.lock);
-+	for_each_possible_cpu(i) {
-+		struct rq *rq;
-+
-+		rq = cpu_rq(i);
-+		INIT_LIST_HEAD(&rq->queue);
-+		rq->rq_deadline = 0;
-+		rq->rq_prio = 0;
-+		rq->cpu = i;
-+		rq->user_pc = rq->nice_pc = rq->softirq_pc = rq->system_pc =
-+			      rq->iowait_pc = rq->idle_pc = 0;
-+#ifdef CONFIG_SMP
-+		rq->sd = NULL;
-+		rq->rd = NULL;
-+		rq->online = 0;
-+		INIT_LIST_HEAD(&rq->migration_queue);
-+		rq_attach_root(rq, &def_root_domain);
-+#endif
-+		atomic_set(&rq->nr_iowait, 0);
-+		highest_cpu = i;
-+	}
-+	grq.iso_ticks = grq.nr_running = grq.nr_uninterruptible = 0;
-+	for (i = 0; i < PRIO_LIMIT; i++)
-+		INIT_LIST_HEAD(grq.queue + i);
-+	bitmap_zero(grq.prio_bitmap, PRIO_LIMIT);
-+	/* delimiter for bitsearch */
-+	__set_bit(PRIO_LIMIT, grq.prio_bitmap);
-+
-+#ifdef CONFIG_SMP
-+	nr_cpu_ids = highest_cpu + 1;
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&init_task.preempt_notifiers);
-+#endif
-+
-+#ifdef CONFIG_RT_MUTEXES
-+	plist_head_init(&init_task.pi_waiters, &init_task.pi_lock);
-+#endif
-+
-+	/*
-+	 * The boot idle thread does lazy MMU switching as well:
-+	 */
-+	atomic_inc(&init_mm.mm_count);
-+	enter_lazy_tlb(&init_mm, current);
-+
-+	/*
-+	 * Make us the idle thread. Technically, schedule() should not be
-+	 * called from this thread, however somewhere below it might be,
-+	 * but because we are the idle thread, we just pick up running again
-+	 * when this runqueue becomes "idle".
-+	 */
-+	init_idle(current, smp_processor_id());
-+
-+	/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
-+	alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
-+	alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
-+#endif
-+	alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
-+#endif /* SMP */
-+	perf_counter_init();
-+}
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+void __might_sleep(char *file, int line)
-+{
-+#ifdef in_atomic
-+	static unsigned long prev_jiffy;	/* ratelimiting */
-+
-+	if ((in_atomic() || irqs_disabled()) &&
-+	    system_state == SYSTEM_RUNNING && !oops_in_progress) {
-+		if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
-+			return;
-+		prev_jiffy = jiffies;
-+		printk(KERN_ERR "BUG: sleeping function called from invalid"
-+				" context at %s:%d\n", file, line);
-+		printk("in_atomic():%d, irqs_disabled():%d\n",
-+			in_atomic(), irqs_disabled());
-+		debug_show_held_locks(current);
-+		if (irqs_disabled())
-+			print_irqtrace_events(current);
-+		dump_stack();
-+	}
-+#endif
-+}
-+EXPORT_SYMBOL(__might_sleep);
-+#endif
-+
-+#ifdef CONFIG_MAGIC_SYSRQ
-+void normalize_rt_tasks(void)
-+{
-+	struct task_struct *g, *p;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int queued;
-+
-+	read_lock_irq(&tasklist_lock);
-+
-+	do_each_thread(g, p) {
-+		if (!rt_task(p) && !iso_task(p))
-+			continue;
-+
-+		spin_lock_irqsave(&p->pi_lock, flags);
-+		rq = __task_grq_lock(p);
-+		update_rq_clock(rq);
-+
-+		queued = task_queued_only(p);
-+		if (queued)
-+			dequeue_task(p);
-+		__setscheduler(p, SCHED_NORMAL, 0);
-+		if (task_running(p))
-+			resched_task(p);
-+		if (queued) {
-+			enqueue_task(p);
-+			try_preempt(p);
-+		}
-+
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+	} while_each_thread(g, p);
-+
-+	read_unlock_irq(&tasklist_lock);
-+}
-+#endif /* CONFIG_MAGIC_SYSRQ */
-+
-+#ifdef CONFIG_IA64
-+/*
-+ * These functions are only useful for the IA64 MCA handling.
-+ *
-+ * They can only be called when the whole system has been
-+ * stopped - every CPU needs to be quiescent, and no scheduling
-+ * activity can take place. Using them for anything else would
-+ * be a serious bug, and as a result, they aren't even visible
-+ * under any other configuration.
-+ */
-+
-+/**
-+ * curr_task - return the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+struct task_struct *curr_task(int cpu)
-+{
-+	return cpu_curr(cpu);
-+}
-+
-+/**
-+ * set_curr_task - set the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ * @p: the task pointer to set.
-+ *
-+ * Description: This function must only be used when non-maskable interrupts
-+ * are serviced on a separate stack.  It allows the architecture to switch the
-+ * notion of the current task on a cpu in a non-blocking manner.  This function
-+ * must be called with all CPU's synchronized, and interrupts disabled, the
-+ * and caller must save the original value of the current task (see
-+ * curr_task() above) and restore that value before reenabling interrupts and
-+ * re-starting the system.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+void set_curr_task(int cpu, struct task_struct *p)
-+{
-+	cpu_curr(cpu) = p;
-+}
-+
-+#endif
-+
-+/*
-+ * Use precise platform statistics if available:
-+ */
-+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	return p->utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	return p->stime;
-+}
-+#else
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	clock_t utime = cputime_to_clock_t(p->utime),
-+		total = utime + cputime_to_clock_t(p->stime);
-+	u64 temp;
-+
-+	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
-+
-+	if (total) {
-+		temp *= utime;
-+		do_div(temp, total);
-+	}
-+	utime = (clock_t)temp;
-+
-+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
-+	return p->prev_utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	clock_t stime;
-+
-+	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
-+			cputime_to_clock_t(task_utime(p));
-+
-+	if (stime >= 0)
-+		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
-+
-+	return p->prev_stime;
-+}
-+#endif
-+
-+inline cputime_t task_gtime(struct task_struct *p)
-+{
-+	return p->gtime;
-+}
-+
-+void __cpuinit init_idle_bootup_task(struct task_struct *idle)
-+{}
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
-+{}
-+
-+void proc_sched_set_task(struct task_struct *p)
-+{}
-+#endif
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -83,6 +83,8 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
-+extern int rr_interval;
-+extern int sched_iso_cpu;
- #ifndef CONFIG_MMU
- extern int sysctl_nr_trim_pages;
- #endif
-@@ -100,7 +102,8 @@ static int zero;
- static int __maybe_unused one = 1;
- static int __maybe_unused two = 2;
- static unsigned long one_ul = 1;
--static int one_hundred = 100;
-+static int __read_mostly one_hundred = 100;
-+static int __maybe_unused __read_mostly five_thousand = 5000;
- 
- /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
- static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-@@ -234,7 +237,7 @@ static struct ctl_table root_table[] = {
- 	{ .ctl_name = 0 }
- };
- 
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- static int min_sched_granularity_ns = 100000;		/* 100 usecs */
- static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
- static int min_wakeup_granularity_ns;			/* 0 usecs */
-@@ -242,7 +245,7 @@ static int max_wakeup_granularity_ns = N
- #endif
- 
- static struct ctl_table kern_table[] = {
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_min_granularity_ns",
-@@ -327,6 +330,7 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= &proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_CFS
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_rt_period_us",
-@@ -351,6 +355,7 @@ static struct ctl_table kern_table[] = {
- 		.mode		= 0644,
- 		.proc_handler	= &proc_dointvec,
- 	},
-+#endif
- #ifdef CONFIG_PROVE_LOCKING
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
-@@ -756,6 +761,30 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= &proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_BFS
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "rr_interval",
-+		.data		= &rr_interval,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &one,
-+		.extra2		= &five_thousand,
-+	},
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "iso_cpu",
-+		.data		= &sched_iso_cpu,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &zero,
-+		.extra2		= &one_hundred,
-+	},
-+#endif
- #if defined(CONFIG_S390) && defined(CONFIG_SMP)
- 	{
- 		.ctl_name	= KERN_SPIN_RETRY,
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -320,7 +320,9 @@ static int worker_thread(void *__cwq)
- 	if (cwq->wq->freezeable)
- 		set_freezable();
- 
-+#ifdef CONFIG_SCHED_CFS
- 	set_user_nice(current, -5);
-+#endif
- 
- 	for (;;) {
- 		prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE);
---- /dev/null
-+++ b/include/linux/perf_counter.h
-@@ -0,0 +1,2 @@
-+#define perf_counter_init() do {} while(0)
-+#define perf_counter_task_sched_in(...) do {} while(0)
---- /dev/null
-+++ b/include/trace/events/sched.h
-@@ -0,0 +1 @@
-+#include <trace/sched.h>
diff --git a/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch
deleted file mode 100644
index 2754ed6d7e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -295,4 +295,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -38,3 +38,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
deleted file mode 100644
index c41fecfead..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -299,4 +299,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -39,3 +39,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch
deleted file mode 100644
index 139d997dfb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/410-gpio_buttons.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -250,4 +250,20 @@ config INPUT_RB532_BUTTON
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called rb532_button.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -24,3 +24,4 @@ obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcs
- obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.30/420-gpiodev.patch
deleted file mode 100644
index 989e253d7c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/420-gpiodev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1016,6 +1016,13 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
- config GPIO_VR41XX
- 	tristate "NEC VR4100 series General-purpose I/O Unit support"
- 	depends on CPU_VR41XX
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch
deleted file mode 100644
index 575bec92d7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.30/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.30/510-yaffs_support.patch
deleted file mode 100644
index 63c034a2d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -177,6 +177,7 @@ source "fs/romfs/Kconfig"
- source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- config NILFS2_FS
- 	tristate "NILFS2 file system support (EXPERIMENTAL)"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index 5c70e79a05..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch
deleted file mode 100644
index 72a4fa5232..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -355,8 +399,8 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
--		if (mii_data->reg_num == MII_BMCR 
-+
-+		if (mii_data->reg_num == MII_BMCR
- 				&& val & BMCR_RESET
- 				&& phydev->drv->config_init) {
- 			phy_scan_fixups(phydev);
-@@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -483,6 +483,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.30/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.30/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index aac38ff2e7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.30/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.30/620-phy_adm6996.patch
deleted file mode 100644
index 8f61d95c2d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -82,6 +82,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY)		+= smsc.o
- obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.30/630-phy_packets.patch
deleted file mode 100644
index ab62b007af..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -143,6 +143,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -168,6 +180,8 @@ struct phy_device* phy_device_create(str
- 	dev->bus = bus;
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -770,6 +770,7 @@ struct net_device
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.30/640-br2684_backport_routed.patch b/target/linux/generic-2.6/patches-2.6.30/640-br2684_backport_routed.patch
deleted file mode 100644
index d925144fa9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/640-br2684_backport_routed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
-Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Date:   Fri Dec 4 11:06:32 2009 +0000
-
-    atm: [br2684] allow routed mode operation again
-    
-    in routed mode, we don't have a hardware address so netdev_ops doesnt
-    need to validate our hardware address via .ndo_validate_addr
-    
-    Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
-    Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/net/atm/br2684.c
-+++ b/net/atm/br2684.c
-@@ -544,6 +544,12 @@ static const struct net_device_ops br268
- 	.ndo_validate_addr	= eth_validate_addr,
- };
- 
-+static const struct net_device_ops br2684_netdev_ops_routed = {
-+	.ndo_start_xmit 	= br2684_start_xmit,
-+	.ndo_set_mac_address	= br2684_mac_addr,
-+	.ndo_change_mtu		= eth_change_mtu
-+};
-+
- static void br2684_setup(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
-@@ -559,11 +565,10 @@ static void br2684_setup(struct net_devi
- static void br2684_setup_routed(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
--	brdev->net_dev = netdev;
- 
-+	brdev->net_dev = netdev;
- 	netdev->hard_header_len = 0;
--
--	netdev->netdev_ops = &br2684_netdev_ops;
-+	netdev->netdev_ops = &br2684_netdev_ops_routed;
- 	netdev->addr_len = 0;
- 	netdev->mtu = 1500;
- 	netdev->type = ARPHRD_PPP;
diff --git a/target/linux/generic-2.6/patches-2.6.30/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.30/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.30/660-phy_mvswitch.patch
deleted file mode 100644
index 731f30301f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -93,6 +93,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.30/670-phy_ip175c.patch
deleted file mode 100644
index 5d8ba3c622..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -96,6 +96,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch
deleted file mode 100644
index d9d3ce7721..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -100,6 +100,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.30/690-phy_rtl8306.patch
deleted file mode 100644
index bfebbcff51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
deleted file mode 100644
index 4ce0520b11..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,4 +135,29 @@ config MDIO_GPIO
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called mdio-gpio.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.30/700-rtc7301.patch
deleted file mode 100644
index 9d17e5c3a5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -526,6 +526,15 @@ config RTC_DRV_PCF50633
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NXP PCF50633 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -62,6 +62,7 @@ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
- obj-$(CONFIG_RTC_DRV_S3C)	+= rtc-s3c.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
deleted file mode 100644
index 79fd131c1d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -75,6 +75,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch b/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
deleted file mode 100644
index b7214b9d6d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 5ced436d549d911ce610ea47d85f71fae5bbfce4
-Author: Lars-Peter Clausen <lars@metafoo.de>
-Date:   Fri Jul 31 18:26:48 2009 +0200
-
-    ASoC: jack: Fix race in snd_soc_jack_add_gpios
-    
-    The irq can fire as soon as it has been requested, thus all fields accessed
-    from within the irq handler must be initialized prior to requesting the irq.
-    
-    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-
---- a/sound/soc/soc-jack.c
-+++ b/sound/soc/soc-jack.c
-@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_so
- 		if (ret)
- 			goto err;
- 
-+		INIT_WORK(&gpios[i].work, gpio_work);
-+		gpios[i].jack = jack;
-+
- 		ret = request_irq(gpio_to_irq(gpios[i].gpio),
- 				gpio_handler,
- 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_so
- 				&gpios[i]);
- 		if (ret)
- 			goto err;
--
--		INIT_WORK(&gpios[i].work, gpio_work);
--		gpios[i].jack = jack;
- 	}
- 
- 	return 0;
diff --git a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index 8eaead9292..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -60,6 +60,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -864,7 +865,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1309,3 +1310,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch
deleted file mode 100644
index c9a2774689..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -812,7 +812,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch
deleted file mode 100644
index 4ff1536773..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #define KSYM_NAME_LEN		128
- 
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -97,6 +97,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch
deleted file mode 100644
index 197d0a1e32..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -431,6 +431,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1475,23 +1475,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4055,3 +4052,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.30/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.30/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.30/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch b/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch
deleted file mode 100644
index b421662d9c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/910-hostap_tx_queue_len_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_main.c
-+++ b/drivers/net/wireless/hostap/hostap_main.c
-@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device 
- 
- 	switch(type) {
- 	case HOSTAP_INTERFACE_AP:
-+		dev->tx_queue_len = 0;	/* use main radio device queue */
- 		dev->netdev_ops = &hostap_mgmt_netdev_ops;
- 		dev->type = ARPHRD_IEEE80211;
- 		dev->header_ops = &hostap_80211_ops;
- 		break;
- 	case HOSTAP_INTERFACE_MASTER:
--		dev->tx_queue_len = 0;	/* use main radio device queue */
- 		dev->netdev_ops = &hostap_master_ops;
- 		break;
- 	default:
-+		dev->tx_queue_len = 0;	/* use main radio device queue */
- 		dev->netdev_ops = &hostap_netdev_ops;
- 	}
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.30/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.30/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.30/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.30/921-gpio_spi_driver.patch
deleted file mode 100644
index 98b764d6f8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on ARCH_IMX && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitban
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch
deleted file mode 100644
index c0a2159d86..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch
+++ /dev/null
@@ -1,838 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -241,3 +241,28 @@ config MMC_TMIO
- 	help
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also ipaq ASIC3
-+
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -29,4 +29,5 @@ endif
- obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
- obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- 
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2504,6 +2504,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.30/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.30/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch
deleted file mode 100644
index 453affe583..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.30/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.30/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d01..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch
deleted file mode 100644
index 202f998dde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -99,7 +99,7 @@ struct wireless_dev;
-  */
- 
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -387,7 +387,7 @@ struct sk_buff {
- #ifdef CONFIG_IPV6_NDISC_NODETYPE
- 	__u8			ndisc_nodetype:2;
- #endif
--#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
-+#if 1
- 	__u8			do_not_encrypt:1;
- 	__u8			requeue:1;
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
deleted file mode 100644
index 391fbba876..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/941-ssb_update.patch
+++ /dev/null
@@ -1,1680 +0,0 @@
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct 
- 	chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
- }
- 
-+static void ssb_chipco_regctl_maskset(struct ssb_chipcommon *cc,
-+				   u32 offset, u32 mask, u32 set)
-+{
-+	u32 value;
-+
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_ADDR, offset);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	value = chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+	value &= mask;
-+	value |= set;
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_DATA, value);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+}
-+
- struct pmu0_plltab_entry {
- 	u16 freq;	/* Crystal frequency in kHz.*/
- 	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -317,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
- 	case 0x5354:
- 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
- 		break;
-+	case 0x4322:
-+		if (cc->pmu.rev == 2) {
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
-+		}
-+		break;
- 	default:
- 		ssb_printk(KERN_ERR PFX
- 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -402,6 +423,7 @@ static void ssb_pmu_resources_init(struc
- 
- 	switch (bus->chip_id) {
- 	case 0x4312:
-+	case 0x4322:
- 		/* We keep the default settings:
- 		 * min_msk = 0xCBB
- 		 * max_msk = 0x7FFFF
-@@ -506,3 +528,82 @@ void ssb_pmu_init(struct ssb_chipcommon 
- 	ssb_pmu_pll_init(cc);
- 	ssb_pmu_resources_init(cc);
- }
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	u32 addr, shift, mask;
-+
-+	switch (bus->chip_id) {
-+	case 0x4328:
-+	case 0x5354:
-+		switch (id) {
-+		case LDO_VOLT1:
-+			addr = 2;
-+			shift = 25;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT2:
-+			addr = 3;
-+			shift = 1;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT3:
-+			addr = 3;
-+			shift = 9;
-+			mask = 0xF;
-+			break;
-+		case LDO_PAREF:
-+			addr = 3;
-+			shift = 17;
-+			mask = 0x3F;
-+			break;
-+		default:
-+			SSB_WARN_ON(1);
-+			return;
-+		}
-+		break;
-+	case 0x4312:
-+		if (SSB_WARN_ON(id != LDO_PAREF))
-+			return;
-+		addr = 0;
-+		shift = 21;
-+		mask = 0x3F;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	ssb_chipco_regctl_maskset(cc, addr, ~(mask << shift),
-+				  (voltage & mask) << shift);
-+}
-+
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	int ldo;
-+
-+	switch (bus->chip_id) {
-+	case 0x4312:
-+		ldo = SSB_PMURES_4312_PA_REF_LDO;
-+		break;
-+	case 0x4328:
-+		ldo = SSB_PMURES_4328_PA_REF_LDO;
-+		break;
-+	case 0x5354:
-+		ldo = SSB_PMURES_5354_PA_REF_LDO;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	if (on)
-+		chipco_set32(cc, SSB_CHIPCO_PMU_MINRES_MSK, 1 << ldo);
-+	else
-+		chipco_mask32(cc, SSB_CHIPCO_PMU_MINRES_MSK, ~(1 << ldo));
-+	chipco_read32(cc, SSB_CHIPCO_PMU_MINRES_MSK); //SPEC FIXME found via mmiotrace - dummy read?
-+}
-+
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -120,6 +120,19 @@ static void ssb_device_put(struct ssb_de
- 		put_device(dev->dev);
- }
- 
-+static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
-+{
-+	if (drv)
-+		get_driver(&drv->drv);
-+	return drv;
-+}
-+
-+static inline void ssb_driver_put(struct ssb_driver *drv)
-+{
-+	if (drv)
-+		put_driver(&drv->drv);
-+}
-+
- static int ssb_device_resume(struct device *dev)
- {
- 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-@@ -190,90 +203,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
- EXPORT_SYMBOL(ssb_bus_suspend);
- 
- #ifdef CONFIG_SSB_SPROM
--int ssb_devices_freeze(struct ssb_bus *bus)
-+/** ssb_devices_freeze - Freeze all devices on the bus.
-+ *
-+ * After freezing no device driver will be handling a device
-+ * on this bus anymore. ssb_devices_thaw() must be called after
-+ * a successful freeze to reactivate the devices.
-+ *
-+ * @bus: The bus.
-+ * @ctx: Context structure. Pass this to ssb_devices_thaw().
-+ */
-+int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx)
- {
--	struct ssb_device *dev;
--	struct ssb_driver *drv;
--	int err = 0;
--	int i;
--	pm_message_t state = PMSG_FREEZE;
-+	struct ssb_device *sdev;
-+	struct ssb_driver *sdrv;
-+	unsigned int i;
-+
-+	memset(ctx, 0, sizeof(*ctx));
-+	ctx->bus = bus;
-+	SSB_WARN_ON(bus->nr_devices > ARRAY_SIZE(ctx->device_frozen));
- 
--	/* First check that we are capable to freeze all devices. */
- 	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
--			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
-+		sdev = ssb_device_get(&bus->devices[i]);
-+
-+		if (!sdev->dev || !sdev->dev->driver ||
-+		    !device_is_registered(sdev->dev)) {
-+			ssb_device_put(sdev);
- 			continue;
--		if (!drv->suspend) {
--			/* Nope, can't suspend this one. */
--			return -EOPNOTSUPP;
- 		}
--	}
--	/* Now suspend all devices */
--	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
--			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
-+		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
-+		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
-+			ssb_device_put(sdev);
- 			continue;
--		err = drv->suspend(dev, state);
--		if (err) {
--			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
--				   dev_name(dev->dev));
--			goto err_unwind;
- 		}
-+		sdrv->remove(sdev);
-+		ctx->device_frozen[i] = 1;
- 	}
- 
- 	return 0;
--err_unwind:
--	for (i--; i >= 0; i--) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
--			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
--			continue;
--		if (drv->resume)
--			drv->resume(dev);
--	}
--	return err;
- }
- 
--int ssb_devices_thaw(struct ssb_bus *bus)
-+/** ssb_devices_thaw - Unfreeze all devices on the bus.
-+ *
-+ * This will re-attach the device drivers and re-init the devices.
-+ *
-+ * @ctx: The context structure from ssb_devices_freeze()
-+ */
-+int ssb_devices_thaw(struct ssb_freeze_context *ctx)
- {
--	struct ssb_device *dev;
--	struct ssb_driver *drv;
--	int err;
--	int i;
-+	struct ssb_bus *bus = ctx->bus;
-+	struct ssb_device *sdev;
-+	struct ssb_driver *sdrv;
-+	unsigned int i;
-+	int err, result = 0;
- 
- 	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
-+		if (!ctx->device_frozen[i])
- 			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
-+		sdev = &bus->devices[i];
-+
-+		if (SSB_WARN_ON(!sdev->dev || !sdev->dev->driver))
- 			continue;
--		if (SSB_WARN_ON(!drv->resume))
-+		sdrv = drv_to_ssb_drv(sdev->dev->driver);
-+		if (SSB_WARN_ON(!sdrv || !sdrv->probe))
- 			continue;
--		err = drv->resume(dev);
-+
-+		err = sdrv->probe(sdev, &sdev->id);
- 		if (err) {
- 			ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
--				   dev_name(dev->dev));
-+				   dev_name(sdev->dev));
-+			result = err;
- 		}
-+		ssb_driver_put(sdrv);
-+		ssb_device_put(sdev);
- 	}
- 
--	return 0;
-+	return result;
- }
- #endif /* CONFIG_SSB_SPROM */
- 
-@@ -472,6 +476,8 @@ static int ssb_devices_register(struct s
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
- 			break;
-+		default:
-+			break;
- 		}
- 
- 		sdev->dev = dev;
-@@ -1358,8 +1364,10 @@ static int __init ssb_modinit(void)
- 	ssb_buses_lock();
- 	err = ssb_attach_queued_buses();
- 	ssb_buses_unlock();
--	if (err)
-+	if (err) {
- 		bus_unregister(&ssb_bustype);
-+		goto out;
-+	}
- 
- 	err = b43_pci_ssb_bridge_init();
- 	if (err) {
-@@ -1375,7 +1383,7 @@ static int __init ssb_modinit(void)
- 		/* don't fail SSB init because of this */
- 		err = 0;
- 	}
--
-+out:
- 	return err;
- }
- /* ssb must be initialized after PCI but before the ssb drivers.
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -167,10 +167,16 @@ err_pci:
- }
- 
- /* Get the word-offset for a SSB_SPROM_XXX define. */
--#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
-+#define SPOFF(offset)	((offset) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
--#define SPEX(_outvar, _offset, _mask, _shift)	\
-+#define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-+#define SPEX32(_outvar, _offset, _mask, _shift)	\
-+	out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \
-+			   in[SPOFF(_offset)]) & (_mask)) >> (_shift))
-+#define SPEX(_outvar, _offset, _mask, _shift) \
-+	SPEX16(_outvar, _offset, _mask, _shift)
-+
- 
- static inline u8 ssb_crc8(u8 crc, u8 data)
- {
-@@ -247,7 +253,7 @@ static int sprom_do_read(struct ssb_bus 
- 	int i;
- 
- 	for (i = 0; i < bus->sprom_size; i++)
--		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
- 
- 	return 0;
- }
-@@ -278,7 +284,7 @@ static int sprom_do_write(struct ssb_bus
- 			ssb_printk("75%%");
- 		else if (i % 2)
- 			ssb_printk(".");
--		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
- 		mmiowb();
- 		msleep(20);
- 	}
-@@ -474,12 +480,14 @@ static void sprom_extract_r8(struct ssb_
- 
- 	/* extract the MAC address */
- 	for (i = 0; i < 3; i++) {
--		v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
-+		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
- 		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
- 	}
- 	SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
- 	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
- 	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
-+	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
-+	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);
- 	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
- 	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
- 	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
-@@ -490,12 +498,55 @@ static void sprom_extract_r8(struct ssb_
- 	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
- 	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
- 	     SSB_SPROM8_ITSSI_A_SHIFT);
-+	SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
-+	SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
-+	     SSB_SPROM8_MAXP_AL_SHIFT);
- 	SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
- 	SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
- 	     SSB_SPROM8_GPIOA_P1_SHIFT);
- 	SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
- 	SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
- 	     SSB_SPROM8_GPIOB_P3_SHIFT);
-+	SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
-+	SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
-+	     SSB_SPROM8_TRI5G_SHIFT);
-+	SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
-+	SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
-+	     SSB_SPROM8_TRI5GH_SHIFT);
-+	SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);
-+	SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
-+	     SSB_SPROM8_RXPO5G_SHIFT);
-+	SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
-+	SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
-+	     SSB_SPROM8_RSSISMC2G_SHIFT);
-+	SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
-+	     SSB_SPROM8_RSSISAV2G_SHIFT);
-+	SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
-+	     SSB_SPROM8_BXA2G_SHIFT);
-+	SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
-+	SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
-+	     SSB_SPROM8_RSSISMC5G_SHIFT);
-+	SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
-+	     SSB_SPROM8_RSSISAV5G_SHIFT);
-+	SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
-+	     SSB_SPROM8_BXA5G_SHIFT);
-+	SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);
-+	SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);
-+	SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);
-+	SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);
-+	SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);
-+	SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);
-+	SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);
-+	SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);
-+	SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);
-+	SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);
-+	SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);
-+	SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);
-+	SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);
-+	SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
- 
- 	/* Extract the antenna gain values. */
- 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus 
- 			ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
- 				   "  revision %d detected. Will extract"
- 				   " v1\n", out->revision);
-+			out->revision = 1;
- 			sprom_extract_r123(out, in);
- 		}
- 	}
-@@ -568,6 +620,14 @@ static int ssb_pci_sprom_get(struct ssb_
- 	int err = -ENOMEM;
- 	u16 *buf;
- 
-+	if (!ssb_is_sprom_available(bus)) {
-+		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
-+		return -ENODEV;
-+	}
-+
-+	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
-+		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
-+
- 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
- 	if (!buf)
- 		goto out;
---- a/drivers/ssb/pcmcia.c
-+++ b/drivers/ssb/pcmcia.c
-@@ -583,7 +583,7 @@ static int ssb_pcmcia_sprom_write_all(st
- 			ssb_printk(".");
- 		err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
- 		if (err) {
--			ssb_printk("\n" KERN_NOTICE PFX
-+			ssb_printk(KERN_NOTICE PFX
- 				   "Failed to write to SPROM.\n");
- 			failed = 1;
- 			break;
-@@ -591,7 +591,7 @@ static int ssb_pcmcia_sprom_write_all(st
- 	}
- 	err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
- 	if (err) {
--		ssb_printk("\n" KERN_NOTICE PFX
-+		ssb_printk(KERN_NOTICE PFX
- 			   "Could not disable SPROM write access.\n");
- 		failed = 1;
- 	}
-@@ -617,134 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
- 	}						\
-   } while (0)
- 
--int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
--			      struct ssb_init_invariants *iv)
-+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
-+			tuple_t *tuple,
-+			void *priv)
- {
--	tuple_t tuple;
--	int res;
--	unsigned char buf[32];
-+	struct ssb_sprom *sprom = priv;
-+
-+	if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
-+		return -EINVAL;
-+	if (tuple->TupleDataLen != ETH_ALEN + 2)
-+		return -EINVAL;
-+	if (tuple->TupleData[1] != ETH_ALEN)
-+		return -EINVAL;
-+	memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN);
-+	return 0;
-+};
-+
-+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
-+					tuple_t *tuple,
-+					void *priv)
-+{
-+	struct ssb_init_invariants *iv = priv;
- 	struct ssb_sprom *sprom = &iv->sprom;
- 	struct ssb_boardinfo *bi = &iv->boardinfo;
- 	const char *error_description;
- 
-+	GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1");
-+	switch (tuple->TupleData[0]) {
-+	case SSB_PCMCIA_CIS_ID:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 5) &&
-+			      (tuple->TupleDataLen != 7),
-+			      "id tpl size");
-+		bi->vendor = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		break;
-+	case SSB_PCMCIA_CIS_BOARDREV:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"boardrev tpl size");
-+		sprom->board_rev = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_PA:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 9) &&
-+			(tuple->TupleDataLen != 10),
-+			"pa tpl size");
-+		sprom->pa0b0 = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		sprom->pa0b1 = tuple->TupleData[3] |
-+			((u16)tuple->TupleData[4] << 8);
-+		sprom->pa0b2 = tuple->TupleData[5] |
-+			((u16)tuple->TupleData[6] << 8);
-+		sprom->itssi_a = tuple->TupleData[7];
-+		sprom->itssi_bg = tuple->TupleData[7];
-+		sprom->maxpwr_a = tuple->TupleData[8];
-+		sprom->maxpwr_bg = tuple->TupleData[8];
-+		break;
-+	case SSB_PCMCIA_CIS_OEMNAME:
-+		/* We ignore this. */
-+		break;
-+	case SSB_PCMCIA_CIS_CCODE:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"ccode tpl size");
-+		sprom->country_code = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_ANTENNA:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"ant tpl size");
-+		sprom->ant_available_a = tuple->TupleData[1];
-+		sprom->ant_available_bg = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_ANTGAIN:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"antg tpl size");
-+		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_BFLAGS:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
-+			(tuple->TupleDataLen != 5),
-+			"bfl tpl size");
-+		sprom->boardflags_lo = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		break;
-+	case SSB_PCMCIA_CIS_LEDS:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 5,
-+			"leds tpl size");
-+		sprom->gpio0 = tuple->TupleData[1];
-+		sprom->gpio1 = tuple->TupleData[2];
-+		sprom->gpio2 = tuple->TupleData[3];
-+		sprom->gpio3 = tuple->TupleData[4];
-+		break;
-+	}
-+	return -ENOSPC; /* continue with next entry */
-+
-+error:
-+	ssb_printk(KERN_ERR PFX
-+		   "PCMCIA: Failed to fetch device invariants: %s\n",
-+		   error_description);
-+	return -ENODEV;
-+}
-+
-+
-+int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
-+			      struct ssb_init_invariants *iv)
-+{
-+	struct ssb_sprom *sprom = &iv->sprom;
-+	int res;
-+
- 	memset(sprom, 0xFF, sizeof(*sprom));
- 	sprom->revision = 1;
- 	sprom->boardflags_lo = 0;
- 	sprom->boardflags_hi = 0;
- 
- 	/* First fetch the MAC address. */
--	memset(&tuple, 0, sizeof(tuple));
--	tuple.DesiredTuple = CISTPL_FUNCE;
--	tuple.TupleData = buf;
--	tuple.TupleDataMax = sizeof(buf);
--	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "MAC first tpl");
--	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "MAC first tpl data");
--	while (1) {
--		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
--		if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
--			break;
--		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "MAC next tpl");
--		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "MAC next tpl data");
-+	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
-+				ssb_pcmcia_get_mac, sprom);
-+	if (res != 0) {
-+		ssb_printk(KERN_ERR PFX
-+			"PCMCIA: Failed to fetch MAC address\n");
-+		return -ENODEV;
- 	}
--	GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
--	memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
- 
- 	/* Fetch the vendor specific tuples. */
--	memset(&tuple, 0, sizeof(tuple));
--	tuple.DesiredTuple = SSB_PCMCIA_CIS;
--	tuple.TupleData = buf;
--	tuple.TupleDataMax = sizeof(buf);
--	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "VEN first tpl");
--	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "VEN first tpl data");
--	while (1) {
--		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
--		switch (tuple.TupleData[0]) {
--		case SSB_PCMCIA_CIS_ID:
--			GOTO_ERROR_ON((tuple.TupleDataLen != 5) &&
--				      (tuple.TupleDataLen != 7),
--				      "id tpl size");
--			bi->vendor = tuple.TupleData[1] |
--			       ((u16)tuple.TupleData[2] << 8);
--			break;
--		case SSB_PCMCIA_CIS_BOARDREV:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "boardrev tpl size");
--			sprom->board_rev = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_PA:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 9,
--				      "pa tpl size");
--			sprom->pa0b0 = tuple.TupleData[1] |
--				 ((u16)tuple.TupleData[2] << 8);
--			sprom->pa0b1 = tuple.TupleData[3] |
--				 ((u16)tuple.TupleData[4] << 8);
--			sprom->pa0b2 = tuple.TupleData[5] |
--				 ((u16)tuple.TupleData[6] << 8);
--			sprom->itssi_a = tuple.TupleData[7];
--			sprom->itssi_bg = tuple.TupleData[7];
--			sprom->maxpwr_a = tuple.TupleData[8];
--			sprom->maxpwr_bg = tuple.TupleData[8];
--			break;
--		case SSB_PCMCIA_CIS_OEMNAME:
--			/* We ignore this. */
--			break;
--		case SSB_PCMCIA_CIS_CCODE:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "ccode tpl size");
--			sprom->country_code = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_ANTENNA:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "ant tpl size");
--			sprom->ant_available_a = tuple.TupleData[1];
--			sprom->ant_available_bg = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_ANTGAIN:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "antg tpl size");
--			sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_BFLAGS:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 3,
--				      "bfl tpl size");
--			sprom->boardflags_lo = tuple.TupleData[1] |
--					 ((u16)tuple.TupleData[2] << 8);
--			break;
--		case SSB_PCMCIA_CIS_LEDS:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 5,
--				      "leds tpl size");
--			sprom->gpio0 = tuple.TupleData[1];
--			sprom->gpio1 = tuple.TupleData[2];
--			sprom->gpio2 = tuple.TupleData[3];
--			sprom->gpio3 = tuple.TupleData[4];
--			break;
--		}
--		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
--		if (res == -ENOSPC)
--			break;
--		GOTO_ERROR_ON(res != 0, "VEN next tpl");
--		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "VEN next tpl data");
--	}
-+	res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
-+				ssb_pcmcia_do_get_invariants, sprom);
-+	if ((res == 0) || (res == -ENOSPC))
-+		return 0;
- 
--	return 0;
--error:
- 	ssb_printk(KERN_ERR PFX
--		   "PCMCIA: Failed to fetch device invariants: %s\n",
--		   error_description);
-+			"PCMCIA: Failed to fetch device invariants\n");
- 	return -ENODEV;
- }
- 
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -27,24 +27,54 @@ struct ssb_sprom {
- 	u8 et1mdcport;		/* MDIO for enet1 */
- 	u8 board_rev;		/* Board revision number from SPROM. */
- 	u8 country_code;	/* Country Code */
--	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */
--	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */
-+	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
-+	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
- 	u16 pa0b0;
- 	u16 pa0b1;
- 	u16 pa0b2;
- 	u16 pa1b0;
- 	u16 pa1b1;
- 	u16 pa1b2;
-+	u16 pa1lob0;
-+	u16 pa1lob1;
-+	u16 pa1lob2;
-+	u16 pa1hib0;
-+	u16 pa1hib1;
-+	u16 pa1hib2;
- 	u8 gpio0;		/* GPIO pin 0 */
- 	u8 gpio1;		/* GPIO pin 1 */
- 	u8 gpio2;		/* GPIO pin 2 */
- 	u8 gpio3;		/* GPIO pin 3 */
--	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */
--	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
- 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
- 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
--	u16 boardflags_lo;	/* Boardflags (low 16 bits) */
--	u16 boardflags_hi;	/* Boardflags (high 16 bits) */
-+	u8 tri2g;		/* 2.4GHz TX isolation */
-+	u8 tri5gl;		/* 5.2GHz TX isolation */
-+	u8 tri5g;		/* 5.3GHz TX isolation */
-+	u8 tri5gh;		/* 5.8GHz TX isolation */
-+	u8 rxpo2g;		/* 2GHz RX power offset */
-+	u8 rxpo5g;		/* 5GHz RX power offset */
-+	u8 rssisav2g;		/* 2GHz RSSI params */
-+	u8 rssismc2g;
-+	u8 rssismf2g;
-+	u8 bxa2g;		/* 2GHz BX arch */
-+	u8 rssisav5g;		/* 5GHz RSSI params */
-+	u8 rssismc5g;
-+	u8 rssismf5g;
-+	u8 bxa5g;		/* 5GHz BX arch */
-+	u16 cck2gpo;		/* CCK power offset */
-+	u32 ofdm2gpo;		/* 2.4GHz OFDM power offset */
-+	u32 ofdm5glpo;		/* 5.2GHz OFDM power offset */
-+	u32 ofdm5gpo;		/* 5.3GHz OFDM power offset */
-+	u32 ofdm5ghpo;		/* 5.8GHz OFDM power offset */
-+	u16 boardflags_lo;	/* Board flags (bits 0-15) */
-+	u16 boardflags_hi;	/* Board flags (bits 16-31) */
-+	u16 boardflags2_lo;	/* Board flags (bits 32-47) */
-+	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
-+	/* TODO store board flags in a single u64 */
- 
- 	/* Antenna gain values for up to 4 antennas
- 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-@@ -58,7 +88,7 @@ struct ssb_sprom {
- 		} ghz5;		/* 5GHz band */
- 	} antenna_gain;
- 
--	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
-+	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
- };
- 
- /* Information about the PCB the circuitry is soldered on. */
-@@ -208,6 +238,7 @@ enum ssb_bustype {
- 	SSB_BUSTYPE_SSB,	/* This SSB bus is the system bus */
- 	SSB_BUSTYPE_PCI,	/* SSB is connected to PCI bus */
- 	SSB_BUSTYPE_PCMCIA,	/* SSB is connected to PCMCIA bus */
-+	SSB_BUSTYPE_SDIO,	/* SSB is connected to SDIO bus */
- };
- 
- /* board_vendor */
-@@ -238,20 +269,33 @@ struct ssb_bus {
- 
- 	const struct ssb_bus_ops *ops;
- 
--	/* The core in the basic address register window. (PCI bus only) */
-+	/* The core currently mapped into the MMIO window.
-+	 * Not valid on all host-buses. So don't use outside of SSB. */
- 	struct ssb_device *mapped_device;
--	/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
--	u8 mapped_pcmcia_seg;
-+	union {
-+		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-+		u8 mapped_pcmcia_seg;
-+		/* Current SSB base address window for SDIO. */
-+		u32 sdio_sbaddr;
-+	};
- 	/* Lock for core and segment switching.
- 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
- 	spinlock_t bar_lock;
- 
--	/* The bus this backplane is running on. */
-+	/* The host-bus this backplane is running on. */
- 	enum ssb_bustype bustype;
--	/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
--	struct pci_dev *host_pci;
--	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
--	struct pcmcia_device *host_pcmcia;
-+	/* Pointers to the host-bus. Check bustype before using any of these pointers. */
-+	union {
-+		/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
-+		struct pci_dev *host_pci;
-+		/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
-+		struct pcmcia_device *host_pcmcia;
-+		/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-+		struct sdio_func *host_sdio;
-+	};
-+
-+	/* See enum ssb_quirks */
-+	unsigned int quirks;
- 
- #ifdef CONFIG_SSB_SPROM
- 	/* Mutex to protect the SPROM writing. */
-@@ -261,6 +305,7 @@ struct ssb_bus {
- 	/* ID information about the Chip. */
- 	u16 chip_id;
- 	u16 chip_rev;
-+	u16 sprom_offset;
- 	u16 sprom_size;		/* number of words in sprom */
- 	u8 chip_package;
- 
-@@ -306,6 +351,11 @@ struct ssb_bus {
- #endif /* DEBUG */
- };
- 
-+enum ssb_quirks {
-+	/* SDIO connected card requires performing a read after writing a 32-bit value */
-+	SSB_QUIRK_SDIO_READ_AFTER_WRITE32	= (1 << 0),
-+};
-+
- /* The initialization-invariants. */
- struct ssb_init_invariants {
- 	/* Versioning information about the PCB. */
-@@ -336,9 +386,18 @@ extern int ssb_bus_pcmciabus_register(st
- 				      struct pcmcia_device *pcmcia_dev,
- 				      unsigned long baseaddr);
- #endif /* CONFIG_SSB_PCMCIAHOST */
-+#ifdef CONFIG_SSB_SDIOHOST
-+extern int ssb_bus_sdiobus_register(struct ssb_bus *bus,
-+				    struct sdio_func *sdio_func,
-+				    unsigned int quirks);
-+#endif /* CONFIG_SSB_SDIOHOST */
-+
- 
- extern void ssb_bus_unregister(struct ssb_bus *bus);
- 
-+/* Does the device have an SPROM? */
-+extern bool ssb_is_sprom_available(struct ssb_bus *bus);
-+
- /* Set a fallback SPROM.
-  * See kdoc at the function definition for complete documentation. */
- extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -53,6 +53,7 @@
- #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
- #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
- #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
-+#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
- #define SSB_CHIPCO_CORECTL		0x0008
- #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
- #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
-@@ -385,6 +386,7 @@
- 
- 
- /** Chip specific Chip-Status register contents. */
-+#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
- #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
- #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
- #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
-@@ -398,6 +400,18 @@
- #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
- #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
- 
-+/** Macros to determine SPROM presence based on Chip-Status register. */
-+#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
-+	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL)
-+#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
-+	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
-+#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
-+	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
-+	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL))
-+
- 
- 
- /** Clockcontrol masks and values **/
-@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
- struct ssb_chipcommon {
- 	struct ssb_device *dev;
- 	u32 capabilities;
-+	u32 status;
- 	/* Fast Powerup Delay constant */
- 	u16 fast_pwrup_delay;
- 	struct ssb_chipcommon_pmu pmu;
-@@ -629,5 +644,15 @@ extern int ssb_chipco_serial_init(struct
- /* PMU support */
- extern void ssb_pmu_init(struct ssb_chipcommon *cc);
- 
-+enum ssb_pmu_ldo_volt_id {
-+	LDO_PAREF = 0,
-+	LDO_VOLT1,
-+	LDO_VOLT2,
-+	LDO_VOLT3,
-+};
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage);
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
- 
- #endif /* LINUX_SSB_CHIPCO_H_ */
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -162,7 +162,7 @@
- 
- /* SPROM shadow area. If not otherwise noted, fields are
-  * two bytes wide. Note that the SPROM can _only_ be read
-- * in two-byte quantinies.
-+ * in two-byte quantities.
-  */
- #define SSB_SPROMSIZE_WORDS		64
- #define SSB_SPROMSIZE_BYTES		(SSB_SPROMSIZE_WORDS * sizeof(u16))
-@@ -170,26 +170,27 @@
- #define SSB_SPROMSIZE_WORDS_R4		220
- #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
- #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
--#define SSB_SPROM_BASE			0x1000
--#define SSB_SPROM_REVISION		0x107E
-+#define SSB_SPROM_BASE1			0x1000
-+#define SSB_SPROM_BASE31		0x0800
-+#define SSB_SPROM_REVISION		0x007E
- #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
- #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
- #define  SSB_SPROM_REVISION_CRC_SHIFT	8
- 
- /* SPROM Revision 1 */
--#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
--#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
--#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
--#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
--#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
--#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
-+#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
-+#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
-+#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
-+#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
-+#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
-+#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
- #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM1_BINF			0x105C	/* Board info */
-+#define SSB_SPROM1_BINF			0x005C	/* Board info */
- #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
- #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
- #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
-@@ -197,63 +198,63 @@
- #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
- #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
- #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
--#define SSB_SPROM1_PA0B0		0x105E
--#define SSB_SPROM1_PA0B1		0x1060
--#define SSB_SPROM1_PA0B2		0x1062
--#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
-+#define SSB_SPROM1_PA0B0		0x005E
-+#define SSB_SPROM1_PA0B1		0x0060
-+#define SSB_SPROM1_PA0B2		0x0062
-+#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
- #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
--#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
-+#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
- #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
--#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
-+#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
- #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
--#define SSB_SPROM1_PA1B0		0x106A
--#define SSB_SPROM1_PA1B1		0x106C
--#define SSB_SPROM1_PA1B2		0x106E
--#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
-+#define SSB_SPROM1_PA1B0		0x006A
-+#define SSB_SPROM1_PA1B1		0x006C
-+#define SSB_SPROM1_PA1B2		0x006E
-+#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
- #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
- #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_ITSSI_A_SHIFT	8
--#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
--#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
- #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
- #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_AGAIN_A_SHIFT	8
- 
- /* SPROM Revision 2 (inherits from rev 1) */
--#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
--#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
-+#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
-+#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
- #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
- #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
- #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
--#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
-+#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
- #define  SSB_SPROM2_OPO_VALUE		0x00FF
- #define  SSB_SPROM2_OPO_UNUSED		0xFF00
--#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
-+#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
- 
- /* SPROM Revision 3 (inherits most data from rev 2) */
--#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
- #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
- #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
- #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
- #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
--#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
-+#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
- #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
-@@ -264,104 +265,156 @@
- #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
- 
- /* SPROM Revision 4 */
--#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
-+#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
-+#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
-+#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
- #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
--#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
--#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
--#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
--#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
--#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
-+#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
-+#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
-+#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM4_AGAIN0_SHIFT	0
- #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM4_AGAIN1_SHIFT	8
--#define SSB_SPROM4_AGAIN23		0x1060
-+#define SSB_SPROM4_AGAIN23		0x0060
- #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM4_AGAIN2_SHIFT	0
- #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM4_AGAIN3_SHIFT	8
--#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
--#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
-+#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
- #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
- #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
--#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
-+#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
- #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
- #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM4_ITSSI_A_SHIFT	8
--#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
--#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
--#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
--#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
--#define SSB_SPROM4_PA0B2		0x1086
--#define SSB_SPROM4_PA1B0		0x108E
--#define SSB_SPROM4_PA1B1		0x1090
--#define SSB_SPROM4_PA1B2		0x1092
-+#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
-+#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
-+#define SSB_SPROM4_PA0B2		0x0086
-+#define SSB_SPROM4_PA1B0		0x008E
-+#define SSB_SPROM4_PA1B1		0x0090
-+#define SSB_SPROM4_PA1B2		0x0092
- 
- /* SPROM Revision 5 (inherits most data from rev 4) */
--#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
--#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
--#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
--#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
-+#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
-+#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
-+#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
- #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
--#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
-+#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
- #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BFLLO		0x1084	/* Boardflags (low 16 bits) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Boardflags Hi */
--#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
--#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
--#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
--#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
--#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
--#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
-+#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
-+#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
-+#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
-+#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
-+#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
-+#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM8_AGAIN0_SHIFT	0
- #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM8_AGAIN1_SHIFT	8
--#define SSB_SPROM8_AGAIN23		0x10A0
-+#define SSB_SPROM8_AGAIN23		0x00A0
- #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM8_AGAIN2_SHIFT	0
- #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM8_AGAIN3_SHIFT	8
--#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
--#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power BG in path 1 */
--#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
-+#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
-+#define  SSB_SPROM8_RSSISMF2G		0x000F
-+#define  SSB_SPROM8_RSSISMC2G		0x00F0
-+#define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV2G		0x0700
-+#define  SSB_SPROM8_RSSISAV2G_SHIFT	8
-+#define  SSB_SPROM8_BXA2G		0x1800
-+#define  SSB_SPROM8_BXA2G_SHIFT		11
-+#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
-+#define  SSB_SPROM8_RSSISMF5G		0x000F
-+#define  SSB_SPROM8_RSSISMC5G		0x00F0
-+#define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV5G		0x0700
-+#define  SSB_SPROM8_RSSISAV5G_SHIFT	8
-+#define  SSB_SPROM8_BXA5G		0x1800
-+#define  SSB_SPROM8_BXA5G_SHIFT		11
-+#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
-+#define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
-+#define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
-+#define  SSB_SPROM8_TRI5G_SHIFT		8
-+#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
-+#define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
-+#define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
-+#define  SSB_SPROM8_TRI5GH_SHIFT	8
-+#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
-+#define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G_SHIFT	8
-+#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
-+#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power A in path 1 */
--#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
-+#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x00C4
-+#define SSB_SPROM8_PA0B2		0x00C6
-+#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
-+#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
-+#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
-+#define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
-+#define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
-+#define  SSB_SPROM8_MAXP_AL_SHIFT	8
-+#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x00CE
-+#define SSB_SPROM8_PA1B2		0x00D0
-+#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x00D4
-+#define SSB_SPROM8_PA1LOB2		0x00D6
-+#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x00DA
-+#define SSB_SPROM8_PA1HIB2		0x00DC
-+#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
---- a/drivers/ssb/scan.c
-+++ b/drivers/ssb/scan.c
-@@ -162,6 +162,8 @@ static u8 chipid_to_nrcores(u16 chipid)
- static u32 scan_read32(struct ssb_bus *bus, u8 current_coreidx,
- 		       u16 offset)
- {
-+	u32 lo, hi;
-+
- 	switch (bus->bustype) {
- 	case SSB_BUSTYPE_SSB:
- 		offset += current_coreidx * SSB_CORE_SIZE;
-@@ -174,6 +176,10 @@ static u32 scan_read32(struct ssb_bus *b
- 			offset -= 0x800;
- 		} else
- 			ssb_pcmcia_switch_segment(bus, 0);
-+		lo = readw(bus->mmio + offset);
-+		hi = readw(bus->mmio + offset + 2);
-+		return lo | (hi << 16);
-+	default:
- 		break;
- 	}
- 	return readl(bus->mmio + offset);
-@@ -188,6 +194,8 @@ static int scan_switchcore(struct ssb_bu
- 		return ssb_pci_switch_coreidx(bus, coreidx);
- 	case SSB_BUSTYPE_PCMCIA:
- 		return ssb_pcmcia_switch_coreidx(bus, coreidx);
-+	default:
-+		break;
- 	}
- 	return 0;
- }
-@@ -206,6 +214,8 @@ void ssb_iounmap(struct ssb_bus *bus)
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	default:
-+		break;
- 	}
- 	bus->mmio = NULL;
- 	bus->mapped_device = NULL;
-@@ -230,6 +240,8 @@ static void __iomem *ssb_ioremap(struct 
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	default:
-+		break;
- 	}
- 
- 	return mmio;
-@@ -339,7 +351,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
- 		dev->bus = bus;
- 		dev->ops = bus->ops;
- 
--		ssb_dprintk(KERN_INFO PFX
-+		printk(KERN_DEBUG PFX
- 			    "Core %d found: %s "
- 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
- 			    i, ssb_core_name(dev->id.coreid),
---- a/drivers/ssb/driver_chipcommon.c
-+++ b/drivers/ssb/driver_chipcommon.c
-@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
- {
- 	if (!cc->dev)
- 		return; /* We don't have a ChipCommon */
-+	if (cc->dev->id.revision >= 11)
-+		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
- 	ssb_pmu_init(cc);
- 	chipco_powercontrol_init(cc);
- 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
-@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
- {
- 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
- }
-+EXPORT_SYMBOL(ssb_chipco_gpio_control);
- 
- u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
- {
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -49,29 +49,54 @@ static const u32 ipsflag_irq_shift[] = {
- 
- static inline u32 ssb_irqflag(struct ssb_device *dev)
- {
--	return ssb_read32(dev, SSB_TPSFLAG) & SSB_TPSFLAG_BPFLAG;
-+	u32 tpsflag = ssb_read32(dev, SSB_TPSFLAG);
-+	if (tpsflag)
-+		return ssb_read32(dev, SSB_TPSFLAG) & SSB_TPSFLAG_BPFLAG;
-+	else
-+		/* not irq supported */
-+		return 0x3f;
-+}
-+
-+static struct ssb_device *find_device(struct ssb_device *rdev, int irqflag)
-+{
-+	struct ssb_bus *bus = rdev->bus;
-+	int i;
-+	for (i = 0; i < bus->nr_devices; i++) {
-+		struct ssb_device *dev;
-+		dev = &(bus->devices[i]);
-+		if (ssb_irqflag(dev) == irqflag)
-+			return dev;
-+	}
-+	return NULL;
- }
- 
- /* Get the MIPS IRQ assignment for a specified device.
-  * If unassigned, 0 is returned.
-+ * If disabled, 5 is returned.
-+ * If not supported, 6 is returned.
-  */
- unsigned int ssb_mips_irq(struct ssb_device *dev)
- {
- 	struct ssb_bus *bus = dev->bus;
-+	struct ssb_device *mdev = bus->mipscore.dev;
- 	u32 irqflag;
- 	u32 ipsflag;
- 	u32 tmp;
- 	unsigned int irq;
- 
- 	irqflag = ssb_irqflag(dev);
-+	if (irqflag == 0x3f)
-+		return 6;
- 	ipsflag = ssb_read32(bus->mipscore.dev, SSB_IPSFLAG);
- 	for (irq = 1; irq <= 4; irq++) {
- 		tmp = ((ipsflag & ipsflag_irq_mask[irq]) >> ipsflag_irq_shift[irq]);
- 		if (tmp == irqflag)
- 			break;
- 	}
--	if (irq	== 5)
--		irq = 0;
-+	if (irq	== 5) {
-+		if ((1 << irqflag) & ssb_read32(mdev, SSB_INTVEC))
-+			irq = 0;
-+	}
- 
- 	return irq;
- }
-@@ -97,25 +122,56 @@ static void set_irq(struct ssb_device *d
- 	struct ssb_device *mdev = bus->mipscore.dev;
- 	u32 irqflag = ssb_irqflag(dev);
- 
-+	BUG_ON(oldirq == 6);
-+
- 	dev->irq = irq + 2;
- 
--	ssb_dprintk(KERN_INFO PFX
--		    "set_irq: core 0x%04x, irq %d => %d\n",
--		    dev->id.coreid, oldirq, irq);
- 	/* clear the old irq */
- 	if (oldirq == 0)
- 		ssb_write32(mdev, SSB_INTVEC, (~(1 << irqflag) & ssb_read32(mdev, SSB_INTVEC)));
--	else
-+	else if (oldirq != 5)
- 		clear_irq(bus, oldirq);
- 
- 	/* assign the new one */
- 	if (irq == 0) {
- 		ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) | ssb_read32(mdev, SSB_INTVEC)));
- 	} else {
-+		u32 ipsflag = ssb_read32(mdev, SSB_IPSFLAG);
-+		if ((ipsflag & ipsflag_irq_mask[irq]) != ipsflag_irq_mask[irq]) {
-+			u32 oldipsflag = (ipsflag & ipsflag_irq_mask[irq]) >> ipsflag_irq_shift[irq];
-+			struct ssb_device *olddev = find_device(dev, oldipsflag);
-+			if (olddev)
-+				set_irq(olddev, 0);
-+		}
- 		irqflag <<= ipsflag_irq_shift[irq];
--		irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]);
-+		irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
- 		ssb_write32(mdev, SSB_IPSFLAG, irqflag);
- 	}
-+	ssb_dprintk(KERN_INFO PFX
-+		    "set_irq: core 0x%04x, irq %d => %d\n",
-+		    dev->id.coreid, oldirq+2, irq+2);
-+}
-+
-+static void print_irq(struct ssb_device *dev, unsigned int irq)
-+{
-+	int i;
-+	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
-+	ssb_dprintk(KERN_INFO PFX
-+		"core 0x%04x, irq :", dev->id.coreid);
-+	for (i = 0; i <= 6; i++) {
-+		ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
-+	}
-+	ssb_dprintk("\n");
-+}
-+
-+static void dump_irq(struct ssb_bus *bus)
-+{
-+	int i;
-+	for (i = 0; i < bus->nr_devices; i++) {
-+		struct ssb_device *dev;
-+		dev = &(bus->devices[i]);
-+		print_irq(dev, ssb_mips_irq(dev));
-+	}
- }
- 
- static void ssb_mips_serial_init(struct ssb_mipscore *mcore)
-@@ -197,17 +253,23 @@ void ssb_mipscore_init(struct ssb_mipsco
- 
- 	/* Assign IRQs to all cores on the bus, start with irq line 2, because serial usually takes 1 */
- 	for (irq = 2, i = 0; i < bus->nr_devices; i++) {
-+		int mips_irq;
- 		dev = &(bus->devices[i]);
--		dev->irq = ssb_mips_irq(dev) + 2;
-+		mips_irq = ssb_mips_irq(dev);
-+		if (mips_irq > 4)
-+			dev->irq = 0;
-+		else
-+			dev->irq = mips_irq + 2;
-+		if (dev->irq > 5)
-+			continue;
- 		switch (dev->id.coreid) {
- 		case SSB_DEV_USB11_HOST:
- 			/* shouldn't need a separate irq line for non-4710, most of them have a proper
- 			 * external usb controller on the pci */
- 			if ((bus->chip_id == 0x4710) && (irq <= 4)) {
- 				set_irq(dev, irq++);
--				break;
- 			}
--			/* fallthrough */
-+			break;
- 		case SSB_DEV_PCI:
- 		case SSB_DEV_ETHERNET:
- 		case SSB_DEV_ETHERNET_GBIT:
-@@ -218,8 +280,14 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 				break;
- 			}
-+			/* fallthrough */
-+		case SSB_DEV_EXTIF:
-+			set_irq(dev, 0);
-+			break;
- 		}
- 	}
-+	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
-+	dump_irq(bus);
- 
- 	ssb_mips_serial_init(mcore);
- 	ssb_mips_flash_detect(mcore);
---- a/drivers/ssb/sprom.c
-+++ b/drivers/ssb/sprom.c
-@@ -13,6 +13,9 @@
- 
- #include "ssb_private.h"
- 
-+#include <linux/ctype.h>
-+#include <linux/slab.h>
-+
- 
- static const struct ssb_sprom *fallback_sprom;
- 
-@@ -33,17 +36,27 @@ static int sprom2hex(const u16 *sprom, c
- static int hex2sprom(u16 *sprom, const char *dump, size_t len,
- 		     size_t sprom_size_words)
- {
--	char tmp[5] = { 0 };
--	int cnt = 0;
-+	char c, tmp[5] = { 0 };
-+	int err, cnt = 0;
- 	unsigned long parsed;
- 
--	if (len < sprom_size_words * 2)
-+	/* Strip whitespace at the end. */
-+	while (len) {
-+		c = dump[len - 1];
-+		if (!isspace(c) && c != '\0')
-+			break;
-+		len--;
-+	}
-+	/* Length must match exactly. */
-+	if (len != sprom_size_words * 4)
- 		return -EINVAL;
- 
- 	while (cnt < sprom_size_words) {
- 		memcpy(tmp, dump, 4);
- 		dump += 4;
--		parsed = simple_strtoul(tmp, NULL, 16);
-+		err = strict_strtoul(tmp, 16, &parsed);
-+		if (err)
-+			return err;
- 		sprom[cnt++] = swab16((u16)parsed);
- 	}
- 
-@@ -90,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
- 	u16 *sprom;
- 	int res = 0, err = -ENOMEM;
- 	size_t sprom_size_words = bus->sprom_size;
-+	struct ssb_freeze_context freeze;
- 
- 	sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
- 	if (!sprom)
-@@ -111,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
- 	err = -ERESTARTSYS;
- 	if (mutex_lock_interruptible(&bus->sprom_mutex))
- 		goto out_kfree;
--	err = ssb_devices_freeze(bus);
--	if (err == -EOPNOTSUPP) {
--		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
--			   "No suspend support. Is CONFIG_PM enabled?\n");
--		goto out_unlock;
--	}
-+	err = ssb_devices_freeze(bus, &freeze);
- 	if (err) {
- 		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
- 		goto out_unlock;
- 	}
- 	res = sprom_write(bus, sprom);
--	err = ssb_devices_thaw(bus);
-+	err = ssb_devices_thaw(&freeze);
- 	if (err)
- 		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
- out_unlock:
-@@ -167,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback
- {
- 	return fallback_sprom;
- }
-+
-+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
-+bool ssb_is_sprom_available(struct ssb_bus *bus)
-+{
-+	/* status register only exists on chipcomon rev >= 11 and we need check
-+	   for >= 31 only */
-+	/* this routine differs from specs as we do not access SPROM directly
-+	   on PCMCIA */
-+	if (bus->bustype == SSB_BUSTYPE_PCI &&
-+	    bus->chipco.dev->id.revision >= 31)
-+		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
-+
-+	return true;
-+}
---- a/drivers/ssb/ssb_private.h
-+++ b/drivers/ssb/ssb_private.h
-@@ -136,19 +136,27 @@ extern const struct ssb_sprom *ssb_get_f
- 
- /* core.c */
- extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
--extern int ssb_devices_freeze(struct ssb_bus *bus);
--extern int ssb_devices_thaw(struct ssb_bus *bus);
- extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
- int ssb_for_each_bus_call(unsigned long data,
- 			  int (*func)(struct ssb_bus *bus, unsigned long data));
- extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
- 
-+struct ssb_freeze_context {
-+	/* Pointer to the bus */
-+	struct ssb_bus *bus;
-+	/* Boolean list to indicate whether a device is frozen on this bus. */
-+	bool device_frozen[SSB_MAX_NR_CORES];
-+};
-+extern int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx);
-+extern int ssb_devices_thaw(struct ssb_freeze_context *ctx);
-+
-+
- 
- /* b43_pci_bridge.c */
- #ifdef CONFIG_SSB_B43_PCI_BRIDGE
- extern int __init b43_pci_ssb_bridge_init(void);
- extern void __exit b43_pci_ssb_bridge_exit(void);
--#else /* CONFIG_SSB_B43_PCI_BRIDGR */
-+#else /* CONFIG_SSB_B43_PCI_BRIDGE */
- static inline int b43_pci_ssb_bridge_init(void)
- {
- 	return 0;
-@@ -156,6 +164,6 @@ static inline int b43_pci_ssb_bridge_ini
- static inline void b43_pci_ssb_bridge_exit(void)
- {
- }
--#endif /* CONFIG_SSB_PCIHOST */
-+#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
- 
- #endif /* LINUX_SSB_PRIVATE_H_ */
diff --git a/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch
deleted file mode 100644
index 6b57e876cf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/942-ssb_add_dma_dev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -465,6 +465,7 @@ static int ssb_devices_register(struct s
- #ifdef CONFIG_SSB_PCIHOST
- 			sdev->irq = bus->host_pci->irq;
- 			dev->parent = &bus->host_pci->dev;
-+			sdev->dma_dev = dev->parent;
- #endif
- 			break;
- 		case SSB_BUSTYPE_PCMCIA:
-@@ -475,6 +476,7 @@ static int ssb_devices_register(struct s
- 			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
-+			sdev->dma_dev = dev;
- 			break;
- 		default:
- 			break;
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -167,7 +167,7 @@ struct ssb_device {
- 	 * is an optimization. */
- 	const struct ssb_bus_ops *ops;
- 
--	struct device *dev;
-+	struct device *dev, *dma_dev;
- 
- 	struct ssb_bus *bus;
- 	struct ssb_device_id id;
diff --git a/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index 26265ab323..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -59,7 +59,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -11,7 +11,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.30/960-arm_lzma_loader.patch b/target/linux/generic-2.6/patches-2.6.30/960-arm_lzma_loader.patch
deleted file mode 100644
index f159898ba8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/960-arm_lzma_loader.patch
+++ /dev/null
@@ -1,710 +0,0 @@
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -63,7 +63,7 @@ endif
- 
- SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
- 
--targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
-+targets       := vmlinux vmlinux.lds piggy.lzma piggy.o font.o font.c \
- 		 head.o misc.o $(OBJS)
- 
- ifeq ($(CONFIG_FUNCTION_TRACER),y)
-@@ -96,10 +96,10 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj
- 	$(call if_changed,ld)
- 	@:
- 
--$(obj)/piggy.gz: $(obj)/../Image FORCE
--	$(call if_changed,gzip)
-+$(obj)/piggy.lzma: $(obj)/../Image FORCE
-+	$(call if_changed,lzma)
- 
--$(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-+$(obj)/piggy.o:  $(obj)/piggy.lzma FORCE
- 
- CFLAGS_font.o := -Dstatic=
- 
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -186,36 +186,10 @@ static inline __ptr_t memcpy(__ptr_t __d
- 	return __dest;
- }
- 
--/*
-- * gzip delarations
-- */
--#define OF(args)  args
--#define STATIC static
--
--typedef unsigned char  uch;
--typedef unsigned short ush;
--typedef unsigned long  ulg;
--
--#define WSIZE 0x8000		/* Window size must be at least 32k, */
-+#define WSIZE 0x20000		/* Window size must be at least 128k, */
- 				/* and a power of two */
- 
--static uch *inbuf;		/* input buffer */
--static uch window[WSIZE];	/* Sliding window buffer */
--
--static unsigned insize;		/* valid bytes in inbuf */
--static unsigned inptr;		/* index of next byte to be processed in inbuf */
--static unsigned outcnt;		/* bytes in output buffer */
--
--/* gzip flag byte */
--#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
--#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
--#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
--#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
--#define COMMENT      0x10 /* bit 4 set: file comment present */
--#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
--#define RESERVED     0xC0 /* bit 6,7:   reserved */
--
--#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
-+static u8 window[WSIZE];	/* Sliding window buffer */
- 
- /* Diagnostic functions */
- #ifdef DEBUG
-@@ -234,24 +208,21 @@ static unsigned outcnt;		/* bytes in out
- #  define Tracecv(c,x)
- #endif
- 
--static int  fill_inbuf(void);
--static void flush_window(void);
- static void error(char *m);
- 
- extern char input_data[];
- extern char input_data_end[];
- 
--static uch *output_data;
--static ulg output_ptr;
--static ulg bytes_out;
-+static unsigned long output_ptr;
-+static unsigned long bytes_out;
- 
- static void error(char *m);
- 
- static void putstr(const char *);
- 
- extern int end;
--static ulg free_mem_ptr;
--static ulg free_mem_end_ptr;
-+static unsigned long free_mem_ptr;
-+static unsigned long free_mem_end_ptr;
- 
- #ifdef STANDALONE_DEBUG
- #define NO_INFLATE_MALLOC
-@@ -259,50 +230,10 @@ static ulg free_mem_end_ptr;
- 
- #define ARCH_HAS_DECOMP_WDOG
- 
--#include "../../../../lib/inflate.c"
--
--/* ===========================================================================
-- * Fill the input buffer. This is called only when the buffer is empty
-- * and at least one byte is really needed.
-- */
--int fill_inbuf(void)
--{
--	if (insize != 0)
--		error("ran out of input data");
--
--	inbuf = input_data;
--	insize = &input_data_end[0] - &input_data[0];
--
--	inptr = 1;
--	return inbuf[0];
--}
--
--/* ===========================================================================
-- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
-- * (Used for the decompressed data only.)
-- */
--void flush_window(void)
--{
--	ulg c = crc;
--	unsigned n;
--	uch *in, *out, ch;
--
--	in = window;
--	out = &output_data[output_ptr];
--	for (n = 0; n < outcnt; n++) {
--		ch = *out++ = *in++;
--		c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
--	}
--	crc = c;
--	bytes_out += (ulg)outcnt;
--	output_ptr += (ulg)outcnt;
--	outcnt = 0;
--	putstr(".");
--}
--
- #ifndef arch_error
- #define arch_error(x)
- #endif
-+#include "unlzma.c"
- 
- static void error(char *x)
- {
-@@ -317,20 +248,16 @@ static void error(char *x)
- 
- #ifndef STANDALONE_DEBUG
- 
--ulg
--decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
-+unsigned long
-+decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, unsigned long free_mem_ptr_end_p,
- 		  int arch_id)
- {
--	output_data		= (uch *)output_start;	/* Points to kernel start */
--	free_mem_ptr		= free_mem_ptr_p;
--	free_mem_end_ptr	= free_mem_ptr_end_p;
- 	__machine_arch_type	= arch_id;
- 
- 	arch_decomp_setup();
- 
--	makecrc();
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	output_ptr += unlzma((u8 *) output_start, input_data, window);
- 	putstr(" done, booting the kernel.\n");
- 	return output_ptr;
- }
-@@ -340,11 +267,8 @@ char output_buffer[1500*1024];
- 
- int main()
- {
--	output_data = output_buffer;
--
--	makecrc();
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	unlzma((u8 *) output_buffer, input_data, window);
- 	putstr("done.\n");
- 	return 0;
- }
---- a/arch/arm/boot/compressed/piggy.S
-+++ b/arch/arm/boot/compressed/piggy.S
-@@ -1,6 +1,6 @@
- 	.section .piggydata,#alloc
- 	.globl	input_data
- input_data:
--	.incbin	"arch/arm/boot/compressed/piggy.gz"
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
- 	.globl	input_data_end
- input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/unlzma.c
-@@ -0,0 +1,429 @@
-+/*
-+ * Copyright (c) 2009  Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * uncompress.c
-+ */
-+
-+#include <linux/types.h>
-+#include <asm/byteorder.h>
-+#include "unlzma.h"
-+
-+struct unlzma_ctx {
-+	const u8 *next_in;
-+	u8 *next_out;
-+	u8 *outbuf;
-+
-+	/* reader state */
-+	u32 code;
-+	u32 range;
-+	u32 bound;
-+
-+	/* writer state */
-+	u8 previous_byte;
-+	ssize_t pos;
-+
-+	/* cstate */
-+	int state;
-+	u32 rep0, rep1, rep2, rep3;
-+
-+	void *workspace;
-+} ctx;
-+
-+static int inbs = 0;
-+static inline u8
-+rc_read(void)
-+{
-+#if 0
-+	if (unlikely(++inbs > 16 * 1024)) {
-+		putstr(".");
-+		inbs = 0;
-+	}
-+#endif
-+	return *(ctx.next_in++);
-+}
-+
-+
-+static inline void
-+rc_get_code(void)
-+{
-+	ctx.code = (ctx.code << 8) | rc_read();
-+}
-+
-+static inline void
-+rc_normalize(void)
-+{
-+	if (ctx.range < (1 << RC_TOP_BITS)) {
-+		ctx.range <<= 8;
-+		rc_get_code();
-+	}
-+}
-+
-+static inline int
-+rc_is_bit_0(u16 *p)
-+{
-+	rc_normalize();
-+	ctx.bound = *p * (ctx.range >> RC_MODEL_TOTAL_BITS);
-+	return ctx.code < ctx.bound;
-+}
-+
-+static inline void
-+rc_update_bit_0(u16 *p)
-+{
-+	ctx.range = ctx.bound;
-+	*p += ((1 << RC_MODEL_TOTAL_BITS) - *p) >> RC_MOVE_BITS;
-+}
-+
-+static inline void
-+rc_update_bit_1(u16 *p)
-+{
-+	ctx.range -= ctx.bound;
-+	ctx.code -= ctx.bound;
-+	*p -= *p >> RC_MOVE_BITS;
-+}
-+
-+static inline bool
-+rc_get_bit(u16 *p, int *symbol)
-+{
-+	if (rc_is_bit_0(p)) {
-+		rc_update_bit_0(p);
-+		*symbol *= 2;
-+		return 0;
-+	} else {
-+		rc_update_bit_1(p);
-+		*symbol = *symbol * 2 + 1;
-+		return 1;
-+	}
-+}
-+
-+static inline int
-+rc_direct_bit(void)
-+{
-+	rc_normalize();
-+	ctx.range >>= 1;
-+	if (ctx.code >= ctx.range) {
-+		ctx.code -= ctx.range;
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+static inline void
-+rc_bit_tree_decode(u16 *p, int num_levels, int *symbol)
-+{
-+	int i = num_levels;
-+
-+	*symbol = 1;
-+	while (i--)
-+		rc_get_bit(p + *symbol, symbol);
-+	*symbol -= 1 << num_levels;
-+}
-+
-+static inline u8
-+peek_old_byte(u32 offs)
-+{
-+	u32 pos = ctx.pos - offs;
-+	return ctx.outbuf[pos];
-+}
-+
-+static inline void
-+write_byte(u8 byte)
-+{
-+	ctx.previous_byte = byte;
-+	*(ctx.next_out++) = byte;
-+	ctx.pos++;
-+}
-+
-+
-+static inline void
-+copy_byte(u32 offs)
-+{
-+	write_byte(peek_old_byte(offs));
-+}
-+
-+static inline void
-+copy_bytes(u32 rep0, int len)
-+{
-+	do {
-+		copy_byte(rep0);
-+		len--;
-+	} while (len != 0);
-+}
-+
-+static inline void
-+process_bit0(u16 *p, int pos_state, u16 *prob,
-+             int lc, u32 literal_pos_mask)
-+{
-+	int mi = 1;
-+	rc_update_bit_0(prob);
-+	prob = (p + LZMA_LITERAL +
-+		(LZMA_LIT_SIZE
-+		 * (((ctx.pos & literal_pos_mask) << lc)
-+		    + (ctx.previous_byte >> (8 - lc))))
-+		);
-+
-+	if (ctx.state >= LZMA_NUM_LIT_STATES) {
-+		int match_byte = peek_old_byte(ctx.rep0);
-+		do {
-+			u16 bit;
-+			u16 *prob_lit;
-+
-+			match_byte <<= 1;
-+			bit = match_byte & 0x100;
-+			prob_lit = prob + 0x100 + bit + mi;
-+			if (rc_get_bit(prob_lit, &mi) != !!bit)
-+				break;
-+		} while (mi < 0x100);
-+	}
-+	while (mi < 0x100) {
-+		u16 *prob_lit = prob + mi;
-+		rc_get_bit(prob_lit, &mi);
-+	}
-+	write_byte(mi);
-+	if (ctx.state < 4)
-+		ctx.state = 0;
-+	else if (ctx.state < 10)
-+		ctx.state -= 3;
-+	else
-+		ctx.state -= 6;
-+}
-+
-+static inline void
-+process_bit1(u16 *p, int pos_state, u16 *prob)
-+{
-+	int offset;
-+	u16 *prob_len;
-+	int num_bits;
-+	int len;
-+
-+	rc_update_bit_1(prob);
-+	prob = p + LZMA_IS_REP + ctx.state;
-+	if (rc_is_bit_0(prob)) {
-+		rc_update_bit_0(prob);
-+		ctx.rep3 = ctx.rep2;
-+		ctx.rep2 = ctx.rep1;
-+		ctx.rep1 = ctx.rep0;
-+		ctx.state = ctx.state < LZMA_NUM_LIT_STATES ? 0 : 3;
-+		prob = p + LZMA_LEN_CODER;
-+	} else {
-+		rc_update_bit_1(prob);
-+		prob = p + LZMA_IS_REP_G0 + ctx.state;
-+		if (rc_is_bit_0(prob)) {
-+			rc_update_bit_0(prob);
-+			prob = (p + LZMA_IS_REP_0_LONG
-+				+ (ctx.state <<
-+				   LZMA_NUM_POS_BITS_MAX) +
-+				pos_state);
-+			if (rc_is_bit_0(prob)) {
-+				rc_update_bit_0(prob);
-+
-+				ctx.state = ctx.state < LZMA_NUM_LIT_STATES ?
-+					9 : 11;
-+				copy_byte(ctx.rep0);
-+				return;
-+			} else {
-+				rc_update_bit_1(prob);
-+			}
-+		} else {
-+			u32 distance;
-+
-+			rc_update_bit_1(prob);
-+			prob = p + LZMA_IS_REP_G1 + ctx.state;
-+			if (rc_is_bit_0(prob)) {
-+				rc_update_bit_0(prob);
-+				distance = ctx.rep1;
-+			} else {
-+				rc_update_bit_1(prob);
-+				prob = p + LZMA_IS_REP_G2 + ctx.state;
-+				if (rc_is_bit_0(prob)) {
-+					rc_update_bit_0(prob);
-+					distance = ctx.rep2;
-+				} else {
-+					rc_update_bit_1(prob);
-+					distance = ctx.rep3;
-+					ctx.rep3 = ctx.rep2;
-+				}
-+				ctx.rep2 = ctx.rep1;
-+			}
-+			ctx.rep1 = ctx.rep0;
-+			ctx.rep0 = distance;
-+		}
-+		ctx.state = ctx.state < LZMA_NUM_LIT_STATES ? 8 : 11;
-+		prob = p + LZMA_REP_LEN_CODER;
-+	}
-+
-+	prob_len = prob + LZMA_LEN_CHOICE;
-+	if (rc_is_bit_0(prob_len)) {
-+		rc_update_bit_0(prob_len);
-+		prob_len = (prob + LZMA_LEN_LOW
-+			    + (pos_state <<
-+			       LZMA_LEN_NUM_LOW_BITS));
-+		offset = 0;
-+		num_bits = LZMA_LEN_NUM_LOW_BITS;
-+	} else {
-+		rc_update_bit_1(prob_len);
-+		prob_len = prob + LZMA_LEN_CHOICE_2;
-+		if (rc_is_bit_0(prob_len)) {
-+			rc_update_bit_0(prob_len);
-+			prob_len = (prob + LZMA_LEN_MID
-+				    + (pos_state <<
-+				       LZMA_LEN_NUM_MID_BITS));
-+			offset = 1 << LZMA_LEN_NUM_LOW_BITS;
-+			num_bits = LZMA_LEN_NUM_MID_BITS;
-+		} else {
-+			rc_update_bit_1(prob_len);
-+			prob_len = prob + LZMA_LEN_HIGH;
-+			offset = ((1 << LZMA_LEN_NUM_LOW_BITS)
-+				  + (1 << LZMA_LEN_NUM_MID_BITS));
-+			num_bits = LZMA_LEN_NUM_HIGH_BITS;
-+		}
-+	}
-+
-+	rc_bit_tree_decode(prob_len, num_bits, &len);
-+	len += offset;
-+
-+	if (ctx.state < 4) {
-+		int pos_slot;
-+
-+		ctx.state += LZMA_NUM_LIT_STATES;
-+		prob =
-+			p + LZMA_POS_SLOT +
-+			((len <
-+			  LZMA_NUM_LEN_TO_POS_STATES ? len :
-+			  LZMA_NUM_LEN_TO_POS_STATES - 1)
-+			 << LZMA_NUM_POS_SLOT_BITS);
-+		rc_bit_tree_decode(prob,
-+				   LZMA_NUM_POS_SLOT_BITS,
-+				   &pos_slot);
-+		if (pos_slot >= LZMA_START_POS_MODEL_INDEX) {
-+			int i, mi;
-+			num_bits = (pos_slot >> 1) - 1;
-+			ctx.rep0 = 2 | (pos_slot & 1);
-+			if (pos_slot < LZMA_END_POS_MODEL_INDEX) {
-+				ctx.rep0 <<= num_bits;
-+				prob = p + LZMA_SPEC_POS +
-+					ctx.rep0 - pos_slot - 1;
-+			} else {
-+				num_bits -= LZMA_NUM_ALIGN_BITS;
-+				while (num_bits--)
-+					ctx.rep0 = (ctx.rep0 << 1) |
-+						rc_direct_bit();
-+				prob = p + LZMA_ALIGN;
-+				ctx.rep0 <<= LZMA_NUM_ALIGN_BITS;
-+				num_bits = LZMA_NUM_ALIGN_BITS;
-+			}
-+			i = 1;
-+			mi = 1;
-+			while (num_bits--) {
-+				if (rc_get_bit(prob + mi, &mi))
-+					ctx.rep0 |= i;
-+				i <<= 1;
-+			}
-+		} else
-+			ctx.rep0 = pos_slot;
-+		if (++(ctx.rep0) == 0)
-+			return;
-+	}
-+
-+	len += LZMA_MATCH_MIN_LEN;
-+
-+	copy_bytes(ctx.rep0, len);
-+}
-+
-+
-+static int
-+do_unlzma(void)
-+{
-+	u8 hdr_buf[sizeof(struct lzma_header)];
-+	struct lzma_header *header = (struct lzma_header *)hdr_buf;
-+	u32 pos_state_mask;
-+	u32 literal_pos_mask;
-+	int lc, pb, lp;
-+	int num_probs;
-+	int i, mi;
-+	u16 *p;
-+
-+	for (i = 0; i < sizeof(struct lzma_header); i++) {
-+		hdr_buf[i] = rc_read();
-+	}
-+
-+	ctx.pos = 0;
-+	ctx.state = 0;
-+	ctx.rep0 = ctx.rep1 = ctx.rep2 = ctx.rep3 = 1;
-+
-+	ctx.previous_byte = 0;
-+	ctx.code = 0;
-+	ctx.range = 0xFFFFFFFF;
-+
-+	if (header->pos >= (9 * 5 * 5))
-+		return -1;
-+
-+	mi = 0;
-+	lc = header->pos;
-+	while (lc >= 9) {
-+		mi++;
-+		lc -= 9;
-+	}
-+	pb = 0;
-+	lp = mi;
-+	while (lp >= 5) {
-+		pb++;
-+		lp -= 5;
-+	}
-+	pos_state_mask = (1 << pb) - 1;
-+	literal_pos_mask = (1 << lp) - 1;
-+
-+	p = (u16 *) ctx.workspace;
-+	if (!p)
-+		return -1;
-+
-+	num_probs = LZMA_LITERAL + (LZMA_LIT_SIZE << (lc + lp));
-+	for (i = 0; i < num_probs; i++)
-+		p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
-+
-+	for (i = 0; i < 5; i++)
-+		rc_get_code();
-+
-+	while (1) {
-+		int pos_state =	ctx.pos & pos_state_mask;
-+		u16 *prob = p + LZMA_IS_MATCH +
-+			(ctx.state << LZMA_NUM_POS_BITS_MAX) + pos_state;
-+		if (rc_is_bit_0(prob))
-+			process_bit0(p, pos_state, prob,
-+				     lc, literal_pos_mask);
-+		else {
-+			process_bit1(p, pos_state, prob);
-+			if (ctx.rep0 == 0)
-+				break;
-+		}
-+	}
-+
-+	return ctx.pos;
-+}
-+
-+
-+static int unlzma(unsigned char *dest, const unsigned char *src, unsigned char *workspace)
-+{
-+	memset(&ctx, 0, sizeof(ctx));
-+	ctx.outbuf = dest;
-+	ctx.next_in = src;
-+	ctx.next_out = dest;
-+	ctx.workspace = workspace;
-+
-+	return do_unlzma();
-+}
-+
-+
---- /dev/null
-+++ b/arch/arm/boot/compressed/unlzma.h
-@@ -0,0 +1,81 @@
-+/* LZMA uncompresion module for pcomp
-+ * Copyright (C) 2009  Felix Fietkau <nbd@openwrt.org>
-+ *
-+ * Based on:
-+ *  Initial Linux kernel adaptation
-+ *  Copyright (C) 2006  Alain < alain@knaff.lu >
-+ *
-+ *  Based on small lzma deflate implementation/Small range coder
-+ *  implementation for lzma.
-+ *  Copyright (C) 2006  Aurelien Jacobs < aurel@gnuage.org >
-+ *
-+ *  Based on LzmaDecode.c from the LZMA SDK 4.22 (http://www.7-zip.org/)
-+ *  Copyright (C) 1999-2005  Igor Pavlov
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+#ifndef __UNLZMA_H
-+#define __UNLZMA_H
-+
-+struct lzma_header {
-+	__u8 pos;
-+	__le32 dict_size;
-+	__le64 uncompr_size;
-+} __attribute__ ((packed));
-+
-+
-+#define RC_TOP_BITS 24
-+#define RC_MOVE_BITS 5
-+#define RC_MODEL_TOTAL_BITS 11
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LZMA_NUM_POS_BITS_MAX 4
-+
-+#define LZMA_LEN_NUM_LOW_BITS 3
-+#define LZMA_LEN_NUM_MID_BITS 3
-+#define LZMA_LEN_NUM_HIGH_BITS 8
-+
-+#define LZMA_LEN_CHOICE 0
-+#define LZMA_LEN_CHOICE_2 (LZMA_LEN_CHOICE + 1)
-+#define LZMA_LEN_LOW (LZMA_LEN_CHOICE_2 + 1)
-+#define LZMA_LEN_MID (LZMA_LEN_LOW \
-+		      + (1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_LOW_BITS)))
-+#define LZMA_LEN_HIGH (LZMA_LEN_MID \
-+		       +(1 << (LZMA_NUM_POS_BITS_MAX + LZMA_LEN_NUM_MID_BITS)))
-+#define LZMA_NUM_LEN_PROBS (LZMA_LEN_HIGH + (1 << LZMA_LEN_NUM_HIGH_BITS))
-+
-+#define LZMA_NUM_STATES 12
-+#define LZMA_NUM_LIT_STATES 7
-+
-+#define LZMA_START_POS_MODEL_INDEX 4
-+#define LZMA_END_POS_MODEL_INDEX 14
-+#define LZMA_NUM_FULL_DISTANCES (1 << (LZMA_END_POS_MODEL_INDEX >> 1))
-+
-+#define LZMA_NUM_POS_SLOT_BITS 6
-+#define LZMA_NUM_LEN_TO_POS_STATES 4
-+
-+#define LZMA_NUM_ALIGN_BITS 4
-+
-+#define LZMA_MATCH_MIN_LEN 2
-+
-+#define LZMA_IS_MATCH 0
-+#define LZMA_IS_REP (LZMA_IS_MATCH + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX))
-+#define LZMA_IS_REP_G0 (LZMA_IS_REP + LZMA_NUM_STATES)
-+#define LZMA_IS_REP_G1 (LZMA_IS_REP_G0 + LZMA_NUM_STATES)
-+#define LZMA_IS_REP_G2 (LZMA_IS_REP_G1 + LZMA_NUM_STATES)
-+#define LZMA_IS_REP_0_LONG (LZMA_IS_REP_G2 + LZMA_NUM_STATES)
-+#define LZMA_POS_SLOT (LZMA_IS_REP_0_LONG \
-+		       + (LZMA_NUM_STATES << LZMA_NUM_POS_BITS_MAX))
-+#define LZMA_SPEC_POS (LZMA_POS_SLOT \
-+		       +(LZMA_NUM_LEN_TO_POS_STATES << LZMA_NUM_POS_SLOT_BITS))
-+#define LZMA_ALIGN (LZMA_SPEC_POS \
-+		    + LZMA_NUM_FULL_DISTANCES - LZMA_END_POS_MODEL_INDEX)
-+#define LZMA_LEN_CODER (LZMA_ALIGN + (1 << LZMA_NUM_ALIGN_BITS))
-+#define LZMA_REP_LEN_CODER (LZMA_LEN_CODER + LZMA_NUM_LEN_PROBS)
-+#define LZMA_LITERAL (LZMA_REP_LEN_CODER + LZMA_NUM_LEN_PROBS)
-+
-+#endif
diff --git a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch b/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
deleted file mode 100644
index 30acd0316b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From: Mikael Pettersson <mikpe@it.uu.se>
-Date: Sat, 15 Aug 2009 11:58:11 +0000 (+0100)
-Subject: ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait
-X-Git-Tag: next-20090817~86^2~1^6
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=369842658a36bcea28ecb643ba4bdb53919330dd
-
-ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait
-
-This patch adds support for TIF_RESTORE_SIGMASK to ARM's
-signal handling, which allows to hook up the pselect6, ppoll,
-and epoll_pwait syscalls on ARM.
-
-Tested here with eabi userspace and a test program with a
-deliberate race between a child's exit and the parent's
-sigprocmask/select sequence. Using sys_pselect6() instead
-of sigprocmask/select reliably prevents the race.
-
-The other arch's support for TIF_RESTORE_SIGMASK has evolved
-over time:
-
-In 2.6.16:
-- add TIF_RESTORE_SIGMASK which parallels TIF_SIGPENDING
-- test both when checking for pending signal [changed later]
-- reimplement sys_sigsuspend() to use current->saved_sigmask,
-  TIF_RESTORE_SIGMASK [changed later], and -ERESTARTNOHAND;
-  ditto for sys_rt_sigsuspend(), but drop private code and
-  use common code via __ARCH_WANT_SYS_RT_SIGSUSPEND;
-- there are now no "extra" calls to do_signal() so its oldset
-  parameter is always &current->blocked so need not be passed,
-  also its return value is changed to void
-- change handle_signal() to return 0/-errno
-- change do_signal() to honor TIF_RESTORE_SIGMASK:
-  + get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
-    is set
-  + if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
-  + if no signal was delivered and TIF_RESTORE_SIGMASK is set then
-    clear it and restore the sigmask
-- hook up sys_pselect6() and sys_ppoll()
-
-In 2.6.19:
-- hook up sys_epoll_pwait()
-
-In 2.6.26:
-- allow archs to override how TIF_RESTORE_SIGMASK is implemented;
-  default set_restore_sigmask() sets both TIF_RESTORE_SIGMASK and
-  TIF_SIGPENDING; archs need now just test TIF_SIGPENDING again
-  when checking for pending signal work; some archs now implement
-  TIF_RESTORE_SIGMASK as a secondary/non-atomic thread flag bit
-- call set_restore_sigmask() in sys_sigsuspend() instead of setting
-  TIF_RESTORE_SIGMASK
-
-In 2.6.29-rc:
-- kill sys_pselect7() which no arch wanted
-
-So for 2.6.31-rc6/ARM this patch does the following:
-- Add TIF_RESTORE_SIGMASK. Use the generic set_restore_sigmask()
-  which sets both TIF_SIGPENDING and TIF_RESTORE_SIGMASK, so
-  TIF_RESTORE_SIGMASK need not claim one of the scarce low thread
-  flags, and existing TIF_SIGPENDING and _TIF_WORK_MASK tests need
-  not be extended for TIF_RESTORE_SIGMASK.
-- sys_sigsuspend() is reimplemented to use current->saved_sigmask
-  and set_restore_sigmask(), making it identical to most other archs
-- The private code for sys_rt_sigsuspend() is removed, instead
-  generic code supplies it via __ARCH_WANT_SYS_RT_SIGSUSPEND.
-- sys_sigsuspend() and sys_rt_sigsuspend() no longer need a pt_regs
-  parameter, so their assembly code wrappers are removed.
-- handle_signal() is changed to return 0 on success or -errno.
-- The oldset parameter to do_signal() is now redundant and removed,
-  and the return value is now also redundant and changed to void.
-- do_signal() is changed to honor TIF_RESTORE_SIGMASK:
-  + get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
-    is set
-  + if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
-  + if no signal was delivered and TIF_RESTORE_SIGMASK is set then
-    clear it and restore the sigmask
-- Hook up sys_pselect6, sys_ppoll, and sys_epoll_pwait.
-
-Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
-
---- a/arch/arm/include/asm/thread_info.h
-+++ b/arch/arm/include/asm/thread_info.h
-@@ -140,6 +140,7 @@ extern void vfp_sync_state(struct thread
- #define TIF_USING_IWMMXT	17
- #define TIF_MEMDIE		18
- #define TIF_FREEZE		19
-+#define TIF_RESTORE_SIGMASK	20
- 
- #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
- #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
-@@ -147,6 +148,7 @@ extern void vfp_sync_state(struct thread
- #define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)
- #define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)
- #define _TIF_FREEZE		(1 << TIF_FREEZE)
-+#define _TIF_RESTORE_SIGMASK	(1 << TIF_RESTORE_SIGMASK)
- 
- /*
-  * Change these and you break ASM code in entry-common.S
---- a/arch/arm/include/asm/unistd.h
-+++ b/arch/arm/include/asm/unistd.h
-@@ -360,8 +360,8 @@
- #define __NR_readlinkat			(__NR_SYSCALL_BASE+332)
- #define __NR_fchmodat			(__NR_SYSCALL_BASE+333)
- #define __NR_faccessat			(__NR_SYSCALL_BASE+334)
--					/* 335 for pselect6 */
--					/* 336 for ppoll */
-+#define __NR_pselect6			(__NR_SYSCALL_BASE+335)
-+#define __NR_ppoll			(__NR_SYSCALL_BASE+336)
- #define __NR_unshare			(__NR_SYSCALL_BASE+337)
- #define __NR_set_robust_list		(__NR_SYSCALL_BASE+338)
- #define __NR_get_robust_list		(__NR_SYSCALL_BASE+339)
-@@ -372,7 +372,7 @@
- #define __NR_vmsplice			(__NR_SYSCALL_BASE+343)
- #define __NR_move_pages			(__NR_SYSCALL_BASE+344)
- #define __NR_getcpu			(__NR_SYSCALL_BASE+345)
--					/* 346 for epoll_pwait */
-+#define __NR_epoll_pwait		(__NR_SYSCALL_BASE+346)
- #define __NR_kexec_load			(__NR_SYSCALL_BASE+347)
- #define __NR_utimensat			(__NR_SYSCALL_BASE+348)
- #define __NR_signalfd			(__NR_SYSCALL_BASE+349)
-@@ -430,6 +430,7 @@
- #define __ARCH_WANT_SYS_SIGPENDING
- #define __ARCH_WANT_SYS_SIGPROCMASK
- #define __ARCH_WANT_SYS_RT_SIGACTION
-+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
- 
- #if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
- #define __ARCH_WANT_SYS_TIME
---- a/arch/arm/kernel/calls.S
-+++ b/arch/arm/kernel/calls.S
-@@ -81,7 +81,7 @@
- 		CALL(sys_ni_syscall)		/* was sys_ssetmask */
- /* 70 */	CALL(sys_setreuid16)
- 		CALL(sys_setregid16)
--		CALL(sys_sigsuspend_wrapper)
-+		CALL(sys_sigsuspend)
- 		CALL(sys_sigpending)
- 		CALL(sys_sethostname)
- /* 75 */	CALL(sys_setrlimit)
-@@ -188,7 +188,7 @@
- 		CALL(sys_rt_sigpending)
- 		CALL(sys_rt_sigtimedwait)
- 		CALL(sys_rt_sigqueueinfo)
--		CALL(sys_rt_sigsuspend_wrapper)
-+		CALL(sys_rt_sigsuspend)
- /* 180 */	CALL(ABI(sys_pread64, sys_oabi_pread64))
- 		CALL(ABI(sys_pwrite64, sys_oabi_pwrite64))
- 		CALL(sys_chown16)
-@@ -344,8 +344,8 @@
- 		CALL(sys_readlinkat)
- 		CALL(sys_fchmodat)
- 		CALL(sys_faccessat)
--/* 335 */	CALL(sys_ni_syscall)		/* eventually pselect6 */
--		CALL(sys_ni_syscall)		/* eventually ppoll */
-+/* 335 */	CALL(sys_pselect6)
-+		CALL(sys_ppoll)
- 		CALL(sys_unshare)
- 		CALL(sys_set_robust_list)
- 		CALL(sys_get_robust_list)
-@@ -355,7 +355,7 @@
- 		CALL(sys_vmsplice)
- 		CALL(sys_move_pages)
- /* 345 */	CALL(sys_getcpu)
--		CALL(sys_ni_syscall)		/* eventually epoll_pwait */
-+		CALL(sys_epoll_pwait)
- 		CALL(sys_kexec_load)
- 		CALL(sys_utimensat)
- 		CALL(sys_signalfd)
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
-@@ -370,16 +370,6 @@ sys_clone_wrapper:
- 		b	sys_clone
- ENDPROC(sys_clone_wrapper)
- 
--sys_sigsuspend_wrapper:
--		add	r3, sp, #S_OFF
--		b	sys_sigsuspend
--ENDPROC(sys_sigsuspend_wrapper)
--
--sys_rt_sigsuspend_wrapper:
--		add	r2, sp, #S_OFF
--		b	sys_rt_sigsuspend
--ENDPROC(sys_rt_sigsuspend_wrapper)
--
- sys_sigreturn_wrapper:
- 		add	r0, sp, #S_OFF
- 		b	sys_sigreturn
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -47,57 +47,22 @@ const unsigned long sigreturn_codes[7] =
- 	MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
- };
- 
--static int do_signal(sigset_t *oldset, struct pt_regs * regs, int syscall);
--
- /*
-  * atomically swap in the new signal mask, and wait for a signal.
-  */
--asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask, struct pt_regs *regs)
-+asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask)
- {
--	sigset_t saveset;
--
- 	mask &= _BLOCKABLE;
- 	spin_lock_irq(&current->sighand->siglock);
--	saveset = current->blocked;
-+	current->saved_sigmask = current->blocked;
- 	siginitset(&current->blocked, mask);
- 	recalc_sigpending();
- 	spin_unlock_irq(&current->sighand->siglock);
--	regs->ARM_r0 = -EINTR;
--
--	while (1) {
--		current->state = TASK_INTERRUPTIBLE;
--		schedule();
--		if (do_signal(&saveset, regs, 0))
--			return regs->ARM_r0;
--	}
--}
--
--asmlinkage int
--sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *regs)
--{
--	sigset_t saveset, newset;
--
--	/* XXX: Don't preclude handling different sized sigset_t's. */
--	if (sigsetsize != sizeof(sigset_t))
--		return -EINVAL;
--
--	if (copy_from_user(&newset, unewset, sizeof(newset)))
--		return -EFAULT;
--	sigdelsetmask(&newset, ~_BLOCKABLE);
--
--	spin_lock_irq(&current->sighand->siglock);
--	saveset = current->blocked;
--	current->blocked = newset;
--	recalc_sigpending();
--	spin_unlock_irq(&current->sighand->siglock);
--	regs->ARM_r0 = -EINTR;
- 
--	while (1) {
--		current->state = TASK_INTERRUPTIBLE;
--		schedule();
--		if (do_signal(&saveset, regs, 0))
--			return regs->ARM_r0;
--	}
-+	current->state = TASK_INTERRUPTIBLE;
-+	schedule();
-+	set_restore_sigmask();
-+	return -ERESTARTNOHAND;
- }
- 
- asmlinkage int 
-@@ -541,7 +506,7 @@ static inline void restart_syscall(struc
- /*
-  * OK, we're invoking a handler
-  */	
--static void
-+static int
- handle_signal(unsigned long sig, struct k_sigaction *ka,
- 	      siginfo_t *info, sigset_t *oldset,
- 	      struct pt_regs * regs, int syscall)
-@@ -592,7 +557,7 @@ handle_signal(unsigned long sig, struct 
- 
- 	if (ret != 0) {
- 		force_sigsegv(sig, tsk);
--		return;
-+		return ret;
- 	}
- 
- 	/*
-@@ -606,6 +571,7 @@ handle_signal(unsigned long sig, struct 
- 	recalc_sigpending();
- 	spin_unlock_irq(&tsk->sighand->siglock);
- 
-+	return 0;
- }
- 
- /*
-@@ -617,11 +583,12 @@ handle_signal(unsigned long sig, struct 
-  * the kernel can handle, and then we build all the user-level signal handling
-  * stack-frames in one go after that.
-  */
--static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
-+static void do_signal(struct pt_regs *regs, int syscall)
- {
- 	struct k_sigaction ka;
- 	siginfo_t info;
- 	int signr;
-+	sigset_t *oldset;
- 
- 	/*
- 	 * We want the common case to go fast, which
-@@ -630,18 +597,32 @@ static int do_signal(sigset_t *oldset, s
- 	 * if so.
- 	 */
- 	if (!user_mode(regs))
--		return 0;
-+		return;
- 
- 	if (try_to_freeze())
- 		goto no_signal;
- 
- 	single_step_clear(current);
- 
-+	if (test_thread_flag(TIF_RESTORE_SIGMASK))
-+		oldset = &current->saved_sigmask;
-+	else
-+		oldset = &current->blocked;
-+
- 	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- 	if (signr > 0) {
--		handle_signal(signr, &ka, &info, oldset, regs, syscall);
-+		if (handle_signal(signr, &ka, &info, oldset, regs, syscall) == 0) {
-+			/*
-+			 * A signal was successfully delivered; the saved
-+			 * sigmask will have been stored in the signal frame,
-+			 * and will be restored by sigreturn, so we can simply
-+			 * clear the TIF_RESTORE_SIGMASK flag.
-+			 */
-+			if (test_thread_flag(TIF_RESTORE_SIGMASK))
-+				clear_thread_flag(TIF_RESTORE_SIGMASK);
-+		}
- 		single_step_set(current);
--		return 1;
-+		return;
- 	}
- 
-  no_signal:
-@@ -693,14 +674,21 @@ static int do_signal(sigset_t *oldset, s
- 		    regs->ARM_r0 == -ERESTARTNOINTR) {
- 			restart_syscall(regs);
- 		}
-+
-+		/* If there's no signal to deliver, we just put the saved sigmask
-+		 * back.
-+		 */
-+		if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-+			clear_thread_flag(TIF_RESTORE_SIGMASK);
-+			sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-+		}
- 	}
- 	single_step_set(current);
--	return 0;
- }
- 
- asmlinkage void
- do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
- {
- 	if (thread_flags & _TIF_SIGPENDING)
--		do_signal(&current->blocked, regs, syscall);
-+		do_signal(regs, syscall);
- }
diff --git a/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 02fd8855bb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -781,3 +781,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -84,6 +84,8 @@ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
- obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.30/971-ocf_20100325.patch
deleted file mode 100644
index ff23af8a0b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/971-ocf_20100325.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Index: linux-2.6.30.10/drivers/char/random.c
-===================================================================
---- linux-2.6.30.10.orig/drivers/char/random.c	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/drivers/char/random.c	2010-05-15 15:44:19.000000000 +0200
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -712,6 +722,61 @@
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
-Index: linux-2.6.30.10/fs/fcntl.c
-===================================================================
---- linux-2.6.30.10.orig/fs/fcntl.c	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/fs/fcntl.c	2010-05-15 15:44:19.000000000 +0200
-@@ -142,6 +142,7 @@
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
-Index: linux-2.6.30.10/include/linux/miscdevice.h
-===================================================================
---- linux-2.6.30.10.orig/include/linux/miscdevice.h	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/include/linux/miscdevice.h	2010-05-15 15:44:19.000000000 +0200
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
-Index: linux-2.6.30.10/include/linux/random.h
-===================================================================
---- linux-2.6.30.10.orig/include/linux/random.h	2009-12-04 07:00:07.000000000 +0100
-+++ linux-2.6.30.10/include/linux/random.h	2010-05-15 15:44:19.000000000 +0200
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.30/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.30/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 655ebae645..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -145,16 +145,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.30/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.30/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 53813a45f6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -63,13 +63,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.30/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.30/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index 03ad2a8590..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -30,7 +30,7 @@ config CRYPTO_FIPS
- 	  this is.
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -39,7 +39,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -48,7 +48,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -59,7 +59,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -68,7 +68,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
deleted file mode 100644
index eaf89da3f5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -2606,6 +2606,16 @@ int shmem_unuse(swp_entry_t entry, struc
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_shm_check(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2684,11 +2694,7 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	ima_shm_check(file);
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
- 
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -270,6 +270,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -508,6 +508,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -160,6 +160,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -5666,6 +5666,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1063,6 +1063,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2438,6 +2439,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -726,6 +726,7 @@ static inline int shmem_lock(struct file
- #endif
- struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1053,6 +1053,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.30/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.30/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch b/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch
deleted file mode 100644
index 0ee18f02b1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/990-fix_feroceon_vfp_handling.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Catalin Marinas <catalin.marinas@arm.com>
-Date: Sat, 30 May 2009 13:00:18 +0000 (+0100)
-Subject: Fix the VFP handling on the Feroceon CPU
-X-Git-Url: http://www.linux-arm.org/git?p=linux-2.6.git;a=commitdiff_plain;h=85d6943af50537d3aec58b967ffbd3fec88453e9;hp=26584853a44c58f3d6ac7360d697a2ddcd1a3efa
-
-Fix the VFP handling on the Feroceon CPU
-
-This CPU generates synchronous VFP exceptions in a non-standard way -
-the FPEXC.EX bit set but without the FPSCR.IXE bit being set like in the
-VFP subarchitecture 1 or just the FPEXC.DEX bit like in VFP
-subarchitecture 2. The main problem is that the faulty instruction
-(which needs to be emulated in software) will be restarted several times
-(normally until a context switch disables the VFP). This patch ensures
-that the VFP exception is treated as synchronous.
-
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Cc: Nicolas Pitre <nico@cam.org>
----
-
---- a/arch/arm/vfp/vfphw.S
-+++ b/arch/arm/vfp/vfphw.S
-@@ -100,6 +100,7 @@ ENTRY(vfp_support_entry)
- 	beq	no_old_VFP_process
- 	VFPFSTMIA r4, r5		@ save the working registers
- 	VFPFMRX	r5, FPSCR		@ current status
-+#ifndef CONFIG_CPU_FEROCEON
- 	tst	r1, #FPEXC_EX		@ is there additional state to save?
- 	beq	1f
- 	VFPFMRX	r6, FPINST		@ FPINST (only if FPEXC.EX is set)
-@@ -107,6 +108,7 @@ ENTRY(vfp_support_entry)
- 	beq	1f
- 	VFPFMRX	r8, FPINST2		@ FPINST2 if needed (and present)
- 1:
-+#endif
- 	stmia	r4, {r1, r5, r6, r8}	@ save FPEXC, FPSCR, FPINST, FPINST2
- 					@ and point r4 at the word at the
- 					@ start of the register dump
-@@ -119,6 +121,7 @@ no_old_VFP_process:
- 	VFPFLDMIA r10, r5		@ reload the working registers while
- 					@ FPEXC is in a safe state
- 	ldmia	r10, {r1, r5, r6, r8}	@ load FPEXC, FPSCR, FPINST, FPINST2
-+#ifndef CONFIG_CPU_FEROCEON
- 	tst	r1, #FPEXC_EX		@ is there additional state to restore?
- 	beq	1f
- 	VFPFMXR	FPINST, r6		@ restore FPINST (only if FPEXC.EX is set)
-@@ -126,6 +129,7 @@ no_old_VFP_process:
- 	beq	1f
- 	VFPFMXR	FPINST2, r8		@ FPINST2 if needed (and present)
- 1:
-+#endif
- 	VFPFMXR	FPSCR, r5		@ restore status
- 
- check_for_exception:
---- a/arch/arm/vfp/vfpmodule.c
-+++ b/arch/arm/vfp/vfpmodule.c
-@@ -253,12 +253,14 @@ void VFP_bounce(u32 trigger, u32 fpexc, 
- 	}
- 
- 	if (fpexc & FPEXC_EX) {
-+#ifndef CONFIG_CPU_FEROCEON
- 		/*
- 		 * Asynchronous exception. The instruction is read from FPINST
- 		 * and the interrupted instruction has to be restarted.
- 		 */
- 		trigger = fmrx(FPINST);
- 		regs->ARM_pc -= 4;
-+#endif
- 	} else if (!(fpexc & FPEXC_DEX)) {
- 		/*
- 		 * Illegal combination of bits. It can be caused by an
diff --git a/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch
deleted file mode 100644
index 39d5fb0d00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,9 +38,9 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
deleted file mode 100644
index b9c9b78683..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -204,4 +204,4 @@ cmd_bzip2 = (bzip2 -9 < $< && $(size_app
- # ---------------------------------------------------------------------------
- 
- quiet_cmd_lzma = LZMA    $@
--cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
-+cmd_lzma = lzma e $< $@ -lc1 -lp2 -pb2 -eos
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -32,6 +32,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0, 0}, NULL, NULL }
- };
- 
diff --git a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch
deleted file mode 100644
index 0a52a87e83..0000000000
--- a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -836,10 +836,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index eacbb97aef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -35,7 +35,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -87,12 +86,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -292,17 +288,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -346,10 +342,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index cbfbf53690..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -41,27 +41,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -86,10 +94,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -116,25 +120,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -201,6 +205,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -288,7 +296,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -298,7 +306,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -342,7 +349,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c00058..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 0991681346..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index aa6c110129..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -53,8 +53,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -77,7 +75,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -117,6 +117,9 @@ config DECOMPRESS_BZIP2
- config DECOMPRESS_LZMA
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -523,7 +524,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -656,4 +657,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch
deleted file mode 100644
index e0ba51598e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -521,7 +521,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -559,6 +559,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch
deleted file mode 100644
index 642f11b21f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -187,7 +187,7 @@ extern __u64 __xchg_u64_unsupported_on_3
-    if something tries to do an invalid xchg().  */
- extern void __xchg_called_with_bad_pointer(void);
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash
deleted file mode 100644
index e2a456915c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -51,6 +51,7 @@
- #define SST49LF040B	        0x0050
- #define SST49LF008A		0x005a
- #define AT49BV6416		0x00d6
-+#define MANUFACTURER_SAMSUNG	0x00ec
- 
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct
- 
- 		if (extp->MajorVersion != '1' ||
- 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
--			kfree(extp);
--			kfree(mtd);
--			return NULL;
-+		        if (cfi->mfr == MANUFACTURER_SAMSUNG &&
-+			    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
-+			    printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+			           "should be compatibile with Amd/Fujitsu.\n");
-+		        }
-+		        else {
-+			    printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
-+			           "version %c.%c.\n",  extp->MajorVersion,
-+			           extp->MinorVersion);
-+			    kfree(extp);
-+			    kfree(mtd);
-+			    return NULL;
-+		        }
- 		}
- 
- 		/* Install our own private info structure */
diff --git a/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch
deleted file mode 100644
index 8f4cf575d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	void			(*mach_setup)(void);
-+	char			*mach_name;
-+	struct list_head	list;
-+};
-+
-+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_set_name(char *name) __init;
-+
-+extern char *mips_machine_name;
-+
-+#define MIPS_MACHINE(_type, _name, _setup) 			\
-+static char machine_name_##_type[] __initdata = _name;		\
-+static struct mips_machine machine_##_type __initdata =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};								\
-+								\
-+static int __init register_machine_##_type(void)		\
-+{								\
-+	mips_machine_register(&machine_##_type);		\
-+	return 0;						\
-+}								\
-+								\
-+pure_initcall(register_machine_##_type)
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
-+
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,74 @@
-+/*
-+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+
-+#include <asm/mips_machine.h>
-+#include <asm/bootinfo.h>
-+
-+static struct list_head mips_machines __initdata =
-+		LIST_HEAD_INIT(mips_machines);
-+
-+char *mips_machine_name = "Unknown";
-+
-+static struct mips_machine * __init mips_machine_find(unsigned long machtype)
-+{
-+	struct list_head *this;
-+
-+	list_for_each(this, &mips_machines) {
-+		struct mips_machine *mach;
-+
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_type == machtype)
-+			return mach;
-+	}
-+
-+	return NULL;
-+}
-+
-+void __init mips_machine_register(struct mips_machine *mach)
-+{
-+	list_add_tail(&mach->list, &mips_machines);
-+}
-+
-+void __init mips_machine_set_name(char *name)
-+{
-+	unsigned int len;
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	len = strlen(name);
-+	p = kmalloc(len + 1, GFP_KERNEL);
-+	if (p) {
-+		strncpy(p, name, len);
-+		p[len] = '\0';
-+		mips_machine_name = p;
-+	} else {
-+		printk(KERN_WARNING "MIPS: no memory for machine_name\n");
-+	}
-+}
-+
-+void __init mips_machine_setup(unsigned long machtype)
-+{
-+	struct mips_machine *mach;
-+
-+	mach = mips_machine_find(machtype);
-+	if (!mach) {
-+		printk(KERN_ALERT "MIPS: no machine registered for "
-+			"machtype %lu\n", machtype);
-+		return;
-+	}
-+
-+	mips_machine_set_name(mach->mach_name);
-+	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mach->mach_setup)
-+		mach->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -837,6 +837,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+#ifdef CONFIG_MIPS_MACHINE
-+		seq_printf(m, "machine\t\t\t: %s\n", mips_machine_name);
-+#endif
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
diff --git a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 026a84b6a4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -840,6 +840,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 737e51bd20..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -99,6 +100,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch
deleted file mode 100644
index 37d64a95de..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -825,6 +825,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -56,6 +56,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,10 +72,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch
deleted file mode 100644
index c0dc64e269..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
deleted file mode 100644
index 3d73a0212f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -55,6 +55,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef VMLINUX_SYMBOL
- #define VMLINUX_SYMBOL(_sym_) _sym_
- #endif
-@@ -256,35 +277,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -325,7 +346,13 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
-+	}								\
-+									\
-+	/DISCARD/ : {							\
-+		SYMTAB_DISCARD						\
-+		SYMTAB_DISCARD_GPL					\
-+		SYMTAB_DISCARD_STR					\
- 	}								\
- 									\
- 	/* __*init sections */						\
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -188,16 +188,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -79,26 +79,6 @@ SECTIONS
- #endif
- 	}
- 
--	/DISCARD/ : {			/* Exit code and data		*/
--		EXIT_TEXT
--		EXIT_DATA
--		*(.exitcall.exit)
--		*(.ARM.exidx.exit.text)
--		*(.ARM.extab.exit.text)
--#ifndef CONFIG_HOTPLUG_CPU
--		*(.ARM.exidx.cpuexit.text)
--		*(.ARM.extab.cpuexit.text)
--#endif
--#ifndef CONFIG_HOTPLUG
--		*(.ARM.exidx.devexit.text)
--		*(.ARM.extab.devexit.text)
--#endif
--#ifndef CONFIG_MMU
--		*(.fixup)
--		*(__ex_table)
--#endif
--	}
--
- 	.text : {			/* Real text segment		*/
- 		_text = .;		/* Text and read-only data	*/
- 			__exception_text_start = .;
-@@ -205,6 +185,28 @@ SECTIONS
- 		__bss_stop = .;
- 		_end = .;
- 	}
-+
-+	/DISCARD/ : {			/* Exit code and data		*/
-+		EXIT_TEXT
-+		EXIT_DATA
-+		*(.discard)
-+		*(.exitcall.exit)
-+		*(.ARM.exidx.exit.text)
-+		*(.ARM.extab.exit.text)
-+#ifndef CONFIG_HOTPLUG_CPU
-+		*(.ARM.exidx.cpuexit.text)
-+		*(.ARM.extab.cpuexit.text)
-+#endif
-+#ifndef CONFIG_HOTPLUG
-+		*(.ARM.exidx.devexit.text)
-+		*(.ARM.extab.devexit.text)
-+#endif
-+#ifndef CONFIG_MMU
-+		*(.fixup)
-+		*(__ex_table)
-+#endif
-+	}
-+
- 					/* Stabs debugging sections.	*/
- 	.stab 0 : { *(.stab) }
- 	.stabstr 0 : { *(.stabstr) }
---- a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
- #endif
- SECTIONS
- {
--	/* Sections to be discarded. */
--	/DISCARD/ : {
--	*(.exitcall.exit)
--	EXIT_DATA
--	}
--
- 	. = KERNELBASE;
- 
- /*
-@@ -295,6 +289,12 @@ SECTIONS
- 		__bss_stop = .;
- 	}
- 
-+	/* Sections to be discarded. */
-+	/DISCARD/ : {
-+	*(.exitcall.exit)
-+	EXIT_DATA
-+	}
-+
- 	. = ALIGN(PAGE_SIZE);
- 	_end = . ;
- 	PROVIDE32 (end = .);
diff --git a/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 42d2dbd202..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -120,6 +120,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch
deleted file mode 100644
index c99ff1d495..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -98,6 +98,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1867,7 +1868,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2498,6 +2501,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 3151eee26e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -813,3 +813,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -188,3 +188,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch b/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
deleted file mode 100644
index 807a9444f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -4,6 +4,8 @@
- 
- CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS)
- 
-+CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS) $(EXTRA_LDSFLAGS)
-+
- extra-y		:= head.o init_task.o vmlinux.lds
- 
- obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \
diff --git a/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch b/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch
deleted file mode 100644
index 5cd81070e1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/049-byteshift_h_fix_usage_for_compressed_kernels.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 2fa4341074cd02fb39aa23410740764948755635 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Wed, 23 Sep 2009 15:57:38 -0700
-Subject: [PATCH] include/linux/unaligned/{l,b}e_byteshift.h: fix usage for compressed kernels
-
-When unaligned accesses are required for uncompressing a kernel (such as
-for LZO decompression on ARM in a patch that follows), including
-<linux/kernel.h> causes issues as it brings in a lot of things that are
-not available in the decompression environment.
-
-linux/kernel.h brings at least:
-extern int console_printk[];
-extern const char hex_asc[];
-which causes errors at link-time as they are not available when
-compiling the pre-boot environement. There are also a few others:
-
-  arch/arm/boot/compressed/misc.o: In function `valid_user_regs':
-   arch/arm/include/asm/ptrace.h:158: undefined reference to `elf_hwcap'
-  arch/arm/boot/compressed/misc.o: In function `console_silent':
-   include/linux/kernel.h:292: undefined reference to `console_printk'
-  arch/arm/boot/compressed/misc.o: In function `console_verbose':
-   include/linux/kernel.h:297: undefined reference to `console_printk'
-  arch/arm/boot/compressed/misc.o: In function `pack_hex_byte':
-   include/linux/kernel.h:360: undefined reference to `hex_asc'
-  arch/arm/boot/compressed/misc.o: In function `hweight_long':
-   include/linux/bitops.h:45: undefined reference to `hweight32'
-  arch/arm/boot/compressed/misc.o: In function `__cmpxchg_local_generic':
-   include/asm-generic/cmpxchg-local.h:21: undefined reference to `wrong_size_cmpxchg'
-   include/asm-generic/cmpxchg-local.h:42: undefined reference to `wrong_size_cmpxchg'
-  arch/arm/boot/compressed/misc.o: In function `__xchg':
-   arch/arm/include/asm/system.h:309: undefined reference to `__bad_xchg'
-
-However, those files apparently use nothing from <linux/kernel.h>, all
-they need is the declaration of types such as u32 or u64, so
-<linux/types.h> should be enough
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Cc: Sam Ravnborg <sam@ravnborg.org>
-Cc: Russell King <rmk@arm.linux.org.uk>
-Cc: Ingo Molnar <mingo@elte.hu>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/unaligned/be_byteshift.h |    2 +-
- include/linux/unaligned/le_byteshift.h |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/linux/unaligned/be_byteshift.h
-+++ b/include/linux/unaligned/be_byteshift.h
-@@ -1,7 +1,7 @@
- #ifndef _LINUX_UNALIGNED_BE_BYTESHIFT_H
- #define _LINUX_UNALIGNED_BE_BYTESHIFT_H
- 
--#include <linux/kernel.h>
-+#include <linux/types.h>
- 
- static inline u16 __get_unaligned_be16(const u8 *p)
- {
---- a/include/linux/unaligned/le_byteshift.h
-+++ b/include/linux/unaligned/le_byteshift.h
-@@ -1,7 +1,7 @@
- #ifndef _LINUX_UNALIGNED_LE_BYTESHIFT_H
- #define _LINUX_UNALIGNED_LE_BYTESHIFT_H
- 
--#include <linux/kernel.h>
-+#include <linux/types.h>
- 
- static inline u16 __get_unaligned_le16(const u8 *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch b/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch
deleted file mode 100644
index 733d1756f6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/050-lzo_compressed_kernels.patch
+++ /dev/null
@@ -1,309 +0,0 @@
---- /dev/null
-+++ b/include/linux/decompress/unlzo.h
-@@ -0,0 +1,10 @@
-+#ifndef DECOMPRESS_UNLZO_H
-+#define DECOMPRESS_UNLZO_H
-+
-+int unlzo(unsigned char *inbuf, int len,
-+	int(*fill)(void*, unsigned int),
-+	int(*flush)(void*, unsigned int),
-+	unsigned char *output,
-+	int *pos,
-+	void(*error)(char *x));
-+#endif
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2
- config HAVE_KERNEL_LZMA
- 	bool
- 
-+config HAVE_KERNEL_LZO
-+	bool
-+
- choice
- 	prompt "Kernel compression mode"
- 	default KERNEL_GZIP
--	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
-+	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
- 	help
- 	  The linux kernel is a kind of self-extracting executable.
- 	  Several compression algorithms are available, which differ
-@@ -141,9 +144,8 @@ config KERNEL_GZIP
- 	bool "Gzip"
- 	depends on HAVE_KERNEL_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config KERNEL_BZIP2
- 	bool "Bzip2"
-@@ -164,6 +166,14 @@ config KERNEL_LZMA
- 	  two. Compression is slowest.	The kernel size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config KERNEL_LZO
-+	bool "LZO"
-+	depends on HAVE_KERNEL_LZO
-+	help
-+	  Its compression ratio is the poorest among the 4. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
- 
- config SWAP
---- /dev/null
-+++ b/lib/decompress_unlzo.c
-@@ -0,0 +1,208 @@
-+/*
-+ * LZO decompressor for the Linux kernel. Code borrowed from the lzo
-+ * implementation by Markus Franz Xaver Johannes Oberhumer.
-+ *
-+ * Linux kernel adaptation:
-+ * Copyright (C) 2009
-+ * Albin Tonnerre, Free Electrons <albin.tonnerre@free-electrons.com>
-+ *
-+ * Original code:
-+ * Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer
-+ * All Rights Reserved.
-+ *
-+ * lzop and the LZO library are free software; you can redistribute them
-+ * and/or modify them under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; see the file COPYING.
-+ * If not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Markus F.X.J. Oberhumer
-+ * <markus@oberhumer.com>
-+ * http://www.oberhumer.com/opensource/lzop/
-+ */
-+
-+#ifdef STATIC
-+#include "lzo/lzo1x_decompress.c"
-+#else
-+#include <linux/slab.h>
-+#include <linux/decompress/unlzo.h>
-+#endif
-+
-+#include <linux/types.h>
-+#include <linux/lzo.h>
-+#include <linux/decompress/mm.h>
-+
-+#include <linux/compiler.h>
-+#include <asm/unaligned.h>
-+
-+static const unsigned char lzop_magic[] =
-+	{ 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a };
-+
-+#define LZO_BLOCK_SIZE        (256*1024l)
-+#define HEADER_HAS_FILTER      0x00000800L
-+
-+STATIC inline int INIT parse_header(u8 *input, u8 *skip)
-+{
-+	int l;
-+	u8 *parse = input;
-+	u8 level = 0;
-+	u16 version;
-+
-+	/* read magic: 9 first bits */
-+	for (l = 0; l < 9; l++) {
-+		if (*parse++ != lzop_magic[l])
-+			return 0;
-+	}
-+	/* get version (2bytes), skip library version (2),
-+	 * 'need to be extracted' version (2) and
-+	 * method (1) */
-+	version = get_unaligned_be16(parse);
-+	parse += 7;
-+	if (version >= 0x0940)
-+		level = *parse++;
-+	if (get_unaligned_be32(parse) & HEADER_HAS_FILTER)
-+		parse += 8; /* flags + filter info */
-+	else
-+		parse += 4; /* flags */
-+
-+	/* skip mode and mtime_low */
-+	parse += 8;
-+	if (version >= 0x0940)
-+		parse += 4;	/* skip mtime_high */
-+
-+	l = *parse++;
-+	/* don't care about the file name, and skip checksum */
-+	parse += l + 4;
-+
-+	*skip = parse - input;
-+	return 1;
-+}
-+
-+STATIC inline int INIT unlzo(u8 *input, int in_len,
-+				int (*fill) (void *, unsigned int),
-+				int (*flush) (void *, unsigned int),
-+				u8 *output, int *posp,
-+				void (*error_fn) (char *x))
-+{
-+	u8 skip = 0, r = 0;
-+	u32 src_len, dst_len;
-+	size_t tmp;
-+	u8 *in_buf, *in_buf_save, *out_buf;
-+	int obytes_processed = 0;
-+
-+	set_error_fn(error_fn);
-+
-+	if (output)
-+		out_buf = output;
-+	else if (!flush) {
-+		error("NULL output pointer and no flush function provided");
-+		goto exit;
-+	} else {
-+		out_buf = malloc(LZO_BLOCK_SIZE);
-+		if (!out_buf) {
-+			error("Could not allocate output buffer");
-+			goto exit;
-+		}
-+	}
-+
-+	if (input && fill) {
-+		error("Both input pointer and fill function provided, don't know what to do");
-+		goto exit_1;
-+	} else if (input)
-+		in_buf = input;
-+	else if (!fill || !posp) {
-+		error("NULL input pointer and missing position pointer or fill function");
-+		goto exit_1;
-+	} else {
-+		in_buf = malloc(lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		if (!in_buf) {
-+			error("Could not allocate input buffer");
-+			goto exit_1;
-+		}
-+	}
-+	in_buf_save = in_buf;
-+
-+	if (posp)
-+		*posp = 0;
-+
-+	if (fill)
-+		fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+
-+	if (!parse_header(input, &skip)) {
-+		error("invalid header");
-+		goto exit_2;
-+	}
-+	in_buf += skip;
-+
-+	if (posp)
-+		*posp = skip;
-+
-+	for (;;) {
-+		/* read uncompressed block size */
-+		dst_len = get_unaligned_be32(in_buf);
-+		in_buf += 4;
-+
-+		/* exit if last block */
-+		if (dst_len == 0) {
-+			if (posp)
-+				*posp += 4;
-+			break;
-+		}
-+
-+		if (dst_len > LZO_BLOCK_SIZE) {
-+			error("dest len longer than block size");
-+			goto exit_2;
-+		}
-+
-+		/* read compressed block size, and skip block checksum info */
-+		src_len = get_unaligned_be32(in_buf);
-+		in_buf += 8;
-+
-+		if (src_len <= 0 || src_len > dst_len) {
-+			error("file corrupted");
-+			goto exit_2;
-+		}
-+
-+		/* decompress */
-+		tmp = dst_len;
-+		r = lzo1x_decompress_safe((u8 *) in_buf, src_len, out_buf, &tmp);
-+
-+		if (r != LZO_E_OK || dst_len != tmp) {
-+			error("Compressed data violation");
-+			goto exit_2;
-+		}
-+
-+		obytes_processed += dst_len;
-+		if (flush)
-+			flush(out_buf, dst_len);
-+		if (output)
-+			out_buf += dst_len;
-+		if (posp)
-+			*posp += src_len + 12;
-+		if (fill) {
-+			in_buf = in_buf_save;
-+			fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		} else
-+			in_buf += src_len;
-+	}
-+
-+exit_2:
-+	if (!input)
-+		free(in_buf);
-+exit_1:
-+	if (!output)
-+		free(out_buf);
-+exit:
-+	return obytes_processed;
-+}
-+
-+#define decompress unlzo
---- a/lib/lzo/lzo1x_decompress.c
-+++ b/lib/lzo/lzo1x_decompress.c
-@@ -11,11 +11,13 @@
-  *  Richard Purdie <rpurdie@openedhand.com>
-  */
- 
-+#ifndef STATIC
- #include <linux/module.h>
- #include <linux/kernel.h>
--#include <linux/lzo.h>
--#include <asm/byteorder.h>
-+#endif
-+
- #include <asm/unaligned.h>
-+#include <linux/lzo.h>
- #include "lzodefs.h"
- 
- #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
-@@ -244,9 +246,10 @@ lookbehind_overrun:
- 	*out_len = op - out;
- 	return LZO_E_LOOKBEHIND_OVERRUN;
- }
--
-+#ifndef STATIC
- EXPORT_SYMBOL_GPL(lzo1x_decompress_safe);
- 
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("LZO1X Decompressor");
- 
-+#endif
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -230,3 +230,8 @@ quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
- 	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
-+
-+quiet_cmd_lzo = LZO    $@
-+cmd_lzo = (cat $(filter-out FORCE,$^) | \
-+	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	(rm -f $@ ; false)
diff --git a/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch b/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch
deleted file mode 100644
index 49512bb41d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/051-lzo_compressed_kernel_for_arm.patch
+++ /dev/null
@@ -1,283 +0,0 @@
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -18,6 +18,8 @@ config ARM
- 	select HAVE_KRETPROBES if (HAVE_KPROBES)
- 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
- 	select HAVE_GENERIC_DMA_COHERENT
-+	select HAVE_KERNEL_GZIP
-+	select HAVE_KERNEL_LZO
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -63,8 +63,12 @@ endif
- 
- SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
- 
--targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
--		 head.o misc.o $(OBJS)
-+suffix_$(CONFIG_KERNEL_GZIP) = gzip
-+suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+
-+targets       := vmlinux vmlinux.lds \
-+		 piggy.$(suffix_y) piggy.$(suffix_y).o \
-+		 font.o font.c head.o misc.o $(OBJS)
- 
- ifeq ($(CONFIG_FUNCTION_TRACER),y)
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
-@@ -87,22 +91,31 @@ endif
- ifneq ($(PARAMS_PHYS),)
- LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)
- endif
--LDFLAGS_vmlinux += -p --no-undefined -X \
--	$(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T
-+# ?
-+LDFLAGS_vmlinux += -p
-+# Report unresolved symbol references
-+LDFLAGS_vmlinux += --no-undefined
-+# Delete all temporary local symbols
-+LDFLAGS_vmlinux += -X
-+# Next argument is a linker script
-+LDFLAGS_vmlinux += -T
-+
-+# For __aeabi_uidivmod
-+lib1funcs = $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.o
- 
- # Don't allow any static data in misc.o, which
- # would otherwise mess up our GOT table
- CFLAGS_misc.o := -Dstatic=
- 
--$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
--	 	$(addprefix $(obj)/, $(OBJS)) FORCE
-+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
-+	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
- 	$(call if_changed,ld)
- 	@:
- 
--$(obj)/piggy.gz: $(obj)/../Image FORCE
--	$(call if_changed,gzip)
-+$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
-+	$(call if_changed,$(suffix_y))
- 
--$(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-+$(obj)/piggy.$(suffix_y).o:  $(obj)/piggy.$(suffix_y) FORCE
- 
- CFLAGS_font.o := -Dstatic=
- 
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -18,10 +18,15 @@
- 
- unsigned int __machine_arch_type;
- 
-+#define _LINUX_STRING_H_
-+
- #include <linux/compiler.h>	/* for inline */
- #include <linux/types.h>	/* for size_t */
- #include <linux/stddef.h>	/* for NULL */
- #include <asm/string.h>
-+#include <linux/linkage.h>
-+
-+#include <asm/unaligned.h>
- 
- #ifdef STANDALONE_DEBUG
- #define putstr printf
-@@ -188,34 +193,8 @@ static inline __ptr_t memcpy(__ptr_t __d
- /*
-  * gzip delarations
-  */
--#define OF(args)  args
- #define STATIC static
- 
--typedef unsigned char  uch;
--typedef unsigned short ush;
--typedef unsigned long  ulg;
--
--#define WSIZE 0x8000		/* Window size must be at least 32k, */
--				/* and a power of two */
--
--static uch *inbuf;		/* input buffer */
--static uch window[WSIZE];	/* Sliding window buffer */
--
--static unsigned insize;		/* valid bytes in inbuf */
--static unsigned inptr;		/* index of next byte to be processed in inbuf */
--static unsigned outcnt;		/* bytes in output buffer */
--
--/* gzip flag byte */
--#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
--#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
--#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
--#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
--#define COMMENT      0x10 /* bit 4 set: file comment present */
--#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
--#define RESERVED     0xC0 /* bit 6,7:   reserved */
--
--#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
--
- /* Diagnostic functions */
- #ifdef DEBUG
- #  define Assert(cond,msg) {if(!(cond)) error(msg);}
-@@ -233,24 +212,20 @@ static unsigned outcnt;		/* bytes in out
- #  define Tracecv(c,x)
- #endif
- 
--static int  fill_inbuf(void);
--static void flush_window(void);
- static void error(char *m);
- 
- extern char input_data[];
- extern char input_data_end[];
- 
--static uch *output_data;
--static ulg output_ptr;
--static ulg bytes_out;
-+static unsigned char *output_data;
-+static unsigned long output_ptr;
- 
- static void error(char *m);
- 
- static void putstr(const char *);
- 
--extern int end;
--static ulg free_mem_ptr;
--static ulg free_mem_end_ptr;
-+static unsigned long free_mem_ptr;
-+static unsigned long free_mem_end_ptr;
- 
- #ifdef STANDALONE_DEBUG
- #define NO_INFLATE_MALLOC
-@@ -258,46 +233,13 @@ static ulg free_mem_end_ptr;
- 
- #define ARCH_HAS_DECOMP_WDOG
- 
--#include "../../../../lib/inflate.c"
--
--/* ===========================================================================
-- * Fill the input buffer. This is called only when the buffer is empty
-- * and at least one byte is really needed.
-- */
--int fill_inbuf(void)
--{
--	if (insize != 0)
--		error("ran out of input data");
--
--	inbuf = input_data;
--	insize = &input_data_end[0] - &input_data[0];
--
--	inptr = 1;
--	return inbuf[0];
--}
-+#ifdef CONFIG_KERNEL_GZIP
-+#include "../../../../lib/decompress_inflate.c"
-+#endif
- 
--/* ===========================================================================
-- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
-- * (Used for the decompressed data only.)
-- */
--void flush_window(void)
--{
--	ulg c = crc;
--	unsigned n;
--	uch *in, *out, ch;
--
--	in = window;
--	out = &output_data[output_ptr];
--	for (n = 0; n < outcnt; n++) {
--		ch = *out++ = *in++;
--		c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
--	}
--	crc = c;
--	bytes_out += (ulg)outcnt;
--	output_ptr += (ulg)outcnt;
--	outcnt = 0;
--	putstr(".");
--}
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
- 
- #ifndef arch_error
- #define arch_error(x)
-@@ -314,22 +256,33 @@ static void error(char *x)
- 	while(1);	/* Halt */
- }
- 
-+asmlinkage void __div0(void)
-+{
-+	error("Attempting division by 0!");
-+}
-+
- #ifndef STANDALONE_DEBUG
- 
--ulg
--decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
--		  int arch_id)
-+unsigned long
-+decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
-+		unsigned long free_mem_ptr_end_p,
-+		int arch_id)
- {
--	output_data		= (uch *)output_start;	/* Points to kernel start */
-+	unsigned char *tmp;
-+
-+	output_data		= (unsigned char *)output_start;
- 	free_mem_ptr		= free_mem_ptr_p;
- 	free_mem_end_ptr	= free_mem_ptr_end_p;
- 	__machine_arch_type	= arch_id;
- 
- 	arch_decomp_setup();
- 
--	makecrc();
-+	tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
-+	output_ptr = get_unaligned_le32(tmp);
-+
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr(" done, booting the kernel.\n");
- 	return output_ptr;
- }
-@@ -341,11 +294,10 @@ int main()
- {
- 	output_data = output_buffer;
- 
--	makecrc();
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr("done.\n");
- 	return 0;
- }
- #endif
--	
---- a/arch/arm/boot/compressed/piggy.S
-+++ /dev/null
-@@ -1,6 +0,0 @@
--	.section .piggydata,#alloc
--	.globl	input_data
--input_data:
--	.incbin	"arch/arm/boot/compressed/piggy.gz"
--	.globl	input_data_end
--input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.gzip.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.gzip"
-+	.globl	input_data_end
-+input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzo.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzo"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch b/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch
deleted file mode 100644
index ea7d2400ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/052-lzo_compressed_kernel_for_x86.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -49,6 +49,7 @@ config X86
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_BZIP2
- 	select HAVE_KERNEL_LZMA
-+	select HAVE_KERNEL_LZO
- 	select HAVE_ARCH_KMEMCHECK
- 
- config OUTPUT_FORMAT
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -4,7 +4,7 @@
- # create a compressed vmlinux image from the original vmlinux
- #
- 
--targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
-+targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o
- 
- KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
- KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
-@@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.al
- 	$(call if_changed,bzip2)
- $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
- 	$(call if_changed,lzma)
-+$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
-+	$(call if_changed,lzo)
- 
- suffix-$(CONFIG_KERNEL_GZIP)	:= gz
- suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2
- suffix-$(CONFIG_KERNEL_LZMA)	:= lzma
-+suffix-$(CONFIG_KERNEL_LZO) 	:= lzo
- 
- quiet_cmd_mkpiggy = MKPIGGY $@
-       cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )
---- a/arch/x86/boot/compressed/misc.c
-+++ b/arch/x86/boot/compressed/misc.c
-@@ -162,6 +162,10 @@ static int lines, cols;
- #include "../../../../lib/decompress_unlzma.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
-+
- static void scroll(void)
- {
- 	int i;
diff --git a/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch b/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch
deleted file mode 100644
index c05c3833d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/053-lzo_compression_for_initramfs.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -120,6 +120,10 @@ config DECOMPRESS_LZMA
- config DECOMPRESS_LZMA_NEEDED
- 	 boolean
- 
-+config DECOMPRESS_LZO
-+	select LZO_DECOMPRESS
-+	tristate
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
- lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
-+lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o
- 
- obj-$(CONFIG_TEXTSEARCH) += textsearch.o
- obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -9,6 +9,7 @@
- #include <linux/decompress/bunzip2.h>
- #include <linux/decompress/unlzma.h>
- #include <linux/decompress/inflate.h>
-+#include <linux/decompress/unlzo.h>
- 
- #include <linux/types.h>
- #include <linux/string.h>
-@@ -22,6 +23,9 @@
- #ifndef CONFIG_DECOMPRESS_LZMA
- # define unlzma NULL
- #endif
-+#ifndef CONFIG_DECOMPRESS_LZO
-+# define unlzo NULL
-+#endif
- 
- static const struct compress_format {
- 	unsigned char magic[2];
-@@ -32,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
- 
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -72,6 +72,15 @@ config RD_LZMA
- 	  Support loading of a LZMA encoded initial ramdisk or cpio buffer
- 	  If unsure, say N.
- 
-+config RD_LZO
-+	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
-+	default !EMBEDDED
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
-+	select DECOMPRESS_LZO
-+	help
-+	  Support loading of a LZO encoded initial ramdisk or cpio buffer
-+	  If unsure, say N.
-+
- choice
- 	prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
- 	help
-@@ -108,16 +117,15 @@ config INITRAMFS_COMPRESSION_GZIP
- 	bool "Gzip"
- 	depends on RD_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config INITRAMFS_COMPRESSION_BZIP2
- 	bool "Bzip2"
- 	depends on RD_BZIP2
- 	help
- 	  Its compression ratio and speed is intermediate.
--	  Decompression speed is slowest among the three.  The initramfs
-+	  Decompression speed is slowest among the four.  The initramfs
- 	  size is about 10% smaller with bzip2, in comparison to gzip.
- 	  Bzip2 uses a large amount of memory. For modern kernels you
- 	  will need at least 8MB RAM or more for booting.
-@@ -128,7 +136,15 @@ config INITRAMFS_COMPRESSION_LZMA
- 	help
- 	  The most recent compression algorithm.
- 	  Its ratio is best, decompression speed is between the other
--	  two. Compression is slowest.	The initramfs size is about 33%
-+	  three. Compression is slowest. The initramfs size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config INITRAMFS_COMPRESSION_LZO
-+	bool "LZO"
-+	depends on RD_LZO
-+	help
-+	  Its compression ratio is the poorest among the four. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
diff --git a/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch
deleted file mode 100644
index a0111bd554..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/055-lzma_arm_kernel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Fri, 16 Oct 2009 16:17:22 +0200
-Subject: [PATCH] Add LZMA decompression on ARM
-
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
----
- arch/arm/Kconfig                      |    1 +
- arch/arm/boot/compressed/Makefile     |    1 +
- arch/arm/boot/compressed/misc.c       |    4 ++++
- arch/arm/boot/compressed/piggy.lzma.S |    6 ++++++
- 4 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -20,6 +20,7 @@ config ARM
- 	select HAVE_GENERIC_DMA_COHERENT
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_LZO
-+	select HAVE_KERNEL_LZMA
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
- 
- suffix_$(CONFIG_KERNEL_GZIP) = gzip
- suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+suffix_$(CONFIG_KERNEL_LZMA)  = lzma
- 
- targets       := vmlinux vmlinux.lds \
- 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -237,6 +237,10 @@ static unsigned long free_mem_end_ptr;
- #include "../../../../lib/decompress_inflate.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZMA
-+#include "../../../../lib/decompress_unlzma.c"
-+#endif
-+
- #ifdef CONFIG_KERNEL_LZO
- #include "../../../../lib/decompress_unlzo.c"
- #endif
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch
deleted file mode 100644
index 50df4aae0f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/060-block2mtd_init.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
deleted file mode 100644
index 7956baf9b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_TESTS
- 	  should normally be compiled as kernel modules. The modules perform
- 	  various checks and verifications when loaded.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -502,6 +504,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -517,7 +663,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -525,6 +671,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -532,6 +693,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 2566151ef9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -575,6 +575,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -80,7 +80,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee88..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index be2c7d7323..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/090-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -492,8 +492,7 @@ int nand_correct_data(struct mtd_info *m
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index 5e4032a82a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -200,6 +200,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
deleted file mode 100644
index bcc1878c9e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -87,6 +87,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP)
- 	    || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -137,13 +140,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -153,6 +178,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -200,7 +227,6 @@ unconditional(const struct ipt_ip *ip)
- 			return 0;
- 
- 	return 1;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -326,8 +352,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	datalen = skb->len - ip->ihl * 4;
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
-@@ -345,13 +391,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -978,6 +1017,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -987,6 +1027,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
- 			goto free_counters;
- 		}
-+
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
- 
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
diff --git a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
deleted file mode 100644
index ffe80b33b4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1260 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,571 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	dev->trans_start = jiffies;
-+	imq_nf_reinject(skb->nf_queue_entry, NF_ACCEPT);
-+	return 0;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -160,6 +160,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -331,6 +334,9 @@ struct sk_buff {
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48];
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
- 
- 	unsigned int		len,
- 				data_len;
-@@ -363,6 +369,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -386,6 +395,9 @@ struct sk_buff {
- 	kmemcheck_bitfield_end(flags2);
- 
- 	/* 0/13/14 bit hole */
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
- 
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
-@@ -441,6 +453,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1976,6 +1994,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -96,6 +96,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1687,7 +1690,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1772,8 +1779,7 @@ u16 skb_tx_hash(const struct net_device
- }
- EXPORT_SYMBOL(skb_tx_hash);
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	const struct net_device_ops *ops = dev->netdev_ops;
- 	u16 queue_index = 0;
-@@ -1786,6 +1792,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- /**
-  *	dev_queue_xmit - transmit a buffer
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1102,6 +1102,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice(struct net_device *dev);
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,80 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, struct sk_buff *old)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!old->cb_next) {
-+		new->cb_next = 0;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +475,15 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		printk(KERN_WARNING "kfree_skb: skb->cb_next: %08x\n",
-+			skb->cb_next);
-+		skb_restore_cb(skb);
-+	}
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -535,6 +621,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+   skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2868,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
deleted file mode 100644
index f3636e6521..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -182,8 +182,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch
deleted file mode 100644
index e4324717b4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch
deleted file mode 100644
index 5bbf9f5f0e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch
deleted file mode 100644
index 80c7e704e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1387,11 +1387,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1481,9 +1488,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1556,7 +1563,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -336,9 +336,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch
deleted file mode 100644
index e3ce162ad7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/209-mini_fo.patch
+++ /dev/null
@@ -1,7780 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -178,6 +178,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index b64630d500..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index b5fa64e6a1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224cc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch
deleted file mode 100644
index f374009a65..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -7,7 +7,7 @@ config SND_PCM
- 	select SND_TIMER
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index fa891e0f3d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch
deleted file mode 100644
index d3234f004b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -472,18 +539,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch
deleted file mode 100644
index 92553de0f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -31,6 +31,8 @@ struct sockaddr_ll
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -48,6 +50,7 @@ struct sockaddr_ll
- #define PACKET_RESERVE			12
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
-+#define PACKET_RECV_TYPE		15
- 
- struct tpacket_stats
- {
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -206,6 +206,7 @@ struct packet_sock {
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- #endif
-+	unsigned int		pkt_type;
- };
- 
- struct packet_skb_cb {
-@@ -343,6 +344,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -350,6 +352,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -362,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (dev_net(dev) != sock_net(sk))
-@@ -546,12 +549,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -1387,6 +1390,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1733,6 +1737,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1878,6 +1892,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
deleted file mode 100644
index 042546f317..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch b/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch
deleted file mode 100644
index 08c7eaa525..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/260-extend_pfifo_fast.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -391,16 +391,50 @@ static const u8 prio2band[TC_PRIO_MAX+1]
- 
- #define PFIFO_FAST_BANDS 3
- 
-+struct pfifo_fast_sched_data {
-+	struct tcf_proto *filter_list;
-+	struct sk_buff_head list[PFIFO_FAST_BANDS];
-+};
-+
- static inline struct sk_buff_head *prio2list(struct sk_buff *skb,
- 					     struct Qdisc *qdisc)
- {
--	struct sk_buff_head *list = qdisc_priv(qdisc);
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	return list + prio2band[skb->priority & TC_PRIO_MAX];
- }
- 
-+static int pfifo_fast_filter(struct sk_buff *skb, struct Qdisc* qdisc)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	int result = 0, ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+	struct tcf_result res;
-+
-+	if (q->filter_list != NULL)
-+		result = tc_classify(skb, q->filter_list, &res);
-+	if (result >= 0) {
-+		switch (result) {
-+		case TC_ACT_STOLEN:
-+		case TC_ACT_QUEUED:
-+			ret = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
-+		case TC_ACT_SHOT:
-+			kfree_skb(skb);
-+			return ret;
-+		}
-+	}
-+#endif
-+	return 0;
-+}
-+
- static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc* qdisc)
- {
- 	struct sk_buff_head *list = prio2list(skb, qdisc);
-+	int ret;
-+
-+	ret = pfifo_fast_filter(skb, qdisc);
-+	if (ret)
-+		return ret;
- 
- 	if (skb_queue_len(list) < qdisc_dev(qdisc)->tx_queue_len) {
- 		qdisc->q.qlen++;
-@@ -412,8 +446,9 @@ static int pfifo_fast_enqueue(struct sk_
- 
- static struct sk_buff *pfifo_fast_dequeue(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) {
- 		if (!skb_queue_empty(list + prio)) {
-@@ -440,8 +475,9 @@ static struct sk_buff *pfifo_fast_peek(s
- 
- static void pfifo_fast_reset(struct Qdisc* qdisc)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		__qdisc_reset_queue(qdisc, list + prio);
-@@ -464,8 +500,9 @@ nla_put_failure:
- 
- static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
- {
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+	struct sk_buff_head *list = q->list;
- 	int prio;
--	struct sk_buff_head *list = qdisc_priv(qdisc);
- 
- 	for (prio = 0; prio < PFIFO_FAST_BANDS; prio++)
- 		skb_queue_head_init(list + prio);
-@@ -473,9 +510,36 @@ static int pfifo_fast_init(struct Qdisc
- 	return 0;
- }
- 
-+static int pfifo_fast_change_class(struct Qdisc *qdisc, u32 classid, u32 parentid,
-+			    struct nlattr **tca, unsigned long *arg)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static unsigned long pfifo_fast_get(struct Qdisc *qdisc, u32 classid)
-+{
-+	return 0;
-+}
-+
-+static struct tcf_proto **pfifo_fast_find_tcf(struct Qdisc *qdisc, unsigned long cl)
-+{
-+	struct pfifo_fast_sched_data *q = qdisc_priv(qdisc);
-+
-+	if (cl)
-+		return NULL;
-+	return &q->filter_list;
-+}
-+
-+static const struct Qdisc_class_ops pfifo_fast_class_ops = {
-+	.get		=	pfifo_fast_get,
-+	.change		=	pfifo_fast_change_class,
-+	.tcf_chain	=	pfifo_fast_find_tcf,
-+};
-+
- static struct Qdisc_ops pfifo_fast_ops __read_mostly = {
- 	.id		=	"pfifo_fast",
--	.priv_size	=	PFIFO_FAST_BANDS * sizeof(struct sk_buff_head),
-+	.cl_ops		=	&pfifo_fast_class_ops,
-+	.priv_size	=	sizeof(struct pfifo_fast_sched_data),
- 	.enqueue	=	pfifo_fast_enqueue,
- 	.dequeue	=	pfifo_fast_dequeue,
- 	.peek		=	pfifo_fast_peek,
-@@ -757,3 +821,18 @@ void dev_shutdown(struct net_device *dev
- 	shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);
- 	WARN_ON(timer_pending(&dev->watchdog_timer));
- }
-+
-+#ifdef CONFIG_NET_SCHED
-+static int __init sch_generic_init(void)
-+{
-+	return register_qdisc(&pfifo_fast_ops);
-+}
-+
-+static void __exit sch_generic_exit(void)
-+{
-+	unregister_qdisc(&pfifo_fast_ops);
-+}
-+
-+module_init(sch_generic_init)
-+module_exit(sch_generic_exit)
-+#endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch b/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
deleted file mode 100644
index 9f30674ef7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/270-sched_bfs.patch
+++ /dev/null
@@ -1,6448 +0,0 @@
-This patch adds support for bfs v230, modified for diff size reduction
-
---- a/Documentation/sysctl/kernel.txt
-+++ b/Documentation/sysctl/kernel.txt
-@@ -27,6 +27,7 @@ show up in /proc/sys/kernel:
- - domainname
- - hostname
- - hotplug
-+- iso_cpu
- - java-appletviewer           [ binfmt_java, obsolete ]
- - java-interpreter            [ binfmt_java, obsolete ]
- - kstack_depth_to_print       [ X86 only ]
-@@ -49,6 +50,7 @@ show up in /proc/sys/kernel:
- - randomize_va_space
- - real-root-dev               ==> Documentation/initrd.txt
- - reboot-cmd                  [ SPARC only ]
-+- rr_interval
- - rtsig-max
- - rtsig-nr
- - sem
-@@ -171,6 +173,16 @@ Default value is "/sbin/hotplug".
- 
- ==============================================================
- 
-+iso_cpu: (BFS only)
-+
-+This sets the percentage cpu that the unprivileged SCHED_ISO tasks can
-+run effectively at realtime priority, averaged over a rolling five
-+seconds over the -whole- system, meaning all cpus.
-+
-+Set to 70 (percent) by default.
-+
-+==============================================================
-+
- l2cr: (PPC only)
- 
- This flag controls the L2 cache of G3 processor boards. If
-@@ -333,6 +345,19 @@ rebooting. ???
- 
- ==============================================================
- 
-+rr_interval: (BFS only)
-+
-+This is the smallest duration that any cpu process scheduling unit
-+will run for. Increasing this value can increase throughput of cpu
-+bound tasks substantially but at the expense of increased latencies
-+overall. This value is in milliseconds and the default value chosen
-+depends on the number of cpus available at scheduler initialisation
-+with a minimum of 6.
-+
-+Valid values are from 1-5000.
-+
-+==============================================================
-+
- rtsig-max & rtsig-nr:
- 
- The file rtsig-max can be used to tune the maximum number
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -116,9 +116,10 @@ extern struct cred init_cred;
- 	.usage		= ATOMIC_INIT(2),				\
- 	.flags		= PF_KTHREAD,					\
- 	.lock_depth	= -1,						\
--	.prio		= MAX_PRIO-20,					\
-+	.prio		= NORMAL_PRIO,					\
- 	.static_prio	= MAX_PRIO-20,					\
--	.normal_prio	= MAX_PRIO-20,					\
-+	.normal_prio	= NORMAL_PRIO,					\
-+	.deadline	= 0,						\
- 	.policy		= SCHED_NORMAL,					\
- 	.cpus_allowed	= CPU_MASK_ALL,					\
- 	.mm		= NULL,						\
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -36,9 +36,12 @@
- #define SCHED_FIFO		1
- #define SCHED_RR		2
- #define SCHED_BATCH		3
--/* SCHED_ISO: reserved but not implemented yet */
-+#define SCHED_ISO		4
- #define SCHED_IDLE		5
- 
-+#define SCHED_MAX		(SCHED_IDLE)
-+#define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
-+
- #ifdef __KERNEL__
- 
- struct sched_param {
-@@ -1090,10 +1093,13 @@ struct sched_entity {
- 	struct load_weight	load;		/* for load-balancing */
- 	struct rb_node		run_node;
- 	struct list_head	group_node;
-+#ifdef CONFIG_SCHED_CFS
- 	unsigned int		on_rq;
- 
- 	u64			exec_start;
-+#endif
- 	u64			sum_exec_runtime;
-+#ifdef CONFIG_SCHED_CFS
- 	u64			vruntime;
- 	u64			prev_sum_exec_runtime;
- 
-@@ -1145,6 +1151,7 @@ struct sched_entity {
- 	/* rq "owned" by this entity/group: */
- 	struct cfs_rq		*my_q;
- #endif
-+#endif
- };
- 
- struct sched_rt_entity {
-@@ -1172,17 +1179,19 @@ struct task_struct {
- 
- 	int lock_depth;		/* BKL lock depth */
- 
--#ifdef CONFIG_SMP
--#ifdef __ARCH_WANT_UNLOCKED_CTXSW
- 	int oncpu;
--#endif
--#endif
--
- 	int prio, static_prio, normal_prio;
- 	unsigned int rt_priority;
- 	const struct sched_class *sched_class;
- 	struct sched_entity se;
- 	struct sched_rt_entity rt;
-+	unsigned long deadline;
-+#ifdef CONFIG_SCHED_BFS
-+	int load_weight;	/* for niceness load balancing purposes */
-+	int first_time_slice;
-+	unsigned long long timestamp, last_ran;
-+	unsigned long utime_pc, stime_pc;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_NOTIFIERS
- 	/* list of struct preempt_notifier: */
-@@ -1205,6 +1214,9 @@ struct task_struct {
- 
- 	unsigned int policy;
- 	cpumask_t cpus_allowed;
-+#ifdef CONFIG_HOTPLUG_CPU
-+	cpumask_t unplugged_mask;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_RCU
- 	int rcu_read_lock_nesting;
-@@ -1497,11 +1509,19 @@ struct task_struct {
-  * priority to a value higher than any user task. Note:
-  * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.
-  */
--
-+#define PRIO_RANGE		(40)
- #define MAX_USER_RT_PRIO	100
- #define MAX_RT_PRIO		MAX_USER_RT_PRIO
--
-+#ifdef CONFIG_SCHED_BFS
-+#define MAX_PRIO		(MAX_RT_PRIO + PRIO_RANGE)
-+#define ISO_PRIO		(MAX_RT_PRIO)
-+#define NORMAL_PRIO		(MAX_RT_PRIO + 1)
-+#define IDLE_PRIO		(MAX_RT_PRIO + 2)
-+#define PRIO_LIMIT		((IDLE_PRIO) + 1)
-+#else
- #define MAX_PRIO		(MAX_RT_PRIO + 40)
-+#define NORMAL_PRIO	(MAX_RT_PRIO - 20)
-+#endif
- #define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
- 
- static inline int rt_prio(int prio)
-@@ -1785,7 +1805,7 @@ task_sched_runtime(struct task_struct *t
- extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
- 
- /* sched_exec is called by processes performing an exec */
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) && defined(CONFIG_SCHED_CFS)
- extern void sched_exec(void);
- #else
- #define sched_exec()   {}
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -451,9 +451,22 @@ config LOG_BUF_SHIFT
- config HAVE_UNSTABLE_SCHED_CLOCK
- 	bool
- 
-+choice
-+	prompt "Scheduler"
-+	default SCHED_CFS
-+
-+	config SCHED_CFS
-+		bool "CFS"
-+
-+	config SCHED_BFS
-+		bool "BFS"
-+
-+endchoice
-+
- config GROUP_SCHED
- 	bool "Group CPU scheduler"
- 	depends on EXPERIMENTAL
-+	depends on SCHED_CFS
- 	default n
- 	help
- 	  This feature lets CPU scheduler recognize task groups and control CPU
-@@ -504,6 +517,7 @@ endchoice
- 
- menuconfig CGROUPS
- 	boolean "Control Group support"
-+	depends on SCHED_CFS
- 	help
- 	  This option adds support for grouping sets of processes together, for
- 	  use with process control subsystems such as Cpusets, CFS, memory
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -2,7 +2,7 @@
- # Makefile for the linux kernel.
- #
- 
--obj-y     = sched.o fork.o exec_domain.o panic.o printk.o \
-+obj-y     = $(if $(CONFIG_SCHED_CFS),sched.o,sched_bfs.o) fork.o exec_domain.o panic.o printk.o \
- 	    cpu.o exit.o itimer.o time.o softirq.o resource.o \
- 	    sysctl.o capability.o ptrace.o timer.o user.o \
- 	    signal.o sys.o kmod.o workqueue.o pid.o \
-@@ -108,6 +108,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER
- # I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
- # to get a correct value for the wait-channel (WCHAN in ps). --davidm
- CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
-+CFLAGS_sched_bfs.o := $(PROFILING) -fno-omit-frame-pointer
- endif
- 
- $(obj)/configs.o: $(obj)/config_data.h
---- a/kernel/kthread.c
-+++ b/kernel/kthread.c
-@@ -16,7 +16,11 @@
- #include <linux/mutex.h>
- #include <trace/events/sched.h>
- 
-+#ifdef CONFIG_SCHED_BFS
-+#define KTHREAD_NICE_LEVEL (0)
-+#else
- #define KTHREAD_NICE_LEVEL (-5)
-+#endif
- 
- static DEFINE_SPINLOCK(kthread_create_lock);
- static LIST_HEAD(kthread_create_list);
---- /dev/null
-+++ b/kernel/sched_bfs.c
-@@ -0,0 +1,6105 @@
-+/*
-+ *  kernel/sched_bfs.c, was sched.c
-+ *
-+ *  Kernel scheduler and related syscalls
-+ *
-+ *  Copyright (C) 1991-2002  Linus Torvalds
-+ *
-+ *  1996-12-23  Modified by Dave Grothe to fix bugs in semaphores and
-+ *		make semaphores SMP safe
-+ *  1998-11-19	Implemented schedule_timeout() and related stuff
-+ *		by Andrea Arcangeli
-+ *  2002-01-04	New ultra-scalable O(1) scheduler by Ingo Molnar:
-+ *		hybrid priority-list and round-robin design with
-+ *		an array-switch method of distributing timeslices
-+ *		and per-CPU runqueues.  Cleanups and useful suggestions
-+ *		by Davide Libenzi, preemptible kernel bits by Robert Love.
-+ *  2003-09-03	Interactivity tuning by Con Kolivas.
-+ *  2004-04-02	Scheduler domains code by Nick Piggin
-+ *  2007-04-15  Work begun on replacing all interactivity tuning with a
-+ *              fair scheduling design by Con Kolivas.
-+ *  2007-05-05  Load balancing (smp-nice) and other improvements
-+ *              by Peter Williams
-+ *  2007-05-06  Interactivity improvements to CFS by Mike Galbraith
-+ *  2007-07-01  Group scheduling enhancements by Srivatsa Vaddagiri
-+ *  2007-11-29  RT balancing improvements by Steven Rostedt, Gregory Haskins,
-+ *              Thomas Gleixner, Mike Kravetz
-+ *  now		Brainfuck deadline scheduling policy by Con Kolivas deletes
-+ *              a whole lot of those previous things.
-+ */
-+
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/nmi.h>
-+#include <linux/init.h>
-+#include <asm/uaccess.h>
-+#include <linux/highmem.h>
-+#include <linux/smp_lock.h>
-+#include <asm/mmu_context.h>
-+#include <linux/interrupt.h>
-+#include <linux/capability.h>
-+#include <linux/completion.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/debug_locks.h>
-+#include <linux/perf_counter.h>
-+#include <linux/security.h>
-+#include <linux/notifier.h>
-+#include <linux/profile.h>
-+#include <linux/freezer.h>
-+#include <linux/vmalloc.h>
-+#include <linux/blkdev.h>
-+#include <linux/delay.h>
-+#include <linux/smp.h>
-+#include <linux/threads.h>
-+#include <linux/timer.h>
-+#include <linux/rcupdate.h>
-+#include <linux/cpu.h>
-+#include <linux/cpuset.h>
-+#include <linux/cpumask.h>
-+#include <linux/percpu.h>
-+#include <linux/kthread.h>
-+#include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
-+#include <linux/syscalls.h>
-+#include <linux/times.h>
-+#include <linux/tsacct_kern.h>
-+#include <linux/kprobes.h>
-+#include <linux/delayacct.h>
-+#include <linux/reciprocal_div.h>
-+#include <linux/log2.h>
-+#include <linux/bootmem.h>
-+#include <linux/ftrace.h>
-+
-+#include <asm/tlb.h>
-+#include <asm/unistd.h>
-+
-+#define CREATE_TRACE_POINTS
-+#include <trace/events/sched.h>
-+
-+#define rt_prio(prio)		unlikely((prio) < MAX_RT_PRIO)
-+#define rt_task(p)		rt_prio((p)->prio)
-+#define rt_queue(rq)		rt_prio((rq)->rq_prio)
-+#define batch_task(p)		(unlikely((p)->policy == SCHED_BATCH))
-+#define is_rt_policy(policy)	((policy) == SCHED_FIFO || \
-+					(policy) == SCHED_RR)
-+#define has_rt_policy(p)	unlikely(is_rt_policy((p)->policy))
-+#define idleprio_task(p)	unlikely((p)->policy == SCHED_IDLE)
-+#define iso_task(p)		unlikely((p)->policy == SCHED_ISO)
-+#define iso_queue(rq)		unlikely((rq)->rq_policy == SCHED_ISO)
-+#define ISO_PERIOD		((5 * HZ * num_online_cpus()) + 1)
-+
-+/*
-+ * Convert user-nice values [ -20 ... 0 ... 19 ]
-+ * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
-+ * and back.
-+ */
-+#define NICE_TO_PRIO(nice)	(MAX_RT_PRIO + (nice) + 20)
-+#define PRIO_TO_NICE(prio)	((prio) - MAX_RT_PRIO - 20)
-+#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)
-+
-+/*
-+ * 'User priority' is the nice value converted to something we
-+ * can work with better when scaling various scheduler parameters,
-+ * it's a [ 0 ... 39 ] range.
-+ */
-+#define USER_PRIO(p)		((p)-MAX_RT_PRIO)
-+#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)
-+#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))
-+#define SCHED_PRIO(p)		((p)+MAX_RT_PRIO)
-+
-+/* Some helpers for converting to/from various scales.*/
-+#define JIFFIES_TO_NS(TIME)	((TIME) * (1000000000 / HZ))
-+#define MS_TO_NS(TIME)		((TIME) * 1000000)
-+#define MS_TO_US(TIME)		((TIME) * 1000)
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * Divide a load by a sched group cpu_power : (load / sg->__cpu_power)
-+ * Since cpu_power is a 'constant', we can use a reciprocal divide.
-+ */
-+static inline u32 sg_div_cpu_power(const struct sched_group *sg, u32 load)
-+{
-+	return reciprocal_divide(load, sg->reciprocal_cpu_power);
-+}
-+
-+/*
-+ * Each time a sched group cpu_power is changed,
-+ * we must compute its reciprocal value
-+ */
-+static inline void sg_inc_cpu_power(struct sched_group *sg, u32 val)
-+{
-+	sg->__cpu_power += val;
-+	sg->reciprocal_cpu_power = reciprocal_value(sg->__cpu_power);
-+}
-+#endif
-+
-+/*
-+ * This is the time all tasks within the same priority round robin.
-+ * Value is in ms and set to a minimum of 6ms. Scales with number of cpus.
-+ * Tunable via /proc interface.
-+ */
-+int rr_interval __read_mostly = 6;
-+
-+/*
-+ * sched_iso_cpu - sysctl which determines the cpu percentage SCHED_ISO tasks
-+ * are allowed to run five seconds as real time tasks. This is the total over
-+ * all online cpus.
-+ */
-+int sched_iso_cpu __read_mostly = 70;
-+
-+int prio_ratios[PRIO_RANGE] __read_mostly;
-+
-+static inline unsigned long timeslice(void)
-+{
-+	return MS_TO_US(rr_interval);
-+}
-+
-+struct global_rq {
-+	spinlock_t lock;
-+	unsigned long nr_running;
-+	unsigned long nr_uninterruptible;
-+	unsigned long long nr_switches;
-+	struct list_head queue[PRIO_LIMIT];
-+	DECLARE_BITMAP(prio_bitmap, PRIO_LIMIT + 1);
-+	unsigned long iso_ticks;
-+	unsigned short iso_refractory;
-+#ifdef CONFIG_SMP
-+	unsigned long qnr; /* queued not running */
-+	cpumask_t cpu_idle_map;
-+#endif
-+};
-+
-+static struct global_rq grq;
-+
-+/*
-+ * This is the main, per-CPU runqueue data structure.
-+ * All this is protected by the global_rq lock.
-+ */
-+struct rq {
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	unsigned char in_nohz_recently;
-+#endif
-+#endif
-+
-+	struct task_struct *curr, *idle;
-+	struct mm_struct *prev_mm;
-+	struct list_head queue; /* Place to store currently running task */
-+
-+	/* Stored data about rq->curr to work outside grq lock */
-+	unsigned long rq_deadline;
-+	unsigned int rq_policy;
-+	int rq_time_slice;
-+	int rq_prio;
-+
-+	/* Accurate timekeeping data */
-+	u64 timekeep_clock;
-+	unsigned long user_pc, nice_pc, irq_pc, softirq_pc, system_pc,
-+			iowait_pc, idle_pc;
-+	atomic_t nr_iowait;
-+
-+	int cpu;		/* cpu of this runqueue */
-+	int online;
-+
-+#ifdef CONFIG_SMP
-+	struct root_domain *rd;
-+	struct sched_domain *sd;
-+
-+	struct list_head migration_queue;
-+#endif
-+
-+	u64 clock;
-+#ifdef CONFIG_SCHEDSTATS
-+
-+	/* latency stats */
-+	struct sched_info rq_sched_info;
-+	unsigned long long rq_cpu_time;
-+	/* could above be rq->cfs_rq.exec_clock + rq->rt_rq.rt_runtime ? */
-+
-+	/* sys_sched_yield() stats */
-+	unsigned int yld_count;
-+
-+	/* schedule() stats */
-+	unsigned int sched_switch;
-+	unsigned int sched_count;
-+	unsigned int sched_goidle;
-+
-+	/* try_to_wake_up() stats */
-+	unsigned int ttwu_count;
-+	unsigned int ttwu_local;
-+
-+	/* BKL stats */
-+	unsigned int bkl_count;
-+#endif
-+};
-+
-+static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp;
-+static DEFINE_MUTEX(sched_hotcpu_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+/*
-+ * We add the notion of a root-domain which will be used to define per-domain
-+ * variables. Each exclusive cpuset essentially defines an island domain by
-+ * fully partitioning the member cpus from any other cpuset. Whenever a new
-+ * exclusive cpuset is created, we also create and attach a new root-domain
-+ * object.
-+ *
-+ */
-+struct root_domain {
-+	atomic_t refcount;
-+	cpumask_var_t span;
-+	cpumask_var_t online;
-+
-+	/*
-+	 * The "RT overload" flag: it gets set if a CPU has more than
-+	 * one runnable RT task.
-+	 */
-+	cpumask_var_t rto_mask;
-+	atomic_t rto_count;
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+	/*
-+	 * Preferred wake up cpu nominated by sched_mc balance that will be
-+	 * used when most cpus are idle in the system indicating overall very
-+	 * low system utilisation. Triggered at POWERSAVINGS_BALANCE_WAKEUP(2)
-+	 */
-+	unsigned int sched_mc_preferred_wakeup_cpu;
-+#endif
-+};
-+
-+/*
-+ * By default the system creates a single root-domain with all cpus as
-+ * members (mimicking the global state we have today).
-+ */
-+static struct root_domain def_root_domain;
-+
-+#endif
-+
-+static inline int cpu_of(struct rq *rq)
-+{
-+#ifdef CONFIG_SMP
-+	return rq->cpu;
-+#else
-+	return 0;
-+#endif
-+}
-+
-+/*
-+ * The domain tree (rq->sd) is protected by RCU's quiescent state transition.
-+ * See detach_destroy_domains: synchronize_sched for details.
-+ *
-+ * The domain tree of any CPU may only be accessed from within
-+ * preempt-disabled sections.
-+ */
-+#define for_each_domain(cpu, __sd) \
-+	for (__sd = rcu_dereference(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
-+
-+#define cpu_rq(cpu)		(&per_cpu(runqueues, (cpu)))
-+#define this_rq()		(&__get_cpu_var(runqueues))
-+#define task_rq(p)		cpu_rq(task_cpu(p))
-+#define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
-+
-+#include "sched_stats.h"
-+
-+#ifndef prepare_arch_switch
-+# define prepare_arch_switch(next)	do { } while (0)
-+#endif
-+#ifndef finish_arch_switch
-+# define finish_arch_switch(prev)	do { } while (0)
-+#endif
-+
-+inline void update_rq_clock(struct rq *rq)
-+{
-+	rq->clock = sched_clock_cpu(cpu_of(rq));
-+}
-+
-+static inline int task_running(struct task_struct *p)
-+{
-+	return (!!p->oncpu);
-+}
-+
-+static inline void grq_lock(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock(&grq.lock);
-+}
-+
-+static inline void grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock(&grq.lock);
-+}
-+
-+static inline void grq_lock_irq(void)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irq(&grq.lock);
-+}
-+
-+static inline void time_lock_grq(struct rq *rq)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	update_rq_clock(rq);
-+}
-+
-+static inline void grq_unlock_irq(void)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irq(&grq.lock);
-+}
-+
-+static inline void grq_lock_irqsave(unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	smp_mb();
-+	spin_lock_irqsave(&grq.lock, *flags);
-+}
-+
-+static inline void grq_unlock_irqrestore(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	spin_unlock_irqrestore(&grq.lock, *flags);
-+}
-+
-+static inline struct rq
-+*task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	grq_lock_irqsave(flags);
-+	return task_rq(p);
-+}
-+
-+static inline struct rq
-+*time_task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	struct rq *rq = task_grq_lock(p, flags);
-+	update_rq_clock(rq);
-+	return rq;
-+}
-+
-+static inline void task_grq_unlock(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	grq_unlock_irqrestore(flags);
-+}
-+
-+/**
-+ * runqueue_is_locked
-+ *
-+ * Returns true if the global runqueue is locked.
-+ * This interface allows printk to be called with the runqueue lock
-+ * held and know whether or not it is OK to wake up the klogd.
-+ */
-+int runqueue_is_locked(void)
-+{
-+	return spin_is_locked(&grq.lock);
-+}
-+
-+void task_rq_unlock_wait(struct task_struct *p)
-+	__releases(grq.lock)
-+{
-+	smp_mb(); /* spin-unlock-wait is not a full memory barrier */
-+	spin_unlock_wait(&grq.lock);
-+}
-+
-+static inline void time_grq_lock(struct rq *rq, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	spin_lock_irqsave(&grq.lock, *flags);
-+	update_rq_clock(rq);
-+}
-+
-+static inline struct rq *__task_grq_lock(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	return task_rq(p);
-+}
-+
-+static inline void __task_grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	grq_unlock();
-+}
-+
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+	/* this is a valid case when another task releases the spinlock */
-+	grq.lock.owner = current;
-+#endif
-+	/*
-+	 * If we are tracking spinlock dependencies then we have to
-+	 * fix up the runqueue lock - which gets 'carried over' from
-+	 * prev into current:
-+	 */
-+	spin_acquire(&grq.lock.dep_map, 0, 0, _THIS_IP_);
-+
-+	grq_unlock_irq();
-+}
-+
-+#else /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	grq_unlock_irq();
-+#else
-+	grq_unlock();
-+#endif
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+	smp_wmb();
-+#ifndef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_enable();
-+#endif
-+}
-+#endif /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+/*
-+ * A task that is queued will be on the grq run list.
-+ * A task that is not running or queued will not be on the grq run list.
-+ * A task that is currently running will have ->oncpu set and be queued
-+ * temporarily in its own rq queue.
-+ * A task that is running and no longer queued will be seen only on
-+ * context switch exit.
-+ */
-+
-+static inline int task_queued(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list));
-+}
-+
-+static inline int task_queued_only(struct task_struct *p)
-+{
-+	return (!list_empty(&p->rt.run_list) && !task_running(p));
-+}
-+
-+/*
-+ * Removing from the global runqueue. Enter with grq locked.
-+ */
-+static void dequeue_task(struct task_struct *p)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (list_empty(grq.queue + p->prio))
-+		__clear_bit(p->prio, grq.prio_bitmap);
-+}
-+
-+static inline void reset_first_time_slice(struct task_struct *p)
-+{
-+	if (unlikely(p->first_time_slice))
-+		p->first_time_slice = 0;
-+}
-+
-+static int idleprio_suitable(struct task_struct *p)
-+{
-+	return (!freezing(p) && !signal_pending(p) &&
-+		!(task_contributes_to_load(p)) && !(p->flags & (PF_EXITING)));
-+}
-+
-+static int isoprio_suitable(void)
-+{
-+	return !grq.iso_refractory;
-+}
-+
-+/*
-+ * Adding to the global runqueue. Enter with grq locked.
-+ */
-+static void enqueue_task(struct task_struct *p)
-+{
-+	if (!rt_task(p)) {
-+		/* Check it hasn't gotten rt from PI */
-+		if ((idleprio_task(p) && idleprio_suitable(p)) ||
-+		   (iso_task(p) && isoprio_suitable()))
-+			p->prio = p->normal_prio;
-+		else
-+			p->prio = NORMAL_PRIO;
-+	}
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add_tail(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+/* Only idle task does this as a real time task*/
-+static inline void enqueue_task_head(struct task_struct *p)
-+{
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add(&p->rt.run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+static inline void requeue_task(struct task_struct *p)
-+{
-+	sched_info_queued(p);
-+}
-+
-+static inline int pratio(struct task_struct *p)
-+{
-+	return prio_ratios[TASK_USER_PRIO(p)];
-+}
-+
-+/*
-+ * task_timeslice - all tasks of all priorities get the exact same timeslice
-+ * length. CPU distribution is handled by giving different deadlines to
-+ * tasks of different priorities.
-+ */
-+static inline int task_timeslice(struct task_struct *p)
-+{
-+	return (rr_interval * pratio(p) / 100);
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void inc_qnr(void)
-+{
-+	grq.qnr++;
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+	grq.qnr--;
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.qnr;
-+}
-+#else
-+static inline void inc_qnr(void)
-+{
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.nr_running;
-+}
-+#endif
-+
-+/*
-+ * activate_idle_task - move idle task to the _front_ of runqueue.
-+ */
-+static inline void activate_idle_task(struct task_struct *p)
-+{
-+	enqueue_task_head(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+static inline int normal_prio(struct task_struct *p)
-+{
-+	if (has_rt_policy(p))
-+		return MAX_RT_PRIO - 1 - p->rt_priority;
-+	if (idleprio_task(p))
-+		return IDLE_PRIO;
-+	if (iso_task(p))
-+		return ISO_PRIO;
-+	return NORMAL_PRIO;
-+}
-+
-+/*
-+ * Calculate the current priority, i.e. the priority
-+ * taken into account by the scheduler. This value might
-+ * be boosted by RT tasks as it will be RT if the task got
-+ * RT-boosted. If not then it returns p->normal_prio.
-+ */
-+static int effective_prio(struct task_struct *p)
-+{
-+	p->normal_prio = normal_prio(p);
-+	/*
-+	 * If we are RT tasks or we were boosted to RT priority,
-+	 * keep the priority unchanged. Otherwise, update priority
-+	 * to the normal priority:
-+	 */
-+	if (!rt_prio(p->prio))
-+		return p->normal_prio;
-+	return p->prio;
-+}
-+
-+/*
-+ * activate_task - move a task to the runqueue. Enter with grq locked. The rq
-+ * doesn't really matter but gives us the local clock.
-+ */
-+static void activate_task(struct task_struct *p, struct rq *rq)
-+{
-+	u64 now = rq->clock;
-+
-+	/*
-+	 * Sleep time is in units of nanosecs, so shift by 20 to get a
-+	 * milliseconds-range estimation of the amount of time that the task
-+	 * spent sleeping:
-+	 */
-+	if (unlikely(prof_on == SLEEP_PROFILING)) {
-+		if (p->state == TASK_UNINTERRUPTIBLE)
-+			profile_hits(SLEEP_PROFILING, (void *)get_wchan(p),
-+				     (now - p->timestamp) >> 20);
-+	}
-+
-+	p->prio = effective_prio(p);
-+	p->timestamp = now;
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible--;
-+	enqueue_task(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+/*
-+ * deactivate_task - If it's running, it's not on the grq and we can just
-+ * decrement the nr_running.
-+ */
-+static inline void deactivate_task(struct task_struct *p)
-+{
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible++;
-+	grq.nr_running--;
-+}
-+
-+#ifdef CONFIG_SMP
-+void set_task_cpu(struct task_struct *p, unsigned int cpu)
-+{
-+	trace_sched_migrate_task(p, cpu);
-+	/*
-+	 * After ->cpu is set up to a new value, task_grq_lock(p, ...) can be
-+	 * successfuly executed on another CPU. We must ensure that updates of
-+	 * per-task data have been completed by this moment.
-+	 */
-+	smp_wmb();
-+	task_thread_info(p)->cpu = cpu;
-+}
-+#endif
-+
-+/*
-+ * Move a task off the global queue and take it to a cpu for it will
-+ * become the running task.
-+ */
-+static inline void take_task(struct rq *rq, struct task_struct *p)
-+{
-+	set_task_cpu(p, rq->cpu);
-+	dequeue_task(p);
-+	list_add(&p->rt.run_list, &rq->queue);
-+	dec_qnr();
-+}
-+
-+/*
-+ * Returns a descheduling task to the grq runqueue unless it is being
-+ * deactivated.
-+ */
-+static inline void return_task(struct task_struct *p, int deactivate)
-+{
-+	list_del_init(&p->rt.run_list);
-+	if (deactivate)
-+		deactivate_task(p);
-+	else {
-+		inc_qnr();
-+		enqueue_task(p);
-+	}
-+}
-+
-+/*
-+ * resched_task - mark a task 'to be rescheduled now'.
-+ *
-+ * On UP this means the setting of the need_resched flag, on SMP it
-+ * might also involve a cross-CPU call to trigger the scheduler on
-+ * the target CPU.
-+ */
-+#ifdef CONFIG_SMP
-+
-+#ifndef tsk_is_polling
-+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-+#endif
-+
-+static void resched_task(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	assert_spin_locked(&grq.lock);
-+
-+	if (unlikely(test_tsk_thread_flag(p, TIF_NEED_RESCHED)))
-+		return;
-+
-+	set_tsk_thread_flag(p, TIF_NEED_RESCHED);
-+
-+	cpu = task_cpu(p);
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(p))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#else
-+static inline void resched_task(struct task_struct *p)
-+{
-+	assert_spin_locked(&grq.lock);
-+	set_tsk_need_resched(p);
-+}
-+#endif
-+
-+/**
-+ * task_curr - is this task currently executing on a CPU?
-+ * @p: the task in question.
-+ */
-+inline int task_curr(const struct task_struct *p)
-+{
-+	return cpu_curr(task_cpu(p)) == p;
-+}
-+
-+#ifdef CONFIG_SMP
-+struct migration_req {
-+	struct list_head list;
-+
-+	struct task_struct *task;
-+	int dest_cpu;
-+
-+	struct completion done;
-+};
-+
-+/*
-+ * wait_task_context_switch -	wait for a thread to complete at least one
-+ *				context switch.
-+ *
-+ * @p must not be current.
-+ */
-+void wait_task_context_switch(struct task_struct *p)
-+{
-+	unsigned long nvcsw, nivcsw, flags;
-+	int running;
-+	struct rq *rq;
-+
-+	nvcsw	= p->nvcsw;
-+	nivcsw	= p->nivcsw;
-+	for (;;) {
-+		/*
-+		 * The runqueue is assigned before the actual context
-+		 * switch. We need to take the runqueue lock.
-+		 *
-+		 * We could check initially without the lock but it is
-+		 * very likely that we need to take the lock in every
-+		 * iteration.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		running = task_running(p);
-+		task_grq_unlock(&flags);
-+
-+		if (likely(!running))
-+			break;
-+		/*
-+		 * The switch count is incremented before the actual
-+		 * context switch. We thus wait for two switches to be
-+		 * sure at least one completed.
-+		 */
-+		if ((p->nvcsw - nvcsw) > 1)
-+			break;
-+		if ((p->nivcsw - nivcsw) > 1)
-+			break;
-+
-+		cpu_relax();
-+	}
-+}
-+
-+/*
-+ * wait_task_inactive - wait for a thread to unschedule.
-+ *
-+ * If @match_state is nonzero, it's the @p->state value just checked and
-+ * not expected to change.  If it changes, i.e. @p might have woken up,
-+ * then return zero.  When we succeed in waiting for @p to be off its CPU,
-+ * we return a positive number (its total switch count).  If a second call
-+ * a short while later returns the same number, the caller can be sure that
-+ * @p has remained unscheduled the whole time.
-+ *
-+ * The caller must ensure that the task *will* unschedule sometime soon,
-+ * else this function might spin for a *long* time. This function can't
-+ * be called with interrupts off, or it may introduce deadlock with
-+ * smp_call_function() if an IPI is sent by the same process we are
-+ * waiting to become inactive.
-+ */
-+unsigned long wait_task_inactive(struct task_struct *p, long match_state)
-+{
-+	unsigned long flags;
-+	int running, on_rq;
-+	unsigned long ncsw;
-+	struct rq *rq;
-+
-+	for (;;) {
-+		/*
-+		 * We do the initial early heuristics without holding
-+		 * any task-queue locks at all. We'll only try to get
-+		 * the runqueue lock when things look like they will
-+		 * work out!
-+		 */
-+		rq = task_rq(p);
-+
-+		/*
-+		 * If the task is actively running on another CPU
-+		 * still, just relax and busy-wait without holding
-+		 * any locks.
-+		 *
-+		 * NOTE! Since we don't hold any locks, it's not
-+		 * even sure that "rq" stays as the right runqueue!
-+		 * But we don't care, since this will
-+		 * return false if the runqueue has changed and p
-+		 * is actually now running somewhere else!
-+		 */
-+		while (task_running(p) && p == rq->curr) {
-+			if (match_state && unlikely(p->state != match_state))
-+				return 0;
-+			cpu_relax();
-+		}
-+
-+		/*
-+		 * Ok, time to look more closely! We need the grq
-+		 * lock now, to be *sure*. If we're wrong, we'll
-+		 * just go back and repeat.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		trace_sched_wait_task(rq, p);
-+		running = task_running(p);
-+		on_rq = task_queued(p);
-+		ncsw = 0;
-+		if (!match_state || p->state == match_state)
-+			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
-+		task_grq_unlock(&flags);
-+
-+		/*
-+		 * If it changed from the expected state, bail out now.
-+		 */
-+		if (unlikely(!ncsw))
-+			break;
-+
-+		/*
-+		 * Was it really running after all now that we
-+		 * checked with the proper locks actually held?
-+		 *
-+		 * Oops. Go back and try again..
-+		 */
-+		if (unlikely(running)) {
-+			cpu_relax();
-+			continue;
-+		}
-+
-+		/*
-+		 * It's not enough that it's not actively running,
-+		 * it must be off the runqueue _entirely_, and not
-+		 * preempted!
-+		 *
-+		 * So if it was still runnable (but just not actively
-+		 * running right now), it's preempted, and we should
-+		 * yield - it could be a while.
-+		 */
-+		if (unlikely(on_rq)) {
-+			schedule_timeout_uninterruptible(1);
-+			continue;
-+		}
-+
-+		/*
-+		 * Ahh, all good. It wasn't running, and it wasn't
-+		 * runnable, which means that it will never become
-+		 * running in the future either. We're all done!
-+		 */
-+		break;
-+	}
-+
-+	return ncsw;
-+}
-+
-+/***
-+ * kick_process - kick a running thread to enter/exit the kernel
-+ * @p: the to-be-kicked thread
-+ *
-+ * Cause a process which is running on another CPU to enter
-+ * kernel-mode, without any delay. (to get signals handled.)
-+ *
-+ * NOTE: this function doesnt have to take the runqueue lock,
-+ * because all it wants to ensure is that the remote task enters
-+ * the kernel. If the IPI races and the task has been migrated
-+ * to another CPU then no harm is done and the purpose has been
-+ * achieved as well.
-+ */
-+void kick_process(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if ((cpu != smp_processor_id()) && task_curr(p))
-+		smp_send_reschedule(cpu);
-+	preempt_enable();
-+}
-+EXPORT_SYMBOL_GPL(kick_process);
-+#endif
-+
-+#define rq_idle(rq)	((rq)->rq_prio == PRIO_LIMIT)
-+
-+/*
-+ * RT tasks preempt purely on priority. SCHED_NORMAL tasks preempt on the
-+ * basis of earlier deadlines. SCHED_BATCH and SCHED_IDLE don't preempt,
-+ * they cooperatively multitask.
-+ */
-+static inline int task_preempts_curr(struct task_struct *p, struct rq *rq)
-+{
-+	int preempts = 0;
-+
-+	if (p->prio < rq->rq_prio)
-+		preempts = 1;
-+	else if (p->policy == SCHED_NORMAL && (p->prio == rq->rq_prio &&
-+		 time_before(p->deadline, rq->rq_deadline)))
-+			preempts = 1;
-+	return preempts;
-+}
-+
-+/*
-+ * Wake up *any* suitable cpu to schedule this task.
-+ */
-+static void try_preempt(struct task_struct *p)
-+{
-+	struct rq *highest_prio_rq, *this_rq;
-+	unsigned long latest_deadline, cpu;
-+	int highest_prio;
-+	cpumask_t tmp;
-+
-+	/* Try the task's previous rq first and as a fallback */
-+	this_rq = task_rq(p);
-+
-+	if (cpu_isset(this_rq->cpu, p->cpus_allowed)) {
-+		highest_prio_rq = this_rq;
-+		/* If this_rq is idle, use that. */
-+		if (rq_idle(this_rq))
-+			goto found_rq;
-+	} else
-+		highest_prio_rq = cpu_rq(any_online_cpu(p->cpus_allowed));
-+	latest_deadline = this_rq->rq_deadline;
-+	highest_prio = this_rq->rq_prio;
-+
-+	cpus_and(tmp, cpu_online_map, p->cpus_allowed);
-+
-+	for_each_cpu_mask(cpu, tmp) {
-+		struct rq *rq;
-+		int rq_prio;
-+
-+		rq = cpu_rq(cpu);
-+
-+		if (rq_idle(rq)) {
-+			/* found an idle rq, use that one */
-+			highest_prio_rq = rq;
-+			goto found_rq;
-+		}
-+
-+		rq_prio = rq->rq_prio;
-+		if (rq_prio > highest_prio ||
-+			(rq_prio == highest_prio &&
-+			time_after(rq->rq_deadline, latest_deadline))) {
-+				highest_prio = rq_prio;
-+				latest_deadline = rq->rq_deadline;
-+				highest_prio_rq = rq;
-+		}
-+	}
-+
-+	if (!task_preempts_curr(p, highest_prio_rq))
-+		return;
-+found_rq:
-+	resched_task(highest_prio_rq->curr);
-+	return;
-+}
-+
-+/**
-+ * task_oncpu_function_call - call a function on the cpu on which a task runs
-+ * @p:		the task to evaluate
-+ * @func:	the function to be called
-+ * @info:	the function call argument
-+ *
-+ * Calls the function @func when the task is currently running. This might
-+ * be on the current CPU, which just calls the function directly
-+ */
-+void task_oncpu_function_call(struct task_struct *p,
-+			      void (*func) (void *info), void *info)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if (task_curr(p))
-+		smp_call_function_single(cpu, func, info, 1);
-+	preempt_enable();
-+}
-+
-+#ifdef CONFIG_SMP
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return (cpus_intersects(p->cpus_allowed, grq.cpu_idle_map));
-+}
-+#else
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return 0;
-+}
-+#endif
-+
-+/***
-+ * try_to_wake_up - wake up a thread
-+ * @p: the to-be-woken-up thread
-+ * @state: the mask of task states that can be woken
-+ * @sync: do a synchronous wakeup?
-+ *
-+ * Put it on the run-queue if it's not already there. The "current"
-+ * thread is always on the run-queue (except when the actual
-+ * re-schedule is in progress), and as such you're allowed to do
-+ * the simpler "current->state = TASK_RUNNING" to mark yourself
-+ * runnable without the overhead of this.
-+ *
-+ * returns failure only if the task is already active.
-+ */
-+static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
-+{
-+	unsigned long flags;
-+	int success = 0;
-+	long old_state;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags);
-+	old_state = p->state;
-+	if (!(old_state & state))
-+		goto out_unlock;
-+
-+	/*
-+	 * Note this catches tasks that are running and queued, but returns
-+	 * false during the context switch when they're running and no
-+	 * longer queued.
-+	 */
-+	if (task_queued(p))
-+		goto out_running;
-+
-+	activate_task(p, rq);
-+	/*
-+	 * Sync wakeups (i.e. those types of wakeups where the waker
-+	 * has indicated that it will leave the CPU in short order)
-+	 * don't trigger a preemption if there are no idle cpus,
-+	 * instead waiting for current to deschedule.
-+	 */
-+	if (!sync || (sync && suitable_idle_cpus(p)))
-+		try_preempt(p);
-+	success = 1;
-+
-+out_running:
-+	trace_sched_wakeup(rq, p, success);
-+	p->state = TASK_RUNNING;
-+out_unlock:
-+	task_grq_unlock(&flags);
-+	return success;
-+}
-+
-+/**
-+ * wake_up_process - Wake up a specific process
-+ * @p: The process to be woken up.
-+ *
-+ * Attempt to wake up the nominated process and move it to the set of runnable
-+ * processes.  Returns 1 if the process was woken up, 0 if it was already
-+ * running.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+int wake_up_process(struct task_struct *p)
-+{
-+	return try_to_wake_up(p, TASK_ALL, 0);
-+}
-+EXPORT_SYMBOL(wake_up_process);
-+
-+int wake_up_state(struct task_struct *p, unsigned int state)
-+{
-+	return try_to_wake_up(p, state, 0);
-+}
-+
-+/*
-+ * Perform scheduler related setup for a newly forked process p.
-+ * p is forked by current.
-+ */
-+void sched_fork(struct task_struct *p, int clone_flags)
-+{
-+	int cpu = get_cpu();
-+	struct rq *rq;
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&p->preempt_notifiers);
-+#endif
-+	/*
-+	 * We mark the process as running here, but have not actually
-+	 * inserted it onto the runqueue yet. This guarantees that
-+	 * nobody will actually run it, and a signal or other external
-+	 * event cannot wake it up and insert it on the runqueue either.
-+	 */
-+	p->state = TASK_RUNNING;
-+	set_task_cpu(p, cpu);
-+
-+	/* Should be reset in fork.c but done here for ease of bfs patching */
-+	p->se.sum_exec_runtime = p->stime_pc = p->utime_pc = 0;
-+
-+	/*
-+	 * Make sure we do not leak PI boosting priority to the child:
-+	 */
-+	p->prio = current->normal_prio;
-+
-+	INIT_LIST_HEAD(&p->rt.run_list);
-+#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
-+	if (unlikely(sched_info_on()))
-+		memset(&p->sched_info, 0, sizeof(p->sched_info));
-+#endif
-+
-+	p->oncpu = 0;
-+
-+#ifdef CONFIG_PREEMPT
-+	/* Want to start with kernel preemption disabled. */
-+	task_thread_info(p)->preempt_count = 1;
-+#endif
-+	if (unlikely(p->policy == SCHED_FIFO))
-+		goto out;
-+	/*
-+	 * Share the timeslice between parent and child, thus the
-+	 * total amount of pending timeslices in the system doesn't change,
-+	 * resulting in more scheduling fairness. If it's negative, it won't
-+	 * matter since that's the same as being 0. current's time_slice is
-+	 * actually in rq_time_slice when it's running.
-+	 */
-+	local_irq_disable();
-+	rq = task_rq(current);
-+	if (likely(rq->rq_time_slice > 0)) {
-+		rq->rq_time_slice /= 2;
-+		/*
-+		 * The remainder of the first timeslice might be recovered by
-+		 * the parent if the child exits early enough.
-+		 */
-+		p->first_time_slice = 1;
-+	}
-+	p->rt.time_slice = rq->rq_time_slice;
-+	local_irq_enable();
-+out:
-+	put_cpu();
-+}
-+
-+/*
-+ * wake_up_new_task - wake up a newly created task for the first time.
-+ *
-+ * This function will do some initial scheduler statistics housekeeping
-+ * that must be done for every newly created context, then puts the task
-+ * on the runqueue and wakes it.
-+ */
-+void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	rq = time_task_grq_lock(p, &flags); ;
-+	parent = p->parent;
-+	BUG_ON(p->state != TASK_RUNNING);
-+	set_task_cpu(p, task_cpu(parent));
-+
-+	activate_task(p, rq);
-+	trace_sched_wakeup_new(rq, p, 1);
-+	if (!(clone_flags & CLONE_VM) && rq->curr == parent &&
-+		!suitable_idle_cpus(p)) {
-+		/*
-+		 * The VM isn't cloned, so we're in a good position to
-+		 * do child-runs-first in anticipation of an exec. This
-+		 * usually avoids a lot of COW overhead.
-+		 */
-+			resched_task(parent);
-+	} else
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+}
-+
-+/*
-+ * Potentially available exiting-child timeslices are
-+ * retrieved here - this way the parent does not get
-+ * penalized for creating too many threads.
-+ *
-+ * (this cannot be used to 'generate' timeslices
-+ * artificially, because any timeslice recovered here
-+ * was given away by the parent in the first place.)
-+ */
-+void sched_exit(struct task_struct *p)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (p->first_time_slice) {
-+		parent = p->parent;
-+		rq = task_grq_lock(parent, &flags);
-+		parent->rt.time_slice += p->rt.time_slice;
-+		if (unlikely(parent->rt.time_slice > timeslice()))
-+			parent->rt.time_slice = timeslice();
-+		task_grq_unlock(&flags);
-+	}
-+}
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+
-+/**
-+ * preempt_notifier_register - tell me when current is being preempted & rescheduled
-+ * @notifier: notifier struct to register
-+ */
-+void preempt_notifier_register(struct preempt_notifier *notifier)
-+{
-+	hlist_add_head(&notifier->link, &current->preempt_notifiers);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_register);
-+
-+/**
-+ * preempt_notifier_unregister - no longer interested in preemption notifications
-+ * @notifier: notifier struct to unregister
-+ *
-+ * This is safe to call from within a preemption notifier.
-+ */
-+void preempt_notifier_unregister(struct preempt_notifier *notifier)
-+{
-+	hlist_del(&notifier->link);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_unregister);
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_in(notifier, raw_smp_processor_id());
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_out(notifier, next);
-+}
-+
-+#else /* !CONFIG_PREEMPT_NOTIFIERS */
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+}
-+
-+#endif /* CONFIG_PREEMPT_NOTIFIERS */
-+
-+/**
-+ * prepare_task_switch - prepare to switch tasks
-+ * @rq: the runqueue preparing to switch
-+ * @next: the task we are going to switch to.
-+ *
-+ * This is called with the rq lock held and interrupts off. It must
-+ * be paired with a subsequent finish_task_switch after the context
-+ * switch.
-+ *
-+ * prepare_task_switch sets up locking and calls architecture specific
-+ * hooks.
-+ */
-+static inline void
-+prepare_task_switch(struct rq *rq, struct task_struct *prev,
-+		    struct task_struct *next)
-+{
-+	fire_sched_out_preempt_notifiers(prev, next);
-+	prepare_lock_switch(rq, next);
-+	prepare_arch_switch(next);
-+}
-+
-+/**
-+ * finish_task_switch - clean up after a task-switch
-+ * @rq: runqueue associated with task-switch
-+ * @prev: the thread we just switched away from.
-+ *
-+ * finish_task_switch must be called after the context switch, paired
-+ * with a prepare_task_switch call before the context switch.
-+ * finish_task_switch will reconcile locking set up by prepare_task_switch,
-+ * and do any other architecture-specific cleanup actions.
-+ *
-+ * Note that we may have delayed dropping an mm in context_switch(). If
-+ * so, we finish that here outside of the runqueue lock.  (Doing it
-+ * with the lock held can cause deadlocks; see schedule() for
-+ * details.)
-+ */
-+static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct mm_struct *mm = rq->prev_mm;
-+	long prev_state;
-+
-+	rq->prev_mm = NULL;
-+
-+	/*
-+	 * A task struct has one reference for the use as "current".
-+	 * If a task dies, then it sets TASK_DEAD in tsk->state and calls
-+	 * schedule one last time. The schedule call will never return, and
-+	 * the scheduled task must drop that reference.
-+	 * The test for TASK_DEAD must occur while the runqueue locks are
-+	 * still held, otherwise prev could be scheduled on another cpu, die
-+	 * there before we look at prev->state, and then the reference would
-+	 * be dropped twice.
-+	 *		Manfred Spraul <manfred@colorfullife.com>
-+	 */
-+	prev_state = prev->state;
-+	finish_arch_switch(prev);
-+	perf_counter_task_sched_in(current, cpu_of(rq));
-+	finish_lock_switch(rq, prev);
-+
-+	fire_sched_in_preempt_notifiers(current);
-+	if (mm)
-+		mmdrop(mm);
-+	if (unlikely(prev_state == TASK_DEAD)) {
-+		/*
-+		 * Remove function-return probe instances associated with this
-+		 * task and put them back on the free list.
-+	 	 */
-+		kprobe_flush_task(prev);
-+		put_task_struct(prev);
-+	}
-+}
-+
-+/**
-+ * schedule_tail - first thing a freshly forked thread must call.
-+ * @prev: the thread we just switched away from.
-+ */
-+asmlinkage void schedule_tail(struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct rq *rq = this_rq();
-+
-+	finish_task_switch(rq, prev);
-+#ifdef __ARCH_WANT_UNLOCKED_CTXSW
-+	/* In this case, finish_task_switch does not reenable preemption */
-+	preempt_enable();
-+#endif
-+	if (current->set_child_tid)
-+		put_user(current->pid, current->set_child_tid);
-+}
-+
-+/*
-+ * context_switch - switch to the new MM and the new
-+ * thread's register state.
-+ */
-+static inline void
-+context_switch(struct rq *rq, struct task_struct *prev,
-+	       struct task_struct *next)
-+{
-+	struct mm_struct *mm, *oldmm;
-+
-+	prepare_task_switch(rq, prev, next);
-+	trace_sched_switch(rq, prev, next);
-+	mm = next->mm;
-+	oldmm = prev->active_mm;
-+	/*
-+	 * For paravirt, this is coupled with an exit in switch_to to
-+	 * combine the page table reload and the switch backend into
-+	 * one hypercall.
-+	 */
-+	arch_start_context_switch(prev);
-+
-+	if (unlikely(!mm)) {
-+		next->active_mm = oldmm;
-+		atomic_inc(&oldmm->mm_count);
-+		enter_lazy_tlb(oldmm, next);
-+	} else
-+		switch_mm(oldmm, mm, next);
-+
-+	if (unlikely(!prev->mm)) {
-+		prev->active_mm = NULL;
-+		rq->prev_mm = oldmm;
-+	}
-+	/*
-+	 * Since the runqueue lock will be released by the next
-+	 * task (which is an invalid locking op but in the case
-+	 * of the scheduler it's an obvious special-case), so we
-+	 * do an early lockdep release here:
-+	 */
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+#endif
-+
-+	/* Here we just switch the register state and the stack. */
-+	switch_to(prev, next, prev);
-+
-+	barrier();
-+	/*
-+	 * this_rq must be evaluated again because prev may have moved
-+	 * CPUs since it called schedule(), thus the 'rq' on its stack
-+	 * frame will be invalid.
-+	 */
-+	finish_task_switch(this_rq(), prev);
-+}
-+
-+/*
-+ * nr_running, nr_uninterruptible and nr_context_switches:
-+ *
-+ * externally visible scheduler statistics: current number of runnable
-+ * threads, current number of uninterruptible-sleeping threads, total
-+ * number of context switches performed since bootup. All are measured
-+ * without grabbing the grq lock but the occasional inaccurate result
-+ * doesn't matter so long as it's positive.
-+ */
-+unsigned long nr_running(void)
-+{
-+	long nr = grq.nr_running;
-+
-+	if (unlikely(nr < 0))
-+		nr = 0;
-+	return (unsigned long)nr;
-+}
-+
-+unsigned long nr_uninterruptible(void)
-+{
-+	unsigned long nu = grq.nr_uninterruptible;
-+
-+	if (unlikely(nu < 0))
-+		nu = 0;
-+	return nu;
-+}
-+
-+unsigned long long nr_context_switches(void)
-+{
-+	long long ns = grq.nr_switches;
-+
-+	/* This is of course impossible */
-+	if (unlikely(ns < 0))
-+		ns = 1;
-+	return (long long)ns;
-+}
-+
-+unsigned long nr_iowait(void)
-+{
-+	unsigned long i, sum = 0;
-+
-+	for_each_possible_cpu(i)
-+		sum += atomic_read(&cpu_rq(i)->nr_iowait);
-+
-+	return sum;
-+}
-+
-+unsigned long nr_active(void)
-+{
-+	return nr_running() + nr_uninterruptible();
-+}
-+
-+/* Variables and functions for calc_load */
-+static unsigned long calc_load_update;
-+unsigned long avenrun[3];
-+EXPORT_SYMBOL(avenrun);
-+
-+/**
-+ * get_avenrun - get the load average array
-+ * @loads:	pointer to dest load array
-+ * @offset:	offset to add
-+ * @shift:	shift count to shift the result left
-+ *
-+ * These values are estimates at best, so no need for locking.
-+ */
-+void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
-+{
-+	loads[0] = (avenrun[0] + offset) << shift;
-+	loads[1] = (avenrun[1] + offset) << shift;
-+	loads[2] = (avenrun[2] + offset) << shift;
-+}
-+
-+static unsigned long
-+calc_load(unsigned long load, unsigned long exp, unsigned long active)
-+{
-+	load *= exp;
-+	load += active * (FIXED_1 - exp);
-+	return load >> FSHIFT;
-+}
-+
-+/*
-+ * calc_load - update the avenrun load estimates every LOAD_FREQ seconds.
-+ */
-+void calc_global_load(void)
-+{
-+	long active;
-+
-+	if (time_before(jiffies, calc_load_update))
-+		return;
-+	active = nr_active() * FIXED_1;
-+
-+	avenrun[0] = calc_load(avenrun[0], EXP_1, active);
-+	avenrun[1] = calc_load(avenrun[1], EXP_5, active);
-+	avenrun[2] = calc_load(avenrun[2], EXP_15, active);
-+
-+	calc_load_update = jiffies + LOAD_FREQ;
-+}
-+
-+DEFINE_PER_CPU(struct kernel_stat, kstat);
-+
-+EXPORT_PER_CPU_SYMBOL(kstat);
-+
-+/*
-+ * On each tick, see what percentage of that tick was attributed to each
-+ * component and add the percentage to the _pc values. Once a _pc value has
-+ * accumulated one tick's worth, account for that. This means the total
-+ * percentage of load components will always be 100 per tick.
-+ */
-+static void pc_idle_time(struct rq *rq, unsigned long pc)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t tmp = cputime_to_cputime64(jiffies_to_cputime(1));
-+
-+	if (atomic_read(&rq->nr_iowait) > 0) {
-+		rq->iowait_pc += pc;
-+		if (rq->iowait_pc >= 100) {
-+			rq->iowait_pc %= 100;
-+			cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
-+		}
-+	} else {
-+		rq->idle_pc += pc;
-+		if (rq->idle_pc >= 100) {
-+			rq->idle_pc %= 100;
-+			cpustat->idle = cputime64_add(cpustat->idle, tmp);
-+		}
-+	}
-+}
-+
-+static void
-+pc_system_time(struct rq *rq, struct task_struct *p, int hardirq_offset,
-+	       unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->stime_pc += pc;
-+	if (p->stime_pc >= 100) {
-+		p->stime_pc -= 100;
-+		p->stime = cputime_add(p->stime, one_jiffy);
-+		p->stimescaled = cputime_add(p->stimescaled, one_jiffy_scaled);
-+		account_group_system_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (hardirq_count() - hardirq_offset)
-+		rq->irq_pc += pc;
-+	else if (softirq_count()) {
-+		rq->softirq_pc += pc;
-+		if (rq->softirq_pc >= 100) {
-+			rq->softirq_pc %= 100;
-+			cpustat->softirq = cputime64_add(cpustat->softirq, tmp);
-+		}
-+	} else {
-+		rq->system_pc += pc;
-+		if (rq->system_pc >= 100) {
-+			rq->system_pc %= 100;
-+			cpustat->system = cputime64_add(cpustat->system, tmp);
-+		}
-+	}
-+}
-+
-+static void pc_user_time(struct rq *rq, struct task_struct *p,
-+			 unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy = jiffies_to_cputime(1);
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(one_jiffy);
-+
-+	p->utime_pc += pc;
-+	if (p->utime_pc >= 100) {
-+		p->utime_pc -= 100;
-+		p->utime = cputime_add(p->utime, one_jiffy);
-+		p->utimescaled = cputime_add(p->utimescaled, one_jiffy_scaled);
-+		account_group_user_time(p, one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->se.sum_exec_runtime += ns;
-+
-+	if (TASK_NICE(p) > 0 || idleprio_task(p)) {
-+		rq->nice_pc += pc;
-+		if (rq->nice_pc >= 100) {
-+			rq->nice_pc %= 100;
-+			cpustat->nice = cputime64_add(cpustat->nice, tmp);
-+		}
-+	} else {
-+		rq->user_pc += pc;
-+		if (rq->user_pc >= 100) {
-+			rq->user_pc %= 100;
-+			cpustat->user = cputime64_add(cpustat->user, tmp);
-+		}
-+	}
-+}
-+
-+/* Convert nanoseconds to percentage of one tick. */
-+#define NS_TO_PC(NS)	(NS * 100 / JIFFIES_TO_NS(1))
-+
-+/*
-+ * This is called on clock ticks and on context switches.
-+ * Bank in p->se.sum_exec_runtime the ns elapsed since the last tick or switch.
-+ * CPU scheduler quota accounting is also performed here in microseconds.
-+ * The value returned from sched_clock() occasionally gives bogus values so
-+ * some sanity checking is required. Time is supposed to be banked all the
-+ * time so default to half a tick to make up for when sched_clock reverts
-+ * to just returning jiffies, and for hardware that can't do tsc.
-+ */
-+static void
-+update_cpu_clock(struct rq *rq, struct task_struct *p, int tick)
-+{
-+	long time_diff = rq->clock - p->last_ran;
-+	long account_ns = rq->clock - rq->timekeep_clock;
-+	struct task_struct *idle = rq->idle;
-+	unsigned long account_pc;
-+
-+	/*
-+	 * There should be less than or equal to one jiffy worth, and not
-+	 * negative/overflow. time_diff is only used for internal scheduler
-+	 * time_slice accounting.
-+	 */
-+	if (time_diff <= 0)
-+		time_diff = JIFFIES_TO_NS(1) / 2;
-+	else if (time_diff > JIFFIES_TO_NS(1))
-+		time_diff = JIFFIES_TO_NS(1);
-+
-+	if (unlikely(account_ns < 0))
-+		account_ns = 0;
-+
-+	account_pc = NS_TO_PC(account_ns);
-+
-+	if (tick) {
-+		int user_tick = user_mode(get_irq_regs());
-+
-+		/* Accurate tick timekeeping */
-+		if (user_tick)
-+			pc_user_time(rq, p, account_pc, account_ns);
-+		else if (p != idle || (irq_count() != HARDIRQ_OFFSET))
-+			pc_system_time(rq, p, HARDIRQ_OFFSET,
-+				       account_pc, account_ns);
-+		else
-+			pc_idle_time(rq, account_pc);
-+	} else {
-+		/* Accurate subtick timekeeping */
-+		if (p == idle)
-+			pc_idle_time(rq, account_pc);
-+		else
-+			pc_user_time(rq, p, account_pc, account_ns);
-+	}
-+
-+	/* time_slice accounting is done in usecs to avoid overflow on 32bit */
-+	if (rq->rq_policy != SCHED_FIFO && p != idle)
-+		rq->rq_time_slice -= time_diff / 1000;
-+	p->last_ran = rq->timekeep_clock = rq->clock;
-+}
-+
-+/*
-+ * Return any ns on the sched_clock that have not yet been accounted in
-+ * @p in case that task is currently running.
-+ *
-+ * Called with task_grq_lock() held on @rq.
-+ */
-+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
-+{
-+	u64 ns = 0;
-+
-+	if (p == rq->curr) {
-+		update_rq_clock(rq);
-+		ns = rq->clock - p->last_ran;
-+		if ((s64)ns < 0)
-+			ns = 0;
-+	}
-+
-+	return ns;
-+}
-+
-+unsigned long long task_delta_exec(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return accounted runtime for the task.
-+ * In case the task is currently running, return the runtime plus current's
-+ * pending runtime that have not been accounted yet.
-+ */
-+unsigned long long task_sched_runtime(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = p->se.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return sum_exec_runtime for the thread group.
-+ * In case the task is currently running, return the sum plus current's
-+ * pending runtime that have not been accounted yet.
-+ *
-+ * Note that the thread group might have other running tasks as well,
-+ * so the return value not includes other pending runtime that other
-+ * running tasks might have.
-+ */
-+unsigned long long thread_group_sched_runtime(struct task_struct *p)
-+{
-+	struct task_cputime totals;
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	thread_group_cputime(p, &totals);
-+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/* Compatibility crap for removal */
-+void account_user_time(struct task_struct *p, cputime_t cputime,
-+		       cputime_t cputime_scaled)
-+{
-+}
-+
-+void account_idle_time(cputime_t cputime)
-+{
-+}
-+
-+/*
-+ * Account guest cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @cputime: the cpu time spent in virtual machine since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ */
-+static void account_guest_time(struct task_struct *p, cputime_t cputime,
-+			       cputime_t cputime_scaled)
-+{
-+	cputime64_t tmp;
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+
-+	tmp = cputime_to_cputime64(cputime);
-+
-+	/* Add guest time to process. */
-+	p->utime = cputime_add(p->utime, cputime);
-+	p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
-+	account_group_user_time(p, cputime);
-+	p->gtime = cputime_add(p->gtime, cputime);
-+
-+	/* Add guest time to cpustat. */
-+	cpustat->user = cputime64_add(cpustat->user, tmp);
-+	cpustat->guest = cputime64_add(cpustat->guest, tmp);
-+}
-+
-+/*
-+ * Account system cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @hardirq_offset: the offset to subtract from hardirq_count()
-+ * @cputime: the cpu time spent in kernel space since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ * This is for guest only now.
-+ */
-+void account_system_time(struct task_struct *p, int hardirq_offset,
-+			 cputime_t cputime, cputime_t cputime_scaled)
-+{
-+
-+	if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0))
-+		account_guest_time(p, cputime, cputime_scaled);
-+}
-+
-+/*
-+ * Account for involuntary wait time.
-+ * @steal: the cpu time spent in involuntary wait
-+ */
-+void account_steal_time(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+
-+	cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-+}
-+
-+/*
-+ * Account for idle time.
-+ * @cputime: the cpu time spent in idle wait
-+ */
-+static void account_idle_times(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+	struct rq *rq = this_rq();
-+
-+	if (atomic_read(&rq->nr_iowait) > 0)
-+		cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
-+	else
-+		cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-+}
-+
-+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
-+
-+void account_process_tick(struct task_struct *p, int user_tick)
-+{
-+}
-+
-+/*
-+ * Account multiple ticks of steal time.
-+ * @p: the process from which the cpu time has been stolen
-+ * @ticks: number of stolen ticks
-+ */
-+void account_steal_ticks(unsigned long ticks)
-+{
-+	account_steal_time(jiffies_to_cputime(ticks));
-+}
-+
-+/*
-+ * Account multiple ticks of idle time.
-+ * @ticks: number of stolen ticks
-+ */
-+void account_idle_ticks(unsigned long ticks)
-+{
-+	account_idle_times(jiffies_to_cputime(ticks));
-+}
-+#endif
-+
-+/*
-+ * Functions to test for when SCHED_ISO tasks have used their allocated
-+ * quota as real time scheduling and convert them back to SCHED_NORMAL.
-+ * Where possible, the data is tested lockless, to avoid grabbing grq_lock
-+ * because the occasional inaccurate result won't matter. However the
-+ * data is only ever modified under lock.
-+ */
-+static void set_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 1;
-+	grq_unlock();
-+}
-+
-+static void clear_iso_refractory(void)
-+{
-+	grq_lock();
-+	grq.iso_refractory = 0;
-+	grq_unlock();
-+}
-+
-+/*
-+ * Test if SCHED_ISO tasks have run longer than their alloted period as RT
-+ * tasks and set the refractory flag if necessary. There is 10% hysteresis
-+ * for unsetting the flag.
-+ */
-+static unsigned int test_ret_isorefractory(struct rq *rq)
-+{
-+	if (likely(!grq.iso_refractory)) {
-+		if (grq.iso_ticks / ISO_PERIOD > sched_iso_cpu)
-+			set_iso_refractory();
-+	} else {
-+		if (grq.iso_ticks / ISO_PERIOD < (sched_iso_cpu * 90 / 100))
-+			clear_iso_refractory();
-+	}
-+	return grq.iso_refractory;
-+}
-+
-+static void iso_tick(void)
-+{
-+	grq_lock();
-+	grq.iso_ticks += 100;
-+	grq_unlock();
-+}
-+
-+/* No SCHED_ISO task was running so decrease rq->iso_ticks */
-+static inline void no_iso_tick(void)
-+{
-+	if (grq.iso_ticks) {
-+		grq_lock();
-+		grq.iso_ticks = grq.iso_ticks * (ISO_PERIOD - 1) / ISO_PERIOD;
-+		grq_unlock();
-+	}
-+}
-+
-+static int rq_running_iso(struct rq *rq)
-+{
-+	return rq->rq_prio == ISO_PRIO;
-+}
-+
-+/* This manages tasks that have run out of timeslice during a scheduler_tick */
-+static void task_running_tick(struct rq *rq)
-+{
-+	struct task_struct *p;
-+
-+	/*
-+	 * If a SCHED_ISO task is running we increment the iso_ticks. In
-+	 * order to prevent SCHED_ISO tasks from causing starvation in the
-+	 * presence of true RT tasks we account those as iso_ticks as well.
-+	 */
-+	if ((rt_queue(rq) || (iso_queue(rq) && !grq.iso_refractory))) {
-+		if (grq.iso_ticks <= (ISO_PERIOD * 100) - 100)
-+			iso_tick();
-+	} else
-+		no_iso_tick();
-+
-+	if (iso_queue(rq)) {
-+		if (unlikely(test_ret_isorefractory(rq))) {
-+			if (rq_running_iso(rq)) {
-+				/*
-+				 * SCHED_ISO task is running as RT and limit
-+				 * has been hit. Force it to reschedule as
-+				 * SCHED_NORMAL by zeroing its time_slice
-+				 */
-+				rq->rq_time_slice = 0;
-+			}
-+		}
-+	}
-+
-+	/* SCHED_FIFO tasks never run out of timeslice. */
-+	if (rq_idle(rq) || rq->rq_time_slice > 0 || rq->rq_policy == SCHED_FIFO)
-+		return;
-+
-+	/* p->rt.time_slice <= 0. We only modify task_struct under grq lock */
-+	grq_lock();
-+	p = rq->curr;
-+	if (likely(task_running(p))) {
-+		requeue_task(p);
-+		set_tsk_need_resched(p);
-+	}
-+	grq_unlock();
-+}
-+
-+void wake_up_idle_cpu(int cpu);
-+
-+/*
-+ * This function gets called by the timer code, with HZ frequency.
-+ * We call it with interrupts disabled. The data modified is all
-+ * local to struct rq so we don't need to grab grq lock.
-+ */
-+void scheduler_tick(void)
-+{
-+	int cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(cpu);
-+
-+	sched_clock_tick();
-+	update_rq_clock(rq);
-+	update_cpu_clock(rq, rq->curr, 1);
-+	if (!rq_idle(rq))
-+		task_running_tick(rq);
-+	else {
-+		no_iso_tick();
-+		if (unlikely(queued_notrunning()))
-+			set_tsk_need_resched(rq->idle);
-+	}
-+}
-+
-+notrace unsigned long get_parent_ip(unsigned long addr)
-+{
-+	if (in_lock_functions(addr)) {
-+		addr = CALLER_ADDR2;
-+		if (in_lock_functions(addr))
-+			addr = CALLER_ADDR3;
-+	}
-+	return addr;
-+}
-+
-+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
-+				defined(CONFIG_PREEMPT_TRACER))
-+void __kprobes add_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((preempt_count() < 0)))
-+		return;
-+#endif
-+	preempt_count() += val;
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Spinlock count overflowing soon?
-+	 */
-+	DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >=
-+				PREEMPT_MASK - 10);
-+#endif
-+	if (preempt_count() == val)
-+		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+}
-+EXPORT_SYMBOL(add_preempt_count);
-+
-+void __kprobes sub_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
-+		return;
-+	/*
-+	 * Is the spinlock portion underflowing?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((val < PREEMPT_MASK) &&
-+			!(preempt_count() & PREEMPT_MASK)))
-+		return;
-+#endif
-+
-+	if (preempt_count() == val)
-+		trace_preempt_on(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+	preempt_count() -= val;
-+}
-+EXPORT_SYMBOL(sub_preempt_count);
-+#endif
-+
-+/*
-+ * Deadline is "now" in jiffies + (offset by priority). Setting the deadline
-+ * is the key to everything. It distributes cpu fairly amongst tasks of the
-+ * same nice value, it proportions cpu according to nice level, it means the
-+ * task that last woke up the longest ago has the earliest deadline, thus
-+ * ensuring that interactive tasks get low latency on wake up.
-+ */
-+static inline int prio_deadline_diff(struct task_struct *p)
-+{
-+	return (pratio(p) * rr_interval * HZ / 1000 / 100) ? : 1;
-+}
-+
-+static inline int longest_deadline(void)
-+{
-+	return (prio_ratios[39] * rr_interval * HZ / 1000 / 100);
-+}
-+
-+/*
-+ * SCHED_IDLE tasks still have a deadline set, but offset by to nice +19.
-+ * This allows nice levels to work between IDLEPRIO tasks and gives a
-+ * deadline longer than nice +19 for when they're scheduled as SCHED_NORMAL
-+ * tasks.
-+ */
-+static inline void time_slice_expired(struct task_struct *p)
-+{
-+	reset_first_time_slice(p);
-+	p->rt.time_slice = timeslice();
-+	p->deadline = jiffies + prio_deadline_diff(p);
-+	if (idleprio_task(p))
-+		p->deadline += longest_deadline();
-+}
-+
-+static inline void check_deadline(struct task_struct *p)
-+{
-+	if (p->rt.time_slice <= 0)
-+		time_slice_expired(p);
-+}
-+
-+/*
-+ * O(n) lookup of all tasks in the global runqueue. The real brainfuck
-+ * of lock contention and O(n). It's not really O(n) as only the queued,
-+ * but not running tasks are scanned, and is O(n) queued in the worst case
-+ * scenario only because the right task can be found before scanning all of
-+ * them.
-+ * Tasks are selected in this order:
-+ * Real time tasks are selected purely by their static priority and in the
-+ * order they were queued, so the lowest value idx, and the first queued task
-+ * of that priority value is chosen.
-+ * If no real time tasks are found, the SCHED_ISO priority is checked, and
-+ * all SCHED_ISO tasks have the same priority value, so they're selected by
-+ * the earliest deadline value.
-+ * If no SCHED_ISO tasks are found, SCHED_NORMAL tasks are selected by the
-+ * earliest deadline.
-+ * Finally if no SCHED_NORMAL tasks are found, SCHED_IDLEPRIO tasks are
-+ * selected by the earliest deadline.
-+ */
-+static inline struct
-+task_struct *earliest_deadline_task(struct rq *rq, struct task_struct *idle)
-+{
-+	unsigned long dl, earliest_deadline = 0; /* Initialise to silence compiler */
-+	struct task_struct *p, *edt;
-+	unsigned int cpu = rq->cpu;
-+	struct list_head *queue;
-+	int idx = 0;
-+
-+	edt = idle;
-+retry:
-+	idx = find_next_bit(grq.prio_bitmap, PRIO_LIMIT, idx);
-+	if (idx >= PRIO_LIMIT)
-+		goto out;
-+	queue = &grq.queue[idx];
-+	list_for_each_entry(p, queue, rt.run_list) {
-+		/* Make sure cpu affinity is ok */
-+		if (!cpu_isset(cpu, p->cpus_allowed))
-+			continue;
-+		if (idx < MAX_RT_PRIO) {
-+			/* We found an rt task */
-+			edt = p;
-+			goto out_take;
-+		}
-+
-+		/*
-+		 * No rt task, select the earliest deadline task now.
-+		 * On the 1st run the 2nd condition is never used, so
-+		 * there is no need to initialise earliest_deadline
-+		 * before. Normalise all old deadlines to now.
-+		 */
-+		if (time_before(p->deadline, jiffies))
-+			dl = jiffies;
-+		else
-+			dl = p->deadline;
-+
-+		if (edt == idle ||
-+		    time_before(dl, earliest_deadline)) {
-+			earliest_deadline = dl;
-+			edt = p;
-+		}
-+	}
-+	if (edt == idle) {
-+		if (++idx < PRIO_LIMIT)
-+			goto retry;
-+		goto out;
-+	}
-+out_take:
-+	take_task(rq, edt);
-+out:
-+	return edt;
-+}
-+
-+#ifdef CONFIG_SMP
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_set(cpu, grq.cpu_idle_map);
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_clear(cpu, grq.cpu_idle_map);
-+}
-+
-+#else /* CONFIG_SMP */
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+}
-+#endif /* !CONFIG_SMP */
-+
-+/*
-+ * Print scheduling while atomic bug:
-+ */
-+static noinline void __schedule_bug(struct task_struct *prev)
-+{
-+	struct pt_regs *regs = get_irq_regs();
-+
-+	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
-+		prev->comm, prev->pid, preempt_count());
-+
-+	debug_show_held_locks(prev);
-+	print_modules();
-+	if (irqs_disabled())
-+		print_irqtrace_events(prev);
-+
-+	if (regs)
-+		show_regs(regs);
-+	else
-+		dump_stack();
-+}
-+
-+/*
-+ * Various schedule()-time debugging checks and statistics:
-+ */
-+static inline void schedule_debug(struct task_struct *prev)
-+{
-+	/*
-+	 * Test if we are atomic. Since do_exit() needs to call into
-+	 * schedule() atomically, we ignore that path for now.
-+	 * Otherwise, whine if we are scheduling when we should not be.
-+	 */
-+	if (unlikely(in_atomic_preempt_off() && !prev->exit_state))
-+		__schedule_bug(prev);
-+
-+	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
-+
-+	schedstat_inc(this_rq(), sched_count);
-+#ifdef CONFIG_SCHEDSTATS
-+	if (unlikely(prev->lock_depth >= 0)) {
-+		schedstat_inc(this_rq(), bkl_count);
-+		schedstat_inc(prev, sched_info.bkl_count);
-+	}
-+#endif
-+}
-+
-+/*
-+ * schedule() is the main scheduler function.
-+ */
-+asmlinkage void __sched __schedule(void)
-+{
-+	struct task_struct *prev, *next, *idle;
-+	int deactivate = 0, cpu;
-+	long *switch_count;
-+	struct rq *rq;
-+	u64 now;
-+
-+	cpu = smp_processor_id();
-+	rq = this_rq();
-+	rcu_qsctr_inc(cpu);
-+	prev = rq->curr;
-+	switch_count = &prev->nivcsw;
-+
-+	release_kernel_lock(prev);
-+need_resched_nonpreemptible:
-+
-+	schedule_debug(prev);
-+	idle = rq->idle;
-+	/*
-+	 * The idle thread is not allowed to schedule!
-+	 * Remove this check after it has been exercised a bit.
-+	 */
-+	if (unlikely(prev == idle) && prev->state != TASK_RUNNING) {
-+		printk(KERN_ERR "bad: scheduling from the idle thread!\n");
-+		dump_stack();
-+	}
-+
-+	grq_lock_irq();
-+	update_rq_clock(rq);
-+	now = rq->clock;
-+	update_cpu_clock(rq, prev, 0);
-+
-+	clear_tsk_need_resched(prev);
-+
-+	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
-+		if (unlikely(signal_pending_state(prev->state, prev)))
-+			prev->state = TASK_RUNNING;
-+		else
-+			deactivate = 1;
-+		switch_count = &prev->nvcsw;
-+	}
-+
-+	if (prev != idle) {
-+		/* Update all the information stored on struct rq */
-+		prev->rt.time_slice = rq->rq_time_slice;
-+		prev->deadline = rq->rq_deadline;
-+		check_deadline(prev);
-+		return_task(prev, deactivate);
-+	}
-+
-+	if (likely(queued_notrunning())) {
-+		next = earliest_deadline_task(rq, idle);
-+	} else {
-+		next = idle;
-+		schedstat_inc(rq, sched_goidle);
-+	}
-+
-+	if (next == rq->idle)
-+		set_cpuidle_map(cpu);
-+	else
-+		clear_cpuidle_map(cpu);
-+
-+	prefetch(next);
-+	prefetch_stack(next);
-+
-+	prev->timestamp = prev->last_ran = now;
-+
-+	if (likely(prev != next)) {
-+		rq->rq_time_slice = next->rt.time_slice;
-+		rq->rq_deadline = next->deadline;
-+		rq->rq_prio = next->prio;
-+
-+		sched_info_switch(prev, next);
-+		grq.nr_switches++;
-+		next->oncpu = 1;
-+		prev->oncpu = 0;
-+		rq->curr = next;
-+		++*switch_count;
-+
-+		context_switch(rq, prev, next); /* unlocks the rq */
-+		/*
-+		 * the context switch might have flipped the stack from under
-+		 * us, hence refresh the local variables.
-+		 */
-+		cpu = smp_processor_id();
-+		rq = cpu_rq(cpu);
-+	} else
-+		grq_unlock_irq();
-+
-+	if (unlikely(reacquire_kernel_lock(current) < 0))
-+		goto need_resched_nonpreemptible;
-+}
-+
-+asmlinkage void __sched schedule(void)
-+{
-+need_resched:
-+	preempt_disable();
-+	__schedule();
-+	preempt_enable_no_resched();
-+	if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
-+		goto need_resched;
-+}
-+EXPORT_SYMBOL(schedule);
-+
-+#ifdef CONFIG_SMP
-+int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
-+{
-+	return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_PREEMPT
-+/*
-+ * this is the entry point to schedule() from in-kernel preemption
-+ * off of preempt_enable. Kernel preemptions off return from interrupt
-+ * occur there and call schedule directly.
-+ */
-+asmlinkage void __sched preempt_schedule(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/*
-+	 * If there is a non-zero preempt_count or interrupts are disabled,
-+	 * we do not want to preempt the current task. Just return..
-+	 */
-+	if (likely(ti->preempt_count || irqs_disabled()))
-+		return;
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+EXPORT_SYMBOL(preempt_schedule);
-+
-+/*
-+ * this is the entry point to schedule() from kernel preemption
-+ * off of irq context.
-+ * Note, that this is called and return with irqs disabled. This will
-+ * protect us against recursive calling from irq.
-+ */
-+asmlinkage void __sched preempt_schedule_irq(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/* Catch callers which need to be fixed */
-+	BUG_ON(ti->preempt_count || !irqs_disabled());
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		local_irq_enable();
-+		schedule();
-+		local_irq_disable();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+
-+#endif /* CONFIG_PREEMPT */
-+
-+int default_wake_function(wait_queue_t *curr, unsigned mode, int sync,
-+			  void *key)
-+{
-+	return try_to_wake_up(curr->private, mode, sync);
-+}
-+EXPORT_SYMBOL(default_wake_function);
-+
-+/*
-+ * The core wakeup function.  Non-exclusive wakeups (nr_exclusive == 0) just
-+ * wake everything up.  If it's an exclusive wakeup (nr_exclusive == small +ve
-+ * number) then we wake all the non-exclusive tasks and one exclusive task.
-+ *
-+ * There are circumstances in which we can try to wake a task which has already
-+ * started to run but is not in state TASK_RUNNING.  try_to_wake_up() returns
-+ * zero in this (rare) case, and we handle it by continuing to scan the queue.
-+ */
-+void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
-+		      int nr_exclusive, int sync, void *key)
-+{
-+	struct list_head *tmp, *next;
-+
-+	list_for_each_safe(tmp, next, &q->task_list) {
-+		wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list);
-+		unsigned flags = curr->flags;
-+
-+		if (curr->func(curr, mode, sync, key) &&
-+				(flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
-+			break;
-+	}
-+}
-+
-+/**
-+ * __wake_up - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: is directly passed to the wakeup function
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, 0, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL(__wake_up);
-+
-+/*
-+ * Same as __wake_up but called with the spinlock in wait_queue_head_t held.
-+ */
-+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode)
-+{
-+	__wake_up_common(q, mode, 1, 0, NULL);
-+}
-+
-+void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key)
-+{
-+	__wake_up_common(q, mode, 1, 0, key);
-+}
-+
-+/**
-+ * __wake_up_sync_key - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: opaque value to be passed to wakeup targets
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync_key);
-+
-+/**
-+ * __wake_up_sync - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronized'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ */
-+void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, NULL);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync);	/* For internal use only */
-+
-+/**
-+ * complete: - signals a single thread waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up a single thread waiting on this completion. Threads will be
-+ * awakened in the same order in which they were queued.
-+ *
-+ * See also complete_all(), wait_for_completion() and related routines.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done++;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 1, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete);
-+
-+/**
-+ * complete_all: - signals all threads waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up all threads waiting on this particular completion event.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete_all(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done += UINT_MAX/2;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 0, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete_all);
-+
-+static inline long __sched
-+do_wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	if (!x->done) {
-+		DECLARE_WAITQUEUE(wait, current);
-+
-+		wait.flags |= WQ_FLAG_EXCLUSIVE;
-+		__add_wait_queue_tail(&x->wait, &wait);
-+		do {
-+			if (signal_pending_state(state, current)) {
-+				timeout = -ERESTARTSYS;
-+				break;
-+			}
-+			__set_current_state(state);
-+			spin_unlock_irq(&x->wait.lock);
-+			timeout = schedule_timeout(timeout);
-+			spin_lock_irq(&x->wait.lock);
-+		} while (!x->done && timeout);
-+		__remove_wait_queue(&x->wait, &wait);
-+		if (!x->done)
-+			return timeout;
-+	}
-+	x->done--;
-+	return timeout ?: 1;
-+}
-+
-+static long __sched
-+wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	might_sleep();
-+
-+	spin_lock_irq(&x->wait.lock);
-+	timeout = do_wait_for_common(x, timeout, state);
-+	spin_unlock_irq(&x->wait.lock);
-+	return timeout;
-+}
-+
-+/**
-+ * wait_for_completion: - waits for completion of a task
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It is NOT
-+ * interruptible and there is no timeout.
-+ *
-+ * See also similar routines (i.e. wait_for_completion_timeout()) with timeout
-+ * and interrupt capability. Also see complete().
-+ */
-+void __sched wait_for_completion(struct completion *x)
-+{
-+	wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion);
-+
-+/**
-+ * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. The timeout is in jiffies. It is not
-+ * interruptible.
-+ */
-+unsigned long __sched
-+wait_for_completion_timeout(struct completion *x, unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_timeout);
-+
-+/**
-+ * wait_for_completion_interruptible: - waits for completion of a task (w/intr)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits for completion of a specific task to be signaled. It is
-+ * interruptible.
-+ */
-+int __sched wait_for_completion_interruptible(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible);
-+
-+/**
-+ * wait_for_completion_interruptible_timeout: - waits for completion (w/(to,intr))
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. It is interruptible. The timeout is in jiffies.
-+ */
-+unsigned long __sched
-+wait_for_completion_interruptible_timeout(struct completion *x,
-+					  unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_INTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
-+
-+/**
-+ * wait_for_completion_killable: - waits for completion of a task (killable)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It can be
-+ * interrupted by a kill signal.
-+ */
-+int __sched wait_for_completion_killable(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_killable);
-+
-+/**
-+ *	try_wait_for_completion - try to decrement a completion without blocking
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if a decrement cannot be done without blocking
-+ *		 1 if a decrement succeeded.
-+ *
-+ *	If a completion is being used as a counting completion,
-+ *	attempt to decrement the counter without blocking. This
-+ *	enables us to avoid waiting if the resource the completion
-+ *	is protecting is not available.
-+ */
-+bool try_wait_for_completion(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	else
-+		x->done--;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(try_wait_for_completion);
-+
-+/**
-+ *	completion_done - Test to see if a completion has any waiters
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if there are waiters (wait_for_completion() in progress)
-+ *		 1 if there are no waiters.
-+ *
-+ */
-+bool completion_done(struct completion *x)
-+{
-+	int ret = 1;
-+
-+	spin_lock_irq(&x->wait.lock);
-+	if (!x->done)
-+		ret = 0;
-+	spin_unlock_irq(&x->wait.lock);
-+	return ret;
-+}
-+EXPORT_SYMBOL(completion_done);
-+
-+static long __sched
-+sleep_on_common(wait_queue_head_t *q, int state, long timeout)
-+{
-+	unsigned long flags;
-+	wait_queue_t wait;
-+
-+	init_waitqueue_entry(&wait, current);
-+
-+	__set_current_state(state);
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__add_wait_queue(q, &wait);
-+	spin_unlock(&q->lock);
-+	timeout = schedule_timeout(timeout);
-+	spin_lock_irq(&q->lock);
-+	__remove_wait_queue(q, &wait);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+
-+	return timeout;
-+}
-+
-+void __sched interruptible_sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on);
-+
-+long __sched
-+interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_INTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on_timeout);
-+
-+void __sched sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(sleep_on);
-+
-+long __sched sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_UNINTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(sleep_on_timeout);
-+
-+#ifdef CONFIG_RT_MUTEXES
-+
-+/*
-+ * rt_mutex_setprio - set the current priority of a task
-+ * @p: task
-+ * @prio: prio value (kernel-internal form)
-+ *
-+ * This function changes the 'effective' priority of a task. It does
-+ * not touch ->normal_prio like __setscheduler().
-+ *
-+ * Used by the rt_mutex code to implement priority inheritance logic.
-+ */
-+void rt_mutex_setprio(struct task_struct *p, int prio)
-+{
-+	unsigned long flags;
-+	int queued, oldprio;
-+	struct rq *rq;
-+
-+	BUG_ON(prio < 0 || prio > MAX_PRIO);
-+
-+	rq = time_task_grq_lock(p, &flags);
-+
-+	oldprio = p->prio;
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	p->prio = prio;
-+	if (task_running(p) && prio > oldprio)
-+		resched_task(p);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	task_grq_unlock(&flags);
-+}
-+
-+#endif
-+
-+/*
-+ * Adjust the deadline for when the priority is to change, before it's
-+ * changed.
-+ */
-+static void adjust_deadline(struct task_struct *p, int new_prio)
-+{
-+	p->deadline += (prio_ratios[USER_PRIO(new_prio)] - pratio(p)) *
-+			rr_interval * HZ / 1000 / 100;
-+}
-+
-+void set_user_nice(struct task_struct *p, long nice)
-+{
-+	int queued, new_static;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (TASK_NICE(p) == nice || nice < -20 || nice > 19)
-+		return;
-+	new_static = NICE_TO_PRIO(nice);
-+	/*
-+	 * We have to be careful, if called from sys_setpriority(),
-+	 * the task might be in the middle of scheduling on another CPU.
-+	 */
-+	rq = time_task_grq_lock(p, &flags);
-+	/*
-+	 * The RT priorities are set via sched_setscheduler(), but we still
-+	 * allow the 'normal' nice value to be set - but as expected
-+	 * it wont have any effect on scheduling until the task is
-+	 * not SCHED_NORMAL/SCHED_BATCH:
-+	 */
-+	if (has_rt_policy(p)) {
-+		p->static_prio = new_static;
-+		goto out_unlock;
-+	}
-+	queued = task_queued_only(p);
-+	/*
-+	 * If p is actually running, we don't need to do anything when
-+	 * changing the priority because the grq is unaffected.
-+	 */
-+	if (queued)
-+		dequeue_task(p);
-+
-+	adjust_deadline(p, new_static);
-+	p->static_prio = new_static;
-+	p->prio = effective_prio(p);
-+
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+
-+	/* Just resched the task, schedule() will know what to do. */
-+	if (task_running(p))
-+		resched_task(p);
-+out_unlock:
-+	task_grq_unlock(&flags);
-+}
-+EXPORT_SYMBOL(set_user_nice);
-+
-+/*
-+ * can_nice - check if a task can reduce its nice value
-+ * @p: task
-+ * @nice: nice value
-+ */
-+int can_nice(const struct task_struct *p, const int nice)
-+{
-+	/* convert nice value [19,-20] to rlimit style value [1,40] */
-+	int nice_rlim = 20 - nice;
-+
-+	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
-+		capable(CAP_SYS_NICE));
-+}
-+
-+#ifdef __ARCH_WANT_SYS_NICE
-+
-+/*
-+ * sys_nice - change the priority of the current process.
-+ * @increment: priority increment
-+ *
-+ * sys_setpriority is a more generic, but much slower function that
-+ * does similar things.
-+ */
-+SYSCALL_DEFINE1(nice, int, increment)
-+{
-+	long nice, retval;
-+
-+	/*
-+	 * Setpriority might change our priority at the same moment.
-+	 * We don't have to worry. Conceptually one call occurs first
-+	 * and we have a single winner.
-+	 */
-+	if (increment < -40)
-+		increment = -40;
-+	if (increment > 40)
-+		increment = 40;
-+
-+	nice = TASK_NICE(current) + increment;
-+	if (nice < -20)
-+		nice = -20;
-+	if (nice > 19)
-+		nice = 19;
-+
-+	if (increment < 0 && !can_nice(current, nice))
-+		return -EPERM;
-+
-+	retval = security_task_setnice(current, nice);
-+	if (retval)
-+		return retval;
-+
-+	set_user_nice(current, nice);
-+	return 0;
-+}
-+
-+#endif
-+
-+/**
-+ * task_prio - return the priority value of a given task.
-+ * @p: the task in question.
-+ *
-+ * This is the priority value as seen by users in /proc.
-+ * RT tasks are offset by -100. Normal tasks are centered
-+ * around 1, value goes from 0 (SCHED_ISO) up to 82 (nice +19
-+ * SCHED_IDLE).
-+ */
-+int task_prio(const struct task_struct *p)
-+{
-+	int delta, prio = p->prio - MAX_RT_PRIO;
-+
-+	/* rt tasks and iso tasks */
-+	if (prio <= 0)
-+		goto out;
-+
-+	delta = (p->deadline - jiffies) * 40 / longest_deadline();
-+	if (delta > 0 && delta <= 80)
-+		prio += delta;
-+out:
-+	return prio;
-+}
-+
-+/**
-+ * task_nice - return the nice value of a given task.
-+ * @p: the task in question.
-+ */
-+int task_nice(const struct task_struct *p)
-+{
-+	return TASK_NICE(p);
-+}
-+EXPORT_SYMBOL_GPL(task_nice);
-+
-+/**
-+ * idle_cpu - is a given cpu idle currently?
-+ * @cpu: the processor in question.
-+ */
-+int idle_cpu(int cpu)
-+{
-+	return cpu_curr(cpu) == cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * idle_task - return the idle task for a given cpu.
-+ * @cpu: the processor in question.
-+ */
-+struct task_struct *idle_task(int cpu)
-+{
-+	return cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * find_process_by_pid - find a process with a matching PID value.
-+ * @pid: the pid in question.
-+ */
-+static inline struct task_struct *find_process_by_pid(pid_t pid)
-+{
-+	return pid ? find_task_by_vpid(pid) : current;
-+}
-+
-+/* Actually do priority change: must hold grq lock. */
-+static void __setscheduler(struct task_struct *p, int policy, int prio)
-+{
-+	BUG_ON(task_queued_only(p));
-+
-+	p->policy = policy;
-+	p->rt_priority = prio;
-+	p->normal_prio = normal_prio(p);
-+	/* we are holding p->pi_lock already */
-+	p->prio = rt_mutex_getprio(p);
-+	/*
-+	 * Reschedule if running. schedule() will know if it can continue
-+	 * running or not.
-+	 */
-+	if (task_running(p))
-+		resched_task(p);
-+}
-+
-+/*
-+ * check the target process has a UID that matches the current process's
-+ */
-+static bool check_same_owner(struct task_struct *p)
-+{
-+	const struct cred *cred = current_cred(), *pcred;
-+	bool match;
-+
-+	rcu_read_lock();
-+	pcred = __task_cred(p);
-+	match = (cred->euid == pcred->euid ||
-+		 cred->euid == pcred->uid);
-+	rcu_read_unlock();
-+	return match;
-+}
-+
-+static int __sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param, bool user)
-+{
-+	struct sched_param zero_param = { .sched_priority = 0 };
-+	int queued, retval, oldprio, oldpolicy = -1;
-+	unsigned long flags, rlim_rtprio = 0;
-+	struct rq *rq;
-+
-+	/* may grab non-irq protected spin_locks */
-+	BUG_ON(in_interrupt());
-+
-+	if (is_rt_policy(policy) && !capable(CAP_SYS_NICE)) {
-+		unsigned long lflags;
-+
-+		if (!lock_task_sighand(p, &lflags))
-+			return -ESRCH;
-+		rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-+		unlock_task_sighand(p, &lflags);
-+		if (rlim_rtprio)
-+			goto recheck;
-+		/*
-+		 * If the caller requested an RT policy without having the
-+		 * necessary rights, we downgrade the policy to SCHED_ISO.
-+		 * We also set the parameter to zero to pass the checks.
-+		 */
-+		policy = SCHED_ISO;
-+		param = &zero_param;
-+	}
-+recheck:
-+	/* double check policy once rq lock held */
-+	if (policy < 0)
-+		policy = oldpolicy = p->policy;
-+	else if (!SCHED_RANGE(policy))
-+		return -EINVAL;
-+	/*
-+	 * Valid priorities for SCHED_FIFO and SCHED_RR are
-+	 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL and
-+	 * SCHED_BATCH is 0.
-+	 */
-+	if (param->sched_priority < 0 ||
-+	    (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
-+	    (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
-+		return -EINVAL;
-+	if (is_rt_policy(policy) != (param->sched_priority != 0))
-+		return -EINVAL;
-+
-+	/*
-+	 * Allow unprivileged RT tasks to decrease priority:
-+	 */
-+	if (user && !capable(CAP_SYS_NICE)) {
-+		if (is_rt_policy(policy)) {
-+			/* can't set/change the rt policy */
-+			if (policy != p->policy && !rlim_rtprio)
-+				return -EPERM;
-+
-+			/* can't increase priority */
-+			if (param->sched_priority > p->rt_priority &&
-+			    param->sched_priority > rlim_rtprio)
-+				return -EPERM;
-+		} else {
-+			switch (p->policy) {
-+				/*
-+				 * Can only downgrade policies but not back to
-+				 * SCHED_NORMAL
-+				 */
-+				case SCHED_ISO:
-+					if (policy == SCHED_ISO)
-+						goto out;
-+					if (policy == SCHED_NORMAL)
-+						return -EPERM;
-+					break;
-+				case SCHED_BATCH:
-+					if (policy == SCHED_BATCH)
-+						goto out;
-+					if (policy != SCHED_IDLE)
-+					    	return -EPERM;
-+					break;
-+				case SCHED_IDLE:
-+					if (policy == SCHED_IDLE)
-+						goto out;
-+					return -EPERM;
-+				default:
-+					break;
-+			}
-+		}
-+
-+		/* can't change other user's priorities */
-+		if (!check_same_owner(p))
-+			return -EPERM;
-+	}
-+
-+	retval = security_task_setscheduler(p, policy, param);
-+	if (retval)
-+		return retval;
-+	/*
-+	 * make sure no PI-waiters arrive (or leave) while we are
-+	 * changing the priority of the task:
-+	 */
-+	spin_lock_irqsave(&p->pi_lock, flags);
-+	/*
-+	 * To be able to change p->policy safely, the apropriate
-+	 * runqueue lock must be held.
-+	 */
-+	rq = __task_grq_lock(p);
-+	/* recheck policy now with rq lock held */
-+	if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+		policy = oldpolicy = -1;
-+		goto recheck;
-+	}
-+	update_rq_clock(rq);
-+	queued = task_queued_only(p);
-+	if (queued)
-+		dequeue_task(p);
-+	oldprio = p->prio;
-+	__setscheduler(p, policy, param->sched_priority);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p);
-+	}
-+	__task_grq_unlock();
-+	spin_unlock_irqrestore(&p->pi_lock, flags);
-+
-+	rt_mutex_adjust_pi(p);
-+out:
-+	return 0;
-+}
-+
-+/**
-+ * sched_setscheduler - change the scheduling policy and/or RT priority of a thread.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * NOTE that the task may be already dead.
-+ */
-+int sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, true);
-+}
-+
-+EXPORT_SYMBOL_GPL(sched_setscheduler);
-+
-+/**
-+ * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * Just like sched_setscheduler, only don't bother checking if the
-+ * current context has permission.  For example, this is needed in
-+ * stop_machine(): we create temporary high priority worker threads,
-+ * but our caller might not have that capability.
-+ */
-+int sched_setscheduler_nocheck(struct task_struct *p, int policy,
-+			       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, false);
-+}
-+
-+static int
-+do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
-+{
-+	struct sched_param lparam;
-+	struct task_struct *p;
-+	int retval;
-+
-+	if (!param || pid < 0)
-+		return -EINVAL;
-+	if (copy_from_user(&lparam, param, sizeof(struct sched_param)))
-+		return -EFAULT;
-+
-+	rcu_read_lock();
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (p != NULL)
-+		retval = sched_setscheduler(p, policy, &lparam);
-+	rcu_read_unlock();
-+
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_setscheduler - set/change the scheduler policy and RT priority
-+ * @pid: the pid in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ */
-+asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
-+				       struct sched_param __user *param)
-+{
-+	/* negative values for policy are not valid */
-+	if (policy < 0)
-+		return -EINVAL;
-+
-+	return do_sched_setscheduler(pid, policy, param);
-+}
-+
-+/**
-+ * sys_sched_setparam - set/change the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the new RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	return do_sched_setscheduler(pid, -1, param);
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the policy (scheduling class) of a thread
-+ * @pid: the pid in question.
-+ */
-+SYSCALL_DEFINE1(sched_getscheduler, pid_t, pid)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (p) {
-+		retval = security_task_getscheduler(p);
-+		if (!retval)
-+			retval = p->policy;
-+	}
-+	read_unlock(&tasklist_lock);
-+
-+out_nounlock:
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	struct sched_param lp;
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (!param || pid < 0)
-+		goto out_nounlock;
-+
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	retval = -ESRCH;
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	lp.sched_priority = p->rt_priority;
-+	read_unlock(&tasklist_lock);
-+
-+	/*
-+	 * This one might sleep, we cannot do it with a spinlock held ...
-+	 */
-+	retval = copy_to_user(param, &lp, sizeof(*param)) ? -EFAULT : 0;
-+
-+out_nounlock:
-+	return retval;
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
-+{
-+	cpumask_var_t cpus_allowed, new_mask;
-+	struct task_struct *p;
-+	int retval;
-+
-+	get_online_cpus();
-+	read_lock(&tasklist_lock);
-+
-+	p = find_process_by_pid(pid);
-+	if (!p) {
-+		read_unlock(&tasklist_lock);
-+		put_online_cpus();
-+		return -ESRCH;
-+	}
-+
-+	/*
-+	 * It is not safe to call set_cpus_allowed with the
-+	 * tasklist_lock held. We will bump the task_struct's
-+	 * usage count and then drop tasklist_lock.
-+	 */
-+	get_task_struct(p);
-+	read_unlock(&tasklist_lock);
-+
-+	if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_put_task;
-+	}
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_free_cpus_allowed;
-+	}
-+	retval = -EPERM;
-+	if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
-+		goto out_unlock;
-+
-+	retval = security_task_setscheduler(p, 0, NULL);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpuset_cpus_allowed(p, cpus_allowed);
-+	cpumask_and(new_mask, in_mask, cpus_allowed);
-+again:
-+	retval = set_cpus_allowed_ptr(p, new_mask);
-+
-+	if (!retval) {
-+		cpuset_cpus_allowed(p, cpus_allowed);
-+		if (!cpumask_subset(new_mask, cpus_allowed)) {
-+			/*
-+			 * We must have raced with a concurrent cpuset
-+			 * update. Just reset the cpus_allowed to the
-+			 * cpuset's cpus_allowed
-+			 */
-+			cpumask_copy(new_mask, cpus_allowed);
-+			goto again;
-+		}
-+	}
-+out_unlock:
-+	free_cpumask_var(new_mask);
-+out_free_cpus_allowed:
-+	free_cpumask_var(cpus_allowed);
-+out_put_task:
-+	put_task_struct(p);
-+	put_online_cpus();
-+	return retval;
-+}
-+
-+static int get_user_cpu_mask(unsigned long __user *user_mask_ptr, unsigned len,
-+			     cpumask_t *new_mask)
-+{
-+	if (len < sizeof(cpumask_t)) {
-+		memset(new_mask, 0, sizeof(cpumask_t));
-+	} else if (len > sizeof(cpumask_t)) {
-+		len = sizeof(cpumask_t);
-+	}
-+	return copy_from_user(new_mask, user_mask_ptr, len) ? -EFAULT : 0;
-+}
-+
-+
-+/**
-+ * sys_sched_setaffinity - set the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to the new cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_setaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	cpumask_var_t new_mask;
-+	int retval;
-+
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	retval = get_user_cpu_mask(user_mask_ptr, len, new_mask);
-+	if (retval == 0)
-+		retval = sched_setaffinity(pid, new_mask);
-+	free_cpumask_var(new_mask);
-+	return retval;
-+}
-+
-+long sched_getaffinity(pid_t pid, cpumask_t *mask)
-+{
-+	struct task_struct *p;
-+	int retval;
-+
-+	mutex_lock(&sched_hotcpu_mutex);
-+	read_lock(&tasklist_lock);
-+
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpus_and(*mask, p->cpus_allowed, cpu_online_map);
-+
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	mutex_unlock(&sched_hotcpu_mutex);
-+	if (retval)
-+		return retval;
-+
-+	return 0;
-+}
-+
-+/**
-+ * sys_sched_getaffinity - get the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to hold the current cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	int ret;
-+	cpumask_var_t mask;
-+
-+	if (len < cpumask_size())
-+		return -EINVAL;
-+
-+	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	ret = sched_getaffinity(pid, mask);
-+	if (ret == 0) {
-+		if (copy_to_user(user_mask_ptr, mask, cpumask_size()))
-+			ret = -EFAULT;
-+		else
-+			ret = cpumask_size();
-+	}
-+	free_cpumask_var(mask);
-+
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_yield - yield the current processor to other threads.
-+ *
-+ * This function yields the current CPU to other tasks. It does this by
-+ * refilling the timeslice, resetting the deadline and scheduling away.
-+ */
-+SYSCALL_DEFINE0(sched_yield)
-+{
-+	struct task_struct *p;
-+
-+	grq_lock_irq();
-+	p = current;
-+	schedstat_inc(this_rq(), yld_count);
-+	update_rq_clock(task_rq(p));
-+	time_slice_expired(p);
-+	requeue_task(p);
-+
-+	/*
-+	 * Since we are going to call schedule() anyway, there's
-+	 * no need to preempt or enable interrupts:
-+	 */
-+	__release(grq.lock);
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+	_raw_spin_unlock(&grq.lock);
-+	preempt_enable_no_resched();
-+
-+	schedule();
-+
-+	return 0;
-+}
-+
-+static inline int should_resched(void)
-+{
-+	return need_resched() && !(preempt_count() & PREEMPT_ACTIVE);
-+}
-+
-+static void __cond_resched(void)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+	__might_sleep(__FILE__, __LINE__);
-+#endif
-+	/*
-+	 * The BKS might be reacquired before we have dropped
-+	 * PREEMPT_ACTIVE, which could trigger a second
-+	 * cond_resched() call.
-+	 */
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+	} while (need_resched());
-+}
-+
-+int __sched _cond_resched(void)
-+{
-+	if (should_resched()) {
-+		__cond_resched();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(_cond_resched);
-+
-+/*
-+ * cond_resched_lock() - if a reschedule is pending, drop the given lock,
-+ * call schedule, and on return reacquire the lock.
-+ *
-+ * This works OK both with and without CONFIG_PREEMPT.  We do strange low-level
-+ * operations here to prevent schedule() from being called twice (once via
-+ * spin_unlock(), once by hand).
-+ */
-+int cond_resched_lock(spinlock_t *lock)
-+{
-+	int resched = should_resched();
-+	int ret = 0;
-+
-+	if (spin_needbreak(lock) || resched) {
-+		spin_unlock(lock);
-+		if (resched)
-+			__cond_resched();
-+		else
-+			cpu_relax();
-+		ret = 1;
-+		spin_lock(lock);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL(cond_resched_lock);
-+
-+int __sched cond_resched_softirq(void)
-+{
-+	BUG_ON(!in_softirq());
-+
-+	if (should_resched()) {
-+		local_bh_enable();
-+		__cond_resched();
-+		local_bh_disable();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(cond_resched_softirq);
-+
-+/**
-+ * yield - yield the current processor to other threads.
-+ *
-+ * This is a shortcut for kernel-space yielding - it marks the
-+ * thread runnable and calls sys_sched_yield().
-+ */
-+void __sched yield(void)
-+{
-+	set_current_state(TASK_RUNNING);
-+	sys_sched_yield();
-+}
-+EXPORT_SYMBOL(yield);
-+
-+/*
-+ * This task is about to go to sleep on IO.  Increment rq->nr_iowait so
-+ * that process accounting knows that this is a task in IO wait state.
-+ *
-+ * But don't do that if it is a deliberate, throttling IO wait (this task
-+ * has set its backing_dev_info: the queue against which it should throttle)
-+ */
-+void __sched io_schedule(void)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	schedule();
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+}
-+EXPORT_SYMBOL(io_schedule);
-+
-+long __sched io_schedule_timeout(long timeout)
-+{
-+	struct rq *rq = &__raw_get_cpu_var(runqueues);
-+	long ret;
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	ret = schedule_timeout(timeout);
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_max - return maximum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the maximum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_max, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = MAX_USER_RT_PRIO-1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_min - return minimum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the minimum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_min, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = 1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLE:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_rr_get_interval - return the default timeslice of a process.
-+ * @pid: pid of the process.
-+ * @interval: userspace pointer to the timeslice value.
-+ *
-+ * this syscall writes the default timeslice value of a given process
-+ * into the user-space timespec buffer. A value of '0' means infinity.
-+ */
-+SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
-+		struct timespec __user *, interval)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+	struct timespec t;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	read_lock(&tasklist_lock);
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	t = ns_to_timespec(p->policy == SCHED_FIFO ? 0 :
-+			   MS_TO_NS(task_timeslice(p)));
-+	read_unlock(&tasklist_lock);
-+	retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
-+out_nounlock:
-+	return retval;
-+out_unlock:
-+	read_unlock(&tasklist_lock);
-+	return retval;
-+}
-+
-+static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-+
-+void sched_show_task(struct task_struct *p)
-+{
-+	unsigned long free = 0;
-+	unsigned state;
-+
-+	state = p->state ? __ffs(p->state) + 1 : 0;
-+	printk(KERN_INFO "%-13.13s %c", p->comm,
-+		state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-+#if BITS_PER_LONG == 32
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT " running  ");
-+	else
-+		printk(KERN_CONT " %08lx ", thread_saved_pc(p));
-+#else
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT "  running task    ");
-+	else
-+		printk(KERN_CONT " %016lx ", thread_saved_pc(p));
-+#endif
-+#ifdef CONFIG_DEBUG_STACK_USAGE
-+	free = stack_not_used(p);
-+#endif
-+	printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
-+		task_pid_nr(p), task_pid_nr(p->real_parent),
-+		(unsigned long)task_thread_info(p)->flags);
-+
-+	show_stack(p, NULL);
-+}
-+
-+void show_state_filter(unsigned long state_filter)
-+{
-+	struct task_struct *g, *p;
-+
-+#if BITS_PER_LONG == 32
-+	printk(KERN_INFO
-+		"  task                PC stack   pid father\n");
-+#else
-+	printk(KERN_INFO
-+		"  task                        PC stack   pid father\n");
-+#endif
-+	read_lock(&tasklist_lock);
-+	do_each_thread(g, p) {
-+		/*
-+		 * reset the NMI-timeout, listing all files on a slow
-+		 * console might take alot of time:
-+		 */
-+		touch_nmi_watchdog();
-+		if (!state_filter || (p->state & state_filter))
-+			sched_show_task(p);
-+	} while_each_thread(g, p);
-+
-+	touch_all_softlockup_watchdogs();
-+
-+	read_unlock(&tasklist_lock);
-+	/*
-+	 * Only show locks if all tasks are dumped:
-+	 */
-+	if (state_filter == -1)
-+		debug_show_all_locks();
-+}
-+
-+/**
-+ * init_idle - set up an idle thread for a given CPU
-+ * @idle: task in question
-+ * @cpu: cpu the idle task belongs to
-+ *
-+ * NOTE: this function does not set the idle thread's NEED_RESCHED
-+ * flag, to make booting more robust.
-+ */
-+void __cpuinit init_idle(struct task_struct *idle, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	unsigned long flags;
-+
-+	time_grq_lock(rq, &flags);
-+	idle->timestamp = idle->last_ran = rq->clock;
-+	idle->state = TASK_RUNNING;
-+	/* Setting prio to illegal value shouldn't matter when never queued */
-+	idle->prio = rq->rq_prio = PRIO_LIMIT;
-+	rq->rq_deadline = idle->deadline;
-+	rq->rq_policy = idle->policy;
-+	rq->rq_time_slice = idle->rt.time_slice;
-+	idle->cpus_allowed = cpumask_of_cpu(cpu);
-+	set_task_cpu(idle, cpu);
-+	rq->curr = rq->idle = idle;
-+	idle->oncpu = 1;
-+	set_cpuidle_map(cpu);
-+#ifdef CONFIG_HOTPLUG_CPU
-+	idle->unplugged_mask = CPU_MASK_NONE;
-+#endif
-+	grq_unlock_irqrestore(&flags);
-+
-+	/* Set the preempt count _outside_ the spinlocks! */
-+#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-+	task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
-+#else
-+	task_thread_info(idle)->preempt_count = 0;
-+#endif
-+	ftrace_graph_init_task(idle);
-+}
-+
-+/*
-+ * In a system that switches off the HZ timer nohz_cpu_mask
-+ * indicates which cpus entered this state. This is used
-+ * in the rcu update to wait only for active cpus. For system
-+ * which do not switch off the HZ timer nohz_cpu_mask should
-+ * always be CPU_BITS_NONE.
-+ */
-+cpumask_var_t nohz_cpu_mask;
-+
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+static struct {
-+	atomic_t load_balancer;
-+	cpumask_var_t cpu_mask;
-+	cpumask_var_t ilb_grp_nohz_mask;
-+} nohz ____cacheline_aligned = {
-+	.load_balancer = ATOMIC_INIT(-1),
-+};
-+
-+int get_nohz_load_balancer(void)
-+{
-+	return atomic_read(&nohz.load_balancer);
-+}
-+
-+/*
-+ * This routine will try to nominate the ilb (idle load balancing)
-+ * owner among the cpus whose ticks are stopped. ilb owner will do the idle
-+ * load balancing on behalf of all those cpus. If all the cpus in the system
-+ * go into this tickless mode, then there will be no ilb owner (as there is
-+ * no need for one) and all the cpus will sleep till the next wakeup event
-+ * arrives...
-+ *
-+ * For the ilb owner, tick is not stopped. And this tick will be used
-+ * for idle load balancing. ilb owner will still be part of
-+ * nohz.cpu_mask..
-+ *
-+ * While stopping the tick, this cpu will become the ilb owner if there
-+ * is no other owner. And will be the owner till that cpu becomes busy
-+ * or if all cpus in the system stop their ticks at which point
-+ * there is no need for ilb owner.
-+ *
-+ * When the ilb owner becomes busy, it nominates another owner, during the
-+ * next busy scheduler_tick()
-+ */
-+int select_nohz_load_balancer(int stop_tick)
-+{
-+	int cpu = smp_processor_id();
-+
-+	if (stop_tick) {
-+		cpu_rq(cpu)->in_nohz_recently = 1;
-+
-+		if (!cpu_active(cpu)) {
-+			if (atomic_read(&nohz.load_balancer) != cpu)
-+				return 0;
-+
-+			/*
-+			 * If we are going offline and still the leader,
-+			 * give up!
-+			 */
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+
-+			return 0;
-+		}
-+
-+		cpumask_set_cpu(cpu, nohz.cpu_mask);
-+
-+		/* time for ilb owner also to sleep */
-+		if (cpumask_weight(nohz.cpu_mask) == num_online_cpus()) {
-+			if (atomic_read(&nohz.load_balancer) == cpu)
-+				atomic_set(&nohz.load_balancer, -1);
-+			return 0;
-+		}
-+
-+		if (atomic_read(&nohz.load_balancer) == -1) {
-+			/* make me the ilb owner */
-+			if (atomic_cmpxchg(&nohz.load_balancer, -1, cpu) == -1)
-+				return 1;
-+		} else if (atomic_read(&nohz.load_balancer) == cpu)
-+			return 1;
-+	} else {
-+		if (!cpumask_test_cpu(cpu, nohz.cpu_mask))
-+			return 0;
-+
-+		cpumask_clear_cpu(cpu, nohz.cpu_mask);
-+
-+		if (atomic_read(&nohz.load_balancer) == cpu)
-+			if (atomic_cmpxchg(&nohz.load_balancer, cpu, -1) != cpu)
-+				BUG();
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * When add_timer_on() enqueues a timer into the timer wheel of an
-+ * idle CPU then this timer might expire before the next timer event
-+ * which is scheduled to wake up that CPU. In case of a completely
-+ * idle system the next event might even be infinite time into the
-+ * future. wake_up_idle_cpu() ensures that the CPU is woken up and
-+ * leaves the inner idle loop so the newly added timer is taken into
-+ * account when the CPU goes back to idle and evaluates the timer
-+ * wheel for the next timer event.
-+ */
-+void wake_up_idle_cpu(int cpu)
-+{
-+	struct task_struct *idle;
-+	struct rq *rq;
-+
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	rq = cpu_rq(cpu);
-+	idle = rq->idle;
-+
-+	/*
-+	 * This is safe, as this function is called with the timer
-+	 * wheel base lock of (cpu) held. When the CPU is on the way
-+	 * to idle and has not yet set rq->curr to idle then it will
-+	 * be serialized on the timer wheel base lock and take the new
-+	 * timer into account automatically.
-+	 */
-+	if (unlikely(rq->curr != idle))
-+		return;
-+
-+	/*
-+	 * We can set TIF_RESCHED on the idle task of the other CPU
-+	 * lockless. The worst case is that the other CPU runs the
-+	 * idle task through an additional NOOP schedule()
-+	 */
-+	set_tsk_need_resched(idle);
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(idle))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#endif /* CONFIG_NO_HZ */
-+
-+/*
-+ * Change a given task's CPU affinity. Migrate the thread to a
-+ * proper CPU and schedule it away if the CPU it's executing on
-+ * is removed from the allowed bitmask.
-+ *
-+ * NOTE: the caller must have a valid reference to the task, the
-+ * task must not exit() & deallocate itself prematurely. The
-+ * call is not atomic; no spinlocks may be held.
-+ */
-+int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
-+{
-+	unsigned long flags;
-+	int running = 0;
-+	int queued = 0;
-+	struct rq *rq;
-+	int ret = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+	if (!cpumask_intersects(new_mask, cpu_online_mask)) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (unlikely((p->flags & PF_THREAD_BOUND) && p != current &&
-+		     !cpumask_equal(&p->cpus_allowed, new_mask))) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	queued = task_queued_only(p);
-+
-+	cpumask_copy(&p->cpus_allowed, new_mask);
-+	p->rt.nr_cpus_allowed = cpumask_weight(new_mask);
-+
-+	/* Can the task run on the task's current CPU? If so, we're done */
-+	if (cpumask_test_cpu(task_cpu(p), new_mask))
-+		goto out;
-+
-+	/* Reschedule the task, schedule() will know if it can keep running */
-+	if (task_running(p))
-+		running = 1;
-+	else
-+		set_task_cpu(p, cpumask_any_and(cpu_online_mask, new_mask));
-+
-+out:
-+	if (queued)
-+		try_preempt(p);
-+	task_grq_unlock(&flags);
-+
-+	/* This might be a flaky way of changing cpus! */
-+	if (running)
-+		schedule();
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/* Schedules idle task to be the next runnable task on current CPU.
-+ * It does so by boosting its priority to highest possible.
-+ * Used by CPU offline code.
-+ */
-+void sched_idle_next(void)
-+{
-+	int this_cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(this_cpu);
-+	struct task_struct *idle = rq->idle;
-+	unsigned long flags;
-+
-+	/* cpu has to be offline */
-+	BUG_ON(cpu_online(this_cpu));
-+
-+	/*
-+	 * Strictly not necessary since rest of the CPUs are stopped by now
-+	 * and interrupts disabled on the current cpu.
-+	 */
-+	time_grq_lock(rq, &flags);
-+
-+	__setscheduler(idle, SCHED_FIFO, MAX_RT_PRIO - 1);
-+
-+	activate_idle_task(idle);
-+	set_tsk_need_resched(rq->curr);
-+
-+	grq_unlock_irqrestore(&flags);
-+}
-+
-+/*
-+ * Ensures that the idle task is using init_mm right before its cpu goes
-+ * offline.
-+ */
-+void idle_task_exit(void)
-+{
-+	struct mm_struct *mm = current->active_mm;
-+
-+	BUG_ON(cpu_online(smp_processor_id()));
-+
-+	if (mm != &init_mm)
-+		switch_mm(mm, &init_mm, current);
-+	mmdrop(mm);
-+}
-+
-+#endif /* CONFIG_HOTPLUG_CPU */
-+
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
-+
-+static struct ctl_table sd_ctl_dir[] = {
-+	{
-+		.procname	= "sched_domain",
-+		.mode		= 0555,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table sd_ctl_root[] = {
-+	{
-+		.ctl_name	= CTL_KERN,
-+		.procname	= "kernel",
-+		.mode		= 0555,
-+		.child		= sd_ctl_dir,
-+	},
-+	{0, },
-+};
-+
-+static struct ctl_table *sd_alloc_ctl_entry(int n)
-+{
-+	struct ctl_table *entry =
-+		kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
-+
-+	return entry;
-+}
-+
-+static void sd_free_ctl_entry(struct ctl_table **tablep)
-+{
-+	struct ctl_table *entry;
-+
-+	/*
-+	 * In the intermediate directories, both the child directory and
-+	 * procname are dynamically allocated and could fail but the mode
-+	 * will always be set. In the lowest directory the names are
-+	 * static strings and all have proc handlers.
-+	 */
-+	for (entry = *tablep; entry->mode; entry++) {
-+		if (entry->child)
-+			sd_free_ctl_entry(&entry->child);
-+		if (entry->proc_handler == NULL)
-+			kfree(entry->procname);
-+	}
-+
-+	kfree(*tablep);
-+	*tablep = NULL;
-+}
-+
-+static void
-+set_table_entry(struct ctl_table *entry,
-+		const char *procname, void *data, int maxlen,
-+		mode_t mode, proc_handler *proc_handler)
-+{
-+	entry->procname = procname;
-+	entry->data = data;
-+	entry->maxlen = maxlen;
-+	entry->mode = mode;
-+	entry->proc_handler = proc_handler;
-+}
-+
-+static struct ctl_table *
-+sd_alloc_ctl_domain_table(struct sched_domain *sd)
-+{
-+	struct ctl_table *table = sd_alloc_ctl_entry(13);
-+
-+	if (table == NULL)
-+		return NULL;
-+
-+	set_table_entry(&table[0], "min_interval", &sd->min_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[1], "max_interval", &sd->max_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[2], "busy_idx", &sd->busy_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[3], "idle_idx", &sd->idle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[4], "newidle_idx", &sd->newidle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[5], "wake_idx", &sd->wake_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[6], "forkexec_idx", &sd->forkexec_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[7], "busy_factor", &sd->busy_factor,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[8], "imbalance_pct", &sd->imbalance_pct,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[9], "cache_nice_tries",
-+		&sd->cache_nice_tries,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[10], "flags", &sd->flags,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[11], "name", sd->name,
-+		CORENAME_MAX_SIZE, 0444, proc_dostring);
-+	/* &table[12] is terminator */
-+
-+	return table;
-+}
-+
-+static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
-+{
-+	struct ctl_table *entry, *table;
-+	struct sched_domain *sd;
-+	int domain_num = 0, i;
-+	char buf[32];
-+
-+	for_each_domain(cpu, sd)
-+		domain_num++;
-+	entry = table = sd_alloc_ctl_entry(domain_num + 1);
-+	if (table == NULL)
-+		return NULL;
-+
-+	i = 0;
-+	for_each_domain(cpu, sd) {
-+		snprintf(buf, 32, "domain%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_domain_table(sd);
-+		entry++;
-+		i++;
-+	}
-+	return table;
-+}
-+
-+static struct ctl_table_header *sd_sysctl_header;
-+static void register_sched_domain_sysctl(void)
-+{
-+	int i, cpu_num = num_online_cpus();
-+	struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
-+	char buf[32];
-+
-+	WARN_ON(sd_ctl_dir[0].child);
-+	sd_ctl_dir[0].child = entry;
-+
-+	if (entry == NULL)
-+		return;
-+
-+	for_each_online_cpu(i) {
-+		snprintf(buf, 32, "cpu%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_cpu_table(i);
-+		entry++;
-+	}
-+
-+	WARN_ON(sd_sysctl_header);
-+	sd_sysctl_header = register_sysctl_table(sd_ctl_root);
-+}
-+
-+/* may be called multiple times per register */
-+static void unregister_sched_domain_sysctl(void)
-+{
-+	if (sd_sysctl_header)
-+		unregister_sysctl_table(sd_sysctl_header);
-+	sd_sysctl_header = NULL;
-+	if (sd_ctl_dir[0].child)
-+		sd_free_ctl_entry(&sd_ctl_dir[0].child);
-+}
-+#else
-+static void register_sched_domain_sysctl(void)
-+{
-+}
-+static void unregister_sched_domain_sysctl(void)
-+{
-+}
-+#endif
-+
-+static void set_rq_online(struct rq *rq)
-+{
-+	if (!rq->online) {
-+		cpumask_set_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 1;
-+	}
-+}
-+
-+static void set_rq_offline(struct rq *rq)
-+{
-+	if (rq->online) {
-+		cpumask_clear_cpu(rq->cpu, rq->rd->online);
-+		rq->online = 0;
-+	}
-+}
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * This cpu is going down, so walk over the tasklist and find tasks that can
-+ * only run on this cpu and remove their affinity. Store their value in
-+ * unplugged_mask so it can be restored once their correct cpu is online. No
-+ * need to do anything special since they'll just move on next reschedule if
-+ * they're running.
-+ */
-+static void remove_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		cpumask_t cpus_remaining;
-+
-+		cpus_and(cpus_remaining, p->cpus_allowed, cpu_online_map);
-+		cpu_clear(cpu, cpus_remaining);
-+		if (cpus_empty(cpus_remaining)) {
-+			p->unplugged_mask = p->cpus_allowed;
-+			p->cpus_allowed = cpu_possible_map;
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+
-+/*
-+ * This cpu is coming up so add it to the cpus_allowed.
-+ */
-+static void add_cpu(unsigned long cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	read_lock(&tasklist_lock);
-+
-+	do_each_thread(t, p) {
-+		/* Have we taken all the cpus from the unplugged_mask back */
-+		if (cpus_empty(p->unplugged_mask))
-+			continue;
-+
-+		/* Was this cpu in the unplugged_mask mask */
-+		if (cpu_isset(cpu, p->unplugged_mask)) {
-+			cpu_set(cpu, p->cpus_allowed);
-+			if (cpus_subset(p->unplugged_mask, p->cpus_allowed)) {
-+				/*
-+				 * Have we set more than the unplugged_mask?
-+				 * If so, that means we have remnants set from
-+				 * the unplug/plug cycle and need to remove
-+				 * them. Then clear the unplugged_mask as we've
-+				 * set all the cpus back.
-+				 */
-+				p->cpus_allowed = p->unplugged_mask;
-+				cpus_clear(p->unplugged_mask);
-+			}
-+		}
-+	} while_each_thread(t, p);
-+
-+	read_unlock(&tasklist_lock);
-+}
-+#else
-+static void add_cpu(unsigned long cpu)
-+{
-+}
-+#endif
-+
-+/*
-+ * migration_call - callback that gets triggered when a CPU is added.
-+ */
-+static int __cpuinit
-+migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
-+{
-+	int cpu = (long)hcpu;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	switch (action) {
-+
-+	case CPU_UP_PREPARE:
-+	case CPU_UP_PREPARE_FROZEN:
-+		break;
-+
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		/* Update our root-domain */
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+
-+			set_rq_online(rq);
-+		}
-+		add_cpu(cpu);
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+	case CPU_UP_CANCELED:
-+	case CPU_UP_CANCELED_FROZEN:
-+		break;
-+
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		cpuset_lock(); /* around calls to cpuset_cpus_allowed_lock() */
-+		rq = cpu_rq(cpu);
-+		/* Idle task back to normal (off runqueue, low prio) */
-+		grq_lock_irq();
-+		remove_cpu(cpu);
-+		deactivate_task(rq->idle);
-+		rq->idle->static_prio = MAX_PRIO;
-+		__setscheduler(rq->idle, SCHED_NORMAL, 0);
-+		rq->idle->prio = PRIO_LIMIT;
-+		update_rq_clock(rq);
-+		grq_unlock_irq();
-+		cpuset_unlock();
-+		break;
-+
-+	case CPU_DYING:
-+	case CPU_DYING_FROZEN:
-+		rq = cpu_rq(cpu);
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+			set_rq_offline(rq);
-+		}
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+#endif
-+	}
-+	return NOTIFY_OK;
-+}
-+
-+/*
-+ * Register at high priority so that task migration (migrate_all_tasks)
-+ * happens before everything else.  This has to be lower priority than
-+ * the notifier in the perf_counter subsystem, though.
-+ */
-+static struct notifier_block __cpuinitdata migration_notifier = {
-+	.notifier_call = migration_call,
-+	.priority = 10
-+};
-+
-+int __init migration_init(void)
-+{
-+	void *cpu = (void *)(long)smp_processor_id();
-+	int err;
-+
-+	/* Start one for the boot CPU: */
-+	err = migration_call(&migration_notifier, CPU_UP_PREPARE, cpu);
-+	BUG_ON(err == NOTIFY_BAD);
-+	migration_call(&migration_notifier, CPU_ONLINE, cpu);
-+	register_cpu_notifier(&migration_notifier);
-+
-+	return 0;
-+}
-+early_initcall(migration_init);
-+#endif
-+
-+/*
-+ * sched_domains_mutex serializes calls to arch_init_sched_domains,
-+ * detach_destroy_domains and partition_sched_domains.
-+ */
-+static DEFINE_MUTEX(sched_domains_mutex);
-+
-+#ifdef CONFIG_SMP
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+
-+static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
-+				  struct cpumask *groupmask)
-+{
-+	struct sched_group *group = sd->groups;
-+	char str[256];
-+
-+	cpulist_scnprintf(str, sizeof(str), sched_domain_span(sd));
-+	cpumask_clear(groupmask);
-+
-+	printk(KERN_DEBUG "%*s domain %d: ", level, "", level);
-+
-+	if (!(sd->flags & SD_LOAD_BALANCE)) {
-+		printk("does not load-balance\n");
-+		if (sd->parent)
-+			printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
-+					" has parent");
-+		return -1;
-+	}
-+
-+	printk(KERN_CONT "span %s level %s\n", str, sd->name);
-+
-+	if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
-+		printk(KERN_ERR "ERROR: domain->span does not contain "
-+				"CPU%d\n", cpu);
-+	}
-+	if (!cpumask_test_cpu(cpu, sched_group_cpus(group))) {
-+		printk(KERN_ERR "ERROR: domain->groups does not contain"
-+				" CPU%d\n", cpu);
-+	}
-+
-+	printk(KERN_DEBUG "%*s groups:", level + 1, "");
-+	do {
-+		if (!group) {
-+			printk("\n");
-+			printk(KERN_ERR "ERROR: group is NULL\n");
-+			break;
-+		}
-+
-+		if (!group->__cpu_power) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: domain->cpu_power not "
-+					"set\n");
-+			break;
-+		}
-+
-+		if (!cpumask_weight(sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: empty group\n");
-+			break;
-+		}
-+
-+		if (cpumask_intersects(groupmask, sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: repeated CPUs\n");
-+			break;
-+		}
-+
-+		cpumask_or(groupmask, groupmask, sched_group_cpus(group));
-+
-+		cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
-+
-+		printk(KERN_CONT " %s", str);
-+		if (group->__cpu_power != SCHED_LOAD_SCALE) {
-+			printk(KERN_CONT " (__cpu_power = %d)",
-+				group->__cpu_power);
-+		}
-+
-+		group = group->next;
-+	} while (group != sd->groups);
-+	printk(KERN_CONT "\n");
-+
-+	if (!cpumask_equal(sched_domain_span(sd), groupmask))
-+		printk(KERN_ERR "ERROR: groups don't span domain->span\n");
-+
-+	if (sd->parent &&
-+	    !cpumask_subset(groupmask, sched_domain_span(sd->parent)))
-+		printk(KERN_ERR "ERROR: parent span is not a superset "
-+			"of domain->span\n");
-+	return 0;
-+}
-+
-+static void sched_domain_debug(struct sched_domain *sd, int cpu)
-+{
-+	cpumask_var_t groupmask;
-+	int level = 0;
-+
-+	if (!sd) {
-+		printk(KERN_DEBUG "CPU%d attaching NULL sched-domain.\n", cpu);
-+		return;
-+	}
-+
-+	printk(KERN_DEBUG "CPU%d attaching sched-domain:\n", cpu);
-+
-+	if (!alloc_cpumask_var(&groupmask, GFP_KERNEL)) {
-+		printk(KERN_DEBUG "Cannot load-balance (out of memory)\n");
-+		return;
-+	}
-+
-+	for (;;) {
-+		if (sched_domain_debug_one(sd, cpu, level, groupmask))
-+			break;
-+		level++;
-+		sd = sd->parent;
-+		if (!sd)
-+			break;
-+	}
-+	free_cpumask_var(groupmask);
-+}
-+#else /* !CONFIG_SCHED_DEBUG */
-+# define sched_domain_debug(sd, cpu) do { } while (0)
-+#endif /* CONFIG_SCHED_DEBUG */
-+
-+static int sd_degenerate(struct sched_domain *sd)
-+{
-+	if (cpumask_weight(sched_domain_span(sd)) == 1)
-+		return 1;
-+
-+	/* Following flags need at least 2 groups */
-+	if (sd->flags & (SD_LOAD_BALANCE |
-+			 SD_BALANCE_NEWIDLE |
-+			 SD_BALANCE_FORK |
-+			 SD_BALANCE_EXEC |
-+			 SD_SHARE_CPUPOWER |
-+			 SD_SHARE_PKG_RESOURCES)) {
-+		if (sd->groups != sd->groups->next)
-+			return 0;
-+	}
-+
-+	/* Following flags don't use groups */
-+	if (sd->flags & (SD_WAKE_IDLE |
-+			 SD_WAKE_AFFINE |
-+			 SD_WAKE_BALANCE))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static int
-+sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
-+{
-+	unsigned long cflags = sd->flags, pflags = parent->flags;
-+
-+	if (sd_degenerate(parent))
-+		return 1;
-+
-+	if (!cpumask_equal(sched_domain_span(sd), sched_domain_span(parent)))
-+		return 0;
-+
-+	/* Does parent contain flags not in child? */
-+	/* WAKE_BALANCE is a subset of WAKE_AFFINE */
-+	if (cflags & SD_WAKE_AFFINE)
-+		pflags &= ~SD_WAKE_BALANCE;
-+	/* Flags needing groups don't count if only 1 group in parent */
-+	if (parent->groups == parent->groups->next) {
-+		pflags &= ~(SD_LOAD_BALANCE |
-+				SD_BALANCE_NEWIDLE |
-+				SD_BALANCE_FORK |
-+				SD_BALANCE_EXEC |
-+				SD_SHARE_CPUPOWER |
-+				SD_SHARE_PKG_RESOURCES);
-+		if (nr_node_ids == 1)
-+			pflags &= ~SD_SERIALIZE;
-+	}
-+	if (~cflags & pflags)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void free_rootdomain(struct root_domain *rd)
-+{
-+	free_cpumask_var(rd->rto_mask);
-+	free_cpumask_var(rd->online);
-+	free_cpumask_var(rd->span);
-+	kfree(rd);
-+}
-+
-+static void rq_attach_root(struct rq *rq, struct root_domain *rd)
-+{
-+	struct root_domain *old_rd = NULL;
-+	unsigned long flags;
-+
-+	grq_lock_irqsave(&flags);
-+
-+	if (rq->rd) {
-+		old_rd = rq->rd;
-+
-+		if (cpumask_test_cpu(rq->cpu, old_rd->online))
-+			set_rq_offline(rq);
-+
-+		cpumask_clear_cpu(rq->cpu, old_rd->span);
-+
-+		/*
-+		 * If we dont want to free the old_rt yet then
-+		 * set old_rd to NULL to skip the freeing later
-+		 * in this function:
-+		 */
-+		if (!atomic_dec_and_test(&old_rd->refcount))
-+			old_rd = NULL;
-+	}
-+
-+	atomic_inc(&rd->refcount);
-+	rq->rd = rd;
-+
-+	cpumask_set_cpu(rq->cpu, rd->span);
-+	if (cpumask_test_cpu(rq->cpu, cpu_online_mask))
-+		set_rq_online(rq);
-+
-+	grq_unlock_irqrestore(&flags);
-+
-+	if (old_rd)
-+		free_rootdomain(old_rd);
-+}
-+
-+static int init_rootdomain(struct root_domain *rd, bool bootmem)
-+{
-+	gfp_t gfp = GFP_KERNEL;
-+
-+	memset(rd, 0, sizeof(*rd));
-+
-+	if (bootmem)
-+		gfp = GFP_NOWAIT;
-+
-+	if (!alloc_cpumask_var(&rd->span, gfp))
-+		goto out;
-+	if (!alloc_cpumask_var(&rd->online, gfp))
-+		goto free_span;
-+	if (!alloc_cpumask_var(&rd->rto_mask, gfp))
-+		goto free_online;
-+
-+	return 0;
-+
-+free_online:
-+	free_cpumask_var(rd->online);
-+free_span:
-+	free_cpumask_var(rd->span);
-+out:
-+	return -ENOMEM;
-+}
-+
-+static void init_defrootdomain(void)
-+{
-+	init_rootdomain(&def_root_domain, true);
-+
-+	atomic_set(&def_root_domain.refcount, 1);
-+}
-+
-+static struct root_domain *alloc_rootdomain(void)
-+{
-+	struct root_domain *rd;
-+
-+	rd = kmalloc(sizeof(*rd), GFP_KERNEL);
-+	if (!rd)
-+		return NULL;
-+
-+	if (init_rootdomain(rd, false) != 0) {
-+		kfree(rd);
-+		return NULL;
-+	}
-+
-+	return rd;
-+}
-+
-+/*
-+ * Attach the domain 'sd' to 'cpu' as its base domain. Callers must
-+ * hold the hotplug lock.
-+ */
-+static void
-+cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	struct sched_domain *tmp;
-+
-+	/* Remove the sched domains which do not contribute to scheduling. */
-+	for (tmp = sd; tmp; ) {
-+		struct sched_domain *parent = tmp->parent;
-+		if (!parent)
-+			break;
-+
-+		if (sd_parent_degenerate(tmp, parent)) {
-+			tmp->parent = parent->parent;
-+			if (parent->parent)
-+				parent->parent->child = tmp;
-+		} else
-+			tmp = tmp->parent;
-+	}
-+
-+	if (sd && sd_degenerate(sd)) {
-+		sd = sd->parent;
-+		if (sd)
-+			sd->child = NULL;
-+	}
-+
-+	sched_domain_debug(sd, cpu);
-+
-+	rq_attach_root(rq, rd);
-+	rcu_assign_pointer(rq->sd, sd);
-+}
-+
-+/* cpus with isolated domains */
-+static cpumask_var_t cpu_isolated_map;
-+
-+/* Setup the mask of cpus configured for isolated domains */
-+static int __init isolated_cpu_setup(char *str)
-+{
-+	cpulist_parse(str, cpu_isolated_map);
-+	return 1;
-+}
-+
-+__setup("isolcpus=", isolated_cpu_setup);
-+
-+/*
-+ * init_sched_build_groups takes the cpumask we wish to span, and a pointer
-+ * to a function which identifies what group(along with sched group) a CPU
-+ * belongs to. The return value of group_fn must be a >= 0 and < nr_cpu_ids
-+ * (due to the fact that we keep track of groups covered with a struct cpumask).
-+ *
-+ * init_sched_build_groups will build a circular linked list of the groups
-+ * covered by the given span, and will set each group's ->cpumask correctly,
-+ * and ->cpu_power to 0.
-+ */
-+static void
-+init_sched_build_groups(const struct cpumask *span,
-+			const struct cpumask *cpu_map,
-+			int (*group_fn)(int cpu, const struct cpumask *cpu_map,
-+					struct sched_group **sg,
-+					struct cpumask *tmpmask),
-+			struct cpumask *covered, struct cpumask *tmpmask)
-+{
-+	struct sched_group *first = NULL, *last = NULL;
-+	int i;
-+
-+	cpumask_clear(covered);
-+
-+	for_each_cpu(i, span) {
-+		struct sched_group *sg;
-+		int group = group_fn(i, cpu_map, &sg, tmpmask);
-+		int j;
-+
-+		if (cpumask_test_cpu(i, covered))
-+			continue;
-+
-+		cpumask_clear(sched_group_cpus(sg));
-+		sg->__cpu_power = 0;
-+
-+		for_each_cpu(j, span) {
-+			if (group_fn(j, cpu_map, NULL, tmpmask) != group)
-+				continue;
-+
-+			cpumask_set_cpu(j, covered);
-+			cpumask_set_cpu(j, sched_group_cpus(sg));
-+		}
-+		if (!first)
-+			first = sg;
-+		if (last)
-+			last->next = sg;
-+		last = sg;
-+	}
-+	last->next = first;
-+}
-+
-+#define SD_NODES_PER_DOMAIN 16
-+
-+#ifdef CONFIG_NUMA
-+
-+/**
-+ * find_next_best_node - find the next node to include in a sched_domain
-+ * @node: node whose sched_domain we're building
-+ * @used_nodes: nodes already in the sched_domain
-+ *
-+ * Find the next node to include in a given scheduling domain. Simply
-+ * finds the closest node not already in the @used_nodes map.
-+ *
-+ * Should use nodemask_t.
-+ */
-+static int find_next_best_node(int node, nodemask_t *used_nodes)
-+{
-+	int i, n, val, min_val, best_node = 0;
-+
-+	min_val = INT_MAX;
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Start at @node */
-+		n = (node + i) % nr_node_ids;
-+
-+		if (!nr_cpus_node(n))
-+			continue;
-+
-+		/* Skip already used nodes */
-+		if (node_isset(n, *used_nodes))
-+			continue;
-+
-+		/* Simple min distance search */
-+		val = node_distance(node, n);
-+
-+		if (val < min_val) {
-+			min_val = val;
-+			best_node = n;
-+		}
-+	}
-+
-+	node_set(best_node, *used_nodes);
-+	return best_node;
-+}
-+
-+/**
-+ * sched_domain_node_span - get a cpumask for a node's sched_domain
-+ * @node: node whose cpumask we're constructing
-+ * @span: resulting cpumask
-+ *
-+ * Given a node, construct a good cpumask for its sched_domain to span. It
-+ * should be one that prevents unnecessary balancing, but also spreads tasks
-+ * out optimally.
-+ */
-+static void sched_domain_node_span(int node, struct cpumask *span)
-+{
-+	nodemask_t used_nodes;
-+	int i;
-+
-+	cpumask_clear(span);
-+	nodes_clear(used_nodes);
-+
-+	cpumask_or(span, span, cpumask_of_node(node));
-+	node_set(node, used_nodes);
-+
-+	for (i = 1; i < SD_NODES_PER_DOMAIN; i++) {
-+		int next_node = find_next_best_node(node, &used_nodes);
-+
-+		cpumask_or(span, span, cpumask_of_node(next_node));
-+	}
-+}
-+#endif /* CONFIG_NUMA */
-+
-+int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
-+
-+/*
-+ * The cpus mask in sched_group and sched_domain hangs off the end.
-+ *
-+ * ( See the the comments in include/linux/sched.h:struct sched_group
-+ *   and struct sched_domain. )
-+ */
-+struct static_sched_group {
-+	struct sched_group sg;
-+	DECLARE_BITMAP(cpus, CONFIG_NR_CPUS);
-+};
-+
-+struct static_sched_domain {
-+	struct sched_domain sd;
-+	DECLARE_BITMAP(span, CONFIG_NR_CPUS);
-+};
-+
-+/*
-+ * SMT sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_SMT
-+static DEFINE_PER_CPU(struct static_sched_domain, cpu_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_cpus);
-+
-+static int
-+cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map,
-+		 struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_cpus, cpu).sg;
-+	return cpu;
-+}
-+#endif /* CONFIG_SCHED_SMT */
-+
-+/*
-+ * multi-core sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_MC
-+static DEFINE_PER_CPU(struct static_sched_domain, core_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);
-+#endif /* CONFIG_SCHED_MC */
-+
-+#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, group).sg;
-+	return group;
-+}
-+#elif defined(CONFIG_SCHED_MC)
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, cpu).sg;
-+	return cpu;
-+}
-+#endif
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);
-+
-+static int
-+cpu_to_phys_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+#ifdef CONFIG_SCHED_MC
-+	cpumask_and(mask, cpu_coregroup_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_SMT)
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#else
-+	group = cpu;
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_phys, group).sg;
-+	return group;
-+}
-+
-+/**
-+ * group_first_cpu - Returns the first cpu in the cpumask of a sched_group.
-+ * @group: The group whose first cpu is to be returned.
-+ */
-+static inline unsigned int group_first_cpu(struct sched_group *group)
-+{
-+	return cpumask_first(sched_group_cpus(group));
-+}
-+
-+#ifdef CONFIG_NUMA
-+/*
-+ * The init_sched_build_groups can't handle what we want to do with node
-+ * groups, so roll our own. Now each node has its own list of groups which
-+ * gets dynamically allocated.
-+ */
-+static DEFINE_PER_CPU(struct static_sched_domain, node_domains);
-+static struct sched_group ***sched_group_nodes_bycpu;
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, allnodes_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_allnodes);
-+
-+static int cpu_to_allnodes_group(int cpu, const struct cpumask *cpu_map,
-+				 struct sched_group **sg,
-+				 struct cpumask *nodemask)
-+{
-+	int group;
-+
-+	cpumask_and(nodemask, cpumask_of_node(cpu_to_node(cpu)), cpu_map);
-+	group = cpumask_first(nodemask);
-+
-+	if (sg)
-+		*sg = &per_cpu(sched_group_allnodes, group).sg;
-+	return group;
-+}
-+
-+static void init_numa_sched_groups_power(struct sched_group *group_head)
-+{
-+	struct sched_group *sg = group_head;
-+	int j;
-+
-+	if (!sg)
-+		return;
-+	do {
-+		for_each_cpu(j, sched_group_cpus(sg)) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(phys_domains, j).sd;
-+			if (j != group_first_cpu(sd->groups)) {
-+				/*
-+				 * Only add "power" once for each
-+				 * physical package.
-+				 */
-+				continue;
-+			}
-+
-+			sg_inc_cpu_power(sg, sd->groups->__cpu_power);
-+		}
-+		sg = sg->next;
-+	} while (sg != group_head);
-+}
-+#endif /* CONFIG_NUMA */
-+
-+#ifdef CONFIG_NUMA
-+/* Free memory allocated for various sched_group structures */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+	int cpu, i;
-+
-+	for_each_cpu(cpu, cpu_map) {
-+		struct sched_group **sched_group_nodes
-+			= sched_group_nodes_bycpu[cpu];
-+
-+		if (!sched_group_nodes)
-+			continue;
-+
-+		for (i = 0; i < nr_node_ids; i++) {
-+			struct sched_group *oldsg, *sg = sched_group_nodes[i];
-+
-+			cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+			if (cpumask_empty(nodemask))
-+				continue;
-+
-+			if (sg == NULL)
-+				continue;
-+			sg = sg->next;
-+next_sg:
-+			oldsg = sg;
-+			sg = sg->next;
-+			kfree(oldsg);
-+			if (oldsg != sched_group_nodes[i])
-+				goto next_sg;
-+		}
-+		kfree(sched_group_nodes);
-+		sched_group_nodes_bycpu[cpu] = NULL;
-+	}
-+}
-+#else /* !CONFIG_NUMA */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+}
-+#endif /* CONFIG_NUMA */
-+
-+/*
-+ * Initialize sched groups cpu_power.
-+ *
-+ * cpu_power indicates the capacity of sched group, which is used while
-+ * distributing the load between different sched groups in a sched domain.
-+ * Typically cpu_power for all the groups in a sched domain will be same unless
-+ * there are asymmetries in the topology. If there are asymmetries, group
-+ * having more cpu_power will pickup more load compared to the group having
-+ * less cpu_power.
-+ *
-+ * cpu_power will be a multiple of SCHED_LOAD_SCALE. This multiple represents
-+ * the maximum number of tasks a group can handle in the presence of other idle
-+ * or lightly loaded groups in the same sched domain.
-+ */
-+static void init_sched_groups_power(int cpu, struct sched_domain *sd)
-+{
-+	struct sched_domain *child;
-+	struct sched_group *group;
-+
-+	WARN_ON(!sd || !sd->groups);
-+
-+	if (cpu != group_first_cpu(sd->groups))
-+		return;
-+
-+	child = sd->child;
-+
-+	sd->groups->__cpu_power = 0;
-+
-+	/*
-+	 * For perf policy, if the groups in child domain share resources
-+	 * (for example cores sharing some portions of the cache hierarchy
-+	 * or SMT), then set this domain groups cpu_power such that each group
-+	 * can handle only one task, when there are other idle groups in the
-+	 * same sched domain.
-+	 */
-+	if (!child || (!(sd->flags & SD_POWERSAVINGS_BALANCE) &&
-+		       (child->flags &
-+			(SD_SHARE_CPUPOWER | SD_SHARE_PKG_RESOURCES)))) {
-+		sg_inc_cpu_power(sd->groups, SCHED_LOAD_SCALE);
-+		return;
-+	}
-+
-+	/*
-+	 * add cpu_power of each child group to this groups cpu_power
-+	 */
-+	group = child->groups;
-+	do {
-+		sg_inc_cpu_power(sd->groups, group->__cpu_power);
-+		group = group->next;
-+	} while (group != child->groups);
-+}
-+
-+/*
-+ * Initializers for schedule domains
-+ * Non-inlined to reduce accumulated stack pressure in build_sched_domains()
-+ */
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+# define SD_INIT_NAME(sd, type)		sd->name = #type
-+#else
-+# define SD_INIT_NAME(sd, type)		do { } while (0)
-+#endif
-+
-+#define	SD_INIT(sd, type)	sd_init_##type(sd)
-+
-+#define SD_INIT_FUNC(type)	\
-+static noinline void sd_init_##type(struct sched_domain *sd)	\
-+{								\
-+	memset(sd, 0, sizeof(*sd));				\
-+	*sd = SD_##type##_INIT;					\
-+	sd->level = SD_LV_##type;				\
-+	SD_INIT_NAME(sd, type);					\
-+}
-+
-+SD_INIT_FUNC(CPU)
-+#ifdef CONFIG_NUMA
-+ SD_INIT_FUNC(ALLNODES)
-+ SD_INIT_FUNC(NODE)
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+ SD_INIT_FUNC(SIBLING)
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+ SD_INIT_FUNC(MC)
-+#endif
-+
-+static int default_relax_domain_level = -1;
-+
-+static int __init setup_relax_domain_level(char *str)
-+{
-+	unsigned long val;
-+
-+	val = simple_strtoul(str, NULL, 0);
-+	if (val < SD_LV_MAX)
-+		default_relax_domain_level = val;
-+
-+	return 1;
-+}
-+__setup("relax_domain_level=", setup_relax_domain_level);
-+
-+static void set_domain_attribute(struct sched_domain *sd,
-+				 struct sched_domain_attr *attr)
-+{
-+	int request;
-+
-+	if (!attr || attr->relax_domain_level < 0) {
-+		if (default_relax_domain_level < 0)
-+			return;
-+		else
-+			request = default_relax_domain_level;
-+	} else
-+		request = attr->relax_domain_level;
-+	if (request < sd->level) {
-+		/* turn off idle balance on this domain */
-+		sd->flags &= ~(SD_WAKE_IDLE|SD_BALANCE_NEWIDLE);
-+	} else {
-+		/* turn on idle balance on this domain */
-+		sd->flags |= (SD_WAKE_IDLE_FAR|SD_BALANCE_NEWIDLE);
-+	}
-+}
-+
-+/*
-+ * Build sched domains for a given set of cpus and attach the sched domains
-+ * to the individual cpus
-+ */
-+static int __build_sched_domains(const struct cpumask *cpu_map,
-+				 struct sched_domain_attr *attr)
-+{
-+	int i, err = -ENOMEM;
-+	struct root_domain *rd;
-+	cpumask_var_t nodemask, this_sibling_map, this_core_map, send_covered,
-+		tmpmask;
-+#ifdef CONFIG_NUMA
-+	cpumask_var_t domainspan, covered, notcovered;
-+	struct sched_group **sched_group_nodes = NULL;
-+	int sd_allnodes = 0;
-+
-+	if (!alloc_cpumask_var(&domainspan, GFP_KERNEL))
-+		goto out;
-+	if (!alloc_cpumask_var(&covered, GFP_KERNEL))
-+		goto free_domainspan;
-+	if (!alloc_cpumask_var(&notcovered, GFP_KERNEL))
-+		goto free_covered;
-+#endif
-+
-+	if (!alloc_cpumask_var(&nodemask, GFP_KERNEL))
-+		goto free_notcovered;
-+	if (!alloc_cpumask_var(&this_sibling_map, GFP_KERNEL))
-+		goto free_nodemask;
-+	if (!alloc_cpumask_var(&this_core_map, GFP_KERNEL))
-+		goto free_this_sibling_map;
-+	if (!alloc_cpumask_var(&send_covered, GFP_KERNEL))
-+		goto free_this_core_map;
-+	if (!alloc_cpumask_var(&tmpmask, GFP_KERNEL))
-+		goto free_send_covered;
-+
-+#ifdef CONFIG_NUMA
-+	/*
-+	 * Allocate the per-node list of sched groups
-+	 */
-+	sched_group_nodes = kcalloc(nr_node_ids, sizeof(struct sched_group *),
-+				    GFP_KERNEL);
-+	if (!sched_group_nodes) {
-+		printk(KERN_WARNING "Can not alloc sched group node list\n");
-+		goto free_tmpmask;
-+	}
-+#endif
-+
-+	rd = alloc_rootdomain();
-+	if (!rd) {
-+		printk(KERN_WARNING "Cannot alloc root domain\n");
-+		goto free_sched_groups;
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	sched_group_nodes_bycpu[cpumask_first(cpu_map)] = sched_group_nodes;
-+#endif
-+
-+	/*
-+	 * Set up domains for cpus specified by the cpu_map.
-+	 */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = NULL, *p;
-+
-+		cpumask_and(nodemask, cpumask_of_node(cpu_to_node(i)), cpu_map);
-+
-+#ifdef CONFIG_NUMA
-+		if (cpumask_weight(cpu_map) >
-+				SD_NODES_PER_DOMAIN*cpumask_weight(nodemask)) {
-+			sd = &per_cpu(allnodes_domains, i).sd;
-+			SD_INIT(sd, ALLNODES);
-+			set_domain_attribute(sd, attr);
-+			cpumask_copy(sched_domain_span(sd), cpu_map);
-+			cpu_to_allnodes_group(i, cpu_map, &sd->groups, tmpmask);
-+			p = sd;
-+			sd_allnodes = 1;
-+		} else
-+			p = NULL;
-+
-+		sd = &per_cpu(node_domains, i).sd;
-+		SD_INIT(sd, NODE);
-+		set_domain_attribute(sd, attr);
-+		sched_domain_node_span(cpu_to_node(i), sched_domain_span(sd));
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpumask_and(sched_domain_span(sd),
-+			    sched_domain_span(sd), cpu_map);
-+#endif
-+
-+		p = sd;
-+		sd = &per_cpu(phys_domains, i).sd;
-+		SD_INIT(sd, CPU);
-+		set_domain_attribute(sd, attr);
-+		cpumask_copy(sched_domain_span(sd), nodemask);
-+		sd->parent = p;
-+		if (p)
-+			p->child = sd;
-+		cpu_to_phys_group(i, cpu_map, &sd->groups, tmpmask);
-+
-+#ifdef CONFIG_SCHED_MC
-+		p = sd;
-+		sd = &per_cpu(core_domains, i).sd;
-+		SD_INIT(sd, MC);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd), cpu_map,
-+						   cpu_coregroup_mask(i));
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_core_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+		p = sd;
-+		sd = &per_cpu(cpu_domains, i).sd;
-+		SD_INIT(sd, SIBLING);
-+		set_domain_attribute(sd, attr);
-+		cpumask_and(sched_domain_span(sd),
-+			    topology_thread_cpumask(i), cpu_map);
-+		sd->parent = p;
-+		p->child = sd;
-+		cpu_to_cpu_group(i, cpu_map, &sd->groups, tmpmask);
-+#endif
-+	}
-+
-+#ifdef CONFIG_SCHED_SMT
-+	/* Set up CPU (sibling) groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_sibling_map,
-+			    topology_thread_cpumask(i), cpu_map);
-+		if (i != cpumask_first(this_sibling_map))
-+			continue;
-+
-+		init_sched_build_groups(this_sibling_map, cpu_map,
-+					&cpu_to_cpu_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+#ifdef CONFIG_SCHED_MC
-+	/* Set up multi-core groups */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(this_core_map, cpu_coregroup_mask(i), cpu_map);
-+		if (i != cpumask_first(this_core_map))
-+			continue;
-+
-+		init_sched_build_groups(this_core_map, cpu_map,
-+					&cpu_to_core_group,
-+					send_covered, tmpmask);
-+	}
-+#endif
-+
-+	/* Set up physical groups */
-+	for (i = 0; i < nr_node_ids; i++) {
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask))
-+			continue;
-+
-+		init_sched_build_groups(nodemask, cpu_map,
-+					&cpu_to_phys_group,
-+					send_covered, tmpmask);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	/* Set up node groups */
-+	if (sd_allnodes) {
-+		init_sched_build_groups(cpu_map, cpu_map,
-+					&cpu_to_allnodes_group,
-+					send_covered, tmpmask);
-+	}
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Set up node groups */
-+		struct sched_group *sg, *prev;
-+		int j;
-+
-+		cpumask_clear(covered);
-+		cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+		if (cpumask_empty(nodemask)) {
-+			sched_group_nodes[i] = NULL;
-+			continue;
-+		}
-+
-+		sched_domain_node_span(i, domainspan);
-+		cpumask_and(domainspan, domainspan, cpu_map);
-+
-+		sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
-+				  GFP_KERNEL, i);
-+		if (!sg) {
-+			printk(KERN_WARNING "Can not alloc domain group for "
-+				"node %d\n", i);
-+			goto error;
-+		}
-+		sched_group_nodes[i] = sg;
-+		for_each_cpu(j, nodemask) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(node_domains, j).sd;
-+			sd->groups = sg;
-+		}
-+		sg->__cpu_power = 0;
-+		cpumask_copy(sched_group_cpus(sg), nodemask);
-+		sg->next = sg;
-+		cpumask_or(covered, covered, nodemask);
-+		prev = sg;
-+
-+		for (j = 0; j < nr_node_ids; j++) {
-+			int n = (i + j) % nr_node_ids;
-+
-+			cpumask_complement(notcovered, covered);
-+			cpumask_and(tmpmask, notcovered, cpu_map);
-+			cpumask_and(tmpmask, tmpmask, domainspan);
-+			if (cpumask_empty(tmpmask))
-+				break;
-+
-+			cpumask_and(tmpmask, tmpmask, cpumask_of_node(n));
-+			if (cpumask_empty(tmpmask))
-+				continue;
-+
-+			sg = kmalloc_node(sizeof(struct sched_group) +
-+					  cpumask_size(),
-+					  GFP_KERNEL, i);
-+			if (!sg) {
-+				printk(KERN_WARNING
-+				"Can not alloc domain group for node %d\n", j);
-+				goto error;
-+			}
-+			sg->__cpu_power = 0;
-+			cpumask_copy(sched_group_cpus(sg), tmpmask);
-+			sg->next = prev->next;
-+			cpumask_or(covered, covered, tmpmask);
-+			prev->next = sg;
-+			prev = sg;
-+		}
-+	}
-+#endif
-+
-+	/* Calculate CPU power for physical packages and nodes */
-+#ifdef CONFIG_SCHED_SMT
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(cpu_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(core_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd = &per_cpu(phys_domains, i).sd;
-+
-+		init_sched_groups_power(i, sd);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	for (i = 0; i < nr_node_ids; i++)
-+		init_numa_sched_groups_power(sched_group_nodes[i]);
-+
-+	if (sd_allnodes) {
-+		struct sched_group *sg;
-+
-+		cpu_to_allnodes_group(cpumask_first(cpu_map), cpu_map, &sg,
-+								tmpmask);
-+		init_numa_sched_groups_power(sg);
-+	}
-+#endif
-+
-+	/* Attach the domains */
-+	for_each_cpu(i, cpu_map) {
-+		struct sched_domain *sd;
-+#ifdef CONFIG_SCHED_SMT
-+		sd = &per_cpu(cpu_domains, i).sd;
-+#elif defined(CONFIG_SCHED_MC)
-+		sd = &per_cpu(core_domains, i).sd;
-+#else
-+		sd = &per_cpu(phys_domains, i).sd;
-+#endif
-+		cpu_attach_domain(sd, rd, i);
-+	}
-+
-+	err = 0;
-+
-+free_tmpmask:
-+	free_cpumask_var(tmpmask);
-+free_send_covered:
-+	free_cpumask_var(send_covered);
-+free_this_core_map:
-+	free_cpumask_var(this_core_map);
-+free_this_sibling_map:
-+	free_cpumask_var(this_sibling_map);
-+free_nodemask:
-+	free_cpumask_var(nodemask);
-+free_notcovered:
-+#ifdef CONFIG_NUMA
-+	free_cpumask_var(notcovered);
-+free_covered:
-+	free_cpumask_var(covered);
-+free_domainspan:
-+	free_cpumask_var(domainspan);
-+out:
-+#endif
-+	return err;
-+
-+free_sched_groups:
-+#ifdef CONFIG_NUMA
-+	kfree(sched_group_nodes);
-+#endif
-+	goto free_tmpmask;
-+
-+#ifdef CONFIG_NUMA
-+error:
-+	free_sched_groups(cpu_map, tmpmask);
-+	free_rootdomain(rd);
-+	goto free_tmpmask;
-+#endif
-+}
-+
-+static int build_sched_domains(const struct cpumask *cpu_map)
-+{
-+	return __build_sched_domains(cpu_map, NULL);
-+}
-+
-+static struct cpumask *doms_cur;	/* current sched domains */
-+static int ndoms_cur;		/* number of sched domains in 'doms_cur' */
-+static struct sched_domain_attr *dattr_cur;
-+				/* attribues of custom domains in 'doms_cur' */
-+
-+/*
-+ * Special case: If a kmalloc of a doms_cur partition (array of
-+ * cpumask) fails, then fallback to a single sched domain,
-+ * as determined by the single cpumask fallback_doms.
-+ */
-+static cpumask_var_t fallback_doms;
-+
-+/*
-+ * arch_update_cpu_topology lets virtualized architectures update the
-+ * cpu core maps. It is supposed to return 1 if the topology changed
-+ * or 0 if it stayed the same.
-+ */
-+int __attribute__((weak)) arch_update_cpu_topology(void)
-+{
-+	return 0;
-+}
-+
-+/*
-+ * Set up scheduler domains and groups. Callers must hold the hotplug lock.
-+ * For now this just excludes isolated cpus, but could be used to
-+ * exclude other special cases in the future.
-+ */
-+static int arch_init_sched_domains(const struct cpumask *cpu_map)
-+{
-+	int err;
-+
-+	arch_update_cpu_topology();
-+	ndoms_cur = 1;
-+	doms_cur = kmalloc(cpumask_size(), GFP_KERNEL);
-+	if (!doms_cur)
-+		doms_cur = fallback_doms;
-+	cpumask_andnot(doms_cur, cpu_map, cpu_isolated_map);
-+	dattr_cur = NULL;
-+	err = build_sched_domains(doms_cur);
-+	register_sched_domain_sysctl();
-+
-+	return err;
-+}
-+
-+static void arch_destroy_sched_domains(const struct cpumask *cpu_map,
-+				       struct cpumask *tmpmask)
-+{
-+	free_sched_groups(cpu_map, tmpmask);
-+}
-+
-+/*
-+ * Detach sched domains from a group of cpus specified in cpu_map
-+ * These cpus will now be attached to the NULL domain
-+ */
-+static void detach_destroy_domains(const struct cpumask *cpu_map)
-+{
-+	/* Save because hotplug lock held. */
-+	static DECLARE_BITMAP(tmpmask, CONFIG_NR_CPUS);
-+	int i;
-+
-+	for_each_cpu(i, cpu_map)
-+		cpu_attach_domain(NULL, &def_root_domain, i);
-+	synchronize_sched();
-+	arch_destroy_sched_domains(cpu_map, to_cpumask(tmpmask));
-+}
-+
-+/* handle null as "default" */
-+static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,
-+			struct sched_domain_attr *new, int idx_new)
-+{
-+	struct sched_domain_attr tmp;
-+
-+	/* fast path */
-+	if (!new && !cur)
-+		return 1;
-+
-+	tmp = SD_ATTR_INIT;
-+	return !memcmp(cur ? (cur + idx_cur) : &tmp,
-+			new ? (new + idx_new) : &tmp,
-+			sizeof(struct sched_domain_attr));
-+}
-+
-+/*
-+ * Partition sched domains as specified by the 'ndoms_new'
-+ * cpumasks in the array doms_new[] of cpumasks. This compares
-+ * doms_new[] to the current sched domain partitioning, doms_cur[].
-+ * It destroys each deleted domain and builds each new domain.
-+ *
-+ * 'doms_new' is an array of cpumask's of length 'ndoms_new'.
-+ * The masks don't intersect (don't overlap.) We should setup one
-+ * sched domain for each mask. CPUs not in any of the cpumasks will
-+ * not be load balanced. If the same cpumask appears both in the
-+ * current 'doms_cur' domains and in the new 'doms_new', we can leave
-+ * it as it is.
-+ *
-+ * The passed in 'doms_new' should be kmalloc'd. This routine takes
-+ * ownership of it and will kfree it when done with it. If the caller
-+ * failed the kmalloc call, then it can pass in doms_new == NULL &&
-+ * ndoms_new == 1, and partition_sched_domains() will fallback to
-+ * the single partition 'fallback_doms', it also forces the domains
-+ * to be rebuilt.
-+ *
-+ * If doms_new == NULL it will be replaced with cpu_online_mask.
-+ * ndoms_new == 0 is a special case for destroying existing domains,
-+ * and it will not create the default domain.
-+ *
-+ * Call with hotplug lock held
-+ */
-+/* FIXME: Change to struct cpumask *doms_new[] */
-+void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
-+			     struct sched_domain_attr *dattr_new)
-+{
-+	int i, j, n;
-+	int new_topology;
-+
-+	mutex_lock(&sched_domains_mutex);
-+
-+	/* always unregister in case we don't destroy any domains */
-+	unregister_sched_domain_sysctl();
-+
-+	/* Let architecture update cpu core mappings. */
-+	new_topology = arch_update_cpu_topology();
-+
-+	n = doms_new ? ndoms_new : 0;
-+
-+	/* Destroy deleted domains */
-+	for (i = 0; i < ndoms_cur; i++) {
-+		for (j = 0; j < n && !new_topology; j++) {
-+			if (cpumask_equal(&doms_cur[i], &doms_new[j])
-+			    && dattrs_equal(dattr_cur, i, dattr_new, j))
-+				goto match1;
-+		}
-+		/* no match - a current sched domain not in new doms_new[] */
-+		detach_destroy_domains(doms_cur + i);
-+match1:
-+		;
-+	}
-+
-+	if (doms_new == NULL) {
-+		ndoms_cur = 0;
-+		doms_new = fallback_doms;
-+		cpumask_andnot(&doms_new[0], cpu_online_mask, cpu_isolated_map);
-+		WARN_ON_ONCE(dattr_new);
-+	}
-+
-+	/* Build new domains */
-+	for (i = 0; i < ndoms_new; i++) {
-+		for (j = 0; j < ndoms_cur && !new_topology; j++) {
-+			if (cpumask_equal(&doms_new[i], &doms_cur[j])
-+			    && dattrs_equal(dattr_new, i, dattr_cur, j))
-+				goto match2;
-+		}
-+		/* no match - add a new doms_new */
-+		__build_sched_domains(doms_new + i,
-+					dattr_new ? dattr_new + i : NULL);
-+match2:
-+		;
-+	}
-+
-+	/* Remember the new sched domains */
-+	if (doms_cur != fallback_doms)
-+		kfree(doms_cur);
-+	kfree(dattr_cur);	/* kfree(NULL) is safe */
-+	doms_cur = doms_new;
-+	dattr_cur = dattr_new;
-+	ndoms_cur = ndoms_new;
-+
-+	register_sched_domain_sysctl();
-+
-+	mutex_unlock(&sched_domains_mutex);
-+}
-+
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+static void arch_reinit_sched_domains(void)
-+{
-+	get_online_cpus();
-+
-+	/* Destroy domains first to force the rebuild */
-+	partition_sched_domains(0, NULL, NULL);
-+
-+	rebuild_sched_domains();
-+	put_online_cpus();
-+}
-+
-+static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)
-+{
-+	unsigned int level = 0;
-+
-+	if (sscanf(buf, "%u", &level) != 1)
-+		return -EINVAL;
-+
-+	/*
-+	 * level is always be positive so don't check for
-+	 * level < POWERSAVINGS_BALANCE_NONE which is 0
-+	 * What happens on 0 or 1 byte write,
-+	 * need to check for count as well?
-+	 */
-+
-+	if (level >= MAX_POWERSAVINGS_BALANCE_LEVELS)
-+		return -EINVAL;
-+
-+	if (smt)
-+		sched_smt_power_savings = level;
-+	else
-+		sched_mc_power_savings = level;
-+
-+	arch_reinit_sched_domains();
-+
-+	return count;
-+}
-+
-+#ifdef CONFIG_SCHED_MC
-+static ssize_t sched_mc_power_savings_show(struct sysdev_class *class,
-+					   char *page)
-+{
-+	return sprintf(page, "%u\n", sched_mc_power_savings);
-+}
-+static ssize_t sched_mc_power_savings_store(struct sysdev_class *class,
-+					    const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 0);
-+}
-+static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644,
-+			 sched_mc_power_savings_show,
-+			 sched_mc_power_savings_store);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev,
-+					    char *page)
-+{
-+	return sprintf(page, "%u\n", sched_smt_power_savings);
-+}
-+static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev,
-+					     const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 1);
-+}
-+static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644,
-+		   sched_smt_power_savings_show,
-+		   sched_smt_power_savings_store);
-+#endif
-+
-+int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)
-+{
-+	int err = 0;
-+
-+#ifdef CONFIG_SCHED_SMT
-+	if (smt_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_smt_power_savings.attr);
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	if (!err && mc_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_mc_power_savings.attr);
-+#endif
-+	return err;
-+}
-+#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
-+
-+#ifndef CONFIG_CPUSETS
-+/*
-+ * Add online and remove offline CPUs from the scheduler domains.
-+ * When cpusets are enabled they take over this function.
-+ */
-+static int update_sched_domains(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		partition_sched_domains(1, NULL, NULL);
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+#endif
-+
-+static int update_runtime(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_DOWN_PREPARE:
-+	case CPU_DOWN_PREPARE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	case CPU_DOWN_FAILED:
-+	case CPU_DOWN_FAILED_FROZEN:
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+void __init sched_init_smp(void)
-+{
-+	cpumask_var_t non_isolated_cpus;
-+
-+	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
-+
-+#if defined(CONFIG_NUMA)
-+	sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
-+								GFP_KERNEL);
-+	BUG_ON(sched_group_nodes_bycpu == NULL);
-+#endif
-+	get_online_cpus();
-+	mutex_lock(&sched_domains_mutex);
-+	arch_init_sched_domains(cpu_online_mask);
-+	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);
-+	if (cpumask_empty(non_isolated_cpus))
-+		cpumask_set_cpu(smp_processor_id(), non_isolated_cpus);
-+	mutex_unlock(&sched_domains_mutex);
-+	put_online_cpus();
-+
-+#ifndef CONFIG_CPUSETS
-+	/* XXX: Theoretical race here - CPU may be hotplugged now */
-+	hotcpu_notifier(update_sched_domains, 0);
-+#endif
-+
-+	/* RT runtime code needs to handle some hotplug events */
-+	hotcpu_notifier(update_runtime, 0);
-+
-+	/* Move init over to a non-isolated CPU */
-+	if (set_cpus_allowed_ptr(current, non_isolated_cpus) < 0)
-+		BUG();
-+	free_cpumask_var(non_isolated_cpus);
-+
-+	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
-+
-+	/*
-+	 * Assume that every added cpu gives us slightly less overall latency
-+	 * allowing us to increase the base rr_interval, but in a non linear
-+	 * fashion.
-+	 */
-+	rr_interval *= 1 + ilog2(num_online_cpus());
-+}
-+#else
-+void __init sched_init_smp(void)
-+{
-+}
-+#endif /* CONFIG_SMP */
-+
-+unsigned int sysctl_timer_migration = 1;
-+
-+int in_sched_functions(unsigned long addr)
-+{
-+	return in_lock_functions(addr) ||
-+		(addr >= (unsigned long)__sched_text_start
-+		&& addr < (unsigned long)__sched_text_end);
-+}
-+
-+void __init sched_init(void)
-+{
-+	int i;
-+	int highest_cpu = 0;
-+
-+	prio_ratios[0] = 100;
-+	for (i = 1 ; i < PRIO_RANGE ; i++)
-+		prio_ratios[i] = prio_ratios[i - 1] * 11 / 10;
-+
-+#ifdef CONFIG_SMP
-+	init_defrootdomain();
-+	cpus_clear(grq.cpu_idle_map);
-+#endif
-+	spin_lock_init(&grq.lock);
-+	for_each_possible_cpu(i) {
-+		struct rq *rq;
-+
-+		rq = cpu_rq(i);
-+		INIT_LIST_HEAD(&rq->queue);
-+		rq->rq_deadline = 0;
-+		rq->rq_prio = 0;
-+		rq->cpu = i;
-+		rq->user_pc = rq->nice_pc = rq->softirq_pc = rq->system_pc =
-+			      rq->iowait_pc = rq->idle_pc = 0;
-+#ifdef CONFIG_SMP
-+		rq->sd = NULL;
-+		rq->rd = NULL;
-+		rq->online = 0;
-+		INIT_LIST_HEAD(&rq->migration_queue);
-+		rq_attach_root(rq, &def_root_domain);
-+#endif
-+		atomic_set(&rq->nr_iowait, 0);
-+		highest_cpu = i;
-+	}
-+	grq.iso_ticks = grq.nr_running = grq.nr_uninterruptible = 0;
-+	for (i = 0; i < PRIO_LIMIT; i++)
-+		INIT_LIST_HEAD(grq.queue + i);
-+	bitmap_zero(grq.prio_bitmap, PRIO_LIMIT);
-+	/* delimiter for bitsearch */
-+	__set_bit(PRIO_LIMIT, grq.prio_bitmap);
-+
-+#ifdef CONFIG_SMP
-+	nr_cpu_ids = highest_cpu + 1;
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&init_task.preempt_notifiers);
-+#endif
-+
-+#ifdef CONFIG_RT_MUTEXES
-+	plist_head_init(&init_task.pi_waiters, &init_task.pi_lock);
-+#endif
-+
-+	/*
-+	 * The boot idle thread does lazy MMU switching as well:
-+	 */
-+	atomic_inc(&init_mm.mm_count);
-+	enter_lazy_tlb(&init_mm, current);
-+
-+	/*
-+	 * Make us the idle thread. Technically, schedule() should not be
-+	 * called from this thread, however somewhere below it might be,
-+	 * but because we are the idle thread, we just pick up running again
-+	 * when this runqueue becomes "idle".
-+	 */
-+	init_idle(current, smp_processor_id());
-+
-+	/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
-+	alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
-+	alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
-+#endif
-+	alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
-+#endif /* SMP */
-+	perf_counter_init();
-+}
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+void __might_sleep(char *file, int line)
-+{
-+#ifdef in_atomic
-+	static unsigned long prev_jiffy;	/* ratelimiting */
-+
-+	if ((in_atomic() || irqs_disabled()) &&
-+	    system_state == SYSTEM_RUNNING && !oops_in_progress) {
-+		if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
-+			return;
-+		prev_jiffy = jiffies;
-+		printk(KERN_ERR "BUG: sleeping function called from invalid"
-+				" context at %s:%d\n", file, line);
-+		printk("in_atomic():%d, irqs_disabled():%d\n",
-+			in_atomic(), irqs_disabled());
-+		debug_show_held_locks(current);
-+		if (irqs_disabled())
-+			print_irqtrace_events(current);
-+		dump_stack();
-+	}
-+#endif
-+}
-+EXPORT_SYMBOL(__might_sleep);
-+#endif
-+
-+#ifdef CONFIG_MAGIC_SYSRQ
-+void normalize_rt_tasks(void)
-+{
-+	struct task_struct *g, *p;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int queued;
-+
-+	read_lock_irq(&tasklist_lock);
-+
-+	do_each_thread(g, p) {
-+		if (!rt_task(p) && !iso_task(p))
-+			continue;
-+
-+		spin_lock_irqsave(&p->pi_lock, flags);
-+		rq = __task_grq_lock(p);
-+		update_rq_clock(rq);
-+
-+		queued = task_queued_only(p);
-+		if (queued)
-+			dequeue_task(p);
-+		__setscheduler(p, SCHED_NORMAL, 0);
-+		if (task_running(p))
-+			resched_task(p);
-+		if (queued) {
-+			enqueue_task(p);
-+			try_preempt(p);
-+		}
-+
-+		__task_grq_unlock();
-+		spin_unlock_irqrestore(&p->pi_lock, flags);
-+	} while_each_thread(g, p);
-+
-+	read_unlock_irq(&tasklist_lock);
-+}
-+#endif /* CONFIG_MAGIC_SYSRQ */
-+
-+#ifdef CONFIG_IA64
-+/*
-+ * These functions are only useful for the IA64 MCA handling.
-+ *
-+ * They can only be called when the whole system has been
-+ * stopped - every CPU needs to be quiescent, and no scheduling
-+ * activity can take place. Using them for anything else would
-+ * be a serious bug, and as a result, they aren't even visible
-+ * under any other configuration.
-+ */
-+
-+/**
-+ * curr_task - return the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+struct task_struct *curr_task(int cpu)
-+{
-+	return cpu_curr(cpu);
-+}
-+
-+/**
-+ * set_curr_task - set the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ * @p: the task pointer to set.
-+ *
-+ * Description: This function must only be used when non-maskable interrupts
-+ * are serviced on a separate stack.  It allows the architecture to switch the
-+ * notion of the current task on a cpu in a non-blocking manner.  This function
-+ * must be called with all CPU's synchronized, and interrupts disabled, the
-+ * and caller must save the original value of the current task (see
-+ * curr_task() above) and restore that value before reenabling interrupts and
-+ * re-starting the system.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+void set_curr_task(int cpu, struct task_struct *p)
-+{
-+	cpu_curr(cpu) = p;
-+}
-+
-+#endif
-+
-+/*
-+ * Use precise platform statistics if available:
-+ */
-+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	return p->utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	return p->stime;
-+}
-+#else
-+cputime_t task_utime(struct task_struct *p)
-+{
-+	clock_t utime = cputime_to_clock_t(p->utime),
-+		total = utime + cputime_to_clock_t(p->stime);
-+	u64 temp;
-+
-+	temp = (u64)nsec_to_clock_t(p->se.sum_exec_runtime);
-+
-+	if (total) {
-+		temp *= utime;
-+		do_div(temp, total);
-+	}
-+	utime = (clock_t)temp;
-+
-+	p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
-+	return p->prev_utime;
-+}
-+
-+cputime_t task_stime(struct task_struct *p)
-+{
-+	clock_t stime;
-+
-+	stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
-+			cputime_to_clock_t(task_utime(p));
-+
-+	if (stime >= 0)
-+		p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
-+
-+	return p->prev_stime;
-+}
-+#endif
-+
-+inline cputime_t task_gtime(struct task_struct *p)
-+{
-+	return p->gtime;
-+}
-+
-+void __cpuinit init_idle_bootup_task(struct task_struct *idle)
-+{}
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
-+{}
-+
-+void proc_sched_set_task(struct task_struct *p)
-+{}
-+#endif
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -86,6 +86,8 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
-+extern int rr_interval;
-+extern int sched_iso_cpu;
- #ifndef CONFIG_MMU
- extern int sysctl_nr_trim_pages;
- #endif
-@@ -103,7 +105,8 @@ static int zero;
- static int __maybe_unused one = 1;
- static int __maybe_unused two = 2;
- static unsigned long one_ul = 1;
--static int one_hundred = 100;
-+static int __read_mostly one_hundred = 100;
-+static int __maybe_unused __read_mostly five_thousand = 5000;
- 
- /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
- static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-@@ -238,7 +241,7 @@ static struct ctl_table root_table[] = {
- 	{ .ctl_name = 0 }
- };
- 
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- static int min_sched_granularity_ns = 100000;		/* 100 usecs */
- static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
- static int min_wakeup_granularity_ns;			/* 0 usecs */
-@@ -246,7 +249,7 @@ static int max_wakeup_granularity_ns = N
- #endif
- 
- static struct ctl_table kern_table[] = {
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SCHED_CFS)
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_min_granularity_ns",
-@@ -342,6 +345,7 @@ static struct ctl_table kern_table[] = {
- 		.extra2		= &one,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_CFS
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
- 		.procname	= "sched_rt_period_us",
-@@ -366,6 +370,7 @@ static struct ctl_table kern_table[] = {
- 		.mode		= 0644,
- 		.proc_handler	= &proc_dointvec,
- 	},
-+#endif
- #ifdef CONFIG_PROVE_LOCKING
- 	{
- 		.ctl_name	= CTL_UNNUMBERED,
-@@ -798,6 +803,30 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= &proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_BFS
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "rr_interval",
-+		.data		= &rr_interval,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &one,
-+		.extra2		= &five_thousand,
-+	},
-+	{
-+		.ctl_name	= CTL_UNNUMBERED,
-+		.procname	= "iso_cpu",
-+		.data		= &sched_iso_cpu,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.strategy	= &sysctl_intvec,
-+		.extra1		= &zero,
-+		.extra2		= &one_hundred,
-+	},
-+#endif
- #if defined(CONFIG_S390) && defined(CONFIG_SMP)
- 	{
- 		.ctl_name	= KERN_SPIN_RETRY,
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -317,7 +317,9 @@ static int worker_thread(void *__cwq)
- 	if (cwq->wq->freezeable)
- 		set_freezable();
- 
-+#ifdef CONFIG_SCHED_CFS
- 	set_user_nice(current, -5);
-+#endif
- 
- 	for (;;) {
- 		prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE);
diff --git a/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch
deleted file mode 100644
index 9e3ddec03b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -297,4 +297,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -39,3 +39,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch
deleted file mode 100644
index 9f307004d2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -301,4 +301,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch
deleted file mode 100644
index 688f6fe10f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -269,4 +269,21 @@ config INPUT_DM355EVM
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called dm355evm_keys.
-+
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -26,3 +26,4 @@ obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)	+=
- obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch
deleted file mode 100644
index 5a364d69ad..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1029,6 +1029,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
deleted file mode 100644
index 575bec92d7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -142,10 +142,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch
deleted file mode 100644
index 08a1efc29c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -188,6 +188,7 @@ source "fs/sysv/Kconfig"
- source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # MISC_FILESYSTEMS
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index c334b17d08..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
-+
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch
deleted file mode 100644
index 473812895e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/600-phy_extension.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -355,8 +399,8 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
--		if (mii_data->reg_num == MII_BMCR 
-+
-+		if (mii_data->reg_num == MII_BMCR
- 				&& val & BMCR_RESET
- 				&& phydev->drv->config_init) {
- 			phy_scan_fixups(phydev);
-@@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -489,6 +489,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.31/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.31/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index aac38ff2e7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch
deleted file mode 100644
index 8f61d95c2d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -82,6 +82,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY)		+= smsc.o
- obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch
deleted file mode 100644
index 82f67bcee5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -804,6 +804,7 @@ struct net_device
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch b/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch
deleted file mode 100644
index 1623e7f9b5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/640-br2684_backport_routed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
-Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Date:   Fri Dec 4 11:06:32 2009 +0000
-
-    atm: [br2684] allow routed mode operation again
-    
-    in routed mode, we don't have a hardware address so netdev_ops doesnt
-    need to validate our hardware address via .ndo_validate_addr
-    
-    Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
-    Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/net/atm/br2684.c
-+++ b/net/atm/br2684.c
-@@ -536,6 +536,12 @@ static const struct net_device_ops br268
- 	.ndo_validate_addr	= eth_validate_addr,
- };
- 
-+static const struct net_device_ops br2684_netdev_ops_routed = {
-+	.ndo_start_xmit 	= br2684_start_xmit,
-+	.ndo_set_mac_address	= br2684_mac_addr,
-+	.ndo_change_mtu		= eth_change_mtu
-+};
-+
- static void br2684_setup(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
-@@ -551,11 +557,10 @@ static void br2684_setup(struct net_devi
- static void br2684_setup_routed(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
--	brdev->net_dev = netdev;
- 
-+	brdev->net_dev = netdev;
- 	netdev->hard_header_len = 0;
--
--	netdev->netdev_ops = &br2684_netdev_ops;
-+	netdev->netdev_ops = &br2684_netdev_ops_routed;
- 	netdev->addr_len = 0;
- 	netdev->mtu = 1500;
- 	netdev->type = ARPHRD_PPP;
diff --git a/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch
deleted file mode 100644
index 731f30301f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -93,6 +93,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch
deleted file mode 100644
index 5d8ba3c622..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -96,6 +96,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch
deleted file mode 100644
index d9d3ce7721..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -100,6 +100,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch
deleted file mode 100644
index bfebbcff51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
deleted file mode 100644
index 4ce0520b11..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,4 +135,29 @@ config MDIO_GPIO
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called mdio-gpio.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch
deleted file mode 100644
index 6e66654400..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -535,6 +535,15 @@ config RTC_DRV_PCF50633
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NXP PCF50633 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -62,6 +62,7 @@ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch
deleted file mode 100644
index 419d98a424..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch b/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch
deleted file mode 100644
index b7214b9d6d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/780-fix-race-in-snd_soc_jack_add_gpios.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 5ced436d549d911ce610ea47d85f71fae5bbfce4
-Author: Lars-Peter Clausen <lars@metafoo.de>
-Date:   Fri Jul 31 18:26:48 2009 +0200
-
-    ASoC: jack: Fix race in snd_soc_jack_add_gpios
-    
-    The irq can fire as soon as it has been requested, thus all fields accessed
-    from within the irq handler must be initialized prior to requesting the irq.
-    
-    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-
---- a/sound/soc/soc-jack.c
-+++ b/sound/soc/soc-jack.c
-@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_so
- 		if (ret)
- 			goto err;
- 
-+		INIT_WORK(&gpios[i].work, gpio_work);
-+		gpios[i].jack = jack;
-+
- 		ret = request_irq(gpio_to_irq(gpios[i].gpio),
- 				gpio_handler,
- 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_so
- 				&gpios[i]);
- 		if (ret)
- 			goto err;
--
--		INIT_WORK(&gpios[i].work, gpio_work);
--		gpios[i].jack = jack;
- 	}
- 
- 	return 0;
diff --git a/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index 41b3848f4d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -60,6 +60,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -947,7 +948,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1381,3 +1382,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
deleted file mode 100644
index b90a247a8e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -839,7 +839,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch
deleted file mode 100644
index fc64c17d52..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -97,6 +97,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch
deleted file mode 100644
index e220b0b36e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -431,6 +431,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1475,23 +1475,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4055,3 +4052,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch
deleted file mode 100644
index 90e40e7054..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale iMX SPI controller"
- 	depends on ARCH_MX1 && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitban
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
deleted file mode 100644
index 10d09624d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -278,6 +278,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- 
- ifeq ($(CONFIG_CB710_DEBUG),y)
- 	CFLAGS-cb710-mmc	+= -DDEBUG
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2266,6 +2266,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch
deleted file mode 100644
index a36ea49933..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d01..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
deleted file mode 100644
index 73e49a0ff3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -100,7 +100,7 @@ struct wireless_dev;
-  */
- 
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -389,7 +389,7 @@ struct sk_buff {
- #ifdef CONFIG_IPV6_NDISC_NODETYPE
- 	__u8			ndisc_nodetype:2;
- #endif
--#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
-+#if 1
- 	__u8			do_not_encrypt:1;
- #endif
- 	kmemcheck_bitfield_end(flags2);
diff --git a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
deleted file mode 100644
index b8c8c0674c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
+++ /dev/null
@@ -1,505 +0,0 @@
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct
- 	chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
- }
- 
-+static void ssb_chipco_regctl_maskset(struct ssb_chipcommon *cc,
-+				   u32 offset, u32 mask, u32 set)
-+{
-+	u32 value;
-+
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_ADDR, offset);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
-+	value = chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+	value &= mask;
-+	value |= set;
-+	chipco_write32(cc, SSB_CHIPCO_REGCTL_DATA, value);
-+	chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
-+}
-+
- struct pmu0_plltab_entry {
- 	u16 freq;	/* Crystal frequency in kHz.*/
- 	u8 xf;		/* Crystal frequency value for PMU control */
-@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon
- 	ssb_pmu_pll_init(cc);
- 	ssb_pmu_resources_init(cc);
- }
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	u32 addr, shift, mask;
-+
-+	switch (bus->chip_id) {
-+	case 0x4328:
-+	case 0x5354:
-+		switch (id) {
-+		case LDO_VOLT1:
-+			addr = 2;
-+			shift = 25;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT2:
-+			addr = 3;
-+			shift = 1;
-+			mask = 0xF;
-+			break;
-+		case LDO_VOLT3:
-+			addr = 3;
-+			shift = 9;
-+			mask = 0xF;
-+			break;
-+		case LDO_PAREF:
-+			addr = 3;
-+			shift = 17;
-+			mask = 0x3F;
-+			break;
-+		default:
-+			SSB_WARN_ON(1);
-+			return;
-+		}
-+		break;
-+	case 0x4312:
-+		if (SSB_WARN_ON(id != LDO_PAREF))
-+			return;
-+		addr = 0;
-+		shift = 21;
-+		mask = 0x3F;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	ssb_chipco_regctl_maskset(cc, addr, ~(mask << shift),
-+				  (voltage & mask) << shift);
-+}
-+
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
-+{
-+	struct ssb_bus *bus = cc->dev->bus;
-+	int ldo;
-+
-+	switch (bus->chip_id) {
-+	case 0x4312:
-+		ldo = SSB_PMURES_4312_PA_REF_LDO;
-+		break;
-+	case 0x4328:
-+		ldo = SSB_PMURES_4328_PA_REF_LDO;
-+		break;
-+	case 0x5354:
-+		ldo = SSB_PMURES_5354_PA_REF_LDO;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	if (on)
-+		chipco_set32(cc, SSB_CHIPCO_PMU_MINRES_MSK, 1 << ldo);
-+	else
-+		chipco_mask32(cc, SSB_CHIPCO_PMU_MINRES_MSK, ~(1 << ldo));
-+	chipco_read32(cc, SSB_CHIPCO_PMU_MINRES_MSK); //SPEC FIXME found via mmiotrace - dummy read?
-+}
-+
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
-+EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -469,6 +469,8 @@ static int ssb_devices_register(struct s
- 			dev->parent = &bus->host_pcmcia->dev;
- #endif
- 			break;
-+		case SSB_BUSTYPE_SDIO:
-+			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
- 			break;
-@@ -1358,8 +1360,10 @@ static int __init ssb_modinit(void)
- 	ssb_buses_lock();
- 	err = ssb_attach_queued_buses();
- 	ssb_buses_unlock();
--	if (err)
-+	if (err) {
- 		bus_unregister(&ssb_bustype);
-+		goto out;
-+	}
- 
- 	err = b43_pci_ssb_bridge_init();
- 	if (err) {
-@@ -1375,7 +1379,7 @@ static int __init ssb_modinit(void)
- 		/* don't fail SSB init because of this */
- 		err = 0;
- 	}
--
-+out:
- 	return err;
- }
- /* ssb must be initialized after PCI but before the ssb drivers.
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -169,8 +169,14 @@ err_pci:
- /* Get the word-offset for a SSB_SPROM_XXX define. */
- #define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
--#define SPEX(_outvar, _offset, _mask, _shift)	\
-+#define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-+#define SPEX32(_outvar, _offset, _mask, _shift)	\
-+	out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \
-+			   in[SPOFF(_offset)]) & (_mask)) >> (_shift))
-+#define SPEX(_outvar, _offset, _mask, _shift) \
-+	SPEX16(_outvar, _offset, _mask, _shift)
-+
- 
- static inline u8 ssb_crc8(u8 crc, u8 data)
- {
-@@ -474,12 +480,14 @@ static void sprom_extract_r8(struct ssb_
- 
- 	/* extract the MAC address */
- 	for (i = 0; i < 3; i++) {
--		v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
-+		v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
- 		*(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
- 	}
- 	SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
- 	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
- 	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
-+	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
-+	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);
- 	SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
- 	     SSB_SPROM8_ANTAVAIL_A_SHIFT);
- 	SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
-@@ -490,12 +498,55 @@ static void sprom_extract_r8(struct ssb_
- 	SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
- 	SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
- 	     SSB_SPROM8_ITSSI_A_SHIFT);
-+	SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
-+	SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
-+	     SSB_SPROM8_MAXP_AL_SHIFT);
- 	SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
- 	SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
- 	     SSB_SPROM8_GPIOA_P1_SHIFT);
- 	SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
- 	SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
- 	     SSB_SPROM8_GPIOB_P3_SHIFT);
-+	SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
-+	SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
-+	     SSB_SPROM8_TRI5G_SHIFT);
-+	SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
-+	SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
-+	     SSB_SPROM8_TRI5GH_SHIFT);
-+	SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);
-+	SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
-+	     SSB_SPROM8_RXPO5G_SHIFT);
-+	SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
-+	SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
-+	     SSB_SPROM8_RSSISMC2G_SHIFT);
-+	SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
-+	     SSB_SPROM8_RSSISAV2G_SHIFT);
-+	SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
-+	     SSB_SPROM8_BXA2G_SHIFT);
-+	SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
-+	SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
-+	     SSB_SPROM8_RSSISMC5G_SHIFT);
-+	SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
-+	     SSB_SPROM8_RSSISAV5G_SHIFT);
-+	SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
-+	     SSB_SPROM8_BXA5G_SHIFT);
-+	SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);
-+	SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);
-+	SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);
-+	SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);
-+	SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);
-+	SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);
-+	SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);
-+	SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);
-+	SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);
-+	SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);
-+	SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);
-+	SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);
-+	SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);
-+	SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);
-+	SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
- 
- 	/* Extract the antenna gain values. */
- 	SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus
- 			ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
- 				   "  revision %d detected. Will extract"
- 				   " v1\n", out->revision);
-+			out->revision = 1;
- 			sprom_extract_r123(out, in);
- 		}
- 	}
---- a/drivers/ssb/scan.c
-+++ b/drivers/ssb/scan.c
-@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
- 		} else
- 			ssb_pcmcia_switch_segment(bus, 0);
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	return readl(bus->mmio + offset);
- }
-@@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
- 		return ssb_pci_switch_coreidx(bus, coreidx);
- 	case SSB_BUSTYPE_PCMCIA:
- 		return ssb_pcmcia_switch_coreidx(bus, coreidx);
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	return 0;
- }
-@@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 	bus->mmio = NULL;
- 	bus->mapped_device = NULL;
-@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct
- 		SSB_BUG_ON(1); /* Can't reach this code. */
- #endif
- 		break;
-+	case SSB_BUSTYPE_SDIO:
-+		break;
- 	}
- 
- 	return mmio;
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -27,24 +27,54 @@ struct ssb_sprom {
- 	u8 et1mdcport;		/* MDIO for enet1 */
- 	u8 board_rev;		/* Board revision number from SPROM. */
- 	u8 country_code;	/* Country Code */
--	u8 ant_available_a;	/* A-PHY antenna available bits (up to 4) */
--	u8 ant_available_bg;	/* B/G-PHY antenna available bits (up to 4) */
-+	u8 ant_available_a;	/* 2GHz antenna available bits (up to 4) */
-+	u8 ant_available_bg;	/* 5GHz antenna available bits (up to 4) */
- 	u16 pa0b0;
- 	u16 pa0b1;
- 	u16 pa0b2;
- 	u16 pa1b0;
- 	u16 pa1b1;
- 	u16 pa1b2;
-+	u16 pa1lob0;
-+	u16 pa1lob1;
-+	u16 pa1lob2;
-+	u16 pa1hib0;
-+	u16 pa1hib1;
-+	u16 pa1hib2;
- 	u8 gpio0;		/* GPIO pin 0 */
- 	u8 gpio1;		/* GPIO pin 1 */
- 	u8 gpio2;		/* GPIO pin 2 */
- 	u8 gpio3;		/* GPIO pin 3 */
--	u16 maxpwr_a;		/* A-PHY Amplifier Max Power (in dBm Q5.2) */
--	u16 maxpwr_bg;		/* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_bg;		/* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_al;		/* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_a;		/* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
-+	u16 maxpwr_ah;		/* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
- 	u8 itssi_a;		/* Idle TSSI Target for A-PHY */
- 	u8 itssi_bg;		/* Idle TSSI Target for B/G-PHY */
--	u16 boardflags_lo;	/* Boardflags (low 16 bits) */
--	u16 boardflags_hi;	/* Boardflags (high 16 bits) */
-+	u8 tri2g;		/* 2.4GHz TX isolation */
-+	u8 tri5gl;		/* 5.2GHz TX isolation */
-+	u8 tri5g;		/* 5.3GHz TX isolation */
-+	u8 tri5gh;		/* 5.8GHz TX isolation */
-+	u8 rxpo2g;		/* 2GHz RX power offset */
-+	u8 rxpo5g;		/* 5GHz RX power offset */
-+	u8 rssisav2g;		/* 2GHz RSSI params */
-+	u8 rssismc2g;
-+	u8 rssismf2g;
-+	u8 bxa2g;		/* 2GHz BX arch */
-+	u8 rssisav5g;		/* 5GHz RSSI params */
-+	u8 rssismc5g;
-+	u8 rssismf5g;
-+	u8 bxa5g;		/* 5GHz BX arch */
-+	u16 cck2gpo;		/* CCK power offset */
-+	u32 ofdm2gpo;		/* 2.4GHz OFDM power offset */
-+	u32 ofdm5glpo;		/* 5.2GHz OFDM power offset */
-+	u32 ofdm5gpo;		/* 5.3GHz OFDM power offset */
-+	u32 ofdm5ghpo;		/* 5.8GHz OFDM power offset */
-+	u16 boardflags_lo;	/* Board flags (bits 0-15) */
-+	u16 boardflags_hi;	/* Board flags (bits 16-31) */
-+	u16 boardflags2_lo;	/* Board flags (bits 32-47) */
-+	u16 boardflags2_hi;	/* Board flags (bits 48-63) */
-+	/* TODO store board flags in a single u64 */
- 
- 	/* Antenna gain values for up to 4 antennas
- 	 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
-@@ -58,7 +88,7 @@ struct ssb_sprom {
- 		} ghz5;		/* 5GHz band */
- 	} antenna_gain;
- 
--	/* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
-+	/* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
- };
- 
- /* Information about the PCB the circuitry is soldered on. */
-@@ -208,6 +238,7 @@ enum ssb_bustype {
- 	SSB_BUSTYPE_SSB,	/* This SSB bus is the system bus */
- 	SSB_BUSTYPE_PCI,	/* SSB is connected to PCI bus */
- 	SSB_BUSTYPE_PCMCIA,	/* SSB is connected to PCMCIA bus */
-+	SSB_BUSTYPE_SDIO,	/* SSB is connected to SDIO bus */
- };
- 
- /* board_vendor */
-@@ -240,8 +271,12 @@ struct ssb_bus {
- 
- 	/* The core in the basic address register window. (PCI bus only) */
- 	struct ssb_device *mapped_device;
--	/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
--	u8 mapped_pcmcia_seg;
-+	union {
-+		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-+		u8 mapped_pcmcia_seg;
-+		/* Current SSB base address window for SDIO. */
-+		u32 sdio_sbaddr;
-+	};
- 	/* Lock for core and segment switching.
- 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
- 	spinlock_t bar_lock;
-@@ -252,6 +287,11 @@ struct ssb_bus {
- 	struct pci_dev *host_pci;
- 	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
- 	struct pcmcia_device *host_pcmcia;
-+	/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-+	struct sdio_func *host_sdio;
-+
-+	/* See enum ssb_quirks */
-+	unsigned int quirks;
- 
- #ifdef CONFIG_SSB_SPROM
- 	/* Mutex to protect the SPROM writing. */
-@@ -306,6 +346,11 @@ struct ssb_bus {
- #endif /* DEBUG */
- };
- 
-+enum ssb_quirks {
-+	/* SDIO connected card requires performing a read after writing a 32-bit value */
-+	SSB_QUIRK_SDIO_READ_AFTER_WRITE32	= (1 << 0),
-+};
-+
- /* The initialization-invariants. */
- struct ssb_init_invariants {
- 	/* Versioning information about the PCB. */
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -629,5 +629,15 @@ extern int ssb_chipco_serial_init(struct
- /* PMU support */
- extern void ssb_pmu_init(struct ssb_chipcommon *cc);
- 
-+enum ssb_pmu_ldo_volt_id {
-+	LDO_PAREF = 0,
-+	LDO_VOLT1,
-+	LDO_VOLT2,
-+	LDO_VOLT3,
-+};
-+
-+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
-+			     enum ssb_pmu_ldo_volt_id id, u32 voltage);
-+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
- 
- #endif /* LINUX_SSB_CHIPCO_H_ */
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -162,7 +162,7 @@
- 
- /* SPROM shadow area. If not otherwise noted, fields are
-  * two bytes wide. Note that the SPROM can _only_ be read
-- * in two-byte quantinies.
-+ * in two-byte quantities.
-  */
- #define SSB_SPROMSIZE_WORDS		64
- #define SSB_SPROMSIZE_BYTES		(SSB_SPROMSIZE_WORDS * sizeof(u16))
-@@ -327,8 +327,11 @@
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BFLLO		0x1084	/* Boardflags (low 16 bits) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Boardflags Hi */
-+#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
- #define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
- #define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
- #define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
-@@ -354,14 +357,63 @@
- #define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power BG in path 1 */
--#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
-+#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
-+#define  SSB_SPROM8_RSSISMF2G		0x000F
-+#define  SSB_SPROM8_RSSISMC2G		0x00F0
-+#define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV2G		0x0700
-+#define  SSB_SPROM8_RSSISAV2G_SHIFT	8
-+#define  SSB_SPROM8_BXA2G		0x1800
-+#define  SSB_SPROM8_BXA2G_SHIFT		11
-+#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
-+#define  SSB_SPROM8_RSSISMF5G		0x000F
-+#define  SSB_SPROM8_RSSISMC5G		0x00F0
-+#define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-+#define  SSB_SPROM8_RSSISAV5G		0x0700
-+#define  SSB_SPROM8_RSSISAV5G_SHIFT	8
-+#define  SSB_SPROM8_BXA5G		0x1800
-+#define  SSB_SPROM8_BXA5G_SHIFT		11
-+#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
-+#define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
-+#define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
-+#define  SSB_SPROM8_TRI5G_SHIFT		8
-+#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
-+#define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
-+#define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
-+#define  SSB_SPROM8_TRI5GH_SHIFT	8
-+#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
-+#define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
-+#define  SSB_SPROM8_RXPO5G_SHIFT	8
-+#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
-+#define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power A in path 1 */
--#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
-+#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x10C4
-+#define SSB_SPROM8_PA0B2		0x10C6
-+#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
-+#define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
-+#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
-+#define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
-+#define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
-+#define  SSB_SPROM8_MAXP_AL_SHIFT	8
-+#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x10CE
-+#define SSB_SPROM8_PA1B2		0x10D0
-+#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x10D4
-+#define SSB_SPROM8_PA1LOB2		0x10D6
-+#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x10DA
-+#define SSB_SPROM8_PA1HIB2		0x10DC
-+#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
diff --git a/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index 1bf19cc764..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -59,7 +59,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 61897eb4a6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -791,3 +791,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -84,6 +84,8 @@ obj-$(CONFIG_CRYPTO_RNG2) += krng.o
- obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.31/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.31/971-ocf_20100325.patch
deleted file mode 100644
index 46dd71fe9e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -712,6 +722,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -387,6 +387,7 @@ struct task_struct *find_task_by_vpid(pi
- {
- 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.31/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.31/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 94d6b91d8a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -152,16 +152,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 696ad55602..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -72,13 +72,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index 03ad2a8590..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -30,7 +30,7 @@ config CRYPTO_FIPS
- 	  this is.
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -39,7 +39,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -48,7 +48,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -59,7 +59,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -68,7 +68,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
deleted file mode 100644
index 3f1848b9e2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2681,10 +2691,7 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
- 
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -270,6 +270,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -159,6 +159,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -5981,6 +5981,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1064,6 +1064,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2490,6 +2491,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1101,6 +1101,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1214,6 +1215,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -711,6 +711,7 @@ static inline int shmem_lock(struct file
- #endif
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1062,6 +1062,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch
deleted file mode 100644
index 39d5fb0d00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,9 +38,9 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch
deleted file mode 100644
index 2a38c0bc79..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
diff --git a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
deleted file mode 100644
index c85113ddd7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.31/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -863,10 +863,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.32/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.32/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.32/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.32/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index eacbb97aef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -35,7 +35,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -87,12 +86,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -292,17 +288,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -346,10 +342,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.32/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.32/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index fdf0d407a1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -41,27 +41,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static const struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -86,10 +94,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -116,25 +120,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -201,6 +205,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -288,7 +296,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -298,7 +306,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -342,7 +349,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.32/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.32/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c00058..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.32/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.32/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 0991681346..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.32/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.32/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.32/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.32/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index 7402471624..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -63,8 +63,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -87,7 +85,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -117,6 +117,9 @@ config DECOMPRESS_BZIP2
- config DECOMPRESS_LZMA
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.32/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.32/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.32/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.32/012-extra_optimization.patch
deleted file mode 100644
index 77eb10377c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -523,7 +523,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -561,6 +561,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
deleted file mode 100644
index 77ab405439..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash.patch
deleted file mode 100644
index 7010d367b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
- static void cfi_fixup_major_minor(struct cfi_private *cfi,
- 				  struct cfi_pri_amdstd *extp)
- {
-+	// manufacturers defined in include/linux/mtd/cfi.h
-+
- 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- 	    extp->MajorVersion == '0')
- 		extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 	mtd->name    = map->name;
- 	mtd->writesize = 1;
- 
-+	printk(" CFI mfr 0x%08x\n", cfi->mfr);	// TODO: Is there a more general place to print this info?
-+	printk(" CFI id  0x%08x\n", cfi->id);
-+
- 	if (cfi->cfi_mode==CFI_MODE_CFI){
- 		unsigned char bootloc;
- 		/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		cfi_fixup_major_minor(cfi, extp);
- 
--		if (extp->MajorVersion != '1' ||
--		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
-+		// valid primary extension versions are: 1.0, 1.1, 1.2, 1.3
-+		// see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on
-+		//      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
-+		if (extp->MajorVersion < '1' ||
-+		    extp->MajorVersion > '1' ||
-+		    (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {
- 			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
-+			       "version %c.%c (0x%02x/0x%02x).\n",
-+			       extp->MajorVersion, extp->MinorVersion,
-+			       extp->MajorVersion, extp->MinorVersion);
- 			kfree(extp);
- 			kfree(mtd);
- 			return NULL;
- 		}
- 
-+		printk("  Amd/Fujitsu Extended Query version %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		/* Install our own private info structure */
- 		cfi->cmdset_priv = extp;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
deleted file mode 100644
index d73b2d1523..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,54 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+#include <asm/bootinfo.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	const char		*mach_id;
-+	const char		*mach_name;
-+	void			(*mach_setup)(void);
-+};
-+
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
-+static struct mips_machine machine_##_type			\
-+		__used __section(.mips.machines.init) =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_id	= machine_id_##_type,			\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};
-+
-+extern long __mips_machines_start;
-+extern long __mips_machines_end;
-+
-+#ifdef CONFIG_MIPS_MACHINE
-+int  mips_machtype_setup(char *id) __init;
-+void mips_machine_setup(void) __init;
-+void mips_set_machine_name(const char *name) __init;
-+char *mips_get_machine_name(void);
-+#else
-+static inline int mips_machtype_setup(char *id) { return 1; }
-+static inline void mips_machine_setup(void) { }
-+static inline void mips_set_machine_name(const char *name) { }
-+static inline char *mips_get_machine_name(void) { return NULL; }
-+#endif /* CONFIG_MIPS_MACHINE */
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,86 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+
-+#include <asm/mips_machine.h>
-+
-+static struct mips_machine *mips_machine __initdata;
-+static char *mips_machine_name = "Unknown";
-+
-+#define for_each_machine(mach) \
-+	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
-+	     (mach) && \
-+	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
-+	     (mach)++)
-+
-+__init void mips_set_machine_name(const char *name)
-+{
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	p = kstrdup(name, GFP_KERNEL);
-+	if (!p)
-+		pr_err("MIPS: no memory for machine_name\n");
-+
-+	mips_machine_name = p;
-+}
-+
-+char *mips_get_machine_name(void)
-+{
-+	return mips_machine_name;
-+}
-+
-+__init int mips_machtype_setup(char *id)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, id) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
-+	pr_err("%-24s : %s\n", "id", "name");
-+	for_each_machine(mach)
-+		pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+__init void mips_machine_setup(void)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mips_machtype == mach->mach_type) {
-+			mips_machine = mach;
-+			break;
-+		}
-+	}
-+
-+	if (!mips_machine)
-+		return;
-+
-+	mips_set_machine_name(mips_machine->mach_name);
-+	pr_info("MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mips_machine->mach_setup)
-+		mips_machine->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -854,6 +854,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+		if (mips_get_machine_name())
-+			seq_printf(m, "machine\t\t\t: %s\n",
-+				   mips_get_machine_name());
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -97,6 +97,13 @@ SECTIONS
- 	INIT_TEXT_SECTION(PAGE_SIZE)
- 	INIT_DATA_SECTION(16)
- 
-+	. = ALIGN(4);
-+	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-+		__mips_machines_start = .;
-+		*(.mips.machines.init)
-+		__mips_machines_end = .;
-+	}
-+
- 	/* .exit.text is discarded at runtime, not link time, to deal with
- 	 * references from .rodata
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 8b9cfe32cd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -857,6 +857,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch
deleted file mode 100644
index e1e9f73699..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -842,6 +842,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -56,6 +56,12 @@
- #endif
- #define __mips 4
- 
-+/* Further private data for which no space exists in mips_fpu_struct */
-+
-+struct mips_fpu_emulator_stats fpuemustats;
-+
-+#ifdef CONFIG_MIPS_FPU_EMU
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,10 +72,6 @@ static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction);
- #endif
- 
--/* Further private data for which no space exists in mips_fpu_struct */
--
--struct mips_fpu_emulator_stats fpuemustats;
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1274,6 +1276,13 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
- 
- #ifdef CONFIG_DEBUG_FS
- extern struct dentry *mips_debugfs_dir;
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.32/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.32/027-mips_module_reloc.patch
deleted file mode 100644
index c0dc64e269..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -83,7 +83,7 @@ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
deleted file mode 100644
index 5d86333c73..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef VMLINUX_SYMBOL
- #define VMLINUX_SYMBOL(_sym_) _sym_
- #endif
-@@ -254,35 +275,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -323,7 +344,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -638,6 +659,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -192,16 +192,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.32/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.32/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23cb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.32/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.32/030-pci_disable_common_quirks.patch
deleted file mode 100644
index cd08ea14f7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1884,7 +1885,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2516,6 +2519,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.32/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.32/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 6945ebf4c9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -820,3 +820,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -188,3 +188,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.32/050-lzo_compressed_kernels.patch b/target/linux/generic-2.6/patches-2.6.32/050-lzo_compressed_kernels.patch
deleted file mode 100644
index 733d1756f6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/050-lzo_compressed_kernels.patch
+++ /dev/null
@@ -1,309 +0,0 @@
---- /dev/null
-+++ b/include/linux/decompress/unlzo.h
-@@ -0,0 +1,10 @@
-+#ifndef DECOMPRESS_UNLZO_H
-+#define DECOMPRESS_UNLZO_H
-+
-+int unlzo(unsigned char *inbuf, int len,
-+	int(*fill)(void*, unsigned int),
-+	int(*flush)(void*, unsigned int),
-+	unsigned char *output,
-+	int *pos,
-+	void(*error)(char *x));
-+#endif
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2
- config HAVE_KERNEL_LZMA
- 	bool
- 
-+config HAVE_KERNEL_LZO
-+	bool
-+
- choice
- 	prompt "Kernel compression mode"
- 	default KERNEL_GZIP
--	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
-+	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
- 	help
- 	  The linux kernel is a kind of self-extracting executable.
- 	  Several compression algorithms are available, which differ
-@@ -141,9 +144,8 @@ config KERNEL_GZIP
- 	bool "Gzip"
- 	depends on HAVE_KERNEL_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config KERNEL_BZIP2
- 	bool "Bzip2"
-@@ -164,6 +166,14 @@ config KERNEL_LZMA
- 	  two. Compression is slowest.	The kernel size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config KERNEL_LZO
-+	bool "LZO"
-+	depends on HAVE_KERNEL_LZO
-+	help
-+	  Its compression ratio is the poorest among the 4. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
- 
- config SWAP
---- /dev/null
-+++ b/lib/decompress_unlzo.c
-@@ -0,0 +1,208 @@
-+/*
-+ * LZO decompressor for the Linux kernel. Code borrowed from the lzo
-+ * implementation by Markus Franz Xaver Johannes Oberhumer.
-+ *
-+ * Linux kernel adaptation:
-+ * Copyright (C) 2009
-+ * Albin Tonnerre, Free Electrons <albin.tonnerre@free-electrons.com>
-+ *
-+ * Original code:
-+ * Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer
-+ * All Rights Reserved.
-+ *
-+ * lzop and the LZO library are free software; you can redistribute them
-+ * and/or modify them under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; see the file COPYING.
-+ * If not, write to the Free Software Foundation, Inc.,
-+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * Markus F.X.J. Oberhumer
-+ * <markus@oberhumer.com>
-+ * http://www.oberhumer.com/opensource/lzop/
-+ */
-+
-+#ifdef STATIC
-+#include "lzo/lzo1x_decompress.c"
-+#else
-+#include <linux/slab.h>
-+#include <linux/decompress/unlzo.h>
-+#endif
-+
-+#include <linux/types.h>
-+#include <linux/lzo.h>
-+#include <linux/decompress/mm.h>
-+
-+#include <linux/compiler.h>
-+#include <asm/unaligned.h>
-+
-+static const unsigned char lzop_magic[] =
-+	{ 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a };
-+
-+#define LZO_BLOCK_SIZE        (256*1024l)
-+#define HEADER_HAS_FILTER      0x00000800L
-+
-+STATIC inline int INIT parse_header(u8 *input, u8 *skip)
-+{
-+	int l;
-+	u8 *parse = input;
-+	u8 level = 0;
-+	u16 version;
-+
-+	/* read magic: 9 first bits */
-+	for (l = 0; l < 9; l++) {
-+		if (*parse++ != lzop_magic[l])
-+			return 0;
-+	}
-+	/* get version (2bytes), skip library version (2),
-+	 * 'need to be extracted' version (2) and
-+	 * method (1) */
-+	version = get_unaligned_be16(parse);
-+	parse += 7;
-+	if (version >= 0x0940)
-+		level = *parse++;
-+	if (get_unaligned_be32(parse) & HEADER_HAS_FILTER)
-+		parse += 8; /* flags + filter info */
-+	else
-+		parse += 4; /* flags */
-+
-+	/* skip mode and mtime_low */
-+	parse += 8;
-+	if (version >= 0x0940)
-+		parse += 4;	/* skip mtime_high */
-+
-+	l = *parse++;
-+	/* don't care about the file name, and skip checksum */
-+	parse += l + 4;
-+
-+	*skip = parse - input;
-+	return 1;
-+}
-+
-+STATIC inline int INIT unlzo(u8 *input, int in_len,
-+				int (*fill) (void *, unsigned int),
-+				int (*flush) (void *, unsigned int),
-+				u8 *output, int *posp,
-+				void (*error_fn) (char *x))
-+{
-+	u8 skip = 0, r = 0;
-+	u32 src_len, dst_len;
-+	size_t tmp;
-+	u8 *in_buf, *in_buf_save, *out_buf;
-+	int obytes_processed = 0;
-+
-+	set_error_fn(error_fn);
-+
-+	if (output)
-+		out_buf = output;
-+	else if (!flush) {
-+		error("NULL output pointer and no flush function provided");
-+		goto exit;
-+	} else {
-+		out_buf = malloc(LZO_BLOCK_SIZE);
-+		if (!out_buf) {
-+			error("Could not allocate output buffer");
-+			goto exit;
-+		}
-+	}
-+
-+	if (input && fill) {
-+		error("Both input pointer and fill function provided, don't know what to do");
-+		goto exit_1;
-+	} else if (input)
-+		in_buf = input;
-+	else if (!fill || !posp) {
-+		error("NULL input pointer and missing position pointer or fill function");
-+		goto exit_1;
-+	} else {
-+		in_buf = malloc(lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		if (!in_buf) {
-+			error("Could not allocate input buffer");
-+			goto exit_1;
-+		}
-+	}
-+	in_buf_save = in_buf;
-+
-+	if (posp)
-+		*posp = 0;
-+
-+	if (fill)
-+		fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+
-+	if (!parse_header(input, &skip)) {
-+		error("invalid header");
-+		goto exit_2;
-+	}
-+	in_buf += skip;
-+
-+	if (posp)
-+		*posp = skip;
-+
-+	for (;;) {
-+		/* read uncompressed block size */
-+		dst_len = get_unaligned_be32(in_buf);
-+		in_buf += 4;
-+
-+		/* exit if last block */
-+		if (dst_len == 0) {
-+			if (posp)
-+				*posp += 4;
-+			break;
-+		}
-+
-+		if (dst_len > LZO_BLOCK_SIZE) {
-+			error("dest len longer than block size");
-+			goto exit_2;
-+		}
-+
-+		/* read compressed block size, and skip block checksum info */
-+		src_len = get_unaligned_be32(in_buf);
-+		in_buf += 8;
-+
-+		if (src_len <= 0 || src_len > dst_len) {
-+			error("file corrupted");
-+			goto exit_2;
-+		}
-+
-+		/* decompress */
-+		tmp = dst_len;
-+		r = lzo1x_decompress_safe((u8 *) in_buf, src_len, out_buf, &tmp);
-+
-+		if (r != LZO_E_OK || dst_len != tmp) {
-+			error("Compressed data violation");
-+			goto exit_2;
-+		}
-+
-+		obytes_processed += dst_len;
-+		if (flush)
-+			flush(out_buf, dst_len);
-+		if (output)
-+			out_buf += dst_len;
-+		if (posp)
-+			*posp += src_len + 12;
-+		if (fill) {
-+			in_buf = in_buf_save;
-+			fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE));
-+		} else
-+			in_buf += src_len;
-+	}
-+
-+exit_2:
-+	if (!input)
-+		free(in_buf);
-+exit_1:
-+	if (!output)
-+		free(out_buf);
-+exit:
-+	return obytes_processed;
-+}
-+
-+#define decompress unlzo
---- a/lib/lzo/lzo1x_decompress.c
-+++ b/lib/lzo/lzo1x_decompress.c
-@@ -11,11 +11,13 @@
-  *  Richard Purdie <rpurdie@openedhand.com>
-  */
- 
-+#ifndef STATIC
- #include <linux/module.h>
- #include <linux/kernel.h>
--#include <linux/lzo.h>
--#include <asm/byteorder.h>
-+#endif
-+
- #include <asm/unaligned.h>
-+#include <linux/lzo.h>
- #include "lzodefs.h"
- 
- #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x))
-@@ -244,9 +246,10 @@ lookbehind_overrun:
- 	*out_len = op - out;
- 	return LZO_E_LOOKBEHIND_OVERRUN;
- }
--
-+#ifndef STATIC
- EXPORT_SYMBOL_GPL(lzo1x_decompress_safe);
- 
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("LZO1X Decompressor");
- 
-+#endif
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -230,3 +230,8 @@ quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
- 	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
-+
-+quiet_cmd_lzo = LZO    $@
-+cmd_lzo = (cat $(filter-out FORCE,$^) | \
-+	lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	(rm -f $@ ; false)
diff --git a/target/linux/generic-2.6/patches-2.6.32/051-lzo_compressed_kernel_for_arm.patch b/target/linux/generic-2.6/patches-2.6.32/051-lzo_compressed_kernel_for_arm.patch
deleted file mode 100644
index 49512bb41d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/051-lzo_compressed_kernel_for_arm.patch
+++ /dev/null
@@ -1,283 +0,0 @@
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -18,6 +18,8 @@ config ARM
- 	select HAVE_KRETPROBES if (HAVE_KPROBES)
- 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
- 	select HAVE_GENERIC_DMA_COHERENT
-+	select HAVE_KERNEL_GZIP
-+	select HAVE_KERNEL_LZO
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -63,8 +63,12 @@ endif
- 
- SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
- 
--targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
--		 head.o misc.o $(OBJS)
-+suffix_$(CONFIG_KERNEL_GZIP) = gzip
-+suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+
-+targets       := vmlinux vmlinux.lds \
-+		 piggy.$(suffix_y) piggy.$(suffix_y).o \
-+		 font.o font.c head.o misc.o $(OBJS)
- 
- ifeq ($(CONFIG_FUNCTION_TRACER),y)
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
-@@ -87,22 +91,31 @@ endif
- ifneq ($(PARAMS_PHYS),)
- LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)
- endif
--LDFLAGS_vmlinux += -p --no-undefined -X \
--	$(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T
-+# ?
-+LDFLAGS_vmlinux += -p
-+# Report unresolved symbol references
-+LDFLAGS_vmlinux += --no-undefined
-+# Delete all temporary local symbols
-+LDFLAGS_vmlinux += -X
-+# Next argument is a linker script
-+LDFLAGS_vmlinux += -T
-+
-+# For __aeabi_uidivmod
-+lib1funcs = $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.o
- 
- # Don't allow any static data in misc.o, which
- # would otherwise mess up our GOT table
- CFLAGS_misc.o := -Dstatic=
- 
--$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
--	 	$(addprefix $(obj)/, $(OBJS)) FORCE
-+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
-+	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
- 	$(call if_changed,ld)
- 	@:
- 
--$(obj)/piggy.gz: $(obj)/../Image FORCE
--	$(call if_changed,gzip)
-+$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
-+	$(call if_changed,$(suffix_y))
- 
--$(obj)/piggy.o:  $(obj)/piggy.gz FORCE
-+$(obj)/piggy.$(suffix_y).o:  $(obj)/piggy.$(suffix_y) FORCE
- 
- CFLAGS_font.o := -Dstatic=
- 
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -18,10 +18,15 @@
- 
- unsigned int __machine_arch_type;
- 
-+#define _LINUX_STRING_H_
-+
- #include <linux/compiler.h>	/* for inline */
- #include <linux/types.h>	/* for size_t */
- #include <linux/stddef.h>	/* for NULL */
- #include <asm/string.h>
-+#include <linux/linkage.h>
-+
-+#include <asm/unaligned.h>
- 
- #ifdef STANDALONE_DEBUG
- #define putstr printf
-@@ -188,34 +193,8 @@ static inline __ptr_t memcpy(__ptr_t __d
- /*
-  * gzip delarations
-  */
--#define OF(args)  args
- #define STATIC static
- 
--typedef unsigned char  uch;
--typedef unsigned short ush;
--typedef unsigned long  ulg;
--
--#define WSIZE 0x8000		/* Window size must be at least 32k, */
--				/* and a power of two */
--
--static uch *inbuf;		/* input buffer */
--static uch window[WSIZE];	/* Sliding window buffer */
--
--static unsigned insize;		/* valid bytes in inbuf */
--static unsigned inptr;		/* index of next byte to be processed in inbuf */
--static unsigned outcnt;		/* bytes in output buffer */
--
--/* gzip flag byte */
--#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
--#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
--#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
--#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
--#define COMMENT      0x10 /* bit 4 set: file comment present */
--#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
--#define RESERVED     0xC0 /* bit 6,7:   reserved */
--
--#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
--
- /* Diagnostic functions */
- #ifdef DEBUG
- #  define Assert(cond,msg) {if(!(cond)) error(msg);}
-@@ -233,24 +212,20 @@ static unsigned outcnt;		/* bytes in out
- #  define Tracecv(c,x)
- #endif
- 
--static int  fill_inbuf(void);
--static void flush_window(void);
- static void error(char *m);
- 
- extern char input_data[];
- extern char input_data_end[];
- 
--static uch *output_data;
--static ulg output_ptr;
--static ulg bytes_out;
-+static unsigned char *output_data;
-+static unsigned long output_ptr;
- 
- static void error(char *m);
- 
- static void putstr(const char *);
- 
--extern int end;
--static ulg free_mem_ptr;
--static ulg free_mem_end_ptr;
-+static unsigned long free_mem_ptr;
-+static unsigned long free_mem_end_ptr;
- 
- #ifdef STANDALONE_DEBUG
- #define NO_INFLATE_MALLOC
-@@ -258,46 +233,13 @@ static ulg free_mem_end_ptr;
- 
- #define ARCH_HAS_DECOMP_WDOG
- 
--#include "../../../../lib/inflate.c"
--
--/* ===========================================================================
-- * Fill the input buffer. This is called only when the buffer is empty
-- * and at least one byte is really needed.
-- */
--int fill_inbuf(void)
--{
--	if (insize != 0)
--		error("ran out of input data");
--
--	inbuf = input_data;
--	insize = &input_data_end[0] - &input_data[0];
--
--	inptr = 1;
--	return inbuf[0];
--}
-+#ifdef CONFIG_KERNEL_GZIP
-+#include "../../../../lib/decompress_inflate.c"
-+#endif
- 
--/* ===========================================================================
-- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
-- * (Used for the decompressed data only.)
-- */
--void flush_window(void)
--{
--	ulg c = crc;
--	unsigned n;
--	uch *in, *out, ch;
--
--	in = window;
--	out = &output_data[output_ptr];
--	for (n = 0; n < outcnt; n++) {
--		ch = *out++ = *in++;
--		c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
--	}
--	crc = c;
--	bytes_out += (ulg)outcnt;
--	output_ptr += (ulg)outcnt;
--	outcnt = 0;
--	putstr(".");
--}
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
- 
- #ifndef arch_error
- #define arch_error(x)
-@@ -314,22 +256,33 @@ static void error(char *x)
- 	while(1);	/* Halt */
- }
- 
-+asmlinkage void __div0(void)
-+{
-+	error("Attempting division by 0!");
-+}
-+
- #ifndef STANDALONE_DEBUG
- 
--ulg
--decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
--		  int arch_id)
-+unsigned long
-+decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
-+		unsigned long free_mem_ptr_end_p,
-+		int arch_id)
- {
--	output_data		= (uch *)output_start;	/* Points to kernel start */
-+	unsigned char *tmp;
-+
-+	output_data		= (unsigned char *)output_start;
- 	free_mem_ptr		= free_mem_ptr_p;
- 	free_mem_end_ptr	= free_mem_ptr_end_p;
- 	__machine_arch_type	= arch_id;
- 
- 	arch_decomp_setup();
- 
--	makecrc();
-+	tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
-+	output_ptr = get_unaligned_le32(tmp);
-+
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr(" done, booting the kernel.\n");
- 	return output_ptr;
- }
-@@ -341,11 +294,10 @@ int main()
- {
- 	output_data = output_buffer;
- 
--	makecrc();
- 	putstr("Uncompressing Linux...");
--	gunzip();
-+	decompress(input_data, input_data_end - input_data,
-+			NULL, NULL, output_data, NULL, error);
- 	putstr("done.\n");
- 	return 0;
- }
- #endif
--	
---- a/arch/arm/boot/compressed/piggy.S
-+++ /dev/null
-@@ -1,6 +0,0 @@
--	.section .piggydata,#alloc
--	.globl	input_data
--input_data:
--	.incbin	"arch/arm/boot/compressed/piggy.gz"
--	.globl	input_data_end
--input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.gzip.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.gzip"
-+	.globl	input_data_end
-+input_data_end:
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzo.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzo"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.32/052-lzo_compressed_kernel_for_x86.patch b/target/linux/generic-2.6/patches-2.6.32/052-lzo_compressed_kernel_for_x86.patch
deleted file mode 100644
index ea7d2400ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/052-lzo_compressed_kernel_for_x86.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -49,6 +49,7 @@ config X86
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_BZIP2
- 	select HAVE_KERNEL_LZMA
-+	select HAVE_KERNEL_LZO
- 	select HAVE_ARCH_KMEMCHECK
- 
- config OUTPUT_FORMAT
---- a/arch/x86/boot/compressed/Makefile
-+++ b/arch/x86/boot/compressed/Makefile
-@@ -4,7 +4,7 @@
- # create a compressed vmlinux image from the original vmlinux
- #
- 
--targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma head_$(BITS).o misc.o piggy.o
-+targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o
- 
- KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
- KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
-@@ -48,10 +48,13 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.al
- 	$(call if_changed,bzip2)
- $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
- 	$(call if_changed,lzma)
-+$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
-+	$(call if_changed,lzo)
- 
- suffix-$(CONFIG_KERNEL_GZIP)	:= gz
- suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2
- suffix-$(CONFIG_KERNEL_LZMA)	:= lzma
-+suffix-$(CONFIG_KERNEL_LZO) 	:= lzo
- 
- quiet_cmd_mkpiggy = MKPIGGY $@
-       cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )
---- a/arch/x86/boot/compressed/misc.c
-+++ b/arch/x86/boot/compressed/misc.c
-@@ -162,6 +162,10 @@ static int lines, cols;
- #include "../../../../lib/decompress_unlzma.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZO
-+#include "../../../../lib/decompress_unlzo.c"
-+#endif
-+
- static void scroll(void)
- {
- 	int i;
diff --git a/target/linux/generic-2.6/patches-2.6.32/053-lzo_compression_for_initramfs.patch b/target/linux/generic-2.6/patches-2.6.32/053-lzo_compression_for_initramfs.patch
deleted file mode 100644
index c05c3833d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/053-lzo_compression_for_initramfs.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -120,6 +120,10 @@ config DECOMPRESS_LZMA
- config DECOMPRESS_LZMA_NEEDED
- 	 boolean
- 
-+config DECOMPRESS_LZO
-+	select LZO_DECOMPRESS
-+	tristate
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -69,6 +69,7 @@ obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
- lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
-+lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o
- 
- obj-$(CONFIG_TEXTSEARCH) += textsearch.o
- obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -9,6 +9,7 @@
- #include <linux/decompress/bunzip2.h>
- #include <linux/decompress/unlzma.h>
- #include <linux/decompress/inflate.h>
-+#include <linux/decompress/unlzo.h>
- 
- #include <linux/types.h>
- #include <linux/string.h>
-@@ -22,6 +23,9 @@
- #ifndef CONFIG_DECOMPRESS_LZMA
- # define unlzma NULL
- #endif
-+#ifndef CONFIG_DECOMPRESS_LZO
-+# define unlzo NULL
-+#endif
- 
- static const struct compress_format {
- 	unsigned char magic[2];
-@@ -32,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
- 
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -72,6 +72,15 @@ config RD_LZMA
- 	  Support loading of a LZMA encoded initial ramdisk or cpio buffer
- 	  If unsure, say N.
- 
-+config RD_LZO
-+	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
-+	default !EMBEDDED
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
-+	select DECOMPRESS_LZO
-+	help
-+	  Support loading of a LZO encoded initial ramdisk or cpio buffer
-+	  If unsure, say N.
-+
- choice
- 	prompt "Built-in initramfs compression mode" if INITRAMFS_SOURCE!=""
- 	help
-@@ -108,16 +117,15 @@ config INITRAMFS_COMPRESSION_GZIP
- 	bool "Gzip"
- 	depends on RD_GZIP
- 	help
--	  The old and tried gzip compression. Its compression ratio is
--	  the poorest among the 3 choices; however its speed (both
--	  compression and decompression) is the fastest.
-+	  The old and tried gzip compression. It provides a good balance
-+	  between compression ratio and decompression speed.
- 
- config INITRAMFS_COMPRESSION_BZIP2
- 	bool "Bzip2"
- 	depends on RD_BZIP2
- 	help
- 	  Its compression ratio and speed is intermediate.
--	  Decompression speed is slowest among the three.  The initramfs
-+	  Decompression speed is slowest among the four.  The initramfs
- 	  size is about 10% smaller with bzip2, in comparison to gzip.
- 	  Bzip2 uses a large amount of memory. For modern kernels you
- 	  will need at least 8MB RAM or more for booting.
-@@ -128,7 +136,15 @@ config INITRAMFS_COMPRESSION_LZMA
- 	help
- 	  The most recent compression algorithm.
- 	  Its ratio is best, decompression speed is between the other
--	  two. Compression is slowest.	The initramfs size is about 33%
-+	  three. Compression is slowest. The initramfs size is about 33%
- 	  smaller with LZMA in comparison to gzip.
- 
-+config INITRAMFS_COMPRESSION_LZO
-+	bool "LZO"
-+	depends on RD_LZO
-+	help
-+	  Its compression ratio is the poorest among the four. The kernel
-+	  size is about about 10% bigger than gzip; however its speed
-+	  (both compression and decompression) is the fastest.
-+
- endchoice
diff --git a/target/linux/generic-2.6/patches-2.6.32/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.32/055-lzma_arm_kernel.patch
deleted file mode 100644
index a0111bd554..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/055-lzma_arm_kernel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Fri, 16 Oct 2009 16:17:22 +0200
-Subject: [PATCH] Add LZMA decompression on ARM
-
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
----
- arch/arm/Kconfig                      |    1 +
- arch/arm/boot/compressed/Makefile     |    1 +
- arch/arm/boot/compressed/misc.c       |    4 ++++
- arch/arm/boot/compressed/piggy.lzma.S |    6 ++++++
- 4 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -20,6 +20,7 @@ config ARM
- 	select HAVE_GENERIC_DMA_COHERENT
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_LZO
-+	select HAVE_KERNEL_LZMA
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
- 
- suffix_$(CONFIG_KERNEL_GZIP) = gzip
- suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+suffix_$(CONFIG_KERNEL_LZMA)  = lzma
- 
- targets       := vmlinux vmlinux.lds \
- 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -237,6 +237,10 @@ static unsigned long free_mem_end_ptr;
- #include "../../../../lib/decompress_inflate.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZMA
-+#include "../../../../lib/decompress_unlzma.c"
-+#endif
-+
- #ifdef CONFIG_KERNEL_LZO
- #include "../../../../lib/decompress_unlzo.c"
- #endif
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.32/057-arm_fix_uncompress_code.patch b/target/linux/generic-2.6/patches-2.6.32/057-arm_fix_uncompress_code.patch
deleted file mode 100644
index d11d11ba05..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/057-arm_fix_uncompress_code.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From b53e9b5ebd5c6e718f54bcacd4e97b71533ca681 Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Thu, 14 Jan 2010 20:36:55 +0100
-Subject: [PATCH] ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)
-
-Because of the include of the decompress_inflate.c file from
-boot/compress/misc.c, there are different flush() defines:
-
-In file included from arch/arm/boot/compressed/misc.c:249:
-arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0
-
-Fix this by removing the define of flush() in misc.c for
-CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h,
-and that is being included unconditionally.
-
-Also use a static inline function instead of define
-for mach-mxc and mach-gemini to avoid similar bug
-for those platforms.
-
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/boot/compressed/misc.c                |    1 -
- arch/arm/mach-gemini/include/mach/uncompress.h |    4 +++-
- arch/arm/plat-mxc/include/mach/uncompress.h    |    4 +++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -88,7 +88,6 @@ static void icedcc_putc(int ch)
- #endif
- 
- #define putc(ch)	icedcc_putc(ch)
--#define flush()	do { } while (0)
- #endif
- 
- static void putstr(const char *ptr)
---- a/arch/arm/mach-gemini/include/mach/uncompress.h
-+++ b/arch/arm/mach-gemini/include/mach/uncompress.h
-@@ -30,7 +30,9 @@ static inline void putc(char c)
- 	UART[UART_TX] = c;
- }
- 
--#define flush() do { } while (0)
-+static inline void flush(void)
-+{
-+}
- 
- /*
-  * nothing to do
---- a/arch/arm/plat-mxc/include/mach/uncompress.h
-+++ b/arch/arm/plat-mxc/include/mach/uncompress.h
-@@ -60,7 +60,9 @@ static void putc(int ch)
- 	UART(TXR) = ch;
- }
- 
--#define flush() do { } while (0)
-+static inline void flush(void)
-+{
-+}
- 
- #define MX1_UART1_BASE_ADDR	0x00206000
- #define MX25_UART1_BASE_ADDR	0x43f90000
diff --git a/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch
deleted file mode 100644
index 3a47c85bb9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -625,6 +625,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
deleted file mode 100644
index 22b3f5e900..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.32/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.32/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.32/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.32/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.32/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.32/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.32/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.32/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 3897c33c23..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -576,6 +576,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -80,7 +80,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		res = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.32/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.32/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee88..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.32/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index 97148d07d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -492,8 +492,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 30c5cc9529..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -626,6 +626,10 @@ static struct flash_info __devinitdata m
- 	{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
- 	{ "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
-+	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index d3bd1dd5ef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -626,6 +626,10 @@ static struct flash_info __devinitdata m
- 	{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
- 	{ "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
-+	{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
- 	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
diff --git a/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 0c7c227ed8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
- 	{ "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
- 	{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  0x898911, 0, 64 * 1024,  64, },
-+	{ "320s33b",  0x898912, 0, 64 * 1024, 128, },
-+	{ "640s33b",  0x898913, 0, 64 * 1024, 256, },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
- 	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
-@@ -784,11 +789,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel serial flash tend to power up
-+	 * Atmel and Intel/Numonyx serial flash tend to power up
- 	 * with the software protection bits set
- 	 */
- 
--	if (info->jedec_id >> 16 == 0x1f) {
-+	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 5f44c1d696..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -687,6 +687,7 @@ static struct flash_info __devinitdata m
- 	{ "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, },
- 	{ "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
- 	{ "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },
-+	{ "w25q32", 0xef4016, 0, 64 * 1024, 64, SECT_4K, },
- 	{ "w25x64", 0xef3017, 0, 64 * 1024, 128, SECT_4K, },
- };
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/088-winbond_cmdset.patch b/target/linux/generic-2.6/patches-2.6.32/088-winbond_cmdset.patch
deleted file mode 100644
index d5889ce62d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/088-winbond_cmdset.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/chips/gen_probe.c
-+++ b/drivers/mtd/chips/gen_probe.c
-@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
- #endif
- #ifdef CONFIG_MTD_CFI_AMDSTD
- 	case 0x0002:
-+	case 0x0006:
- 		return cfi_cmdset_0002(map, primary);
- #endif
- #ifdef CONFIG_MTD_CFI_STAA
diff --git a/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
deleted file mode 100644
index 46923358b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -327,9 +327,32 @@ static void cfi_fixup_major_minor(struct
- {
- 	// manufacturers defined in include/linux/mtd/cfi.h
- 
--	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
--	    extp->MajorVersion == '0')
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '0') {
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		extp->MajorVersion = '1';
-+		extp->MinorVersion = '0';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
-+
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '3' && extp->MinorVersion == '3') {
-+		printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+		       "should be compatibile with Amd/Fujitsu.\n");
-+
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
-+		extp->MajorVersion = '1';	// set to 1.3 (last defined version)
-+		extp->MinorVersion = '3';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
- }
- 
- struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
diff --git a/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index be7d97fe12..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.32/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.32/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
deleted file mode 100644
index a9eb1089f5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -88,6 +88,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP)
- 	    || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -138,13 +141,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -154,6 +179,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -196,7 +223,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -321,8 +347,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -339,13 +385,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -992,6 +1031,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
- 			goto free_counters;
- 		}
- 
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
-+
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
- 		     i += m->u.match_size) {
diff --git a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch
deleted file mode 100644
index 9540ce0dde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1336 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,632 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *             2009/09/26 - (Jussi Kivilinna)
-+ *              - Add imq_nf_reinject_lockless to fix deadlock with
-+ *                imq_nf_queue/imq_nf_reinject.
-+ *
-+ *             2009/12/08 - (Jussi Kivilinna)
-+ *              - Port to 2.6.32
-+ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
-+ *              - Also add better error checking for skb->nf_queue_entry usage
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+						unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		nf_reinject(entry, verdict);
-+		return;
-+	}
-+
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+	dev->trans_start = jiffies;
-+
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	if (entry == NULL) {
-+		/* We don't know what is going on here.. packet is queued for
-+		 * imq device, but (probably) not by us.
-+		 *
-+		 * If this packet was not send here by imq_nf_queue(), then
-+		 * skb_save_cb() was not used and skb_free() should not show:
-+		 *   WARNING: IMQ: kfree_skb: skb->cb_next:..
-+		 * and/or
-+		 *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
-+		 *
-+		 * However if this message is shown, then IMQ is somehow broken
-+		 * and you should report this to linuximq.net.
-+		 */
-+
-+		/* imq_dev_xmit is black hole that eats all packets, report that
-+		 * we eat this packet happily and increase dropped counters.
-+		 */
-+
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	imq_nf_reinject(entry, NF_ACCEPT);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject_lockless(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		skb->nf_queue_entry = NULL;
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -165,6 +165,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1114,6 +1114,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice(struct net_device *dev);
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -330,6 +333,9 @@ struct sk_buff {
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48];
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
- 
- 	unsigned int		len,
- 				data_len;
-@@ -362,6 +368,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -383,6 +392,10 @@ struct sk_buff {
- 
- 	/* 0/14 bit hole */
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
-+
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
- #endif
-@@ -437,6 +450,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1972,6 +1991,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -96,6 +96,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1704,7 +1707,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device 
- }
- EXPORT_SYMBOL(skb_tx_hash);
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	const struct net_device_ops *ops = dev->netdev_ops;
- 	u16 queue_index = 0;
-@@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- 				 struct net_device *dev,
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
-+{
-+	struct skb_cb_table *next;
-+	struct sk_buff *old;
-+
-+	if (!__old->cb_next) {
-+		new->cb_next = NULL;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	old = (struct sk_buff *)__old;
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
-+				"%08x\n", (unsigned int)skb->cb_next);
-+
-+		skb_restore_cb(skb);
-+	}
-+	/* This should not happen either, nf_queue_entry is nullified in
-+	 * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
-+	 * leaking entry pointers, maybe memory. We don't know if this is
-+	 * pointer to already freed memory, or should this be freed.
-+	 * If this happens we need to add refcounting, etc for nf_queue_entry.
-+	 */
-+	if (skb->nf_queue_entry && net_ratelimit())
-+		printk(KERN_WARNING
-+				"IMQ: kfree_skb: skb->nf_queue_entry != NULL");
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -535,6 +635,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2776,6 +2879,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.32/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.32/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.32/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.32/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch
deleted file mode 100644
index f3636e6521..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -182,8 +182,37 @@ struct tc_sfq_xstats
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.32/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.32/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch
deleted file mode 100644
index 6ea9ba51ee..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch
deleted file mode 100644
index 0c1ae72a4e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.32/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.32/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
deleted file mode 100644
index face44c0a3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1384,11 +1384,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1478,9 +1485,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1553,7 +1560,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.32/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.32/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.32/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.32/208-mips_oprofile_fix.patch
deleted file mode 100644
index 2e019dba2c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -48,7 +48,9 @@ ifneq ($(SUBARCH),$(ARCH))
-   endif
- endif
- 
-+ifndef CONFIG_PROFILING
- cflags-y := -ffunction-sections
-+endif
- cflags-y += $(call cc-option, -mno-check-zero-division)
- 
- ifdef CONFIG_32BIT
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.32/209-mini_fo.patch
deleted file mode 100644
index 0b4091c64e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/209-mini_fo.patch
+++ /dev/null
@@ -1,7780 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -180,6 +180,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,252 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6faa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.32/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index 8bd9ba3244..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.32/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.32/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.32/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.32/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.32/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.32/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.32/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224cc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.32/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.32/220-sound_kconfig.patch
deleted file mode 100644
index f374009a65..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -7,7 +7,7 @@ config SND_PCM
- 	select SND_TIMER
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.32/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.32/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index 694737e408..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1170,7 +1170,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.32/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.32/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8be..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch
deleted file mode 100644
index 864f5733ac..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -31,6 +31,8 @@ struct sockaddr_ll
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -48,6 +50,7 @@ struct sockaddr_ll
- #define PACKET_RESERVE			12
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
-+#define PACKET_RECV_TYPE		15
- 
- struct tpacket_stats
- {
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -204,6 +204,7 @@ struct packet_sock {
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- #endif
-+	unsigned int		pkt_type;
- };
- 
- struct packet_skb_cb {
-@@ -342,6 +343,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -349,6 +351,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -361,7 +364,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (dev_net(dev) != sock_net(sk))
-@@ -545,12 +548,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (dev_net(dev) != sock_net(sk))
- 		goto drop;
- 
-@@ -1390,6 +1393,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1737,6 +1741,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1882,6 +1896,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.32/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.32/250-pppoe_header_pad.patch
deleted file mode 100644
index 042546f317..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.32/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.32/260-crypto_optional_tests.patch
deleted file mode 100644
index 0808c778e9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2350,8 +2352,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2406,5 +2411,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9537,4 +9539,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch
deleted file mode 100644
index 1892eb5bd9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -304,4 +304,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch
deleted file mode 100644
index 11a9c9b1ea..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -308,4 +308,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.32/410-gpio_buttons.patch
deleted file mode 100644
index 41f52afea4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -317,4 +317,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/411-add-KEY_WPS_BUTTON-definition.patch b/target/linux/generic-2.6/patches-2.6.32/411-add-KEY_WPS_BUTTON-definition.patch
deleted file mode 100644
index c78874a380..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/411-add-KEY_WPS_BUTTON-definition.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 492d4f25416528ffb900e6edf0fd70eafd098cfc Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Fri, 26 Feb 2010 00:16:05 -0800
-Subject: [PATCH] Input: add KEY_WPS_BUTTON definition
-
-The new key definition is supposed to be used for buttons that initiate
-WiFi Protected setup sequence:
-
-	http://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup
-
-Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
----
- include/linux/input.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/include/linux/input.h
-+++ b/include/linux/input.h
-@@ -595,6 +595,8 @@ struct input_absinfo {
- #define KEY_NUMERIC_STAR	0x20a
- #define KEY_NUMERIC_POUND	0x20b
- 
-+#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
-+
- /* We avoid low common keys in module aliases so they don't get huge. */
- #define KEY_MIN_INTERESTING	KEY_MUTE
- #define KEY_MAX			0x2ff
diff --git a/target/linux/generic-2.6/patches-2.6.32/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.32/420-gpiodev.patch
deleted file mode 100644
index 7e4b85b25b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1029,6 +1029,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -96,6 +96,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.32/430-scsi_header_fix.patch
deleted file mode 100644
index adbd383914..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -145,10 +145,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch
deleted file mode 100644
index e490452e58..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index 5c70e79a05..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.32/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.32/600-phy_extension.patch
deleted file mode 100644
index f3841012a7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/600-phy_extension.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -352,8 +396,8 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
--		if (mii_data->reg_num == MII_BMCR 
-+
-+		if (mii_data->reg_num == MII_BMCR
- 				&& val & BMCR_RESET
- 				&& phydev->drv->config_init) {
- 			phy_scan_fixups(phydev);
-@@ -468,7 +512,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -489,6 +489,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.32/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.32/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index 7ab076b4af..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -379,9 +379,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -681,6 +681,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.32/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.32/620-phy_adm6996.patch
deleted file mode 100644
index b3e469a8d6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.32/630-phy_packets.patch
deleted file mode 100644
index fdfdac7c29..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -807,6 +807,7 @@ struct net_device
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.32/640-br2684_backport_routed.patch b/target/linux/generic-2.6/patches-2.6.32/640-br2684_backport_routed.patch
deleted file mode 100644
index 28dd74dd7c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/640-br2684_backport_routed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a
-Author: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Date:   Fri Dec 4 11:06:32 2009 +0000
-
-    atm: [br2684] allow routed mode operation again
-    
-    in routed mode, we don't have a hardware address so netdev_ops doesnt
-    need to validate our hardware address via .ndo_validate_addr
-    
-    Reported-by: Manuel Fuentes <mfuentes@agenciaefe.com>
-    Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
---- a/net/atm/br2684.c
-+++ b/net/atm/br2684.c
-@@ -554,6 +554,12 @@ static const struct net_device_ops br268
- 	.ndo_validate_addr	= eth_validate_addr,
- };
- 
-+static const struct net_device_ops br2684_netdev_ops_routed = {
-+	.ndo_start_xmit 	= br2684_start_xmit,
-+	.ndo_set_mac_address	= br2684_mac_addr,
-+	.ndo_change_mtu		= eth_change_mtu
-+};
-+
- static void br2684_setup(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
-@@ -569,11 +575,10 @@ static void br2684_setup(struct net_devi
- static void br2684_setup_routed(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
--	brdev->net_dev = netdev;
- 
-+	brdev->net_dev = netdev;
- 	netdev->hard_header_len = 0;
--
--	netdev->netdev_ops = &br2684_netdev_ops;
-+	netdev->netdev_ops = &br2684_netdev_ops_routed;
- 	netdev->addr_len = 0;
- 	netdev->mtu = 1500;
- 	netdev->type = ARPHRD_PPP;
diff --git a/target/linux/generic-2.6/patches-2.6.32/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.32/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index b86e259c8d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.32/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.32/660-phy_mvswitch.patch
deleted file mode 100644
index 36551fd570..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -99,6 +99,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.32/670-phy_ip175c.patch
deleted file mode 100644
index a9452b3bbe..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -102,6 +102,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.32/680-phy_ar8216.patch
deleted file mode 100644
index 0566600a0e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -106,6 +106,10 @@ config IP17XX_PHY
- 	tristate "Driver for IC+ IP17xx switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.32/690-phy_rtl8306.patch
deleted file mode 100644
index 36ce9dfce7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -110,6 +110,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
deleted file mode 100644
index 56050912c1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -141,4 +141,29 @@ config MDIO_GPIO
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called mdio-gpio.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.32/700-rtc7301.patch
deleted file mode 100644
index dfaad429f8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -574,6 +574,15 @@ config RTC_DRV_AB3100
- 	  support. This chip contains a battery- and capacitor-backed RTC.
- 
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -67,6 +67,7 @@ obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.32/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.32/750-glamo-headers.patch
deleted file mode 100644
index 419d98a424..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.32/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.32/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index fea67c49f6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -942,7 +943,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1386,3 +1387,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch
deleted file mode 100644
index 8d90396761..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -807,7 +807,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.32/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.32/902-darwin_scripts_include.patch
deleted file mode 100644
index 6d4b08cbc5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -129,6 +129,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch
deleted file mode 100644
index 7552ceb33d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -432,6 +432,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1476,23 +1476,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4056,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.32/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.32/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.32/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.32/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.32/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.32/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.32/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.32/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.32/921-gpio_spi_driver.patch
deleted file mode 100644
index 73563f2337..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitban
- obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
deleted file mode 100644
index 8c995874a8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -334,6 +334,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- 
- ifeq ($(CONFIG_CB710_DEBUG),y)
- 	CFLAGS-cb710-mmc	+= -DDEBUG
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2377,6 +2377,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.32/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.32/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch
deleted file mode 100644
index 453affe583..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.32/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.32/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d01..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.32/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.32/940-wireless_mesh_header.patch
deleted file mode 100644
index bd44529fbb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -98,7 +98,7 @@ typedef enum netdev_tx netdev_tx_t;
-  */
- 
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.32/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.32/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.32/970-ocf_kbuild_integration.patch
deleted file mode 100644
index f1823ecb46..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -817,3 +817,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -85,6 +85,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch
deleted file mode 100644
index 0b0c1e279c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -387,6 +387,7 @@ struct task_struct *find_task_by_vpid(pi
- {
- 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.32/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.32/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
deleted file mode 100644
index f48c58052f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/975-ssb_update.patch
+++ /dev/null
@@ -1,1231 +0,0 @@
---- a/drivers/ssb/driver_chipcommon.c
-+++ b/drivers/ssb/driver_chipcommon.c
-@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
- {
- 	if (!cc->dev)
- 		return; /* We don't have a ChipCommon */
-+	if (cc->dev->id.revision >= 11)
-+		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
- 	ssb_pmu_init(cc);
- 	chipco_powercontrol_init(cc);
- 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
-@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
- {
- 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
- }
-+EXPORT_SYMBOL(ssb_chipco_gpio_control);
- 
- u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
- {
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -332,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
- 	case 0x5354:
- 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
- 		break;
-+	case 0x4322:
-+		if (cc->pmu.rev == 2) {
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
-+		}
-+		break;
- 	default:
- 		ssb_printk(KERN_ERR PFX
- 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -417,6 +423,7 @@ static void ssb_pmu_resources_init(struc
- 
- 	switch (bus->chip_id) {
- 	case 0x4312:
-+	case 0x4322:
- 		/* We keep the default settings:
- 		 * min_msk = 0xCBB
- 		 * max_msk = 0x7FFFF
---- a/drivers/ssb/driver_gige.c
-+++ b/drivers/ssb/driver_gige.c
-@@ -12,6 +12,7 @@
- #include <linux/ssb/ssb_driver_gige.h>
- #include <linux/pci.h>
- #include <linux/pci_regs.h>
-+#include <linux/slab.h>
- 
- 
- /*
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 			}
- 			break;
--			/* fallthrough */
- 		case SSB_DEV_PCI:
- 		case SSB_DEV_ETHERNET:
- 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 				break;
- 			}
-+			/* fallthrough */
-+		case SSB_DEV_EXTIF:
-+			set_irq(dev, 0);
-+			break;
- 		}
- 	}
- 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
- 	.pci_ops	= &ssb_pcicore_pciops,
- 	.io_resource	= &ssb_pcicore_io_resource,
- 	.mem_resource	= &ssb_pcicore_mem_resource,
--	.mem_offset	= 0x24000000,
- };
- 
--static u32 ssb_pcicore_pcibus_iobase = 0x100;
--static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
--
- /* This function is called when doing a pci_enable_device().
-  * We must first check if the device is a device on the PCI-core bridge. */
- int ssb_pcicore_plat_dev_init(struct pci_dev *d)
- {
--	struct resource *res;
--	int pos, size;
--	u32 *base;
--
- 	if (d->bus->ops != &ssb_pcicore_pciops) {
- 		/* This is not a device on the PCI-core bridge. */
- 		return -ENODEV;
-@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
- 	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
- 		   pci_name(d));
- 
--	/* Fix up resource bases */
--	for (pos = 0; pos < 6; pos++) {
--		res = &d->resource[pos];
--		if (res->flags & IORESOURCE_IO)
--			base = &ssb_pcicore_pcibus_iobase;
--		else
--			base = &ssb_pcicore_pcibus_membase;
--		res->flags |= IORESOURCE_PCI_FIXED;
--		if (res->end) {
--			size = res->end - res->start + 1;
--			if (*base & (size - 1))
--				*base = (*base + size) & ~(size - 1);
--			res->start = *base;
--			res->end = res->start + size - 1;
--			*base += size;
--			pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
--		}
--		/* Fix up PCI bridge BAR0 only */
--		if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
--			break;
--	}
- 	/* Fix up interrupt lines */
- 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
- 	pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
-@@ -551,13 +522,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
- 	might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
- 
- 	/* Enable interrupts for this device. */
--	if (bus->host_pci &&
--	    ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
-+	if ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE)) {
- 		u32 coremask;
- 
- 		/* Calculate the "coremask" for the device. */
- 		coremask = (1 << dev->core_index);
- 
-+		SSB_WARN_ON(bus->bustype != SSB_BUSTYPE_PCI);
- 		err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
- 		if (err)
- 			goto out;
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -18,6 +18,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/pci.h>
- #include <linux/mmc/sdio_func.h>
-+#include <linux/slab.h>
- 
- #include <pcmcia/cs_types.h>
- #include <pcmcia/cs.h>
-@@ -140,6 +141,19 @@ static void ssb_device_put(struct ssb_de
- 		put_device(dev->dev);
- }
- 
-+static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
-+{
-+	if (drv)
-+		get_driver(&drv->drv);
-+	return drv;
-+}
-+
-+static inline void ssb_driver_put(struct ssb_driver *drv)
-+{
-+	if (drv)
-+		put_driver(&drv->drv);
-+}
-+
- static int ssb_device_resume(struct device *dev)
- {
- 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-@@ -210,90 +224,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
- EXPORT_SYMBOL(ssb_bus_suspend);
- 
- #ifdef CONFIG_SSB_SPROM
--int ssb_devices_freeze(struct ssb_bus *bus)
-+/** ssb_devices_freeze - Freeze all devices on the bus.
-+ *
-+ * After freezing no device driver will be handling a device
-+ * on this bus anymore. ssb_devices_thaw() must be called after
-+ * a successful freeze to reactivate the devices.
-+ *
-+ * @bus: The bus.
-+ * @ctx: Context structure. Pass this to ssb_devices_thaw().
-+ */
-+int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx)
- {
--	struct ssb_device *dev;
--	struct ssb_driver *drv;
--	int err = 0;
--	int i;
--	pm_message_t state = PMSG_FREEZE;
-+	struct ssb_device *sdev;
-+	struct ssb_driver *sdrv;
-+	unsigned int i;
-+
-+	memset(ctx, 0, sizeof(*ctx));
-+	ctx->bus = bus;
-+	SSB_WARN_ON(bus->nr_devices > ARRAY_SIZE(ctx->device_frozen));
- 
--	/* First check that we are capable to freeze all devices. */
- 	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
--			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
-+		sdev = ssb_device_get(&bus->devices[i]);
-+
-+		if (!sdev->dev || !sdev->dev->driver ||
-+		    !device_is_registered(sdev->dev)) {
-+			ssb_device_put(sdev);
- 			continue;
--		if (!drv->suspend) {
--			/* Nope, can't suspend this one. */
--			return -EOPNOTSUPP;
- 		}
--	}
--	/* Now suspend all devices */
--	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
-+		sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
-+		if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
-+			ssb_device_put(sdev);
- 			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
--			continue;
--		err = drv->suspend(dev, state);
--		if (err) {
--			ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
--				   dev_name(dev->dev));
--			goto err_unwind;
- 		}
-+		sdrv->remove(sdev);
-+		ctx->device_frozen[i] = 1;
- 	}
- 
- 	return 0;
--err_unwind:
--	for (i--; i >= 0; i--) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
--			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
--			continue;
--		if (drv->resume)
--			drv->resume(dev);
--	}
--	return err;
- }
- 
--int ssb_devices_thaw(struct ssb_bus *bus)
-+/** ssb_devices_thaw - Unfreeze all devices on the bus.
-+ *
-+ * This will re-attach the device drivers and re-init the devices.
-+ *
-+ * @ctx: The context structure from ssb_devices_freeze()
-+ */
-+int ssb_devices_thaw(struct ssb_freeze_context *ctx)
- {
--	struct ssb_device *dev;
--	struct ssb_driver *drv;
--	int err;
--	int i;
-+	struct ssb_bus *bus = ctx->bus;
-+	struct ssb_device *sdev;
-+	struct ssb_driver *sdrv;
-+	unsigned int i;
-+	int err, result = 0;
- 
- 	for (i = 0; i < bus->nr_devices; i++) {
--		dev = &(bus->devices[i]);
--		if (!dev->dev ||
--		    !dev->dev->driver ||
--		    !device_is_registered(dev->dev))
-+		if (!ctx->device_frozen[i])
- 			continue;
--		drv = drv_to_ssb_drv(dev->dev->driver);
--		if (!drv)
-+		sdev = &bus->devices[i];
-+
-+		if (SSB_WARN_ON(!sdev->dev || !sdev->dev->driver))
- 			continue;
--		if (SSB_WARN_ON(!drv->resume))
-+		sdrv = drv_to_ssb_drv(sdev->dev->driver);
-+		if (SSB_WARN_ON(!sdrv || !sdrv->probe))
- 			continue;
--		err = drv->resume(dev);
-+
-+		err = sdrv->probe(sdev, &sdev->id);
- 		if (err) {
- 			ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
--				   dev_name(dev->dev));
-+				   dev_name(sdev->dev));
-+			result = err;
- 		}
-+		ssb_driver_put(sdrv);
-+		ssb_device_put(sdev);
- 	}
- 
--	return 0;
-+	return result;
- }
- #endif /* CONFIG_SSB_SPROM */
- 
-@@ -490,8 +495,7 @@ static int ssb_devices_register(struct s
- #endif
- 			break;
- 		case SSB_BUSTYPE_SDIO:
--#ifdef CONFIG_SSB_SDIO
--			sdev->irq = bus->host_sdio->dev.irq;
-+#ifdef CONFIG_SSB_SDIOHOST
- 			dev->parent = &bus->host_sdio->dev;
- #endif
- 			break;
-@@ -830,6 +834,9 @@ int ssb_bus_pcibus_register(struct ssb_b
- 	if (!err) {
- 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
- 			   "PCI device %s\n", dev_name(&host_pci->dev));
-+	} else {
-+		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
-+			   " of SSB with error %d\n", err);
- 	}
- 
- 	return err;
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -17,6 +17,7 @@
- 
- #include <linux/ssb/ssb.h>
- #include <linux/ssb/ssb_regs.h>
-+#include <linux/slab.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
- 
-@@ -167,7 +168,7 @@ err_pci:
- }
- 
- /* Get the word-offset for a SSB_SPROM_XXX define. */
--#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
-+#define SPOFF(offset)	((offset) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
- #define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-@@ -253,7 +254,7 @@ static int sprom_do_read(struct ssb_bus 
- 	int i;
- 
- 	for (i = 0; i < bus->sprom_size; i++)
--		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
- 
- 	return 0;
- }
-@@ -284,7 +285,7 @@ static int sprom_do_write(struct ssb_bus
- 			ssb_printk("75%%");
- 		else if (i % 2)
- 			ssb_printk(".");
--		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
- 		mmiowb();
- 		msleep(20);
- 	}
-@@ -620,6 +621,14 @@ static int ssb_pci_sprom_get(struct ssb_
- 	int err = -ENOMEM;
- 	u16 *buf;
- 
-+	if (!ssb_is_sprom_available(bus)) {
-+		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
-+		return -ENODEV;
-+	}
-+
-+	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
-+		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
-+
- 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
- 	if (!buf)
- 		goto out;
---- a/drivers/ssb/pcihost_wrapper.c
-+++ b/drivers/ssb/pcihost_wrapper.c
-@@ -12,6 +12,7 @@
-  */
- 
- #include <linux/pci.h>
-+#include <linux/slab.h>
- #include <linux/ssb/ssb.h>
- 
- 
---- a/drivers/ssb/pcmcia.c
-+++ b/drivers/ssb/pcmcia.c
-@@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
- 	}						\
-   } while (0)
- 
--int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
--			      struct ssb_init_invariants *iv)
-+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
-+			tuple_t *tuple,
-+			void *priv)
-+{
-+	struct ssb_sprom *sprom = priv;
-+
-+	if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
-+		return -EINVAL;
-+	if (tuple->TupleDataLen != ETH_ALEN + 2)
-+		return -EINVAL;
-+	if (tuple->TupleData[1] != ETH_ALEN)
-+		return -EINVAL;
-+	memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN);
-+	return 0;
-+};
-+
-+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
-+					tuple_t *tuple,
-+					void *priv)
- {
--	tuple_t tuple;
--	int res;
--	unsigned char buf[32];
-+	struct ssb_init_invariants *iv = priv;
- 	struct ssb_sprom *sprom = &iv->sprom;
- 	struct ssb_boardinfo *bi = &iv->boardinfo;
- 	const char *error_description;
- 
-+	GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1");
-+	switch (tuple->TupleData[0]) {
-+	case SSB_PCMCIA_CIS_ID:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 5) &&
-+			      (tuple->TupleDataLen != 7),
-+			      "id tpl size");
-+		bi->vendor = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		break;
-+	case SSB_PCMCIA_CIS_BOARDREV:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"boardrev tpl size");
-+		sprom->board_rev = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_PA:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 9) &&
-+			(tuple->TupleDataLen != 10),
-+			"pa tpl size");
-+		sprom->pa0b0 = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		sprom->pa0b1 = tuple->TupleData[3] |
-+			((u16)tuple->TupleData[4] << 8);
-+		sprom->pa0b2 = tuple->TupleData[5] |
-+			((u16)tuple->TupleData[6] << 8);
-+		sprom->itssi_a = tuple->TupleData[7];
-+		sprom->itssi_bg = tuple->TupleData[7];
-+		sprom->maxpwr_a = tuple->TupleData[8];
-+		sprom->maxpwr_bg = tuple->TupleData[8];
-+		break;
-+	case SSB_PCMCIA_CIS_OEMNAME:
-+		/* We ignore this. */
-+		break;
-+	case SSB_PCMCIA_CIS_CCODE:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"ccode tpl size");
-+		sprom->country_code = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_ANTENNA:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"ant tpl size");
-+		sprom->ant_available_a = tuple->TupleData[1];
-+		sprom->ant_available_bg = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_ANTGAIN:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 2,
-+			"antg tpl size");
-+		sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
-+		sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
-+		break;
-+	case SSB_PCMCIA_CIS_BFLAGS:
-+		GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
-+			(tuple->TupleDataLen != 5),
-+			"bfl tpl size");
-+		sprom->boardflags_lo = tuple->TupleData[1] |
-+			((u16)tuple->TupleData[2] << 8);
-+		break;
-+	case SSB_PCMCIA_CIS_LEDS:
-+		GOTO_ERROR_ON(tuple->TupleDataLen != 5,
-+			"leds tpl size");
-+		sprom->gpio0 = tuple->TupleData[1];
-+		sprom->gpio1 = tuple->TupleData[2];
-+		sprom->gpio2 = tuple->TupleData[3];
-+		sprom->gpio3 = tuple->TupleData[4];
-+		break;
-+	}
-+	return -ENOSPC; /* continue with next entry */
-+
-+error:
-+	ssb_printk(KERN_ERR PFX
-+		   "PCMCIA: Failed to fetch device invariants: %s\n",
-+		   error_description);
-+	return -ENODEV;
-+}
-+
-+
-+int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
-+			      struct ssb_init_invariants *iv)
-+{
-+	struct ssb_sprom *sprom = &iv->sprom;
-+	int res;
-+
- 	memset(sprom, 0xFF, sizeof(*sprom));
- 	sprom->revision = 1;
- 	sprom->boardflags_lo = 0;
- 	sprom->boardflags_hi = 0;
- 
- 	/* First fetch the MAC address. */
--	memset(&tuple, 0, sizeof(tuple));
--	tuple.DesiredTuple = CISTPL_FUNCE;
--	tuple.TupleData = buf;
--	tuple.TupleDataMax = sizeof(buf);
--	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "MAC first tpl");
--	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "MAC first tpl data");
--	while (1) {
--		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
--		if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
--			break;
--		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "MAC next tpl");
--		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "MAC next tpl data");
-+	res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
-+				ssb_pcmcia_get_mac, sprom);
-+	if (res != 0) {
-+		ssb_printk(KERN_ERR PFX
-+			"PCMCIA: Failed to fetch MAC address\n");
-+		return -ENODEV;
- 	}
--	GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
--	memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
- 
- 	/* Fetch the vendor specific tuples. */
--	memset(&tuple, 0, sizeof(tuple));
--	tuple.DesiredTuple = SSB_PCMCIA_CIS;
--	tuple.TupleData = buf;
--	tuple.TupleDataMax = sizeof(buf);
--	res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "VEN first tpl");
--	res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--	GOTO_ERROR_ON(res != 0, "VEN first tpl data");
--	while (1) {
--		GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
--		switch (tuple.TupleData[0]) {
--		case SSB_PCMCIA_CIS_ID:
--			GOTO_ERROR_ON((tuple.TupleDataLen != 5) &&
--				      (tuple.TupleDataLen != 7),
--				      "id tpl size");
--			bi->vendor = tuple.TupleData[1] |
--			       ((u16)tuple.TupleData[2] << 8);
--			break;
--		case SSB_PCMCIA_CIS_BOARDREV:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "boardrev tpl size");
--			sprom->board_rev = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_PA:
--			GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
--				      (tuple.TupleDataLen != 10),
--				      "pa tpl size");
--			sprom->pa0b0 = tuple.TupleData[1] |
--				 ((u16)tuple.TupleData[2] << 8);
--			sprom->pa0b1 = tuple.TupleData[3] |
--				 ((u16)tuple.TupleData[4] << 8);
--			sprom->pa0b2 = tuple.TupleData[5] |
--				 ((u16)tuple.TupleData[6] << 8);
--			sprom->itssi_a = tuple.TupleData[7];
--			sprom->itssi_bg = tuple.TupleData[7];
--			sprom->maxpwr_a = tuple.TupleData[8];
--			sprom->maxpwr_bg = tuple.TupleData[8];
--			break;
--		case SSB_PCMCIA_CIS_OEMNAME:
--			/* We ignore this. */
--			break;
--		case SSB_PCMCIA_CIS_CCODE:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "ccode tpl size");
--			sprom->country_code = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_ANTENNA:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "ant tpl size");
--			sprom->ant_available_a = tuple.TupleData[1];
--			sprom->ant_available_bg = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_ANTGAIN:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 2,
--				      "antg tpl size");
--			sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1];
--			sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
--			break;
--		case SSB_PCMCIA_CIS_BFLAGS:
--			GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
--				      (tuple.TupleDataLen != 5),
--				      "bfl tpl size");
--			sprom->boardflags_lo = tuple.TupleData[1] |
--					 ((u16)tuple.TupleData[2] << 8);
--			break;
--		case SSB_PCMCIA_CIS_LEDS:
--			GOTO_ERROR_ON(tuple.TupleDataLen != 5,
--				      "leds tpl size");
--			sprom->gpio0 = tuple.TupleData[1];
--			sprom->gpio1 = tuple.TupleData[2];
--			sprom->gpio2 = tuple.TupleData[3];
--			sprom->gpio3 = tuple.TupleData[4];
--			break;
--		}
--		res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
--		if (res == -ENOSPC)
--			break;
--		GOTO_ERROR_ON(res != 0, "VEN next tpl");
--		res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
--		GOTO_ERROR_ON(res != 0, "VEN next tpl data");
--	}
-+	res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
-+				ssb_pcmcia_do_get_invariants, sprom);
-+	if ((res == 0) || (res == -ENOSPC))
-+		return 0;
- 
--	return 0;
--error:
- 	ssb_printk(KERN_ERR PFX
--		   "PCMCIA: Failed to fetch device invariants: %s\n",
--		   error_description);
-+			"PCMCIA: Failed to fetch device invariants\n");
- 	return -ENODEV;
- }
- 
---- a/drivers/ssb/scan.c
-+++ b/drivers/ssb/scan.c
-@@ -354,7 +354,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
- 		dev->bus = bus;
- 		dev->ops = bus->ops;
- 
--		ssb_dprintk(KERN_INFO PFX
-+		printk(KERN_DEBUG PFX
- 			    "Core %d found: %s "
- 			    "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
- 			    i, ssb_core_name(dev->id.coreid),
---- a/drivers/ssb/sprom.c
-+++ b/drivers/ssb/sprom.c
-@@ -14,6 +14,7 @@
- #include "ssb_private.h"
- 
- #include <linux/ctype.h>
-+#include <linux/slab.h>
- 
- 
- static const struct ssb_sprom *fallback_sprom;
-@@ -102,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
- 	u16 *sprom;
- 	int res = 0, err = -ENOMEM;
- 	size_t sprom_size_words = bus->sprom_size;
-+	struct ssb_freeze_context freeze;
- 
- 	sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
- 	if (!sprom)
-@@ -123,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
- 	err = -ERESTARTSYS;
- 	if (mutex_lock_interruptible(&bus->sprom_mutex))
- 		goto out_kfree;
--	err = ssb_devices_freeze(bus);
--	if (err == -EOPNOTSUPP) {
--		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
--			   "No suspend support. Is CONFIG_PM enabled?\n");
--		goto out_unlock;
--	}
-+	err = ssb_devices_freeze(bus, &freeze);
- 	if (err) {
- 		ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
- 		goto out_unlock;
- 	}
- 	res = sprom_write(bus, sprom);
--	err = ssb_devices_thaw(bus);
-+	err = ssb_devices_thaw(&freeze);
- 	if (err)
- 		ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
- out_unlock:
-@@ -179,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback
- {
- 	return fallback_sprom;
- }
-+
-+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
-+bool ssb_is_sprom_available(struct ssb_bus *bus)
-+{
-+	/* status register only exists on chipcomon rev >= 11 and we need check
-+	   for >= 31 only */
-+	/* this routine differs from specs as we do not access SPROM directly
-+	   on PCMCIA */
-+	if (bus->bustype == SSB_BUSTYPE_PCI &&
-+	    bus->chipco.dev->id.revision >= 31)
-+		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
-+
-+	return true;
-+}
---- a/drivers/ssb/ssb_private.h
-+++ b/drivers/ssb/ssb_private.h
-@@ -176,19 +176,27 @@ extern const struct ssb_sprom *ssb_get_f
- 
- /* core.c */
- extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
--extern int ssb_devices_freeze(struct ssb_bus *bus);
--extern int ssb_devices_thaw(struct ssb_bus *bus);
- extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
- int ssb_for_each_bus_call(unsigned long data,
- 			  int (*func)(struct ssb_bus *bus, unsigned long data));
- extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
- 
-+struct ssb_freeze_context {
-+	/* Pointer to the bus */
-+	struct ssb_bus *bus;
-+	/* Boolean list to indicate whether a device is frozen on this bus. */
-+	bool device_frozen[SSB_MAX_NR_CORES];
-+};
-+extern int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx);
-+extern int ssb_devices_thaw(struct ssb_freeze_context *ctx);
-+
-+
- 
- /* b43_pci_bridge.c */
- #ifdef CONFIG_SSB_B43_PCI_BRIDGE
- extern int __init b43_pci_ssb_bridge_init(void);
- extern void __exit b43_pci_ssb_bridge_exit(void);
--#else /* CONFIG_SSB_B43_PCI_BRIDGR */
-+#else /* CONFIG_SSB_B43_PCI_BRIDGE */
- static inline int b43_pci_ssb_bridge_init(void)
- {
- 	return 0;
-@@ -196,6 +204,6 @@ static inline int b43_pci_ssb_bridge_ini
- static inline void b43_pci_ssb_bridge_exit(void)
- {
- }
--#endif /* CONFIG_SSB_PCIHOST */
-+#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
- 
- #endif /* LINUX_SSB_PRIVATE_H_ */
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -269,7 +269,8 @@ struct ssb_bus {
- 
- 	const struct ssb_bus_ops *ops;
- 
--	/* The core in the basic address register window. (PCI bus only) */
-+	/* The core currently mapped into the MMIO window.
-+	 * Not valid on all host-buses. So don't use outside of SSB. */
- 	struct ssb_device *mapped_device;
- 	union {
- 		/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
-@@ -281,14 +282,17 @@ struct ssb_bus {
- 	 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
- 	spinlock_t bar_lock;
- 
--	/* The bus this backplane is running on. */
-+	/* The host-bus this backplane is running on. */
- 	enum ssb_bustype bustype;
--	/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
--	struct pci_dev *host_pci;
--	/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
--	struct pcmcia_device *host_pcmcia;
--	/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
--	struct sdio_func *host_sdio;
-+	/* Pointers to the host-bus. Check bustype before using any of these pointers. */
-+	union {
-+		/* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
-+		struct pci_dev *host_pci;
-+		/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
-+		struct pcmcia_device *host_pcmcia;
-+		/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-+		struct sdio_func *host_sdio;
-+	};
- 
- 	/* See enum ssb_quirks */
- 	unsigned int quirks;
-@@ -301,6 +305,7 @@ struct ssb_bus {
- 	/* ID information about the Chip. */
- 	u16 chip_id;
- 	u16 chip_rev;
-+	u16 sprom_offset;
- 	u16 sprom_size;		/* number of words in sprom */
- 	u8 chip_package;
- 
-@@ -390,6 +395,9 @@ extern int ssb_bus_sdiobus_register(stru
- 
- extern void ssb_bus_unregister(struct ssb_bus *bus);
- 
-+/* Does the device have an SPROM? */
-+extern bool ssb_is_sprom_available(struct ssb_bus *bus);
-+
- /* Set a fallback SPROM.
-  * See kdoc at the function definition for complete documentation. */
- extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -53,6 +53,7 @@
- #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
- #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
- #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
-+#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
- #define SSB_CHIPCO_CORECTL		0x0008
- #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
- #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
-@@ -385,6 +386,7 @@
- 
- 
- /** Chip specific Chip-Status register contents. */
-+#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
- #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
- #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
- #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
-@@ -398,6 +400,18 @@
- #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
- #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
- 
-+/** Macros to determine SPROM presence based on Chip-Status register. */
-+#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
-+	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL)
-+#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
-+	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
-+#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
-+	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
-+	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL))
-+
- 
- 
- /** Clockcontrol masks and values **/
-@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
- struct ssb_chipcommon {
- 	struct ssb_device *dev;
- 	u32 capabilities;
-+	u32 status;
- 	/* Fast Powerup Delay constant */
- 	u16 fast_pwrup_delay;
- 	struct ssb_chipcommon_pmu pmu;
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -170,26 +170,27 @@
- #define SSB_SPROMSIZE_WORDS_R4		220
- #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
- #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
--#define SSB_SPROM_BASE			0x1000
--#define SSB_SPROM_REVISION		0x107E
-+#define SSB_SPROM_BASE1			0x1000
-+#define SSB_SPROM_BASE31		0x0800
-+#define SSB_SPROM_REVISION		0x007E
- #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
- #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
- #define  SSB_SPROM_REVISION_CRC_SHIFT	8
- 
- /* SPROM Revision 1 */
--#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
--#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
--#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
--#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
--#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
--#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
-+#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
-+#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
-+#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
-+#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
-+#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
-+#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
- #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM1_BINF			0x105C	/* Board info */
-+#define SSB_SPROM1_BINF			0x005C	/* Board info */
- #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
- #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
- #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
-@@ -197,63 +198,63 @@
- #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
- #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
- #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
--#define SSB_SPROM1_PA0B0		0x105E
--#define SSB_SPROM1_PA0B1		0x1060
--#define SSB_SPROM1_PA0B2		0x1062
--#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
-+#define SSB_SPROM1_PA0B0		0x005E
-+#define SSB_SPROM1_PA0B1		0x0060
-+#define SSB_SPROM1_PA0B2		0x0062
-+#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
- #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
--#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
-+#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
- #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
--#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
-+#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
- #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
--#define SSB_SPROM1_PA1B0		0x106A
--#define SSB_SPROM1_PA1B1		0x106C
--#define SSB_SPROM1_PA1B2		0x106E
--#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
-+#define SSB_SPROM1_PA1B0		0x006A
-+#define SSB_SPROM1_PA1B1		0x006C
-+#define SSB_SPROM1_PA1B2		0x006E
-+#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
- #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
- #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_ITSSI_A_SHIFT	8
--#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
--#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
- #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
- #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_AGAIN_A_SHIFT	8
- 
- /* SPROM Revision 2 (inherits from rev 1) */
--#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
--#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
-+#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
-+#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
- #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
- #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
- #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
--#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
-+#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
- #define  SSB_SPROM2_OPO_VALUE		0x00FF
- #define  SSB_SPROM2_OPO_UNUSED		0xFF00
--#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
-+#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
- 
- /* SPROM Revision 3 (inherits most data from rev 2) */
--#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
- #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
- #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
- #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
- #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
--#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
-+#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
- #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
-@@ -264,100 +265,100 @@
- #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
- 
- /* SPROM Revision 4 */
--#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
-+#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
-+#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
-+#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
- #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
--#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
--#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
--#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
--#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
--#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
-+#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
-+#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
-+#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM4_AGAIN0_SHIFT	0
- #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM4_AGAIN1_SHIFT	8
--#define SSB_SPROM4_AGAIN23		0x1060
-+#define SSB_SPROM4_AGAIN23		0x0060
- #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM4_AGAIN2_SHIFT	0
- #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM4_AGAIN3_SHIFT	8
--#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
--#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
-+#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
- #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
- #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
--#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
-+#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
- #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
- #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM4_ITSSI_A_SHIFT	8
--#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
--#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
--#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
--#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
--#define SSB_SPROM4_PA0B2		0x1086
--#define SSB_SPROM4_PA1B0		0x108E
--#define SSB_SPROM4_PA1B1		0x1090
--#define SSB_SPROM4_PA1B2		0x1092
-+#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
-+#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
-+#define SSB_SPROM4_PA0B2		0x0086
-+#define SSB_SPROM4_PA1B0		0x008E
-+#define SSB_SPROM4_PA1B1		0x0090
-+#define SSB_SPROM4_PA1B2		0x0092
- 
- /* SPROM Revision 5 (inherits most data from rev 4) */
--#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
--#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
--#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
--#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
-+#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
-+#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
-+#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
- #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
--#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
-+#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
- #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
--#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
--#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
--#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
--#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
--#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
--#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
--#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
--#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
--#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
-+#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
-+#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
-+#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
-+#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
-+#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
-+#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM8_AGAIN0_SHIFT	0
- #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM8_AGAIN1_SHIFT	8
--#define SSB_SPROM8_AGAIN23		0x10A0
-+#define SSB_SPROM8_AGAIN23		0x00A0
- #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM8_AGAIN2_SHIFT	0
- #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM8_AGAIN3_SHIFT	8
--#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
--#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
-+#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
- #define  SSB_SPROM8_RSSISMF2G		0x000F
- #define  SSB_SPROM8_RSSISMC2G		0x00F0
- #define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-@@ -365,7 +366,7 @@
- #define  SSB_SPROM8_RSSISAV2G_SHIFT	8
- #define  SSB_SPROM8_BXA2G		0x1800
- #define  SSB_SPROM8_BXA2G_SHIFT		11
--#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
-+#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
- #define  SSB_SPROM8_RSSISMF5G		0x000F
- #define  SSB_SPROM8_RSSISMC5G		0x00F0
- #define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-@@ -373,47 +374,47 @@
- #define  SSB_SPROM8_RSSISAV5G_SHIFT	8
- #define  SSB_SPROM8_BXA5G		0x1800
- #define  SSB_SPROM8_BXA5G_SHIFT		11
--#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
-+#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
- #define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
- #define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
- #define  SSB_SPROM8_TRI5G_SHIFT		8
--#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
-+#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
- #define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
- #define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
- #define  SSB_SPROM8_TRI5GH_SHIFT	8
--#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
-+#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
- #define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
-+#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
- #define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
--#define SSB_SPROM8_PA0B1		0x10C4
--#define SSB_SPROM8_PA0B2		0x10C6
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
-+#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x00C4
-+#define SSB_SPROM8_PA0B2		0x00C6
-+#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
- #define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
--#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
-+#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
- #define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
- #define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
- #define  SSB_SPROM8_MAXP_AL_SHIFT	8
--#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
--#define SSB_SPROM8_PA1B1		0x10CE
--#define SSB_SPROM8_PA1B2		0x10D0
--#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
--#define SSB_SPROM8_PA1LOB1		0x10D4
--#define SSB_SPROM8_PA1LOB2		0x10D6
--#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
--#define SSB_SPROM8_PA1HIB1		0x10DA
--#define SSB_SPROM8_PA1HIB2		0x10DC
--#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
--#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
-+#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x00CE
-+#define SSB_SPROM8_PA1B2		0x00D0
-+#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x00D4
-+#define SSB_SPROM8_PA1LOB2		0x00D6
-+#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x00DA
-+#define SSB_SPROM8_PA1HIB2		0x00DC
-+#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
diff --git a/target/linux/generic-2.6/patches-2.6.32/976-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.32/976-ssb_add_dma_dev.patch
deleted file mode 100644
index fd463b4a75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/976-ssb_add_dma_dev.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-
-Add dma_dev, a pointer to struct device, to struct ssb_device.  We pass it
-to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB. 
-ssb_devices_register() sets up it properly.
-
-This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
-with the generic DMA API.
-
-Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-Acked-by: Michael Buesch <mb@bu3sch.de>
-Cc: Gary Zambrano <zambrano@broadcom.com>
-Cc: Stefano Brivio <stefano.brivio@polimi.it>
-Cc: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: John W. Linville <linville@tuxdriver.com>
-Acked-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
- drivers/ssb/main.c      |    2 ++
- include/linux/ssb/ssb.h |    2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s
- #ifdef CONFIG_SSB_PCIHOST
- 			sdev->irq = bus->host_pci->irq;
- 			dev->parent = &bus->host_pci->dev;
-+			sdev->dma_dev = dev->parent;
- #endif
- 			break;
- 		case SSB_BUSTYPE_PCMCIA:
-@@ -501,6 +502,7 @@ static int ssb_devices_register(struct s
- 			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
-+			sdev->dma_dev = dev;
- 			break;
- 		}
- 
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -167,7 +167,7 @@ struct ssb_device {
- 	 * is an optimization. */
- 	const struct ssb_bus_ops *ops;
- 
--	struct device *dev;
-+	struct device *dev, *dma_dev;
- 
- 	struct ssb_bus *bus;
- 	struct ssb_device_id id;
diff --git a/target/linux/generic-2.6/patches-2.6.32/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.32/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index 94d6b91d8a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -152,16 +152,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.32/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.32/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index e0dc6365fe..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -127,13 +127,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.32/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.32/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea96..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
deleted file mode 100644
index c226ac7bf1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -168,6 +168,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -6113,6 +6113,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1100,6 +1100,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2486,6 +2487,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1172,6 +1172,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1287,6 +1288,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -713,6 +713,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1070,6 +1070,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.32/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.32/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.32/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.32/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb777809..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch
deleted file mode 100644
index face9154d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
deleted file mode 100644
index c1f8ef075e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -831,10 +831,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch b/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch
deleted file mode 100644
index 94096791f1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/001-squashfs_move_zlib_decomp.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 6c4419d997d4431bb62e73475cd6b084e83efbd1 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 22 Sep 2009 19:25:24 +0100
-Subject: [PATCH] Squashfs: move zlib decompression wrapper code into a separate file
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile       |    2 +-
- fs/squashfs/block.c        |   74 ++----------------------------
- fs/squashfs/squashfs.h     |    4 ++
- fs/squashfs/zlib_wrapper.c |  109 ++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 118 insertions(+), 71 deletions(-)
- create mode 100644 fs/squashfs/zlib_wrapper.c
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -29,7 +29,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/mutex.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
- #include <linux/zlib.h>
-@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		int zlib_err = 0, zlib_init = 0;
--
--		/*
--		 * Uncompress block.
--		 */
--
--		mutex_lock(&msblk->read_data_mutex);
--
--		msblk->stream.avail_out = 0;
--		msblk->stream.avail_in = 0;
--
--		bytes = length;
--		do {
--			if (msblk->stream.avail_in == 0 && k < b) {
--				avail = min(bytes, msblk->devblksize - offset);
--				bytes -= avail;
--				wait_on_buffer(bh[k]);
--				if (!buffer_uptodate(bh[k]))
--					goto release_mutex;
--
--				if (avail == 0) {
--					offset = 0;
--					put_bh(bh[k++]);
--					continue;
--				}
--
--				msblk->stream.next_in = bh[k]->b_data + offset;
--				msblk->stream.avail_in = avail;
--				offset = 0;
--			}
--
--			if (msblk->stream.avail_out == 0 && page < pages) {
--				msblk->stream.next_out = buffer[page++];
--				msblk->stream.avail_out = PAGE_CACHE_SIZE;
--			}
--
--			if (!zlib_init) {
--				zlib_err = zlib_inflateInit(&msblk->stream);
--				if (zlib_err != Z_OK) {
--					ERROR("zlib_inflateInit returned"
--						" unexpected result 0x%x,"
--						" srclength %d\n", zlib_err,
--						srclength);
--					goto release_mutex;
--				}
--				zlib_init = 1;
--			}
--
--			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
--
--			if (msblk->stream.avail_in == 0 && k < b)
--				put_bh(bh[k++]);
--		} while (zlib_err == Z_OK);
--
--		if (zlib_err != Z_STREAM_END) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--
--		zlib_err = zlib_inflateEnd(&msblk->stream);
--		if (zlib_err != Z_OK) {
--			ERROR("zlib_inflate error, data probably corrupt\n");
--			goto release_mutex;
--		}
--		length = msblk->stream.total_out;
--		mutex_unlock(&msblk->read_data_mutex);
-+		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
-+			srclength, pages);
-+		if (length < 0)
-+			goto read_failure;
- 	} else {
- 		/*
- 		 * Block is uncompressed.
-@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_bloc
- 	kfree(bh);
- 	return length;
- 
--release_mutex:
--	mutex_unlock(&msblk->read_data_mutex);
--
- block_release:
- 	for (; k < b; k++)
- 		put_bh(bh[k]);
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -70,6 +70,10 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
-+/* zlib_wrapper.c */
-+extern int zlib_uncompress(struct squashfs_sb_info *, void **,
-+				struct buffer_head **, int, int, int, int, int);
-+
- /*
-  * Inodes and files operations
-  */
---- /dev/null
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * zlib_wrapper.c
-+ */
-+
-+
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+#include <linux/zlib.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+
-+int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	int zlib_err = 0, zlib_init = 0;
-+	int avail, bytes, k = 0, page = 0;
-+
-+	mutex_lock(&msblk->read_data_mutex);
-+
-+	msblk->stream.avail_out = 0;
-+	msblk->stream.avail_in = 0;
-+
-+	bytes = length;
-+	do {
-+		if (msblk->stream.avail_in == 0 && k < b) {
-+			avail = min(bytes, msblk->devblksize - offset);
-+			bytes -= avail;
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto release_mutex;
-+
-+			if (avail == 0) {
-+				offset = 0;
-+				put_bh(bh[k++]);
-+				continue;
-+			}
-+
-+			msblk->stream.next_in = bh[k]->b_data + offset;
-+			msblk->stream.avail_in = avail;
-+			offset = 0;
-+		}
-+
-+		if (msblk->stream.avail_out == 0 && page < pages) {
-+			msblk->stream.next_out = buffer[page++];
-+			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		}
-+
-+		if (!zlib_init) {
-+			zlib_err = zlib_inflateInit(&msblk->stream);
-+			if (zlib_err != Z_OK) {
-+				ERROR("zlib_inflateInit returned unexpected "
-+					"result 0x%x, srclength %d\n",
-+					zlib_err, srclength);
-+				goto release_mutex;
-+			}
-+			zlib_init = 1;
-+		}
-+
-+		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+
-+		if (msblk->stream.avail_in == 0 && k < b)
-+			put_bh(bh[k++]);
-+	} while (zlib_err == Z_OK);
-+
-+	if (zlib_err != Z_STREAM_END) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	if (zlib_err != Z_OK) {
-+		ERROR("zlib_inflate error, data probably corrupt\n");
-+		goto release_mutex;
-+	}
-+
-+	mutex_unlock(&msblk->read_data_mutex);
-+	return msblk->stream.total_out;
-+
-+release_mutex:
-+	mutex_unlock(&msblk->read_data_mutex);
-+
-+	for (; k < b; k++)
-+		put_bh(bh[k]);
-+
-+	return -EIO;
-+}
diff --git a/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch b/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch
deleted file mode 100644
index eacbb97aef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/002-squashfs_factor_out_remaining_zlib.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From 37c44e85fd49676ec15ccaeea065662c1fbcda7d Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 23 Sep 2009 19:04:49 +0100
-Subject: [PATCH] Squashfs: Factor out remaining zlib dependencies into separate wrapper file
-
-Move zlib buffer init/destroy code into separate wrapper file.  Also
-make zlib z_stream field a void * removing the need to include zlib.h
-for most files.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/block.c          |    1 -
- fs/squashfs/cache.c          |    1 -
- fs/squashfs/dir.c            |    1 -
- fs/squashfs/export.c         |    1 -
- fs/squashfs/file.c           |    1 -
- fs/squashfs/fragment.c       |    1 -
- fs/squashfs/id.c             |    1 -
- fs/squashfs/inode.c          |    1 -
- fs/squashfs/namei.c          |    1 -
- fs/squashfs/squashfs.h       |    2 +
- fs/squashfs/squashfs_fs_sb.h |    2 +-
- fs/squashfs/super.c          |   14 +++------
- fs/squashfs/symlink.c        |    1 -
- fs/squashfs/zlib_wrapper.c   |   56 ++++++++++++++++++++++++++++++++---------
- 14 files changed, 51 insertions(+), 33 deletions(-)
-
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -31,7 +31,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/buffer_head.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/cache.c
-+++ b/fs/squashfs/cache.c
-@@ -51,7 +51,6 @@
- #include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/wait.h>
--#include <linux/zlib.h>
- #include <linux/pagemap.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -30,7 +30,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/export.c
-+++ b/fs/squashfs/export.c
-@@ -39,7 +39,6 @@
- #include <linux/vfs.h>
- #include <linux/dcache.h>
- #include <linux/exportfs.h>
--#include <linux/zlib.h>
- #include <linux/slab.h>
- 
- #include "squashfs_fs.h"
---- a/fs/squashfs/file.c
-+++ b/fs/squashfs/file.c
-@@ -47,7 +47,6 @@
- #include <linux/string.h>
- #include <linux/pagemap.h>
- #include <linux/mutex.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/fragment.c
-+++ b/fs/squashfs/fragment.c
-@@ -36,7 +36,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/id.c
-+++ b/fs/squashfs/id.c
-@@ -34,7 +34,6 @@
- #include <linux/fs.h>
- #include <linux/vfs.h>
- #include <linux/slab.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/inode.c
-+++ b/fs/squashfs/inode.c
-@@ -40,7 +40,6 @@
- 
- #include <linux/fs.h>
- #include <linux/vfs.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -57,7 +57,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/dcache.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -71,6 +71,8 @@ extern struct inode *squashfs_iget(struc
- extern int squashfs_read_inode(struct inode *, long long);
- 
- /* zlib_wrapper.c */
-+extern void *zlib_init(void);
-+extern void zlib_free(void *);
- extern int zlib_uncompress(struct squashfs_sb_info *, void **,
- 				struct buffer_head **, int, int, int, int, int);
- 
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -64,7 +64,7 @@ struct squashfs_sb_info {
- 	struct mutex		read_data_mutex;
- 	struct mutex		meta_index_mutex;
- 	struct meta_index	*meta_index;
--	z_stream		stream;
-+	void			*stream;
- 	__le64			*inode_lookup_table;
- 	u64			inode_table;
- 	u64			directory_table;
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -35,7 +35,6 @@
- #include <linux/pagemap.h>
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/zlib.h>
- #include <linux/magic.h>
- 
- #include "squashfs_fs.h"
-@@ -87,12 +86,9 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream.workspace = kmalloc(zlib_inflate_workspacesize(),
--		GFP_KERNEL);
--	if (msblk->stream.workspace == NULL) {
--		ERROR("Failed to allocate zlib workspace\n");
-+	msblk->stream = zlib_init();
-+	if (msblk->stream == NULL)
- 		goto failure;
--	}
- 
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
-@@ -292,17 +288,17 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
-+	zlib_free(msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
--	kfree(msblk->stream.workspace);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	kfree(sblk);
- 	return err;
- 
- failure:
--	kfree(msblk->stream.workspace);
-+	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -346,10 +342,10 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
-+		zlib_free(sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
--		kfree(sbi->stream.workspace);
- 		kfree(sb->s_fs_info);
- 		sb->s_fs_info = NULL;
- 	}
---- a/fs/squashfs/symlink.c
-+++ b/fs/squashfs/symlink.c
-@@ -36,7 +36,6 @@
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/pagemap.h>
--#include <linux/zlib.h>
- 
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -31,21 +31,51 @@
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
- 
-+void *zlib_init()
-+{
-+	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->workspace = kmalloc(zlib_inflate_workspacesize(),
-+		GFP_KERNEL);
-+	if (stream->workspace == NULL)
-+		goto failed;
-+
-+	return stream;
-+
-+failed:
-+	ERROR("Failed to allocate zlib workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+void zlib_free(void *strm)
-+{
-+	z_stream *stream = strm;
-+
-+	if (stream)
-+		kfree(stream->workspace);
-+	kfree(stream);
-+}
-+
-+
- int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
- 	int zlib_err = 0, zlib_init = 0;
- 	int avail, bytes, k = 0, page = 0;
-+	z_stream *stream = msblk->stream;
- 
- 	mutex_lock(&msblk->read_data_mutex);
- 
--	msblk->stream.avail_out = 0;
--	msblk->stream.avail_in = 0;
-+	stream->avail_out = 0;
-+	stream->avail_in = 0;
- 
- 	bytes = length;
- 	do {
--		if (msblk->stream.avail_in == 0 && k < b) {
-+		if (stream->avail_in == 0 && k < b) {
- 			avail = min(bytes, msblk->devblksize - offset);
- 			bytes -= avail;
- 			wait_on_buffer(bh[k]);
-@@ -58,18 +88,18 @@ int zlib_uncompress(struct squashfs_sb_i
- 				continue;
- 			}
- 
--			msblk->stream.next_in = bh[k]->b_data + offset;
--			msblk->stream.avail_in = avail;
-+			stream->next_in = bh[k]->b_data + offset;
-+			stream->avail_in = avail;
- 			offset = 0;
- 		}
- 
--		if (msblk->stream.avail_out == 0 && page < pages) {
--			msblk->stream.next_out = buffer[page++];
--			msblk->stream.avail_out = PAGE_CACHE_SIZE;
-+		if (stream->avail_out == 0 && page < pages) {
-+			stream->next_out = buffer[page++];
-+			stream->avail_out = PAGE_CACHE_SIZE;
- 		}
- 
- 		if (!zlib_init) {
--			zlib_err = zlib_inflateInit(&msblk->stream);
-+			zlib_err = zlib_inflateInit(stream);
- 			if (zlib_err != Z_OK) {
- 				ERROR("zlib_inflateInit returned unexpected "
- 					"result 0x%x, srclength %d\n",
-@@ -79,9 +109,9 @@ int zlib_uncompress(struct squashfs_sb_i
- 			zlib_init = 1;
- 		}
- 
--		zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
-+		zlib_err = zlib_inflate(stream, Z_SYNC_FLUSH);
- 
--		if (msblk->stream.avail_in == 0 && k < b)
-+		if (stream->avail_in == 0 && k < b)
- 			put_bh(bh[k++]);
- 	} while (zlib_err == Z_OK);
- 
-@@ -90,14 +120,14 @@ int zlib_uncompress(struct squashfs_sb_i
- 		goto release_mutex;
- 	}
- 
--	zlib_err = zlib_inflateEnd(&msblk->stream);
-+	zlib_err = zlib_inflateEnd(stream);
- 	if (zlib_err != Z_OK) {
- 		ERROR("zlib_inflate error, data probably corrupt\n");
- 		goto release_mutex;
- 	}
- 
- 	mutex_unlock(&msblk->read_data_mutex);
--	return msblk->stream.total_out;
-+	return stream->total_out;
- 
- release_mutex:
- 	mutex_unlock(&msblk->read_data_mutex);
diff --git a/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch b/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch
deleted file mode 100644
index fdf0d407a1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/003-squashfs_add_decompressor_framework.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 327fbf47a419befc6bff74f3ca42d2b6f0841903 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 6 Oct 2009 04:04:15 +0100
-Subject: [PATCH] Squashfs: add a decompressor framework
-
-This adds a decompressor framework which allows multiple compression
-algorithms to be cleanly supported.
-
-Also update zlib wrapper and other code to use the new framework.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Makefile         |    2 +-
- fs/squashfs/block.c          |    6 ++--
- fs/squashfs/decompressor.c   |   58 ++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/decompressor.h   |   55 +++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h       |   14 +++++-----
- fs/squashfs/squashfs_fs_sb.h |   41 +++++++++++++++--------------
- fs/squashfs/super.c          |   45 ++++++++++++++++++-------------
- fs/squashfs/zlib_wrapper.c   |   17 ++++++++++--
- 8 files changed, 185 insertions(+), 53 deletions(-)
- create mode 100644 fs/squashfs/decompressor.c
- create mode 100644 fs/squashfs/decompressor.h
-
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -4,4 +4,4 @@
- 
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
--squashfs-y += namei.o super.o symlink.o zlib_wrapper.o
-+squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
---- a/fs/squashfs/block.c
-+++ b/fs/squashfs/block.c
-@@ -36,7 +36,7 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
--
-+#include "decompressor.h"
- /*
-  * Read the metadata block length, this is stored in the first two
-  * bytes of the metadata block.
-@@ -151,8 +151,8 @@ int squashfs_read_data(struct super_bloc
- 	}
- 
- 	if (compressed) {
--		length = zlib_uncompress(msblk, buffer, bh, b, offset, length,
--			srclength, pages);
-+		length = squashfs_decompress(msblk, buffer, bh, b, offset,
-+			length, srclength, pages);
- 		if (length < 0)
- 			goto read_failure;
- 	} else {
---- /dev/null
-+++ b/fs/squashfs/decompressor.c
-@@ -0,0 +1,58 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.c
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/buffer_head.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "decompressor.h"
-+#include "squashfs.h"
-+
-+/*
-+ * This file (and decompressor.h) implements a decompressor framework for
-+ * Squashfs, allowing multiple decompressors to be easily supported
-+ */
-+
-+static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
-+	NULL, NULL, NULL, 0, "unknown", 0
-+};
-+
-+static const struct squashfs_decompressor *decompressor[] = {
-+	&squashfs_zlib_comp_ops,
-+	&squashfs_unknown_comp_ops
-+};
-+
-+
-+const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)
-+{
-+	int i;
-+
-+	for (i = 0; decompressor[i]->id; i++)
-+		if (id == decompressor[i]->id)
-+			break;
-+
-+	return decompressor[i];
-+}
---- /dev/null
-+++ b/fs/squashfs/decompressor.h
-@@ -0,0 +1,55 @@
-+#ifndef DECOMPRESSOR_H
-+#define DECOMPRESSOR_H
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * decompressor.h
-+ */
-+
-+struct squashfs_decompressor {
-+	void	*(*init)(void);
-+	void	(*free)(void *);
-+	int	(*decompress)(struct squashfs_sb_info *, void **,
-+		struct buffer_head **, int, int, int, int, int);
-+	int	id;
-+	char	*name;
-+	int	supported;
-+};
-+
-+static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
-+{
-+	return msblk->decompressor->init();
-+}
-+
-+static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
-+	void *s)
-+{
-+	if (msblk->decompressor)
-+		msblk->decompressor->free(s);
-+}
-+
-+static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
-+	void **buffer, struct buffer_head **bh, int b, int offset, int length,
-+	int srclength, int pages)
-+{
-+	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,
-+		length, srclength, pages);
-+}
-+#endif
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry *squa
- 				u64, int);
- extern int squashfs_read_table(struct super_block *, void *, u64, int);
- 
-+/* decompressor.c */
-+extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);
-+
- /* export.c */
- extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64,
- 				unsigned int);
-@@ -70,14 +73,8 @@ extern struct inode *squashfs_iget(struc
- 				unsigned int);
- extern int squashfs_read_inode(struct inode *, long long);
- 
--/* zlib_wrapper.c */
--extern void *zlib_init(void);
--extern void zlib_free(void *);
--extern int zlib_uncompress(struct squashfs_sb_info *, void **,
--				struct buffer_head **, int, int, int, int, int);
--
- /*
-- * Inodes and files operations
-+ * Inodes, files and decompressor operations
-  */
- 
- /* dir.c */
-@@ -94,3 +91,6 @@ extern const struct inode_operations squ
- 
- /* symlink.c */
- extern const struct address_space_operations squashfs_symlink_aops;
-+
-+/* zlib_wrapper.c */
-+extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
---- a/fs/squashfs/squashfs_fs_sb.h
-+++ b/fs/squashfs/squashfs_fs_sb.h
-@@ -52,25 +52,26 @@ struct squashfs_cache_entry {
- };
- 
- struct squashfs_sb_info {
--	int			devblksize;
--	int			devblksize_log2;
--	struct squashfs_cache	*block_cache;
--	struct squashfs_cache	*fragment_cache;
--	struct squashfs_cache	*read_page;
--	int			next_meta_index;
--	__le64			*id_table;
--	__le64			*fragment_index;
--	unsigned int		*fragment_index_2;
--	struct mutex		read_data_mutex;
--	struct mutex		meta_index_mutex;
--	struct meta_index	*meta_index;
--	void			*stream;
--	__le64			*inode_lookup_table;
--	u64			inode_table;
--	u64			directory_table;
--	unsigned int		block_size;
--	unsigned short		block_log;
--	long long		bytes_used;
--	unsigned int		inodes;
-+	const struct squashfs_decompressor	*decompressor;
-+	int					devblksize;
-+	int					devblksize_log2;
-+	struct squashfs_cache			*block_cache;
-+	struct squashfs_cache			*fragment_cache;
-+	struct squashfs_cache			*read_page;
-+	int					next_meta_index;
-+	__le64					*id_table;
-+	__le64					*fragment_index;
-+	unsigned int				*fragment_index_2;
-+	struct mutex				read_data_mutex;
-+	struct mutex				meta_index_mutex;
-+	struct meta_index			*meta_index;
-+	void					*stream;
-+	__le64					*inode_lookup_table;
-+	u64					inode_table;
-+	u64					directory_table;
-+	unsigned int				block_size;
-+	unsigned short				block_log;
-+	long long				bytes_used;
-+	unsigned int				inodes;
- };
- #endif
---- a/fs/squashfs/super.c
-+++ b/fs/squashfs/super.c
-@@ -41,27 +41,35 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
- static struct file_system_type squashfs_fs_type;
- static const struct super_operations squashfs_super_ops;
- 
--static int supported_squashfs_filesystem(short major, short minor, short comp)
-+static const struct squashfs_decompressor *supported_squashfs_filesystem(short
-+	major, short minor, short id)
- {
-+	const struct squashfs_decompressor *decompressor;
-+
- 	if (major < SQUASHFS_MAJOR) {
- 		ERROR("Major/Minor mismatch, older Squashfs %d.%d "
- 			"filesystems are unsupported\n", major, minor);
--		return -EINVAL;
-+		return NULL;
- 	} else if (major > SQUASHFS_MAJOR || minor > SQUASHFS_MINOR) {
- 		ERROR("Major/Minor mismatch, trying to mount newer "
- 			"%d.%d filesystem\n", major, minor);
- 		ERROR("Please update your kernel\n");
--		return -EINVAL;
-+		return NULL;
- 	}
- 
--	if (comp != ZLIB_COMPRESSION)
--		return -EINVAL;
-+	decompressor = squashfs_lookup_decompressor(id);
-+	if (!decompressor->supported) {
-+		ERROR("Filesystem uses \"%s\" compression. This is not "
-+			"supported\n", decompressor->name);
-+		return NULL;
-+	}
- 
--	return 0;
-+	return decompressor;
- }
- 
- 
-@@ -86,10 +94,6 @@ static int squashfs_fill_super(struct su
- 	}
- 	msblk = sb->s_fs_info;
- 
--	msblk->stream = zlib_init();
--	if (msblk->stream == NULL)
--		goto failure;
--
- 	sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);
- 	if (sblk == NULL) {
- 		ERROR("Failed to allocate squashfs_super_block\n");
-@@ -116,25 +120,25 @@ static int squashfs_fill_super(struct su
- 		goto failed_mount;
- 	}
- 
-+	err = -EINVAL;
-+
- 	/* Check it is a SQUASHFS superblock */
- 	sb->s_magic = le32_to_cpu(sblk->s_magic);
- 	if (sb->s_magic != SQUASHFS_MAGIC) {
- 		if (!silent)
- 			ERROR("Can't find a SQUASHFS superblock on %s\n",
- 						bdevname(sb->s_bdev, b));
--		err = -EINVAL;
- 		goto failed_mount;
- 	}
- 
--	/* Check the MAJOR & MINOR versions and compression type */
--	err = supported_squashfs_filesystem(le16_to_cpu(sblk->s_major),
-+	/* Check the MAJOR & MINOR versions and lookup compression type */
-+	msblk->decompressor = supported_squashfs_filesystem(
-+			le16_to_cpu(sblk->s_major),
- 			le16_to_cpu(sblk->s_minor),
- 			le16_to_cpu(sblk->compression));
--	if (err < 0)
-+	if (msblk->decompressor == NULL)
- 		goto failed_mount;
- 
--	err = -EINVAL;
--
- 	/*
- 	 * Check if there's xattrs in the filesystem.  These are not
- 	 * supported in this version, so warn that they will be ignored.
-@@ -201,6 +205,10 @@ static int squashfs_fill_super(struct su
- 
- 	err = -ENOMEM;
- 
-+	msblk->stream = squashfs_decompressor_init(msblk);
-+	if (msblk->stream == NULL)
-+		goto failed_mount;
-+
- 	msblk->block_cache = squashfs_cache_init("metadata",
- 			SQUASHFS_CACHED_BLKS, SQUASHFS_METADATA_SIZE);
- 	if (msblk->block_cache == NULL)
-@@ -288,7 +296,7 @@ failed_mount:
- 	squashfs_cache_delete(msblk->block_cache);
- 	squashfs_cache_delete(msblk->fragment_cache);
- 	squashfs_cache_delete(msblk->read_page);
--	zlib_free(msblk->stream);
-+	squashfs_decompressor_free(msblk, msblk->stream);
- 	kfree(msblk->inode_lookup_table);
- 	kfree(msblk->fragment_index);
- 	kfree(msblk->id_table);
-@@ -298,7 +306,6 @@ failed_mount:
- 	return err;
- 
- failure:
--	zlib_free(msblk->stream);
- 	kfree(sb->s_fs_info);
- 	sb->s_fs_info = NULL;
- 	return -ENOMEM;
-@@ -342,7 +349,7 @@ static void squashfs_put_super(struct su
- 		squashfs_cache_delete(sbi->block_cache);
- 		squashfs_cache_delete(sbi->fragment_cache);
- 		squashfs_cache_delete(sbi->read_page);
--		zlib_free(sbi->stream);
-+		squashfs_decompressor_free(sbi, sbi->stream);
- 		kfree(sbi->id_table);
- 		kfree(sbi->fragment_index);
- 		kfree(sbi->meta_index);
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -30,8 +30,9 @@
- #include "squashfs_fs_sb.h"
- #include "squashfs_fs_i.h"
- #include "squashfs.h"
-+#include "decompressor.h"
- 
--void *zlib_init()
-+static void *zlib_init(void)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
-@@ -50,7 +51,7 @@ failed:
- }
- 
- 
--void zlib_free(void *strm)
-+static void zlib_free(void *strm)
- {
- 	z_stream *stream = strm;
- 
-@@ -60,7 +61,7 @@ void zlib_free(void *strm)
- }
- 
- 
--int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
- 	struct buffer_head **bh, int b, int offset, int length, int srclength,
- 	int pages)
- {
-@@ -137,3 +138,13 @@ release_mutex:
- 
- 	return -EIO;
- }
-+
-+const struct squashfs_decompressor squashfs_zlib_comp_ops = {
-+	.init = zlib_init,
-+	.free = zlib_free,
-+	.decompress = zlib_uncompress,
-+	.id = ZLIB_COMPRESSION,
-+	.name = "zlib",
-+	.supported = 1
-+};
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch b/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch
deleted file mode 100644
index a378c00058..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/004-squashfs_add_decompressor_lzma_lzo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1885ca0a1973944684f252094a703b7c80dfc974 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 03:58:11 +0100
-Subject: [PATCH] Squashfs: add decompressor entries for lzma and lzo
-
-Add knowledge of lzma/lzo compression formats to the decompressor
-framework.  For now these are added as unsupported.  Without
-these entries lzma/lzo compressed filesystems will be flagged as
-having unknown compression which is undesirable.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.c |   10 ++++++++++
- fs/squashfs/squashfs_fs.h  |    4 +++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -36,12 +36,22 @@
-  * Squashfs, allowing multiple decompressors to be easily supported
-  */
- 
-+static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0
-+};
-+
-+static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {
-+	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
-+};
-+
- static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
- 	NULL, NULL, NULL, 0, "unknown", 0
- };
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+	&squashfs_lzma_unsupported_comp_ops,
-+	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
- 
---- a/fs/squashfs/squashfs_fs.h
-+++ b/fs/squashfs/squashfs_fs.h
-@@ -211,7 +211,9 @@ struct meta_index {
- /*
-  * definitions for structures on disk
-  */
--#define ZLIB_COMPRESSION	 1
-+#define ZLIB_COMPRESSION	1
-+#define LZMA_COMPRESSION	2
-+#define LZO_COMPRESSION		3
- 
- struct squashfs_super_block {
- 	__le32			s_magic;
diff --git a/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch b/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch
deleted file mode 100644
index 0991681346..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/005-squashfs_extra_parameter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5f393ede3ddb5dd4cc2a9f243182fac45f1ce10b Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Wed, 14 Oct 2009 04:07:54 +0100
-Subject: [PATCH] Squashfs: add an extra parameter to the decompressor init function
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/decompressor.h |    4 ++--
- fs/squashfs/zlib_wrapper.c |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/fs/squashfs/decompressor.h
-+++ b/fs/squashfs/decompressor.h
-@@ -24,7 +24,7 @@
-  */
- 
- struct squashfs_decompressor {
--	void	*(*init)(void);
-+	void	*(*init)(struct squashfs_sb_info *);
- 	void	(*free)(void *);
- 	int	(*decompress)(struct squashfs_sb_info *, void **,
- 		struct buffer_head **, int, int, int, int, int);
-@@ -35,7 +35,7 @@ struct squashfs_decompressor {
- 
- static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)
- {
--	return msblk->decompressor->init();
-+	return msblk->decompressor->init(msblk);
- }
- 
- static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,
---- a/fs/squashfs/zlib_wrapper.c
-+++ b/fs/squashfs/zlib_wrapper.c
-@@ -32,7 +32,7 @@
- #include "squashfs.h"
- #include "decompressor.h"
- 
--static void *zlib_init(void)
-+static void *zlib_init(struct squashfs_sb_info *dummy)
- {
- 	z_stream *stream = kmalloc(sizeof(z_stream), GFP_KERNEL);
- 	if (stream == NULL)
diff --git a/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch
deleted file mode 100644
index 9fd57970f2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,151 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index c1a105d0dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -63,8 +63,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -87,7 +85,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
- 	select LZO_DECOMPRESS
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/008-jffs2_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.33/008-jffs2_make_lzma_available.patch
deleted file mode 100644
index 482b7039a2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/008-jffs2_make_lzma_available.patch
+++ /dev/null
@@ -1,5142 +0,0 @@
---- a/fs/jffs2/Kconfig
-+++ b/fs/jffs2/Kconfig
-@@ -139,6 +139,15 @@ config JFFS2_LZO
- 	  This feature was added in July, 2007. Say 'N' if you need
- 	  compatibility with older bootloaders or kernels.
- 
-+config JFFS2_LZMA
-+	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
-+	select LZMA_COMPRESS
-+	select LZMA_DECOMPRESS
-+	depends on JFFS2_FS
-+	default n
-+	help
-+	  JFFS2 wrapper to the LZMA C SDK
-+
- config JFFS2_RTIME
- 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
- 	depends on JFFS2_FS
---- a/fs/jffs2/Makefile
-+++ b/fs/jffs2/Makefile
-@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
- jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
- jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
- jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
-+jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
- jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
-+
-+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
---- a/fs/jffs2/compr.c
-+++ b/fs/jffs2/compr.c
-@@ -319,6 +319,9 @@ int __init jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_init();
-+#endif
- /* Setting default compression mode */
- #ifdef CONFIG_JFFS2_CMODE_NONE
- 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void)
- int jffs2_compressors_exit(void)
- {
- /* Unregistering compressors */
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_exit();
-+#endif
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_exit();
- #endif
---- a/fs/jffs2/compr.h
-+++ b/fs/jffs2/compr.h
-@@ -28,9 +28,9 @@
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_LZARI_PRIORITY     30
- #define JFFS2_RTIME_PRIORITY     50
--#define JFFS2_ZLIB_PRIORITY      60
--#define JFFS2_LZO_PRIORITY       80
--
-+#define JFFS2_LZMA_PRIORITY      70
-+#define JFFS2_ZLIB_PRIORITY      80
-+#define JFFS2_LZO_PRIORITY       90
- 
- #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
- #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
-@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void);
- int jffs2_lzo_init(void);
- void jffs2_lzo_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+int jffs2_lzma_init(void);
-+void jffs2_lzma_exit(void);
-+#endif
- 
- #endif /* __JFFS2_COMPR_H__ */
---- /dev/null
-+++ b/fs/jffs2/compr_lzma.c
-@@ -0,0 +1,128 @@
-+/*
-+ * JFFS2 -- Journalling Flash File System, Version 2.
-+ *
-+ * For licensing information, see the file 'LICENCE' in this directory.
-+ *
-+ * JFFS2 wrapper to the LZMA C SDK
-+ *
-+ */
-+
-+#include <linux/lzma.h>
-+#include "compr.h"
-+
-+#ifdef __KERNEL__
-+	static DEFINE_MUTEX(deflate_mutex);
-+#endif
-+
-+CLzmaEncHandle *p;
-+Byte propsEncoded[LZMA_PROPS_SIZE];
-+SizeT propsSize = sizeof(propsEncoded);
-+
-+STATIC void lzma_free_workspace(void)
-+{
-+	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
-+}
-+
-+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
-+{
-+	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
-+	{
-+		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (LzmaEnc_SetProps(p, props) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+	
-+	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+
-+        return 0;
-+}
-+
-+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
-+			      uint32_t *sourcelen, uint32_t *dstlen, void *model)
-+{
-+	SizeT compress_size = (SizeT)(*dstlen);
-+	int ret;
-+
-+	#ifdef __KERNEL__
-+		mutex_lock(&deflate_mutex);
-+	#endif
-+
-+	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
-+		0, NULL, &lzma_alloc, &lzma_alloc);
-+
-+	#ifdef __KERNEL__
-+		mutex_unlock(&deflate_mutex);
-+	#endif
-+
-+	if (ret != SZ_OK)
-+		return -1;
-+
-+	*dstlen = (uint32_t)compress_size;
-+
-+	return 0;
-+}
-+
-+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+				 uint32_t srclen, uint32_t destlen, void *model)
-+{
-+	int ret;
-+	SizeT dl = (SizeT)destlen;
-+	SizeT sl = (SizeT)srclen;
-+	ELzmaStatus status;
-+	
-+	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
-+		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
-+
-+	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzma_comp = {
-+	.priority = JFFS2_LZMA_PRIORITY,
-+	.name = "lzma",
-+	.compr = JFFS2_COMPR_LZMA,
-+	.compress = &jffs2_lzma_compress,
-+	.decompress = &jffs2_lzma_decompress,
-+	.disabled = 0,
-+};
-+
-+int INIT jffs2_lzma_init(void)
-+{
-+        int ret;
-+	CLzmaEncProps props;
-+	LzmaEncProps_Init(&props);
-+
-+        props.dictSize = LZMA_BEST_DICT(0x2000);
-+        props.level = LZMA_BEST_LEVEL;
-+        props.lc = LZMA_BEST_LC;
-+        props.lp = LZMA_BEST_LP;
-+        props.pb = LZMA_BEST_PB;
-+        props.fb = LZMA_BEST_FB;
-+
-+	ret = lzma_alloc_workspace(&props);
-+        if (ret < 0)
-+                return ret;
-+
-+	ret = jffs2_register_compressor(&jffs2_lzma_comp);
-+	if (ret)
-+		lzma_free_workspace();
-+	
-+        return ret;
-+}
-+
-+void jffs2_lzma_exit(void)
-+{
-+	jffs2_unregister_compressor(&jffs2_lzma_comp);
-+	lzma_free_workspace();
-+}
---- a/fs/jffs2/super.c
-+++ b/fs/jffs2/super.c
-@@ -254,14 +254,41 @@ static int __init init_jffs2_fs(void)
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
- 
--	printk(KERN_INFO "JFFS2 version 2.2."
-+	printk(KERN_INFO "JFFS2 version 2.2"
- #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
- 	       " (NAND)"
- #endif
- #ifdef CONFIG_JFFS2_SUMMARY
--	       " (SUMMARY) "
-+	       " (SUMMARY)"
- #endif
--	       " © 2001-2006 Red Hat, Inc.\n");
-+#ifdef CONFIG_JFFS2_ZLIB
-+	       " (ZLIB)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZO
-+	       " (LZO)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZMA
-+	       " (LZMA)"
-+#endif
-+#ifdef CONFIG_JFFS2_RTIME
-+	       " (RTIME)"
-+#endif
-+#ifdef CONFIG_JFFS2_RUBIN
-+	       " (RUBIN)"
-+#endif
-+#ifdef  CONFIG_JFFS2_CMODE_NONE
-+	       " (CMODE_NONE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_PRIORITY
-+	       " (CMODE_PRIORITY)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_SIZE
-+	       " (CMODE_SIZE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
-+	       " (CMODE_FAVOURLZO)"
-+#endif
-+	       " (c) 2001-2006 Red Hat, Inc.\n");
- 
- 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
- 					     sizeof(struct jffs2_inode_info),
---- a/include/linux/jffs2.h
-+++ b/include/linux/jffs2.h
-@@ -45,6 +45,7 @@
- #define JFFS2_COMPR_DYNRUBIN	0x05
- #define JFFS2_COMPR_ZLIB	0x06
- #define JFFS2_COMPR_LZO		0x07
-+#define JFFS2_COMPR_LZMA	0x08
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
---- /dev/null
-+++ b/include/linux/lzma.h
-@@ -0,0 +1,62 @@
-+#ifndef __LZMA_H__
-+#define __LZMA_H__
-+
-+#ifdef __KERNEL__
-+	#include <linux/kernel.h>
-+	#include <linux/sched.h>
-+	#include <linux/slab.h>
-+	#include <linux/vmalloc.h>
-+	#include <linux/init.h>
-+	#define LZMA_MALLOC vmalloc
-+	#define LZMA_FREE vfree
-+	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
-+	#define INIT __init
-+	#define STATIC static
-+#else
-+	#include <stdint.h>
-+	#include <stdlib.h>
-+	#include <stdio.h>
-+	#include <unistd.h>
-+	#include <string.h>
-+	#include <asm/types.h>
-+	#include <errno.h>
-+	#include <linux/jffs2.h>
-+	#ifndef PAGE_SIZE
-+		extern int page_size;
-+		#define PAGE_SIZE page_size
-+	#endif
-+	#define LZMA_MALLOC malloc
-+	#define LZMA_FREE free
-+	#define PRINT_ERROR(msg) fprintf(stderr, msg)
-+	#define INIT
-+	#define STATIC
-+#endif
-+
-+#include "lzma/LzmaDec.h"
-+#include "lzma/LzmaEnc.h"
-+
-+#define LZMA_BEST_LEVEL (9)
-+#define LZMA_BEST_LC    (0)
-+#define LZMA_BEST_LP    (0)
-+#define LZMA_BEST_PB    (0)
-+#define LZMA_BEST_FB  (273)
-+
-+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
-+
-+static void *p_lzma_malloc(void *p, size_t size)
-+{
-+        if (size == 0)
-+                return NULL;
-+
-+        return LZMA_MALLOC(size);
-+}
-+
-+static void p_lzma_free(void *p, void *address)
-+{
-+        if (address != NULL)
-+                LZMA_FREE(address);
-+}
-+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzFind.h
-@@ -0,0 +1,115 @@
-+/* LzFind.h -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_FIND_H
-+#define __LZ_FIND_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef UInt32 CLzRef;
-+
-+typedef struct _CMatchFinder
-+{
-+  Byte *buffer;
-+  UInt32 pos;
-+  UInt32 posLimit;
-+  UInt32 streamPos;
-+  UInt32 lenLimit;
-+
-+  UInt32 cyclicBufferPos;
-+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-+
-+  UInt32 matchMaxLen;
-+  CLzRef *hash;
-+  CLzRef *son;
-+  UInt32 hashMask;
-+  UInt32 cutValue;
-+
-+  Byte *bufferBase;
-+  ISeqInStream *stream;
-+  int streamEndWasReached;
-+
-+  UInt32 blockSize;
-+  UInt32 keepSizeBefore;
-+  UInt32 keepSizeAfter;
-+
-+  UInt32 numHashBytes;
-+  int directInput;
-+  size_t directInputRem;
-+  int btMode;
-+  int bigHash;
-+  UInt32 historySize;
-+  UInt32 fixedHashSize;
-+  UInt32 hashSizeSum;
-+  UInt32 numSons;
-+  SRes result;
-+  UInt32 crc[256];
-+} CMatchFinder;
-+
-+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-+
-+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-+
-+int MatchFinder_NeedMove(CMatchFinder *p);
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-+void MatchFinder_MoveBlock(CMatchFinder *p);
-+void MatchFinder_ReadIfRequired(CMatchFinder *p);
-+
-+void MatchFinder_Construct(CMatchFinder *p);
-+
-+/* Conditions:
-+     historySize <= 3 GB
-+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-+*/
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc);
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-+    UInt32 *distances, UInt32 maxLen);
-+
-+/*
-+Conditions:
-+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-+*/
-+
-+typedef void (*Mf_Init_Func)(void *object);
-+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-+typedef void (*Mf_Skip_Func)(void *object, UInt32);
-+
-+typedef struct _IMatchFinder
-+{
-+  Mf_Init_Func Init;
-+  Mf_GetIndexByte_Func GetIndexByte;
-+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-+  Mf_GetMatches_Func GetMatches;
-+  Mf_Skip_Func Skip;
-+} IMatchFinder;
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-+
-+void MatchFinder_Init(CMatchFinder *p);
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzHash.h
-@@ -0,0 +1,54 @@
-+/* LzHash.h -- HASH functions for LZ algorithms
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_HASH_H
-+#define __LZ_HASH_H
-+
-+#define kHash2Size (1 << 10)
-+#define kHash3Size (1 << 16)
-+#define kHash4Size (1 << 20)
-+
-+#define kFix3HashSize (kHash2Size)
-+#define kFix4HashSize (kHash2Size + kHash3Size)
-+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-+
-+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-+
-+#define HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-+
-+#define HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-+
-+#define HASH5_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-+  hash4Value &= (kHash4Size - 1); }
-+
-+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-+
-+
-+#define MT_HASH2_CALC \
-+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-+
-+#define MT_HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-+
-+#define MT_HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -0,0 +1,231 @@
-+/* LzmaDec.h -- LZMA Decoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_DEC_H
-+#define __LZMA_DEC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* #define _LZMA_PROB32 */
-+/* _LZMA_PROB32 can increase the speed on some CPUs,
-+   but memory usage for CLzmaDec::probs will be doubled in that case */
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+
-+/* ---------- LZMA Properties ---------- */
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaProps
-+{
-+  unsigned lc, lp, pb;
-+  UInt32 dicSize;
-+} CLzmaProps;
-+
-+/* LzmaProps_Decode - decodes properties
-+Returns:
-+  SZ_OK
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-+
-+
-+/* ---------- LZMA Decoder state ---------- */
-+
-+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-+
-+#define LZMA_REQUIRED_INPUT_MAX 20
-+
-+typedef struct
-+{
-+  CLzmaProps prop;
-+  CLzmaProb *probs;
-+  Byte *dic;
-+  const Byte *buf;
-+  UInt32 range, code;
-+  SizeT dicPos;
-+  SizeT dicBufSize;
-+  UInt32 processedPos;
-+  UInt32 checkDicSize;
-+  unsigned state;
-+  UInt32 reps[4];
-+  unsigned remainLen;
-+  int needFlush;
-+  int needInitState;
-+  UInt32 numProbs;
-+  unsigned tempBufSize;
-+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-+} CLzmaDec;
-+
-+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-+
-+void LzmaDec_Init(CLzmaDec *p);
-+
-+/* There are two types of LZMA streams:
-+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-+
-+typedef enum
-+{
-+  LZMA_FINISH_ANY,   /* finish at any point */
-+  LZMA_FINISH_END    /* block must be finished at the end */
-+} ELzmaFinishMode;
-+
-+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-+
-+   You must use LZMA_FINISH_END, when you know that current output buffer
-+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-+
-+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-+   and output value of destLen will be less than output buffer size limit.
-+   You can check status result also.
-+
-+   You can use multiple checks to test data integrity after full decompression:
-+     1) Check Result and "status" variable.
-+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-+        You must use correct finish mode in that case. */
-+
-+typedef enum
-+{
-+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-+} ELzmaStatus;
-+
-+/* ELzmaStatus is used only as output value for function call */
-+
-+
-+/* ---------- Interfaces ---------- */
-+
-+/* There are 3 levels of interfaces:
-+     1) Dictionary Interface
-+     2) Buffer Interface
-+     3) One Call Interface
-+   You can select any of these interfaces, but don't mix functions from different
-+   groups for same object. */
-+
-+
-+/* There are two variants to allocate state for Dictionary Interface:
-+     1) LzmaDec_Allocate / LzmaDec_Free
-+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-+   You can use variant 2, if you set dictionary buffer manually.
-+   For Buffer Interface you must always use variant 1.
-+
-+LzmaDec_Allocate* can return:
-+  SZ_OK
-+  SZ_ERROR_MEM         - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+   
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-+
-+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-+
-+/* ---------- Dictionary Interface ---------- */
-+
-+/* You can use it, if you want to eliminate the overhead for data copying from
-+   dictionary to some other external buffer.
-+   You must work with CLzmaDec variables directly in this interface.
-+
-+   STEPS:
-+     LzmaDec_Constr()
-+     LzmaDec_Allocate()
-+     for (each new stream)
-+     {
-+       LzmaDec_Init()
-+       while (it needs more decompression)
-+       {
-+         LzmaDec_DecodeToDic()
-+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-+       }
-+     }
-+     LzmaDec_Free()
-+*/
-+
-+/* LzmaDec_DecodeToDic
-+   
-+   The decoding to internal dictionary buffer (CLzmaDec::dic).
-+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (dicLimit).
-+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-+  LZMA_FINISH_END - Stream must be finished after dicLimit.
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_NEEDS_MORE_INPUT
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+*/
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- Buffer Interface ---------- */
-+
-+/* It's zlib-like interface.
-+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-+   to work with CLzmaDec variables manually.
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+*/
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaDecode
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+  SZ_ERROR_MEM  - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-+*/
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -0,0 +1,80 @@
-+/*  LzmaEnc.h -- LZMA Encoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_ENC_H
-+#define __LZMA_ENC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaEncProps
-+{
-+  int level;       /*  0 <= level <= 9 */
-+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-+                       default = (1 << 24) */
-+  int lc;          /* 0 <= lc <= 8, default = 3 */
-+  int lp;          /* 0 <= lp <= 4, default = 0 */
-+  int pb;          /* 0 <= pb <= 4, default = 2 */
-+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-+  int fb;          /* 5 <= fb <= 273, default = 32 */
-+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-+  int numHashBytes; /* 2, 3 or 4, default = 4 */
-+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-+  int numThreads;  /* 1 or 2, default = 2 */
-+} CLzmaEncProps;
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p);
-+void LzmaEncProps_Normalize(CLzmaEncProps *p);
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-+
-+
-+/* ---------- CLzmaEncHandle Interface ---------- */
-+
-+/* LzmaEnc_* functions can return the following exit codes:
-+Returns:
-+  SZ_OK           - OK
-+  SZ_ERROR_MEM    - Memory allocation error
-+  SZ_ERROR_PARAM  - Incorrect paramater in props
-+  SZ_ERROR_WRITE  - Write callback error.
-+  SZ_ERROR_PROGRESS - some break from progress callback
-+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-+*/
-+
-+typedef void * CLzmaEncHandle;
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaEncode
-+Return code:
-+  SZ_OK               - OK
-+  SZ_ERROR_MEM        - Memory allocation error
-+  SZ_ERROR_PARAM      - Incorrect paramater
-+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-+*/
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/Types.h
-@@ -0,0 +1,226 @@
-+/* Types.h -- Basic types
-+2009-11-23 : Igor Pavlov : Public domain */
-+
-+#ifndef __7Z_TYPES_H
-+#define __7Z_TYPES_H
-+
-+#include <stddef.h>
-+
-+#ifdef _WIN32
-+#include <windows.h>
-+#endif
-+
-+#ifndef EXTERN_C_BEGIN
-+#ifdef __cplusplus
-+#define EXTERN_C_BEGIN extern "C" {
-+#define EXTERN_C_END }
-+#else
-+#define EXTERN_C_BEGIN
-+#define EXTERN_C_END
-+#endif
-+#endif
-+
-+EXTERN_C_BEGIN
-+
-+#define SZ_OK 0
-+
-+#define SZ_ERROR_DATA 1
-+#define SZ_ERROR_MEM 2
-+#define SZ_ERROR_CRC 3
-+#define SZ_ERROR_UNSUPPORTED 4
-+#define SZ_ERROR_PARAM 5
-+#define SZ_ERROR_INPUT_EOF 6
-+#define SZ_ERROR_OUTPUT_EOF 7
-+#define SZ_ERROR_READ 8
-+#define SZ_ERROR_WRITE 9
-+#define SZ_ERROR_PROGRESS 10
-+#define SZ_ERROR_FAIL 11
-+#define SZ_ERROR_THREAD 12
-+
-+#define SZ_ERROR_ARCHIVE 16
-+#define SZ_ERROR_NO_ARCHIVE 17
-+
-+typedef int SRes;
-+
-+#ifdef _WIN32
-+typedef DWORD WRes;
-+#else
-+typedef int WRes;
-+#endif
-+
-+#ifndef RINOK
-+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-+#endif
-+
-+typedef unsigned char Byte;
-+typedef short Int16;
-+typedef unsigned short UInt16;
-+
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef long Int32;
-+typedef unsigned long UInt32;
-+#else
-+typedef int Int32;
-+typedef unsigned int UInt32;
-+#endif
-+
-+#ifdef _SZ_NO_INT_64
-+
-+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-+   NOTES: Some code will work incorrectly in that case! */
-+
-+typedef long Int64;
-+typedef unsigned long UInt64;
-+
-+#else
-+
-+#if defined(_MSC_VER) || defined(__BORLANDC__)
-+typedef __int64 Int64;
-+typedef unsigned __int64 UInt64;
-+#else
-+typedef long long int Int64;
-+typedef unsigned long long int UInt64;
-+#endif
-+
-+#endif
-+
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+typedef size_t SizeT;
-+#endif
-+
-+typedef int Bool;
-+#define True 1
-+#define False 0
-+
-+
-+#ifdef _WIN32
-+#define MY_STD_CALL __stdcall
-+#else
-+#define MY_STD_CALL
-+#endif
-+
-+#ifdef _MSC_VER
-+
-+#if _MSC_VER >= 1300
-+#define MY_NO_INLINE __declspec(noinline)
-+#else
-+#define MY_NO_INLINE
-+#endif
-+
-+#define MY_CDECL __cdecl
-+#define MY_FAST_CALL __fastcall
-+
-+#else
-+
-+#define MY_CDECL
-+#define MY_FAST_CALL
-+
-+#endif
-+
-+
-+/* The following interfaces use first parameter as pointer to structure */
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) < input(*size)) is allowed */
-+} ISeqInStream;
-+
-+/* it can return SZ_ERROR_INPUT_EOF */
-+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-+
-+typedef struct
-+{
-+  size_t (*Write)(void *p, const void *buf, size_t size);
-+    /* Returns: result - the number of actually written bytes.
-+       (result < size) means error */
-+} ISeqOutStream;
-+
-+typedef enum
-+{
-+  SZ_SEEK_SET = 0,
-+  SZ_SEEK_CUR = 1,
-+  SZ_SEEK_END = 2
-+} ESzSeek;
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ISeekInStream;
-+
-+typedef struct
-+{
-+  SRes (*Look)(void *p, void **buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) > input(*size)) is not allowed
-+       (output(*size) < input(*size)) is allowed */
-+  SRes (*Skip)(void *p, size_t offset);
-+    /* offset must be <= output(*size) of Look */
-+
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ILookInStream;
-+
-+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-+
-+/* reads via ILookInStream::Read */
-+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-+
-+#define LookToRead_BUF_SIZE (1 << 14)
-+
-+typedef struct
-+{
-+  ILookInStream s;
-+  ISeekInStream *realStream;
-+  size_t pos;
-+  size_t size;
-+  Byte buf[LookToRead_BUF_SIZE];
-+} CLookToRead;
-+
-+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-+void LookToRead_Init(CLookToRead *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToLook;
-+
-+void SecToLook_CreateVTable(CSecToLook *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToRead;
-+
-+void SecToRead_CreateVTable(CSecToRead *p);
-+
-+typedef struct
-+{
-+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-+    /* Returns: result. (result != SZ_OK) means break.
-+       Value (UInt64)(Int64)-1 for size means unknown value. */
-+} ICompressProgress;
-+
-+typedef struct
-+{
-+  void *(*Alloc)(void *p, size_t size);
-+  void (*Free)(void *p, void *address); /* address can be 0 */
-+} ISzAlloc;
-+
-+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-+#define IAlloc_Free(p, a) (p)->Free((p), a)
-+
-+EXTERN_C_END
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -103,6 +103,12 @@ config LZO_COMPRESS
- config LZO_DECOMPRESS
- 	tristate
- 
-+config LZMA_COMPRESS
-+    tristate
-+
-+config LZMA_DECOMPRESS
-+    tristate
-+
- #
- # These all provide a common interface (hence the apparent duplication with
- # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -2,6 +2,16 @@
- # Makefile for some libs needed in the kernel.
- #
- 
-+ifdef CONFIG_JFFS2_ZLIB
-+	CONFIG_ZLIB_INFLATE:=y
-+	CONFIG_ZLIB_DEFLATE:=y
-+endif
-+
-+ifdef CONFIG_JFFS2_LZMA
-+	CONFIG_LZMA_DECOMPRESS:=y
-+	CONFIG_LZMA_COMPRESS:=y
-+endif
-+
- ifdef CONFIG_FUNCTION_TRACER
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
-@@ -65,6 +75,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
- obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
- obj-$(CONFIG_LZO_COMPRESS) += lzo/
- obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma/
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
- 
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
---- /dev/null
-+++ b/lib/lzma/LzFind.c
-@@ -0,0 +1,761 @@
-+/* LzFind.c -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+#include "LzFind.h"
-+#include "LzHash.h"
-+
-+#define kEmptyHashValue 0
-+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-+#define kNormalizeMask (~(kNormalizeStepMin - 1))
-+#define kMaxHistorySize ((UInt32)3 << 30)
-+
-+#define kStartMaxLen 3
-+
-+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  if (!p->directInput)
-+  {
-+    alloc->Free(alloc, p->bufferBase);
-+    p->bufferBase = 0;
-+  }
-+}
-+
-+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-+
-+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-+{
-+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-+  if (p->directInput)
-+  {
-+    p->blockSize = blockSize;
-+    return 1;
-+  }
-+  if (p->bufferBase == 0 || p->blockSize != blockSize)
-+  {
-+    LzInWindow_Free(p, alloc);
-+    p->blockSize = blockSize;
-+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-+  }
-+  return (p->bufferBase != 0);
-+}
-+
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+{
-+  p->posLimit -= subValue;
-+  p->pos -= subValue;
-+  p->streamPos -= subValue;
-+}
-+
-+static void MatchFinder_ReadBlock(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached || p->result != SZ_OK)
-+    return;
-+  if (p->directInput)
-+  {
-+    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-+    if (curSize > p->directInputRem)
-+      curSize = (UInt32)p->directInputRem;
-+    p->directInputRem -= curSize;
-+    p->streamPos += curSize;
-+    if (p->directInputRem == 0)
-+      p->streamEndWasReached = 1;
-+    return;
-+  }
-+  for (;;)
-+  {
-+    Byte *dest = p->buffer + (p->streamPos - p->pos);
-+    size_t size = (p->bufferBase + p->blockSize - dest);
-+    if (size == 0)
-+      return;
-+    p->result = p->stream->Read(p->stream, dest, &size);
-+    if (p->result != SZ_OK)
-+      return;
-+    if (size == 0)
-+    {
-+      p->streamEndWasReached = 1;
-+      return;
-+    }
-+    p->streamPos += (UInt32)size;
-+    if (p->streamPos - p->pos > p->keepSizeAfter)
-+      return;
-+  }
-+}
-+
-+void MatchFinder_MoveBlock(CMatchFinder *p)
-+{
-+  memmove(p->bufferBase,
-+    p->buffer - p->keepSizeBefore,
-+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-+  p->buffer = p->bufferBase + p->keepSizeBefore;
-+}
-+
-+int MatchFinder_NeedMove(CMatchFinder *p)
-+{
-+  if (p->directInput)
-+    return 0;
-+  /* if (p->streamEndWasReached) return 0; */
-+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-+}
-+
-+void MatchFinder_ReadIfRequired(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached)
-+    return;
-+  if (p->keepSizeAfter >= p->streamPos - p->pos)
-+    MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-+{
-+  if (MatchFinder_NeedMove(p))
-+    MatchFinder_MoveBlock(p);
-+  MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-+{
-+  p->cutValue = 32;
-+  p->btMode = 1;
-+  p->numHashBytes = 4;
-+  p->bigHash = 0;
-+}
-+
-+#define kCrcPoly 0xEDB88320
-+
-+void MatchFinder_Construct(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  p->bufferBase = 0;
-+  p->directInput = 0;
-+  p->hash = 0;
-+  MatchFinder_SetDefaultSettings(p);
-+
-+  for (i = 0; i < 256; i++)
-+  {
-+    UInt32 r = i;
-+    int j;
-+    for (j = 0; j < 8; j++)
-+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-+    p->crc[i] = r;
-+  }
-+}
-+
-+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->hash);
-+  p->hash = 0;
-+}
-+
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  MatchFinder_FreeThisClassMemory(p, alloc);
-+  LzInWindow_Free(p, alloc);
-+}
-+
-+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-+{
-+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-+  if (sizeInBytes / sizeof(CLzRef) != num)
-+    return 0;
-+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-+}
-+
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc)
-+{
-+  UInt32 sizeReserv;
-+  if (historySize > kMaxHistorySize)
-+  {
-+    MatchFinder_Free(p, alloc);
-+    return 0;
-+  }
-+  sizeReserv = historySize >> 1;
-+  if (historySize > ((UInt32)2 << 30))
-+    sizeReserv = historySize >> 2;
-+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-+
-+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-+  if (LzInWindow_Create(p, sizeReserv, alloc))
-+  {
-+    UInt32 newCyclicBufferSize = historySize + 1;
-+    UInt32 hs;
-+    p->matchMaxLen = matchMaxLen;
-+    {
-+      p->fixedHashSize = 0;
-+      if (p->numHashBytes == 2)
-+        hs = (1 << 16) - 1;
-+      else
-+      {
-+        hs = historySize - 1;
-+        hs |= (hs >> 1);
-+        hs |= (hs >> 2);
-+        hs |= (hs >> 4);
-+        hs |= (hs >> 8);
-+        hs >>= 1;
-+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-+        if (hs > (1 << 24))
-+        {
-+          if (p->numHashBytes == 3)
-+            hs = (1 << 24) - 1;
-+          else
-+            hs >>= 1;
-+        }
-+      }
-+      p->hashMask = hs;
-+      hs++;
-+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-+      hs += p->fixedHashSize;
-+    }
-+
-+    {
-+      UInt32 prevSize = p->hashSizeSum + p->numSons;
-+      UInt32 newSize;
-+      p->historySize = historySize;
-+      p->hashSizeSum = hs;
-+      p->cyclicBufferSize = newCyclicBufferSize;
-+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-+      newSize = p->hashSizeSum + p->numSons;
-+      if (p->hash != 0 && prevSize == newSize)
-+        return 1;
-+      MatchFinder_FreeThisClassMemory(p, alloc);
-+      p->hash = AllocRefs(newSize, alloc);
-+      if (p->hash != 0)
-+      {
-+        p->son = p->hash + p->hashSizeSum;
-+        return 1;
-+      }
-+    }
-+  }
-+  MatchFinder_Free(p, alloc);
-+  return 0;
-+}
-+
-+static void MatchFinder_SetLimits(CMatchFinder *p)
-+{
-+  UInt32 limit = kMaxValForNormalize - p->pos;
-+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  limit2 = p->streamPos - p->pos;
-+  if (limit2 <= p->keepSizeAfter)
-+  {
-+    if (limit2 > 0)
-+      limit2 = 1;
-+  }
-+  else
-+    limit2 -= p->keepSizeAfter;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  {
-+    UInt32 lenLimit = p->streamPos - p->pos;
-+    if (lenLimit > p->matchMaxLen)
-+      lenLimit = p->matchMaxLen;
-+    p->lenLimit = lenLimit;
-+  }
-+  p->posLimit = p->pos + limit;
-+}
-+
-+void MatchFinder_Init(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < p->hashSizeSum; i++)
-+    p->hash[i] = kEmptyHashValue;
-+  p->cyclicBufferPos = 0;
-+  p->buffer = p->bufferBase;
-+  p->pos = p->streamPos = p->cyclicBufferSize;
-+  p->result = SZ_OK;
-+  p->streamEndWasReached = 0;
-+  MatchFinder_ReadBlock(p);
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-+{
-+  return (p->pos - p->historySize - 1) & kNormalizeMask;
-+}
-+
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+{
-+  UInt32 i;
-+  for (i = 0; i < numItems; i++)
-+  {
-+    UInt32 value = items[i];
-+    if (value <= subValue)
-+      value = kEmptyHashValue;
-+    else
-+      value -= subValue;
-+    items[i] = value;
-+  }
-+}
-+
-+static void MatchFinder_Normalize(CMatchFinder *p)
-+{
-+  UInt32 subValue = MatchFinder_GetSubValue(p);
-+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-+  MatchFinder_ReduceOffsets(p, subValue);
-+}
-+
-+static void MatchFinder_CheckLimits(CMatchFinder *p)
-+{
-+  if (p->pos == kMaxValForNormalize)
-+    MatchFinder_Normalize(p);
-+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-+    MatchFinder_CheckAndMoveAndRead(p);
-+  if (p->cyclicBufferPos == p->cyclicBufferSize)
-+    p->cyclicBufferPos = 0;
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  son[_cyclicBufferPos] = curMatch;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+      return distances;
-+    {
-+      const Byte *pb = cur - delta;
-+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-+      {
-+        UInt32 len = 0;
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+            return distances;
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return distances;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        if (++len != lenLimit && pb[len] == cur[len])
-+          while (++len != lenLimit)
-+            if (pb[len] != cur[len])
-+              break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return distances;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        {
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+#define MOVE_POS \
-+  ++p->cyclicBufferPos; \
-+  p->buffer++; \
-+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-+
-+#define MOVE_POS_RET MOVE_POS return offset;
-+
-+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+
-+#define GET_MATCHES_HEADER2(minLen, ret_op) \
-+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-+  cur = p->buffer;
-+
-+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-+
-+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-+
-+#define GET_MATCHES_FOOTER(offset, maxLen) \
-+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-+  distances + offset, maxLen) - distances); MOVE_POS_RET;
-+
-+#define SKIP_FOOTER \
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-+
-+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(2)
-+  HASH2_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 1)
-+}
-+
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 2)
-+}
-+
-+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, delta2, maxLen, offset;
-+  GET_MATCHES_HEADER(3)
-+
-+  HASH3_CALC;
-+
-+  delta2 = p->pos - p->hash[hash2Value];
-+  curMatch = p->hash[kFix3HashSize + hashValue];
-+  
-+  p->hash[hash2Value] =
-+  p->hash[kFix3HashSize + hashValue] = p->pos;
-+
-+
-+  maxLen = 2;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[0] = maxLen;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+  
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      p->son[p->cyclicBufferPos] = curMatch;
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances + offset, maxLen) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances, 2) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(2)
-+    HASH2_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value;
-+    SKIP_HEADER(3)
-+    HASH3_CALC;
-+    curMatch = p->hash[kFix3HashSize + hashValue];
-+    p->hash[hash2Value] =
-+    p->hash[kFix3HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] = p->pos;
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] =
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-+{
-+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-+  if (!p->btMode)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 2)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 3)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-+  }
-+  else
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-+  }
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaDec.c
-@@ -0,0 +1,999 @@
-+/* LzmaDec.c -- LZMA Decoder
-+2009-09-20 : Igor Pavlov : Public domain */
-+
-+#include "LzmaDec.h"
-+
-+#include <string.h>
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_INIT_SIZE 5
-+
-+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-+  { UPDATE_0(p); i = (i + i); A0; } else \
-+  { UPDATE_1(p); i = (i + i) + 1; A1; }
-+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-+
-+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-+#define TREE_DECODE(probs, limit, i) \
-+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-+
-+/* #define _LZMA_SIZE_OPT */
-+
-+#ifdef _LZMA_SIZE_OPT
-+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-+#else
-+#define TREE_6_DECODE(probs, i) \
-+  { i = 1; \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  i -= 0x40; }
-+#endif
-+
-+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0_CHECK range = bound;
-+#define UPDATE_1_CHECK range -= bound; code -= bound;
-+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-+#define TREE_DECODE_CHECK(probs, limit, i) \
-+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#define LZMA_DIC_MIN (1 << 12)
-+
-+/* First LZMA-symbol is always decoded.
-+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-+Out:
-+  Result:
-+    SZ_OK - OK
-+    SZ_ERROR_DATA - Error
-+  p->remainLen:
-+    < kMatchSpecLenStart : normal remain
-+    = kMatchSpecLenStart : finished
-+    = kMatchSpecLenStart + 1 : Flush marker
-+    = kMatchSpecLenStart + 2 : State Init Marker
-+*/
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  CLzmaProb *probs = p->probs;
-+
-+  unsigned state = p->state;
-+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-+  unsigned lc = p->prop.lc;
-+
-+  Byte *dic = p->dic;
-+  SizeT dicBufSize = p->dicBufSize;
-+  SizeT dicPos = p->dicPos;
-+  
-+  UInt32 processedPos = p->processedPos;
-+  UInt32 checkDicSize = p->checkDicSize;
-+  unsigned len = 0;
-+
-+  const Byte *buf = p->buf;
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+
-+  do
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = processedPos & pbMask;
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0(prob)
-+    {
-+      unsigned symbol;
-+      UPDATE_0(prob);
-+      prob = probs + Literal;
-+      if (checkDicSize != 0 || processedPos != 0)
-+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        state -= (state < 4) ? state : 3;
-+        symbol = 1;
-+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        state -= (state < 10) ? 3 : 6;
-+        symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      dic[dicPos++] = (Byte)symbol;
-+      processedPos++;
-+      continue;
-+    }
-+    else
-+    {
-+      UPDATE_1(prob);
-+      prob = probs + IsRep + state;
-+      IF_BIT_0(prob)
-+      {
-+        UPDATE_0(prob);
-+        state += kNumStates;
-+        prob = probs + LenCoder;
-+      }
-+      else
-+      {
-+        UPDATE_1(prob);
-+        if (checkDicSize == 0 && processedPos == 0)
-+          return SZ_ERROR_DATA;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0(prob)
-+        {
-+          UPDATE_0(prob);
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+            dicPos++;
-+            processedPos++;
-+            state = state < kNumLitStates ? 9 : 11;
-+            continue;
-+          }
-+          UPDATE_1(prob);
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UPDATE_1(prob);
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            distance = rep1;
-+          }
-+          else
-+          {
-+            UPDATE_1(prob);
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0(prob)
-+            {
-+              UPDATE_0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UPDATE_1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0(probLen)
-+        {
-+          UPDATE_0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = (1 << kLenNumLowBits);
-+        }
-+        else
-+        {
-+          UPDATE_1(probLen);
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0(probLen)
-+          {
-+            UPDATE_0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = (1 << kLenNumMidBits);
-+          }
-+          else
-+          {
-+            UPDATE_1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = (1 << kLenNumHighBits);
-+          }
-+        }
-+        TREE_DECODE(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state >= kNumStates)
-+      {
-+        UInt32 distance;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-+        TREE_6_DECODE(prob, distance);
-+        if (distance >= kStartPosModelIndex)
-+        {
-+          unsigned posSlot = (unsigned)distance;
-+          int numDirectBits = (int)(((distance >> 1) - 1));
-+          distance = (2 | (distance & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            distance <<= numDirectBits;
-+            prob = probs + SpecPos + distance - posSlot - 1;
-+            {
-+              UInt32 mask = 1;
-+              unsigned i = 1;
-+              do
-+              {
-+                GET_BIT2(prob + i, i, ; , distance |= mask);
-+                mask <<= 1;
-+              }
-+              while (--numDirectBits != 0);
-+            }
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE
-+              range >>= 1;
-+              
-+              {
-+                UInt32 t;
-+                code -= range;
-+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-+                distance = (distance << 1) + (t + 1);
-+                code += range & t;
-+              }
-+              /*
-+              distance <<= 1;
-+              if (code >= range)
-+              {
-+                code -= range;
-+                distance |= 1;
-+              }
-+              */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            distance <<= kNumAlignBits;
-+            {
-+              unsigned i = 1;
-+              GET_BIT2(prob + i, i, ; , distance |= 1);
-+              GET_BIT2(prob + i, i, ; , distance |= 2);
-+              GET_BIT2(prob + i, i, ; , distance |= 4);
-+              GET_BIT2(prob + i, i, ; , distance |= 8);
-+            }
-+            if (distance == (UInt32)0xFFFFFFFF)
-+            {
-+              len += kMatchSpecLenStart;
-+              state -= kNumStates;
-+              break;
-+            }
-+          }
-+        }
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        rep0 = distance + 1;
-+        if (checkDicSize == 0)
-+        {
-+          if (distance >= processedPos)
-+            return SZ_ERROR_DATA;
-+        }
-+        else if (distance >= checkDicSize)
-+          return SZ_ERROR_DATA;
-+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-+      }
-+
-+      len += kMatchMinLen;
-+
-+      if (limit == dicPos)
-+        return SZ_ERROR_DATA;
-+      {
-+        SizeT rem = limit - dicPos;
-+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-+
-+        processedPos += curLen;
-+
-+        len -= curLen;
-+        if (pos + curLen <= dicBufSize)
-+        {
-+          Byte *dest = dic + dicPos;
-+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-+          const Byte *lim = dest + curLen;
-+          dicPos += curLen;
-+          do
-+            *(dest) = (Byte)*(dest + src);
-+          while (++dest != lim);
-+        }
-+        else
-+        {
-+          do
-+          {
-+            dic[dicPos++] = dic[pos];
-+            if (++pos == dicBufSize)
-+              pos = 0;
-+          }
-+          while (--curLen != 0);
-+        }
-+      }
-+    }
-+  }
-+  while (dicPos < limit && buf < bufLimit);
-+  NORMALIZE;
-+  p->buf = buf;
-+  p->range = range;
-+  p->code = code;
-+  p->remainLen = len;
-+  p->dicPos = dicPos;
-+  p->processedPos = processedPos;
-+  p->reps[0] = rep0;
-+  p->reps[1] = rep1;
-+  p->reps[2] = rep2;
-+  p->reps[3] = rep3;
-+  p->state = state;
-+
-+  return SZ_OK;
-+}
-+
-+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-+{
-+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-+  {
-+    Byte *dic = p->dic;
-+    SizeT dicPos = p->dicPos;
-+    SizeT dicBufSize = p->dicBufSize;
-+    unsigned len = p->remainLen;
-+    UInt32 rep0 = p->reps[0];
-+    if (limit - dicPos < len)
-+      len = (unsigned)(limit - dicPos);
-+
-+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-+      p->checkDicSize = p->prop.dicSize;
-+
-+    p->processedPos += len;
-+    p->remainLen -= len;
-+    while (len-- != 0)
-+    {
-+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+      dicPos++;
-+    }
-+    p->dicPos = dicPos;
-+  }
-+}
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  do
-+  {
-+    SizeT limit2 = limit;
-+    if (p->checkDicSize == 0)
-+    {
-+      UInt32 rem = p->prop.dicSize - p->processedPos;
-+      if (limit - p->dicPos > rem)
-+        limit2 = p->dicPos + rem;
-+    }
-+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-+    if (p->processedPos >= p->prop.dicSize)
-+      p->checkDicSize = p->prop.dicSize;
-+    LzmaDec_WriteRem(p, limit);
-+  }
-+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-+
-+  if (p->remainLen > kMatchSpecLenStart)
-+  {
-+    p->remainLen = kMatchSpecLenStart;
-+  }
-+  return 0;
-+}
-+
-+typedef enum
-+{
-+  DUMMY_ERROR, /* unexpected end of input stream */
-+  DUMMY_LIT,
-+  DUMMY_MATCH,
-+  DUMMY_REP
-+} ELzmaDummy;
-+
-+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-+{
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+  const Byte *bufLimit = buf + inSize;
-+  CLzmaProb *probs = p->probs;
-+  unsigned state = p->state;
-+  ELzmaDummy res;
-+
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0_CHECK(prob)
-+    {
-+      UPDATE_0_CHECK
-+
-+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-+
-+      prob = probs + Literal;
-+      if (p->checkDicSize != 0 || p->processedPos != 0)
-+        prob += (LZMA_LIT_SIZE *
-+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        unsigned symbol = 1;
-+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        unsigned symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      res = DUMMY_LIT;
-+    }
-+    else
-+    {
-+      unsigned len;
-+      UPDATE_1_CHECK;
-+
-+      prob = probs + IsRep + state;
-+      IF_BIT_0_CHECK(prob)
-+      {
-+        UPDATE_0_CHECK;
-+        state = 0;
-+        prob = probs + LenCoder;
-+        res = DUMMY_MATCH;
-+      }
-+      else
-+      {
-+        UPDATE_1_CHECK;
-+        res = DUMMY_REP;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0_CHECK(prob)
-+        {
-+          UPDATE_0_CHECK;
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+            NORMALIZE_CHECK;
-+            return DUMMY_REP;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+          }
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0_CHECK(prob)
-+            {
-+              UPDATE_0_CHECK;
-+            }
-+            else
-+            {
-+              UPDATE_1_CHECK;
-+            }
-+          }
-+        }
-+        state = kNumStates;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0_CHECK(probLen)
-+        {
-+          UPDATE_0_CHECK;
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = 1 << kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0_CHECK(probLen)
-+          {
-+            UPDATE_0_CHECK;
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = 1 << kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = 1 << kLenNumHighBits;
-+          }
-+        }
-+        TREE_DECODE_CHECK(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        unsigned posSlot;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits);
-+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+
-+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-+
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE_CHECK
-+              range >>= 1;
-+              code -= range & (((code - range) >> 31) - 1);
-+              /* if (code >= range) code -= range; */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            unsigned i = 1;
-+            do
-+            {
-+              GET_BIT_CHECK(prob + i, i);
-+            }
-+            while (--numDirectBits != 0);
-+          }
-+        }
-+      }
-+    }
-+  }
-+  NORMALIZE_CHECK;
-+  return res;
-+}
-+
-+
-+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-+{
-+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-+  p->range = 0xFFFFFFFF;
-+  p->needFlush = 0;
-+}
-+
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+{
-+  p->needFlush = 1;
-+  p->remainLen = 0;
-+  p->tempBufSize = 0;
-+
-+  if (initDic)
-+  {
-+    p->processedPos = 0;
-+    p->checkDicSize = 0;
-+    p->needInitState = 1;
-+  }
-+  if (initState)
-+    p->needInitState = 1;
-+}
-+
-+void LzmaDec_Init(CLzmaDec *p)
-+{
-+  p->dicPos = 0;
-+  LzmaDec_InitDicAndState(p, True, True);
-+}
-+
-+static void LzmaDec_InitStateReal(CLzmaDec *p)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-+  UInt32 i;
-+  CLzmaProb *probs = p->probs;
-+  for (i = 0; i < numProbs; i++)
-+    probs[i] = kBitModelTotal >> 1;
-+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-+  p->state = 0;
-+  p->needInitState = 0;
-+}
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+    ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT inSize = *srcLen;
-+  (*srcLen) = 0;
-+  LzmaDec_WriteRem(p, dicLimit);
-+  
-+  *status = LZMA_STATUS_NOT_SPECIFIED;
-+
-+  while (p->remainLen != kMatchSpecLenStart)
-+  {
-+      int checkEndMarkNow;
-+
-+      if (p->needFlush != 0)
-+      {
-+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-+          p->tempBuf[p->tempBufSize++] = *src++;
-+        if (p->tempBufSize < RC_INIT_SIZE)
-+        {
-+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+          return SZ_OK;
-+        }
-+        if (p->tempBuf[0] != 0)
-+          return SZ_ERROR_DATA;
-+
-+        LzmaDec_InitRc(p, p->tempBuf);
-+        p->tempBufSize = 0;
-+      }
-+
-+      checkEndMarkNow = 0;
-+      if (p->dicPos >= dicLimit)
-+      {
-+        if (p->remainLen == 0 && p->code == 0)
-+        {
-+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-+          return SZ_OK;
-+        }
-+        if (finishMode == LZMA_FINISH_ANY)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_OK;
-+        }
-+        if (p->remainLen != 0)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_ERROR_DATA;
-+        }
-+        checkEndMarkNow = 1;
-+      }
-+
-+      if (p->needInitState)
-+        LzmaDec_InitStateReal(p);
-+  
-+      if (p->tempBufSize == 0)
-+      {
-+        SizeT processed;
-+        const Byte *bufLimit;
-+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            memcpy(p->tempBuf, src, inSize);
-+            p->tempBufSize = (unsigned)inSize;
-+            (*srcLen) += inSize;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+          bufLimit = src;
-+        }
-+        else
-+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-+        p->buf = src;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-+          return SZ_ERROR_DATA;
-+        processed = (SizeT)(p->buf - src);
-+        (*srcLen) += processed;
-+        src += processed;
-+        inSize -= processed;
-+      }
-+      else
-+      {
-+        unsigned rem = p->tempBufSize, lookAhead = 0;
-+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-+          p->tempBuf[rem++] = src[lookAhead++];
-+        p->tempBufSize = rem;
-+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            (*srcLen) += lookAhead;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+        }
-+        p->buf = p->tempBuf;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-+          return SZ_ERROR_DATA;
-+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-+        (*srcLen) += lookAhead;
-+        src += lookAhead;
-+        inSize -= lookAhead;
-+        p->tempBufSize = 0;
-+      }
-+  }
-+  if (p->code == 0)
-+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-+}
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT outSize = *destLen;
-+  SizeT inSize = *srcLen;
-+  *srcLen = *destLen = 0;
-+  for (;;)
-+  {
-+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-+    ELzmaFinishMode curFinishMode;
-+    SRes res;
-+    if (p->dicPos == p->dicBufSize)
-+      p->dicPos = 0;
-+    dicPos = p->dicPos;
-+    if (outSize > p->dicBufSize - dicPos)
-+    {
-+      outSizeCur = p->dicBufSize;
-+      curFinishMode = LZMA_FINISH_ANY;
-+    }
-+    else
-+    {
-+      outSizeCur = dicPos + outSize;
-+      curFinishMode = finishMode;
-+    }
-+
-+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-+    src += inSizeCur;
-+    inSize -= inSizeCur;
-+    *srcLen += inSizeCur;
-+    outSizeCur = p->dicPos - dicPos;
-+    memcpy(dest, p->dic + dicPos, outSizeCur);
-+    dest += outSizeCur;
-+    outSize -= outSizeCur;
-+    *destLen += outSizeCur;
-+    if (res != 0)
-+      return res;
-+    if (outSizeCur == 0 || outSize == 0)
-+      return SZ_OK;
-+  }
-+}
-+
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->probs);
-+  p->probs = 0;
-+}
-+
-+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->dic);
-+  p->dic = 0;
-+}
-+
-+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  LzmaDec_FreeProbs(p, alloc);
-+  LzmaDec_FreeDict(p, alloc);
-+}
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+{
-+  UInt32 dicSize;
-+  Byte d;
-+  
-+  if (size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_UNSUPPORTED;
-+  else
-+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-+ 
-+  if (dicSize < LZMA_DIC_MIN)
-+    dicSize = LZMA_DIC_MIN;
-+  p->dicSize = dicSize;
-+
-+  d = data[0];
-+  if (d >= (9 * 5 * 5))
-+    return SZ_ERROR_UNSUPPORTED;
-+
-+  p->lc = d % 9;
-+  d /= 9;
-+  p->pb = d / 5;
-+  p->lp = d % 5;
-+
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-+{
-+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-+  if (p->probs == 0 || numProbs != p->numProbs)
-+  {
-+    LzmaDec_FreeProbs(p, alloc);
-+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-+    p->numProbs = numProbs;
-+    if (p->probs == 0)
-+      return SZ_ERROR_MEM;
-+  }
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  SizeT dicBufSize;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  dicBufSize = propNew.dicSize;
-+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-+  {
-+    LzmaDec_FreeDict(p, alloc);
-+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-+    if (p->dic == 0)
-+    {
-+      LzmaDec_FreeProbs(p, alloc);
-+      return SZ_ERROR_MEM;
-+    }
-+  }
-+  p->dicBufSize = dicBufSize;
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc)
-+{
-+  CLzmaDec p;
-+  SRes res;
-+  SizeT inSize = *srcLen;
-+  SizeT outSize = *destLen;
-+  *srcLen = *destLen = 0;
-+  if (inSize < RC_INIT_SIZE)
-+    return SZ_ERROR_INPUT_EOF;
-+
-+  LzmaDec_Construct(&p);
-+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-+  if (res != 0)
-+    return res;
-+  p.dic = dest;
-+  p.dicBufSize = outSize;
-+
-+  LzmaDec_Init(&p);
-+  
-+  *srcLen = inSize;
-+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-+
-+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-+    res = SZ_ERROR_INPUT_EOF;
-+
-+  (*destLen) = p.dicPos;
-+  LzmaDec_FreeProbs(&p, alloc);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaEnc.c
-@@ -0,0 +1,2271 @@
-+/* LzmaEnc.c -- LZMA Encoder
-+2009-11-24 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+/* #define SHOW_STAT */
-+/* #define SHOW_STAT2 */
-+
-+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-+#include <stdio.h>
-+#endif
-+
-+#include "LzmaEnc.h"
-+
-+/* disable MT */
-+#define _7ZIP_ST
-+
-+#include "LzFind.h"
-+#ifndef _7ZIP_ST
-+#include "LzFindMt.h"
-+#endif
-+
-+#ifdef SHOW_STAT
-+static int ttt = 0;
-+#endif
-+
-+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-+
-+#define kBlockSize (9 << 10)
-+#define kUnpackBlockSize (1 << 18)
-+#define kMatchArraySize (1 << 21)
-+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-+
-+#define kNumMaxDirectBits (31)
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+#define kProbInitValue (kBitModelTotal >> 1)
-+
-+#define kNumMoveReducingBits 4
-+#define kNumBitPriceShiftBits 4
-+#define kBitPrice (1 << kNumBitPriceShiftBits)
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p)
-+{
-+  p->level = 5;
-+  p->dictSize = p->mc = 0;
-+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-+  p->writeEndMark = 0;
-+}
-+
-+void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+{
-+  int level = p->level;
-+  if (level < 0) level = 5;
-+  p->level = level;
-+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-+  if (p->lc < 0) p->lc = 3;
-+  if (p->lp < 0) p->lp = 0;
-+  if (p->pb < 0) p->pb = 2;
-+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-+  if (p->numHashBytes < 0) p->numHashBytes = 4;
-+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-+  if (p->numThreads < 0)
-+    p->numThreads =
-+      #ifndef _7ZIP_ST
-+      ((p->btMode && p->algo) ? 2 : 1);
-+      #else
-+      1;
-+      #endif
-+}
-+
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+{
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+  return props.dictSize;
-+}
-+
-+/* #define LZMA_LOG_BSR */
-+/* Define it for Intel's CPU */
-+
-+
-+#ifdef LZMA_LOG_BSR
-+
-+#define kDicLogSizeMaxCompress 30
-+
-+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-+
-+UInt32 GetPosSlot1(UInt32 pos)
-+{
-+  UInt32 res;
-+  BSR2_RET(pos, res);
-+  return res;
-+}
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-+
-+#else
-+
-+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-+
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+{
-+  int c = 2, slotFast;
-+  g_FastPos[0] = 0;
-+  g_FastPos[1] = 1;
-+  
-+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-+  {
-+    UInt32 k = (1 << ((slotFast >> 1) - 1));
-+    UInt32 j;
-+    for (j = 0; j < k; j++, c++)
-+      g_FastPos[c] = (Byte)slotFast;
-+  }
-+}
-+
-+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-+  res = p->g_FastPos[pos >> i] + (i * 2); }
-+/*
-+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-+  p->g_FastPos[pos >> 6] + 12 : \
-+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-+*/
-+
-+#define GetPosSlot1(pos) p->g_FastPos[pos]
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-+
-+#endif
-+
-+
-+#define LZMA_NUM_REPS 4
-+
-+typedef unsigned CState;
-+
-+typedef struct
-+{
-+  UInt32 price;
-+
-+  CState state;
-+  int prev1IsChar;
-+  int prev2;
-+
-+  UInt32 posPrev2;
-+  UInt32 backPrev2;
-+
-+  UInt32 posPrev;
-+  UInt32 backPrev;
-+  UInt32 backs[LZMA_NUM_REPS];
-+} COptimal;
-+
-+#define kNumOpts (1 << 12)
-+
-+#define kNumLenToPosStates 4
-+#define kNumPosSlotBits 6
-+#define kDicLogSizeMin 0
-+#define kDicLogSizeMax 32
-+#define kDistTableSizeMax (kDicLogSizeMax * 2)
-+
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+#define kAlignMask (kAlignTableSize - 1)
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-+
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+#define LZMA_PB_MAX 4
-+#define LZMA_LC_MAX 8
-+#define LZMA_LP_MAX 4
-+
-+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-+
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define LZMA_MATCH_LEN_MIN 2
-+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-+
-+#define kNumStates 12
-+
-+typedef struct
-+{
-+  CLzmaProb choice;
-+  CLzmaProb choice2;
-+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-+  CLzmaProb high[kLenNumHighSymbols];
-+} CLenEnc;
-+
-+typedef struct
-+{
-+  CLenEnc p;
-+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-+  UInt32 tableSize;
-+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-+} CLenPriceEnc;
-+
-+typedef struct
-+{
-+  UInt32 range;
-+  Byte cache;
-+  UInt64 low;
-+  UInt64 cacheSize;
-+  Byte *buf;
-+  Byte *bufLim;
-+  Byte *bufBase;
-+  ISeqOutStream *outStream;
-+  UInt64 processed;
-+  SRes res;
-+} CRangeEnc;
-+
-+typedef struct
-+{
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+} CSaveState;
-+
-+typedef struct
-+{
-+  IMatchFinder matchFinder;
-+  void *matchFinderObj;
-+
-+  #ifndef _7ZIP_ST
-+  Bool mtMode;
-+  CMatchFinderMt matchFinderMt;
-+  #endif
-+
-+  CMatchFinder matchFinderBase;
-+
-+  #ifndef _7ZIP_ST
-+  Byte pad[128];
-+  #endif
-+  
-+  UInt32 optimumEndIndex;
-+  UInt32 optimumCurrentIndex;
-+
-+  UInt32 longestMatchLength;
-+  UInt32 numPairs;
-+  UInt32 numAvail;
-+  COptimal opt[kNumOpts];
-+  
-+  #ifndef LZMA_LOG_BSR
-+  Byte g_FastPos[1 << kNumLogBits];
-+  #endif
-+
-+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-+  UInt32 numFastBytes;
-+  UInt32 additionalOffset;
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+
-+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-+  UInt32 alignPrices[kAlignTableSize];
-+  UInt32 alignPriceCount;
-+
-+  UInt32 distTableSize;
-+
-+  unsigned lc, lp, pb;
-+  unsigned lpMask, pbMask;
-+
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  unsigned lclp;
-+
-+  Bool fastMode;
-+  
-+  CRangeEnc rc;
-+
-+  Bool writeEndMark;
-+  UInt64 nowPos64;
-+  UInt32 matchPriceCount;
-+  Bool finished;
-+  Bool multiThread;
-+
-+  SRes result;
-+  UInt32 dictSize;
-+  UInt32 matchFinderCycles;
-+
-+  int needInit;
-+
-+  CSaveState saveState;
-+} CLzmaEnc;
-+
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CSaveState *dest = &p->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-+}
-+
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *dest = (CLzmaEnc *)pp;
-+  const CSaveState *p = &dest->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-+}
-+
-+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+
-+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-+    return SZ_ERROR_PARAM;
-+  p->dictSize = props.dictSize;
-+  p->matchFinderCycles = props.mc;
-+  {
-+    unsigned fb = props.fb;
-+    if (fb < 5)
-+      fb = 5;
-+    if (fb > LZMA_MATCH_LEN_MAX)
-+      fb = LZMA_MATCH_LEN_MAX;
-+    p->numFastBytes = fb;
-+  }
-+  p->lc = props.lc;
-+  p->lp = props.lp;
-+  p->pb = props.pb;
-+  p->fastMode = (props.algo == 0);
-+  p->matchFinderBase.btMode = props.btMode;
-+  {
-+    UInt32 numHashBytes = 4;
-+    if (props.btMode)
-+    {
-+      if (props.numHashBytes < 2)
-+        numHashBytes = 2;
-+      else if (props.numHashBytes < 4)
-+        numHashBytes = props.numHashBytes;
-+    }
-+    p->matchFinderBase.numHashBytes = numHashBytes;
-+  }
-+
-+  p->matchFinderBase.cutValue = props.mc;
-+
-+  p->writeEndMark = props.writeEndMark;
-+
-+  #ifndef _7ZIP_ST
-+  /*
-+  if (newMultiThread != _multiThread)
-+  {
-+    ReleaseMatchFinder();
-+    _multiThread = newMultiThread;
-+  }
-+  */
-+  p->multiThread = (props.numThreads > 1);
-+  #endif
-+
-+  return SZ_OK;
-+}
-+
-+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-+
-+#define IsCharState(s) ((s) < 7)
-+
-+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-+
-+#define kInfinityPrice (1 << 30)
-+
-+static void RangeEnc_Construct(CRangeEnc *p)
-+{
-+  p->outStream = 0;
-+  p->bufBase = 0;
-+}
-+
-+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-+
-+#define RC_BUF_SIZE (1 << 16)
-+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  if (p->bufBase == 0)
-+  {
-+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-+    if (p->bufBase == 0)
-+      return 0;
-+    p->bufLim = p->bufBase + RC_BUF_SIZE;
-+  }
-+  return 1;
-+}
-+
-+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->bufBase);
-+  p->bufBase = 0;
-+}
-+
-+static void RangeEnc_Init(CRangeEnc *p)
-+{
-+  /* Stream.Init(); */
-+  p->low = 0;
-+  p->range = 0xFFFFFFFF;
-+  p->cacheSize = 1;
-+  p->cache = 0;
-+
-+  p->buf = p->bufBase;
-+
-+  p->processed = 0;
-+  p->res = SZ_OK;
-+}
-+
-+static void RangeEnc_FlushStream(CRangeEnc *p)
-+{
-+  size_t num;
-+  if (p->res != SZ_OK)
-+    return;
-+  num = p->buf - p->bufBase;
-+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-+    p->res = SZ_ERROR_WRITE;
-+  p->processed += num;
-+  p->buf = p->bufBase;
-+}
-+
-+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-+{
-+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-+  {
-+    Byte temp = p->cache;
-+    do
-+    {
-+      Byte *buf = p->buf;
-+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-+      p->buf = buf;
-+      if (buf == p->bufLim)
-+        RangeEnc_FlushStream(p);
-+      temp = 0xFF;
-+    }
-+    while (--p->cacheSize != 0);
-+    p->cache = (Byte)((UInt32)p->low >> 24);
-+  }
-+  p->cacheSize++;
-+  p->low = (UInt32)p->low << 8;
-+}
-+
-+static void RangeEnc_FlushData(CRangeEnc *p)
-+{
-+  int i;
-+  for (i = 0; i < 5; i++)
-+    RangeEnc_ShiftLow(p);
-+}
-+
-+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-+{
-+  do
-+  {
-+    p->range >>= 1;
-+    p->low += p->range & (0 - ((value >> --numBits) & 1));
-+    if (p->range < kTopValue)
-+    {
-+      p->range <<= 8;
-+      RangeEnc_ShiftLow(p);
-+    }
-+  }
-+  while (numBits != 0);
-+}
-+
-+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-+{
-+  UInt32 ttt = *prob;
-+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-+  if (symbol == 0)
-+  {
-+    p->range = newBound;
-+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-+  }
-+  else
-+  {
-+    p->low += newBound;
-+    p->range -= newBound;
-+    ttt -= ttt >> kNumMoveBits;
-+  }
-+  *prob = (CLzmaProb)ttt;
-+  if (p->range < kTopValue)
-+  {
-+    p->range <<= 8;
-+    RangeEnc_ShiftLow(p);
-+  }
-+}
-+
-+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-+{
-+  symbol |= 0x100;
-+  do
-+  {
-+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-+{
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+{
-+  UInt32 i;
-+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-+  {
-+    const int kCyclesBits = kNumBitPriceShiftBits;
-+    UInt32 w = i;
-+    UInt32 bitCount = 0;
-+    int j;
-+    for (j = 0; j < kCyclesBits; j++)
-+    {
-+      w = w * w;
-+      bitCount <<= 1;
-+      while (w >= ((UInt32)1 << 16))
-+      {
-+        w >>= 1;
-+        bitCount++;
-+      }
-+    }
-+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-+  }
-+}
-+
-+
-+#define GET_PRICE(prob, symbol) \
-+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICEa(prob, symbol) \
-+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= 0x100;
-+  do
-+  {
-+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+
-+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0;)
-+  {
-+    UInt32 bit;
-+    i--;
-+    bit = (symbol >> i) & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+  }
-+}
-+
-+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = 0; i < numBitLevels; i++)
-+  {
-+    UInt32 bit = symbol & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+    symbol >>= 1;
-+  }
-+}
-+
-+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= (1 << numBitLevels);
-+  while (symbol != 1)
-+  {
-+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-+    symbol >>= 1;
-+  }
-+  return price;
-+}
-+
-+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0; i--)
-+  {
-+    UInt32 bit = symbol & 1;
-+    symbol >>= 1;
-+    price += GET_PRICEa(probs[m], bit);
-+    m = (m << 1) | bit;
-+  }
-+  return price;
-+}
-+
-+
-+static void LenEnc_Init(CLenEnc *p)
-+{
-+  unsigned i;
-+  p->choice = p->choice2 = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-+    p->low[i] = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-+    p->mid[i] = kProbInitValue;
-+  for (i = 0; i < kLenNumHighSymbols; i++)
-+    p->high[i] = kProbInitValue;
-+}
-+
-+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-+{
-+  if (symbol < kLenNumLowSymbols)
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 0);
-+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-+  }
-+  else
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 1);
-+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-+    }
-+  }
-+}
-+
-+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-+{
-+  UInt32 a0 = GET_PRICE_0a(p->choice);
-+  UInt32 a1 = GET_PRICE_1a(p->choice);
-+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-+  UInt32 i = 0;
-+  for (i = 0; i < kLenNumLowSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-+  }
-+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-+  }
-+  for (; i < numSymbols; i++)
-+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-+}
-+
-+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-+{
-+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-+  p->counters[posState] = p->tableSize;
-+}
-+
-+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-+{
-+  UInt32 posState;
-+  for (posState = 0; posState < numPosStates; posState++)
-+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-+{
-+  LenEnc_Encode(&p->p, rc, symbol, posState);
-+  if (updatePrice)
-+    if (--p->counters[posState] == 0)
-+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+
-+
-+
-+static void MovePos(CLzmaEnc *p, UInt32 num)
-+{
-+  #ifdef SHOW_STAT
-+  ttt += num;
-+  printf("\n MovePos %d", num);
-+  #endif
-+  if (num != 0)
-+  {
-+    p->additionalOffset += num;
-+    p->matchFinder.Skip(p->matchFinderObj, num);
-+  }
-+}
-+
-+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-+{
-+  UInt32 lenRes = 0, numPairs;
-+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-+  #ifdef SHOW_STAT
-+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-+  ttt++;
-+  {
-+    UInt32 i;
-+    for (i = 0; i < numPairs; i += 2)
-+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-+  }
-+  #endif
-+  if (numPairs > 0)
-+  {
-+    lenRes = p->matches[numPairs - 2];
-+    if (lenRes == p->numFastBytes)
-+    {
-+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+      UInt32 distance = p->matches[numPairs - 1] + 1;
-+      UInt32 numAvail = p->numAvail;
-+      if (numAvail > LZMA_MATCH_LEN_MAX)
-+        numAvail = LZMA_MATCH_LEN_MAX;
-+      {
-+        const Byte *pby2 = pby - distance;
-+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-+      }
-+    }
-+  }
-+  p->additionalOffset++;
-+  *numDistancePairsRes = numPairs;
-+  return lenRes;
-+}
-+
-+
-+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-+#define IsShortRep(p) ((p)->backPrev == 0)
-+
-+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-+{
-+  return
-+    GET_PRICE_0(p->isRepG0[state]) +
-+    GET_PRICE_0(p->isRep0Long[state][posState]);
-+}
-+
-+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-+{
-+  UInt32 price;
-+  if (repIndex == 0)
-+  {
-+    price = GET_PRICE_0(p->isRepG0[state]);
-+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-+  }
-+  else
-+  {
-+    price = GET_PRICE_1(p->isRepG0[state]);
-+    if (repIndex == 1)
-+      price += GET_PRICE_0(p->isRepG1[state]);
-+    else
-+    {
-+      price += GET_PRICE_1(p->isRepG1[state]);
-+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-+    }
-+  }
-+  return price;
-+}
-+
-+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-+{
-+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-+    GetPureRepPrice(p, repIndex, state, posState);
-+}
-+
-+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-+{
-+  UInt32 posMem = p->opt[cur].posPrev;
-+  UInt32 backMem = p->opt[cur].backPrev;
-+  p->optimumEndIndex = cur;
-+  do
-+  {
-+    if (p->opt[cur].prev1IsChar)
-+    {
-+      MakeAsChar(&p->opt[posMem])
-+      p->opt[posMem].posPrev = posMem - 1;
-+      if (p->opt[cur].prev2)
-+      {
-+        p->opt[posMem - 1].prev1IsChar = False;
-+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-+      }
-+    }
-+    {
-+      UInt32 posPrev = posMem;
-+      UInt32 backCur = backMem;
-+      
-+      backMem = p->opt[posPrev].backPrev;
-+      posMem = p->opt[posPrev].posPrev;
-+      
-+      p->opt[posPrev].backPrev = backCur;
-+      p->opt[posPrev].posPrev = cur;
-+      cur = posPrev;
-+    }
-+  }
-+  while (cur != 0);
-+  *backRes = p->opt[0].backPrev;
-+  p->optimumCurrentIndex  = p->opt[0].posPrev;
-+  return p->optimumCurrentIndex;
-+}
-+
-+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-+
-+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-+  UInt32 *matches;
-+  const Byte *data;
-+  Byte curByte, matchByte;
-+  if (p->optimumEndIndex != p->optimumCurrentIndex)
-+  {
-+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-+    *backRes = opt->backPrev;
-+    p->optimumCurrentIndex = opt->posPrev;
-+    return lenRes;
-+  }
-+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-+  
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  if (numAvail < 2)
-+  {
-+    *backRes = (UInt32)(-1);
-+    return 1;
-+  }
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  repMaxIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 lenTest;
-+    const Byte *data2;
-+    reps[i] = p->reps[i];
-+    data2 = data - (reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+    {
-+      repLens[i] = 0;
-+      continue;
-+    }
-+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+    repLens[i] = lenTest;
-+    if (lenTest > repLens[repMaxIndex])
-+      repMaxIndex = i;
-+  }
-+  if (repLens[repMaxIndex] >= p->numFastBytes)
-+  {
-+    UInt32 lenRes;
-+    *backRes = repMaxIndex;
-+    lenRes = repLens[repMaxIndex];
-+    MovePos(p, lenRes - 1);
-+    return lenRes;
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+  curByte = *data;
-+  matchByte = *(data - (reps[0] + 1));
-+
-+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-+  {
-+    *backRes = (UInt32)-1;
-+    return 1;
-+  }
-+
-+  p->opt[0].state = (CState)p->state;
-+
-+  posState = (position & p->pbMask);
-+
-+  {
-+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-+        (!IsCharState(p->state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+  }
-+
-+  MakeAsChar(&p->opt[1]);
-+
-+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-+
-+  if (matchByte == curByte)
-+  {
-+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-+    if (shortRepPrice < p->opt[1].price)
-+    {
-+      p->opt[1].price = shortRepPrice;
-+      MakeAsShortRep(&p->opt[1]);
-+    }
-+  }
-+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-+
-+  if (lenEnd < 2)
-+  {
-+    *backRes = p->opt[1].backPrev;
-+    return 1;
-+  }
-+
-+  p->opt[1].posPrev = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+    p->opt[0].backs[i] = reps[i];
-+
-+  len = lenEnd;
-+  do
-+    p->opt[len--].price = kInfinityPrice;
-+  while (len >= 2);
-+
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 repLen = repLens[i];
-+    UInt32 price;
-+    if (repLen < 2)
-+      continue;
-+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-+    do
-+    {
-+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-+      COptimal *opt = &p->opt[repLen];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = i;
-+        opt->prev1IsChar = False;
-+      }
-+    }
-+    while (--repLen >= 2);
-+  }
-+
-+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-+
-+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-+  if (len <= mainLen)
-+  {
-+    UInt32 offs = 0;
-+    while (len > matches[offs])
-+      offs += 2;
-+    for (; ; len++)
-+    {
-+      COptimal *opt;
-+      UInt32 distance = matches[offs + 1];
-+
-+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-+      UInt32 lenToPosState = GetLenToPosState(len);
-+      if (distance < kNumFullDistances)
-+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-+      else
-+      {
-+        UInt32 slot;
-+        GetPosSlot2(distance, slot);
-+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-+      }
-+      opt = &p->opt[len];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = distance + LZMA_NUM_REPS;
-+        opt->prev1IsChar = False;
-+      }
-+      if (len == matches[offs])
-+      {
-+        offs += 2;
-+        if (offs == numPairs)
-+          break;
-+      }
-+    }
-+  }
-+
-+  cur = 0;
-+
-+    #ifdef SHOW_STAT2
-+    if (position >= 0)
-+    {
-+      unsigned i;
-+      printf("\n pos = %4X", position);
-+      for (i = cur; i <= lenEnd; i++)
-+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-+    }
-+    #endif
-+
-+  for (;;)
-+  {
-+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-+    Bool nextIsChar;
-+    Byte curByte, matchByte;
-+    const Byte *data;
-+    COptimal *curOpt;
-+    COptimal *nextOpt;
-+
-+    cur++;
-+    if (cur == lenEnd)
-+      return Backward(p, backRes, cur);
-+
-+    newLen = ReadMatchDistances(p, &numPairs);
-+    if (newLen >= p->numFastBytes)
-+    {
-+      p->numPairs = numPairs;
-+      p->longestMatchLength = newLen;
-+      return Backward(p, backRes, cur);
-+    }
-+    position++;
-+    curOpt = &p->opt[cur];
-+    posPrev = curOpt->posPrev;
-+    if (curOpt->prev1IsChar)
-+    {
-+      posPrev--;
-+      if (curOpt->prev2)
-+      {
-+        state = p->opt[curOpt->posPrev2].state;
-+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      else
-+        state = p->opt[posPrev].state;
-+      state = kLiteralNextStates[state];
-+    }
-+    else
-+      state = p->opt[posPrev].state;
-+    if (posPrev == cur - 1)
-+    {
-+      if (IsShortRep(curOpt))
-+        state = kShortRepNextStates[state];
-+      else
-+        state = kLiteralNextStates[state];
-+    }
-+    else
-+    {
-+      UInt32 pos;
-+      const COptimal *prevOpt;
-+      if (curOpt->prev1IsChar && curOpt->prev2)
-+      {
-+        posPrev = curOpt->posPrev2;
-+        pos = curOpt->backPrev2;
-+        state = kRepNextStates[state];
-+      }
-+      else
-+      {
-+        pos = curOpt->backPrev;
-+        if (pos < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      prevOpt = &p->opt[posPrev];
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        UInt32 i;
-+        reps[0] = prevOpt->backs[pos];
-+        for (i = 1; i <= pos; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+        for (; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i];
-+      }
-+      else
-+      {
-+        UInt32 i;
-+        reps[0] = (pos - LZMA_NUM_REPS);
-+        for (i = 1; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+      }
-+    }
-+    curOpt->state = (CState)state;
-+
-+    curOpt->backs[0] = reps[0];
-+    curOpt->backs[1] = reps[1];
-+    curOpt->backs[2] = reps[2];
-+    curOpt->backs[3] = reps[3];
-+
-+    curPrice = curOpt->price;
-+    nextIsChar = False;
-+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+    curByte = *data;
-+    matchByte = *(data - (reps[0] + 1));
-+
-+    posState = (position & p->pbMask);
-+
-+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-+    {
-+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+      curAnd1Price +=
-+        (!IsCharState(state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+    }
-+
-+    nextOpt = &p->opt[cur + 1];
-+
-+    if (curAnd1Price < nextOpt->price)
-+    {
-+      nextOpt->price = curAnd1Price;
-+      nextOpt->posPrev = cur;
-+      MakeAsChar(nextOpt);
-+      nextIsChar = True;
-+    }
-+
-+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-+    
-+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-+    {
-+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-+      if (shortRepPrice <= nextOpt->price)
-+      {
-+        nextOpt->price = shortRepPrice;
-+        nextOpt->posPrev = cur;
-+        MakeAsShortRep(nextOpt);
-+        nextIsChar = True;
-+      }
-+    }
-+    numAvailFull = p->numAvail;
-+    {
-+      UInt32 temp = kNumOpts - 1 - cur;
-+      if (temp < numAvailFull)
-+        numAvailFull = temp;
-+    }
-+
-+    if (numAvailFull < 2)
-+      continue;
-+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-+
-+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-+    {
-+      /* try Literal + rep0 */
-+      UInt32 temp;
-+      UInt32 lenTest2;
-+      const Byte *data2 = data - (reps[0] + 1);
-+      UInt32 limit = p->numFastBytes + 1;
-+      if (limit > numAvailFull)
-+        limit = numAvailFull;
-+
-+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-+      lenTest2 = temp - 1;
-+      if (lenTest2 >= 2)
-+      {
-+        UInt32 state2 = kLiteralNextStates[state];
-+        UInt32 posStateNext = (position + 1) & p->pbMask;
-+        UInt32 nextRepMatchPrice = curAnd1Price +
-+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+            GET_PRICE_1(p->isRep[state2]);
-+        /* for (; lenTest2 >= 2; lenTest2--) */
-+        {
-+          UInt32 curAndLenPrice;
-+          COptimal *opt;
-+          UInt32 offset = cur + 1 + lenTest2;
-+          while (lenEnd < offset)
-+            p->opt[++lenEnd].price = kInfinityPrice;
-+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+          opt = &p->opt[offset];
-+          if (curAndLenPrice < opt->price)
-+          {
-+            opt->price = curAndLenPrice;
-+            opt->posPrev = cur + 1;
-+            opt->backPrev = 0;
-+            opt->prev1IsChar = True;
-+            opt->prev2 = False;
-+          }
-+        }
-+      }
-+    }
-+    
-+    startLen = 2; /* speed optimization */
-+    {
-+    UInt32 repIndex;
-+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-+    {
-+      UInt32 lenTest;
-+      UInt32 lenTestTemp;
-+      UInt32 price;
-+      const Byte *data2 = data - (reps[repIndex] + 1);
-+      if (data[0] != data2[0] || data[1] != data2[1])
-+        continue;
-+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+      while (lenEnd < cur + lenTest)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+      lenTestTemp = lenTest;
-+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-+      do
-+      {
-+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-+        COptimal *opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = repIndex;
-+          opt->prev1IsChar = False;
-+        }
-+      }
-+      while (--lenTest >= 2);
-+      lenTest = lenTestTemp;
-+      
-+      if (repIndex == 0)
-+        startLen = lenTest + 1;
-+        
-+      /* if (_maxMode) */
-+        {
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kRepNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice =
-+                price + p->repLenEnc.prices[posState][lenTest - 2] +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (position + lenTest + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = repIndex;
-+              }
-+            }
-+          }
-+        }
-+    }
-+    }
-+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-+    if (newLen > numAvail)
-+    {
-+      newLen = numAvail;
-+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-+      matches[numPairs] = newLen;
-+      numPairs += 2;
-+    }
-+    if (newLen >= startLen)
-+    {
-+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-+      UInt32 offs, curBack, posSlot;
-+      UInt32 lenTest;
-+      while (lenEnd < cur + newLen)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+
-+      offs = 0;
-+      while (startLen > matches[offs])
-+        offs += 2;
-+      curBack = matches[offs + 1];
-+      GetPosSlot2(curBack, posSlot);
-+      for (lenTest = /*2*/ startLen; ; lenTest++)
-+      {
-+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-+        UInt32 lenToPosState = GetLenToPosState(lenTest);
-+        COptimal *opt;
-+        if (curBack < kNumFullDistances)
-+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-+        else
-+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-+        
-+        opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = curBack + LZMA_NUM_REPS;
-+          opt->prev1IsChar = False;
-+        }
-+
-+        if (/*_maxMode && */lenTest == matches[offs])
-+        {
-+          /* Try Match + Literal + Rep0 */
-+          const Byte *data2 = data - (curBack + 1);
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kMatchNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice = curAndLenPrice +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (posStateNext + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-+              }
-+            }
-+          }
-+          offs += 2;
-+          if (offs == numPairs)
-+            break;
-+          curBack = matches[offs + 1];
-+          if (curBack >= kNumFullDistances)
-+            GetPosSlot2(curBack, posSlot);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-+
-+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-+  const Byte *data;
-+  const UInt32 *matches;
-+
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  *backRes = (UInt32)-1;
-+  if (numAvail < 2)
-+    return 1;
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+
-+  repLen = repIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-+    if (len >= p->numFastBytes)
-+    {
-+      *backRes = i;
-+      MovePos(p, len - 1);
-+      return len;
-+    }
-+    if (len > repLen)
-+    {
-+      repIndex = i;
-+      repLen = len;
-+    }
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+
-+  mainDist = 0; /* for GCC */
-+  if (mainLen >= 2)
-+  {
-+    mainDist = matches[numPairs - 1];
-+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-+    {
-+      if (!ChangePair(matches[numPairs - 3], mainDist))
-+        break;
-+      numPairs -= 2;
-+      mainLen = matches[numPairs - 2];
-+      mainDist = matches[numPairs - 1];
-+    }
-+    if (mainLen == 2 && mainDist >= 0x80)
-+      mainLen = 1;
-+  }
-+
-+  if (repLen >= 2 && (
-+        (repLen + 1 >= mainLen) ||
-+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-+  {
-+    *backRes = repIndex;
-+    MovePos(p, repLen - 1);
-+    return repLen;
-+  }
-+  
-+  if (mainLen < 2 || numAvail <= 2)
-+    return 1;
-+
-+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-+  if (p->longestMatchLength >= 2)
-+  {
-+    UInt32 newDistance = matches[p->numPairs - 1];
-+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-+        (p->longestMatchLength > mainLen + 1) ||
-+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-+      return 1;
-+  }
-+  
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len, limit;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    limit = mainLen - 1;
-+    for (len = 2; len < limit && data[len] == data2[len]; len++);
-+    if (len >= limit)
-+      return 1;
-+  }
-+  *backRes = mainDist + LZMA_NUM_REPS;
-+  MovePos(p, mainLen - 2);
-+  return mainLen;
-+}
-+
-+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-+{
-+  UInt32 len;
-+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+  p->state = kMatchNextStates[p->state];
-+  len = LZMA_MATCH_LEN_MIN;
-+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-+}
-+
-+static SRes CheckErrors(CLzmaEnc *p)
-+{
-+  if (p->result != SZ_OK)
-+    return p->result;
-+  if (p->rc.res != SZ_OK)
-+    p->result = SZ_ERROR_WRITE;
-+  if (p->matchFinderBase.result != SZ_OK)
-+    p->result = SZ_ERROR_READ;
-+  if (p->result != SZ_OK)
-+    p->finished = True;
-+  return p->result;
-+}
-+
-+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-+{
-+  /* ReleaseMFStream(); */
-+  p->finished = True;
-+  if (p->writeEndMark)
-+    WriteEndMarker(p, nowPos & p->pbMask);
-+  RangeEnc_FlushData(&p->rc);
-+  RangeEnc_FlushStream(&p->rc);
-+  return CheckErrors(p);
-+}
-+
-+static void FillAlignPrices(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < kAlignTableSize; i++)
-+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-+  p->alignPriceCount = 0;
-+}
-+
-+static void FillDistancesPrices(CLzmaEnc *p)
-+{
-+  UInt32 tempPrices[kNumFullDistances];
-+  UInt32 i, lenToPosState;
-+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-+  {
-+    UInt32 posSlot = GetPosSlot1(i);
-+    UInt32 footerBits = ((posSlot >> 1) - 1);
-+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-+  }
-+
-+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-+  {
-+    UInt32 posSlot;
-+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-+
-+    {
-+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-+      UInt32 i;
-+      for (i = 0; i < kStartPosModelIndex; i++)
-+        distancesPrices[i] = posSlotPrices[i];
-+      for (; i < kNumFullDistances; i++)
-+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-+    }
-+  }
-+  p->matchPriceCount = 0;
-+}
-+
-+void LzmaEnc_Construct(CLzmaEnc *p)
-+{
-+  RangeEnc_Construct(&p->rc);
-+  MatchFinder_Construct(&p->matchFinderBase);
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Construct(&p->matchFinderMt);
-+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-+  #endif
-+
-+  {
-+    CLzmaEncProps props;
-+    LzmaEncProps_Init(&props);
-+    LzmaEnc_SetProps(p, &props);
-+  }
-+
-+  #ifndef LZMA_LOG_BSR
-+  LzmaEnc_FastPosInit(p->g_FastPos);
-+  #endif
-+
-+  LzmaEnc_InitPriceTables(p->ProbPrices);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-+{
-+  void *p;
-+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-+  if (p != 0)
-+    LzmaEnc_Construct((CLzmaEnc *)p);
-+  return p;
-+}
-+
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->litProbs);
-+  alloc->Free(alloc, p->saveState.litProbs);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-+  #endif
-+  MatchFinder_Free(&p->matchFinderBase, allocBig);
-+  LzmaEnc_FreeLits(p, alloc);
-+  RangeEnc_Free(&p->rc, alloc);
-+}
-+
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-+  alloc->Free(alloc, p);
-+}
-+
-+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-+{
-+  UInt32 nowPos32, startPos32;
-+  if (p->needInit)
-+  {
-+    p->matchFinder.Init(p->matchFinderObj);
-+    p->needInit = 0;
-+  }
-+
-+  if (p->finished)
-+    return p->result;
-+  RINOK(CheckErrors(p));
-+
-+  nowPos32 = (UInt32)p->nowPos64;
-+  startPos32 = nowPos32;
-+
-+  if (p->nowPos64 == 0)
-+  {
-+    UInt32 numPairs;
-+    Byte curByte;
-+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+      return Flush(p, nowPos32);
-+    ReadMatchDistances(p, &numPairs);
-+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-+    p->state = kLiteralNextStates[p->state];
-+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-+    p->additionalOffset--;
-+    nowPos32++;
-+  }
-+
-+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-+  for (;;)
-+  {
-+    UInt32 pos, len, posState;
-+
-+    if (p->fastMode)
-+      len = GetOptimumFast(p, &pos);
-+    else
-+      len = GetOptimum(p, nowPos32, &pos);
-+
-+    #ifdef SHOW_STAT2
-+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-+    #endif
-+
-+    posState = nowPos32 & p->pbMask;
-+    if (len == 1 && pos == (UInt32)-1)
-+    {
-+      Byte curByte;
-+      CLzmaProb *probs;
-+      const Byte *data;
-+
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+      curByte = *data;
-+      probs = LIT_PROBS(nowPos32, *(data - 1));
-+      if (IsCharState(p->state))
-+        LitEnc_Encode(&p->rc, probs, curByte);
-+      else
-+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-+      p->state = kLiteralNextStates[p->state];
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-+        if (pos == 0)
-+        {
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-+        }
-+        else
-+        {
-+          UInt32 distance = p->reps[pos];
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-+          if (pos == 1)
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-+          else
-+          {
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-+            if (pos == 3)
-+              p->reps[3] = p->reps[2];
-+            p->reps[2] = p->reps[1];
-+          }
-+          p->reps[1] = p->reps[0];
-+          p->reps[0] = distance;
-+        }
-+        if (len == 1)
-+          p->state = kShortRepNextStates[p->state];
-+        else
-+        {
-+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+          p->state = kRepNextStates[p->state];
-+        }
-+      }
-+      else
-+      {
-+        UInt32 posSlot;
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+        p->state = kMatchNextStates[p->state];
-+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+        pos -= LZMA_NUM_REPS;
-+        GetPosSlot(pos, posSlot);
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          UInt32 footerBits = ((posSlot >> 1) - 1);
-+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+          UInt32 posReduced = pos - base;
-+
-+          if (posSlot < kEndPosModelIndex)
-+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-+          else
-+          {
-+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-+            p->alignPriceCount++;
-+          }
-+        }
-+        p->reps[3] = p->reps[2];
-+        p->reps[2] = p->reps[1];
-+        p->reps[1] = p->reps[0];
-+        p->reps[0] = pos;
-+        p->matchPriceCount++;
-+      }
-+    }
-+    p->additionalOffset -= len;
-+    nowPos32 += len;
-+    if (p->additionalOffset == 0)
-+    {
-+      UInt32 processed;
-+      if (!p->fastMode)
-+      {
-+        if (p->matchPriceCount >= (1 << 7))
-+          FillDistancesPrices(p);
-+        if (p->alignPriceCount >= kAlignTableSize)
-+          FillAlignPrices(p);
-+      }
-+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+        break;
-+      processed = nowPos32 - startPos32;
-+      if (useLimits)
-+      {
-+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-+          break;
-+      }
-+      else if (processed >= (1 << 15))
-+      {
-+        p->nowPos64 += nowPos32 - startPos32;
-+        return CheckErrors(p);
-+      }
-+    }
-+  }
-+  p->nowPos64 += nowPos32 - startPos32;
-+  return Flush(p, nowPos32);
-+}
-+
-+#define kBigHashDicLimit ((UInt32)1 << 24)
-+
-+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 beforeSize = kNumOpts;
-+  Bool btMode;
-+  if (!RangeEnc_Alloc(&p->rc, alloc))
-+    return SZ_ERROR_MEM;
-+  btMode = (p->matchFinderBase.btMode != 0);
-+  #ifndef _7ZIP_ST
-+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-+  #endif
-+
-+  {
-+    unsigned lclp = p->lc + p->lp;
-+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-+    {
-+      LzmaEnc_FreeLits(p, alloc);
-+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-+      {
-+        LzmaEnc_FreeLits(p, alloc);
-+        return SZ_ERROR_MEM;
-+      }
-+      p->lclp = lclp;
-+    }
-+  }
-+
-+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-+
-+  if (beforeSize + p->dictSize < keepWindowSize)
-+    beforeSize = keepWindowSize - p->dictSize;
-+
-+  #ifndef _7ZIP_ST
-+  if (p->mtMode)
-+  {
-+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-+    p->matchFinderObj = &p->matchFinderMt;
-+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-+  }
-+  else
-+  #endif
-+  {
-+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-+      return SZ_ERROR_MEM;
-+    p->matchFinderObj = &p->matchFinderBase;
-+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-+  }
-+  return SZ_OK;
-+}
-+
-+void LzmaEnc_Init(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  p->state = 0;
-+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-+    p->reps[i] = 0;
-+
-+  RangeEnc_Init(&p->rc);
-+
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    UInt32 j;
-+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-+    {
-+      p->isMatch[i][j] = kProbInitValue;
-+      p->isRep0Long[i][j] = kProbInitValue;
-+    }
-+    p->isRep[i] = kProbInitValue;
-+    p->isRepG0[i] = kProbInitValue;
-+    p->isRepG1[i] = kProbInitValue;
-+    p->isRepG2[i] = kProbInitValue;
-+  }
-+
-+  {
-+    UInt32 num = 0x300 << (p->lp + p->lc);
-+    for (i = 0; i < num; i++)
-+      p->litProbs[i] = kProbInitValue;
-+  }
-+
-+  {
-+    for (i = 0; i < kNumLenToPosStates; i++)
-+    {
-+      CLzmaProb *probs = p->posSlotEncoder[i];
-+      UInt32 j;
-+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-+        probs[j] = kProbInitValue;
-+    }
-+  }
-+  {
-+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-+      p->posEncoders[i] = kProbInitValue;
-+  }
-+
-+  LenEnc_Init(&p->lenEnc.p);
-+  LenEnc_Init(&p->repLenEnc.p);
-+
-+  for (i = 0; i < (1 << kNumAlignBits); i++)
-+    p->posAlignEncoder[i] = kProbInitValue;
-+
-+  p->optimumEndIndex = 0;
-+  p->optimumCurrentIndex = 0;
-+  p->additionalOffset = 0;
-+
-+  p->pbMask = (1 << p->pb) - 1;
-+  p->lpMask = (1 << p->lp) - 1;
-+}
-+
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
-+{
-+  if (!p->fastMode)
-+  {
-+    FillDistancesPrices(p);
-+    FillAlignPrices(p);
-+  }
-+
-+  p->lenEnc.tableSize =
-+  p->repLenEnc.tableSize =
-+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-+}
-+
-+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 i;
-+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-+    if (p->dictSize <= ((UInt32)1 << i))
-+      break;
-+  p->distTableSize = i * 2;
-+
-+  p->finished = False;
-+  p->result = SZ_OK;
-+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-+  LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  p->nowPos64 = 0;
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  p->rc.outStream = outStream;
-+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-+}
-+
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-+    ISeqInStream *inStream, UInt32 keepWindowSize,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-+{
-+  p->matchFinderBase.directInput = 1;
-+  p->matchFinderBase.bufferBase = (Byte *)src;
-+  p->matchFinderBase.directInputRem = srcLen;
-+}
-+
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+  p->needInit = 1;
-+
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
-+{
-+  #ifndef _7ZIP_ST
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  if (p->mtMode)
-+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-+  #else
-+  pp = pp;
-+  #endif
-+}
-+
-+typedef struct
-+{
-+  ISeqOutStream funcTable;
-+  Byte *data;
-+  SizeT rem;
-+  Bool overflow;
-+} CSeqOutStreamBuf;
-+
-+static size_t MyWrite(void *pp, const void *data, size_t size)
-+{
-+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-+  if (p->rem < size)
-+  {
-+    size = p->rem;
-+    p->overflow = True;
-+  }
-+  memcpy(p->data, data, size);
-+  p->rem -= size;
-+  p->data += size;
-+  return size;
-+}
-+
-+
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+}
-+
-+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+}
-+
-+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  UInt64 nowPos64;
-+  SRes res;
-+  CSeqOutStreamBuf outStream;
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = False;
-+  p->finished = False;
-+  p->result = SZ_OK;
-+
-+  if (reInit)
-+    LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  nowPos64 = p->nowPos64;
-+  RangeEnc_Init(&p->rc);
-+  p->rc.outStream = &outStream.funcTable;
-+
-+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-+  
-+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+
-+  return res;
-+}
-+
-+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-+{
-+  SRes res = SZ_OK;
-+
-+  #ifndef _7ZIP_ST
-+  Byte allocaDummy[0x300];
-+  int i = 0;
-+  for (i = 0; i < 16; i++)
-+    allocaDummy[i] = (Byte)i;
-+  #endif
-+
-+  for (;;)
-+  {
-+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-+    if (res != SZ_OK || p->finished != 0)
-+      break;
-+    if (progress != 0)
-+    {
-+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-+      if (res != SZ_OK)
-+      {
-+        res = SZ_ERROR_PROGRESS;
-+        break;
-+      }
-+    }
-+  }
-+  LzmaEnc_Finish(p);
-+  return res;
-+}
-+
-+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-+}
-+
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  int i;
-+  UInt32 dictSize = p->dictSize;
-+  if (*size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_PARAM;
-+  *size = LZMA_PROPS_SIZE;
-+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-+
-+  for (i = 11; i <= 30; i++)
-+  {
-+    if (dictSize <= ((UInt32)2 << i))
-+    {
-+      dictSize = (2 << i);
-+      break;
-+    }
-+    if (dictSize <= ((UInt32)3 << i))
-+    {
-+      dictSize = (3 << i);
-+      break;
-+    }
-+  }
-+
-+  for (i = 0; i < 4; i++)
-+    props[1 + i] = (Byte)(dictSize >> (8 * i));
-+  return SZ_OK;
-+}
-+
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  SRes res;
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+
-+  CSeqOutStreamBuf outStream;
-+
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = writeEndMark;
-+
-+  p->rc.outStream = &outStream.funcTable;
-+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-+  if (res == SZ_OK)
-+    res = LzmaEnc_Encode2(p, progress);
-+
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+  return res;
-+}
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-+  SRes res;
-+  if (p == 0)
-+    return SZ_ERROR_MEM;
-+
-+  res = LzmaEnc_SetProps(p, props);
-+  if (res == SZ_OK)
-+  {
-+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-+    if (res == SZ_OK)
-+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-+          writeEndMark, progress, alloc, allocBig);
-+  }
-+
-+  LzmaEnc_Destroy(p, alloc, allocBig);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/Makefile
-@@ -0,0 +1,7 @@
-+lzma_compress-objs := LzFind.o LzmaEnc.o
-+lzma_decompress-objs := LzmaDec.o
-+
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
-+
-+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbbd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch
deleted file mode 100644
index 77ab405439..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash.patch
deleted file mode 100644
index 7010d367b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/014-samsung_flash.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
- static void cfi_fixup_major_minor(struct cfi_private *cfi,
- 				  struct cfi_pri_amdstd *extp)
- {
-+	// manufacturers defined in include/linux/mtd/cfi.h
-+
- 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- 	    extp->MajorVersion == '0')
- 		extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 	mtd->name    = map->name;
- 	mtd->writesize = 1;
- 
-+	printk(" CFI mfr 0x%08x\n", cfi->mfr);	// TODO: Is there a more general place to print this info?
-+	printk(" CFI id  0x%08x\n", cfi->id);
-+
- 	if (cfi->cfi_mode==CFI_MODE_CFI){
- 		unsigned char bootloc;
- 		/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		cfi_fixup_major_minor(cfi, extp);
- 
--		if (extp->MajorVersion != '1' ||
--		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
-+		// valid primary extension versions are: 1.0, 1.1, 1.2, 1.3
-+		// see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on
-+		//      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
-+		if (extp->MajorVersion < '1' ||
-+		    extp->MajorVersion > '1' ||
-+		    (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {
- 			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
-+			       "version %c.%c (0x%02x/0x%02x).\n",
-+			       extp->MajorVersion, extp->MinorVersion,
-+			       extp->MajorVersion, extp->MinorVersion);
- 			kfree(extp);
- 			kfree(mtd);
- 			return NULL;
- 		}
- 
-+		printk("  Amd/Fujitsu Extended Query version %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		/* Install our own private info structure */
- 		cfi->cmdset_priv = extp;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
deleted file mode 100644
index 111d69b4d9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,54 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+#include <asm/bootinfo.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	const char		*mach_id;
-+	const char		*mach_name;
-+	void			(*mach_setup)(void);
-+};
-+
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
-+static struct mips_machine machine_##_type			\
-+		__used __section(.mips.machines.init) =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_id	= machine_id_##_type,			\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};
-+
-+extern long __mips_machines_start;
-+extern long __mips_machines_end;
-+
-+#ifdef CONFIG_MIPS_MACHINE
-+int  mips_machtype_setup(char *id) __init;
-+void mips_machine_setup(void) __init;
-+void mips_set_machine_name(const char *name) __init;
-+char *mips_get_machine_name(void);
-+#else
-+static inline int mips_machtype_setup(char *id) { return 1; }
-+static inline void mips_machine_setup(void) { }
-+static inline void mips_set_machine_name(const char *name) { }
-+static inline char *mips_get_machine_name(void) { return NULL; }
-+#endif /* CONFIG_MIPS_MACHINE */
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,86 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+
-+#include <asm/mips_machine.h>
-+
-+static struct mips_machine *mips_machine __initdata;
-+static char *mips_machine_name = "Unknown";
-+
-+#define for_each_machine(mach) \
-+	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
-+	     (mach) && \
-+	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
-+	     (mach)++)
-+
-+__init void mips_set_machine_name(const char *name)
-+{
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	p = kstrdup(name, GFP_KERNEL);
-+	if (!p)
-+		pr_err("MIPS: no memory for machine_name\n");
-+
-+	mips_machine_name = p;
-+}
-+
-+char *mips_get_machine_name(void)
-+{
-+	return mips_machine_name;
-+}
-+
-+__init int mips_machtype_setup(char *id)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, id) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
-+	pr_err("%-24s : %s\n", "id", "name");
-+	for_each_machine(mach)
-+		pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+__init void mips_machine_setup(void)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mips_machtype == mach->mach_type) {
-+			mips_machine = mach;
-+			break;
-+		}
-+	}
-+
-+	if (!mips_machine)
-+		return;
-+
-+	mips_set_machine_name(mips_machine->mach_name);
-+	pr_info("MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mips_machine->mach_setup)
-+		mips_machine->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -93,6 +93,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- 
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -851,6 +851,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+		if (mips_get_machine_name())
-+			seq_printf(m, "machine\t\t\t: %s\n",
-+				   mips_get_machine_name());
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -98,6 +98,13 @@ SECTIONS
- 	INIT_TEXT_SECTION(PAGE_SIZE)
- 	INIT_DATA_SECTION(16)
- 
-+	. = ALIGN(4);
-+	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-+		__mips_machines_start = .;
-+		*(.mips.machines.init)
-+		__mips_machines_end = .;
-+	}
-+
- 	/* .exit.text is discarded at runtime, not link time, to deal with
- 	 * references from .rodata
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index 00de8d5450..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -854,6 +854,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch
deleted file mode 100644
index e6b764e2df..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -839,6 +839,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -58,7 +58,11 @@
- #define __mips 4
- 
- /* Function which emulates a floating point instruction. */
-+#ifdef CONFIG_DEBUG_FS
-+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
-+#endif
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- 	mips_instruction);
- 
-@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
--#ifdef CONFIG_DEBUG_FS
--DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
--#endif
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
--
- #ifdef CONFIG_DEBUG_FS
- 
- static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void)
- 	return 0;
- }
- __initcall(debugfs_fpuemu);
--#endif
-+#endif /* CONFIG_DEBUGFS */
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch
deleted file mode 100644
index 024e7f16cd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch
deleted file mode 100644
index c56fbb79d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef SYMBOL_PREFIX
- #define VMLINUX_SYMBOL(sym) sym
- #else
-@@ -258,35 +279,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -327,7 +348,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -642,6 +663,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -194,16 +194,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23cb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
deleted file mode 100644
index 492d46d4d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1905,7 +1906,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2537,6 +2540,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
- 			  struct pci_fixup *end)
diff --git a/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index 60027948eb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -802,3 +802,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -185,3 +185,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch
deleted file mode 100644
index 59c31e7f33..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/055-lzma_arm_kernel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Fri, 16 Oct 2009 16:17:22 +0200
-Subject: [PATCH] Add LZMA decompression on ARM
-
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
----
- arch/arm/Kconfig                      |    1 +
- arch/arm/boot/compressed/Makefile     |    1 +
- arch/arm/boot/compressed/misc.c       |    4 ++++
- arch/arm/boot/compressed/piggy.lzma.S |    6 ++++++
- 4 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -20,6 +20,7 @@ config ARM
- 	select HAVE_GENERIC_DMA_COHERENT
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_LZO
-+	select HAVE_KERNEL_LZMA
- 	help
- 	  The ARM series is a line of low-power-consumption RISC chip designs
- 	  licensed by ARM Ltd and targeted at embedded applications and
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
- 
- suffix_$(CONFIG_KERNEL_GZIP) = gzip
- suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+suffix_$(CONFIG_KERNEL_LZMA)  = lzma
- 
- targets       := vmlinux vmlinux.lds \
- 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
---- a/arch/arm/boot/compressed/misc.c
-+++ b/arch/arm/boot/compressed/misc.c
-@@ -248,6 +248,10 @@ static unsigned long free_mem_end_ptr;
- #include "../../../../lib/decompress_inflate.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZMA
-+#include "../../../../lib/decompress_unlzma.c"
-+#endif
-+
- #ifdef CONFIG_KERNEL_LZO
- #include "../../../../lib/decompress_unlzo.c"
- #endif
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
deleted file mode 100644
index 8feec96a19..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -637,6 +637,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch
deleted file mode 100644
index 22b3f5e900..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -210,52 +246,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -263,17 +276,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -297,6 +391,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch
deleted file mode 100644
index b2b1a347f4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -268,6 +268,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 16ce76ce8c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		err = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee88..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index f630059e87..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 54cc6bbe50..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 607430bb2d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
diff --git a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 2f6d89927c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
- 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
- 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+	{ "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel and SST serial flash tend to power
-+	 * Atmel, SST and Intel/Numonyx serial flash tend to power
- 	 * up with the software protection bits set
- 	 */
- 
- 	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89 ||
- 	    info->jedec_id >> 16 == 0xbf) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
diff --git a/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 8d32ec2c5e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -706,6 +706,7 @@ static const struct spi_device_id m25p_i
- 	{ "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
- 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
- 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
- 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
- 
- 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch b/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch
deleted file mode 100644
index d5889ce62d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/088-winbond_cmdset.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/chips/gen_probe.c
-+++ b/drivers/mtd/chips/gen_probe.c
-@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
- #endif
- #ifdef CONFIG_MTD_CFI_AMDSTD
- 	case 0x0002:
-+	case 0x0006:
- 		return cfi_cmdset_0002(map, primary);
- #endif
- #ifdef CONFIG_MTD_CFI_STAA
diff --git a/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch
deleted file mode 100644
index 46923358b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -327,9 +327,32 @@ static void cfi_fixup_major_minor(struct
- {
- 	// manufacturers defined in include/linux/mtd/cfi.h
- 
--	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
--	    extp->MajorVersion == '0')
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '0') {
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		extp->MajorVersion = '1';
-+		extp->MinorVersion = '0';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
-+
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '3' && extp->MinorVersion == '3') {
-+		printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+		       "should be compatibile with Amd/Fujitsu.\n");
-+
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
-+		extp->MajorVersion = '1';	// set to 1.3 (last defined version)
-+		extp->MinorVersion = '3';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
- }
- 
- struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
diff --git a/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index be7d97fe12..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -858,6 +858,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -171,6 +171,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
deleted file mode 100644
index e99c6db4d1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -88,6 +88,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP) ||
- 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -138,13 +141,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -154,6 +179,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -196,7 +223,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-@@ -321,8 +347,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -339,13 +385,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -992,6 +1031,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
- 			goto free_counters;
- 		}
- 
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
-+
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
- 		     i += m->u.match_size) {
diff --git a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
deleted file mode 100644
index c078e37e61..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1337 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,632 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *             2009/09/26 - (Jussi Kivilinna)
-+ *              - Add imq_nf_reinject_lockless to fix deadlock with
-+ *                imq_nf_queue/imq_nf_reinject.
-+ *
-+ *             2009/12/08 - (Jussi Kivilinna)
-+ *              - Port to 2.6.32
-+ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
-+ *              - Also add better error checking for skb->nf_queue_entry usage
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+						unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		nf_reinject(entry, verdict);
-+		return;
-+	}
-+
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+	dev->trans_start = jiffies;
-+
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	if (entry == NULL) {
-+		/* We don't know what is going on here.. packet is queued for
-+		 * imq device, but (probably) not by us.
-+		 *
-+		 * If this packet was not send here by imq_nf_queue(), then
-+		 * skb_save_cb() was not used and skb_free() should not show:
-+		 *   WARNING: IMQ: kfree_skb: skb->cb_next:..
-+		 * and/or
-+		 *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
-+		 *
-+		 * However if this message is shown, then IMQ is somehow broken
-+		 * and you should report this to linuximq.net.
-+		 */
-+
-+		/* imq_dev_xmit is black hole that eats all packets, report that
-+		 * we eat this packet happily and increase dropped counters.
-+		 */
-+
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	imq_nf_reinject(entry, NF_ACCEPT);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject_lockless(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		skb->nf_queue_entry = NULL;
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -165,6 +165,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1168,6 +1168,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice_queue(struct net_device *dev,
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -323,6 +326,10 @@ struct sk_buff {
- 	char			cb[48] __aligned(8);
- 
- 	unsigned long		_skb_dst;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void			*cb_next;
-+#endif
-+
- #ifdef CONFIG_XFRM
- 	struct	sec_path	*sp;
- #endif
-@@ -357,6 +364,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -378,6 +388,10 @@ struct sk_buff {
- 
- 	/* 0/14 bit hole */
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
-+
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
- #endif
-@@ -426,6 +440,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1970,6 +1990,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -97,6 +97,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1810,7 +1813,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc = NETDEV_TX_OK;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1912,8 +1919,7 @@ static inline u16 dev_cap_txqueue(struct
- 	return queue_index;
- }
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	u16 queue_index;
- 	struct sock *sk = skb->sk;
-@@ -1939,6 +1945,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- 				 struct net_device *dev,
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
-+{
-+	struct skb_cb_table *next;
-+	struct sk_buff *old;
-+
-+	if (!__old->cb_next) {
-+		new->cb_next = NULL;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	old = (struct sk_buff *)__old;
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
-+				"%08x\n", (unsigned int)skb->cb_next);
-+
-+		skb_restore_cb(skb);
-+	}
-+	/* This should not happen either, nf_queue_entry is nullified in
-+	 * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
-+	 * leaking entry pointers, maybe memory. We don't know if this is
-+	 * pointer to already freed memory, or should this be freed.
-+	 * If this happens we need to add refcounting, etc for nf_queue_entry.
-+	 */
-+	if (skb->nf_queue_entry && net_ratelimit())
-+		printk(KERN_WARNING
-+				"IMQ: kfree_skb: skb->nf_queue_entry != NULL");
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -538,6 +638,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2882,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -396,6 +396,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMAR
- obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch
deleted file mode 100644
index fc00d159c3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -505,7 +504,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch
deleted file mode 100644
index 29e82084ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch
deleted file mode 100644
index 1d513580b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
deleted file mode 100644
index 6ea9ba51ee..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
deleted file mode 100644
index 0c1ae72a4e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
deleted file mode 100644
index 0928464ec9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1373,11 +1373,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1467,9 +1474,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1552,7 +1559,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch
deleted file mode 100644
index 0cbf4ed32b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
- endif
- 
- ifndef CONFIG_FUNCTION_TRACER
--cflags-y := -ffunction-sections
-+  ifndef CONFIG_PROFILING
-+    cflags-y := -ffunction-sections
-+  endif
- endif
- ifdef CONFIG_FUNCTION_GRAPH_TRACER
-   ifndef KBUILD_MCOUNT_RA_ADDRESS
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
deleted file mode 100644
index b2625cd269..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/209-mini_fo.patch
+++ /dev/null
@@ -1,7782 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -180,6 +180,7 @@ source "fs/ubifs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index d71e3b6faa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index 8bd9ba3244..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch
deleted file mode 100644
index 7e00b224cc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch
deleted file mode 100644
index fb3df254dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -8,7 +8,7 @@ config SND_PCM
- 	select GCD
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index aefbe18755..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1165,7 +1165,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8be..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch
deleted file mode 100644
index 0cf56c02b6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -29,6 +29,8 @@ struct sockaddr_ll {
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -46,6 +48,7 @@ struct sockaddr_ll {
- #define PACKET_RESERVE			12
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
-+#define PACKET_RECV_TYPE		15
- 
- struct tpacket_stats {
- 	unsigned int	tp_packets;
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -205,6 +205,7 @@ struct packet_sock {
- 	unsigned int		tp_loss:1;
- #endif
- 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
-+	__u8			pkt_type:3;
- };
- 
- struct packet_skb_cb {
-@@ -343,6 +344,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -350,6 +352,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -362,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -538,12 +541,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -659,12 +662,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -1386,6 +1389,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1731,6 +1735,16 @@ packet_setsockopt(struct socket *sock, i
- 			ret = packet_mc_drop(sk, &mreq);
- 		return ret;
- 	}
-+	case PACKET_RECV_TYPE:
-+	{
-+		unsigned int val;
-+		if (optlen != sizeof(val))
-+			return -EINVAL;
-+		if (copy_from_user(&val, optval, sizeof(val)))
-+			return -EFAULT;
-+		po->pkt_type = val & ~PACKET_LOOPBACK;
-+		return 0;
-+	}
- 
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_RX_RING:
-@@ -1876,6 +1890,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- #ifdef CONFIG_PACKET_MMAP
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
diff --git a/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
deleted file mode 100644
index a2535db60e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.33/251-atm.patch b/target/linux/generic-2.6/patches-2.6.33/251-atm.patch
deleted file mode 100644
index 238d6f81c4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/251-atm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/linux/atm.h
-+++ b/include/linux/atm.h
-@@ -139,6 +139,9 @@ struct atm_trafprm {
- 	int		min_pcr;	/* minimum PCR in cells per second */
- 	int		max_cdv;	/* maximum CDV in microseconds */
- 	int		max_sdu;	/* maximum SDU in bytes */
-+	int		scr;		/* sustained rate in cells per second */
-+	int		mbs;		/* maximum burst size (MBS) in cells */
-+	int		cdv;		/* Cell delay varition */
-         /* extra params for ABR */
-         unsigned int 	icr;         	/* Initial Cell Rate (24-bit) */
-         unsigned int	tbe;		/* Transient Buffer Exposure (24-bit) */ 
diff --git a/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch
deleted file mode 100644
index 3b28502a64..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2359,8 +2361,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2415,5 +2420,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
deleted file mode 100644
index 855b3dee53..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -337,4 +337,8 @@ config LEDS_TRIGGER_DEFAULT_ON
- comment "iptables trigger is under Netfilter config (LED target)"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
deleted file mode 100644
index be1e0cbd7a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -341,4 +341,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -45,3 +45,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch
deleted file mode 100644
index b762ddea5d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -319,4 +319,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -30,4 +30,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/411-add-KEY_WPS_BUTTON-definition.patch b/target/linux/generic-2.6/patches-2.6.33/411-add-KEY_WPS_BUTTON-definition.patch
deleted file mode 100644
index c2b68e79bb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/411-add-KEY_WPS_BUTTON-definition.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 492d4f25416528ffb900e6edf0fd70eafd098cfc Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Fri, 26 Feb 2010 00:16:05 -0800
-Subject: [PATCH] Input: add KEY_WPS_BUTTON definition
-
-The new key definition is supposed to be used for buttons that initiate
-WiFi Protected setup sequence:
-
-	http://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup
-
-Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
----
- include/linux/input.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/include/linux/input.h
-+++ b/include/linux/input.h
-@@ -597,6 +597,7 @@ struct input_absinfo {
- #define KEY_NUMERIC_POUND	0x20b
- 
- #define KEY_CAMERA_FOCUS	0x210
-+#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
- 
- /* We avoid low common keys in module aliases so they don't get huge. */
- #define KEY_MIN_INTERESTING	KEY_MUTE
diff --git a/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch
deleted file mode 100644
index ebc430f3ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1016,6 +1016,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch
deleted file mode 100644
index 59e4333611..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch
deleted file mode 100644
index e490452e58..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/510-yaffs_support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
diff --git a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index 5c70e79a05..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch
deleted file mode 100644
index 966a812c0f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/600-phy_extension.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -352,7 +396,7 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
-+
- 		if (mii_data->reg_num == MII_BMCR &&
- 		    val & BMCR_RESET &&
- 		    phydev->drv->config_init) {
-@@ -466,7 +510,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -491,6 +491,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.33/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.33/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index 15a5e7ea6d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -379,9 +379,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -682,6 +682,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch
deleted file mode 100644
index b3e469a8d6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY
- 	---help---
- 	  Supports the LSI ET1011C PHY.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch
deleted file mode 100644
index 9c0f24aa17..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -844,6 +844,7 @@ struct net_device {
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index b86e259c8d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch
deleted file mode 100644
index 36551fd570..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -99,6 +99,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch
deleted file mode 100644
index a9452b3bbe..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -102,6 +102,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch
deleted file mode 100644
index 0566600a0e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -106,6 +106,10 @@ config IP17XX_PHY
- 	tristate "Driver for IC+ IP17xx switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch
deleted file mode 100644
index 36ce9dfce7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -110,6 +110,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch
deleted file mode 100644
index 80f4782c53..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -152,4 +152,29 @@ config MDIO_OCTEON
- 
- 	  If in doubt, say Y.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch
deleted file mode 100644
index dae807f40f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -608,6 +608,15 @@ config RTC_DRV_NUC900
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NUC910/NUC920 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch
deleted file mode 100644
index 419d98a424..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -76,6 +76,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index e6d06456a7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -914,7 +915,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1356,3 +1357,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch
deleted file mode 100644
index 8d90396761..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -807,7 +807,7 @@ static noinline int init_post(void)
- 	numa_default_policy();
- 
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch
deleted file mode 100644
index be31abeac6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -130,6 +130,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
deleted file mode 100644
index 7552ceb33d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2407,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -432,6 +432,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1476,23 +1476,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4056,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch
deleted file mode 100644
index c37bb2280f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -116,6 +116,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butt
- obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.o
- obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch
deleted file mode 100644
index cb39a705f2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -373,6 +373,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
- 
- obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2443,6 +2443,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
deleted file mode 100644
index 4cb3031db5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- 
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index 1708e33d01..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -210,7 +210,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
deleted file mode 100644
index 8fbd2a4dca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
-  */
- 
- #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch
deleted file mode 100644
index fd304613f7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -826,3 +826,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -85,6 +85,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.33/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.33/971-ocf_20100325.patch
deleted file mode 100644
index 0b0c1e279c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -387,6 +387,7 @@ struct task_struct *find_task_by_vpid(pi
- {
- 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.33/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.33/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.33/975-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.33/975-ssb_update.patch
deleted file mode 100644
index fbc8f517b0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/975-ssb_update.patch
+++ /dev/null
@@ -1,644 +0,0 @@
---- a/drivers/ssb/driver_chipcommon.c
-+++ b/drivers/ssb/driver_chipcommon.c
-@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
- {
- 	if (!cc->dev)
- 		return; /* We don't have a ChipCommon */
-+	if (cc->dev->id.revision >= 11)
-+		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
- 	ssb_pmu_init(cc);
- 	chipco_powercontrol_init(cc);
- 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
-@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
- {
- 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
- }
-+EXPORT_SYMBOL(ssb_chipco_gpio_control);
- 
- u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
- {
---- a/drivers/ssb/driver_chipcommon_pmu.c
-+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -332,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
- 	case 0x5354:
- 		ssb_pmu0_pllinit_r0(cc, crystalfreq);
- 		break;
-+	case 0x4322:
-+		if (cc->pmu.rev == 2) {
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
-+			chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
-+		}
-+		break;
- 	default:
- 		ssb_printk(KERN_ERR PFX
- 			   "ERROR: PLL init unknown for device %04X\n",
-@@ -417,6 +423,7 @@ static void ssb_pmu_resources_init(struc
- 
- 	switch (bus->chip_id) {
- 	case 0x4312:
-+	case 0x4322:
- 		/* We keep the default settings:
- 		 * min_msk = 0xCBB
- 		 * max_msk = 0x7FFFF
---- a/drivers/ssb/driver_mipscore.c
-+++ b/drivers/ssb/driver_mipscore.c
-@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 			}
- 			break;
--			/* fallthrough */
- 		case SSB_DEV_PCI:
- 		case SSB_DEV_ETHERNET:
- 		case SSB_DEV_ETHERNET_GBIT:
-@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
- 				set_irq(dev, irq++);
- 				break;
- 			}
-+			/* fallthrough */
-+		case SSB_DEV_EXTIF:
-+			set_irq(dev, 0);
-+			break;
- 		}
- 	}
- 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore
- 	.pci_ops	= &ssb_pcicore_pciops,
- 	.io_resource	= &ssb_pcicore_io_resource,
- 	.mem_resource	= &ssb_pcicore_mem_resource,
--	.mem_offset	= 0x24000000,
- };
- 
--static u32 ssb_pcicore_pcibus_iobase = 0x100;
--static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
--
- /* This function is called when doing a pci_enable_device().
-  * We must first check if the device is a device on the PCI-core bridge. */
- int ssb_pcicore_plat_dev_init(struct pci_dev *d)
- {
--	struct resource *res;
--	int pos, size;
--	u32 *base;
--
- 	if (d->bus->ops != &ssb_pcicore_pciops) {
- 		/* This is not a device on the PCI-core bridge. */
- 		return -ENODEV;
-@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci
- 	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
- 		   pci_name(d));
- 
--	/* Fix up resource bases */
--	for (pos = 0; pos < 6; pos++) {
--		res = &d->resource[pos];
--		if (res->flags & IORESOURCE_IO)
--			base = &ssb_pcicore_pcibus_iobase;
--		else
--			base = &ssb_pcicore_pcibus_membase;
--		res->flags |= IORESOURCE_PCI_FIXED;
--		if (res->end) {
--			size = res->end - res->start + 1;
--			if (*base & (size - 1))
--				*base = (*base + size) & ~(size - 1);
--			res->start = *base;
--			res->end = res->start + size - 1;
--			*base += size;
--			pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
--		}
--		/* Fix up PCI bridge BAR0 only */
--		if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
--			break;
--	}
- 	/* Fix up interrupt lines */
- 	d->irq = ssb_mips_irq(extpci_core->dev) + 2;
- 	pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -833,6 +833,9 @@ int ssb_bus_pcibus_register(struct ssb_b
- 	if (!err) {
- 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
- 			   "PCI device %s\n", dev_name(&host_pci->dev));
-+	} else {
-+		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
-+			   " of SSB with error %d\n", err);
- 	}
- 
- 	return err;
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -167,7 +167,7 @@ err_pci:
- }
- 
- /* Get the word-offset for a SSB_SPROM_XXX define. */
--#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
-+#define SPOFF(offset)	((offset) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
- #define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-@@ -253,7 +253,7 @@ static int sprom_do_read(struct ssb_bus 
- 	int i;
- 
- 	for (i = 0; i < bus->sprom_size; i++)
--		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
- 
- 	return 0;
- }
-@@ -284,7 +284,7 @@ static int sprom_do_write(struct ssb_bus
- 			ssb_printk("75%%");
- 		else if (i % 2)
- 			ssb_printk(".");
--		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
- 		mmiowb();
- 		msleep(20);
- 	}
-@@ -620,6 +620,14 @@ static int ssb_pci_sprom_get(struct ssb_
- 	int err = -ENOMEM;
- 	u16 *buf;
- 
-+	if (!ssb_is_sprom_available(bus)) {
-+		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
-+		return -ENODEV;
-+	}
-+
-+	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
-+		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
-+
- 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
- 	if (!buf)
- 		goto out;
---- a/drivers/ssb/sprom.c
-+++ b/drivers/ssb/sprom.c
-@@ -175,3 +175,17 @@ const struct ssb_sprom *ssb_get_fallback
- {
- 	return fallback_sprom;
- }
-+
-+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
-+bool ssb_is_sprom_available(struct ssb_bus *bus)
-+{
-+	/* status register only exists on chipcomon rev >= 11 and we need check
-+	   for >= 31 only */
-+	/* this routine differs from specs as we do not access SPROM directly
-+	   on PCMCIA */
-+	if (bus->bustype == SSB_BUSTYPE_PCI &&
-+	    bus->chipco.dev->id.revision >= 31)
-+		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
-+
-+	return true;
-+}
---- a/drivers/ssb/ssb_private.h
-+++ b/drivers/ssb/ssb_private.h
-@@ -196,7 +196,7 @@ extern int ssb_devices_thaw(struct ssb_f
- #ifdef CONFIG_SSB_B43_PCI_BRIDGE
- extern int __init b43_pci_ssb_bridge_init(void);
- extern void __exit b43_pci_ssb_bridge_exit(void);
--#else /* CONFIG_SSB_B43_PCI_BRIDGR */
-+#else /* CONFIG_SSB_B43_PCI_BRIDGE */
- static inline int b43_pci_ssb_bridge_init(void)
- {
- 	return 0;
-@@ -204,6 +204,6 @@ static inline int b43_pci_ssb_bridge_ini
- static inline void b43_pci_ssb_bridge_exit(void)
- {
- }
--#endif /* CONFIG_SSB_PCIHOST */
-+#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
- 
- #endif /* LINUX_SSB_PRIVATE_H_ */
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -305,6 +305,7 @@ struct ssb_bus {
- 	/* ID information about the Chip. */
- 	u16 chip_id;
- 	u16 chip_rev;
-+	u16 sprom_offset;
- 	u16 sprom_size;		/* number of words in sprom */
- 	u8 chip_package;
- 
-@@ -394,6 +395,9 @@ extern int ssb_bus_sdiobus_register(stru
- 
- extern void ssb_bus_unregister(struct ssb_bus *bus);
- 
-+/* Does the device have an SPROM? */
-+extern bool ssb_is_sprom_available(struct ssb_bus *bus);
-+
- /* Set a fallback SPROM.
-  * See kdoc at the function definition for complete documentation. */
- extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -53,6 +53,7 @@
- #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
- #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
- #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
-+#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
- #define SSB_CHIPCO_CORECTL		0x0008
- #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
- #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
-@@ -385,6 +386,7 @@
- 
- 
- /** Chip specific Chip-Status register contents. */
-+#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
- #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
- #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
- #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
-@@ -398,6 +400,18 @@
- #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
- #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
- 
-+/** Macros to determine SPROM presence based on Chip-Status register. */
-+#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
-+	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL)
-+#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
-+	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
-+#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
-+	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
-+	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL))
-+
- 
- 
- /** Clockcontrol masks and values **/
-@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
- struct ssb_chipcommon {
- 	struct ssb_device *dev;
- 	u32 capabilities;
-+	u32 status;
- 	/* Fast Powerup Delay constant */
- 	u16 fast_pwrup_delay;
- 	struct ssb_chipcommon_pmu pmu;
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -170,26 +170,27 @@
- #define SSB_SPROMSIZE_WORDS_R4		220
- #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
- #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
--#define SSB_SPROM_BASE			0x1000
--#define SSB_SPROM_REVISION		0x107E
-+#define SSB_SPROM_BASE1			0x1000
-+#define SSB_SPROM_BASE31		0x0800
-+#define SSB_SPROM_REVISION		0x007E
- #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
- #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
- #define  SSB_SPROM_REVISION_CRC_SHIFT	8
- 
- /* SPROM Revision 1 */
--#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
--#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
--#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
--#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
--#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
--#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
-+#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
-+#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
-+#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
-+#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
-+#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
-+#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
- #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM1_BINF			0x105C	/* Board info */
-+#define SSB_SPROM1_BINF			0x005C	/* Board info */
- #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
- #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
- #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
-@@ -197,63 +198,63 @@
- #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
- #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
- #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
--#define SSB_SPROM1_PA0B0		0x105E
--#define SSB_SPROM1_PA0B1		0x1060
--#define SSB_SPROM1_PA0B2		0x1062
--#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
-+#define SSB_SPROM1_PA0B0		0x005E
-+#define SSB_SPROM1_PA0B1		0x0060
-+#define SSB_SPROM1_PA0B2		0x0062
-+#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
- #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
--#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
-+#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
- #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
--#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
-+#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
- #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
--#define SSB_SPROM1_PA1B0		0x106A
--#define SSB_SPROM1_PA1B1		0x106C
--#define SSB_SPROM1_PA1B2		0x106E
--#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
-+#define SSB_SPROM1_PA1B0		0x006A
-+#define SSB_SPROM1_PA1B1		0x006C
-+#define SSB_SPROM1_PA1B2		0x006E
-+#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
- #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
- #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_ITSSI_A_SHIFT	8
--#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
--#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
- #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
- #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_AGAIN_A_SHIFT	8
- 
- /* SPROM Revision 2 (inherits from rev 1) */
--#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
--#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
-+#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
-+#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
- #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
- #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
- #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
--#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
-+#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
- #define  SSB_SPROM2_OPO_VALUE		0x00FF
- #define  SSB_SPROM2_OPO_UNUSED		0xFF00
--#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
-+#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
- 
- /* SPROM Revision 3 (inherits most data from rev 2) */
--#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
- #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
- #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
- #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
- #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
--#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
-+#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
- #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
-@@ -264,100 +265,100 @@
- #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
- 
- /* SPROM Revision 4 */
--#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
-+#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
-+#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
-+#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
- #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
--#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
--#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
--#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
--#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
--#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
-+#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
-+#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
-+#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM4_AGAIN0_SHIFT	0
- #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM4_AGAIN1_SHIFT	8
--#define SSB_SPROM4_AGAIN23		0x1060
-+#define SSB_SPROM4_AGAIN23		0x0060
- #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM4_AGAIN2_SHIFT	0
- #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM4_AGAIN3_SHIFT	8
--#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
--#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
-+#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
- #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
- #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
--#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
-+#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
- #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
- #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM4_ITSSI_A_SHIFT	8
--#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
--#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
--#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
--#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
--#define SSB_SPROM4_PA0B2		0x1086
--#define SSB_SPROM4_PA1B0		0x108E
--#define SSB_SPROM4_PA1B1		0x1090
--#define SSB_SPROM4_PA1B2		0x1092
-+#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
-+#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
-+#define SSB_SPROM4_PA0B2		0x0086
-+#define SSB_SPROM4_PA1B0		0x008E
-+#define SSB_SPROM4_PA1B1		0x0090
-+#define SSB_SPROM4_PA1B2		0x0092
- 
- /* SPROM Revision 5 (inherits most data from rev 4) */
--#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
--#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
--#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
--#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
-+#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
-+#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
-+#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
- #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
--#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
-+#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
- #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
--#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
--#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
--#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
--#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
--#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
--#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
--#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
--#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
--#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
-+#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
-+#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
-+#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
-+#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
-+#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
-+#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM8_AGAIN0_SHIFT	0
- #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM8_AGAIN1_SHIFT	8
--#define SSB_SPROM8_AGAIN23		0x10A0
-+#define SSB_SPROM8_AGAIN23		0x00A0
- #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM8_AGAIN2_SHIFT	0
- #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM8_AGAIN3_SHIFT	8
--#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
--#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
-+#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
- #define  SSB_SPROM8_RSSISMF2G		0x000F
- #define  SSB_SPROM8_RSSISMC2G		0x00F0
- #define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-@@ -365,7 +366,7 @@
- #define  SSB_SPROM8_RSSISAV2G_SHIFT	8
- #define  SSB_SPROM8_BXA2G		0x1800
- #define  SSB_SPROM8_BXA2G_SHIFT		11
--#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
-+#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
- #define  SSB_SPROM8_RSSISMF5G		0x000F
- #define  SSB_SPROM8_RSSISMC5G		0x00F0
- #define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-@@ -373,47 +374,47 @@
- #define  SSB_SPROM8_RSSISAV5G_SHIFT	8
- #define  SSB_SPROM8_BXA5G		0x1800
- #define  SSB_SPROM8_BXA5G_SHIFT		11
--#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
-+#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
- #define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
- #define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
- #define  SSB_SPROM8_TRI5G_SHIFT		8
--#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
-+#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
- #define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
- #define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
- #define  SSB_SPROM8_TRI5GH_SHIFT	8
--#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
-+#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
- #define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
-+#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
- #define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
--#define SSB_SPROM8_PA0B1		0x10C4
--#define SSB_SPROM8_PA0B2		0x10C6
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
-+#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x00C4
-+#define SSB_SPROM8_PA0B2		0x00C6
-+#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
- #define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
--#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
-+#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
- #define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
- #define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
- #define  SSB_SPROM8_MAXP_AL_SHIFT	8
--#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
--#define SSB_SPROM8_PA1B1		0x10CE
--#define SSB_SPROM8_PA1B2		0x10D0
--#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
--#define SSB_SPROM8_PA1LOB1		0x10D4
--#define SSB_SPROM8_PA1LOB2		0x10D6
--#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
--#define SSB_SPROM8_PA1HIB1		0x10DA
--#define SSB_SPROM8_PA1HIB2		0x10DC
--#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
--#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
-+#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x00CE
-+#define SSB_SPROM8_PA1B2		0x00D0
-+#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x00D4
-+#define SSB_SPROM8_PA1LOB2		0x00D6
-+#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x00DA
-+#define SSB_SPROM8_PA1HIB2		0x00DC
-+#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
diff --git a/target/linux/generic-2.6/patches-2.6.33/976-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.33/976-ssb_add_dma_dev.patch
deleted file mode 100644
index 072df895be..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/976-ssb_add_dma_dev.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-
-Add dma_dev, a pointer to struct device, to struct ssb_device.  We pass it
-to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB. 
-ssb_devices_register() sets up it properly.
-
-This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
-with the generic DMA API.
-
-Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-Acked-by: Michael Buesch <mb@bu3sch.de>
-Cc: Gary Zambrano <zambrano@broadcom.com>
-Cc: Stefano Brivio <stefano.brivio@polimi.it>
-Cc: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: John W. Linville <linville@tuxdriver.com>
-Acked-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
- drivers/ssb/main.c      |    2 ++
- include/linux/ssb/ssb.h |    2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -485,6 +485,7 @@ static int ssb_devices_register(struct s
- #ifdef CONFIG_SSB_PCIHOST
- 			sdev->irq = bus->host_pci->irq;
- 			dev->parent = &bus->host_pci->dev;
-+			sdev->dma_dev = dev->parent;
- #endif
- 			break;
- 		case SSB_BUSTYPE_PCMCIA:
-@@ -500,6 +501,7 @@ static int ssb_devices_register(struct s
- 			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
-+			sdev->dma_dev = dev;
- 			break;
- 		}
- 
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -167,7 +167,7 @@ struct ssb_device {
- 	 * is an optimization. */
- 	const struct ssb_bus_ops *ops;
- 
--	struct device *dev;
-+	struct device *dev, *dma_dev;
- 
- 	struct ssb_bus *bus;
- 	struct ssb_device_id id;
diff --git a/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index d2e41fe9ab..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config HAS_IOMEM
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index 05bb838c19..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -141,13 +141,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea96..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
deleted file mode 100644
index 2c3a55201b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -29,6 +29,7 @@
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/swap.h>
-+#include <linux/ima.h>
- 
- static struct vfsmount *shm_mnt;
- 
-@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -508,6 +508,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
- 		free_fdtable(fdt);
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -169,6 +169,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -6171,6 +6171,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1115,6 +1115,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2501,6 +2502,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -725,6 +725,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1104,6 +1104,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
deleted file mode 100644
index daac5898ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--	bool
-+	bool "Wireless extensions"
- 
- config WEXT_CORE
- 	def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
- 	depends on WEXT_CORE
- 
- config WEXT_SPY
--	bool
-+	bool "WEXT_SPY"
- 
- config WEXT_PRIV
--	bool
-+	bool "WEXT_PRIV"
- 
- config CFG80211
- 	tristate "cfg80211 - wireless configuration API"
diff --git a/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb777809..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch
deleted file mode 100644
index 450986538d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/997-lzo_decompressor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -75,7 +75,7 @@ config RD_LZMA
- config RD_LZO
- 	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
- 	default !EMBEDDED
--	depends on BLK_DEV_INITRD
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
- 	select DECOMPRESS_LZO
- 	help
- 	  Support loading of a LZO encoded initial ramdisk or cpio buffer
diff --git a/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
deleted file mode 100644
index 0ac880caea..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch
deleted file mode 100644
index c1f8ef075e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.33/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -831,10 +831,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel.");
- }
diff --git a/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch
deleted file mode 100644
index 29d507eb4a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,3 +5,4 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,152 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+#include <linux/slab.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index c1a105d0dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -63,8 +63,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -87,7 +85,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
- 	select LZO_DECOMPRESS
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/008-jffs2_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.34/008-jffs2_make_lzma_available.patch
deleted file mode 100644
index 5ab2e72928..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/008-jffs2_make_lzma_available.patch
+++ /dev/null
@@ -1,5142 +0,0 @@
---- a/fs/jffs2/Kconfig
-+++ b/fs/jffs2/Kconfig
-@@ -139,6 +139,15 @@ config JFFS2_LZO
- 	  This feature was added in July, 2007. Say 'N' if you need
- 	  compatibility with older bootloaders or kernels.
- 
-+config JFFS2_LZMA
-+	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
-+	select LZMA_COMPRESS
-+	select LZMA_DECOMPRESS
-+	depends on JFFS2_FS
-+	default n
-+	help
-+	  JFFS2 wrapper to the LZMA C SDK
-+
- config JFFS2_RTIME
- 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
- 	depends on JFFS2_FS
---- a/fs/jffs2/Makefile
-+++ b/fs/jffs2/Makefile
-@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
- jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
- jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
- jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
-+jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
- jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
-+
-+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
---- a/fs/jffs2/compr.c
-+++ b/fs/jffs2/compr.c
-@@ -319,6 +319,9 @@ int __init jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_init();
-+#endif
- /* Setting default compression mode */
- #ifdef CONFIG_JFFS2_CMODE_NONE
- 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void)
- int jffs2_compressors_exit(void)
- {
- /* Unregistering compressors */
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_exit();
-+#endif
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_exit();
- #endif
---- a/fs/jffs2/compr.h
-+++ b/fs/jffs2/compr.h
-@@ -28,9 +28,9 @@
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_LZARI_PRIORITY     30
- #define JFFS2_RTIME_PRIORITY     50
--#define JFFS2_ZLIB_PRIORITY      60
--#define JFFS2_LZO_PRIORITY       80
--
-+#define JFFS2_LZMA_PRIORITY      70
-+#define JFFS2_ZLIB_PRIORITY      80
-+#define JFFS2_LZO_PRIORITY       90
- 
- #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
- #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
-@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void);
- int jffs2_lzo_init(void);
- void jffs2_lzo_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+int jffs2_lzma_init(void);
-+void jffs2_lzma_exit(void);
-+#endif
- 
- #endif /* __JFFS2_COMPR_H__ */
---- /dev/null
-+++ b/fs/jffs2/compr_lzma.c
-@@ -0,0 +1,128 @@
-+/*
-+ * JFFS2 -- Journalling Flash File System, Version 2.
-+ *
-+ * For licensing information, see the file 'LICENCE' in this directory.
-+ *
-+ * JFFS2 wrapper to the LZMA C SDK
-+ *
-+ */
-+
-+#include <linux/lzma.h>
-+#include "compr.h"
-+
-+#ifdef __KERNEL__
-+	static DEFINE_MUTEX(deflate_mutex);
-+#endif
-+
-+CLzmaEncHandle *p;
-+Byte propsEncoded[LZMA_PROPS_SIZE];
-+SizeT propsSize = sizeof(propsEncoded);
-+
-+STATIC void lzma_free_workspace(void)
-+{
-+	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
-+}
-+
-+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
-+{
-+	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
-+	{
-+		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (LzmaEnc_SetProps(p, props) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+	
-+	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+
-+        return 0;
-+}
-+
-+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
-+			      uint32_t *sourcelen, uint32_t *dstlen, void *model)
-+{
-+	SizeT compress_size = (SizeT)(*dstlen);
-+	int ret;
-+
-+	#ifdef __KERNEL__
-+		mutex_lock(&deflate_mutex);
-+	#endif
-+
-+	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
-+		0, NULL, &lzma_alloc, &lzma_alloc);
-+
-+	#ifdef __KERNEL__
-+		mutex_unlock(&deflate_mutex);
-+	#endif
-+
-+	if (ret != SZ_OK)
-+		return -1;
-+
-+	*dstlen = (uint32_t)compress_size;
-+
-+	return 0;
-+}
-+
-+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+				 uint32_t srclen, uint32_t destlen, void *model)
-+{
-+	int ret;
-+	SizeT dl = (SizeT)destlen;
-+	SizeT sl = (SizeT)srclen;
-+	ELzmaStatus status;
-+	
-+	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
-+		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
-+
-+	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzma_comp = {
-+	.priority = JFFS2_LZMA_PRIORITY,
-+	.name = "lzma",
-+	.compr = JFFS2_COMPR_LZMA,
-+	.compress = &jffs2_lzma_compress,
-+	.decompress = &jffs2_lzma_decompress,
-+	.disabled = 0,
-+};
-+
-+int INIT jffs2_lzma_init(void)
-+{
-+        int ret;
-+	CLzmaEncProps props;
-+	LzmaEncProps_Init(&props);
-+
-+        props.dictSize = LZMA_BEST_DICT(0x2000);
-+        props.level = LZMA_BEST_LEVEL;
-+        props.lc = LZMA_BEST_LC;
-+        props.lp = LZMA_BEST_LP;
-+        props.pb = LZMA_BEST_PB;
-+        props.fb = LZMA_BEST_FB;
-+
-+	ret = lzma_alloc_workspace(&props);
-+        if (ret < 0)
-+                return ret;
-+
-+	ret = jffs2_register_compressor(&jffs2_lzma_comp);
-+	if (ret)
-+		lzma_free_workspace();
-+	
-+        return ret;
-+}
-+
-+void jffs2_lzma_exit(void)
-+{
-+	jffs2_unregister_compressor(&jffs2_lzma_comp);
-+	lzma_free_workspace();
-+}
---- a/fs/jffs2/super.c
-+++ b/fs/jffs2/super.c
-@@ -254,14 +254,41 @@ static int __init init_jffs2_fs(void)
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
- 
--	printk(KERN_INFO "JFFS2 version 2.2."
-+	printk(KERN_INFO "JFFS2 version 2.2"
- #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
- 	       " (NAND)"
- #endif
- #ifdef CONFIG_JFFS2_SUMMARY
--	       " (SUMMARY) "
-+	       " (SUMMARY)"
- #endif
--	       " © 2001-2006 Red Hat, Inc.\n");
-+#ifdef CONFIG_JFFS2_ZLIB
-+	       " (ZLIB)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZO
-+	       " (LZO)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZMA
-+	       " (LZMA)"
-+#endif
-+#ifdef CONFIG_JFFS2_RTIME
-+	       " (RTIME)"
-+#endif
-+#ifdef CONFIG_JFFS2_RUBIN
-+	       " (RUBIN)"
-+#endif
-+#ifdef  CONFIG_JFFS2_CMODE_NONE
-+	       " (CMODE_NONE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_PRIORITY
-+	       " (CMODE_PRIORITY)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_SIZE
-+	       " (CMODE_SIZE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
-+	       " (CMODE_FAVOURLZO)"
-+#endif
-+	       " (c) 2001-2006 Red Hat, Inc.\n");
- 
- 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
- 					     sizeof(struct jffs2_inode_info),
---- a/include/linux/jffs2.h
-+++ b/include/linux/jffs2.h
-@@ -45,6 +45,7 @@
- #define JFFS2_COMPR_DYNRUBIN	0x05
- #define JFFS2_COMPR_ZLIB	0x06
- #define JFFS2_COMPR_LZO		0x07
-+#define JFFS2_COMPR_LZMA	0x08
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
---- /dev/null
-+++ b/include/linux/lzma.h
-@@ -0,0 +1,62 @@
-+#ifndef __LZMA_H__
-+#define __LZMA_H__
-+
-+#ifdef __KERNEL__
-+	#include <linux/kernel.h>
-+	#include <linux/sched.h>
-+	#include <linux/slab.h>
-+	#include <linux/vmalloc.h>
-+	#include <linux/init.h>
-+	#define LZMA_MALLOC vmalloc
-+	#define LZMA_FREE vfree
-+	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
-+	#define INIT __init
-+	#define STATIC static
-+#else
-+	#include <stdint.h>
-+	#include <stdlib.h>
-+	#include <stdio.h>
-+	#include <unistd.h>
-+	#include <string.h>
-+	#include <asm/types.h>
-+	#include <errno.h>
-+	#include <linux/jffs2.h>
-+	#ifndef PAGE_SIZE
-+		extern int page_size;
-+		#define PAGE_SIZE page_size
-+	#endif
-+	#define LZMA_MALLOC malloc
-+	#define LZMA_FREE free
-+	#define PRINT_ERROR(msg) fprintf(stderr, msg)
-+	#define INIT
-+	#define STATIC
-+#endif
-+
-+#include "lzma/LzmaDec.h"
-+#include "lzma/LzmaEnc.h"
-+
-+#define LZMA_BEST_LEVEL (9)
-+#define LZMA_BEST_LC    (0)
-+#define LZMA_BEST_LP    (0)
-+#define LZMA_BEST_PB    (0)
-+#define LZMA_BEST_FB  (273)
-+
-+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
-+
-+static void *p_lzma_malloc(void *p, size_t size)
-+{
-+        if (size == 0)
-+                return NULL;
-+
-+        return LZMA_MALLOC(size);
-+}
-+
-+static void p_lzma_free(void *p, void *address)
-+{
-+        if (address != NULL)
-+                LZMA_FREE(address);
-+}
-+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzFind.h
-@@ -0,0 +1,115 @@
-+/* LzFind.h -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_FIND_H
-+#define __LZ_FIND_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef UInt32 CLzRef;
-+
-+typedef struct _CMatchFinder
-+{
-+  Byte *buffer;
-+  UInt32 pos;
-+  UInt32 posLimit;
-+  UInt32 streamPos;
-+  UInt32 lenLimit;
-+
-+  UInt32 cyclicBufferPos;
-+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-+
-+  UInt32 matchMaxLen;
-+  CLzRef *hash;
-+  CLzRef *son;
-+  UInt32 hashMask;
-+  UInt32 cutValue;
-+
-+  Byte *bufferBase;
-+  ISeqInStream *stream;
-+  int streamEndWasReached;
-+
-+  UInt32 blockSize;
-+  UInt32 keepSizeBefore;
-+  UInt32 keepSizeAfter;
-+
-+  UInt32 numHashBytes;
-+  int directInput;
-+  size_t directInputRem;
-+  int btMode;
-+  int bigHash;
-+  UInt32 historySize;
-+  UInt32 fixedHashSize;
-+  UInt32 hashSizeSum;
-+  UInt32 numSons;
-+  SRes result;
-+  UInt32 crc[256];
-+} CMatchFinder;
-+
-+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-+
-+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-+
-+int MatchFinder_NeedMove(CMatchFinder *p);
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-+void MatchFinder_MoveBlock(CMatchFinder *p);
-+void MatchFinder_ReadIfRequired(CMatchFinder *p);
-+
-+void MatchFinder_Construct(CMatchFinder *p);
-+
-+/* Conditions:
-+     historySize <= 3 GB
-+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-+*/
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc);
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-+    UInt32 *distances, UInt32 maxLen);
-+
-+/*
-+Conditions:
-+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-+*/
-+
-+typedef void (*Mf_Init_Func)(void *object);
-+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-+typedef void (*Mf_Skip_Func)(void *object, UInt32);
-+
-+typedef struct _IMatchFinder
-+{
-+  Mf_Init_Func Init;
-+  Mf_GetIndexByte_Func GetIndexByte;
-+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-+  Mf_GetMatches_Func GetMatches;
-+  Mf_Skip_Func Skip;
-+} IMatchFinder;
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-+
-+void MatchFinder_Init(CMatchFinder *p);
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzHash.h
-@@ -0,0 +1,54 @@
-+/* LzHash.h -- HASH functions for LZ algorithms
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_HASH_H
-+#define __LZ_HASH_H
-+
-+#define kHash2Size (1 << 10)
-+#define kHash3Size (1 << 16)
-+#define kHash4Size (1 << 20)
-+
-+#define kFix3HashSize (kHash2Size)
-+#define kFix4HashSize (kHash2Size + kHash3Size)
-+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-+
-+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-+
-+#define HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-+
-+#define HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-+
-+#define HASH5_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-+  hash4Value &= (kHash4Size - 1); }
-+
-+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-+
-+
-+#define MT_HASH2_CALC \
-+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-+
-+#define MT_HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-+
-+#define MT_HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -0,0 +1,231 @@
-+/* LzmaDec.h -- LZMA Decoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_DEC_H
-+#define __LZMA_DEC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* #define _LZMA_PROB32 */
-+/* _LZMA_PROB32 can increase the speed on some CPUs,
-+   but memory usage for CLzmaDec::probs will be doubled in that case */
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+
-+/* ---------- LZMA Properties ---------- */
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaProps
-+{
-+  unsigned lc, lp, pb;
-+  UInt32 dicSize;
-+} CLzmaProps;
-+
-+/* LzmaProps_Decode - decodes properties
-+Returns:
-+  SZ_OK
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-+
-+
-+/* ---------- LZMA Decoder state ---------- */
-+
-+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-+
-+#define LZMA_REQUIRED_INPUT_MAX 20
-+
-+typedef struct
-+{
-+  CLzmaProps prop;
-+  CLzmaProb *probs;
-+  Byte *dic;
-+  const Byte *buf;
-+  UInt32 range, code;
-+  SizeT dicPos;
-+  SizeT dicBufSize;
-+  UInt32 processedPos;
-+  UInt32 checkDicSize;
-+  unsigned state;
-+  UInt32 reps[4];
-+  unsigned remainLen;
-+  int needFlush;
-+  int needInitState;
-+  UInt32 numProbs;
-+  unsigned tempBufSize;
-+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-+} CLzmaDec;
-+
-+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-+
-+void LzmaDec_Init(CLzmaDec *p);
-+
-+/* There are two types of LZMA streams:
-+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-+
-+typedef enum
-+{
-+  LZMA_FINISH_ANY,   /* finish at any point */
-+  LZMA_FINISH_END    /* block must be finished at the end */
-+} ELzmaFinishMode;
-+
-+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-+
-+   You must use LZMA_FINISH_END, when you know that current output buffer
-+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-+
-+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-+   and output value of destLen will be less than output buffer size limit.
-+   You can check status result also.
-+
-+   You can use multiple checks to test data integrity after full decompression:
-+     1) Check Result and "status" variable.
-+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-+        You must use correct finish mode in that case. */
-+
-+typedef enum
-+{
-+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-+} ELzmaStatus;
-+
-+/* ELzmaStatus is used only as output value for function call */
-+
-+
-+/* ---------- Interfaces ---------- */
-+
-+/* There are 3 levels of interfaces:
-+     1) Dictionary Interface
-+     2) Buffer Interface
-+     3) One Call Interface
-+   You can select any of these interfaces, but don't mix functions from different
-+   groups for same object. */
-+
-+
-+/* There are two variants to allocate state for Dictionary Interface:
-+     1) LzmaDec_Allocate / LzmaDec_Free
-+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-+   You can use variant 2, if you set dictionary buffer manually.
-+   For Buffer Interface you must always use variant 1.
-+
-+LzmaDec_Allocate* can return:
-+  SZ_OK
-+  SZ_ERROR_MEM         - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+   
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-+
-+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-+
-+/* ---------- Dictionary Interface ---------- */
-+
-+/* You can use it, if you want to eliminate the overhead for data copying from
-+   dictionary to some other external buffer.
-+   You must work with CLzmaDec variables directly in this interface.
-+
-+   STEPS:
-+     LzmaDec_Constr()
-+     LzmaDec_Allocate()
-+     for (each new stream)
-+     {
-+       LzmaDec_Init()
-+       while (it needs more decompression)
-+       {
-+         LzmaDec_DecodeToDic()
-+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-+       }
-+     }
-+     LzmaDec_Free()
-+*/
-+
-+/* LzmaDec_DecodeToDic
-+   
-+   The decoding to internal dictionary buffer (CLzmaDec::dic).
-+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (dicLimit).
-+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-+  LZMA_FINISH_END - Stream must be finished after dicLimit.
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_NEEDS_MORE_INPUT
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+*/
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- Buffer Interface ---------- */
-+
-+/* It's zlib-like interface.
-+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-+   to work with CLzmaDec variables manually.
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+*/
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaDecode
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+  SZ_ERROR_MEM  - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-+*/
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -0,0 +1,80 @@
-+/*  LzmaEnc.h -- LZMA Encoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_ENC_H
-+#define __LZMA_ENC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaEncProps
-+{
-+  int level;       /*  0 <= level <= 9 */
-+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-+                       default = (1 << 24) */
-+  int lc;          /* 0 <= lc <= 8, default = 3 */
-+  int lp;          /* 0 <= lp <= 4, default = 0 */
-+  int pb;          /* 0 <= pb <= 4, default = 2 */
-+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-+  int fb;          /* 5 <= fb <= 273, default = 32 */
-+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-+  int numHashBytes; /* 2, 3 or 4, default = 4 */
-+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-+  int numThreads;  /* 1 or 2, default = 2 */
-+} CLzmaEncProps;
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p);
-+void LzmaEncProps_Normalize(CLzmaEncProps *p);
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-+
-+
-+/* ---------- CLzmaEncHandle Interface ---------- */
-+
-+/* LzmaEnc_* functions can return the following exit codes:
-+Returns:
-+  SZ_OK           - OK
-+  SZ_ERROR_MEM    - Memory allocation error
-+  SZ_ERROR_PARAM  - Incorrect paramater in props
-+  SZ_ERROR_WRITE  - Write callback error.
-+  SZ_ERROR_PROGRESS - some break from progress callback
-+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-+*/
-+
-+typedef void * CLzmaEncHandle;
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaEncode
-+Return code:
-+  SZ_OK               - OK
-+  SZ_ERROR_MEM        - Memory allocation error
-+  SZ_ERROR_PARAM      - Incorrect paramater
-+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-+*/
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/Types.h
-@@ -0,0 +1,226 @@
-+/* Types.h -- Basic types
-+2009-11-23 : Igor Pavlov : Public domain */
-+
-+#ifndef __7Z_TYPES_H
-+#define __7Z_TYPES_H
-+
-+#include <stddef.h>
-+
-+#ifdef _WIN32
-+#include <windows.h>
-+#endif
-+
-+#ifndef EXTERN_C_BEGIN
-+#ifdef __cplusplus
-+#define EXTERN_C_BEGIN extern "C" {
-+#define EXTERN_C_END }
-+#else
-+#define EXTERN_C_BEGIN
-+#define EXTERN_C_END
-+#endif
-+#endif
-+
-+EXTERN_C_BEGIN
-+
-+#define SZ_OK 0
-+
-+#define SZ_ERROR_DATA 1
-+#define SZ_ERROR_MEM 2
-+#define SZ_ERROR_CRC 3
-+#define SZ_ERROR_UNSUPPORTED 4
-+#define SZ_ERROR_PARAM 5
-+#define SZ_ERROR_INPUT_EOF 6
-+#define SZ_ERROR_OUTPUT_EOF 7
-+#define SZ_ERROR_READ 8
-+#define SZ_ERROR_WRITE 9
-+#define SZ_ERROR_PROGRESS 10
-+#define SZ_ERROR_FAIL 11
-+#define SZ_ERROR_THREAD 12
-+
-+#define SZ_ERROR_ARCHIVE 16
-+#define SZ_ERROR_NO_ARCHIVE 17
-+
-+typedef int SRes;
-+
-+#ifdef _WIN32
-+typedef DWORD WRes;
-+#else
-+typedef int WRes;
-+#endif
-+
-+#ifndef RINOK
-+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-+#endif
-+
-+typedef unsigned char Byte;
-+typedef short Int16;
-+typedef unsigned short UInt16;
-+
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef long Int32;
-+typedef unsigned long UInt32;
-+#else
-+typedef int Int32;
-+typedef unsigned int UInt32;
-+#endif
-+
-+#ifdef _SZ_NO_INT_64
-+
-+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-+   NOTES: Some code will work incorrectly in that case! */
-+
-+typedef long Int64;
-+typedef unsigned long UInt64;
-+
-+#else
-+
-+#if defined(_MSC_VER) || defined(__BORLANDC__)
-+typedef __int64 Int64;
-+typedef unsigned __int64 UInt64;
-+#else
-+typedef long long int Int64;
-+typedef unsigned long long int UInt64;
-+#endif
-+
-+#endif
-+
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+typedef size_t SizeT;
-+#endif
-+
-+typedef int Bool;
-+#define True 1
-+#define False 0
-+
-+
-+#ifdef _WIN32
-+#define MY_STD_CALL __stdcall
-+#else
-+#define MY_STD_CALL
-+#endif
-+
-+#ifdef _MSC_VER
-+
-+#if _MSC_VER >= 1300
-+#define MY_NO_INLINE __declspec(noinline)
-+#else
-+#define MY_NO_INLINE
-+#endif
-+
-+#define MY_CDECL __cdecl
-+#define MY_FAST_CALL __fastcall
-+
-+#else
-+
-+#define MY_CDECL
-+#define MY_FAST_CALL
-+
-+#endif
-+
-+
-+/* The following interfaces use first parameter as pointer to structure */
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) < input(*size)) is allowed */
-+} ISeqInStream;
-+
-+/* it can return SZ_ERROR_INPUT_EOF */
-+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-+
-+typedef struct
-+{
-+  size_t (*Write)(void *p, const void *buf, size_t size);
-+    /* Returns: result - the number of actually written bytes.
-+       (result < size) means error */
-+} ISeqOutStream;
-+
-+typedef enum
-+{
-+  SZ_SEEK_SET = 0,
-+  SZ_SEEK_CUR = 1,
-+  SZ_SEEK_END = 2
-+} ESzSeek;
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ISeekInStream;
-+
-+typedef struct
-+{
-+  SRes (*Look)(void *p, void **buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) > input(*size)) is not allowed
-+       (output(*size) < input(*size)) is allowed */
-+  SRes (*Skip)(void *p, size_t offset);
-+    /* offset must be <= output(*size) of Look */
-+
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ILookInStream;
-+
-+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-+
-+/* reads via ILookInStream::Read */
-+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-+
-+#define LookToRead_BUF_SIZE (1 << 14)
-+
-+typedef struct
-+{
-+  ILookInStream s;
-+  ISeekInStream *realStream;
-+  size_t pos;
-+  size_t size;
-+  Byte buf[LookToRead_BUF_SIZE];
-+} CLookToRead;
-+
-+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-+void LookToRead_Init(CLookToRead *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToLook;
-+
-+void SecToLook_CreateVTable(CSecToLook *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToRead;
-+
-+void SecToRead_CreateVTable(CSecToRead *p);
-+
-+typedef struct
-+{
-+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-+    /* Returns: result. (result != SZ_OK) means break.
-+       Value (UInt64)(Int64)-1 for size means unknown value. */
-+} ICompressProgress;
-+
-+typedef struct
-+{
-+  void *(*Alloc)(void *p, size_t size);
-+  void (*Free)(void *p, void *address); /* address can be 0 */
-+} ISzAlloc;
-+
-+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-+#define IAlloc_Free(p, a) (p)->Free((p), a)
-+
-+EXTERN_C_END
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -103,6 +103,12 @@ config LZO_COMPRESS
- config LZO_DECOMPRESS
- 	tristate
- 
-+config LZMA_COMPRESS
-+    tristate
-+
-+config LZMA_DECOMPRESS
-+    tristate
-+
- #
- # These all provide a common interface (hence the apparent duplication with
- # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -2,6 +2,16 @@
- # Makefile for some libs needed in the kernel.
- #
- 
-+ifdef CONFIG_JFFS2_ZLIB
-+	CONFIG_ZLIB_INFLATE:=y
-+	CONFIG_ZLIB_DEFLATE:=y
-+endif
-+
-+ifdef CONFIG_JFFS2_LZMA
-+	CONFIG_LZMA_DECOMPRESS:=y
-+	CONFIG_LZMA_COMPRESS:=y
-+endif
-+
- ifdef CONFIG_FUNCTION_TRACER
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
-@@ -66,6 +76,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
- obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
- obj-$(CONFIG_LZO_COMPRESS) += lzo/
- obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma/
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
- 
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
---- /dev/null
-+++ b/lib/lzma/LzFind.c
-@@ -0,0 +1,761 @@
-+/* LzFind.c -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+#include "LzFind.h"
-+#include "LzHash.h"
-+
-+#define kEmptyHashValue 0
-+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-+#define kNormalizeMask (~(kNormalizeStepMin - 1))
-+#define kMaxHistorySize ((UInt32)3 << 30)
-+
-+#define kStartMaxLen 3
-+
-+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  if (!p->directInput)
-+  {
-+    alloc->Free(alloc, p->bufferBase);
-+    p->bufferBase = 0;
-+  }
-+}
-+
-+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-+
-+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-+{
-+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-+  if (p->directInput)
-+  {
-+    p->blockSize = blockSize;
-+    return 1;
-+  }
-+  if (p->bufferBase == 0 || p->blockSize != blockSize)
-+  {
-+    LzInWindow_Free(p, alloc);
-+    p->blockSize = blockSize;
-+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-+  }
-+  return (p->bufferBase != 0);
-+}
-+
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+{
-+  p->posLimit -= subValue;
-+  p->pos -= subValue;
-+  p->streamPos -= subValue;
-+}
-+
-+static void MatchFinder_ReadBlock(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached || p->result != SZ_OK)
-+    return;
-+  if (p->directInput)
-+  {
-+    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-+    if (curSize > p->directInputRem)
-+      curSize = (UInt32)p->directInputRem;
-+    p->directInputRem -= curSize;
-+    p->streamPos += curSize;
-+    if (p->directInputRem == 0)
-+      p->streamEndWasReached = 1;
-+    return;
-+  }
-+  for (;;)
-+  {
-+    Byte *dest = p->buffer + (p->streamPos - p->pos);
-+    size_t size = (p->bufferBase + p->blockSize - dest);
-+    if (size == 0)
-+      return;
-+    p->result = p->stream->Read(p->stream, dest, &size);
-+    if (p->result != SZ_OK)
-+      return;
-+    if (size == 0)
-+    {
-+      p->streamEndWasReached = 1;
-+      return;
-+    }
-+    p->streamPos += (UInt32)size;
-+    if (p->streamPos - p->pos > p->keepSizeAfter)
-+      return;
-+  }
-+}
-+
-+void MatchFinder_MoveBlock(CMatchFinder *p)
-+{
-+  memmove(p->bufferBase,
-+    p->buffer - p->keepSizeBefore,
-+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-+  p->buffer = p->bufferBase + p->keepSizeBefore;
-+}
-+
-+int MatchFinder_NeedMove(CMatchFinder *p)
-+{
-+  if (p->directInput)
-+    return 0;
-+  /* if (p->streamEndWasReached) return 0; */
-+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-+}
-+
-+void MatchFinder_ReadIfRequired(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached)
-+    return;
-+  if (p->keepSizeAfter >= p->streamPos - p->pos)
-+    MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-+{
-+  if (MatchFinder_NeedMove(p))
-+    MatchFinder_MoveBlock(p);
-+  MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-+{
-+  p->cutValue = 32;
-+  p->btMode = 1;
-+  p->numHashBytes = 4;
-+  p->bigHash = 0;
-+}
-+
-+#define kCrcPoly 0xEDB88320
-+
-+void MatchFinder_Construct(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  p->bufferBase = 0;
-+  p->directInput = 0;
-+  p->hash = 0;
-+  MatchFinder_SetDefaultSettings(p);
-+
-+  for (i = 0; i < 256; i++)
-+  {
-+    UInt32 r = i;
-+    int j;
-+    for (j = 0; j < 8; j++)
-+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-+    p->crc[i] = r;
-+  }
-+}
-+
-+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->hash);
-+  p->hash = 0;
-+}
-+
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  MatchFinder_FreeThisClassMemory(p, alloc);
-+  LzInWindow_Free(p, alloc);
-+}
-+
-+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-+{
-+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-+  if (sizeInBytes / sizeof(CLzRef) != num)
-+    return 0;
-+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-+}
-+
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc)
-+{
-+  UInt32 sizeReserv;
-+  if (historySize > kMaxHistorySize)
-+  {
-+    MatchFinder_Free(p, alloc);
-+    return 0;
-+  }
-+  sizeReserv = historySize >> 1;
-+  if (historySize > ((UInt32)2 << 30))
-+    sizeReserv = historySize >> 2;
-+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-+
-+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-+  if (LzInWindow_Create(p, sizeReserv, alloc))
-+  {
-+    UInt32 newCyclicBufferSize = historySize + 1;
-+    UInt32 hs;
-+    p->matchMaxLen = matchMaxLen;
-+    {
-+      p->fixedHashSize = 0;
-+      if (p->numHashBytes == 2)
-+        hs = (1 << 16) - 1;
-+      else
-+      {
-+        hs = historySize - 1;
-+        hs |= (hs >> 1);
-+        hs |= (hs >> 2);
-+        hs |= (hs >> 4);
-+        hs |= (hs >> 8);
-+        hs >>= 1;
-+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-+        if (hs > (1 << 24))
-+        {
-+          if (p->numHashBytes == 3)
-+            hs = (1 << 24) - 1;
-+          else
-+            hs >>= 1;
-+        }
-+      }
-+      p->hashMask = hs;
-+      hs++;
-+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-+      hs += p->fixedHashSize;
-+    }
-+
-+    {
-+      UInt32 prevSize = p->hashSizeSum + p->numSons;
-+      UInt32 newSize;
-+      p->historySize = historySize;
-+      p->hashSizeSum = hs;
-+      p->cyclicBufferSize = newCyclicBufferSize;
-+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-+      newSize = p->hashSizeSum + p->numSons;
-+      if (p->hash != 0 && prevSize == newSize)
-+        return 1;
-+      MatchFinder_FreeThisClassMemory(p, alloc);
-+      p->hash = AllocRefs(newSize, alloc);
-+      if (p->hash != 0)
-+      {
-+        p->son = p->hash + p->hashSizeSum;
-+        return 1;
-+      }
-+    }
-+  }
-+  MatchFinder_Free(p, alloc);
-+  return 0;
-+}
-+
-+static void MatchFinder_SetLimits(CMatchFinder *p)
-+{
-+  UInt32 limit = kMaxValForNormalize - p->pos;
-+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  limit2 = p->streamPos - p->pos;
-+  if (limit2 <= p->keepSizeAfter)
-+  {
-+    if (limit2 > 0)
-+      limit2 = 1;
-+  }
-+  else
-+    limit2 -= p->keepSizeAfter;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  {
-+    UInt32 lenLimit = p->streamPos - p->pos;
-+    if (lenLimit > p->matchMaxLen)
-+      lenLimit = p->matchMaxLen;
-+    p->lenLimit = lenLimit;
-+  }
-+  p->posLimit = p->pos + limit;
-+}
-+
-+void MatchFinder_Init(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < p->hashSizeSum; i++)
-+    p->hash[i] = kEmptyHashValue;
-+  p->cyclicBufferPos = 0;
-+  p->buffer = p->bufferBase;
-+  p->pos = p->streamPos = p->cyclicBufferSize;
-+  p->result = SZ_OK;
-+  p->streamEndWasReached = 0;
-+  MatchFinder_ReadBlock(p);
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-+{
-+  return (p->pos - p->historySize - 1) & kNormalizeMask;
-+}
-+
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+{
-+  UInt32 i;
-+  for (i = 0; i < numItems; i++)
-+  {
-+    UInt32 value = items[i];
-+    if (value <= subValue)
-+      value = kEmptyHashValue;
-+    else
-+      value -= subValue;
-+    items[i] = value;
-+  }
-+}
-+
-+static void MatchFinder_Normalize(CMatchFinder *p)
-+{
-+  UInt32 subValue = MatchFinder_GetSubValue(p);
-+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-+  MatchFinder_ReduceOffsets(p, subValue);
-+}
-+
-+static void MatchFinder_CheckLimits(CMatchFinder *p)
-+{
-+  if (p->pos == kMaxValForNormalize)
-+    MatchFinder_Normalize(p);
-+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-+    MatchFinder_CheckAndMoveAndRead(p);
-+  if (p->cyclicBufferPos == p->cyclicBufferSize)
-+    p->cyclicBufferPos = 0;
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  son[_cyclicBufferPos] = curMatch;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+      return distances;
-+    {
-+      const Byte *pb = cur - delta;
-+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-+      {
-+        UInt32 len = 0;
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+            return distances;
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return distances;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        if (++len != lenLimit && pb[len] == cur[len])
-+          while (++len != lenLimit)
-+            if (pb[len] != cur[len])
-+              break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return distances;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        {
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+#define MOVE_POS \
-+  ++p->cyclicBufferPos; \
-+  p->buffer++; \
-+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-+
-+#define MOVE_POS_RET MOVE_POS return offset;
-+
-+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+
-+#define GET_MATCHES_HEADER2(minLen, ret_op) \
-+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-+  cur = p->buffer;
-+
-+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-+
-+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-+
-+#define GET_MATCHES_FOOTER(offset, maxLen) \
-+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-+  distances + offset, maxLen) - distances); MOVE_POS_RET;
-+
-+#define SKIP_FOOTER \
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-+
-+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(2)
-+  HASH2_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 1)
-+}
-+
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 2)
-+}
-+
-+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, delta2, maxLen, offset;
-+  GET_MATCHES_HEADER(3)
-+
-+  HASH3_CALC;
-+
-+  delta2 = p->pos - p->hash[hash2Value];
-+  curMatch = p->hash[kFix3HashSize + hashValue];
-+  
-+  p->hash[hash2Value] =
-+  p->hash[kFix3HashSize + hashValue] = p->pos;
-+
-+
-+  maxLen = 2;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[0] = maxLen;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+  
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      p->son[p->cyclicBufferPos] = curMatch;
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances + offset, maxLen) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances, 2) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(2)
-+    HASH2_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value;
-+    SKIP_HEADER(3)
-+    HASH3_CALC;
-+    curMatch = p->hash[kFix3HashSize + hashValue];
-+    p->hash[hash2Value] =
-+    p->hash[kFix3HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] = p->pos;
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] =
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-+{
-+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-+  if (!p->btMode)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 2)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 3)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-+  }
-+  else
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-+  }
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaDec.c
-@@ -0,0 +1,999 @@
-+/* LzmaDec.c -- LZMA Decoder
-+2009-09-20 : Igor Pavlov : Public domain */
-+
-+#include "LzmaDec.h"
-+
-+#include <string.h>
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_INIT_SIZE 5
-+
-+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-+  { UPDATE_0(p); i = (i + i); A0; } else \
-+  { UPDATE_1(p); i = (i + i) + 1; A1; }
-+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-+
-+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-+#define TREE_DECODE(probs, limit, i) \
-+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-+
-+/* #define _LZMA_SIZE_OPT */
-+
-+#ifdef _LZMA_SIZE_OPT
-+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-+#else
-+#define TREE_6_DECODE(probs, i) \
-+  { i = 1; \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  i -= 0x40; }
-+#endif
-+
-+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0_CHECK range = bound;
-+#define UPDATE_1_CHECK range -= bound; code -= bound;
-+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-+#define TREE_DECODE_CHECK(probs, limit, i) \
-+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#define LZMA_DIC_MIN (1 << 12)
-+
-+/* First LZMA-symbol is always decoded.
-+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-+Out:
-+  Result:
-+    SZ_OK - OK
-+    SZ_ERROR_DATA - Error
-+  p->remainLen:
-+    < kMatchSpecLenStart : normal remain
-+    = kMatchSpecLenStart : finished
-+    = kMatchSpecLenStart + 1 : Flush marker
-+    = kMatchSpecLenStart + 2 : State Init Marker
-+*/
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  CLzmaProb *probs = p->probs;
-+
-+  unsigned state = p->state;
-+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-+  unsigned lc = p->prop.lc;
-+
-+  Byte *dic = p->dic;
-+  SizeT dicBufSize = p->dicBufSize;
-+  SizeT dicPos = p->dicPos;
-+  
-+  UInt32 processedPos = p->processedPos;
-+  UInt32 checkDicSize = p->checkDicSize;
-+  unsigned len = 0;
-+
-+  const Byte *buf = p->buf;
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+
-+  do
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = processedPos & pbMask;
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0(prob)
-+    {
-+      unsigned symbol;
-+      UPDATE_0(prob);
-+      prob = probs + Literal;
-+      if (checkDicSize != 0 || processedPos != 0)
-+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        state -= (state < 4) ? state : 3;
-+        symbol = 1;
-+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        state -= (state < 10) ? 3 : 6;
-+        symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      dic[dicPos++] = (Byte)symbol;
-+      processedPos++;
-+      continue;
-+    }
-+    else
-+    {
-+      UPDATE_1(prob);
-+      prob = probs + IsRep + state;
-+      IF_BIT_0(prob)
-+      {
-+        UPDATE_0(prob);
-+        state += kNumStates;
-+        prob = probs + LenCoder;
-+      }
-+      else
-+      {
-+        UPDATE_1(prob);
-+        if (checkDicSize == 0 && processedPos == 0)
-+          return SZ_ERROR_DATA;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0(prob)
-+        {
-+          UPDATE_0(prob);
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+            dicPos++;
-+            processedPos++;
-+            state = state < kNumLitStates ? 9 : 11;
-+            continue;
-+          }
-+          UPDATE_1(prob);
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UPDATE_1(prob);
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            distance = rep1;
-+          }
-+          else
-+          {
-+            UPDATE_1(prob);
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0(prob)
-+            {
-+              UPDATE_0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UPDATE_1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0(probLen)
-+        {
-+          UPDATE_0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = (1 << kLenNumLowBits);
-+        }
-+        else
-+        {
-+          UPDATE_1(probLen);
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0(probLen)
-+          {
-+            UPDATE_0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = (1 << kLenNumMidBits);
-+          }
-+          else
-+          {
-+            UPDATE_1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = (1 << kLenNumHighBits);
-+          }
-+        }
-+        TREE_DECODE(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state >= kNumStates)
-+      {
-+        UInt32 distance;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-+        TREE_6_DECODE(prob, distance);
-+        if (distance >= kStartPosModelIndex)
-+        {
-+          unsigned posSlot = (unsigned)distance;
-+          int numDirectBits = (int)(((distance >> 1) - 1));
-+          distance = (2 | (distance & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            distance <<= numDirectBits;
-+            prob = probs + SpecPos + distance - posSlot - 1;
-+            {
-+              UInt32 mask = 1;
-+              unsigned i = 1;
-+              do
-+              {
-+                GET_BIT2(prob + i, i, ; , distance |= mask);
-+                mask <<= 1;
-+              }
-+              while (--numDirectBits != 0);
-+            }
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE
-+              range >>= 1;
-+              
-+              {
-+                UInt32 t;
-+                code -= range;
-+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-+                distance = (distance << 1) + (t + 1);
-+                code += range & t;
-+              }
-+              /*
-+              distance <<= 1;
-+              if (code >= range)
-+              {
-+                code -= range;
-+                distance |= 1;
-+              }
-+              */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            distance <<= kNumAlignBits;
-+            {
-+              unsigned i = 1;
-+              GET_BIT2(prob + i, i, ; , distance |= 1);
-+              GET_BIT2(prob + i, i, ; , distance |= 2);
-+              GET_BIT2(prob + i, i, ; , distance |= 4);
-+              GET_BIT2(prob + i, i, ; , distance |= 8);
-+            }
-+            if (distance == (UInt32)0xFFFFFFFF)
-+            {
-+              len += kMatchSpecLenStart;
-+              state -= kNumStates;
-+              break;
-+            }
-+          }
-+        }
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        rep0 = distance + 1;
-+        if (checkDicSize == 0)
-+        {
-+          if (distance >= processedPos)
-+            return SZ_ERROR_DATA;
-+        }
-+        else if (distance >= checkDicSize)
-+          return SZ_ERROR_DATA;
-+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-+      }
-+
-+      len += kMatchMinLen;
-+
-+      if (limit == dicPos)
-+        return SZ_ERROR_DATA;
-+      {
-+        SizeT rem = limit - dicPos;
-+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-+
-+        processedPos += curLen;
-+
-+        len -= curLen;
-+        if (pos + curLen <= dicBufSize)
-+        {
-+          Byte *dest = dic + dicPos;
-+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-+          const Byte *lim = dest + curLen;
-+          dicPos += curLen;
-+          do
-+            *(dest) = (Byte)*(dest + src);
-+          while (++dest != lim);
-+        }
-+        else
-+        {
-+          do
-+          {
-+            dic[dicPos++] = dic[pos];
-+            if (++pos == dicBufSize)
-+              pos = 0;
-+          }
-+          while (--curLen != 0);
-+        }
-+      }
-+    }
-+  }
-+  while (dicPos < limit && buf < bufLimit);
-+  NORMALIZE;
-+  p->buf = buf;
-+  p->range = range;
-+  p->code = code;
-+  p->remainLen = len;
-+  p->dicPos = dicPos;
-+  p->processedPos = processedPos;
-+  p->reps[0] = rep0;
-+  p->reps[1] = rep1;
-+  p->reps[2] = rep2;
-+  p->reps[3] = rep3;
-+  p->state = state;
-+
-+  return SZ_OK;
-+}
-+
-+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-+{
-+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-+  {
-+    Byte *dic = p->dic;
-+    SizeT dicPos = p->dicPos;
-+    SizeT dicBufSize = p->dicBufSize;
-+    unsigned len = p->remainLen;
-+    UInt32 rep0 = p->reps[0];
-+    if (limit - dicPos < len)
-+      len = (unsigned)(limit - dicPos);
-+
-+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-+      p->checkDicSize = p->prop.dicSize;
-+
-+    p->processedPos += len;
-+    p->remainLen -= len;
-+    while (len-- != 0)
-+    {
-+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+      dicPos++;
-+    }
-+    p->dicPos = dicPos;
-+  }
-+}
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  do
-+  {
-+    SizeT limit2 = limit;
-+    if (p->checkDicSize == 0)
-+    {
-+      UInt32 rem = p->prop.dicSize - p->processedPos;
-+      if (limit - p->dicPos > rem)
-+        limit2 = p->dicPos + rem;
-+    }
-+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-+    if (p->processedPos >= p->prop.dicSize)
-+      p->checkDicSize = p->prop.dicSize;
-+    LzmaDec_WriteRem(p, limit);
-+  }
-+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-+
-+  if (p->remainLen > kMatchSpecLenStart)
-+  {
-+    p->remainLen = kMatchSpecLenStart;
-+  }
-+  return 0;
-+}
-+
-+typedef enum
-+{
-+  DUMMY_ERROR, /* unexpected end of input stream */
-+  DUMMY_LIT,
-+  DUMMY_MATCH,
-+  DUMMY_REP
-+} ELzmaDummy;
-+
-+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-+{
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+  const Byte *bufLimit = buf + inSize;
-+  CLzmaProb *probs = p->probs;
-+  unsigned state = p->state;
-+  ELzmaDummy res;
-+
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0_CHECK(prob)
-+    {
-+      UPDATE_0_CHECK
-+
-+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-+
-+      prob = probs + Literal;
-+      if (p->checkDicSize != 0 || p->processedPos != 0)
-+        prob += (LZMA_LIT_SIZE *
-+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        unsigned symbol = 1;
-+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        unsigned symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      res = DUMMY_LIT;
-+    }
-+    else
-+    {
-+      unsigned len;
-+      UPDATE_1_CHECK;
-+
-+      prob = probs + IsRep + state;
-+      IF_BIT_0_CHECK(prob)
-+      {
-+        UPDATE_0_CHECK;
-+        state = 0;
-+        prob = probs + LenCoder;
-+        res = DUMMY_MATCH;
-+      }
-+      else
-+      {
-+        UPDATE_1_CHECK;
-+        res = DUMMY_REP;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0_CHECK(prob)
-+        {
-+          UPDATE_0_CHECK;
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+            NORMALIZE_CHECK;
-+            return DUMMY_REP;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+          }
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0_CHECK(prob)
-+            {
-+              UPDATE_0_CHECK;
-+            }
-+            else
-+            {
-+              UPDATE_1_CHECK;
-+            }
-+          }
-+        }
-+        state = kNumStates;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0_CHECK(probLen)
-+        {
-+          UPDATE_0_CHECK;
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = 1 << kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0_CHECK(probLen)
-+          {
-+            UPDATE_0_CHECK;
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = 1 << kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = 1 << kLenNumHighBits;
-+          }
-+        }
-+        TREE_DECODE_CHECK(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        unsigned posSlot;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits);
-+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+
-+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-+
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE_CHECK
-+              range >>= 1;
-+              code -= range & (((code - range) >> 31) - 1);
-+              /* if (code >= range) code -= range; */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            unsigned i = 1;
-+            do
-+            {
-+              GET_BIT_CHECK(prob + i, i);
-+            }
-+            while (--numDirectBits != 0);
-+          }
-+        }
-+      }
-+    }
-+  }
-+  NORMALIZE_CHECK;
-+  return res;
-+}
-+
-+
-+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-+{
-+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-+  p->range = 0xFFFFFFFF;
-+  p->needFlush = 0;
-+}
-+
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+{
-+  p->needFlush = 1;
-+  p->remainLen = 0;
-+  p->tempBufSize = 0;
-+
-+  if (initDic)
-+  {
-+    p->processedPos = 0;
-+    p->checkDicSize = 0;
-+    p->needInitState = 1;
-+  }
-+  if (initState)
-+    p->needInitState = 1;
-+}
-+
-+void LzmaDec_Init(CLzmaDec *p)
-+{
-+  p->dicPos = 0;
-+  LzmaDec_InitDicAndState(p, True, True);
-+}
-+
-+static void LzmaDec_InitStateReal(CLzmaDec *p)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-+  UInt32 i;
-+  CLzmaProb *probs = p->probs;
-+  for (i = 0; i < numProbs; i++)
-+    probs[i] = kBitModelTotal >> 1;
-+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-+  p->state = 0;
-+  p->needInitState = 0;
-+}
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+    ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT inSize = *srcLen;
-+  (*srcLen) = 0;
-+  LzmaDec_WriteRem(p, dicLimit);
-+  
-+  *status = LZMA_STATUS_NOT_SPECIFIED;
-+
-+  while (p->remainLen != kMatchSpecLenStart)
-+  {
-+      int checkEndMarkNow;
-+
-+      if (p->needFlush != 0)
-+      {
-+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-+          p->tempBuf[p->tempBufSize++] = *src++;
-+        if (p->tempBufSize < RC_INIT_SIZE)
-+        {
-+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+          return SZ_OK;
-+        }
-+        if (p->tempBuf[0] != 0)
-+          return SZ_ERROR_DATA;
-+
-+        LzmaDec_InitRc(p, p->tempBuf);
-+        p->tempBufSize = 0;
-+      }
-+
-+      checkEndMarkNow = 0;
-+      if (p->dicPos >= dicLimit)
-+      {
-+        if (p->remainLen == 0 && p->code == 0)
-+        {
-+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-+          return SZ_OK;
-+        }
-+        if (finishMode == LZMA_FINISH_ANY)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_OK;
-+        }
-+        if (p->remainLen != 0)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_ERROR_DATA;
-+        }
-+        checkEndMarkNow = 1;
-+      }
-+
-+      if (p->needInitState)
-+        LzmaDec_InitStateReal(p);
-+  
-+      if (p->tempBufSize == 0)
-+      {
-+        SizeT processed;
-+        const Byte *bufLimit;
-+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            memcpy(p->tempBuf, src, inSize);
-+            p->tempBufSize = (unsigned)inSize;
-+            (*srcLen) += inSize;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+          bufLimit = src;
-+        }
-+        else
-+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-+        p->buf = src;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-+          return SZ_ERROR_DATA;
-+        processed = (SizeT)(p->buf - src);
-+        (*srcLen) += processed;
-+        src += processed;
-+        inSize -= processed;
-+      }
-+      else
-+      {
-+        unsigned rem = p->tempBufSize, lookAhead = 0;
-+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-+          p->tempBuf[rem++] = src[lookAhead++];
-+        p->tempBufSize = rem;
-+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            (*srcLen) += lookAhead;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+        }
-+        p->buf = p->tempBuf;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-+          return SZ_ERROR_DATA;
-+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-+        (*srcLen) += lookAhead;
-+        src += lookAhead;
-+        inSize -= lookAhead;
-+        p->tempBufSize = 0;
-+      }
-+  }
-+  if (p->code == 0)
-+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-+}
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT outSize = *destLen;
-+  SizeT inSize = *srcLen;
-+  *srcLen = *destLen = 0;
-+  for (;;)
-+  {
-+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-+    ELzmaFinishMode curFinishMode;
-+    SRes res;
-+    if (p->dicPos == p->dicBufSize)
-+      p->dicPos = 0;
-+    dicPos = p->dicPos;
-+    if (outSize > p->dicBufSize - dicPos)
-+    {
-+      outSizeCur = p->dicBufSize;
-+      curFinishMode = LZMA_FINISH_ANY;
-+    }
-+    else
-+    {
-+      outSizeCur = dicPos + outSize;
-+      curFinishMode = finishMode;
-+    }
-+
-+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-+    src += inSizeCur;
-+    inSize -= inSizeCur;
-+    *srcLen += inSizeCur;
-+    outSizeCur = p->dicPos - dicPos;
-+    memcpy(dest, p->dic + dicPos, outSizeCur);
-+    dest += outSizeCur;
-+    outSize -= outSizeCur;
-+    *destLen += outSizeCur;
-+    if (res != 0)
-+      return res;
-+    if (outSizeCur == 0 || outSize == 0)
-+      return SZ_OK;
-+  }
-+}
-+
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->probs);
-+  p->probs = 0;
-+}
-+
-+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->dic);
-+  p->dic = 0;
-+}
-+
-+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  LzmaDec_FreeProbs(p, alloc);
-+  LzmaDec_FreeDict(p, alloc);
-+}
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+{
-+  UInt32 dicSize;
-+  Byte d;
-+  
-+  if (size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_UNSUPPORTED;
-+  else
-+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-+ 
-+  if (dicSize < LZMA_DIC_MIN)
-+    dicSize = LZMA_DIC_MIN;
-+  p->dicSize = dicSize;
-+
-+  d = data[0];
-+  if (d >= (9 * 5 * 5))
-+    return SZ_ERROR_UNSUPPORTED;
-+
-+  p->lc = d % 9;
-+  d /= 9;
-+  p->pb = d / 5;
-+  p->lp = d % 5;
-+
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-+{
-+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-+  if (p->probs == 0 || numProbs != p->numProbs)
-+  {
-+    LzmaDec_FreeProbs(p, alloc);
-+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-+    p->numProbs = numProbs;
-+    if (p->probs == 0)
-+      return SZ_ERROR_MEM;
-+  }
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  SizeT dicBufSize;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  dicBufSize = propNew.dicSize;
-+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-+  {
-+    LzmaDec_FreeDict(p, alloc);
-+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-+    if (p->dic == 0)
-+    {
-+      LzmaDec_FreeProbs(p, alloc);
-+      return SZ_ERROR_MEM;
-+    }
-+  }
-+  p->dicBufSize = dicBufSize;
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc)
-+{
-+  CLzmaDec p;
-+  SRes res;
-+  SizeT inSize = *srcLen;
-+  SizeT outSize = *destLen;
-+  *srcLen = *destLen = 0;
-+  if (inSize < RC_INIT_SIZE)
-+    return SZ_ERROR_INPUT_EOF;
-+
-+  LzmaDec_Construct(&p);
-+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-+  if (res != 0)
-+    return res;
-+  p.dic = dest;
-+  p.dicBufSize = outSize;
-+
-+  LzmaDec_Init(&p);
-+  
-+  *srcLen = inSize;
-+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-+
-+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-+    res = SZ_ERROR_INPUT_EOF;
-+
-+  (*destLen) = p.dicPos;
-+  LzmaDec_FreeProbs(&p, alloc);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaEnc.c
-@@ -0,0 +1,2271 @@
-+/* LzmaEnc.c -- LZMA Encoder
-+2009-11-24 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+/* #define SHOW_STAT */
-+/* #define SHOW_STAT2 */
-+
-+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-+#include <stdio.h>
-+#endif
-+
-+#include "LzmaEnc.h"
-+
-+/* disable MT */
-+#define _7ZIP_ST
-+
-+#include "LzFind.h"
-+#ifndef _7ZIP_ST
-+#include "LzFindMt.h"
-+#endif
-+
-+#ifdef SHOW_STAT
-+static int ttt = 0;
-+#endif
-+
-+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-+
-+#define kBlockSize (9 << 10)
-+#define kUnpackBlockSize (1 << 18)
-+#define kMatchArraySize (1 << 21)
-+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-+
-+#define kNumMaxDirectBits (31)
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+#define kProbInitValue (kBitModelTotal >> 1)
-+
-+#define kNumMoveReducingBits 4
-+#define kNumBitPriceShiftBits 4
-+#define kBitPrice (1 << kNumBitPriceShiftBits)
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p)
-+{
-+  p->level = 5;
-+  p->dictSize = p->mc = 0;
-+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-+  p->writeEndMark = 0;
-+}
-+
-+void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+{
-+  int level = p->level;
-+  if (level < 0) level = 5;
-+  p->level = level;
-+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-+  if (p->lc < 0) p->lc = 3;
-+  if (p->lp < 0) p->lp = 0;
-+  if (p->pb < 0) p->pb = 2;
-+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-+  if (p->numHashBytes < 0) p->numHashBytes = 4;
-+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-+  if (p->numThreads < 0)
-+    p->numThreads =
-+      #ifndef _7ZIP_ST
-+      ((p->btMode && p->algo) ? 2 : 1);
-+      #else
-+      1;
-+      #endif
-+}
-+
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+{
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+  return props.dictSize;
-+}
-+
-+/* #define LZMA_LOG_BSR */
-+/* Define it for Intel's CPU */
-+
-+
-+#ifdef LZMA_LOG_BSR
-+
-+#define kDicLogSizeMaxCompress 30
-+
-+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-+
-+UInt32 GetPosSlot1(UInt32 pos)
-+{
-+  UInt32 res;
-+  BSR2_RET(pos, res);
-+  return res;
-+}
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-+
-+#else
-+
-+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-+
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+{
-+  int c = 2, slotFast;
-+  g_FastPos[0] = 0;
-+  g_FastPos[1] = 1;
-+  
-+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-+  {
-+    UInt32 k = (1 << ((slotFast >> 1) - 1));
-+    UInt32 j;
-+    for (j = 0; j < k; j++, c++)
-+      g_FastPos[c] = (Byte)slotFast;
-+  }
-+}
-+
-+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-+  res = p->g_FastPos[pos >> i] + (i * 2); }
-+/*
-+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-+  p->g_FastPos[pos >> 6] + 12 : \
-+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-+*/
-+
-+#define GetPosSlot1(pos) p->g_FastPos[pos]
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-+
-+#endif
-+
-+
-+#define LZMA_NUM_REPS 4
-+
-+typedef unsigned CState;
-+
-+typedef struct
-+{
-+  UInt32 price;
-+
-+  CState state;
-+  int prev1IsChar;
-+  int prev2;
-+
-+  UInt32 posPrev2;
-+  UInt32 backPrev2;
-+
-+  UInt32 posPrev;
-+  UInt32 backPrev;
-+  UInt32 backs[LZMA_NUM_REPS];
-+} COptimal;
-+
-+#define kNumOpts (1 << 12)
-+
-+#define kNumLenToPosStates 4
-+#define kNumPosSlotBits 6
-+#define kDicLogSizeMin 0
-+#define kDicLogSizeMax 32
-+#define kDistTableSizeMax (kDicLogSizeMax * 2)
-+
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+#define kAlignMask (kAlignTableSize - 1)
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-+
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+#define LZMA_PB_MAX 4
-+#define LZMA_LC_MAX 8
-+#define LZMA_LP_MAX 4
-+
-+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-+
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define LZMA_MATCH_LEN_MIN 2
-+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-+
-+#define kNumStates 12
-+
-+typedef struct
-+{
-+  CLzmaProb choice;
-+  CLzmaProb choice2;
-+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-+  CLzmaProb high[kLenNumHighSymbols];
-+} CLenEnc;
-+
-+typedef struct
-+{
-+  CLenEnc p;
-+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-+  UInt32 tableSize;
-+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-+} CLenPriceEnc;
-+
-+typedef struct
-+{
-+  UInt32 range;
-+  Byte cache;
-+  UInt64 low;
-+  UInt64 cacheSize;
-+  Byte *buf;
-+  Byte *bufLim;
-+  Byte *bufBase;
-+  ISeqOutStream *outStream;
-+  UInt64 processed;
-+  SRes res;
-+} CRangeEnc;
-+
-+typedef struct
-+{
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+} CSaveState;
-+
-+typedef struct
-+{
-+  IMatchFinder matchFinder;
-+  void *matchFinderObj;
-+
-+  #ifndef _7ZIP_ST
-+  Bool mtMode;
-+  CMatchFinderMt matchFinderMt;
-+  #endif
-+
-+  CMatchFinder matchFinderBase;
-+
-+  #ifndef _7ZIP_ST
-+  Byte pad[128];
-+  #endif
-+  
-+  UInt32 optimumEndIndex;
-+  UInt32 optimumCurrentIndex;
-+
-+  UInt32 longestMatchLength;
-+  UInt32 numPairs;
-+  UInt32 numAvail;
-+  COptimal opt[kNumOpts];
-+  
-+  #ifndef LZMA_LOG_BSR
-+  Byte g_FastPos[1 << kNumLogBits];
-+  #endif
-+
-+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-+  UInt32 numFastBytes;
-+  UInt32 additionalOffset;
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+
-+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-+  UInt32 alignPrices[kAlignTableSize];
-+  UInt32 alignPriceCount;
-+
-+  UInt32 distTableSize;
-+
-+  unsigned lc, lp, pb;
-+  unsigned lpMask, pbMask;
-+
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  unsigned lclp;
-+
-+  Bool fastMode;
-+  
-+  CRangeEnc rc;
-+
-+  Bool writeEndMark;
-+  UInt64 nowPos64;
-+  UInt32 matchPriceCount;
-+  Bool finished;
-+  Bool multiThread;
-+
-+  SRes result;
-+  UInt32 dictSize;
-+  UInt32 matchFinderCycles;
-+
-+  int needInit;
-+
-+  CSaveState saveState;
-+} CLzmaEnc;
-+
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CSaveState *dest = &p->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-+}
-+
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *dest = (CLzmaEnc *)pp;
-+  const CSaveState *p = &dest->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-+}
-+
-+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+
-+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-+    return SZ_ERROR_PARAM;
-+  p->dictSize = props.dictSize;
-+  p->matchFinderCycles = props.mc;
-+  {
-+    unsigned fb = props.fb;
-+    if (fb < 5)
-+      fb = 5;
-+    if (fb > LZMA_MATCH_LEN_MAX)
-+      fb = LZMA_MATCH_LEN_MAX;
-+    p->numFastBytes = fb;
-+  }
-+  p->lc = props.lc;
-+  p->lp = props.lp;
-+  p->pb = props.pb;
-+  p->fastMode = (props.algo == 0);
-+  p->matchFinderBase.btMode = props.btMode;
-+  {
-+    UInt32 numHashBytes = 4;
-+    if (props.btMode)
-+    {
-+      if (props.numHashBytes < 2)
-+        numHashBytes = 2;
-+      else if (props.numHashBytes < 4)
-+        numHashBytes = props.numHashBytes;
-+    }
-+    p->matchFinderBase.numHashBytes = numHashBytes;
-+  }
-+
-+  p->matchFinderBase.cutValue = props.mc;
-+
-+  p->writeEndMark = props.writeEndMark;
-+
-+  #ifndef _7ZIP_ST
-+  /*
-+  if (newMultiThread != _multiThread)
-+  {
-+    ReleaseMatchFinder();
-+    _multiThread = newMultiThread;
-+  }
-+  */
-+  p->multiThread = (props.numThreads > 1);
-+  #endif
-+
-+  return SZ_OK;
-+}
-+
-+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-+
-+#define IsCharState(s) ((s) < 7)
-+
-+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-+
-+#define kInfinityPrice (1 << 30)
-+
-+static void RangeEnc_Construct(CRangeEnc *p)
-+{
-+  p->outStream = 0;
-+  p->bufBase = 0;
-+}
-+
-+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-+
-+#define RC_BUF_SIZE (1 << 16)
-+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  if (p->bufBase == 0)
-+  {
-+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-+    if (p->bufBase == 0)
-+      return 0;
-+    p->bufLim = p->bufBase + RC_BUF_SIZE;
-+  }
-+  return 1;
-+}
-+
-+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->bufBase);
-+  p->bufBase = 0;
-+}
-+
-+static void RangeEnc_Init(CRangeEnc *p)
-+{
-+  /* Stream.Init(); */
-+  p->low = 0;
-+  p->range = 0xFFFFFFFF;
-+  p->cacheSize = 1;
-+  p->cache = 0;
-+
-+  p->buf = p->bufBase;
-+
-+  p->processed = 0;
-+  p->res = SZ_OK;
-+}
-+
-+static void RangeEnc_FlushStream(CRangeEnc *p)
-+{
-+  size_t num;
-+  if (p->res != SZ_OK)
-+    return;
-+  num = p->buf - p->bufBase;
-+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-+    p->res = SZ_ERROR_WRITE;
-+  p->processed += num;
-+  p->buf = p->bufBase;
-+}
-+
-+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-+{
-+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-+  {
-+    Byte temp = p->cache;
-+    do
-+    {
-+      Byte *buf = p->buf;
-+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-+      p->buf = buf;
-+      if (buf == p->bufLim)
-+        RangeEnc_FlushStream(p);
-+      temp = 0xFF;
-+    }
-+    while (--p->cacheSize != 0);
-+    p->cache = (Byte)((UInt32)p->low >> 24);
-+  }
-+  p->cacheSize++;
-+  p->low = (UInt32)p->low << 8;
-+}
-+
-+static void RangeEnc_FlushData(CRangeEnc *p)
-+{
-+  int i;
-+  for (i = 0; i < 5; i++)
-+    RangeEnc_ShiftLow(p);
-+}
-+
-+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-+{
-+  do
-+  {
-+    p->range >>= 1;
-+    p->low += p->range & (0 - ((value >> --numBits) & 1));
-+    if (p->range < kTopValue)
-+    {
-+      p->range <<= 8;
-+      RangeEnc_ShiftLow(p);
-+    }
-+  }
-+  while (numBits != 0);
-+}
-+
-+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-+{
-+  UInt32 ttt = *prob;
-+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-+  if (symbol == 0)
-+  {
-+    p->range = newBound;
-+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-+  }
-+  else
-+  {
-+    p->low += newBound;
-+    p->range -= newBound;
-+    ttt -= ttt >> kNumMoveBits;
-+  }
-+  *prob = (CLzmaProb)ttt;
-+  if (p->range < kTopValue)
-+  {
-+    p->range <<= 8;
-+    RangeEnc_ShiftLow(p);
-+  }
-+}
-+
-+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-+{
-+  symbol |= 0x100;
-+  do
-+  {
-+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-+{
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+{
-+  UInt32 i;
-+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-+  {
-+    const int kCyclesBits = kNumBitPriceShiftBits;
-+    UInt32 w = i;
-+    UInt32 bitCount = 0;
-+    int j;
-+    for (j = 0; j < kCyclesBits; j++)
-+    {
-+      w = w * w;
-+      bitCount <<= 1;
-+      while (w >= ((UInt32)1 << 16))
-+      {
-+        w >>= 1;
-+        bitCount++;
-+      }
-+    }
-+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-+  }
-+}
-+
-+
-+#define GET_PRICE(prob, symbol) \
-+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICEa(prob, symbol) \
-+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= 0x100;
-+  do
-+  {
-+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+
-+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0;)
-+  {
-+    UInt32 bit;
-+    i--;
-+    bit = (symbol >> i) & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+  }
-+}
-+
-+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = 0; i < numBitLevels; i++)
-+  {
-+    UInt32 bit = symbol & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+    symbol >>= 1;
-+  }
-+}
-+
-+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= (1 << numBitLevels);
-+  while (symbol != 1)
-+  {
-+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-+    symbol >>= 1;
-+  }
-+  return price;
-+}
-+
-+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0; i--)
-+  {
-+    UInt32 bit = symbol & 1;
-+    symbol >>= 1;
-+    price += GET_PRICEa(probs[m], bit);
-+    m = (m << 1) | bit;
-+  }
-+  return price;
-+}
-+
-+
-+static void LenEnc_Init(CLenEnc *p)
-+{
-+  unsigned i;
-+  p->choice = p->choice2 = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-+    p->low[i] = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-+    p->mid[i] = kProbInitValue;
-+  for (i = 0; i < kLenNumHighSymbols; i++)
-+    p->high[i] = kProbInitValue;
-+}
-+
-+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-+{
-+  if (symbol < kLenNumLowSymbols)
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 0);
-+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-+  }
-+  else
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 1);
-+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-+    }
-+  }
-+}
-+
-+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-+{
-+  UInt32 a0 = GET_PRICE_0a(p->choice);
-+  UInt32 a1 = GET_PRICE_1a(p->choice);
-+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-+  UInt32 i = 0;
-+  for (i = 0; i < kLenNumLowSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-+  }
-+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-+  }
-+  for (; i < numSymbols; i++)
-+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-+}
-+
-+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-+{
-+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-+  p->counters[posState] = p->tableSize;
-+}
-+
-+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-+{
-+  UInt32 posState;
-+  for (posState = 0; posState < numPosStates; posState++)
-+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-+{
-+  LenEnc_Encode(&p->p, rc, symbol, posState);
-+  if (updatePrice)
-+    if (--p->counters[posState] == 0)
-+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+
-+
-+
-+static void MovePos(CLzmaEnc *p, UInt32 num)
-+{
-+  #ifdef SHOW_STAT
-+  ttt += num;
-+  printf("\n MovePos %d", num);
-+  #endif
-+  if (num != 0)
-+  {
-+    p->additionalOffset += num;
-+    p->matchFinder.Skip(p->matchFinderObj, num);
-+  }
-+}
-+
-+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-+{
-+  UInt32 lenRes = 0, numPairs;
-+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-+  #ifdef SHOW_STAT
-+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-+  ttt++;
-+  {
-+    UInt32 i;
-+    for (i = 0; i < numPairs; i += 2)
-+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-+  }
-+  #endif
-+  if (numPairs > 0)
-+  {
-+    lenRes = p->matches[numPairs - 2];
-+    if (lenRes == p->numFastBytes)
-+    {
-+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+      UInt32 distance = p->matches[numPairs - 1] + 1;
-+      UInt32 numAvail = p->numAvail;
-+      if (numAvail > LZMA_MATCH_LEN_MAX)
-+        numAvail = LZMA_MATCH_LEN_MAX;
-+      {
-+        const Byte *pby2 = pby - distance;
-+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-+      }
-+    }
-+  }
-+  p->additionalOffset++;
-+  *numDistancePairsRes = numPairs;
-+  return lenRes;
-+}
-+
-+
-+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-+#define IsShortRep(p) ((p)->backPrev == 0)
-+
-+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-+{
-+  return
-+    GET_PRICE_0(p->isRepG0[state]) +
-+    GET_PRICE_0(p->isRep0Long[state][posState]);
-+}
-+
-+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-+{
-+  UInt32 price;
-+  if (repIndex == 0)
-+  {
-+    price = GET_PRICE_0(p->isRepG0[state]);
-+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-+  }
-+  else
-+  {
-+    price = GET_PRICE_1(p->isRepG0[state]);
-+    if (repIndex == 1)
-+      price += GET_PRICE_0(p->isRepG1[state]);
-+    else
-+    {
-+      price += GET_PRICE_1(p->isRepG1[state]);
-+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-+    }
-+  }
-+  return price;
-+}
-+
-+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-+{
-+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-+    GetPureRepPrice(p, repIndex, state, posState);
-+}
-+
-+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-+{
-+  UInt32 posMem = p->opt[cur].posPrev;
-+  UInt32 backMem = p->opt[cur].backPrev;
-+  p->optimumEndIndex = cur;
-+  do
-+  {
-+    if (p->opt[cur].prev1IsChar)
-+    {
-+      MakeAsChar(&p->opt[posMem])
-+      p->opt[posMem].posPrev = posMem - 1;
-+      if (p->opt[cur].prev2)
-+      {
-+        p->opt[posMem - 1].prev1IsChar = False;
-+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-+      }
-+    }
-+    {
-+      UInt32 posPrev = posMem;
-+      UInt32 backCur = backMem;
-+      
-+      backMem = p->opt[posPrev].backPrev;
-+      posMem = p->opt[posPrev].posPrev;
-+      
-+      p->opt[posPrev].backPrev = backCur;
-+      p->opt[posPrev].posPrev = cur;
-+      cur = posPrev;
-+    }
-+  }
-+  while (cur != 0);
-+  *backRes = p->opt[0].backPrev;
-+  p->optimumCurrentIndex  = p->opt[0].posPrev;
-+  return p->optimumCurrentIndex;
-+}
-+
-+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-+
-+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-+  UInt32 *matches;
-+  const Byte *data;
-+  Byte curByte, matchByte;
-+  if (p->optimumEndIndex != p->optimumCurrentIndex)
-+  {
-+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-+    *backRes = opt->backPrev;
-+    p->optimumCurrentIndex = opt->posPrev;
-+    return lenRes;
-+  }
-+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-+  
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  if (numAvail < 2)
-+  {
-+    *backRes = (UInt32)(-1);
-+    return 1;
-+  }
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  repMaxIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 lenTest;
-+    const Byte *data2;
-+    reps[i] = p->reps[i];
-+    data2 = data - (reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+    {
-+      repLens[i] = 0;
-+      continue;
-+    }
-+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+    repLens[i] = lenTest;
-+    if (lenTest > repLens[repMaxIndex])
-+      repMaxIndex = i;
-+  }
-+  if (repLens[repMaxIndex] >= p->numFastBytes)
-+  {
-+    UInt32 lenRes;
-+    *backRes = repMaxIndex;
-+    lenRes = repLens[repMaxIndex];
-+    MovePos(p, lenRes - 1);
-+    return lenRes;
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+  curByte = *data;
-+  matchByte = *(data - (reps[0] + 1));
-+
-+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-+  {
-+    *backRes = (UInt32)-1;
-+    return 1;
-+  }
-+
-+  p->opt[0].state = (CState)p->state;
-+
-+  posState = (position & p->pbMask);
-+
-+  {
-+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-+        (!IsCharState(p->state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+  }
-+
-+  MakeAsChar(&p->opt[1]);
-+
-+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-+
-+  if (matchByte == curByte)
-+  {
-+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-+    if (shortRepPrice < p->opt[1].price)
-+    {
-+      p->opt[1].price = shortRepPrice;
-+      MakeAsShortRep(&p->opt[1]);
-+    }
-+  }
-+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-+
-+  if (lenEnd < 2)
-+  {
-+    *backRes = p->opt[1].backPrev;
-+    return 1;
-+  }
-+
-+  p->opt[1].posPrev = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+    p->opt[0].backs[i] = reps[i];
-+
-+  len = lenEnd;
-+  do
-+    p->opt[len--].price = kInfinityPrice;
-+  while (len >= 2);
-+
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 repLen = repLens[i];
-+    UInt32 price;
-+    if (repLen < 2)
-+      continue;
-+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-+    do
-+    {
-+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-+      COptimal *opt = &p->opt[repLen];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = i;
-+        opt->prev1IsChar = False;
-+      }
-+    }
-+    while (--repLen >= 2);
-+  }
-+
-+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-+
-+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-+  if (len <= mainLen)
-+  {
-+    UInt32 offs = 0;
-+    while (len > matches[offs])
-+      offs += 2;
-+    for (; ; len++)
-+    {
-+      COptimal *opt;
-+      UInt32 distance = matches[offs + 1];
-+
-+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-+      UInt32 lenToPosState = GetLenToPosState(len);
-+      if (distance < kNumFullDistances)
-+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-+      else
-+      {
-+        UInt32 slot;
-+        GetPosSlot2(distance, slot);
-+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-+      }
-+      opt = &p->opt[len];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = distance + LZMA_NUM_REPS;
-+        opt->prev1IsChar = False;
-+      }
-+      if (len == matches[offs])
-+      {
-+        offs += 2;
-+        if (offs == numPairs)
-+          break;
-+      }
-+    }
-+  }
-+
-+  cur = 0;
-+
-+    #ifdef SHOW_STAT2
-+    if (position >= 0)
-+    {
-+      unsigned i;
-+      printf("\n pos = %4X", position);
-+      for (i = cur; i <= lenEnd; i++)
-+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-+    }
-+    #endif
-+
-+  for (;;)
-+  {
-+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-+    Bool nextIsChar;
-+    Byte curByte, matchByte;
-+    const Byte *data;
-+    COptimal *curOpt;
-+    COptimal *nextOpt;
-+
-+    cur++;
-+    if (cur == lenEnd)
-+      return Backward(p, backRes, cur);
-+
-+    newLen = ReadMatchDistances(p, &numPairs);
-+    if (newLen >= p->numFastBytes)
-+    {
-+      p->numPairs = numPairs;
-+      p->longestMatchLength = newLen;
-+      return Backward(p, backRes, cur);
-+    }
-+    position++;
-+    curOpt = &p->opt[cur];
-+    posPrev = curOpt->posPrev;
-+    if (curOpt->prev1IsChar)
-+    {
-+      posPrev--;
-+      if (curOpt->prev2)
-+      {
-+        state = p->opt[curOpt->posPrev2].state;
-+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      else
-+        state = p->opt[posPrev].state;
-+      state = kLiteralNextStates[state];
-+    }
-+    else
-+      state = p->opt[posPrev].state;
-+    if (posPrev == cur - 1)
-+    {
-+      if (IsShortRep(curOpt))
-+        state = kShortRepNextStates[state];
-+      else
-+        state = kLiteralNextStates[state];
-+    }
-+    else
-+    {
-+      UInt32 pos;
-+      const COptimal *prevOpt;
-+      if (curOpt->prev1IsChar && curOpt->prev2)
-+      {
-+        posPrev = curOpt->posPrev2;
-+        pos = curOpt->backPrev2;
-+        state = kRepNextStates[state];
-+      }
-+      else
-+      {
-+        pos = curOpt->backPrev;
-+        if (pos < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      prevOpt = &p->opt[posPrev];
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        UInt32 i;
-+        reps[0] = prevOpt->backs[pos];
-+        for (i = 1; i <= pos; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+        for (; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i];
-+      }
-+      else
-+      {
-+        UInt32 i;
-+        reps[0] = (pos - LZMA_NUM_REPS);
-+        for (i = 1; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+      }
-+    }
-+    curOpt->state = (CState)state;
-+
-+    curOpt->backs[0] = reps[0];
-+    curOpt->backs[1] = reps[1];
-+    curOpt->backs[2] = reps[2];
-+    curOpt->backs[3] = reps[3];
-+
-+    curPrice = curOpt->price;
-+    nextIsChar = False;
-+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+    curByte = *data;
-+    matchByte = *(data - (reps[0] + 1));
-+
-+    posState = (position & p->pbMask);
-+
-+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-+    {
-+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+      curAnd1Price +=
-+        (!IsCharState(state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+    }
-+
-+    nextOpt = &p->opt[cur + 1];
-+
-+    if (curAnd1Price < nextOpt->price)
-+    {
-+      nextOpt->price = curAnd1Price;
-+      nextOpt->posPrev = cur;
-+      MakeAsChar(nextOpt);
-+      nextIsChar = True;
-+    }
-+
-+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-+    
-+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-+    {
-+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-+      if (shortRepPrice <= nextOpt->price)
-+      {
-+        nextOpt->price = shortRepPrice;
-+        nextOpt->posPrev = cur;
-+        MakeAsShortRep(nextOpt);
-+        nextIsChar = True;
-+      }
-+    }
-+    numAvailFull = p->numAvail;
-+    {
-+      UInt32 temp = kNumOpts - 1 - cur;
-+      if (temp < numAvailFull)
-+        numAvailFull = temp;
-+    }
-+
-+    if (numAvailFull < 2)
-+      continue;
-+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-+
-+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-+    {
-+      /* try Literal + rep0 */
-+      UInt32 temp;
-+      UInt32 lenTest2;
-+      const Byte *data2 = data - (reps[0] + 1);
-+      UInt32 limit = p->numFastBytes + 1;
-+      if (limit > numAvailFull)
-+        limit = numAvailFull;
-+
-+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-+      lenTest2 = temp - 1;
-+      if (lenTest2 >= 2)
-+      {
-+        UInt32 state2 = kLiteralNextStates[state];
-+        UInt32 posStateNext = (position + 1) & p->pbMask;
-+        UInt32 nextRepMatchPrice = curAnd1Price +
-+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+            GET_PRICE_1(p->isRep[state2]);
-+        /* for (; lenTest2 >= 2; lenTest2--) */
-+        {
-+          UInt32 curAndLenPrice;
-+          COptimal *opt;
-+          UInt32 offset = cur + 1 + lenTest2;
-+          while (lenEnd < offset)
-+            p->opt[++lenEnd].price = kInfinityPrice;
-+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+          opt = &p->opt[offset];
-+          if (curAndLenPrice < opt->price)
-+          {
-+            opt->price = curAndLenPrice;
-+            opt->posPrev = cur + 1;
-+            opt->backPrev = 0;
-+            opt->prev1IsChar = True;
-+            opt->prev2 = False;
-+          }
-+        }
-+      }
-+    }
-+    
-+    startLen = 2; /* speed optimization */
-+    {
-+    UInt32 repIndex;
-+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-+    {
-+      UInt32 lenTest;
-+      UInt32 lenTestTemp;
-+      UInt32 price;
-+      const Byte *data2 = data - (reps[repIndex] + 1);
-+      if (data[0] != data2[0] || data[1] != data2[1])
-+        continue;
-+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+      while (lenEnd < cur + lenTest)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+      lenTestTemp = lenTest;
-+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-+      do
-+      {
-+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-+        COptimal *opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = repIndex;
-+          opt->prev1IsChar = False;
-+        }
-+      }
-+      while (--lenTest >= 2);
-+      lenTest = lenTestTemp;
-+      
-+      if (repIndex == 0)
-+        startLen = lenTest + 1;
-+        
-+      /* if (_maxMode) */
-+        {
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kRepNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice =
-+                price + p->repLenEnc.prices[posState][lenTest - 2] +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (position + lenTest + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = repIndex;
-+              }
-+            }
-+          }
-+        }
-+    }
-+    }
-+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-+    if (newLen > numAvail)
-+    {
-+      newLen = numAvail;
-+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-+      matches[numPairs] = newLen;
-+      numPairs += 2;
-+    }
-+    if (newLen >= startLen)
-+    {
-+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-+      UInt32 offs, curBack, posSlot;
-+      UInt32 lenTest;
-+      while (lenEnd < cur + newLen)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+
-+      offs = 0;
-+      while (startLen > matches[offs])
-+        offs += 2;
-+      curBack = matches[offs + 1];
-+      GetPosSlot2(curBack, posSlot);
-+      for (lenTest = /*2*/ startLen; ; lenTest++)
-+      {
-+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-+        UInt32 lenToPosState = GetLenToPosState(lenTest);
-+        COptimal *opt;
-+        if (curBack < kNumFullDistances)
-+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-+        else
-+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-+        
-+        opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = curBack + LZMA_NUM_REPS;
-+          opt->prev1IsChar = False;
-+        }
-+
-+        if (/*_maxMode && */lenTest == matches[offs])
-+        {
-+          /* Try Match + Literal + Rep0 */
-+          const Byte *data2 = data - (curBack + 1);
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kMatchNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice = curAndLenPrice +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (posStateNext + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-+              }
-+            }
-+          }
-+          offs += 2;
-+          if (offs == numPairs)
-+            break;
-+          curBack = matches[offs + 1];
-+          if (curBack >= kNumFullDistances)
-+            GetPosSlot2(curBack, posSlot);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-+
-+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-+  const Byte *data;
-+  const UInt32 *matches;
-+
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  *backRes = (UInt32)-1;
-+  if (numAvail < 2)
-+    return 1;
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+
-+  repLen = repIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-+    if (len >= p->numFastBytes)
-+    {
-+      *backRes = i;
-+      MovePos(p, len - 1);
-+      return len;
-+    }
-+    if (len > repLen)
-+    {
-+      repIndex = i;
-+      repLen = len;
-+    }
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+
-+  mainDist = 0; /* for GCC */
-+  if (mainLen >= 2)
-+  {
-+    mainDist = matches[numPairs - 1];
-+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-+    {
-+      if (!ChangePair(matches[numPairs - 3], mainDist))
-+        break;
-+      numPairs -= 2;
-+      mainLen = matches[numPairs - 2];
-+      mainDist = matches[numPairs - 1];
-+    }
-+    if (mainLen == 2 && mainDist >= 0x80)
-+      mainLen = 1;
-+  }
-+
-+  if (repLen >= 2 && (
-+        (repLen + 1 >= mainLen) ||
-+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-+  {
-+    *backRes = repIndex;
-+    MovePos(p, repLen - 1);
-+    return repLen;
-+  }
-+  
-+  if (mainLen < 2 || numAvail <= 2)
-+    return 1;
-+
-+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-+  if (p->longestMatchLength >= 2)
-+  {
-+    UInt32 newDistance = matches[p->numPairs - 1];
-+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-+        (p->longestMatchLength > mainLen + 1) ||
-+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-+      return 1;
-+  }
-+  
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len, limit;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    limit = mainLen - 1;
-+    for (len = 2; len < limit && data[len] == data2[len]; len++);
-+    if (len >= limit)
-+      return 1;
-+  }
-+  *backRes = mainDist + LZMA_NUM_REPS;
-+  MovePos(p, mainLen - 2);
-+  return mainLen;
-+}
-+
-+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-+{
-+  UInt32 len;
-+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+  p->state = kMatchNextStates[p->state];
-+  len = LZMA_MATCH_LEN_MIN;
-+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-+}
-+
-+static SRes CheckErrors(CLzmaEnc *p)
-+{
-+  if (p->result != SZ_OK)
-+    return p->result;
-+  if (p->rc.res != SZ_OK)
-+    p->result = SZ_ERROR_WRITE;
-+  if (p->matchFinderBase.result != SZ_OK)
-+    p->result = SZ_ERROR_READ;
-+  if (p->result != SZ_OK)
-+    p->finished = True;
-+  return p->result;
-+}
-+
-+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-+{
-+  /* ReleaseMFStream(); */
-+  p->finished = True;
-+  if (p->writeEndMark)
-+    WriteEndMarker(p, nowPos & p->pbMask);
-+  RangeEnc_FlushData(&p->rc);
-+  RangeEnc_FlushStream(&p->rc);
-+  return CheckErrors(p);
-+}
-+
-+static void FillAlignPrices(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < kAlignTableSize; i++)
-+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-+  p->alignPriceCount = 0;
-+}
-+
-+static void FillDistancesPrices(CLzmaEnc *p)
-+{
-+  UInt32 tempPrices[kNumFullDistances];
-+  UInt32 i, lenToPosState;
-+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-+  {
-+    UInt32 posSlot = GetPosSlot1(i);
-+    UInt32 footerBits = ((posSlot >> 1) - 1);
-+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-+  }
-+
-+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-+  {
-+    UInt32 posSlot;
-+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-+
-+    {
-+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-+      UInt32 i;
-+      for (i = 0; i < kStartPosModelIndex; i++)
-+        distancesPrices[i] = posSlotPrices[i];
-+      for (; i < kNumFullDistances; i++)
-+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-+    }
-+  }
-+  p->matchPriceCount = 0;
-+}
-+
-+void LzmaEnc_Construct(CLzmaEnc *p)
-+{
-+  RangeEnc_Construct(&p->rc);
-+  MatchFinder_Construct(&p->matchFinderBase);
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Construct(&p->matchFinderMt);
-+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-+  #endif
-+
-+  {
-+    CLzmaEncProps props;
-+    LzmaEncProps_Init(&props);
-+    LzmaEnc_SetProps(p, &props);
-+  }
-+
-+  #ifndef LZMA_LOG_BSR
-+  LzmaEnc_FastPosInit(p->g_FastPos);
-+  #endif
-+
-+  LzmaEnc_InitPriceTables(p->ProbPrices);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-+{
-+  void *p;
-+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-+  if (p != 0)
-+    LzmaEnc_Construct((CLzmaEnc *)p);
-+  return p;
-+}
-+
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->litProbs);
-+  alloc->Free(alloc, p->saveState.litProbs);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-+  #endif
-+  MatchFinder_Free(&p->matchFinderBase, allocBig);
-+  LzmaEnc_FreeLits(p, alloc);
-+  RangeEnc_Free(&p->rc, alloc);
-+}
-+
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-+  alloc->Free(alloc, p);
-+}
-+
-+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-+{
-+  UInt32 nowPos32, startPos32;
-+  if (p->needInit)
-+  {
-+    p->matchFinder.Init(p->matchFinderObj);
-+    p->needInit = 0;
-+  }
-+
-+  if (p->finished)
-+    return p->result;
-+  RINOK(CheckErrors(p));
-+
-+  nowPos32 = (UInt32)p->nowPos64;
-+  startPos32 = nowPos32;
-+
-+  if (p->nowPos64 == 0)
-+  {
-+    UInt32 numPairs;
-+    Byte curByte;
-+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+      return Flush(p, nowPos32);
-+    ReadMatchDistances(p, &numPairs);
-+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-+    p->state = kLiteralNextStates[p->state];
-+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-+    p->additionalOffset--;
-+    nowPos32++;
-+  }
-+
-+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-+  for (;;)
-+  {
-+    UInt32 pos, len, posState;
-+
-+    if (p->fastMode)
-+      len = GetOptimumFast(p, &pos);
-+    else
-+      len = GetOptimum(p, nowPos32, &pos);
-+
-+    #ifdef SHOW_STAT2
-+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-+    #endif
-+
-+    posState = nowPos32 & p->pbMask;
-+    if (len == 1 && pos == (UInt32)-1)
-+    {
-+      Byte curByte;
-+      CLzmaProb *probs;
-+      const Byte *data;
-+
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+      curByte = *data;
-+      probs = LIT_PROBS(nowPos32, *(data - 1));
-+      if (IsCharState(p->state))
-+        LitEnc_Encode(&p->rc, probs, curByte);
-+      else
-+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-+      p->state = kLiteralNextStates[p->state];
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-+        if (pos == 0)
-+        {
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-+        }
-+        else
-+        {
-+          UInt32 distance = p->reps[pos];
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-+          if (pos == 1)
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-+          else
-+          {
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-+            if (pos == 3)
-+              p->reps[3] = p->reps[2];
-+            p->reps[2] = p->reps[1];
-+          }
-+          p->reps[1] = p->reps[0];
-+          p->reps[0] = distance;
-+        }
-+        if (len == 1)
-+          p->state = kShortRepNextStates[p->state];
-+        else
-+        {
-+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+          p->state = kRepNextStates[p->state];
-+        }
-+      }
-+      else
-+      {
-+        UInt32 posSlot;
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+        p->state = kMatchNextStates[p->state];
-+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+        pos -= LZMA_NUM_REPS;
-+        GetPosSlot(pos, posSlot);
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          UInt32 footerBits = ((posSlot >> 1) - 1);
-+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+          UInt32 posReduced = pos - base;
-+
-+          if (posSlot < kEndPosModelIndex)
-+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-+          else
-+          {
-+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-+            p->alignPriceCount++;
-+          }
-+        }
-+        p->reps[3] = p->reps[2];
-+        p->reps[2] = p->reps[1];
-+        p->reps[1] = p->reps[0];
-+        p->reps[0] = pos;
-+        p->matchPriceCount++;
-+      }
-+    }
-+    p->additionalOffset -= len;
-+    nowPos32 += len;
-+    if (p->additionalOffset == 0)
-+    {
-+      UInt32 processed;
-+      if (!p->fastMode)
-+      {
-+        if (p->matchPriceCount >= (1 << 7))
-+          FillDistancesPrices(p);
-+        if (p->alignPriceCount >= kAlignTableSize)
-+          FillAlignPrices(p);
-+      }
-+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+        break;
-+      processed = nowPos32 - startPos32;
-+      if (useLimits)
-+      {
-+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-+          break;
-+      }
-+      else if (processed >= (1 << 15))
-+      {
-+        p->nowPos64 += nowPos32 - startPos32;
-+        return CheckErrors(p);
-+      }
-+    }
-+  }
-+  p->nowPos64 += nowPos32 - startPos32;
-+  return Flush(p, nowPos32);
-+}
-+
-+#define kBigHashDicLimit ((UInt32)1 << 24)
-+
-+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 beforeSize = kNumOpts;
-+  Bool btMode;
-+  if (!RangeEnc_Alloc(&p->rc, alloc))
-+    return SZ_ERROR_MEM;
-+  btMode = (p->matchFinderBase.btMode != 0);
-+  #ifndef _7ZIP_ST
-+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-+  #endif
-+
-+  {
-+    unsigned lclp = p->lc + p->lp;
-+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-+    {
-+      LzmaEnc_FreeLits(p, alloc);
-+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-+      {
-+        LzmaEnc_FreeLits(p, alloc);
-+        return SZ_ERROR_MEM;
-+      }
-+      p->lclp = lclp;
-+    }
-+  }
-+
-+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-+
-+  if (beforeSize + p->dictSize < keepWindowSize)
-+    beforeSize = keepWindowSize - p->dictSize;
-+
-+  #ifndef _7ZIP_ST
-+  if (p->mtMode)
-+  {
-+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-+    p->matchFinderObj = &p->matchFinderMt;
-+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-+  }
-+  else
-+  #endif
-+  {
-+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-+      return SZ_ERROR_MEM;
-+    p->matchFinderObj = &p->matchFinderBase;
-+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-+  }
-+  return SZ_OK;
-+}
-+
-+void LzmaEnc_Init(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  p->state = 0;
-+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-+    p->reps[i] = 0;
-+
-+  RangeEnc_Init(&p->rc);
-+
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    UInt32 j;
-+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-+    {
-+      p->isMatch[i][j] = kProbInitValue;
-+      p->isRep0Long[i][j] = kProbInitValue;
-+    }
-+    p->isRep[i] = kProbInitValue;
-+    p->isRepG0[i] = kProbInitValue;
-+    p->isRepG1[i] = kProbInitValue;
-+    p->isRepG2[i] = kProbInitValue;
-+  }
-+
-+  {
-+    UInt32 num = 0x300 << (p->lp + p->lc);
-+    for (i = 0; i < num; i++)
-+      p->litProbs[i] = kProbInitValue;
-+  }
-+
-+  {
-+    for (i = 0; i < kNumLenToPosStates; i++)
-+    {
-+      CLzmaProb *probs = p->posSlotEncoder[i];
-+      UInt32 j;
-+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-+        probs[j] = kProbInitValue;
-+    }
-+  }
-+  {
-+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-+      p->posEncoders[i] = kProbInitValue;
-+  }
-+
-+  LenEnc_Init(&p->lenEnc.p);
-+  LenEnc_Init(&p->repLenEnc.p);
-+
-+  for (i = 0; i < (1 << kNumAlignBits); i++)
-+    p->posAlignEncoder[i] = kProbInitValue;
-+
-+  p->optimumEndIndex = 0;
-+  p->optimumCurrentIndex = 0;
-+  p->additionalOffset = 0;
-+
-+  p->pbMask = (1 << p->pb) - 1;
-+  p->lpMask = (1 << p->lp) - 1;
-+}
-+
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
-+{
-+  if (!p->fastMode)
-+  {
-+    FillDistancesPrices(p);
-+    FillAlignPrices(p);
-+  }
-+
-+  p->lenEnc.tableSize =
-+  p->repLenEnc.tableSize =
-+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-+}
-+
-+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 i;
-+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-+    if (p->dictSize <= ((UInt32)1 << i))
-+      break;
-+  p->distTableSize = i * 2;
-+
-+  p->finished = False;
-+  p->result = SZ_OK;
-+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-+  LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  p->nowPos64 = 0;
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  p->rc.outStream = outStream;
-+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-+}
-+
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-+    ISeqInStream *inStream, UInt32 keepWindowSize,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-+{
-+  p->matchFinderBase.directInput = 1;
-+  p->matchFinderBase.bufferBase = (Byte *)src;
-+  p->matchFinderBase.directInputRem = srcLen;
-+}
-+
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+  p->needInit = 1;
-+
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
-+{
-+  #ifndef _7ZIP_ST
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  if (p->mtMode)
-+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-+  #else
-+  pp = pp;
-+  #endif
-+}
-+
-+typedef struct
-+{
-+  ISeqOutStream funcTable;
-+  Byte *data;
-+  SizeT rem;
-+  Bool overflow;
-+} CSeqOutStreamBuf;
-+
-+static size_t MyWrite(void *pp, const void *data, size_t size)
-+{
-+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-+  if (p->rem < size)
-+  {
-+    size = p->rem;
-+    p->overflow = True;
-+  }
-+  memcpy(p->data, data, size);
-+  p->rem -= size;
-+  p->data += size;
-+  return size;
-+}
-+
-+
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+}
-+
-+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+}
-+
-+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  UInt64 nowPos64;
-+  SRes res;
-+  CSeqOutStreamBuf outStream;
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = False;
-+  p->finished = False;
-+  p->result = SZ_OK;
-+
-+  if (reInit)
-+    LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  nowPos64 = p->nowPos64;
-+  RangeEnc_Init(&p->rc);
-+  p->rc.outStream = &outStream.funcTable;
-+
-+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-+  
-+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+
-+  return res;
-+}
-+
-+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-+{
-+  SRes res = SZ_OK;
-+
-+  #ifndef _7ZIP_ST
-+  Byte allocaDummy[0x300];
-+  int i = 0;
-+  for (i = 0; i < 16; i++)
-+    allocaDummy[i] = (Byte)i;
-+  #endif
-+
-+  for (;;)
-+  {
-+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-+    if (res != SZ_OK || p->finished != 0)
-+      break;
-+    if (progress != 0)
-+    {
-+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-+      if (res != SZ_OK)
-+      {
-+        res = SZ_ERROR_PROGRESS;
-+        break;
-+      }
-+    }
-+  }
-+  LzmaEnc_Finish(p);
-+  return res;
-+}
-+
-+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-+}
-+
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  int i;
-+  UInt32 dictSize = p->dictSize;
-+  if (*size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_PARAM;
-+  *size = LZMA_PROPS_SIZE;
-+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-+
-+  for (i = 11; i <= 30; i++)
-+  {
-+    if (dictSize <= ((UInt32)2 << i))
-+    {
-+      dictSize = (2 << i);
-+      break;
-+    }
-+    if (dictSize <= ((UInt32)3 << i))
-+    {
-+      dictSize = (3 << i);
-+      break;
-+    }
-+  }
-+
-+  for (i = 0; i < 4; i++)
-+    props[1 + i] = (Byte)(dictSize >> (8 * i));
-+  return SZ_OK;
-+}
-+
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  SRes res;
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+
-+  CSeqOutStreamBuf outStream;
-+
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = writeEndMark;
-+
-+  p->rc.outStream = &outStream.funcTable;
-+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-+  if (res == SZ_OK)
-+    res = LzmaEnc_Encode2(p, progress);
-+
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+  return res;
-+}
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-+  SRes res;
-+  if (p == 0)
-+    return SZ_ERROR_MEM;
-+
-+  res = LzmaEnc_SetProps(p, props);
-+  if (res == SZ_OK)
-+  {
-+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-+    if (res == SZ_OK)
-+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-+          writeEndMark, progress, alloc, allocBig);
-+  }
-+
-+  LzmaEnc_Destroy(p, alloc, allocBig);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/Makefile
-@@ -0,0 +1,7 @@
-+lzma_compress-objs := LzFind.o LzmaEnc.o
-+lzma_decompress-objs := LzmaDec.o
-+
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
-+
-+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbbd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch
deleted file mode 100644
index a7082de492..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -198,7 +198,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash.patch
deleted file mode 100644
index 7010d367b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/014-samsung_flash.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = 
- static void cfi_fixup_major_minor(struct cfi_private *cfi,
- 				  struct cfi_pri_amdstd *extp)
- {
-+	// manufacturers defined in include/linux/mtd/cfi.h
-+
- 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- 	    extp->MajorVersion == '0')
- 		extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 	mtd->name    = map->name;
- 	mtd->writesize = 1;
- 
-+	printk(" CFI mfr 0x%08x\n", cfi->mfr);	// TODO: Is there a more general place to print this info?
-+	printk(" CFI id  0x%08x\n", cfi->id);
-+
- 	if (cfi->cfi_mode==CFI_MODE_CFI){
- 		unsigned char bootloc;
- 		/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 		cfi_fixup_major_minor(cfi, extp);
- 
--		if (extp->MajorVersion != '1' ||
--		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
-+		// valid primary extension versions are: 1.0, 1.1, 1.2, 1.3
-+		// see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on
-+		//      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
-+		if (extp->MajorVersion < '1' ||
-+		    extp->MajorVersion > '1' ||
-+		    (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {
- 			printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--			       "version %c.%c.\n",  extp->MajorVersion,
--			       extp->MinorVersion);
-+			       "version %c.%c (0x%02x/0x%02x).\n",
-+			       extp->MajorVersion, extp->MinorVersion,
-+			       extp->MajorVersion, extp->MinorVersion);
- 			kfree(extp);
- 			kfree(mtd);
- 			return NULL;
- 		}
- 
-+		printk("  Amd/Fujitsu Extended Query version %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		/* Install our own private info structure */
- 		cfi->cmdset_priv = extp;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
deleted file mode 100644
index 83e24451c1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,54 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+#include <asm/bootinfo.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	const char		*mach_id;
-+	const char		*mach_name;
-+	void			(*mach_setup)(void);
-+};
-+
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
-+static struct mips_machine machine_##_type			\
-+		__used __section(.mips.machines.init) =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_id	= machine_id_##_type,			\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};
-+
-+extern long __mips_machines_start;
-+extern long __mips_machines_end;
-+
-+#ifdef CONFIG_MIPS_MACHINE
-+int  mips_machtype_setup(char *id) __init;
-+void mips_machine_setup(void) __init;
-+void mips_set_machine_name(const char *name) __init;
-+char *mips_get_machine_name(void);
-+#else
-+static inline int mips_machtype_setup(char *id) { return 1; }
-+static inline void mips_machine_setup(void) { }
-+static inline void mips_set_machine_name(const char *name) { }
-+static inline char *mips_get_machine_name(void) { return NULL; }
-+#endif /* CONFIG_MIPS_MACHINE */
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,86 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+
-+#include <asm/mips_machine.h>
-+
-+static struct mips_machine *mips_machine __initdata;
-+static char *mips_machine_name = "Unknown";
-+
-+#define for_each_machine(mach) \
-+	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
-+	     (mach) && \
-+	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
-+	     (mach)++)
-+
-+__init void mips_set_machine_name(const char *name)
-+{
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	p = kstrdup(name, GFP_KERNEL);
-+	if (!p)
-+		pr_err("MIPS: no memory for machine_name\n");
-+
-+	mips_machine_name = p;
-+}
-+
-+char *mips_get_machine_name(void)
-+{
-+	return mips_machine_name;
-+}
-+
-+__init int mips_machtype_setup(char *id)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, id) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
-+	pr_err("%-24s : %s\n", "id", "name");
-+	for_each_machine(mach)
-+		pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+__init void mips_machine_setup(void)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mips_machtype == mach->mach_type) {
-+			mips_machine = mach;
-+			break;
-+		}
-+	}
-+
-+	if (!mips_machine)
-+		return;
-+
-+	mips_set_machine_name(mips_machine->mach_name);
-+	pr_info("MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mips_machine->mach_setup)
-+		mips_machine->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+		if (mips_get_machine_name())
-+			seq_printf(m, "machine\t\t\t: %s\n",
-+				   mips_get_machine_name());
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -98,6 +98,13 @@ SECTIONS
- 	INIT_TEXT_SECTION(PAGE_SIZE)
- 	INIT_DATA_SECTION(16)
- 
-+	. = ALIGN(4);
-+	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-+		__mips_machines_start = .;
-+		*(.mips.machines.init)
-+		__mips_machines_end = .;
-+	}
-+
- 	/* .exit.text is discarded at runtime, not link time, to deal with
- 	 * references from .rodata
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index a304f0bcc7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -856,6 +856,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch
deleted file mode 100644
index a65be6f2cf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -841,6 +841,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -58,7 +58,11 @@
- #define __mips 4
- 
- /* Function which emulates a floating point instruction. */
-+#ifdef CONFIG_DEBUG_FS
-+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
-+#endif
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- 	mips_instruction);
- 
-@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
--#ifdef CONFIG_DEBUG_FS
--DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
--#endif
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
--
- #ifdef CONFIG_DEBUG_FS
- 
- static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void)
- 	return 0;
- }
- __initcall(debugfs_fpuemu);
--#endif
-+#endif /* CONFIG_DEBUGFS */
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch
deleted file mode 100644
index 024e7f16cd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch
deleted file mode 100644
index ad9074a885..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef SYMBOL_PREFIX
- #define VMLINUX_SYMBOL(sym) sym
- #else
-@@ -258,35 +279,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -327,7 +348,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -642,6 +663,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -195,16 +195,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23cb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
deleted file mode 100644
index 0cf19789ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -40,6 +40,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- /*
-  * This is a quirk for the Ricoh MMC controller found as a part of
diff --git a/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index be4d2bfc2d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -802,3 +802,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -186,3 +186,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.34/055-lzma_arm_kernel.patch b/target/linux/generic-2.6/patches-2.6.34/055-lzma_arm_kernel.patch
deleted file mode 100644
index cda31d2f71..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/055-lzma_arm_kernel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0f226a0f104c7d1da1d215b8013359273e39e18 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre@free-electrons.com>
-Date: Fri, 16 Oct 2009 16:17:22 +0200
-Subject: [PATCH] Add LZMA decompression on ARM
-
-
-Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
----
- arch/arm/Kconfig                      |    1 +
- arch/arm/boot/compressed/Makefile     |    1 +
- arch/arm/boot/compressed/misc.c       |    4 ++++
- arch/arm/boot/compressed/piggy.lzma.S |    6 ++++++
- 4 files changed, 12 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
-
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -21,6 +21,7 @@ config ARM
- 	select HAVE_GENERIC_DMA_COHERENT
- 	select HAVE_KERNEL_GZIP
- 	select HAVE_KERNEL_LZO
-+	select HAVE_KERNEL_LZMA
- 	select HAVE_PERF_EVENTS
- 	select PERF_USE_VMALLOC
- 	help
---- a/arch/arm/boot/compressed/Makefile
-+++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
- 
- suffix_$(CONFIG_KERNEL_GZIP) = gzip
- suffix_$(CONFIG_KERNEL_LZO)  = lzo
-+suffix_$(CONFIG_KERNEL_LZMA) = lzma
- 
- targets       := vmlinux vmlinux.lds \
- 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
---- a/arch/arm/boot/compressed/decompress.c
-+++ b/arch/arm/boot/compressed/decompress.c
-@@ -40,6 +40,10 @@ extern void error(char *);
- #include "../../../../lib/decompress_unlzo.c"
- #endif
- 
-+#ifdef CONFIG_KERNEL_LZMA
-+#include "../../../../lib/decompress_unlzma.c"
-+#endif
-+
- void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
- {
- 	decompress(input, len, NULL, NULL, output, NULL, error);
---- /dev/null
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -0,0 +1,6 @@
-+	.section .piggydata,#alloc
-+	.globl	input_data
-+input_data:
-+	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-+	.globl	input_data_end
-+input_data_end:
diff --git a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
deleted file mode 100644
index d2890c3e7f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -233,10 +234,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -274,17 +276,17 @@ static struct block2mtd_dev *add_device(
- 
- 	mutex_init(&dev->write_mutex);
- 
--	/* Setup the MTD structure */
--	/* make the name contain the block device in */
--	name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
--			GFP_KERNEL);
-+	if (!mtdname)
-+		mtdname = devname;
-+
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
--	sprintf(name, "block2mtd: %s", devname);
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -297,14 +299,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -377,9 +382,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -390,7 +395,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -409,8 +414,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -444,7 +451,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -639,6 +639,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch
deleted file mode 100644
index d70d1835a3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -30,6 +30,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -82,6 +84,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -94,6 +102,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -105,10 +117,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -123,10 +139,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -137,7 +157,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -189,12 +212,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -203,6 +236,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -211,52 +247,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -264,17 +277,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch
deleted file mode 100644
index 4cc7ef517c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -269,6 +269,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 16ce76ce8c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		err = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee88..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index f630059e87..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 96a5bd0132..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 9235e6ee16..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
diff --git a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 293ed8bdb6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
- 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
- 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+	{ "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel and SST serial flash tend to power
-+	 * Atmel, SST and Intel/Numonyx serial flash tend to power
- 	 * up with the software protection bits set
- 	 */
- 
- 	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89 ||
- 	    info->jedec_id >> 16 == 0xbf) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
diff --git a/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 34dfdbd894..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -707,6 +707,7 @@ static const struct spi_device_id m25p_i
- 	{ "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
- 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
- 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
- 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
- 
- 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch b/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
deleted file mode 100644
index d5889ce62d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/088-winbond_cmdset.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/chips/gen_probe.c
-+++ b/drivers/mtd/chips/gen_probe.c
-@@ -249,6 +249,7 @@ static struct mtd_info *check_cmd_set(st
- #endif
- #ifdef CONFIG_MTD_CFI_AMDSTD
- 	case 0x0002:
-+	case 0x0006:
- 		return cfi_cmdset_0002(map, primary);
- #endif
- #ifdef CONFIG_MTD_CFI_STAA
diff --git a/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch
deleted file mode 100644
index 46923358b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -327,9 +327,32 @@ static void cfi_fixup_major_minor(struct
- {
- 	// manufacturers defined in include/linux/mtd/cfi.h
- 
--	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
--	    extp->MajorVersion == '0')
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '0') {
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		extp->MajorVersion = '1';
-+		extp->MinorVersion = '0';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
-+
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '3' && extp->MinorVersion == '3') {
-+		printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+		       "should be compatibile with Amd/Fujitsu.\n");
-+
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
-+		extp->MajorVersion = '1';	// set to 1.3 (last defined version)
-+		extp->MinorVersion = '3';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
- }
- 
- struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
diff --git a/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index a19ff620cb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -883,6 +883,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -202,6 +202,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -178,6 +178,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
deleted file mode 100644
index 41c487b689..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -95,6 +95,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP) ||
- 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -145,13 +148,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -161,6 +186,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -203,7 +230,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- /* for const-correctness */
-@@ -336,8 +362,28 @@ ipt_do_table(struct sk_buff *skb,
- 	struct xt_match_param mtpar;
- 	struct xt_target_param tgpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -354,13 +400,6 @@ ipt_do_table(struct sk_buff *skb,
- 	mtpar.family  = tgpar.family = NFPROTO_IPV4;
- 	mtpar.hooknum = tgpar.hooknum = hook;
- 
--	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
--	xt_info_rdlock_bh();
--	private = table->private;
--	table_base = private->entries[smp_processor_id()];
--
--	e = get_entry(table_base, private->hook_entry[hook]);
--
- 	/* For return from builtin chain */
- 	back = get_entry(table_base, private->underflow[hook]);
- 
-@@ -991,6 +1030,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
- 			goto free_counters;
- 		}
-+
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
- 
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
diff --git a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch
deleted file mode 100644
index d595346874..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch
+++ /dev/null
@@ -1,1336 +0,0 @@
---- /dev/null
-+++ b/drivers/net/imq.c
-@@ -0,0 +1,632 @@
-+/*
-+ *             Pseudo-driver for the intermediate queue device.
-+ *
-+ *             This program is free software; you can redistribute it and/or
-+ *             modify it under the terms of the GNU General Public License
-+ *             as published by the Free Software Foundation; either version
-+ *             2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:    Patrick McHardy, <kaber@trash.net>
-+ *
-+ *            The first version was written by Martin Devera, <devik@cdi.cz>
-+ *
-+ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
-+ *              - Update patch to 2.4.21
-+ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
-+ *              - Fix "Dead-loop on netdevice imq"-issue
-+ *             Marcel Sebek <sebek64@post.cz>
-+ *              - Update to 2.6.2-rc1
-+ *
-+ *	       After some time of inactivity there is a group taking care
-+ *	       of IMQ again: http://www.linuximq.net
-+ *
-+ *
-+ *	       2004/06/30 - New version of IMQ patch to kernels <=2.6.7
-+ *             including the following changes:
-+ *
-+ *	       - Correction of ipv6 support "+"s issue (Hasso Tepper)
-+ *	       - Correction of imq_init_devs() issue that resulted in
-+ *	       kernel OOPS unloading IMQ as module (Norbert Buchmuller)
-+ *	       - Addition of functionality to choose number of IMQ devices
-+ *	       during kernel config (Andre Correa)
-+ *	       - Addition of functionality to choose how IMQ hooks on
-+ *	       PRE and POSTROUTING (after or before NAT) (Andre Correa)
-+ *	       - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
-+ *
-+ *
-+ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
-+ *             released with almost no problems. 2.6.14-x was released
-+ *             with some important changes: nfcache was removed; After
-+ *             some weeks of trouble we figured out that some IMQ fields
-+ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
-+ *             These functions are correctly patched by this new patch version.
-+ *
-+ *             Thanks for all who helped to figure out all the problems with
-+ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
-+ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
-+ *             I didn't forget anybody). I apologize again for my lack of time.
-+ *
-+ *
-+ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
-+ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
-+ *             recursive locking. New initialization routines to fix 'rmmod' not
-+ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
-+ *
-+ *             2008/08/06 - 2.6.26 - (JK)
-+ *              - Replaced tasklet with 'netif_schedule()'.
-+ *              - Cleaned up and added comments for imq_nf_queue().
-+ *
-+ *             2009/04/12
-+ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
-+ *                control buffer. This is needed because qdisc-layer on kernels
-+ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
-+ *              - Add better locking for IMQ device. Hopefully this will solve
-+ *                SMP issues. (Jussi Kivilinna)
-+ *              - Port to 2.6.27
-+ *              - Port to 2.6.28
-+ *              - Port to 2.6.29 + fix rmmod not working
-+ *
-+ *             2009/04/20 - (Jussi Kivilinna)
-+ *              - Use netdevice feature flags to avoid extra packet handling
-+ *                by core networking layer and possibly increase performance.
-+ *
-+ *             2009/09/26 - (Jussi Kivilinna)
-+ *              - Add imq_nf_reinject_lockless to fix deadlock with
-+ *                imq_nf_queue/imq_nf_reinject.
-+ *
-+ *             2009/12/08 - (Jussi Kivilinna)
-+ *              - Port to 2.6.32
-+ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
-+ *              - Also add better error checking for skb->nf_queue_entry usage
-+ *
-+ *	       Also, many thanks to pablo Sebastian Greco for making the initial
-+ *	       patch and to those who helped the testing.
-+ *
-+ *             More info at: http://www.linuximq.net/ (Andre Correa)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/moduleparam.h>
-+#include <linux/list.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/if_arp.h>
-+#include <linux/netfilter.h>
-+#include <linux/netfilter_ipv4.h>
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	#include <linux/netfilter_ipv6.h>
-+#endif
-+#include <linux/imq.h>
-+#include <net/pkt_sched.h>
-+#include <net/netfilter/nf_queue.h>
-+
-+static nf_hookfn imq_nf_hook;
-+
-+static struct nf_hook_ops imq_ingress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv4 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP_PRI_LAST
-+#else
-+	.priority	= NF_IP_PRI_NAT_SRC - 1
-+#endif
-+};
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+static struct nf_hook_ops imq_ingress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_PRE_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	.priority	= NF_IP6_PRI_MANGLE + 1
-+#else
-+	.priority	= NF_IP6_PRI_NAT_DST + 1
-+#endif
-+};
-+
-+static struct nf_hook_ops imq_egress_ipv6 = {
-+	.hook		= imq_nf_hook,
-+	.owner		= THIS_MODULE,
-+	.pf		= PF_INET6,
-+	.hooknum	= NF_INET_POST_ROUTING,
-+#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
-+	.priority	= NF_IP6_PRI_LAST
-+#else
-+	.priority	= NF_IP6_PRI_NAT_SRC - 1
-+#endif
-+};
-+#endif
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
-+#else
-+static unsigned int numdevs = IMQ_MAX_DEVS;
-+#endif
-+
-+static DEFINE_SPINLOCK(imq_nf_queue_lock);
-+
-+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
-+
-+
-+static struct net_device_stats *imq_get_stats(struct net_device *dev)
-+{
-+	return &dev->stats;
-+}
-+
-+/* called for packets kfree'd in qdiscs at places other than enqueue */
-+static void imq_skb_destructor(struct sk_buff *skb)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+
-+	if (entry) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree(entry);
-+	}
-+
-+	skb_restore_cb(skb); /* kfree backup */
-+}
-+
-+/* locking not needed when called from imq_nf_queue */
-+static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
-+						unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		nf_reinject(entry, verdict);
-+		return;
-+	}
-+
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+}
-+
-+static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
-+{
-+	int status;
-+
-+	if (!entry->next_outfn) {
-+		spin_lock_bh(&imq_nf_queue_lock);
-+		nf_reinject(entry, verdict);
-+		spin_unlock_bh(&imq_nf_queue_lock);
-+		return;
-+	}
-+
-+	rcu_read_lock();
-+	local_bh_disable();
-+	status = entry->next_outfn(entry, entry->next_queuenum);
-+	local_bh_enable();
-+	if (status < 0) {
-+		nf_queue_entry_release_refs(entry);
-+		kfree_skb(entry->skb);
-+		kfree(entry);
-+	}
-+
-+	rcu_read_unlock();
-+}
-+
-+static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct nf_queue_entry *entry = skb->nf_queue_entry;
-+
-+	skb->nf_queue_entry = NULL;
-+	dev->trans_start = jiffies;
-+
-+	dev->stats.tx_bytes += skb->len;
-+	dev->stats.tx_packets++;
-+
-+	if (entry == NULL) {
-+		/* We don't know what is going on here.. packet is queued for
-+		 * imq device, but (probably) not by us.
-+		 *
-+		 * If this packet was not send here by imq_nf_queue(), then
-+		 * skb_save_cb() was not used and skb_free() should not show:
-+		 *   WARNING: IMQ: kfree_skb: skb->cb_next:..
-+		 * and/or
-+		 *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
-+		 *
-+		 * However if this message is shown, then IMQ is somehow broken
-+		 * and you should report this to linuximq.net.
-+		 */
-+
-+		/* imq_dev_xmit is black hole that eats all packets, report that
-+		 * we eat this packet happily and increase dropped counters.
-+		 */
-+
-+		dev->stats.tx_dropped++;
-+		dev_kfree_skb(skb);
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	skb_restore_cb(skb); /* restore skb->cb */
-+
-+	skb->imq_flags = 0;
-+	skb->destructor = NULL;
-+
-+	imq_nf_reinject(entry, NF_ACCEPT);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
-+{
-+	struct net_device *dev;
-+	struct sk_buff *skb_orig, *skb, *skb_shared;
-+	struct Qdisc *q;
-+	struct netdev_queue *txq;
-+	int users, index;
-+	int retval = -EINVAL;
-+
-+	index = entry->skb->imq_flags & IMQ_F_IFMASK;
-+	if (unlikely(index > numdevs - 1)) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING
-+			       "IMQ: invalid device specified, highest is %u\n",
-+			       numdevs - 1);
-+		retval = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* check for imq device by index from cache */
-+	dev = imq_devs_cache[index];
-+	if (unlikely(!dev)) {
-+		char buf[8];
-+
-+		/* get device by name and cache result */
-+		snprintf(buf, sizeof(buf), "imq%d", index);
-+		dev = dev_get_by_name(&init_net, buf);
-+		if (!dev) {
-+			/* not found ?!*/
-+			BUG();
-+			retval = -ENODEV;
-+			goto out;
-+		}
-+
-+		imq_devs_cache[index] = dev;
-+		dev_put(dev);
-+	}
-+
-+	if (unlikely(!(dev->flags & IFF_UP))) {
-+		entry->skb->imq_flags = 0;
-+		imq_nf_reinject_lockless(entry, NF_ACCEPT);
-+		retval = 0;
-+		goto out;
-+	}
-+	dev->last_rx = jiffies;
-+
-+	skb = entry->skb;
-+	skb_orig = NULL;
-+
-+	/* skb has owner? => make clone */
-+	if (unlikely(skb->destructor)) {
-+		skb_orig = skb;
-+		skb = skb_clone(skb, GFP_ATOMIC);
-+		if (!skb) {
-+			retval = -ENOMEM;
-+			goto out;
-+		}
-+		entry->skb = skb;
-+	}
-+
-+	skb->nf_queue_entry = entry;
-+
-+	dev->stats.rx_bytes += skb->len;
-+	dev->stats.rx_packets++;
-+
-+	txq = dev_pick_tx(dev, skb);
-+
-+	q = rcu_dereference(txq->qdisc);
-+	if (unlikely(!q->enqueue))
-+		goto packet_not_eaten_by_imq_dev;
-+
-+	spin_lock_bh(qdisc_lock(q));
-+
-+	users = atomic_read(&skb->users);
-+
-+	skb_shared = skb_get(skb); /* increase reference count by one */
-+	skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
-+					overwrite it */
-+	qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
-+
-+	if (likely(atomic_read(&skb_shared->users) == users + 1)) {
-+		kfree_skb(skb_shared); /* decrease reference count by one */
-+
-+		skb->destructor = &imq_skb_destructor;
-+
-+		/* cloned? */
-+		if (skb_orig)
-+			kfree_skb(skb_orig); /* free original */
-+
-+		spin_unlock_bh(qdisc_lock(q));
-+
-+		/* schedule qdisc dequeue */
-+		__netif_schedule(q);
-+
-+		retval = 0;
-+		goto out;
-+	} else {
-+		skb_restore_cb(skb_shared); /* restore skb->cb */
-+		skb->nf_queue_entry = NULL;
-+		/* qdisc dropped packet and decreased skb reference count of
-+		 * skb, so we don't really want to and try refree as that would
-+		 * actually destroy the skb. */
-+		spin_unlock_bh(qdisc_lock(q));
-+		goto packet_not_eaten_by_imq_dev;
-+	}
-+
-+packet_not_eaten_by_imq_dev:
-+	/* cloned? restore original */
-+	if (skb_orig) {
-+		kfree_skb(skb);
-+		entry->skb = skb_orig;
-+	}
-+	retval = -1;
-+out:
-+	return retval;
-+}
-+
-+static struct nf_queue_handler nfqh = {
-+	.name  = "imq",
-+	.outfn = imq_nf_queue,
-+};
-+
-+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
-+				const struct net_device *indev,
-+				const struct net_device *outdev,
-+				int (*okfn)(struct sk_buff *))
-+{
-+	if (pskb->imq_flags & IMQ_F_ENQUEUE)
-+		return NF_QUEUE;
-+
-+	return NF_ACCEPT;
-+}
-+
-+static int imq_close(struct net_device *dev)
-+{
-+	netif_stop_queue(dev);
-+	return 0;
-+}
-+
-+static int imq_open(struct net_device *dev)
-+{
-+	netif_start_queue(dev);
-+	return 0;
-+}
-+
-+static const struct net_device_ops imq_netdev_ops = {
-+	.ndo_open		= imq_open,
-+	.ndo_stop		= imq_close,
-+	.ndo_start_xmit		= imq_dev_xmit,
-+	.ndo_get_stats		= imq_get_stats,
-+};
-+
-+static void imq_setup(struct net_device *dev)
-+{
-+	dev->netdev_ops		= &imq_netdev_ops;
-+	dev->type               = ARPHRD_VOID;
-+	dev->mtu                = 16000;
-+	dev->tx_queue_len       = 11000;
-+	dev->flags              = IFF_NOARP;
-+	dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
-+				  NETIF_F_GSO | NETIF_F_HW_CSUM |
-+				  NETIF_F_HIGHDMA;
-+	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
-+}
-+
-+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
-+{
-+	int ret = 0;
-+
-+	if (tb[IFLA_ADDRESS]) {
-+		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
-+			ret = -EINVAL;
-+			goto end;
-+		}
-+		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
-+			ret = -EADDRNOTAVAIL;
-+			goto end;
-+		}
-+	}
-+	return 0;
-+end:
-+	printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static struct rtnl_link_ops imq_link_ops __read_mostly = {
-+	.kind		= "imq",
-+	.priv_size	= 0,
-+	.setup		= imq_setup,
-+	.validate	= imq_validate,
-+};
-+
-+static int __init imq_init_hooks(void)
-+{
-+	int err;
-+
-+	nf_register_queue_imq_handler(&nfqh);
-+
-+	err = nf_register_hook(&imq_ingress_ipv4);
-+	if (err)
-+		goto err1;
-+
-+	err = nf_register_hook(&imq_egress_ipv4);
-+	if (err)
-+		goto err2;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	err = nf_register_hook(&imq_ingress_ipv6);
-+	if (err)
-+		goto err3;
-+
-+	err = nf_register_hook(&imq_egress_ipv6);
-+	if (err)
-+		goto err4;
-+#endif
-+
-+	return 0;
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+err4:
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+err3:
-+	nf_unregister_hook(&imq_egress_ipv4);
-+#endif
-+err2:
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+err1:
-+	nf_unregister_queue_imq_handler();
-+	return err;
-+}
-+
-+static int __init imq_init_one(int index)
-+{
-+	struct net_device *dev;
-+	int ret;
-+
-+	dev = alloc_netdev(0, "imq%d", imq_setup);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	ret = dev_alloc_name(dev, dev->name);
-+	if (ret < 0)
-+		goto fail;
-+
-+	dev->rtnl_link_ops = &imq_link_ops;
-+	ret = register_netdevice(dev);
-+	if (ret < 0)
-+		goto fail;
-+
-+	return 0;
-+fail:
-+	free_netdev(dev);
-+	return ret;
-+}
-+
-+static int __init imq_init_devs(void)
-+{
-+	int err, i;
-+
-+	if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
-+		printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
-+		       IMQ_MAX_DEVS);
-+		return -EINVAL;
-+	}
-+
-+	rtnl_lock();
-+	err = __rtnl_link_register(&imq_link_ops);
-+
-+	for (i = 0; i < numdevs && !err; i++)
-+		err = imq_init_one(i);
-+
-+	if (err) {
-+		__rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+	}
-+	rtnl_unlock();
-+
-+	return err;
-+}
-+
-+static int __init imq_init_module(void)
-+{
-+	int err;
-+
-+#if defined(CONFIG_IMQ_NUM_DEVS)
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
-+	BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
-+#endif
-+
-+	err = imq_init_devs();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
-+		return err;
-+	}
-+
-+	err = imq_init_hooks();
-+	if (err) {
-+		printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
-+		rtnl_link_unregister(&imq_link_ops);
-+		memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+		return err;
-+	}
-+
-+	printk(KERN_INFO "IMQ driver loaded successfully.\n");
-+
-+#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
-+#endif
-+#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
-+	printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
-+#else
-+	printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
-+#endif
-+
-+	return 0;
-+}
-+
-+static void __exit imq_unhook(void)
-+{
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	nf_unregister_hook(&imq_ingress_ipv6);
-+	nf_unregister_hook(&imq_egress_ipv6);
-+#endif
-+	nf_unregister_hook(&imq_ingress_ipv4);
-+	nf_unregister_hook(&imq_egress_ipv4);
-+
-+	nf_unregister_queue_imq_handler();
-+}
-+
-+static void __exit imq_cleanup_devs(void)
-+{
-+	rtnl_link_unregister(&imq_link_ops);
-+	memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
-+}
-+
-+static void __exit imq_exit_module(void)
-+{
-+	imq_unhook();
-+	imq_cleanup_devs();
-+	printk(KERN_INFO "IMQ driver unloaded successfully.\n");
-+}
-+
-+module_init(imq_init_module);
-+module_exit(imq_exit_module);
-+
-+module_param(numdevs, int, 0);
-+MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
-+			"be created)");
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
-+			"http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS_RTNL_LINK("imq");
-+
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -121,6 +121,129 @@ config EQUALIZER
- 	  To compile this driver as a module, choose M here: the module
- 	  will be called eql.  If unsure, say N.
- 
-+config IMQ
-+	tristate "IMQ (intermediate queueing device) support"
-+	depends on NETDEVICES && NETFILTER
-+	---help---
-+	  The IMQ device(s) is used as placeholder for QoS queueing
-+	  disciplines. Every packet entering/leaving the IP stack can be
-+	  directed through the IMQ device where it's enqueued/dequeued to the
-+	  attached qdisc. This allows you to treat network devices as classes
-+	  and distribute bandwidth among them. Iptables is used to specify
-+	  through which IMQ device, if any, packets travel.
-+
-+	  More information at: http://www.linuximq.net/
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called imq.  If unsure, say N.
-+
-+choice
-+	prompt "IMQ behavior (PRE/POSTROUTING)"
-+	depends on IMQ
-+	default IMQ_BEHAVIOR_AB
-+	help
-+
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		IMQ can work in any of the following ways:
-+
-+		    PREROUTING   |      POSTROUTING
-+		-----------------|-------------------
-+		#1  After NAT    |      After NAT
-+		#2  After NAT    |      Before NAT
-+		#3  Before NAT   |      After NAT
-+		#4  Before NAT   |      Before NAT
-+
-+		The default behavior is to hook before NAT on PREROUTING
-+		and after NAT on POSTROUTING (#3).
-+
-+		This settings are specially usefull when trying to use IMQ
-+		to shape NATed clients.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AA
-+	bool "IMQ AA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_AB
-+	bool "IMQ AB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   After NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BA
-+	bool "IMQ BA"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  After NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+config IMQ_BEHAVIOR_BB
-+	bool "IMQ BB"
-+	help
-+		This settings defines how IMQ behaves in respect to its
-+		hooking in PREROUTING and POSTROUTING.
-+
-+		Choosing this option will make IMQ hook like this:
-+
-+		PREROUTING:   Before NAT
-+		POSTROUTING:  Before NAT
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
-+endchoice
-+
-+config IMQ_NUM_DEVS
-+
-+	int "Number of IMQ devices"
-+	range 2 16
-+	depends on IMQ
-+	default "16"
-+	help
-+
-+		This settings defines how many IMQ devices will be
-+		created.
-+
-+		The default value is 16.
-+
-+		More information can be found at: www.linuximq.net
-+
-+		If not sure leave the default settings alone.
-+
- config TUN
- 	tristate "Universal TUN/TAP device driver support"
- 	select CRC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -169,6 +169,7 @@ obj-$(CONFIG_SLHC) += slhc.o
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_MACVTAP) += macvtap.o
---- /dev/null
-+++ b/include/linux/imq.h
-@@ -0,0 +1,13 @@
-+#ifndef _IMQ_H
-+#define _IMQ_H
-+
-+/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
-+#define IMQ_F_BITS	5
-+
-+#define IMQ_F_IFMASK	0x0f
-+#define IMQ_F_ENQUEUE	0x10
-+
-+#define IMQ_MAX_DEVS	(IMQ_F_IFMASK + 1)
-+
-+#endif /* _IMQ_H */
-+
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1203,6 +1203,7 @@ extern int		dev_alloc_name(struct net_de
- extern int		dev_open(struct net_device *dev);
- extern int		dev_close(struct net_device *dev);
- extern void		dev_disable_lro(struct net_device *dev);
-+extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
- extern int		dev_queue_xmit(struct sk_buff *skb);
- extern int		register_netdevice(struct net_device *dev);
- extern void		unregister_netdevice_queue(struct net_device *dev,
---- /dev/null
-+++ b/include/linux/netfilter/xt_IMQ.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_IMQ_H
-+#define _XT_IMQ_H
-+
-+struct xt_imq_info {
-+	unsigned int todev;     /* target imq device */
-+};
-+
-+#endif /* _XT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_IMQ_H
-+#define _IPT_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ipt_imq_info xt_imq_info
-+
-+#endif /* _IPT_IMQ_H */
-+
---- /dev/null
-+++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
-@@ -0,0 +1,10 @@
-+#ifndef _IP6T_IMQ_H
-+#define _IP6T_IMQ_H
-+
-+/* Backwards compatibility for old userspace */
-+#include <linux/netfilter/xt_IMQ.h>
-+
-+#define ip6t_imq_info xt_imq_info
-+
-+#endif /* _IP6T_IMQ_H */
-+
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
- #include <linux/dmaengine.h>
- #include <linux/hrtimer.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- 
- /* Don't change this without changing skb_csum_unnecessary! */
- #define CHECKSUM_NONE 0
-@@ -321,6 +324,9 @@ struct sk_buff {
- 	 * first. This is owned by whoever has the skb queued ATM.
- 	 */
- 	char			cb[48] __aligned(8);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	void                    *cb_next;
-+#endif
- 
- 	unsigned long		_skb_dst;
- #ifdef CONFIG_XFRM
-@@ -357,6 +363,9 @@ struct sk_buff {
- 	struct nf_conntrack	*nfct;
- 	struct sk_buff		*nfct_reasm;
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	struct nf_queue_entry	*nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
- #endif
-@@ -378,6 +387,10 @@ struct sk_buff {
- 
- 	/* 0/14 bit hole */
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	__u8			imq_flags:IMQ_F_BITS;
-+#endif
-+
- #ifdef CONFIG_NET_DMA
- 	dma_cookie_t		dma_cookie;
- #endif
-@@ -426,6 +439,12 @@ static inline struct rtable *skb_rtable(
- 	return (struct rtable *)skb_dst(skb);
- }
- 
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern int skb_save_cb(struct sk_buff *skb);
-+extern int skb_restore_cb(struct sk_buff *skb);
-+#endif
-+
- extern void kfree_skb(struct sk_buff *skb);
- extern void consume_skb(struct sk_buff *skb);
- extern void	       __kfree_skb(struct sk_buff *skb);
-@@ -1970,6 +1989,10 @@ static inline void __nf_copy(struct sk_b
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
- #endif
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	dst->imq_flags = src->imq_flags;
-+	dst->nf_queue_entry = src->nf_queue_entry;
-+#endif
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	dst->nf_bridge  = src->nf_bridge;
- 	nf_bridge_get(src->nf_bridge);
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -13,6 +13,12 @@ struct nf_queue_entry {
- 	struct net_device	*indev;
- 	struct net_device	*outdev;
- 	int			(*okfn)(struct sk_buff *);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	int			(*next_outfn)(struct nf_queue_entry *entry,
-+					      unsigned int queuenum);
-+	unsigned int		next_queuenum;
-+#endif
- };
- 
- #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
-@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u
- 				       const struct nf_queue_handler *qh);
- extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
- extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
-+extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
-+extern void nf_unregister_queue_imq_handler(void);
-+#endif
- 
- #endif /* _NF_QUEUE_H */
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -98,6 +98,9 @@
- #include <net/net_namespace.h>
- #include <net/sock.h>
- #include <linux/rtnetlink.h>
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#include <linux/imq.h>
-+#endif
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
- #include <linux/stat.h>
-@@ -1859,7 +1862,11 @@ int dev_hard_start_xmit(struct sk_buff *
- 	int rc = NETDEV_TX_OK;
- 
- 	if (likely(!skb->next)) {
--		if (!list_empty(&ptype_all))
-+		if (!list_empty(&ptype_all)
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		    && !(skb->imq_flags & IMQ_F_ENQUEUE)
-+#endif
-+		    )
- 			dev_queue_xmit_nit(skb, dev);
- 
- 		if (netif_needs_gso(dev, skb)) {
-@@ -1969,8 +1976,7 @@ static inline u16 dev_cap_txqueue(struct
- 	return queue_index;
- }
- 
--static struct netdev_queue *dev_pick_tx(struct net_device *dev,
--					struct sk_buff *skb)
-+struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
- {
- 	u16 queue_index;
- 	struct sock *sk = skb->sk;
-@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx(
- 	skb_set_queue_mapping(skb, queue_index);
- 	return netdev_get_tx_queue(dev, queue_index);
- }
-+EXPORT_SYMBOL(dev_pick_tx);
- 
- static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- 				 struct net_device *dev,
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -72,6 +72,9 @@
- 
- static struct kmem_cache *skbuff_head_cache __read_mostly;
- static struct kmem_cache *skbuff_fclone_cache __read_mostly;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
-+#endif
- 
- static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
- 				  struct pipe_buffer *buf)
-@@ -91,6 +94,83 @@ static int sock_pipe_buf_steal(struct pi
- 	return 1;
- }
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+/* Control buffer save/restore for IMQ devices */
-+struct skb_cb_table {
-+	void			*cb_next;
-+	atomic_t		refcnt;
-+	char      		cb[48];
-+};
-+
-+static DEFINE_SPINLOCK(skb_cb_store_lock);
-+
-+int skb_save_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
-+	if (!next)
-+		return -ENOMEM;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(next->cb, skb->cb, sizeof(skb->cb));
-+	next->cb_next = skb->cb_next;
-+
-+	atomic_set(&next->refcnt, 1);
-+
-+	skb->cb_next = next;
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_save_cb);
-+
-+int skb_restore_cb(struct sk_buff *skb)
-+{
-+	struct skb_cb_table *next;
-+
-+	if (!skb->cb_next)
-+		return 0;
-+
-+	next = skb->cb_next;
-+
-+	BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
-+
-+	memcpy(skb->cb, next->cb, sizeof(skb->cb));
-+	skb->cb_next = next->cb_next;
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	if (atomic_dec_and_test(&next->refcnt)) {
-+		kmem_cache_free(skbuff_cb_store_cache, next);
-+	}
-+
-+	spin_unlock(&skb_cb_store_lock);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(skb_restore_cb);
-+
-+static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
-+{
-+	struct skb_cb_table *next;
-+	struct sk_buff *old;
-+
-+	if (!__old->cb_next) {
-+		new->cb_next = NULL;
-+		return;
-+	}
-+
-+	spin_lock(&skb_cb_store_lock);
-+
-+	old = (struct sk_buff *)__old;
-+
-+	next = old->cb_next;
-+	atomic_inc(&next->refcnt);
-+	new->cb_next = next;
-+
-+	spin_unlock(&skb_cb_store_lock);
-+}
-+#endif
- 
- /* Pipe buffer operations for a socket. */
- static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -398,6 +478,26 @@ static void skb_release_head_state(struc
- 		WARN_ON(in_irq());
- 		skb->destructor(skb);
- 	}
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	/* This should not happen. When it does, avoid memleak by restoring
-+	the chain of cb-backups. */
-+	while(skb->cb_next != NULL) {
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
-+				"%08x\n", (unsigned int)skb->cb_next);
-+
-+		skb_restore_cb(skb);
-+	}
-+	/* This should not happen either, nf_queue_entry is nullified in
-+	 * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
-+	 * leaking entry pointers, maybe memory. We don't know if this is
-+	 * pointer to already freed memory, or should this be freed.
-+	 * If this happens we need to add refcounting, etc for nf_queue_entry.
-+	 */
-+	if (skb->nf_queue_entry && net_ratelimit())
-+		printk(KERN_WARNING
-+				"IMQ: kfree_skb: skb->nf_queue_entry != NULL");
-+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- 	nf_conntrack_put(skb->nfct);
- 	nf_conntrack_put_reasm(skb->nfct_reasm);
-@@ -538,6 +638,9 @@ static void __copy_skb_header(struct sk_
- 	new->sp			= secpath_get(old->sp);
- #endif
- 	memcpy(new->cb, old->cb, sizeof(old->cb));
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skb_copy_stored_cb(new, old);
-+#endif
- 	new->csum		= old->csum;
- 	new->local_df		= old->local_df;
- 	new->pkt_type		= old->pkt_type;
-@@ -2779,6 +2882,13 @@ void __init skb_init(void)
- 						0,
- 						SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- 						NULL);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
-+						  sizeof(struct skb_cb_table),
-+						  0,
-+						  SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-+						  NULL);
-+#endif
- }
- 
- /**
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -421,6 +421,18 @@ config NETFILTER_XT_TARGET_LED
- 	  For more information on the LEDs available on your system, see
- 	  Documentation/leds-class.txt
- 
-+config NETFILTER_XT_TARGET_IMQ
-+        tristate '"IMQ" target support'
-+	depends on NETFILTER_XTABLES
-+	depends on IP_NF_MANGLE || IP6_NF_MANGLE
-+	select IMQ
-+	default m if NETFILTER_ADVANCED=n
-+        help
-+          This option adds a `IMQ' target which is used to specify if and
-+          to which imq device packets should get enqueued/dequeued.
-+
-+          To compile it as a module, choose M here.  If unsure, say N.
-+
- config NETFILTER_XT_TARGET_MARK
- 	tristate '"MARK" target support'
- 	default m if NETFILTER_ADVANCED=n
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSEC
- obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -21,6 +21,26 @@ static const struct nf_queue_handler *qu
- 
- static DEFINE_MUTEX(queue_handler_mutex);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+static const struct nf_queue_handler *queue_imq_handler;
-+
-+void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, qh);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_register_queue_imq_handler);
-+
-+void nf_unregister_queue_imq_handler(void)
-+{
-+	mutex_lock(&queue_handler_mutex);
-+	rcu_assign_pointer(queue_imq_handler, NULL);
-+	mutex_unlock(&queue_handler_mutex);
-+}
-+EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
-+#endif
-+
- /* return EBUSY when somebody else is registered, return EEXIST if the
-  * same handler is registered, return 0 in case of success. */
- int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const
- }
- EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
- 
--static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
-+void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
- {
- 	/* Release those devices we held, or Alexey will kill me. */
- 	if (entry->indev)
-@@ -101,6 +121,7 @@ static void nf_queue_entry_release_refs(
- 	/* Drop reference to owner of hook which queued us. */
- 	module_put(entry->elem->owner);
- }
-+EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
- 
- /*
-  * Any packet that leaves via this function must come back
-@@ -122,12 +143,26 @@ static int __nf_queue(struct sk_buff *sk
- #endif
- 	const struct nf_afinfo *afinfo;
- 	const struct nf_queue_handler *qh;
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	const struct nf_queue_handler *qih = NULL;
-+#endif
- 
- 	/* QUEUE == DROP if noone is waiting, to be safe. */
- 	rcu_read_lock();
- 
- 	qh = rcu_dereference(queue_handler[pf]);
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+	if (pf == PF_INET || pf == PF_INET6)
-+#else
-+	if (pf == PF_INET)
-+#endif
-+		qih = rcu_dereference(queue_imq_handler);
-+
-+	if (!qh && !qih)
-+#else /* !IMQ */
- 	if (!qh)
-+#endif
- 		goto err_unlock;
- 
- 	afinfo = nf_get_afinfo(pf);
-@@ -146,6 +181,10 @@ static int __nf_queue(struct sk_buff *sk
- 		.indev	= indev,
- 		.outdev	= outdev,
- 		.okfn	= okfn,
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+		.next_outfn = qh ? qh->outfn : NULL,
-+		.next_queuenum = queuenum,
-+#endif
- 	};
- 
- 	/* If it's going away, ignore hook. */
-@@ -171,8 +210,19 @@ static int __nf_queue(struct sk_buff *sk
- 	}
- #endif
- 	afinfo->saveroute(skb, entry);
-+
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+	if (qih) {
-+		status = qih->outfn(entry, queuenum);
-+		goto imq_skip_queue;
-+	}
-+#endif
-+
- 	status = qh->outfn(entry, queuenum);
- 
-+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+imq_skip_queue:
-+#endif
- 	rcu_read_unlock();
- 
- 	if (status < 0) {
---- /dev/null
-+++ b/net/netfilter/xt_IMQ.c
-@@ -0,0 +1,73 @@
-+/*
-+ * This target marks packets to be enqueued to an imq device
-+ */
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_IMQ.h>
-+#include <linux/imq.h>
-+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+				const struct xt_target_param *par)
-+{
-+	const struct xt_imq_info *mr = par->targinfo;
-+
-+	pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
-+
-+	return XT_CONTINUE;
-+}
-+
-+static bool imq_checkentry(const struct xt_tgchk_param *par)
-+{
-+	struct xt_imq_info *mr = par->targinfo;
-+
-+	if (mr->todev > IMQ_MAX_DEVS - 1) {
-+		printk(KERN_WARNING
-+		       "IMQ: invalid device specified, highest is %u\n",
-+		       IMQ_MAX_DEVS - 1);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static struct xt_target xt_imq_reg[] __read_mostly = {
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+	{
-+		.name           = "IMQ",
-+		.family		= AF_INET6,
-+		.checkentry     = imq_checkentry,
-+		.target         = imq_target,
-+		.targetsize	= sizeof(struct xt_imq_info),
-+		.table		= "mangle",
-+		.me             = THIS_MODULE
-+	},
-+};
-+
-+static int __init imq_init(void)
-+{
-+	return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+static void __exit imq_fini(void)
-+{
-+	xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
-+}
-+
-+module_init(imq_init);
-+module_exit(imq_fini);
-+
-+MODULE_AUTHOR("http://www.linuximq.net");
-+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("ipt_IMQ");
-+MODULE_ALIAS("ip6t_IMQ");
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
deleted file mode 100644
index 1bda13d191..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -173,7 +173,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
deleted file mode 100644
index 68792936bb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch
deleted file mode 100644
index 1d513580b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch
deleted file mode 100644
index e4324717b4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch
deleted file mode 100644
index fe8cecfc77..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch
deleted file mode 100644
index adbe7021df..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/205-skb_padding.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -1372,11 +1372,18 @@ static inline int skb_network_offset(con
-  *
-  * Various parts of the networking layer expect at least 32 bytes of
-  * headroom, you should not reduce this.
-+ *
-+ * This has been changed to 64 to acommodate for routing between ethernet
-+ * and wireless, but only for new allocations
-  */
- #ifndef NET_SKB_PAD
- #define NET_SKB_PAD	32
- #endif
- 
-+#ifndef NET_SKB_PAD_ALLOC
-+#define NET_SKB_PAD_ALLOC	64
-+#endif
-+
- extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
- 
- static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-@@ -1466,9 +1473,9 @@ static inline void __skb_queue_purge(str
- static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
- 					      gfp_t gfp_mask)
- {
--	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD, gfp_mask);
-+	struct sk_buff *skb = alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask);
- 	if (likely(skb))
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 	return skb;
- }
- 
-@@ -1551,7 +1558,7 @@ static inline int __skb_cow(struct sk_bu
- 		delta = headroom - skb_headroom(skb);
- 
- 	if (delta || cloned)
--		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
-+		return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD_ALLOC), 0,
- 					GFP_ATOMIC);
- 	return 0;
- }
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -339,9 +339,9 @@ struct sk_buff *__netdev_alloc_skb(struc
- 	int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
- 	struct sk_buff *skb;
- 
--	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
-+	skb = __alloc_skb(length + NET_SKB_PAD_ALLOC, gfp_mask, 0, node);
- 	if (likely(skb)) {
--		skb_reserve(skb, NET_SKB_PAD);
-+		skb_reserve(skb, NET_SKB_PAD_ALLOC);
- 		skb->dev = dev;
- 	}
- 	return skb;
diff --git a/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch
deleted file mode 100644
index 0cbf4ed32b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
- endif
- 
- ifndef CONFIG_FUNCTION_TRACER
--cflags-y := -ffunction-sections
-+  ifndef CONFIG_PROFILING
-+    cflags-y := -ffunction-sections
-+  endif
- endif
- ifdef CONFIG_FUNCTION_GRAPH_TRACER
-   ifndef KBUILD_MCOUNT_RA_ADDRESS
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch
deleted file mode 100644
index d7e3220d24..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/209-mini_fo.patch
+++ /dev/null
@@ -1,7782 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -181,6 +181,7 @@ source "fs/logfs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index b64630d500..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index b5fa64e6a1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch
deleted file mode 100644
index 1c1beaf9ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -30,7 +30,8 @@ u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
- static DEFINE_SPINLOCK(sequence_lock);
- #if defined(CONFIG_NET)
--static struct sock *uevent_sock;
-+struct sock *uevent_sock = NULL;
-+EXPORT_SYMBOL_GPL(uevent_sock);
- #endif
- 
- /* the strings here must match the enum in include/linux/kobject.h */
-@@ -43,6 +44,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -202,9 +215,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch
deleted file mode 100644
index fb3df254dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -8,7 +8,7 @@ config SND_PCM
- 	select GCD
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index f452a25774..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1136,7 +1136,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8be..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch
deleted file mode 100644
index 4d4c01155f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/240-packet_socket_type.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -29,6 +29,8 @@ struct sockaddr_ll {
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -47,6 +49,8 @@ struct sockaddr_ll {
- #define PACKET_TX_RING			13
- #define PACKET_LOSS			14
- #define PACKET_VNET_HDR			15
-+#define PACKET_RECV_TYPE		16
-+
- 
- struct tpacket_stats {
- 	unsigned int	tp_packets;
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -202,6 +202,7 @@ struct packet_sock {
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
-+	__u8			pkt_type:3;
- };
- 
- struct packet_skb_cb {
-@@ -336,6 +337,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -343,6 +345,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -355,7 +358,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -531,12 +534,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -651,12 +654,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -1464,6 +1467,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1968,6 +1972,16 @@ packet_setsockopt(struct socket *sock, i
- 		po->has_vnet_hdr = !!val;
- 		return 0;
- 	}
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
-+                return 0;
-+        }
- 	default:
- 		return -ENOPROTOOPT;
- 	}
-@@ -2025,6 +2039,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
- 			len = sizeof(int);
diff --git a/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch
deleted file mode 100644
index a2535db60e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch
deleted file mode 100644
index f431f5d0ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2443,8 +2445,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2499,5 +2504,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch
deleted file mode 100644
index 3f43c90aca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -354,4 +354,8 @@ endif # LEDS_TRIGGERS
- 
- endif # LEDS_CLASS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch
deleted file mode 100644
index 858966c908..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -358,4 +358,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
deleted file mode 100644
index e38c31de40..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -340,4 +340,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch
deleted file mode 100644
index 27da3c7812..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1024,6 +1024,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch
deleted file mode 100644
index 59e4333611..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
deleted file mode 100644
index 192181f005..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -127,3 +127,5 @@ obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
- obj-$(CONFIG_CEPH_FS)		+= ceph/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
-+
diff --git a/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index c334b17d08..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
-+
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- 		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
deleted file mode 100644
index 7ae6d2ab00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/600-phy_extension.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -298,6 +298,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
-+
- 		if (mii_data->reg_num == MII_BMCR &&
- 		    val & BMCR_RESET &&
- 		    phydev->drv->config_init) {
-@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -492,6 +492,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index 8f939a5b7b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -379,9 +379,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -698,6 +698,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch
deleted file mode 100644
index 86bab7a1eb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -93,6 +93,11 @@ config MICREL_PHY
- 	---help---
- 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch
deleted file mode 100644
index fd6d0d2438..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -863,6 +863,7 @@ struct net_device {
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index b86e259c8d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch
deleted file mode 100644
index f5ff558b0f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch
deleted file mode 100644
index 22a56ed4dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -107,6 +107,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch
deleted file mode 100644
index c375a97292..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -111,6 +111,10 @@ config IP17XX_PHY
- 	tristate "Driver for IC+ IP17xx switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch
deleted file mode 100644
index e97b84d48c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -115,6 +115,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch
deleted file mode 100644
index 34ac10ed39..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -157,4 +157,29 @@ config MDIO_OCTEON
- 
- 	  If in doubt, say Y.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch
deleted file mode 100644
index f4325d298a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -618,6 +618,15 @@ config RTC_DRV_NUC900
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NUC910/NUC920 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -74,6 +74,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch
deleted file mode 100644
index c2e3880641..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -77,6 +77,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index d03275e57a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -901,7 +902,7 @@ int usb_serial_probe(struct usb_interfac
- 			dev_err(&interface->dev, "No free urbs available\n");
- 			goto probe_error;
- 		}
--		buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1343,3 +1344,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch
deleted file mode 100644
index 6a634b7b39..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -887,7 +887,7 @@ static int __init kernel_init(void * unu
- 
- 	/* Open the /dev/console on the rootfs, this should never fail */
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.34/890-generic_pwm_api.patch b/target/linux/generic-2.6/patches-2.6.34/890-generic_pwm_api.patch
deleted file mode 100644
index 6c58e53204..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/890-generic_pwm_api.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patches from: Bill Gatliff <bgat@billgatliff.com>
-Based on:
-* Expunge old Atmel PWMC driver, replacing it with one that conforms to the PWM API
-* Incorporate PWM API code into KBuild
-Ignore the LEDS part atm
----
-
-diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index 049ff24..b94666c 100644
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_IBM_ASM)		+= ibmasm/
- obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
- obj-$(CONFIG_AD525X_DPOT)	+= ad525x_dpot.o
--obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
- obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
- obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
- obj-$(CONFIG_ICS932S401)	+= ics932s401.o
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index 368ae6d..54d7b16 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -54,6 +54,8 @@ source "drivers/pps/Kconfig"
- 
- source "drivers/gpio/Kconfig"
- 
-+source "drivers/pwm/Kconfig"
-+
- source "drivers/w1/Kconfig"
- 
- source "drivers/power/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 6ee53c7..e6143f3 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -6,6 +6,8 @@
- #
- 
- obj-y				+= gpio/
-+obj-$(CONFIG_GENERIC_PWM)	+= pwm/
-+
- obj-$(CONFIG_PCI)		+= pci/
- obj-$(CONFIG_PARISC)		+= parisc/
- obj-$(CONFIG_RAPIDIO)		+= rapidio/
-diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
diff --git a/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch
deleted file mode 100644
index 39b6abe8d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -140,6 +140,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch
deleted file mode 100644
index 8aa43c5242..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2408,13 +2408,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1477,23 +1477,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch
deleted file mode 100644
index 65f17b49eb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -133,6 +133,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.
- obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
- obj-$(CONFIG_SPI_DW_MMIO)		+= dw_spi_mmio.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
deleted file mode 100644
index 24e5d592e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -370,6 +370,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
- 
- obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2540,6 +2540,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch
deleted file mode 100644
index 9081be84a4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- 
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch b/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch
deleted file mode 100644
index d4926894e6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/925-modify-i2c-gpio-initcall-level.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -211,7 +211,7 @@ static int __init i2c_gpio_init(void)
- 
- 	return ret;
- }
--module_init(i2c_gpio_init);
-+subsys_initcall(i2c_gpio_init);
- 
- static void __exit i2c_gpio_exit(void)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch
deleted file mode 100644
index 33d5299f25..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -138,7 +138,7 @@ static inline bool dev_xmit_complete(int
-  */
- 
- #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 76413e9cef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -86,6 +86,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.34/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.34/971-ocf_20100325.patch
deleted file mode 100644
index c34a7e2657..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+	mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+	credit_entropy_bits(&input_pool, ent_count);
-+
-+	DEBUG_ENT("crediting %d bits => %d\n",
-+		  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait, 
-+			 input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+        /* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh; 
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		  count,
-+		  input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- #define EXTRACT_SIZE 10
- 
- /*********************************************************************
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -389,6 +389,7 @@ struct task_struct *find_task_by_vpid(pi
- {
- 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.34/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.34/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.34/975-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.34/975-ssb_update.patch
deleted file mode 100644
index 245cec18a9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/975-ssb_update.patch
+++ /dev/null
@@ -1,530 +0,0 @@
---- a/drivers/ssb/driver_chipcommon.c
-+++ b/drivers/ssb/driver_chipcommon.c
-@@ -233,6 +233,8 @@ void ssb_chipcommon_init(struct ssb_chip
- {
- 	if (!cc->dev)
- 		return; /* We don't have a ChipCommon */
-+	if (cc->dev->id.revision >= 11)
-+		cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
- 	ssb_pmu_init(cc);
- 	chipco_powercontrol_init(cc);
- 	ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
-@@ -370,6 +372,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
- {
- 	return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
- }
-+EXPORT_SYMBOL(ssb_chipco_gpio_control);
- 
- u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
- {
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -834,6 +834,9 @@ int ssb_bus_pcibus_register(struct ssb_b
- 	if (!err) {
- 		ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
- 			   "PCI device %s\n", dev_name(&host_pci->dev));
-+	} else {
-+		ssb_printk(KERN_ERR PFX "Failed to register PCI version"
-+			   " of SSB with error %d\n", err);
- 	}
- 
- 	return err;
---- a/drivers/ssb/pci.c
-+++ b/drivers/ssb/pci.c
-@@ -168,7 +168,7 @@ err_pci:
- }
- 
- /* Get the word-offset for a SSB_SPROM_XXX define. */
--#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE) / sizeof(u16))
-+#define SPOFF(offset)	((offset) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
- #define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-@@ -254,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
- 	int i;
- 
- 	for (i = 0; i < bus->sprom_size; i++)
--		sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
- 
- 	return 0;
- }
-@@ -285,7 +285,7 @@ static int sprom_do_write(struct ssb_bus
- 			ssb_printk("75%%");
- 		else if (i % 2)
- 			ssb_printk(".");
--		writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
-+		writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
- 		mmiowb();
- 		msleep(20);
- 	}
-@@ -621,6 +621,14 @@ static int ssb_pci_sprom_get(struct ssb_
- 	int err = -ENOMEM;
- 	u16 *buf;
- 
-+	if (!ssb_is_sprom_available(bus)) {
-+		ssb_printk(KERN_ERR PFX "No SPROM available!\n");
-+		return -ENODEV;
-+	}
-+
-+	bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ?
-+		SSB_SPROM_BASE1 : SSB_SPROM_BASE31;
-+
- 	buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
- 	if (!buf)
- 		goto out;
---- a/drivers/ssb/sprom.c
-+++ b/drivers/ssb/sprom.c
-@@ -176,3 +176,17 @@ const struct ssb_sprom *ssb_get_fallback
- {
- 	return fallback_sprom;
- }
-+
-+/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
-+bool ssb_is_sprom_available(struct ssb_bus *bus)
-+{
-+	/* status register only exists on chipcomon rev >= 11 and we need check
-+	   for >= 31 only */
-+	/* this routine differs from specs as we do not access SPROM directly
-+	   on PCMCIA */
-+	if (bus->bustype == SSB_BUSTYPE_PCI &&
-+	    bus->chipco.dev->id.revision >= 31)
-+		return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
-+
-+	return true;
-+}
---- a/include/linux/ssb/ssb.h
-+++ b/include/linux/ssb/ssb.h
-@@ -305,6 +305,7 @@ struct ssb_bus {
- 	/* ID information about the Chip. */
- 	u16 chip_id;
- 	u16 chip_rev;
-+	u16 sprom_offset;
- 	u16 sprom_size;		/* number of words in sprom */
- 	u8 chip_package;
- 
-@@ -394,6 +395,9 @@ extern int ssb_bus_sdiobus_register(stru
- 
- extern void ssb_bus_unregister(struct ssb_bus *bus);
- 
-+/* Does the device have an SPROM? */
-+extern bool ssb_is_sprom_available(struct ssb_bus *bus);
-+
- /* Set a fallback SPROM.
-  * See kdoc at the function definition for complete documentation. */
- extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
---- a/include/linux/ssb/ssb_driver_chipcommon.h
-+++ b/include/linux/ssb/ssb_driver_chipcommon.h
-@@ -53,6 +53,7 @@
- #define  SSB_CHIPCO_CAP_64BIT		0x08000000	/* 64-bit Backplane */
- #define  SSB_CHIPCO_CAP_PMU		0x10000000	/* PMU available (rev >= 20) */
- #define  SSB_CHIPCO_CAP_ECI		0x20000000	/* ECI available (rev >= 20) */
-+#define  SSB_CHIPCO_CAP_SPROM		0x40000000	/* SPROM present */
- #define SSB_CHIPCO_CORECTL		0x0008
- #define  SSB_CHIPCO_CORECTL_UARTCLK0	0x00000001	/* Drive UART with internal clock */
- #define	 SSB_CHIPCO_CORECTL_SE		0x00000002	/* sync clk out enable (corerev >= 3) */
-@@ -385,6 +386,7 @@
- 
- 
- /** Chip specific Chip-Status register contents. */
-+#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS	0x00000040 /* SPROM present */
- #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL	0x00000003
- #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL		0 /* OTP is powered up, use def. CIS, no SPROM */
- #define SSB_CHIPCO_CHST_4325_SPROM_SEL		1 /* OTP is powered up, SPROM is present */
-@@ -398,6 +400,18 @@
- #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT	4
- #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 		0x00000200 /* 1 for 2b, 0 for to 2a */
- 
-+/** Macros to determine SPROM presence based on Chip-Status register. */
-+#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
-+	((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL)
-+#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
-+	(status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
-+#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
-+	(((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
-+	 ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
-+		SSB_CHIPCO_CHST_4325_OTP_SEL))
-+
- 
- 
- /** Clockcontrol masks and values **/
-@@ -564,6 +578,7 @@ struct ssb_chipcommon_pmu {
- struct ssb_chipcommon {
- 	struct ssb_device *dev;
- 	u32 capabilities;
-+	u32 status;
- 	/* Fast Powerup Delay constant */
- 	u16 fast_pwrup_delay;
- 	struct ssb_chipcommon_pmu pmu;
---- a/include/linux/ssb/ssb_regs.h
-+++ b/include/linux/ssb/ssb_regs.h
-@@ -170,26 +170,27 @@
- #define SSB_SPROMSIZE_WORDS_R4		220
- #define SSB_SPROMSIZE_BYTES_R123	(SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
- #define SSB_SPROMSIZE_BYTES_R4		(SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
--#define SSB_SPROM_BASE			0x1000
--#define SSB_SPROM_REVISION		0x107E
-+#define SSB_SPROM_BASE1			0x1000
-+#define SSB_SPROM_BASE31		0x0800
-+#define SSB_SPROM_REVISION		0x007E
- #define  SSB_SPROM_REVISION_REV		0x00FF	/* SPROM Revision number */
- #define  SSB_SPROM_REVISION_CRC		0xFF00	/* SPROM CRC8 value */
- #define  SSB_SPROM_REVISION_CRC_SHIFT	8
- 
- /* SPROM Revision 1 */
--#define SSB_SPROM1_SPID			0x1004	/* Subsystem Product ID for PCI */
--#define SSB_SPROM1_SVID			0x1006	/* Subsystem Vendor ID for PCI */
--#define SSB_SPROM1_PID			0x1008	/* Product ID for PCI */
--#define SSB_SPROM1_IL0MAC		0x1048	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM1_ET0MAC		0x104E	/* 6 bytes MAC address for Ethernet */
--#define SSB_SPROM1_ET1MAC		0x1054	/* 6 bytes MAC address for 802.11a */
--#define SSB_SPROM1_ETHPHY		0x105A	/* Ethernet PHY settings */
-+#define SSB_SPROM1_SPID			0x0004	/* Subsystem Product ID for PCI */
-+#define SSB_SPROM1_SVID			0x0006	/* Subsystem Vendor ID for PCI */
-+#define SSB_SPROM1_PID			0x0008	/* Product ID for PCI */
-+#define SSB_SPROM1_IL0MAC		0x0048	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM1_ET0MAC		0x004E	/* 6 bytes MAC address for Ethernet */
-+#define SSB_SPROM1_ET1MAC		0x0054	/* 6 bytes MAC address for 802.11a */
-+#define SSB_SPROM1_ETHPHY		0x005A	/* Ethernet PHY settings */
- #define  SSB_SPROM1_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM1_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM1_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM1_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM1_BINF			0x105C	/* Board info */
-+#define SSB_SPROM1_BINF			0x005C	/* Board info */
- #define  SSB_SPROM1_BINF_BREV		0x00FF	/* Board Revision */
- #define  SSB_SPROM1_BINF_CCODE		0x0F00	/* Country Code */
- #define  SSB_SPROM1_BINF_CCODE_SHIFT	8
-@@ -197,63 +198,63 @@
- #define  SSB_SPROM1_BINF_ANTBG_SHIFT	12
- #define  SSB_SPROM1_BINF_ANTA		0xC000	/* Available A-PHY antennas */
- #define  SSB_SPROM1_BINF_ANTA_SHIFT	14
--#define SSB_SPROM1_PA0B0		0x105E
--#define SSB_SPROM1_PA0B1		0x1060
--#define SSB_SPROM1_PA0B2		0x1062
--#define SSB_SPROM1_GPIOA		0x1064	/* General Purpose IO pins 0 and 1 */
-+#define SSB_SPROM1_PA0B0		0x005E
-+#define SSB_SPROM1_PA0B1		0x0060
-+#define SSB_SPROM1_PA0B2		0x0062
-+#define SSB_SPROM1_GPIOA		0x0064	/* General Purpose IO pins 0 and 1 */
- #define  SSB_SPROM1_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM1_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM1_GPIOA_P1_SHIFT	8
--#define SSB_SPROM1_GPIOB		0x1066	/* General Purpuse IO pins 2 and 3 */
-+#define SSB_SPROM1_GPIOB		0x0066	/* General Purpuse IO pins 2 and 3 */
- #define  SSB_SPROM1_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM1_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM1_GPIOB_P3_SHIFT	8
--#define SSB_SPROM1_MAXPWR		0x1068	/* Power Amplifier Max Power */
-+#define SSB_SPROM1_MAXPWR		0x0068	/* Power Amplifier Max Power */
- #define  SSB_SPROM1_MAXPWR_BG		0x00FF	/* B-PHY and G-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A		0xFF00	/* A-PHY (in dBm Q5.2) */
- #define  SSB_SPROM1_MAXPWR_A_SHIFT	8
--#define SSB_SPROM1_PA1B0		0x106A
--#define SSB_SPROM1_PA1B1		0x106C
--#define SSB_SPROM1_PA1B2		0x106E
--#define SSB_SPROM1_ITSSI		0x1070	/* Idle TSSI Target */
-+#define SSB_SPROM1_PA1B0		0x006A
-+#define SSB_SPROM1_PA1B1		0x006C
-+#define SSB_SPROM1_PA1B2		0x006E
-+#define SSB_SPROM1_ITSSI		0x0070	/* Idle TSSI Target */
- #define  SSB_SPROM1_ITSSI_BG		0x00FF	/* B-PHY and G-PHY*/
- #define  SSB_SPROM1_ITSSI_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_ITSSI_A_SHIFT	8
--#define SSB_SPROM1_BFLLO		0x1072	/* Boardflags (low 16 bits) */
--#define SSB_SPROM1_AGAIN		0x1074	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM1_BFLLO		0x0072	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM1_AGAIN		0x0074	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM1_AGAIN_BG		0x00FF	/* B-PHY and G-PHY */
- #define  SSB_SPROM1_AGAIN_BG_SHIFT	0
- #define  SSB_SPROM1_AGAIN_A		0xFF00	/* A-PHY */
- #define  SSB_SPROM1_AGAIN_A_SHIFT	8
- 
- /* SPROM Revision 2 (inherits from rev 1) */
--#define SSB_SPROM2_BFLHI		0x1038	/* Boardflags (high 16 bits) */
--#define SSB_SPROM2_MAXP_A		0x103A	/* A-PHY Max Power */
-+#define SSB_SPROM2_BFLHI		0x0038	/* Boardflags (high 16 bits) */
-+#define SSB_SPROM2_MAXP_A		0x003A	/* A-PHY Max Power */
- #define  SSB_SPROM2_MAXP_A_HI		0x00FF	/* Max Power High */
- #define  SSB_SPROM2_MAXP_A_LO		0xFF00	/* Max Power Low */
- #define  SSB_SPROM2_MAXP_A_LO_SHIFT	8
--#define SSB_SPROM2_PA1LOB0		0x103C	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB1		0x103E	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1LOB2		0x1040	/* A-PHY PowerAmplifier Low Settings */
--#define SSB_SPROM2_PA1HIB0		0x1042	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB1		0x1044	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_PA1HIB2		0x1046	/* A-PHY PowerAmplifier High Settings */
--#define SSB_SPROM2_OPO			0x1078	/* OFDM Power Offset from CCK Level */
-+#define SSB_SPROM2_PA1LOB0		0x003C	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB1		0x003E	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1LOB2		0x0040	/* A-PHY PowerAmplifier Low Settings */
-+#define SSB_SPROM2_PA1HIB0		0x0042	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB1		0x0044	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_PA1HIB2		0x0046	/* A-PHY PowerAmplifier High Settings */
-+#define SSB_SPROM2_OPO			0x0078	/* OFDM Power Offset from CCK Level */
- #define  SSB_SPROM2_OPO_VALUE		0x00FF
- #define  SSB_SPROM2_OPO_UNUSED		0xFF00
--#define SSB_SPROM2_CCODE		0x107C	/* Two char Country Code */
-+#define SSB_SPROM2_CCODE		0x007C	/* Two char Country Code */
- 
- /* SPROM Revision 3 (inherits most data from rev 2) */
--#define SSB_SPROM3_IL0MAC		0x104A	/* 6 bytes MAC address for 802.11b/g */
--#define SSB_SPROM3_OFDMAPO		0x102C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMALPO		0x1030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_OFDMAHPO		0x1034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
--#define SSB_SPROM3_GPIOLDC		0x1042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAPO		0x002C	/* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMALPO		0x0030	/* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_OFDMAHPO		0x0034	/* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
-+#define SSB_SPROM3_GPIOLDC		0x0042	/* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
- #define  SSB_SPROM3_GPIOLDC_OFF		0x0000FF00	/* Off Count */
- #define  SSB_SPROM3_GPIOLDC_OFF_SHIFT	8
- #define  SSB_SPROM3_GPIOLDC_ON		0x00FF0000	/* On Count */
- #define  SSB_SPROM3_GPIOLDC_ON_SHIFT	16
--#define SSB_SPROM3_CCKPO		0x1078	/* CCK Power Offset */
-+#define SSB_SPROM3_IL0MAC		0x004A	/* 6 bytes MAC address for 802.11b/g */
-+#define SSB_SPROM3_CCKPO		0x0078	/* CCK Power Offset */
- #define  SSB_SPROM3_CCKPO_1M		0x000F	/* 1M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M		0x00F0	/* 2M Rate PO */
- #define  SSB_SPROM3_CCKPO_2M_SHIFT	4
-@@ -264,100 +265,100 @@
- #define  SSB_SPROM3_OFDMGPO		0x107A	/* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
- 
- /* SPROM Revision 4 */
--#define SSB_SPROM4_IL0MAC		0x104C	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM4_ETHPHY		0x105A	/* Ethernet PHY settings ?? */
-+#define SSB_SPROM4_BFLLO		0x0044	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM4_BFLHI		0x0046  /* Board Flags Hi */
-+#define SSB_SPROM4_IL0MAC		0x004C	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM4_CCODE		0x0052	/* Country Code (2 bytes) */
-+#define SSB_SPROM4_GPIOA		0x0056	/* Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM4_GPIOB		0x0058	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM4_ETHPHY		0x005A	/* Ethernet PHY settings ?? */
- #define  SSB_SPROM4_ETHPHY_ET0A		0x001F	/* MII Address for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1A		0x03E0	/* MII Address for enet1 */
- #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT	5
- #define  SSB_SPROM4_ETHPHY_ET0M		(1<<14)	/* MDIO for enet0 */
- #define  SSB_SPROM4_ETHPHY_ET1M		(1<<15)	/* MDIO for enet1 */
--#define SSB_SPROM4_CCODE		0x1052	/* Country Code (2 bytes) */
--#define SSB_SPROM4_ANTAVAIL		0x105D  /* Antenna available bitfields */
--#define SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_A_SHIFT	0
--#define SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
--#define SSB_SPROM4_BFLLO		0x1044	/* Boardflags (low 16 bits) */
--#define SSB_SPROM4_AGAIN01		0x105E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM4_ANTAVAIL		0x005D  /* Antenna available bitfields */
-+#define  SSB_SPROM4_ANTAVAIL_A		0x00FF	/* A-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_A_SHIFT	0
-+#define  SSB_SPROM4_ANTAVAIL_BG		0xFF00	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT	8
-+#define SSB_SPROM4_AGAIN01		0x005E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM4_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM4_AGAIN0_SHIFT	0
- #define  SSB_SPROM4_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM4_AGAIN1_SHIFT	8
--#define SSB_SPROM4_AGAIN23		0x1060
-+#define SSB_SPROM4_AGAIN23		0x0060
- #define  SSB_SPROM4_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM4_AGAIN2_SHIFT	0
- #define  SSB_SPROM4_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM4_AGAIN3_SHIFT	8
--#define SSB_SPROM4_BFLHI		0x1046  /* Board Flags Hi */
--#define SSB_SPROM4_MAXP_BG		0x1080  /* Max Power BG in path 1 */
-+#define SSB_SPROM4_MAXP_BG		0x0080  /* Max Power BG in path 1 */
- #define  SSB_SPROM4_MAXP_BG_MASK	0x00FF  /* Mask for Max Power BG */
- #define  SSB_SPROM4_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM4_ITSSI_BG_SHIFT	8
--#define SSB_SPROM4_MAXP_A		0x108A  /* Max Power A in path 1 */
-+#define SSB_SPROM4_MAXP_A		0x008A  /* Max Power A in path 1 */
- #define  SSB_SPROM4_MAXP_A_MASK		0x00FF  /* Mask for Max Power A */
- #define  SSB_SPROM4_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM4_ITSSI_A_SHIFT	8
--#define SSB_SPROM4_GPIOA		0x1056	/* Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM4_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM4_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM4_GPIOA_P1_SHIFT	8
--#define SSB_SPROM4_GPIOB		0x1058	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM4_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM4_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM4_GPIOB_P3_SHIFT	8
--#define SSB_SPROM4_PA0B0		0x1082	/* The paXbY locations are */
--#define SSB_SPROM4_PA0B1		0x1084	/*   only guesses */
--#define SSB_SPROM4_PA0B2		0x1086
--#define SSB_SPROM4_PA1B0		0x108E
--#define SSB_SPROM4_PA1B1		0x1090
--#define SSB_SPROM4_PA1B2		0x1092
-+#define SSB_SPROM4_PA0B0		0x0082	/* The paXbY locations are */
-+#define SSB_SPROM4_PA0B1		0x0084	/*   only guesses */
-+#define SSB_SPROM4_PA0B2		0x0086
-+#define SSB_SPROM4_PA1B0		0x008E
-+#define SSB_SPROM4_PA1B1		0x0090
-+#define SSB_SPROM4_PA1B2		0x0092
- 
- /* SPROM Revision 5 (inherits most data from rev 4) */
--#define SSB_SPROM5_BFLLO		0x104A	/* Boardflags (low 16 bits) */
--#define SSB_SPROM5_BFLHI		0x104C  /* Board Flags Hi */
--#define SSB_SPROM5_IL0MAC		0x1052	/* 6 byte MAC address for a/b/g/n */
--#define SSB_SPROM5_CCODE		0x1044	/* Country Code (2 bytes) */
--#define SSB_SPROM5_GPIOA		0x1076	/* Gen. Purpose IO # 0 and 1 */
-+#define SSB_SPROM5_CCODE		0x0044	/* Country Code (2 bytes) */
-+#define SSB_SPROM5_BFLLO		0x004A	/* Boardflags (low 16 bits) */
-+#define SSB_SPROM5_BFLHI		0x004C  /* Board Flags Hi */
-+#define SSB_SPROM5_IL0MAC		0x0052	/* 6 byte MAC address for a/b/g/n */
-+#define SSB_SPROM5_GPIOA		0x0076	/* Gen. Purpose IO # 0 and 1 */
- #define  SSB_SPROM5_GPIOA_P0		0x00FF	/* Pin 0 */
- #define  SSB_SPROM5_GPIOA_P1		0xFF00	/* Pin 1 */
- #define  SSB_SPROM5_GPIOA_P1_SHIFT	8
--#define SSB_SPROM5_GPIOB		0x1078	/* Gen. Purpose IO # 2 and 3 */
-+#define SSB_SPROM5_GPIOB		0x0078	/* Gen. Purpose IO # 2 and 3 */
- #define  SSB_SPROM5_GPIOB_P2		0x00FF	/* Pin 2 */
- #define  SSB_SPROM5_GPIOB_P3		0xFF00	/* Pin 3 */
- #define  SSB_SPROM5_GPIOB_P3_SHIFT	8
- 
- /* SPROM Revision 8 */
--#define SSB_SPROM8_BOARDREV		0x1082	/* Board revision */
--#define SSB_SPROM8_BFLLO		0x1084	/* Board flags (bits 0-15) */
--#define SSB_SPROM8_BFLHI		0x1086	/* Board flags (bits 16-31) */
--#define SSB_SPROM8_BFL2LO		0x1088	/* Board flags (bits 32-47) */
--#define SSB_SPROM8_BFL2HI		0x108A	/* Board flags (bits 48-63) */
--#define SSB_SPROM8_IL0MAC		0x108C	/* 6 byte MAC address */
--#define SSB_SPROM8_CCODE		0x1092	/* 2 byte country code */
--#define SSB_SPROM8_ANTAVAIL		0x109C  /* Antenna available bitfields*/
--#define SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_A_SHIFT	8
--#define SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
--#define SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
--#define SSB_SPROM8_AGAIN01		0x109E	/* Antenna Gain (in dBm Q5.2) */
-+#define SSB_SPROM8_BOARDREV		0x0082	/* Board revision */
-+#define SSB_SPROM8_BFLLO		0x0084	/* Board flags (bits 0-15) */
-+#define SSB_SPROM8_BFLHI		0x0086	/* Board flags (bits 16-31) */
-+#define SSB_SPROM8_BFL2LO		0x0088	/* Board flags (bits 32-47) */
-+#define SSB_SPROM8_BFL2HI		0x008A	/* Board flags (bits 48-63) */
-+#define SSB_SPROM8_IL0MAC		0x008C	/* 6 byte MAC address */
-+#define SSB_SPROM8_CCODE		0x0092	/* 2 byte country code */
-+#define SSB_SPROM8_GPIOA		0x0096	/*Gen. Purpose IO # 0 and 1 */
-+#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
-+#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
-+#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
-+#define SSB_SPROM8_GPIOB		0x0098	/* Gen. Purpose IO # 2 and 3 */
-+#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
-+#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
-+#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
-+#define SSB_SPROM8_ANTAVAIL		0x009C  /* Antenna available bitfields*/
-+#define  SSB_SPROM8_ANTAVAIL_A		0xFF00	/* A-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_A_SHIFT	8
-+#define  SSB_SPROM8_ANTAVAIL_BG		0x00FF	/* B-PHY and G-PHY bitfield */
-+#define  SSB_SPROM8_ANTAVAIL_BG_SHIFT	0
-+#define SSB_SPROM8_AGAIN01		0x009E	/* Antenna Gain (in dBm Q5.2) */
- #define  SSB_SPROM8_AGAIN0		0x00FF	/* Antenna 0 */
- #define  SSB_SPROM8_AGAIN0_SHIFT	0
- #define  SSB_SPROM8_AGAIN1		0xFF00	/* Antenna 1 */
- #define  SSB_SPROM8_AGAIN1_SHIFT	8
--#define SSB_SPROM8_AGAIN23		0x10A0
-+#define SSB_SPROM8_AGAIN23		0x00A0
- #define  SSB_SPROM8_AGAIN2		0x00FF	/* Antenna 2 */
- #define  SSB_SPROM8_AGAIN2_SHIFT	0
- #define  SSB_SPROM8_AGAIN3		0xFF00	/* Antenna 3 */
- #define  SSB_SPROM8_AGAIN3_SHIFT	8
--#define SSB_SPROM8_GPIOA		0x1096	/*Gen. Purpose IO # 0 and 1 */
--#define  SSB_SPROM8_GPIOA_P0		0x00FF	/* Pin 0 */
--#define  SSB_SPROM8_GPIOA_P1		0xFF00	/* Pin 1 */
--#define  SSB_SPROM8_GPIOA_P1_SHIFT	8
--#define SSB_SPROM8_GPIOB		0x1098	/* Gen. Purpose IO # 2 and 3 */
--#define  SSB_SPROM8_GPIOB_P2		0x00FF	/* Pin 2 */
--#define  SSB_SPROM8_GPIOB_P3		0xFF00	/* Pin 3 */
--#define  SSB_SPROM8_GPIOB_P3_SHIFT	8
--#define SSB_SPROM8_RSSIPARM2G		0x10A4	/* RSSI params for 2GHz */
-+#define SSB_SPROM8_RSSIPARM2G		0x00A4	/* RSSI params for 2GHz */
- #define  SSB_SPROM8_RSSISMF2G		0x000F
- #define  SSB_SPROM8_RSSISMC2G		0x00F0
- #define  SSB_SPROM8_RSSISMC2G_SHIFT	4
-@@ -365,7 +366,7 @@
- #define  SSB_SPROM8_RSSISAV2G_SHIFT	8
- #define  SSB_SPROM8_BXA2G		0x1800
- #define  SSB_SPROM8_BXA2G_SHIFT		11
--#define SSB_SPROM8_RSSIPARM5G		0x10A6	/* RSSI params for 5GHz */
-+#define SSB_SPROM8_RSSIPARM5G		0x00A6	/* RSSI params for 5GHz */
- #define  SSB_SPROM8_RSSISMF5G		0x000F
- #define  SSB_SPROM8_RSSISMC5G		0x00F0
- #define  SSB_SPROM8_RSSISMC5G_SHIFT	4
-@@ -373,47 +374,47 @@
- #define  SSB_SPROM8_RSSISAV5G_SHIFT	8
- #define  SSB_SPROM8_BXA5G		0x1800
- #define  SSB_SPROM8_BXA5G_SHIFT		11
--#define SSB_SPROM8_TRI25G		0x10A8	/* TX isolation 2.4&5.3GHz */
-+#define SSB_SPROM8_TRI25G		0x00A8	/* TX isolation 2.4&5.3GHz */
- #define  SSB_SPROM8_TRI2G		0x00FF	/* TX isolation 2.4GHz */
- #define  SSB_SPROM8_TRI5G		0xFF00	/* TX isolation 5.3GHz */
- #define  SSB_SPROM8_TRI5G_SHIFT		8
--#define SSB_SPROM8_TRI5GHL		0x10AA	/* TX isolation 5.2/5.8GHz */
-+#define SSB_SPROM8_TRI5GHL		0x00AA	/* TX isolation 5.2/5.8GHz */
- #define  SSB_SPROM8_TRI5GL		0x00FF	/* TX isolation 5.2GHz */
- #define  SSB_SPROM8_TRI5GH		0xFF00	/* TX isolation 5.8GHz */
- #define  SSB_SPROM8_TRI5GH_SHIFT	8
--#define SSB_SPROM8_RXPO			0x10AC  /* RX power offsets */
-+#define SSB_SPROM8_RXPO			0x00AC  /* RX power offsets */
- #define  SSB_SPROM8_RXPO2G		0x00FF	/* 2GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G		0xFF00	/* 5GHz RX power offset */
- #define  SSB_SPROM8_RXPO5G_SHIFT	8
--#define SSB_SPROM8_MAXP_BG		0x10C0  /* Max Power 2GHz in path 1 */
-+#define SSB_SPROM8_MAXP_BG		0x00C0  /* Max Power 2GHz in path 1 */
- #define  SSB_SPROM8_MAXP_BG_MASK	0x00FF  /* Mask for Max Power 2GHz */
- #define  SSB_SPROM8_ITSSI_BG		0xFF00	/* Mask for path 1 itssi_bg */
- #define  SSB_SPROM8_ITSSI_BG_SHIFT	8
--#define SSB_SPROM8_PA0B0		0x10C2	/* 2GHz power amp settings */
--#define SSB_SPROM8_PA0B1		0x10C4
--#define SSB_SPROM8_PA0B2		0x10C6
--#define SSB_SPROM8_MAXP_A		0x10C8  /* Max Power 5.3GHz */
-+#define SSB_SPROM8_PA0B0		0x00C2	/* 2GHz power amp settings */
-+#define SSB_SPROM8_PA0B1		0x00C4
-+#define SSB_SPROM8_PA0B2		0x00C6
-+#define SSB_SPROM8_MAXP_A		0x00C8  /* Max Power 5.3GHz */
- #define  SSB_SPROM8_MAXP_A_MASK		0x00FF  /* Mask for Max Power 5.3GHz */
- #define  SSB_SPROM8_ITSSI_A		0xFF00	/* Mask for path 1 itssi_a */
- #define  SSB_SPROM8_ITSSI_A_SHIFT	8
--#define SSB_SPROM8_MAXP_AHL		0x10CA  /* Max Power 5.2/5.8GHz */
-+#define SSB_SPROM8_MAXP_AHL		0x00CA  /* Max Power 5.2/5.8GHz */
- #define  SSB_SPROM8_MAXP_AH_MASK	0x00FF  /* Mask for Max Power 5.8GHz */
- #define  SSB_SPROM8_MAXP_AL_MASK	0xFF00  /* Mask for Max Power 5.2GHz */
- #define  SSB_SPROM8_MAXP_AL_SHIFT	8
--#define SSB_SPROM8_PA1B0		0x10CC	/* 5.3GHz power amp settings */
--#define SSB_SPROM8_PA1B1		0x10CE
--#define SSB_SPROM8_PA1B2		0x10D0
--#define SSB_SPROM8_PA1LOB0		0x10D2	/* 5.2GHz power amp settings */
--#define SSB_SPROM8_PA1LOB1		0x10D4
--#define SSB_SPROM8_PA1LOB2		0x10D6
--#define SSB_SPROM8_PA1HIB0		0x10D8	/* 5.8GHz power amp settings */
--#define SSB_SPROM8_PA1HIB1		0x10DA
--#define SSB_SPROM8_PA1HIB2		0x10DC
--#define SSB_SPROM8_CCK2GPO		0x1140	/* CCK power offset */
--#define SSB_SPROM8_OFDM2GPO		0x1142	/* 2.4GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GPO		0x1146	/* 5.3GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GLPO		0x114A	/* 5.2GHz OFDM power offset */
--#define SSB_SPROM8_OFDM5GHPO		0x114E	/* 5.8GHz OFDM power offset */
-+#define SSB_SPROM8_PA1B0		0x00CC	/* 5.3GHz power amp settings */
-+#define SSB_SPROM8_PA1B1		0x00CE
-+#define SSB_SPROM8_PA1B2		0x00D0
-+#define SSB_SPROM8_PA1LOB0		0x00D2	/* 5.2GHz power amp settings */
-+#define SSB_SPROM8_PA1LOB1		0x00D4
-+#define SSB_SPROM8_PA1LOB2		0x00D6
-+#define SSB_SPROM8_PA1HIB0		0x00D8	/* 5.8GHz power amp settings */
-+#define SSB_SPROM8_PA1HIB1		0x00DA
-+#define SSB_SPROM8_PA1HIB2		0x00DC
-+#define SSB_SPROM8_CCK2GPO		0x0140	/* CCK power offset */
-+#define SSB_SPROM8_OFDM2GPO		0x0142	/* 2.4GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GPO		0x0146	/* 5.3GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GLPO		0x014A	/* 5.2GHz OFDM power offset */
-+#define SSB_SPROM8_OFDM5GHPO		0x014E	/* 5.8GHz OFDM power offset */
- 
- /* Values for SSB_SPROM1_BINF_CCODE */
- enum {
diff --git a/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch
deleted file mode 100644
index b207c094c6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-
-Add dma_dev, a pointer to struct device, to struct ssb_device.  We pass it
-to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB. 
-ssb_devices_register() sets up it properly.
-
-This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*)
-with the generic DMA API.
-
-Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-Acked-by: Michael Buesch <mb@bu3sch.de>
-Cc: Gary Zambrano <zambrano@broadcom.com>
-Cc: Stefano Brivio <stefano.brivio@polimi.it>
-Cc: Larry Finger <Larry.Finger@lwfinger.net>
-Cc: John W. Linville <linville@tuxdriver.com>
-Acked-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
- drivers/ssb/main.c      |    2 ++
- include/linux/ssb/ssb.h |    2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff -puN drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure drivers/ssb/main.c
---- a/drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure
-+++ a/drivers/ssb/main.c
-@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s
- #ifdef CONFIG_SSB_PCIHOST
- 			sdev->irq = bus->host_pci->irq;
- 			dev->parent = &bus->host_pci->dev;
-+			sdev->dma_dev = dev->parent;
- #endif
- 			break;
- 		case SSB_BUSTYPE_PCMCIA:
-@@ -501,6 +502,7 @@ static int ssb_devices_register(struct s
- 			break;
- 		case SSB_BUSTYPE_SSB:
- 			dev->dma_mask = &dev->coherent_dma_mask;
-+			sdev->dma_dev = dev;
- 			break;
- 		}
- 
-diff -puN include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure include/linux/ssb/ssb.h
---- a/include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure
-+++ a/include/linux/ssb/ssb.h
-@@ -167,7 +167,7 @@ struct ssb_device {
- 	 * is an optimization. */
- 	const struct ssb_bus_ops *ops;
- 
--	struct device *dev;
-+	struct device *dev, *dma_dev;
- 
- 	struct ssb_bus *bus;
- 	struct ssb_device_id id;
-_
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index e9577ba5a0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config BTREE
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index c044deac00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -142,13 +142,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea96..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
deleted file mode 100644
index 5d0b5c6970..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/980-vm_exports.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -29,6 +29,7 @@
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/swap.h>
-+#include <linux/ima.h>
- 
- static struct vfsmount *shm_mnt;
- 
-@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
- 		rcu_read_unlock();
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -177,6 +177,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1203,6 +1203,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -728,6 +728,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch
deleted file mode 100644
index daac5898ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/981-wireless_ext_kconfig_hack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--	bool
-+	bool "Wireless extensions"
- 
- config WEXT_CORE
- 	def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
- 	depends on WEXT_CORE
- 
- config WEXT_SPY
--	bool
-+	bool "WEXT_SPY"
- 
- config WEXT_PRIV
--	bool
-+	bool "WEXT_PRIV"
- 
- config CFG80211
- 	tristate "cfg80211 - wireless configuration API"
diff --git a/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb777809..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch
deleted file mode 100644
index 450986538d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -75,7 +75,7 @@ config RD_LZMA
- config RD_LZO
- 	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
- 	default !EMBEDDED
--	depends on BLK_DEV_INITRD
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
- 	select DECOMPRESS_LZO
- 	help
- 	  Support loading of a LZO encoded initial ramdisk or cpio buffer
diff --git a/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch
deleted file mode 100644
index 63834d65ea..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -225,7 +225,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -239,9 +239,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
- 		;;
-@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch
deleted file mode 100644
index 5499f75bc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.34/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -842,10 +842,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel. "
- 	      "See Linux Documentation/init.txt for guidance.");
diff --git a/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch b/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch
deleted file mode 100644
index ef404868e5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/006-squashfs_add_lzma.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From f49e1efdd179d54e814ff2a8e8f469496583062c Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Tue, 20 Oct 2009 10:54:36 +0100
-Subject: [PATCH] Squashfs: add LZMA compression
-
-Add support for LZMA compressed filesystems.  This is an initial
-implementation.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig        |    5 ++
- fs/squashfs/Makefile       |    1 +
- fs/squashfs/decompressor.c |    4 +
- fs/squashfs/lzma_wrapper.c |  151 ++++++++++++++++++++++++++++++++++++++++++++
- fs/squashfs/squashfs.h     |    3 +
- 5 files changed, 164 insertions(+), 0 deletions(-)
- create mode 100644 fs/squashfs/lzma_wrapper.c
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -26,6 +26,11 @@ config SQUASHFS
- 
- 	  If unsure, say N.
- 
-+config SQUASHFS_LZMA
-+	bool "Include support for LZMA compressed file systems"
-+	depends on SQUASHFS
-+	select DECOMPRESS_LZMA
-+
- config SQUASHFS_EMBEDDED
- 
- 	bool "Additional option for memory-constrained systems" 
---- a/fs/squashfs/Makefile
-+++ b/fs/squashfs/Makefile
-@@ -5,5 +5,5 @@
- obj-$(CONFIG_SQUASHFS) += squashfs.o
- squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
- squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
--squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
-+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
- 
---- a/fs/squashfs/decompressor.c
-+++ b/fs/squashfs/decompressor.c
-@@ -50,7 +50,11 @@ static const struct squashfs_decompresso
- 
- static const struct squashfs_decompressor *decompressor[] = {
- 	&squashfs_zlib_comp_ops,
-+#ifdef CONFIG_SQUASHFS_LZMA
-+	&squashfs_lzma_comp_ops,
-+#else
- 	&squashfs_lzma_unsupported_comp_ops,
-+#endif
- 	&squashfs_lzo_unsupported_comp_ops,
- 	&squashfs_unknown_comp_ops
- };
---- /dev/null
-+++ b/fs/squashfs/lzma_wrapper.c
-@@ -0,0 +1,152 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+ * Phillip Lougher <phillip@lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ * lzma_wrapper.c
-+ */
-+
-+#include <asm/unaligned.h>
-+#include <linux/buffer_head.h>
-+#include <linux/mutex.h>
-+#include <linux/vmalloc.h>
-+#include <linux/decompress/unlzma.h>
-+#include <linux/slab.h>
-+
-+#include "squashfs_fs.h"
-+#include "squashfs_fs_sb.h"
-+#include "squashfs_fs_i.h"
-+#include "squashfs.h"
-+#include "decompressor.h"
-+
-+struct squashfs_lzma {
-+	void	*input;
-+	void	*output;
-+};
-+
-+/* decompress_unlzma.c is currently non re-entrant... */
-+DEFINE_MUTEX(lzma_mutex);
-+
-+/* decompress_unlzma.c doesn't provide any context in its callbacks... */
-+static int lzma_error;
-+
-+static void error(char *m)
-+{
-+	ERROR("unlzma error: %s\n", m);
-+	lzma_error = 1;
-+}
-+
-+	
-+static void *lzma_init(struct squashfs_sb_info *msblk)
-+{
-+	struct squashfs_lzma *stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-+	if (stream == NULL)
-+		goto failed;
-+	stream->input = vmalloc(msblk->block_size);
-+	if (stream->input == NULL)
-+		goto failed;
-+	stream->output = vmalloc(msblk->block_size);
-+	if (stream->output == NULL)
-+		goto failed2;
-+
-+	return stream;
-+
-+failed2:
-+	vfree(stream->input);
-+failed:
-+	ERROR("failed to allocate lzma workspace\n");
-+	kfree(stream);
-+	return NULL;
-+}
-+
-+
-+static void lzma_free(void *strm)
-+{
-+	struct squashfs_lzma *stream = strm;
-+
-+	if (stream) {
-+		vfree(stream->input);
-+		vfree(stream->output);
-+	}
-+	kfree(stream);
-+}
-+
-+
-+static int lzma_uncompress(struct squashfs_sb_info *msblk, void **buffer,
-+	struct buffer_head **bh, int b, int offset, int length, int srclength,
-+	int pages)
-+{
-+	struct squashfs_lzma *stream = msblk->stream;
-+	void *buff = stream->input;
-+	int avail, i, bytes = length, res;
-+
-+	mutex_lock(&lzma_mutex);
-+
-+	for (i = 0; i < b; i++) {
-+		wait_on_buffer(bh[i]);
-+		if (!buffer_uptodate(bh[i]))
-+			goto block_release;
-+
-+		avail = min(bytes, msblk->devblksize - offset);
-+		memcpy(buff, bh[i]->b_data + offset, avail);
-+		buff += avail;
-+		bytes -= avail;
-+		offset = 0;
-+		put_bh(bh[i]);
-+	}
-+
-+	lzma_error = 0;
-+	res = unlzma(stream->input, length, NULL, NULL, stream->output, NULL,
-+							error);
-+	if (res || lzma_error)
-+		goto failed;
-+
-+	/* uncompressed size is stored in the LZMA header (5 byte offset) */
-+	res = bytes = get_unaligned_le32(stream->input + 5);
-+	for (i = 0, buff = stream->output; bytes && i < pages; i++) {
-+		avail = min_t(int, bytes, PAGE_CACHE_SIZE);
-+		memcpy(buffer[i], buff, avail);
-+		buff += avail;
-+		bytes -= avail;
-+	}
-+	if (bytes)
-+		goto failed;
-+
-+	mutex_unlock(&lzma_mutex);
-+	return res;
-+
-+block_release:
-+	for (; i < b; i++)
-+		put_bh(bh[i]);
-+
-+failed:
-+	mutex_unlock(&lzma_mutex);
-+
-+	ERROR("lzma decompression failed, data probably corrupt\n");
-+	return -EIO;
-+}
-+
-+const struct squashfs_decompressor squashfs_lzma_comp_ops = {
-+	.init = lzma_init,
-+	.free = lzma_free,
-+	.decompress = lzma_uncompress,
-+	.id = LZMA_COMPRESSION,
-+	.name = "lzma",
-+	.supported = 1
-+};
-+
---- a/fs/squashfs/squashfs.h
-+++ b/fs/squashfs/squashfs.h
-@@ -94,3 +94,6 @@ extern const struct address_space_operat
- 
- /* zlib_wrapper.c */
- extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
-+
-+/* lzma wrapper.c */
-+extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff --git a/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch
deleted file mode 100644
index c1a105d0dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/007-squashfs_make_lzma_available.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fdf23ed283bc6ef5c25076ce2065f892120ff556 Mon Sep 17 00:00:00 2001
-From: Phillip Lougher <phillip@lougher.demon.co.uk>
-Date: Thu, 22 Oct 2009 04:57:38 +0100
-Subject: [PATCH] Squashfs: Make unlzma available to non initramfs/initrd code
-
-Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to
-specify they need the unlzma code.  Normally decompress_unlzma.c is
-compiled with __init and unlzma is not exported to modules.
-
-Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
----
- fs/squashfs/Kconfig                   |    1 +
- include/linux/decompress/bunzip2_mm.h |   12 ++++++++++++
- include/linux/decompress/inflate_mm.h |   12 ++++++++++++
- include/linux/decompress/mm.h         |    3 ---
- include/linux/decompress/unlzma_mm.h  |   20 ++++++++++++++++++++
- lib/Kconfig                           |    3 +++
- lib/decompress_bunzip2.c              |    1 +
- lib/decompress_inflate.c              |    1 +
- lib/decompress_unlzma.c               |    5 ++++-
- 9 files changed, 54 insertions(+), 4 deletions(-)
- create mode 100644 include/linux/decompress/bunzip2_mm.h
- create mode 100644 include/linux/decompress/inflate_mm.h
- create mode 100644 include/linux/decompress/unlzma_mm.h
-
---- a/fs/squashfs/Kconfig
-+++ b/fs/squashfs/Kconfig
-@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
- 	bool "Include support for LZMA compressed file systems"
- 	depends on SQUASHFS
- 	select DECOMPRESS_LZMA
-+	select DECOMPRESS_LZMA_NEEDED
- 
- config SQUASHFS_EMBEDDED
- 
---- /dev/null
-+++ b/include/linux/decompress/bunzip2_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef BUNZIP2_MM_H
-+#define BUNZIP2_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/decompress/inflate_mm.h
-@@ -0,0 +1,12 @@
-+#ifndef INFLATE_MM_H
-+#define INFLATE_MM_H
-+
-+#ifdef STATIC
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+#else
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
-@@ -63,8 +63,6 @@ static void free(void *where)
- 
- #define set_error_fn(x)
- 
--#define INIT
--
- #else /* STATIC */
- 
- /* Code active when compiled standalone for use when loading ramdisk: */
-@@ -87,7 +85,6 @@ static void free(void *where)
- static void(*error)(char *m);
- #define set_error_fn(x) error = x;
- 
--#define INIT __init
- #define STATIC
- 
- #include <linux/init.h>
---- /dev/null
-+++ b/include/linux/decompress/unlzma_mm.h
-@@ -0,0 +1,20 @@
-+#ifndef UNLZMA_MM_H
-+#define UNLZMA_MM_H
-+
-+#ifdef STATIC
-+
-+/* Code active when included from pre-boot environment: */
-+#define INIT
-+
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+
-+/* Make it available to non initramfs/initrd code */
-+#define INIT
-+#include <linux/module.h>
-+#else
-+
-+/* Compile for initramfs/initrd code only */
-+#define INIT __init
-+#endif
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -121,6 +121,9 @@ config DECOMPRESS_LZO
- 	select LZO_DECOMPRESS
- 	tristate
- 
-+config DECOMPRESS_LZMA_NEEDED
-+	 boolean
-+
- #
- # Generic allocator support is selected if needed
- #
---- a/lib/decompress_bunzip2.c
-+++ b/lib/decompress_bunzip2.c
-@@ -52,6 +52,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/bunzip2_mm.h>
- #include <linux/decompress/mm.h>
- 
- #ifndef INT_MAX
---- a/lib/decompress_inflate.c
-+++ b/lib/decompress_inflate.c
-@@ -23,6 +23,7 @@
- 
- #endif /* STATIC */
- 
-+#include <linux/decompress/inflate_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define GZIP_IOBUF_SIZE (16*1024)
---- a/lib/decompress_unlzma.c
-+++ b/lib/decompress_unlzma.c
-@@ -36,6 +36,7 @@
- #include <linux/slab.h>
- #endif /* STATIC */
- 
-+#include <linux/decompress/unlzma_mm.h>
- #include <linux/decompress/mm.h>
- 
- #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
-@@ -531,7 +532,7 @@ static inline void INIT process_bit1(str
- 
- 
- 
--STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
-+STATIC int INIT unlzma(unsigned char *buf, int in_len,
- 			      int(*fill)(void*, unsigned int),
- 			      int(*flush)(void*, unsigned int),
- 			      unsigned char *output,
-@@ -664,4 +665,6 @@ STATIC int INIT decompress(unsigned char
- {
- 	return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn);
- }
-+#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED)
-+EXPORT_SYMBOL(unlzma);
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch b/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch
deleted file mode 100644
index 5ab2e72928..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/008-jffs2_make_lzma_available.patch
+++ /dev/null
@@ -1,5142 +0,0 @@
---- a/fs/jffs2/Kconfig
-+++ b/fs/jffs2/Kconfig
-@@ -139,6 +139,15 @@ config JFFS2_LZO
- 	  This feature was added in July, 2007. Say 'N' if you need
- 	  compatibility with older bootloaders or kernels.
- 
-+config JFFS2_LZMA
-+	bool "JFFS2 LZMA compression support" if JFFS2_COMPRESSION_OPTIONS
-+	select LZMA_COMPRESS
-+	select LZMA_DECOMPRESS
-+	depends on JFFS2_FS
-+	default n
-+	help
-+	  JFFS2 wrapper to the LZMA C SDK
-+
- config JFFS2_RTIME
- 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS
- 	depends on JFFS2_FS
---- a/fs/jffs2/Makefile
-+++ b/fs/jffs2/Makefile
-@@ -18,4 +18,7 @@ jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rub
- jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
- jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
- jffs2-$(CONFIG_JFFS2_LZO)	+= compr_lzo.o
-+jffs2-$(CONFIG_JFFS2_LZMA)      += compr_lzma.o
- jffs2-$(CONFIG_JFFS2_SUMMARY)   += summary.o
-+
-+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
---- a/fs/jffs2/compr.c
-+++ b/fs/jffs2/compr.c
-@@ -319,6 +319,9 @@ int __init jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_init();
-+#endif
- /* Setting default compression mode */
- #ifdef CONFIG_JFFS2_CMODE_NONE
- 	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void)
- int jffs2_compressors_exit(void)
- {
- /* Unregistering compressors */
-+#ifdef CONFIG_JFFS2_LZMA
-+        jffs2_lzma_exit();
-+#endif
- #ifdef CONFIG_JFFS2_LZO
- 	jffs2_lzo_exit();
- #endif
---- a/fs/jffs2/compr.h
-+++ b/fs/jffs2/compr.h
-@@ -28,9 +28,9 @@
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_LZARI_PRIORITY     30
- #define JFFS2_RTIME_PRIORITY     50
--#define JFFS2_ZLIB_PRIORITY      60
--#define JFFS2_LZO_PRIORITY       80
--
-+#define JFFS2_LZMA_PRIORITY      70
-+#define JFFS2_ZLIB_PRIORITY      80
-+#define JFFS2_LZO_PRIORITY       90
- 
- #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
- #define JFFS2_DYNRUBIN_DISABLED  /*	   for decompression */
-@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void);
- int jffs2_lzo_init(void);
- void jffs2_lzo_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZMA
-+int jffs2_lzma_init(void);
-+void jffs2_lzma_exit(void);
-+#endif
- 
- #endif /* __JFFS2_COMPR_H__ */
---- /dev/null
-+++ b/fs/jffs2/compr_lzma.c
-@@ -0,0 +1,128 @@
-+/*
-+ * JFFS2 -- Journalling Flash File System, Version 2.
-+ *
-+ * For licensing information, see the file 'LICENCE' in this directory.
-+ *
-+ * JFFS2 wrapper to the LZMA C SDK
-+ *
-+ */
-+
-+#include <linux/lzma.h>
-+#include "compr.h"
-+
-+#ifdef __KERNEL__
-+	static DEFINE_MUTEX(deflate_mutex);
-+#endif
-+
-+CLzmaEncHandle *p;
-+Byte propsEncoded[LZMA_PROPS_SIZE];
-+SizeT propsSize = sizeof(propsEncoded);
-+
-+STATIC void lzma_free_workspace(void)
-+{
-+	LzmaEnc_Destroy(p, &lzma_alloc, &lzma_alloc);
-+}
-+
-+STATIC int INIT lzma_alloc_workspace(CLzmaEncProps *props)
-+{
-+	if ((p = (CLzmaEncHandle *)LzmaEnc_Create(&lzma_alloc)) == NULL)
-+	{
-+		PRINT_ERROR("Failed to allocate lzma deflate workspace\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (LzmaEnc_SetProps(p, props) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+	
-+	if (LzmaEnc_WriteProperties(p, propsEncoded, &propsSize) != SZ_OK)
-+	{
-+		lzma_free_workspace();
-+		return -1;
-+	}
-+
-+        return 0;
-+}
-+
-+STATIC int jffs2_lzma_compress(unsigned char *data_in, unsigned char *cpage_out,
-+			      uint32_t *sourcelen, uint32_t *dstlen, void *model)
-+{
-+	SizeT compress_size = (SizeT)(*dstlen);
-+	int ret;
-+
-+	#ifdef __KERNEL__
-+		mutex_lock(&deflate_mutex);
-+	#endif
-+
-+	ret = LzmaEnc_MemEncode(p, cpage_out, &compress_size, data_in, *sourcelen,
-+		0, NULL, &lzma_alloc, &lzma_alloc);
-+
-+	#ifdef __KERNEL__
-+		mutex_unlock(&deflate_mutex);
-+	#endif
-+
-+	if (ret != SZ_OK)
-+		return -1;
-+
-+	*dstlen = (uint32_t)compress_size;
-+
-+	return 0;
-+}
-+
-+STATIC int jffs2_lzma_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+				 uint32_t srclen, uint32_t destlen, void *model)
-+{
-+	int ret;
-+	SizeT dl = (SizeT)destlen;
-+	SizeT sl = (SizeT)srclen;
-+	ELzmaStatus status;
-+	
-+	ret = LzmaDecode(cpage_out, &dl, data_in, &sl, propsEncoded,
-+		propsSize, LZMA_FINISH_ANY, &status, &lzma_alloc);
-+
-+	if (ret != SZ_OK || status == LZMA_STATUS_NOT_FINISHED || dl != (SizeT)destlen)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzma_comp = {
-+	.priority = JFFS2_LZMA_PRIORITY,
-+	.name = "lzma",
-+	.compr = JFFS2_COMPR_LZMA,
-+	.compress = &jffs2_lzma_compress,
-+	.decompress = &jffs2_lzma_decompress,
-+	.disabled = 0,
-+};
-+
-+int INIT jffs2_lzma_init(void)
-+{
-+        int ret;
-+	CLzmaEncProps props;
-+	LzmaEncProps_Init(&props);
-+
-+        props.dictSize = LZMA_BEST_DICT(0x2000);
-+        props.level = LZMA_BEST_LEVEL;
-+        props.lc = LZMA_BEST_LC;
-+        props.lp = LZMA_BEST_LP;
-+        props.pb = LZMA_BEST_PB;
-+        props.fb = LZMA_BEST_FB;
-+
-+	ret = lzma_alloc_workspace(&props);
-+        if (ret < 0)
-+                return ret;
-+
-+	ret = jffs2_register_compressor(&jffs2_lzma_comp);
-+	if (ret)
-+		lzma_free_workspace();
-+	
-+        return ret;
-+}
-+
-+void jffs2_lzma_exit(void)
-+{
-+	jffs2_unregister_compressor(&jffs2_lzma_comp);
-+	lzma_free_workspace();
-+}
---- a/fs/jffs2/super.c
-+++ b/fs/jffs2/super.c
-@@ -254,14 +254,41 @@ static int __init init_jffs2_fs(void)
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
- 	BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
- 
--	printk(KERN_INFO "JFFS2 version 2.2."
-+	printk(KERN_INFO "JFFS2 version 2.2"
- #ifdef CONFIG_JFFS2_FS_WRITEBUFFER
- 	       " (NAND)"
- #endif
- #ifdef CONFIG_JFFS2_SUMMARY
--	       " (SUMMARY) "
-+	       " (SUMMARY)"
- #endif
--	       " © 2001-2006 Red Hat, Inc.\n");
-+#ifdef CONFIG_JFFS2_ZLIB
-+	       " (ZLIB)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZO
-+	       " (LZO)"
-+#endif
-+#ifdef CONFIG_JFFS2_LZMA
-+	       " (LZMA)"
-+#endif
-+#ifdef CONFIG_JFFS2_RTIME
-+	       " (RTIME)"
-+#endif
-+#ifdef CONFIG_JFFS2_RUBIN
-+	       " (RUBIN)"
-+#endif
-+#ifdef  CONFIG_JFFS2_CMODE_NONE
-+	       " (CMODE_NONE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_PRIORITY
-+	       " (CMODE_PRIORITY)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_SIZE
-+	       " (CMODE_SIZE)"
-+#endif
-+#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO
-+	       " (CMODE_FAVOURLZO)"
-+#endif
-+	       " (c) 2001-2006 Red Hat, Inc.\n");
- 
- 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",
- 					     sizeof(struct jffs2_inode_info),
---- a/include/linux/jffs2.h
-+++ b/include/linux/jffs2.h
-@@ -45,6 +45,7 @@
- #define JFFS2_COMPR_DYNRUBIN	0x05
- #define JFFS2_COMPR_ZLIB	0x06
- #define JFFS2_COMPR_LZO		0x07
-+#define JFFS2_COMPR_LZMA	0x08
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
---- /dev/null
-+++ b/include/linux/lzma.h
-@@ -0,0 +1,62 @@
-+#ifndef __LZMA_H__
-+#define __LZMA_H__
-+
-+#ifdef __KERNEL__
-+	#include <linux/kernel.h>
-+	#include <linux/sched.h>
-+	#include <linux/slab.h>
-+	#include <linux/vmalloc.h>
-+	#include <linux/init.h>
-+	#define LZMA_MALLOC vmalloc
-+	#define LZMA_FREE vfree
-+	#define PRINT_ERROR(msg) printk(KERN_WARNING #msg)
-+	#define INIT __init
-+	#define STATIC static
-+#else
-+	#include <stdint.h>
-+	#include <stdlib.h>
-+	#include <stdio.h>
-+	#include <unistd.h>
-+	#include <string.h>
-+	#include <asm/types.h>
-+	#include <errno.h>
-+	#include <linux/jffs2.h>
-+	#ifndef PAGE_SIZE
-+		extern int page_size;
-+		#define PAGE_SIZE page_size
-+	#endif
-+	#define LZMA_MALLOC malloc
-+	#define LZMA_FREE free
-+	#define PRINT_ERROR(msg) fprintf(stderr, msg)
-+	#define INIT
-+	#define STATIC
-+#endif
-+
-+#include "lzma/LzmaDec.h"
-+#include "lzma/LzmaEnc.h"
-+
-+#define LZMA_BEST_LEVEL (9)
-+#define LZMA_BEST_LC    (0)
-+#define LZMA_BEST_LP    (0)
-+#define LZMA_BEST_PB    (0)
-+#define LZMA_BEST_FB  (273)
-+
-+#define LZMA_BEST_DICT(n) (((int)((n) / 2)) * 2)
-+
-+static void *p_lzma_malloc(void *p, size_t size)
-+{
-+        if (size == 0)
-+                return NULL;
-+
-+        return LZMA_MALLOC(size);
-+}
-+
-+static void p_lzma_free(void *p, void *address)
-+{
-+        if (address != NULL)
-+                LZMA_FREE(address);
-+}
-+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzFind.h
-@@ -0,0 +1,115 @@
-+/* LzFind.h -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_FIND_H
-+#define __LZ_FIND_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef UInt32 CLzRef;
-+
-+typedef struct _CMatchFinder
-+{
-+  Byte *buffer;
-+  UInt32 pos;
-+  UInt32 posLimit;
-+  UInt32 streamPos;
-+  UInt32 lenLimit;
-+
-+  UInt32 cyclicBufferPos;
-+  UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
-+
-+  UInt32 matchMaxLen;
-+  CLzRef *hash;
-+  CLzRef *son;
-+  UInt32 hashMask;
-+  UInt32 cutValue;
-+
-+  Byte *bufferBase;
-+  ISeqInStream *stream;
-+  int streamEndWasReached;
-+
-+  UInt32 blockSize;
-+  UInt32 keepSizeBefore;
-+  UInt32 keepSizeAfter;
-+
-+  UInt32 numHashBytes;
-+  int directInput;
-+  size_t directInputRem;
-+  int btMode;
-+  int bigHash;
-+  UInt32 historySize;
-+  UInt32 fixedHashSize;
-+  UInt32 hashSizeSum;
-+  UInt32 numSons;
-+  SRes result;
-+  UInt32 crc[256];
-+} CMatchFinder;
-+
-+#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
-+#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
-+
-+#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
-+
-+int MatchFinder_NeedMove(CMatchFinder *p);
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
-+void MatchFinder_MoveBlock(CMatchFinder *p);
-+void MatchFinder_ReadIfRequired(CMatchFinder *p);
-+
-+void MatchFinder_Construct(CMatchFinder *p);
-+
-+/* Conditions:
-+     historySize <= 3 GB
-+     keepAddBufferBefore + matchMaxLen + keepAddBufferAfter < 511MB
-+*/
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc);
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
-+    UInt32 *distances, UInt32 maxLen);
-+
-+/*
-+Conditions:
-+  Mf_GetNumAvailableBytes_Func must be called before each Mf_GetMatchLen_Func.
-+  Mf_GetPointerToCurrentPos_Func's result must be used only before any other function
-+*/
-+
-+typedef void (*Mf_Init_Func)(void *object);
-+typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
-+typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
-+typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
-+typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
-+typedef void (*Mf_Skip_Func)(void *object, UInt32);
-+
-+typedef struct _IMatchFinder
-+{
-+  Mf_Init_Func Init;
-+  Mf_GetIndexByte_Func GetIndexByte;
-+  Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
-+  Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
-+  Mf_GetMatches_Func GetMatches;
-+  Mf_Skip_Func Skip;
-+} IMatchFinder;
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
-+
-+void MatchFinder_Init(CMatchFinder *p);
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzHash.h
-@@ -0,0 +1,54 @@
-+/* LzHash.h -- HASH functions for LZ algorithms
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZ_HASH_H
-+#define __LZ_HASH_H
-+
-+#define kHash2Size (1 << 10)
-+#define kHash3Size (1 << 16)
-+#define kHash4Size (1 << 20)
-+
-+#define kFix3HashSize (kHash2Size)
-+#define kFix4HashSize (kHash2Size + kHash3Size)
-+#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
-+
-+#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
-+
-+#define HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
-+
-+#define HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
-+
-+#define HASH5_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
-+  hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
-+  hash4Value &= (kHash4Size - 1); }
-+
-+/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
-+#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
-+
-+
-+#define MT_HASH2_CALC \
-+  hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
-+
-+#define MT_HASH3_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
-+
-+#define MT_HASH4_CALC { \
-+  UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
-+  hash2Value = temp & (kHash2Size - 1); \
-+  hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
-+  hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaDec.h
-@@ -0,0 +1,231 @@
-+/* LzmaDec.h -- LZMA Decoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_DEC_H
-+#define __LZMA_DEC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* #define _LZMA_PROB32 */
-+/* _LZMA_PROB32 can increase the speed on some CPUs,
-+   but memory usage for CLzmaDec::probs will be doubled in that case */
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+
-+/* ---------- LZMA Properties ---------- */
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaProps
-+{
-+  unsigned lc, lp, pb;
-+  UInt32 dicSize;
-+} CLzmaProps;
-+
-+/* LzmaProps_Decode - decodes properties
-+Returns:
-+  SZ_OK
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
-+
-+
-+/* ---------- LZMA Decoder state ---------- */
-+
-+/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
-+   Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
-+
-+#define LZMA_REQUIRED_INPUT_MAX 20
-+
-+typedef struct
-+{
-+  CLzmaProps prop;
-+  CLzmaProb *probs;
-+  Byte *dic;
-+  const Byte *buf;
-+  UInt32 range, code;
-+  SizeT dicPos;
-+  SizeT dicBufSize;
-+  UInt32 processedPos;
-+  UInt32 checkDicSize;
-+  unsigned state;
-+  UInt32 reps[4];
-+  unsigned remainLen;
-+  int needFlush;
-+  int needInitState;
-+  UInt32 numProbs;
-+  unsigned tempBufSize;
-+  Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
-+} CLzmaDec;
-+
-+#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
-+
-+void LzmaDec_Init(CLzmaDec *p);
-+
-+/* There are two types of LZMA streams:
-+     0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
-+     1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
-+
-+typedef enum
-+{
-+  LZMA_FINISH_ANY,   /* finish at any point */
-+  LZMA_FINISH_END    /* block must be finished at the end */
-+} ELzmaFinishMode;
-+
-+/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
-+
-+   You must use LZMA_FINISH_END, when you know that current output buffer
-+   covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
-+
-+   If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
-+   and output value of destLen will be less than output buffer size limit.
-+   You can check status result also.
-+
-+   You can use multiple checks to test data integrity after full decompression:
-+     1) Check Result and "status" variable.
-+     2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
-+     3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
-+        You must use correct finish mode in that case. */
-+
-+typedef enum
-+{
-+  LZMA_STATUS_NOT_SPECIFIED,               /* use main error code instead */
-+  LZMA_STATUS_FINISHED_WITH_MARK,          /* stream was finished with end mark. */
-+  LZMA_STATUS_NOT_FINISHED,                /* stream was not finished */
-+  LZMA_STATUS_NEEDS_MORE_INPUT,            /* you must provide more input bytes */
-+  LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK  /* there is probability that stream was finished without end mark */
-+} ELzmaStatus;
-+
-+/* ELzmaStatus is used only as output value for function call */
-+
-+
-+/* ---------- Interfaces ---------- */
-+
-+/* There are 3 levels of interfaces:
-+     1) Dictionary Interface
-+     2) Buffer Interface
-+     3) One Call Interface
-+   You can select any of these interfaces, but don't mix functions from different
-+   groups for same object. */
-+
-+
-+/* There are two variants to allocate state for Dictionary Interface:
-+     1) LzmaDec_Allocate / LzmaDec_Free
-+     2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
-+   You can use variant 2, if you set dictionary buffer manually.
-+   For Buffer Interface you must always use variant 1.
-+
-+LzmaDec_Allocate* can return:
-+  SZ_OK
-+  SZ_ERROR_MEM         - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+*/
-+   
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
-+
-+SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
-+void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
-+
-+/* ---------- Dictionary Interface ---------- */
-+
-+/* You can use it, if you want to eliminate the overhead for data copying from
-+   dictionary to some other external buffer.
-+   You must work with CLzmaDec variables directly in this interface.
-+
-+   STEPS:
-+     LzmaDec_Constr()
-+     LzmaDec_Allocate()
-+     for (each new stream)
-+     {
-+       LzmaDec_Init()
-+       while (it needs more decompression)
-+       {
-+         LzmaDec_DecodeToDic()
-+         use data from CLzmaDec::dic and update CLzmaDec::dicPos
-+       }
-+     }
-+     LzmaDec_Free()
-+*/
-+
-+/* LzmaDec_DecodeToDic
-+   
-+   The decoding to internal dictionary buffer (CLzmaDec::dic).
-+   You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (dicLimit).
-+  LZMA_FINISH_ANY - Decode just dicLimit bytes.
-+  LZMA_FINISH_END - Stream must be finished after dicLimit.
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_NEEDS_MORE_INPUT
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+*/
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- Buffer Interface ---------- */
-+
-+/* It's zlib-like interface.
-+   See LzmaDec_DecodeToDic description for information about STEPS and return results,
-+   but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
-+   to work with CLzmaDec variables manually.
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+*/
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
-+    const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
-+
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaDecode
-+
-+finishMode:
-+  It has meaning only if the decoding reaches output limit (*destLen).
-+  LZMA_FINISH_ANY - Decode just destLen bytes.
-+  LZMA_FINISH_END - Stream must be finished after (*destLen).
-+
-+Returns:
-+  SZ_OK
-+    status:
-+      LZMA_STATUS_FINISHED_WITH_MARK
-+      LZMA_STATUS_NOT_FINISHED
-+      LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
-+  SZ_ERROR_DATA - Data error
-+  SZ_ERROR_MEM  - Memory allocation error
-+  SZ_ERROR_UNSUPPORTED - Unsupported properties
-+  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-+*/
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/LzmaEnc.h
-@@ -0,0 +1,80 @@
-+/*  LzmaEnc.h -- LZMA Encoder
-+2009-02-07 : Igor Pavlov : Public domain */
-+
-+#ifndef __LZMA_ENC_H
-+#define __LZMA_ENC_H
-+
-+#include "Types.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define LZMA_PROPS_SIZE 5
-+
-+typedef struct _CLzmaEncProps
-+{
-+  int level;       /*  0 <= level <= 9 */
-+  UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
-+                      (1 << 12) <= dictSize <= (1 << 30) for 64-bit version
-+                       default = (1 << 24) */
-+  int lc;          /* 0 <= lc <= 8, default = 3 */
-+  int lp;          /* 0 <= lp <= 4, default = 0 */
-+  int pb;          /* 0 <= pb <= 4, default = 2 */
-+  int algo;        /* 0 - fast, 1 - normal, default = 1 */
-+  int fb;          /* 5 <= fb <= 273, default = 32 */
-+  int btMode;      /* 0 - hashChain Mode, 1 - binTree mode - normal, default = 1 */
-+  int numHashBytes; /* 2, 3 or 4, default = 4 */
-+  UInt32 mc;        /* 1 <= mc <= (1 << 30), default = 32 */
-+  unsigned writeEndMark;  /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
-+  int numThreads;  /* 1 or 2, default = 2 */
-+} CLzmaEncProps;
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p);
-+void LzmaEncProps_Normalize(CLzmaEncProps *p);
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
-+
-+
-+/* ---------- CLzmaEncHandle Interface ---------- */
-+
-+/* LzmaEnc_* functions can return the following exit codes:
-+Returns:
-+  SZ_OK           - OK
-+  SZ_ERROR_MEM    - Memory allocation error
-+  SZ_ERROR_PARAM  - Incorrect paramater in props
-+  SZ_ERROR_WRITE  - Write callback error.
-+  SZ_ERROR_PROGRESS - some break from progress callback
-+  SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
-+*/
-+
-+typedef void * CLzmaEncHandle;
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
-+SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+/* ---------- One Call Interface ---------- */
-+
-+/* LzmaEncode
-+Return code:
-+  SZ_OK               - OK
-+  SZ_ERROR_MEM        - Memory allocation error
-+  SZ_ERROR_PARAM      - Incorrect paramater
-+  SZ_ERROR_OUTPUT_EOF - output buffer overflow
-+  SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
-+*/
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/include/linux/lzma/Types.h
-@@ -0,0 +1,226 @@
-+/* Types.h -- Basic types
-+2009-11-23 : Igor Pavlov : Public domain */
-+
-+#ifndef __7Z_TYPES_H
-+#define __7Z_TYPES_H
-+
-+#include <stddef.h>
-+
-+#ifdef _WIN32
-+#include <windows.h>
-+#endif
-+
-+#ifndef EXTERN_C_BEGIN
-+#ifdef __cplusplus
-+#define EXTERN_C_BEGIN extern "C" {
-+#define EXTERN_C_END }
-+#else
-+#define EXTERN_C_BEGIN
-+#define EXTERN_C_END
-+#endif
-+#endif
-+
-+EXTERN_C_BEGIN
-+
-+#define SZ_OK 0
-+
-+#define SZ_ERROR_DATA 1
-+#define SZ_ERROR_MEM 2
-+#define SZ_ERROR_CRC 3
-+#define SZ_ERROR_UNSUPPORTED 4
-+#define SZ_ERROR_PARAM 5
-+#define SZ_ERROR_INPUT_EOF 6
-+#define SZ_ERROR_OUTPUT_EOF 7
-+#define SZ_ERROR_READ 8
-+#define SZ_ERROR_WRITE 9
-+#define SZ_ERROR_PROGRESS 10
-+#define SZ_ERROR_FAIL 11
-+#define SZ_ERROR_THREAD 12
-+
-+#define SZ_ERROR_ARCHIVE 16
-+#define SZ_ERROR_NO_ARCHIVE 17
-+
-+typedef int SRes;
-+
-+#ifdef _WIN32
-+typedef DWORD WRes;
-+#else
-+typedef int WRes;
-+#endif
-+
-+#ifndef RINOK
-+#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
-+#endif
-+
-+typedef unsigned char Byte;
-+typedef short Int16;
-+typedef unsigned short UInt16;
-+
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef long Int32;
-+typedef unsigned long UInt32;
-+#else
-+typedef int Int32;
-+typedef unsigned int UInt32;
-+#endif
-+
-+#ifdef _SZ_NO_INT_64
-+
-+/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-+   NOTES: Some code will work incorrectly in that case! */
-+
-+typedef long Int64;
-+typedef unsigned long UInt64;
-+
-+#else
-+
-+#if defined(_MSC_VER) || defined(__BORLANDC__)
-+typedef __int64 Int64;
-+typedef unsigned __int64 UInt64;
-+#else
-+typedef long long int Int64;
-+typedef unsigned long long int UInt64;
-+#endif
-+
-+#endif
-+
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+typedef size_t SizeT;
-+#endif
-+
-+typedef int Bool;
-+#define True 1
-+#define False 0
-+
-+
-+#ifdef _WIN32
-+#define MY_STD_CALL __stdcall
-+#else
-+#define MY_STD_CALL
-+#endif
-+
-+#ifdef _MSC_VER
-+
-+#if _MSC_VER >= 1300
-+#define MY_NO_INLINE __declspec(noinline)
-+#else
-+#define MY_NO_INLINE
-+#endif
-+
-+#define MY_CDECL __cdecl
-+#define MY_FAST_CALL __fastcall
-+
-+#else
-+
-+#define MY_CDECL
-+#define MY_FAST_CALL
-+
-+#endif
-+
-+
-+/* The following interfaces use first parameter as pointer to structure */
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) < input(*size)) is allowed */
-+} ISeqInStream;
-+
-+/* it can return SZ_ERROR_INPUT_EOF */
-+SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
-+SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
-+
-+typedef struct
-+{
-+  size_t (*Write)(void *p, const void *buf, size_t size);
-+    /* Returns: result - the number of actually written bytes.
-+       (result < size) means error */
-+} ISeqOutStream;
-+
-+typedef enum
-+{
-+  SZ_SEEK_SET = 0,
-+  SZ_SEEK_CUR = 1,
-+  SZ_SEEK_END = 2
-+} ESzSeek;
-+
-+typedef struct
-+{
-+  SRes (*Read)(void *p, void *buf, size_t *size);  /* same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ISeekInStream;
-+
-+typedef struct
-+{
-+  SRes (*Look)(void *p, void **buf, size_t *size);
-+    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-+       (output(*size) > input(*size)) is not allowed
-+       (output(*size) < input(*size)) is allowed */
-+  SRes (*Skip)(void *p, size_t offset);
-+    /* offset must be <= output(*size) of Look */
-+
-+  SRes (*Read)(void *p, void *buf, size_t *size);
-+    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-+  SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
-+} ILookInStream;
-+
-+SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
-+SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
-+
-+/* reads via ILookInStream::Read */
-+SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
-+SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
-+
-+#define LookToRead_BUF_SIZE (1 << 14)
-+
-+typedef struct
-+{
-+  ILookInStream s;
-+  ISeekInStream *realStream;
-+  size_t pos;
-+  size_t size;
-+  Byte buf[LookToRead_BUF_SIZE];
-+} CLookToRead;
-+
-+void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
-+void LookToRead_Init(CLookToRead *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToLook;
-+
-+void SecToLook_CreateVTable(CSecToLook *p);
-+
-+typedef struct
-+{
-+  ISeqInStream s;
-+  ILookInStream *realStream;
-+} CSecToRead;
-+
-+void SecToRead_CreateVTable(CSecToRead *p);
-+
-+typedef struct
-+{
-+  SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
-+    /* Returns: result. (result != SZ_OK) means break.
-+       Value (UInt64)(Int64)-1 for size means unknown value. */
-+} ICompressProgress;
-+
-+typedef struct
-+{
-+  void *(*Alloc)(void *p, size_t size);
-+  void (*Free)(void *p, void *address); /* address can be 0 */
-+} ISzAlloc;
-+
-+#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-+#define IAlloc_Free(p, a) (p)->Free((p), a)
-+
-+EXTERN_C_END
-+
-+#endif
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -103,6 +103,12 @@ config LZO_COMPRESS
- config LZO_DECOMPRESS
- 	tristate
- 
-+config LZMA_COMPRESS
-+    tristate
-+
-+config LZMA_DECOMPRESS
-+    tristate
-+
- #
- # These all provide a common interface (hence the apparent duplication with
- # ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -2,6 +2,16 @@
- # Makefile for some libs needed in the kernel.
- #
- 
-+ifdef CONFIG_JFFS2_ZLIB
-+	CONFIG_ZLIB_INFLATE:=y
-+	CONFIG_ZLIB_DEFLATE:=y
-+endif
-+
-+ifdef CONFIG_JFFS2_LZMA
-+	CONFIG_LZMA_DECOMPRESS:=y
-+	CONFIG_LZMA_COMPRESS:=y
-+endif
-+
- ifdef CONFIG_FUNCTION_TRACER
- ORIG_CFLAGS := $(KBUILD_CFLAGS)
- KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
-@@ -66,6 +76,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
- obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
- obj-$(CONFIG_LZO_COMPRESS) += lzo/
- obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma/
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
- 
- lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
- lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
---- /dev/null
-+++ b/lib/lzma/LzFind.c
-@@ -0,0 +1,761 @@
-+/* LzFind.c -- Match finder for LZ algorithms
-+2009-04-22 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+#include "LzFind.h"
-+#include "LzHash.h"
-+
-+#define kEmptyHashValue 0
-+#define kMaxValForNormalize ((UInt32)0xFFFFFFFF)
-+#define kNormalizeStepMin (1 << 10) /* it must be power of 2 */
-+#define kNormalizeMask (~(kNormalizeStepMin - 1))
-+#define kMaxHistorySize ((UInt32)3 << 30)
-+
-+#define kStartMaxLen 3
-+
-+static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  if (!p->directInput)
-+  {
-+    alloc->Free(alloc, p->bufferBase);
-+    p->bufferBase = 0;
-+  }
-+}
-+
-+/* keepSizeBefore + keepSizeAfter + keepSizeReserv must be < 4G) */
-+
-+static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc)
-+{
-+  UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv;
-+  if (p->directInput)
-+  {
-+    p->blockSize = blockSize;
-+    return 1;
-+  }
-+  if (p->bufferBase == 0 || p->blockSize != blockSize)
-+  {
-+    LzInWindow_Free(p, alloc);
-+    p->blockSize = blockSize;
-+    p->bufferBase = (Byte *)alloc->Alloc(alloc, (size_t)blockSize);
-+  }
-+  return (p->bufferBase != 0);
-+}
-+
-+Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p) { return p->buffer; }
-+Byte MatchFinder_GetIndexByte(CMatchFinder *p, Int32 index) { return p->buffer[index]; }
-+
-+UInt32 MatchFinder_GetNumAvailableBytes(CMatchFinder *p) { return p->streamPos - p->pos; }
-+
-+void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue)
-+{
-+  p->posLimit -= subValue;
-+  p->pos -= subValue;
-+  p->streamPos -= subValue;
-+}
-+
-+static void MatchFinder_ReadBlock(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached || p->result != SZ_OK)
-+    return;
-+  if (p->directInput)
-+  {
-+    UInt32 curSize = 0xFFFFFFFF - p->streamPos;
-+    if (curSize > p->directInputRem)
-+      curSize = (UInt32)p->directInputRem;
-+    p->directInputRem -= curSize;
-+    p->streamPos += curSize;
-+    if (p->directInputRem == 0)
-+      p->streamEndWasReached = 1;
-+    return;
-+  }
-+  for (;;)
-+  {
-+    Byte *dest = p->buffer + (p->streamPos - p->pos);
-+    size_t size = (p->bufferBase + p->blockSize - dest);
-+    if (size == 0)
-+      return;
-+    p->result = p->stream->Read(p->stream, dest, &size);
-+    if (p->result != SZ_OK)
-+      return;
-+    if (size == 0)
-+    {
-+      p->streamEndWasReached = 1;
-+      return;
-+    }
-+    p->streamPos += (UInt32)size;
-+    if (p->streamPos - p->pos > p->keepSizeAfter)
-+      return;
-+  }
-+}
-+
-+void MatchFinder_MoveBlock(CMatchFinder *p)
-+{
-+  memmove(p->bufferBase,
-+    p->buffer - p->keepSizeBefore,
-+    (size_t)(p->streamPos - p->pos + p->keepSizeBefore));
-+  p->buffer = p->bufferBase + p->keepSizeBefore;
-+}
-+
-+int MatchFinder_NeedMove(CMatchFinder *p)
-+{
-+  if (p->directInput)
-+    return 0;
-+  /* if (p->streamEndWasReached) return 0; */
-+  return ((size_t)(p->bufferBase + p->blockSize - p->buffer) <= p->keepSizeAfter);
-+}
-+
-+void MatchFinder_ReadIfRequired(CMatchFinder *p)
-+{
-+  if (p->streamEndWasReached)
-+    return;
-+  if (p->keepSizeAfter >= p->streamPos - p->pos)
-+    MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p)
-+{
-+  if (MatchFinder_NeedMove(p))
-+    MatchFinder_MoveBlock(p);
-+  MatchFinder_ReadBlock(p);
-+}
-+
-+static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
-+{
-+  p->cutValue = 32;
-+  p->btMode = 1;
-+  p->numHashBytes = 4;
-+  p->bigHash = 0;
-+}
-+
-+#define kCrcPoly 0xEDB88320
-+
-+void MatchFinder_Construct(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  p->bufferBase = 0;
-+  p->directInput = 0;
-+  p->hash = 0;
-+  MatchFinder_SetDefaultSettings(p);
-+
-+  for (i = 0; i < 256; i++)
-+  {
-+    UInt32 r = i;
-+    int j;
-+    for (j = 0; j < 8; j++)
-+      r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-+    p->crc[i] = r;
-+  }
-+}
-+
-+static void MatchFinder_FreeThisClassMemory(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->hash);
-+  p->hash = 0;
-+}
-+
-+void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc)
-+{
-+  MatchFinder_FreeThisClassMemory(p, alloc);
-+  LzInWindow_Free(p, alloc);
-+}
-+
-+static CLzRef* AllocRefs(UInt32 num, ISzAlloc *alloc)
-+{
-+  size_t sizeInBytes = (size_t)num * sizeof(CLzRef);
-+  if (sizeInBytes / sizeof(CLzRef) != num)
-+    return 0;
-+  return (CLzRef *)alloc->Alloc(alloc, sizeInBytes);
-+}
-+
-+int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
-+    UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
-+    ISzAlloc *alloc)
-+{
-+  UInt32 sizeReserv;
-+  if (historySize > kMaxHistorySize)
-+  {
-+    MatchFinder_Free(p, alloc);
-+    return 0;
-+  }
-+  sizeReserv = historySize >> 1;
-+  if (historySize > ((UInt32)2 << 30))
-+    sizeReserv = historySize >> 2;
-+  sizeReserv += (keepAddBufferBefore + matchMaxLen + keepAddBufferAfter) / 2 + (1 << 19);
-+
-+  p->keepSizeBefore = historySize + keepAddBufferBefore + 1;
-+  p->keepSizeAfter = matchMaxLen + keepAddBufferAfter;
-+  /* we need one additional byte, since we use MoveBlock after pos++ and before dictionary using */
-+  if (LzInWindow_Create(p, sizeReserv, alloc))
-+  {
-+    UInt32 newCyclicBufferSize = historySize + 1;
-+    UInt32 hs;
-+    p->matchMaxLen = matchMaxLen;
-+    {
-+      p->fixedHashSize = 0;
-+      if (p->numHashBytes == 2)
-+        hs = (1 << 16) - 1;
-+      else
-+      {
-+        hs = historySize - 1;
-+        hs |= (hs >> 1);
-+        hs |= (hs >> 2);
-+        hs |= (hs >> 4);
-+        hs |= (hs >> 8);
-+        hs >>= 1;
-+        hs |= 0xFFFF; /* don't change it! It's required for Deflate */
-+        if (hs > (1 << 24))
-+        {
-+          if (p->numHashBytes == 3)
-+            hs = (1 << 24) - 1;
-+          else
-+            hs >>= 1;
-+        }
-+      }
-+      p->hashMask = hs;
-+      hs++;
-+      if (p->numHashBytes > 2) p->fixedHashSize += kHash2Size;
-+      if (p->numHashBytes > 3) p->fixedHashSize += kHash3Size;
-+      if (p->numHashBytes > 4) p->fixedHashSize += kHash4Size;
-+      hs += p->fixedHashSize;
-+    }
-+
-+    {
-+      UInt32 prevSize = p->hashSizeSum + p->numSons;
-+      UInt32 newSize;
-+      p->historySize = historySize;
-+      p->hashSizeSum = hs;
-+      p->cyclicBufferSize = newCyclicBufferSize;
-+      p->numSons = (p->btMode ? newCyclicBufferSize * 2 : newCyclicBufferSize);
-+      newSize = p->hashSizeSum + p->numSons;
-+      if (p->hash != 0 && prevSize == newSize)
-+        return 1;
-+      MatchFinder_FreeThisClassMemory(p, alloc);
-+      p->hash = AllocRefs(newSize, alloc);
-+      if (p->hash != 0)
-+      {
-+        p->son = p->hash + p->hashSizeSum;
-+        return 1;
-+      }
-+    }
-+  }
-+  MatchFinder_Free(p, alloc);
-+  return 0;
-+}
-+
-+static void MatchFinder_SetLimits(CMatchFinder *p)
-+{
-+  UInt32 limit = kMaxValForNormalize - p->pos;
-+  UInt32 limit2 = p->cyclicBufferSize - p->cyclicBufferPos;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  limit2 = p->streamPos - p->pos;
-+  if (limit2 <= p->keepSizeAfter)
-+  {
-+    if (limit2 > 0)
-+      limit2 = 1;
-+  }
-+  else
-+    limit2 -= p->keepSizeAfter;
-+  if (limit2 < limit)
-+    limit = limit2;
-+  {
-+    UInt32 lenLimit = p->streamPos - p->pos;
-+    if (lenLimit > p->matchMaxLen)
-+      lenLimit = p->matchMaxLen;
-+    p->lenLimit = lenLimit;
-+  }
-+  p->posLimit = p->pos + limit;
-+}
-+
-+void MatchFinder_Init(CMatchFinder *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < p->hashSizeSum; i++)
-+    p->hash[i] = kEmptyHashValue;
-+  p->cyclicBufferPos = 0;
-+  p->buffer = p->bufferBase;
-+  p->pos = p->streamPos = p->cyclicBufferSize;
-+  p->result = SZ_OK;
-+  p->streamEndWasReached = 0;
-+  MatchFinder_ReadBlock(p);
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 MatchFinder_GetSubValue(CMatchFinder *p)
-+{
-+  return (p->pos - p->historySize - 1) & kNormalizeMask;
-+}
-+
-+void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems)
-+{
-+  UInt32 i;
-+  for (i = 0; i < numItems; i++)
-+  {
-+    UInt32 value = items[i];
-+    if (value <= subValue)
-+      value = kEmptyHashValue;
-+    else
-+      value -= subValue;
-+    items[i] = value;
-+  }
-+}
-+
-+static void MatchFinder_Normalize(CMatchFinder *p)
-+{
-+  UInt32 subValue = MatchFinder_GetSubValue(p);
-+  MatchFinder_Normalize3(subValue, p->hash, p->hashSizeSum + p->numSons);
-+  MatchFinder_ReduceOffsets(p, subValue);
-+}
-+
-+static void MatchFinder_CheckLimits(CMatchFinder *p)
-+{
-+  if (p->pos == kMaxValForNormalize)
-+    MatchFinder_Normalize(p);
-+  if (!p->streamEndWasReached && p->keepSizeAfter == p->streamPos - p->pos)
-+    MatchFinder_CheckAndMoveAndRead(p);
-+  if (p->cyclicBufferPos == p->cyclicBufferSize)
-+    p->cyclicBufferPos = 0;
-+  MatchFinder_SetLimits(p);
-+}
-+
-+static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  son[_cyclicBufferPos] = curMatch;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+      return distances;
-+    {
-+      const Byte *pb = cur - delta;
-+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];
-+      if (pb[maxLen] == cur[maxLen] && *pb == *cur)
-+      {
-+        UInt32 len = 0;
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+            return distances;
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,
-+    UInt32 *distances, UInt32 maxLen)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return distances;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        if (++len != lenLimit && pb[len] == cur[len])
-+          while (++len != lenLimit)
-+            if (pb[len] != cur[len])
-+              break;
-+        if (maxLen < len)
-+        {
-+          *distances++ = maxLen = len;
-+          *distances++ = delta - 1;
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return distances;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,
-+    UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)
-+{
-+  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;
-+  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);
-+  UInt32 len0 = 0, len1 = 0;
-+  for (;;)
-+  {
-+    UInt32 delta = pos - curMatch;
-+    if (cutValue-- == 0 || delta >= _cyclicBufferSize)
-+    {
-+      *ptr0 = *ptr1 = kEmptyHashValue;
-+      return;
-+    }
-+    {
-+      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);
-+      const Byte *pb = cur - delta;
-+      UInt32 len = (len0 < len1 ? len0 : len1);
-+      if (pb[len] == cur[len])
-+      {
-+        while (++len != lenLimit)
-+          if (pb[len] != cur[len])
-+            break;
-+        {
-+          if (len == lenLimit)
-+          {
-+            *ptr1 = pair[0];
-+            *ptr0 = pair[1];
-+            return;
-+          }
-+        }
-+      }
-+      if (pb[len] < cur[len])
-+      {
-+        *ptr1 = curMatch;
-+        ptr1 = pair + 1;
-+        curMatch = *ptr1;
-+        len1 = len;
-+      }
-+      else
-+      {
-+        *ptr0 = curMatch;
-+        ptr0 = pair;
-+        curMatch = *ptr0;
-+        len0 = len;
-+      }
-+    }
-+  }
-+}
-+
-+#define MOVE_POS \
-+  ++p->cyclicBufferPos; \
-+  p->buffer++; \
-+  if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);
-+
-+#define MOVE_POS_RET MOVE_POS return offset;
-+
-+static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
-+
-+#define GET_MATCHES_HEADER2(minLen, ret_op) \
-+  UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \
-+  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \
-+  cur = p->buffer;
-+
-+#define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)
-+#define SKIP_HEADER(minLen)        GET_MATCHES_HEADER2(minLen, continue)
-+
-+#define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue
-+
-+#define GET_MATCHES_FOOTER(offset, maxLen) \
-+  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \
-+  distances + offset, maxLen) - distances); MOVE_POS_RET;
-+
-+#define SKIP_FOOTER \
-+  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;
-+
-+static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(2)
-+  HASH2_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 1)
-+}
-+
-+UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = 0;
-+  GET_MATCHES_FOOTER(offset, 2)
-+}
-+
-+static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, delta2, maxLen, offset;
-+  GET_MATCHES_HEADER(3)
-+
-+  HASH3_CALC;
-+
-+  delta2 = p->pos - p->hash[hash2Value];
-+  curMatch = p->hash[kFix3HashSize + hashValue];
-+  
-+  p->hash[hash2Value] =
-+  p->hash[kFix3HashSize + hashValue] = p->pos;
-+
-+
-+  maxLen = 2;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[0] = maxLen;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+  
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  GET_MATCHES_FOOTER(offset, maxLen)
-+}
-+
-+static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 hash2Value, hash3Value, delta2, delta3, maxLen, offset;
-+  GET_MATCHES_HEADER(4)
-+
-+  HASH4_CALC;
-+
-+  delta2 = p->pos - p->hash[                hash2Value];
-+  delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
-+  curMatch = p->hash[kFix4HashSize + hashValue];
-+
-+  p->hash[                hash2Value] =
-+  p->hash[kFix3HashSize + hash3Value] =
-+  p->hash[kFix4HashSize + hashValue] = p->pos;
-+
-+  maxLen = 1;
-+  offset = 0;
-+  if (delta2 < p->cyclicBufferSize && *(cur - delta2) == *cur)
-+  {
-+    distances[0] = maxLen = 2;
-+    distances[1] = delta2 - 1;
-+    offset = 2;
-+  }
-+  if (delta2 != delta3 && delta3 < p->cyclicBufferSize && *(cur - delta3) == *cur)
-+  {
-+    maxLen = 3;
-+    distances[offset + 1] = delta3 - 1;
-+    offset += 2;
-+    delta2 = delta3;
-+  }
-+  if (offset != 0)
-+  {
-+    for (; maxLen != lenLimit; maxLen++)
-+      if (cur[(ptrdiff_t)maxLen - delta2] != cur[maxLen])
-+        break;
-+    distances[offset - 2] = maxLen;
-+    if (maxLen == lenLimit)
-+    {
-+      p->son[p->cyclicBufferPos] = curMatch;
-+      MOVE_POS_RET;
-+    }
-+  }
-+  if (maxLen < 3)
-+    maxLen = 3;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances + offset, maxLen) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
-+{
-+  UInt32 offset;
-+  GET_MATCHES_HEADER(3)
-+  HASH_ZIP_CALC;
-+  curMatch = p->hash[hashValue];
-+  p->hash[hashValue] = p->pos;
-+  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),
-+    distances, 2) - (distances));
-+  MOVE_POS_RET
-+}
-+
-+static void Bt2_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(2)
-+    HASH2_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt3_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value;
-+    SKIP_HEADER(3)
-+    HASH3_CALC;
-+    curMatch = p->hash[kFix3HashSize + hashValue];
-+    p->hash[hash2Value] =
-+    p->hash[kFix3HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] = p->pos;
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    SKIP_FOOTER
-+  }
-+  while (--num != 0);
-+}
-+
-+static void Hc4_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    UInt32 hash2Value, hash3Value;
-+    SKIP_HEADER(4)
-+    HASH4_CALC;
-+    curMatch = p->hash[kFix4HashSize + hashValue];
-+    p->hash[                hash2Value] =
-+    p->hash[kFix3HashSize + hash3Value] =
-+    p->hash[kFix4HashSize + hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num)
-+{
-+  do
-+  {
-+    SKIP_HEADER(3)
-+    HASH_ZIP_CALC;
-+    curMatch = p->hash[hashValue];
-+    p->hash[hashValue] = p->pos;
-+    p->son[p->cyclicBufferPos] = curMatch;
-+    MOVE_POS
-+  }
-+  while (--num != 0);
-+}
-+
-+void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable)
-+{
-+  vTable->Init = (Mf_Init_Func)MatchFinder_Init;
-+  vTable->GetIndexByte = (Mf_GetIndexByte_Func)MatchFinder_GetIndexByte;
-+  vTable->GetNumAvailableBytes = (Mf_GetNumAvailableBytes_Func)MatchFinder_GetNumAvailableBytes;
-+  vTable->GetPointerToCurrentPos = (Mf_GetPointerToCurrentPos_Func)MatchFinder_GetPointerToCurrentPos;
-+  if (!p->btMode)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Hc4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Hc4_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 2)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt2_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt2_MatchFinder_Skip;
-+  }
-+  else if (p->numHashBytes == 3)
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt3_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt3_MatchFinder_Skip;
-+  }
-+  else
-+  {
-+    vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches;
-+    vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
-+  }
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaDec.c
-@@ -0,0 +1,999 @@
-+/* LzmaDec.c -- LZMA Decoder
-+2009-09-20 : Igor Pavlov : Public domain */
-+
-+#include "LzmaDec.h"
-+
-+#include <string.h>
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_INIT_SIZE 5
-+
-+#define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-+#define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-+#define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \
-+  { UPDATE_0(p); i = (i + i); A0; } else \
-+  { UPDATE_1(p); i = (i + i) + 1; A1; }
-+#define GET_BIT(p, i) GET_BIT2(p, i, ; , ;)
-+
-+#define TREE_GET_BIT(probs, i) { GET_BIT((probs + i), i); }
-+#define TREE_DECODE(probs, limit, i) \
-+  { i = 1; do { TREE_GET_BIT(probs, i); } while (i < limit); i -= limit; }
-+
-+/* #define _LZMA_SIZE_OPT */
-+
-+#ifdef _LZMA_SIZE_OPT
-+#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-+#else
-+#define TREE_6_DECODE(probs, i) \
-+  { i = 1; \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  TREE_GET_BIT(probs, i); \
-+  i -= 0x40; }
-+#endif
-+
-+#define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }
-+
-+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)
-+#define UPDATE_0_CHECK range = bound;
-+#define UPDATE_1_CHECK range -= bound; code -= bound;
-+#define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \
-+  { UPDATE_0_CHECK; i = (i + i); A0; } else \
-+  { UPDATE_1_CHECK; i = (i + i) + 1; A1; }
-+#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ; , ;)
-+#define TREE_DECODE_CHECK(probs, limit, i) \
-+  { i = 1; do { GET_BIT_CHECK(probs + i, i) } while (i < limit); i -= limit; }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+#define LZMA_DIC_MIN (1 << 12)
-+
-+/* First LZMA-symbol is always decoded.
-+And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-+Out:
-+  Result:
-+    SZ_OK - OK
-+    SZ_ERROR_DATA - Error
-+  p->remainLen:
-+    < kMatchSpecLenStart : normal remain
-+    = kMatchSpecLenStart : finished
-+    = kMatchSpecLenStart + 1 : Flush marker
-+    = kMatchSpecLenStart + 2 : State Init Marker
-+*/
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  CLzmaProb *probs = p->probs;
-+
-+  unsigned state = p->state;
-+  UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-+  unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-+  unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-+  unsigned lc = p->prop.lc;
-+
-+  Byte *dic = p->dic;
-+  SizeT dicBufSize = p->dicBufSize;
-+  SizeT dicPos = p->dicPos;
-+  
-+  UInt32 processedPos = p->processedPos;
-+  UInt32 checkDicSize = p->checkDicSize;
-+  unsigned len = 0;
-+
-+  const Byte *buf = p->buf;
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+
-+  do
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = processedPos & pbMask;
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0(prob)
-+    {
-+      unsigned symbol;
-+      UPDATE_0(prob);
-+      prob = probs + Literal;
-+      if (checkDicSize != 0 || processedPos != 0)
-+        prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) +
-+        (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        state -= (state < 4) ? state : 3;
-+        symbol = 1;
-+        do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        state -= (state < 10) ? 3 : 6;
-+        symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      dic[dicPos++] = (Byte)symbol;
-+      processedPos++;
-+      continue;
-+    }
-+    else
-+    {
-+      UPDATE_1(prob);
-+      prob = probs + IsRep + state;
-+      IF_BIT_0(prob)
-+      {
-+        UPDATE_0(prob);
-+        state += kNumStates;
-+        prob = probs + LenCoder;
-+      }
-+      else
-+      {
-+        UPDATE_1(prob);
-+        if (checkDicSize == 0 && processedPos == 0)
-+          return SZ_ERROR_DATA;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0(prob)
-+        {
-+          UPDATE_0(prob);
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+            dicPos++;
-+            processedPos++;
-+            state = state < kNumLitStates ? 9 : 11;
-+            continue;
-+          }
-+          UPDATE_1(prob);
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UPDATE_1(prob);
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0(prob)
-+          {
-+            UPDATE_0(prob);
-+            distance = rep1;
-+          }
-+          else
-+          {
-+            UPDATE_1(prob);
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0(prob)
-+            {
-+              UPDATE_0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UPDATE_1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0(probLen)
-+        {
-+          UPDATE_0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = (1 << kLenNumLowBits);
-+        }
-+        else
-+        {
-+          UPDATE_1(probLen);
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0(probLen)
-+          {
-+            UPDATE_0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = (1 << kLenNumMidBits);
-+          }
-+          else
-+          {
-+            UPDATE_1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = (1 << kLenNumHighBits);
-+          }
-+        }
-+        TREE_DECODE(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state >= kNumStates)
-+      {
-+        UInt32 distance;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-+        TREE_6_DECODE(prob, distance);
-+        if (distance >= kStartPosModelIndex)
-+        {
-+          unsigned posSlot = (unsigned)distance;
-+          int numDirectBits = (int)(((distance >> 1) - 1));
-+          distance = (2 | (distance & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            distance <<= numDirectBits;
-+            prob = probs + SpecPos + distance - posSlot - 1;
-+            {
-+              UInt32 mask = 1;
-+              unsigned i = 1;
-+              do
-+              {
-+                GET_BIT2(prob + i, i, ; , distance |= mask);
-+                mask <<= 1;
-+              }
-+              while (--numDirectBits != 0);
-+            }
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE
-+              range >>= 1;
-+              
-+              {
-+                UInt32 t;
-+                code -= range;
-+                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-+                distance = (distance << 1) + (t + 1);
-+                code += range & t;
-+              }
-+              /*
-+              distance <<= 1;
-+              if (code >= range)
-+              {
-+                code -= range;
-+                distance |= 1;
-+              }
-+              */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            distance <<= kNumAlignBits;
-+            {
-+              unsigned i = 1;
-+              GET_BIT2(prob + i, i, ; , distance |= 1);
-+              GET_BIT2(prob + i, i, ; , distance |= 2);
-+              GET_BIT2(prob + i, i, ; , distance |= 4);
-+              GET_BIT2(prob + i, i, ; , distance |= 8);
-+            }
-+            if (distance == (UInt32)0xFFFFFFFF)
-+            {
-+              len += kMatchSpecLenStart;
-+              state -= kNumStates;
-+              break;
-+            }
-+          }
-+        }
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        rep0 = distance + 1;
-+        if (checkDicSize == 0)
-+        {
-+          if (distance >= processedPos)
-+            return SZ_ERROR_DATA;
-+        }
-+        else if (distance >= checkDicSize)
-+          return SZ_ERROR_DATA;
-+        state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-+      }
-+
-+      len += kMatchMinLen;
-+
-+      if (limit == dicPos)
-+        return SZ_ERROR_DATA;
-+      {
-+        SizeT rem = limit - dicPos;
-+        unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-+        SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-+
-+        processedPos += curLen;
-+
-+        len -= curLen;
-+        if (pos + curLen <= dicBufSize)
-+        {
-+          Byte *dest = dic + dicPos;
-+          ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-+          const Byte *lim = dest + curLen;
-+          dicPos += curLen;
-+          do
-+            *(dest) = (Byte)*(dest + src);
-+          while (++dest != lim);
-+        }
-+        else
-+        {
-+          do
-+          {
-+            dic[dicPos++] = dic[pos];
-+            if (++pos == dicBufSize)
-+              pos = 0;
-+          }
-+          while (--curLen != 0);
-+        }
-+      }
-+    }
-+  }
-+  while (dicPos < limit && buf < bufLimit);
-+  NORMALIZE;
-+  p->buf = buf;
-+  p->range = range;
-+  p->code = code;
-+  p->remainLen = len;
-+  p->dicPos = dicPos;
-+  p->processedPos = processedPos;
-+  p->reps[0] = rep0;
-+  p->reps[1] = rep1;
-+  p->reps[2] = rep2;
-+  p->reps[3] = rep3;
-+  p->state = state;
-+
-+  return SZ_OK;
-+}
-+
-+static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
-+{
-+  if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart)
-+  {
-+    Byte *dic = p->dic;
-+    SizeT dicPos = p->dicPos;
-+    SizeT dicBufSize = p->dicBufSize;
-+    unsigned len = p->remainLen;
-+    UInt32 rep0 = p->reps[0];
-+    if (limit - dicPos < len)
-+      len = (unsigned)(limit - dicPos);
-+
-+    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-+      p->checkDicSize = p->prop.dicSize;
-+
-+    p->processedPos += len;
-+    p->remainLen -= len;
-+    while (len-- != 0)
-+    {
-+      dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-+      dicPos++;
-+    }
-+    p->dicPos = dicPos;
-+  }
-+}
-+
-+static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec *p, SizeT limit, const Byte *bufLimit)
-+{
-+  do
-+  {
-+    SizeT limit2 = limit;
-+    if (p->checkDicSize == 0)
-+    {
-+      UInt32 rem = p->prop.dicSize - p->processedPos;
-+      if (limit - p->dicPos > rem)
-+        limit2 = p->dicPos + rem;
-+    }
-+    RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-+    if (p->processedPos >= p->prop.dicSize)
-+      p->checkDicSize = p->prop.dicSize;
-+    LzmaDec_WriteRem(p, limit);
-+  }
-+  while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-+
-+  if (p->remainLen > kMatchSpecLenStart)
-+  {
-+    p->remainLen = kMatchSpecLenStart;
-+  }
-+  return 0;
-+}
-+
-+typedef enum
-+{
-+  DUMMY_ERROR, /* unexpected end of input stream */
-+  DUMMY_LIT,
-+  DUMMY_MATCH,
-+  DUMMY_REP
-+} ELzmaDummy;
-+
-+static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inSize)
-+{
-+  UInt32 range = p->range;
-+  UInt32 code = p->code;
-+  const Byte *bufLimit = buf + inSize;
-+  CLzmaProb *probs = p->probs;
-+  unsigned state = p->state;
-+  ELzmaDummy res;
-+
-+  {
-+    CLzmaProb *prob;
-+    UInt32 bound;
-+    unsigned ttt;
-+    unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-+
-+    prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IF_BIT_0_CHECK(prob)
-+    {
-+      UPDATE_0_CHECK
-+
-+      /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-+
-+      prob = probs + Literal;
-+      if (p->checkDicSize != 0 || p->processedPos != 0)
-+        prob += (LZMA_LIT_SIZE *
-+          ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) +
-+          (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-+
-+      if (state < kNumLitStates)
-+      {
-+        unsigned symbol = 1;
-+        do { GET_BIT_CHECK(prob + symbol, symbol) } while (symbol < 0x100);
-+      }
-+      else
-+      {
-+        unsigned matchByte = p->dic[p->dicPos - p->reps[0] +
-+            ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-+        unsigned offs = 0x100;
-+        unsigned symbol = 1;
-+        do
-+        {
-+          unsigned bit;
-+          CLzmaProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & offs);
-+          probLit = prob + offs + bit + symbol;
-+          GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      res = DUMMY_LIT;
-+    }
-+    else
-+    {
-+      unsigned len;
-+      UPDATE_1_CHECK;
-+
-+      prob = probs + IsRep + state;
-+      IF_BIT_0_CHECK(prob)
-+      {
-+        UPDATE_0_CHECK;
-+        state = 0;
-+        prob = probs + LenCoder;
-+        res = DUMMY_MATCH;
-+      }
-+      else
-+      {
-+        UPDATE_1_CHECK;
-+        res = DUMMY_REP;
-+        prob = probs + IsRepG0 + state;
-+        IF_BIT_0_CHECK(prob)
-+        {
-+          UPDATE_0_CHECK;
-+          prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+            NORMALIZE_CHECK;
-+            return DUMMY_REP;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+          }
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          prob = probs + IsRepG1 + state;
-+          IF_BIT_0_CHECK(prob)
-+          {
-+            UPDATE_0_CHECK;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            prob = probs + IsRepG2 + state;
-+            IF_BIT_0_CHECK(prob)
-+            {
-+              UPDATE_0_CHECK;
-+            }
-+            else
-+            {
-+              UPDATE_1_CHECK;
-+            }
-+          }
-+        }
-+        state = kNumStates;
-+        prob = probs + RepLenCoder;
-+      }
-+      {
-+        unsigned limit, offset;
-+        CLzmaProb *probLen = prob + LenChoice;
-+        IF_BIT_0_CHECK(probLen)
-+        {
-+          UPDATE_0_CHECK;
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          limit = 1 << kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UPDATE_1_CHECK;
-+          probLen = prob + LenChoice2;
-+          IF_BIT_0_CHECK(probLen)
-+          {
-+            UPDATE_0_CHECK;
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            limit = 1 << kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UPDATE_1_CHECK;
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            limit = 1 << kLenNumHighBits;
-+          }
-+        }
-+        TREE_DECODE_CHECK(probLen, limit, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        unsigned posSlot;
-+        prob = probs + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) <<
-+            kNumPosSlotBits);
-+        TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+
-+          /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-+
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              NORMALIZE_CHECK
-+              range >>= 1;
-+              code -= range & (((code - range) >> 31) - 1);
-+              /* if (code >= range) code -= range; */
-+            }
-+            while (--numDirectBits != 0);
-+            prob = probs + Align;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            unsigned i = 1;
-+            do
-+            {
-+              GET_BIT_CHECK(prob + i, i);
-+            }
-+            while (--numDirectBits != 0);
-+          }
-+        }
-+      }
-+    }
-+  }
-+  NORMALIZE_CHECK;
-+  return res;
-+}
-+
-+
-+static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data)
-+{
-+  p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-+  p->range = 0xFFFFFFFF;
-+  p->needFlush = 0;
-+}
-+
-+void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)
-+{
-+  p->needFlush = 1;
-+  p->remainLen = 0;
-+  p->tempBufSize = 0;
-+
-+  if (initDic)
-+  {
-+    p->processedPos = 0;
-+    p->checkDicSize = 0;
-+    p->needInitState = 1;
-+  }
-+  if (initState)
-+    p->needInitState = 1;
-+}
-+
-+void LzmaDec_Init(CLzmaDec *p)
-+{
-+  p->dicPos = 0;
-+  LzmaDec_InitDicAndState(p, True, True);
-+}
-+
-+static void LzmaDec_InitStateReal(CLzmaDec *p)
-+{
-+  UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-+  UInt32 i;
-+  CLzmaProb *probs = p->probs;
-+  for (i = 0; i < numProbs; i++)
-+    probs[i] = kBitModelTotal >> 1;
-+  p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-+  p->state = 0;
-+  p->needInitState = 0;
-+}
-+
-+SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *srcLen,
-+    ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT inSize = *srcLen;
-+  (*srcLen) = 0;
-+  LzmaDec_WriteRem(p, dicLimit);
-+  
-+  *status = LZMA_STATUS_NOT_SPECIFIED;
-+
-+  while (p->remainLen != kMatchSpecLenStart)
-+  {
-+      int checkEndMarkNow;
-+
-+      if (p->needFlush != 0)
-+      {
-+        for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-+          p->tempBuf[p->tempBufSize++] = *src++;
-+        if (p->tempBufSize < RC_INIT_SIZE)
-+        {
-+          *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+          return SZ_OK;
-+        }
-+        if (p->tempBuf[0] != 0)
-+          return SZ_ERROR_DATA;
-+
-+        LzmaDec_InitRc(p, p->tempBuf);
-+        p->tempBufSize = 0;
-+      }
-+
-+      checkEndMarkNow = 0;
-+      if (p->dicPos >= dicLimit)
-+      {
-+        if (p->remainLen == 0 && p->code == 0)
-+        {
-+          *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-+          return SZ_OK;
-+        }
-+        if (finishMode == LZMA_FINISH_ANY)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_OK;
-+        }
-+        if (p->remainLen != 0)
-+        {
-+          *status = LZMA_STATUS_NOT_FINISHED;
-+          return SZ_ERROR_DATA;
-+        }
-+        checkEndMarkNow = 1;
-+      }
-+
-+      if (p->needInitState)
-+        LzmaDec_InitStateReal(p);
-+  
-+      if (p->tempBufSize == 0)
-+      {
-+        SizeT processed;
-+        const Byte *bufLimit;
-+        if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            memcpy(p->tempBuf, src, inSize);
-+            p->tempBufSize = (unsigned)inSize;
-+            (*srcLen) += inSize;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+          bufLimit = src;
-+        }
-+        else
-+          bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-+        p->buf = src;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-+          return SZ_ERROR_DATA;
-+        processed = (SizeT)(p->buf - src);
-+        (*srcLen) += processed;
-+        src += processed;
-+        inSize -= processed;
-+      }
-+      else
-+      {
-+        unsigned rem = p->tempBufSize, lookAhead = 0;
-+        while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-+          p->tempBuf[rem++] = src[lookAhead++];
-+        p->tempBufSize = rem;
-+        if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)
-+        {
-+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-+          if (dummyRes == DUMMY_ERROR)
-+          {
-+            (*srcLen) += lookAhead;
-+            *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-+            return SZ_OK;
-+          }
-+          if (checkEndMarkNow && dummyRes != DUMMY_MATCH)
-+          {
-+            *status = LZMA_STATUS_NOT_FINISHED;
-+            return SZ_ERROR_DATA;
-+          }
-+        }
-+        p->buf = p->tempBuf;
-+        if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-+          return SZ_ERROR_DATA;
-+        lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-+        (*srcLen) += lookAhead;
-+        src += lookAhead;
-+        inSize -= lookAhead;
-+        p->tempBufSize = 0;
-+      }
-+  }
-+  if (p->code == 0)
-+    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-+  return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-+}
-+
-+SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status)
-+{
-+  SizeT outSize = *destLen;
-+  SizeT inSize = *srcLen;
-+  *srcLen = *destLen = 0;
-+  for (;;)
-+  {
-+    SizeT inSizeCur = inSize, outSizeCur, dicPos;
-+    ELzmaFinishMode curFinishMode;
-+    SRes res;
-+    if (p->dicPos == p->dicBufSize)
-+      p->dicPos = 0;
-+    dicPos = p->dicPos;
-+    if (outSize > p->dicBufSize - dicPos)
-+    {
-+      outSizeCur = p->dicBufSize;
-+      curFinishMode = LZMA_FINISH_ANY;
-+    }
-+    else
-+    {
-+      outSizeCur = dicPos + outSize;
-+      curFinishMode = finishMode;
-+    }
-+
-+    res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-+    src += inSizeCur;
-+    inSize -= inSizeCur;
-+    *srcLen += inSizeCur;
-+    outSizeCur = p->dicPos - dicPos;
-+    memcpy(dest, p->dic + dicPos, outSizeCur);
-+    dest += outSizeCur;
-+    outSize -= outSizeCur;
-+    *destLen += outSizeCur;
-+    if (res != 0)
-+      return res;
-+    if (outSizeCur == 0 || outSize == 0)
-+      return SZ_OK;
-+  }
-+}
-+
-+void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->probs);
-+  p->probs = 0;
-+}
-+
-+static void LzmaDec_FreeDict(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->dic);
-+  p->dic = 0;
-+}
-+
-+void LzmaDec_Free(CLzmaDec *p, ISzAlloc *alloc)
-+{
-+  LzmaDec_FreeProbs(p, alloc);
-+  LzmaDec_FreeDict(p, alloc);
-+}
-+
-+SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
-+{
-+  UInt32 dicSize;
-+  Byte d;
-+  
-+  if (size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_UNSUPPORTED;
-+  else
-+    dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-+ 
-+  if (dicSize < LZMA_DIC_MIN)
-+    dicSize = LZMA_DIC_MIN;
-+  p->dicSize = dicSize;
-+
-+  d = data[0];
-+  if (d >= (9 * 5 * 5))
-+    return SZ_ERROR_UNSUPPORTED;
-+
-+  p->lc = d % 9;
-+  d /= 9;
-+  p->pb = d / 5;
-+  p->lp = d % 5;
-+
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc)
-+{
-+  UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-+  if (p->probs == 0 || numProbs != p->numProbs)
-+  {
-+    LzmaDec_FreeProbs(p, alloc);
-+    p->probs = (CLzmaProb *)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-+    p->numProbs = numProbs;
-+    if (p->probs == 0)
-+      return SZ_ERROR_MEM;
-+  }
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-+{
-+  CLzmaProps propNew;
-+  SizeT dicBufSize;
-+  RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-+  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-+  dicBufSize = propNew.dicSize;
-+  if (p->dic == 0 || dicBufSize != p->dicBufSize)
-+  {
-+    LzmaDec_FreeDict(p, alloc);
-+    p->dic = (Byte *)alloc->Alloc(alloc, dicBufSize);
-+    if (p->dic == 0)
-+    {
-+      LzmaDec_FreeProbs(p, alloc);
-+      return SZ_ERROR_MEM;
-+    }
-+  }
-+  p->dicBufSize = dicBufSize;
-+  p->prop = propNew;
-+  return SZ_OK;
-+}
-+
-+SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
-+    const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
-+    ELzmaStatus *status, ISzAlloc *alloc)
-+{
-+  CLzmaDec p;
-+  SRes res;
-+  SizeT inSize = *srcLen;
-+  SizeT outSize = *destLen;
-+  *srcLen = *destLen = 0;
-+  if (inSize < RC_INIT_SIZE)
-+    return SZ_ERROR_INPUT_EOF;
-+
-+  LzmaDec_Construct(&p);
-+  res = LzmaDec_AllocateProbs(&p, propData, propSize, alloc);
-+  if (res != 0)
-+    return res;
-+  p.dic = dest;
-+  p.dicBufSize = outSize;
-+
-+  LzmaDec_Init(&p);
-+  
-+  *srcLen = inSize;
-+  res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-+
-+  if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-+    res = SZ_ERROR_INPUT_EOF;
-+
-+  (*destLen) = p.dicPos;
-+  LzmaDec_FreeProbs(&p, alloc);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/LzmaEnc.c
-@@ -0,0 +1,2271 @@
-+/* LzmaEnc.c -- LZMA Encoder
-+2009-11-24 : Igor Pavlov : Public domain */
-+
-+#include <string.h>
-+
-+/* #define SHOW_STAT */
-+/* #define SHOW_STAT2 */
-+
-+#if defined(SHOW_STAT) || defined(SHOW_STAT2)
-+#include <stdio.h>
-+#endif
-+
-+#include "LzmaEnc.h"
-+
-+/* disable MT */
-+#define _7ZIP_ST
-+
-+#include "LzFind.h"
-+#ifndef _7ZIP_ST
-+#include "LzFindMt.h"
-+#endif
-+
-+#ifdef SHOW_STAT
-+static int ttt = 0;
-+#endif
-+
-+#define kBlockSizeMax ((1 << LZMA_NUM_BLOCK_SIZE_BITS) - 1)
-+
-+#define kBlockSize (9 << 10)
-+#define kUnpackBlockSize (1 << 18)
-+#define kMatchArraySize (1 << 21)
-+#define kMatchRecordMaxSize ((LZMA_MATCH_LEN_MAX * 2 + 3) * LZMA_MATCH_LEN_MAX)
-+
-+#define kNumMaxDirectBits (31)
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+#define kProbInitValue (kBitModelTotal >> 1)
-+
-+#define kNumMoveReducingBits 4
-+#define kNumBitPriceShiftBits 4
-+#define kBitPrice (1 << kNumBitPriceShiftBits)
-+
-+void LzmaEncProps_Init(CLzmaEncProps *p)
-+{
-+  p->level = 5;
-+  p->dictSize = p->mc = 0;
-+  p->lc = p->lp = p->pb = p->algo = p->fb = p->btMode = p->numHashBytes = p->numThreads = -1;
-+  p->writeEndMark = 0;
-+}
-+
-+void LzmaEncProps_Normalize(CLzmaEncProps *p)
-+{
-+  int level = p->level;
-+  if (level < 0) level = 5;
-+  p->level = level;
-+  if (p->dictSize == 0) p->dictSize = (level <= 5 ? (1 << (level * 2 + 14)) : (level == 6 ? (1 << 25) : (1 << 26)));
-+  if (p->lc < 0) p->lc = 3;
-+  if (p->lp < 0) p->lp = 0;
-+  if (p->pb < 0) p->pb = 2;
-+  if (p->algo < 0) p->algo = (level < 5 ? 0 : 1);
-+  if (p->fb < 0) p->fb = (level < 7 ? 32 : 64);
-+  if (p->btMode < 0) p->btMode = (p->algo == 0 ? 0 : 1);
-+  if (p->numHashBytes < 0) p->numHashBytes = 4;
-+  if (p->mc == 0)  p->mc = (16 + (p->fb >> 1)) >> (p->btMode ? 0 : 1);
-+  if (p->numThreads < 0)
-+    p->numThreads =
-+      #ifndef _7ZIP_ST
-+      ((p->btMode && p->algo) ? 2 : 1);
-+      #else
-+      1;
-+      #endif
-+}
-+
-+UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2)
-+{
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+  return props.dictSize;
-+}
-+
-+/* #define LZMA_LOG_BSR */
-+/* Define it for Intel's CPU */
-+
-+
-+#ifdef LZMA_LOG_BSR
-+
-+#define kDicLogSizeMaxCompress 30
-+
-+#define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); }
-+
-+UInt32 GetPosSlot1(UInt32 pos)
-+{
-+  UInt32 res;
-+  BSR2_RET(pos, res);
-+  return res;
-+}
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
-+
-+#else
-+
-+#define kNumLogBits (9 + (int)sizeof(size_t) / 2)
-+#define kDicLogSizeMaxCompress ((kNumLogBits - 1) * 2 + 7)
-+
-+void LzmaEnc_FastPosInit(Byte *g_FastPos)
-+{
-+  int c = 2, slotFast;
-+  g_FastPos[0] = 0;
-+  g_FastPos[1] = 1;
-+  
-+  for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
-+  {
-+    UInt32 k = (1 << ((slotFast >> 1) - 1));
-+    UInt32 j;
-+    for (j = 0; j < k; j++, c++)
-+      g_FastPos[c] = (Byte)slotFast;
-+  }
-+}
-+
-+#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
-+  (0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
-+  res = p->g_FastPos[pos >> i] + (i * 2); }
-+/*
-+#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
-+  p->g_FastPos[pos >> 6] + 12 : \
-+  p->g_FastPos[pos >> (6 + kNumLogBits - 1)] + (6 + (kNumLogBits - 1)) * 2; }
-+*/
-+
-+#define GetPosSlot1(pos) p->g_FastPos[pos]
-+#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
-+#define GetPosSlot(pos, res) { if (pos < kNumFullDistances) res = p->g_FastPos[pos]; else BSR2_RET(pos, res); }
-+
-+#endif
-+
-+
-+#define LZMA_NUM_REPS 4
-+
-+typedef unsigned CState;
-+
-+typedef struct
-+{
-+  UInt32 price;
-+
-+  CState state;
-+  int prev1IsChar;
-+  int prev2;
-+
-+  UInt32 posPrev2;
-+  UInt32 backPrev2;
-+
-+  UInt32 posPrev;
-+  UInt32 backPrev;
-+  UInt32 backs[LZMA_NUM_REPS];
-+} COptimal;
-+
-+#define kNumOpts (1 << 12)
-+
-+#define kNumLenToPosStates 4
-+#define kNumPosSlotBits 6
-+#define kDicLogSizeMin 0
-+#define kDicLogSizeMax 32
-+#define kDistTableSizeMax (kDicLogSizeMax * 2)
-+
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+#define kAlignMask (kAlignTableSize - 1)
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumPosModels (kEndPosModelIndex - kStartPosModelIndex)
-+
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#ifdef _LZMA_PROB32
-+#define CLzmaProb UInt32
-+#else
-+#define CLzmaProb UInt16
-+#endif
-+
-+#define LZMA_PB_MAX 4
-+#define LZMA_LC_MAX 8
-+#define LZMA_LP_MAX 4
-+
-+#define LZMA_NUM_PB_STATES_MAX (1 << LZMA_PB_MAX)
-+
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define kLenNumSymbolsTotal (kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-+
-+#define LZMA_MATCH_LEN_MIN 2
-+#define LZMA_MATCH_LEN_MAX (LZMA_MATCH_LEN_MIN + kLenNumSymbolsTotal - 1)
-+
-+#define kNumStates 12
-+
-+typedef struct
-+{
-+  CLzmaProb choice;
-+  CLzmaProb choice2;
-+  CLzmaProb low[LZMA_NUM_PB_STATES_MAX << kLenNumLowBits];
-+  CLzmaProb mid[LZMA_NUM_PB_STATES_MAX << kLenNumMidBits];
-+  CLzmaProb high[kLenNumHighSymbols];
-+} CLenEnc;
-+
-+typedef struct
-+{
-+  CLenEnc p;
-+  UInt32 prices[LZMA_NUM_PB_STATES_MAX][kLenNumSymbolsTotal];
-+  UInt32 tableSize;
-+  UInt32 counters[LZMA_NUM_PB_STATES_MAX];
-+} CLenPriceEnc;
-+
-+typedef struct
-+{
-+  UInt32 range;
-+  Byte cache;
-+  UInt64 low;
-+  UInt64 cacheSize;
-+  Byte *buf;
-+  Byte *bufLim;
-+  Byte *bufBase;
-+  ISeqOutStream *outStream;
-+  UInt64 processed;
-+  SRes res;
-+} CRangeEnc;
-+
-+typedef struct
-+{
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+} CSaveState;
-+
-+typedef struct
-+{
-+  IMatchFinder matchFinder;
-+  void *matchFinderObj;
-+
-+  #ifndef _7ZIP_ST
-+  Bool mtMode;
-+  CMatchFinderMt matchFinderMt;
-+  #endif
-+
-+  CMatchFinder matchFinderBase;
-+
-+  #ifndef _7ZIP_ST
-+  Byte pad[128];
-+  #endif
-+  
-+  UInt32 optimumEndIndex;
-+  UInt32 optimumCurrentIndex;
-+
-+  UInt32 longestMatchLength;
-+  UInt32 numPairs;
-+  UInt32 numAvail;
-+  COptimal opt[kNumOpts];
-+  
-+  #ifndef LZMA_LOG_BSR
-+  Byte g_FastPos[1 << kNumLogBits];
-+  #endif
-+
-+  UInt32 ProbPrices[kBitModelTotal >> kNumMoveReducingBits];
-+  UInt32 matches[LZMA_MATCH_LEN_MAX * 2 + 2 + 1];
-+  UInt32 numFastBytes;
-+  UInt32 additionalOffset;
-+  UInt32 reps[LZMA_NUM_REPS];
-+  UInt32 state;
-+
-+  UInt32 posSlotPrices[kNumLenToPosStates][kDistTableSizeMax];
-+  UInt32 distancesPrices[kNumLenToPosStates][kNumFullDistances];
-+  UInt32 alignPrices[kAlignTableSize];
-+  UInt32 alignPriceCount;
-+
-+  UInt32 distTableSize;
-+
-+  unsigned lc, lp, pb;
-+  unsigned lpMask, pbMask;
-+
-+  CLzmaProb *litProbs;
-+
-+  CLzmaProb isMatch[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+  CLzmaProb isRep[kNumStates];
-+  CLzmaProb isRepG0[kNumStates];
-+  CLzmaProb isRepG1[kNumStates];
-+  CLzmaProb isRepG2[kNumStates];
-+  CLzmaProb isRep0Long[kNumStates][LZMA_NUM_PB_STATES_MAX];
-+
-+  CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
-+  CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
-+  CLzmaProb posAlignEncoder[1 << kNumAlignBits];
-+  
-+  CLenPriceEnc lenEnc;
-+  CLenPriceEnc repLenEnc;
-+
-+  unsigned lclp;
-+
-+  Bool fastMode;
-+  
-+  CRangeEnc rc;
-+
-+  Bool writeEndMark;
-+  UInt64 nowPos64;
-+  UInt32 matchPriceCount;
-+  Bool finished;
-+  Bool multiThread;
-+
-+  SRes result;
-+  UInt32 dictSize;
-+  UInt32 matchFinderCycles;
-+
-+  int needInit;
-+
-+  CSaveState saveState;
-+} CLzmaEnc;
-+
-+void LzmaEnc_SaveState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CSaveState *dest = &p->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << p->lclp) * sizeof(CLzmaProb));
-+}
-+
-+void LzmaEnc_RestoreState(CLzmaEncHandle pp)
-+{
-+  CLzmaEnc *dest = (CLzmaEnc *)pp;
-+  const CSaveState *p = &dest->saveState;
-+  int i;
-+  dest->lenEnc = p->lenEnc;
-+  dest->repLenEnc = p->repLenEnc;
-+  dest->state = p->state;
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    memcpy(dest->isMatch[i], p->isMatch[i], sizeof(p->isMatch[i]));
-+    memcpy(dest->isRep0Long[i], p->isRep0Long[i], sizeof(p->isRep0Long[i]));
-+  }
-+  for (i = 0; i < kNumLenToPosStates; i++)
-+    memcpy(dest->posSlotEncoder[i], p->posSlotEncoder[i], sizeof(p->posSlotEncoder[i]));
-+  memcpy(dest->isRep, p->isRep, sizeof(p->isRep));
-+  memcpy(dest->isRepG0, p->isRepG0, sizeof(p->isRepG0));
-+  memcpy(dest->isRepG1, p->isRepG1, sizeof(p->isRepG1));
-+  memcpy(dest->isRepG2, p->isRepG2, sizeof(p->isRepG2));
-+  memcpy(dest->posEncoders, p->posEncoders, sizeof(p->posEncoders));
-+  memcpy(dest->posAlignEncoder, p->posAlignEncoder, sizeof(p->posAlignEncoder));
-+  memcpy(dest->reps, p->reps, sizeof(p->reps));
-+  memcpy(dest->litProbs, p->litProbs, (0x300 << dest->lclp) * sizeof(CLzmaProb));
-+}
-+
-+SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  CLzmaEncProps props = *props2;
-+  LzmaEncProps_Normalize(&props);
-+
-+  if (props.lc > LZMA_LC_MAX || props.lp > LZMA_LP_MAX || props.pb > LZMA_PB_MAX ||
-+      props.dictSize > (1 << kDicLogSizeMaxCompress) || props.dictSize > (1 << 30))
-+    return SZ_ERROR_PARAM;
-+  p->dictSize = props.dictSize;
-+  p->matchFinderCycles = props.mc;
-+  {
-+    unsigned fb = props.fb;
-+    if (fb < 5)
-+      fb = 5;
-+    if (fb > LZMA_MATCH_LEN_MAX)
-+      fb = LZMA_MATCH_LEN_MAX;
-+    p->numFastBytes = fb;
-+  }
-+  p->lc = props.lc;
-+  p->lp = props.lp;
-+  p->pb = props.pb;
-+  p->fastMode = (props.algo == 0);
-+  p->matchFinderBase.btMode = props.btMode;
-+  {
-+    UInt32 numHashBytes = 4;
-+    if (props.btMode)
-+    {
-+      if (props.numHashBytes < 2)
-+        numHashBytes = 2;
-+      else if (props.numHashBytes < 4)
-+        numHashBytes = props.numHashBytes;
-+    }
-+    p->matchFinderBase.numHashBytes = numHashBytes;
-+  }
-+
-+  p->matchFinderBase.cutValue = props.mc;
-+
-+  p->writeEndMark = props.writeEndMark;
-+
-+  #ifndef _7ZIP_ST
-+  /*
-+  if (newMultiThread != _multiThread)
-+  {
-+    ReleaseMatchFinder();
-+    _multiThread = newMultiThread;
-+  }
-+  */
-+  p->multiThread = (props.numThreads > 1);
-+  #endif
-+
-+  return SZ_OK;
-+}
-+
-+static const int kLiteralNextStates[kNumStates] = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-+static const int kMatchNextStates[kNumStates]   = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-+static const int kRepNextStates[kNumStates]     = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-+static const int kShortRepNextStates[kNumStates]= {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-+
-+#define IsCharState(s) ((s) < 7)
-+
-+#define GetLenToPosState(len) (((len) < kNumLenToPosStates + 1) ? (len) - 2 : kNumLenToPosStates - 1)
-+
-+#define kInfinityPrice (1 << 30)
-+
-+static void RangeEnc_Construct(CRangeEnc *p)
-+{
-+  p->outStream = 0;
-+  p->bufBase = 0;
-+}
-+
-+#define RangeEnc_GetProcessed(p) ((p)->processed + ((p)->buf - (p)->bufBase) + (p)->cacheSize)
-+
-+#define RC_BUF_SIZE (1 << 16)
-+static int RangeEnc_Alloc(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  if (p->bufBase == 0)
-+  {
-+    p->bufBase = (Byte *)alloc->Alloc(alloc, RC_BUF_SIZE);
-+    if (p->bufBase == 0)
-+      return 0;
-+    p->bufLim = p->bufBase + RC_BUF_SIZE;
-+  }
-+  return 1;
-+}
-+
-+static void RangeEnc_Free(CRangeEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->bufBase);
-+  p->bufBase = 0;
-+}
-+
-+static void RangeEnc_Init(CRangeEnc *p)
-+{
-+  /* Stream.Init(); */
-+  p->low = 0;
-+  p->range = 0xFFFFFFFF;
-+  p->cacheSize = 1;
-+  p->cache = 0;
-+
-+  p->buf = p->bufBase;
-+
-+  p->processed = 0;
-+  p->res = SZ_OK;
-+}
-+
-+static void RangeEnc_FlushStream(CRangeEnc *p)
-+{
-+  size_t num;
-+  if (p->res != SZ_OK)
-+    return;
-+  num = p->buf - p->bufBase;
-+  if (num != p->outStream->Write(p->outStream, p->bufBase, num))
-+    p->res = SZ_ERROR_WRITE;
-+  p->processed += num;
-+  p->buf = p->bufBase;
-+}
-+
-+static void MY_FAST_CALL RangeEnc_ShiftLow(CRangeEnc *p)
-+{
-+  if ((UInt32)p->low < (UInt32)0xFF000000 || (int)(p->low >> 32) != 0)
-+  {
-+    Byte temp = p->cache;
-+    do
-+    {
-+      Byte *buf = p->buf;
-+      *buf++ = (Byte)(temp + (Byte)(p->low >> 32));
-+      p->buf = buf;
-+      if (buf == p->bufLim)
-+        RangeEnc_FlushStream(p);
-+      temp = 0xFF;
-+    }
-+    while (--p->cacheSize != 0);
-+    p->cache = (Byte)((UInt32)p->low >> 24);
-+  }
-+  p->cacheSize++;
-+  p->low = (UInt32)p->low << 8;
-+}
-+
-+static void RangeEnc_FlushData(CRangeEnc *p)
-+{
-+  int i;
-+  for (i = 0; i < 5; i++)
-+    RangeEnc_ShiftLow(p);
-+}
-+
-+static void RangeEnc_EncodeDirectBits(CRangeEnc *p, UInt32 value, int numBits)
-+{
-+  do
-+  {
-+    p->range >>= 1;
-+    p->low += p->range & (0 - ((value >> --numBits) & 1));
-+    if (p->range < kTopValue)
-+    {
-+      p->range <<= 8;
-+      RangeEnc_ShiftLow(p);
-+    }
-+  }
-+  while (numBits != 0);
-+}
-+
-+static void RangeEnc_EncodeBit(CRangeEnc *p, CLzmaProb *prob, UInt32 symbol)
-+{
-+  UInt32 ttt = *prob;
-+  UInt32 newBound = (p->range >> kNumBitModelTotalBits) * ttt;
-+  if (symbol == 0)
-+  {
-+    p->range = newBound;
-+    ttt += (kBitModelTotal - ttt) >> kNumMoveBits;
-+  }
-+  else
-+  {
-+    p->low += newBound;
-+    p->range -= newBound;
-+    ttt -= ttt >> kNumMoveBits;
-+  }
-+  *prob = (CLzmaProb)ttt;
-+  if (p->range < kTopValue)
-+  {
-+    p->range <<= 8;
-+    RangeEnc_ShiftLow(p);
-+  }
-+}
-+
-+static void LitEnc_Encode(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol)
-+{
-+  symbol |= 0x100;
-+  do
-+  {
-+    RangeEnc_EncodeBit(p, probs + (symbol >> 8), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, UInt32 matchByte)
-+{
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    RangeEnc_EncodeBit(p, probs + (offs + (matchByte & offs) + (symbol >> 8)), (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+}
-+
-+void LzmaEnc_InitPriceTables(UInt32 *ProbPrices)
-+{
-+  UInt32 i;
-+  for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits))
-+  {
-+    const int kCyclesBits = kNumBitPriceShiftBits;
-+    UInt32 w = i;
-+    UInt32 bitCount = 0;
-+    int j;
-+    for (j = 0; j < kCyclesBits; j++)
-+    {
-+      w = w * w;
-+      bitCount <<= 1;
-+      while (w >= ((UInt32)1 << 16))
-+      {
-+        w >>= 1;
-+        bitCount++;
-+      }
-+    }
-+    ProbPrices[i >> kNumMoveReducingBits] = ((kNumBitModelTotalBits << kCyclesBits) - 15 - bitCount);
-+  }
-+}
-+
-+
-+#define GET_PRICE(prob, symbol) \
-+  p->ProbPrices[((prob) ^ (((-(int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICEa(prob, symbol) \
-+  ProbPrices[((prob) ^ ((-((int)(symbol))) & (kBitModelTotal - 1))) >> kNumMoveReducingBits];
-+
-+#define GET_PRICE_0(prob) p->ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1(prob) p->ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+#define GET_PRICE_0a(prob) ProbPrices[(prob) >> kNumMoveReducingBits]
-+#define GET_PRICE_1a(prob) ProbPrices[((prob) ^ (kBitModelTotal - 1)) >> kNumMoveReducingBits]
-+
-+static UInt32 LitEnc_GetPrice(const CLzmaProb *probs, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= 0x100;
-+  do
-+  {
-+    price += GET_PRICEa(probs[symbol >> 8], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+static UInt32 LitEnc_GetPriceMatched(const CLzmaProb *probs, UInt32 symbol, UInt32 matchByte, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 offs = 0x100;
-+  symbol |= 0x100;
-+  do
-+  {
-+    matchByte <<= 1;
-+    price += GET_PRICEa(probs[offs + (matchByte & offs) + (symbol >> 8)], (symbol >> 7) & 1);
-+    symbol <<= 1;
-+    offs &= ~(matchByte ^ symbol);
-+  }
-+  while (symbol < 0x10000);
-+  return price;
-+}
-+
-+
-+static void RcTree_Encode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0;)
-+  {
-+    UInt32 bit;
-+    i--;
-+    bit = (symbol >> i) & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+  }
-+}
-+
-+static void RcTree_ReverseEncode(CRangeEnc *rc, CLzmaProb *probs, int numBitLevels, UInt32 symbol)
-+{
-+  UInt32 m = 1;
-+  int i;
-+  for (i = 0; i < numBitLevels; i++)
-+  {
-+    UInt32 bit = symbol & 1;
-+    RangeEnc_EncodeBit(rc, probs + m, bit);
-+    m = (m << 1) | bit;
-+    symbol >>= 1;
-+  }
-+}
-+
-+static UInt32 RcTree_GetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  symbol |= (1 << numBitLevels);
-+  while (symbol != 1)
-+  {
-+    price += GET_PRICEa(probs[symbol >> 1], symbol & 1);
-+    symbol >>= 1;
-+  }
-+  return price;
-+}
-+
-+static UInt32 RcTree_ReverseGetPrice(const CLzmaProb *probs, int numBitLevels, UInt32 symbol, UInt32 *ProbPrices)
-+{
-+  UInt32 price = 0;
-+  UInt32 m = 1;
-+  int i;
-+  for (i = numBitLevels; i != 0; i--)
-+  {
-+    UInt32 bit = symbol & 1;
-+    symbol >>= 1;
-+    price += GET_PRICEa(probs[m], bit);
-+    m = (m << 1) | bit;
-+  }
-+  return price;
-+}
-+
-+
-+static void LenEnc_Init(CLenEnc *p)
-+{
-+  unsigned i;
-+  p->choice = p->choice2 = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumLowBits); i++)
-+    p->low[i] = kProbInitValue;
-+  for (i = 0; i < (LZMA_NUM_PB_STATES_MAX << kLenNumMidBits); i++)
-+    p->mid[i] = kProbInitValue;
-+  for (i = 0; i < kLenNumHighSymbols; i++)
-+    p->high[i] = kProbInitValue;
-+}
-+
-+static void LenEnc_Encode(CLenEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState)
-+{
-+  if (symbol < kLenNumLowSymbols)
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 0);
-+    RcTree_Encode(rc, p->low + (posState << kLenNumLowBits), kLenNumLowBits, symbol);
-+  }
-+  else
-+  {
-+    RangeEnc_EncodeBit(rc, &p->choice, 1);
-+    if (symbol < kLenNumLowSymbols + kLenNumMidSymbols)
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 0);
-+      RcTree_Encode(rc, p->mid + (posState << kLenNumMidBits), kLenNumMidBits, symbol - kLenNumLowSymbols);
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(rc, &p->choice2, 1);
-+      RcTree_Encode(rc, p->high, kLenNumHighBits, symbol - kLenNumLowSymbols - kLenNumMidSymbols);
-+    }
-+  }
-+}
-+
-+static void LenEnc_SetPrices(CLenEnc *p, UInt32 posState, UInt32 numSymbols, UInt32 *prices, UInt32 *ProbPrices)
-+{
-+  UInt32 a0 = GET_PRICE_0a(p->choice);
-+  UInt32 a1 = GET_PRICE_1a(p->choice);
-+  UInt32 b0 = a1 + GET_PRICE_0a(p->choice2);
-+  UInt32 b1 = a1 + GET_PRICE_1a(p->choice2);
-+  UInt32 i = 0;
-+  for (i = 0; i < kLenNumLowSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = a0 + RcTree_GetPrice(p->low + (posState << kLenNumLowBits), kLenNumLowBits, i, ProbPrices);
-+  }
-+  for (; i < kLenNumLowSymbols + kLenNumMidSymbols; i++)
-+  {
-+    if (i >= numSymbols)
-+      return;
-+    prices[i] = b0 + RcTree_GetPrice(p->mid + (posState << kLenNumMidBits), kLenNumMidBits, i - kLenNumLowSymbols, ProbPrices);
-+  }
-+  for (; i < numSymbols; i++)
-+    prices[i] = b1 + RcTree_GetPrice(p->high, kLenNumHighBits, i - kLenNumLowSymbols - kLenNumMidSymbols, ProbPrices);
-+}
-+
-+static void MY_FAST_CALL LenPriceEnc_UpdateTable(CLenPriceEnc *p, UInt32 posState, UInt32 *ProbPrices)
-+{
-+  LenEnc_SetPrices(&p->p, posState, p->tableSize, p->prices[posState], ProbPrices);
-+  p->counters[posState] = p->tableSize;
-+}
-+
-+static void LenPriceEnc_UpdateTables(CLenPriceEnc *p, UInt32 numPosStates, UInt32 *ProbPrices)
-+{
-+  UInt32 posState;
-+  for (posState = 0; posState < numPosStates; posState++)
-+    LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+static void LenEnc_Encode2(CLenPriceEnc *p, CRangeEnc *rc, UInt32 symbol, UInt32 posState, Bool updatePrice, UInt32 *ProbPrices)
-+{
-+  LenEnc_Encode(&p->p, rc, symbol, posState);
-+  if (updatePrice)
-+    if (--p->counters[posState] == 0)
-+      LenPriceEnc_UpdateTable(p, posState, ProbPrices);
-+}
-+
-+
-+
-+
-+static void MovePos(CLzmaEnc *p, UInt32 num)
-+{
-+  #ifdef SHOW_STAT
-+  ttt += num;
-+  printf("\n MovePos %d", num);
-+  #endif
-+  if (num != 0)
-+  {
-+    p->additionalOffset += num;
-+    p->matchFinder.Skip(p->matchFinderObj, num);
-+  }
-+}
-+
-+static UInt32 ReadMatchDistances(CLzmaEnc *p, UInt32 *numDistancePairsRes)
-+{
-+  UInt32 lenRes = 0, numPairs;
-+  p->numAvail = p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+  numPairs = p->matchFinder.GetMatches(p->matchFinderObj, p->matches);
-+  #ifdef SHOW_STAT
-+  printf("\n i = %d numPairs = %d    ", ttt, numPairs / 2);
-+  ttt++;
-+  {
-+    UInt32 i;
-+    for (i = 0; i < numPairs; i += 2)
-+      printf("%2d %6d   | ", p->matches[i], p->matches[i + 1]);
-+  }
-+  #endif
-+  if (numPairs > 0)
-+  {
-+    lenRes = p->matches[numPairs - 2];
-+    if (lenRes == p->numFastBytes)
-+    {
-+      const Byte *pby = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+      UInt32 distance = p->matches[numPairs - 1] + 1;
-+      UInt32 numAvail = p->numAvail;
-+      if (numAvail > LZMA_MATCH_LEN_MAX)
-+        numAvail = LZMA_MATCH_LEN_MAX;
-+      {
-+        const Byte *pby2 = pby - distance;
-+        for (; lenRes < numAvail && pby[lenRes] == pby2[lenRes]; lenRes++);
-+      }
-+    }
-+  }
-+  p->additionalOffset++;
-+  *numDistancePairsRes = numPairs;
-+  return lenRes;
-+}
-+
-+
-+#define MakeAsChar(p) (p)->backPrev = (UInt32)(-1); (p)->prev1IsChar = False;
-+#define MakeAsShortRep(p) (p)->backPrev = 0; (p)->prev1IsChar = False;
-+#define IsShortRep(p) ((p)->backPrev == 0)
-+
-+static UInt32 GetRepLen1Price(CLzmaEnc *p, UInt32 state, UInt32 posState)
-+{
-+  return
-+    GET_PRICE_0(p->isRepG0[state]) +
-+    GET_PRICE_0(p->isRep0Long[state][posState]);
-+}
-+
-+static UInt32 GetPureRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 state, UInt32 posState)
-+{
-+  UInt32 price;
-+  if (repIndex == 0)
-+  {
-+    price = GET_PRICE_0(p->isRepG0[state]);
-+    price += GET_PRICE_1(p->isRep0Long[state][posState]);
-+  }
-+  else
-+  {
-+    price = GET_PRICE_1(p->isRepG0[state]);
-+    if (repIndex == 1)
-+      price += GET_PRICE_0(p->isRepG1[state]);
-+    else
-+    {
-+      price += GET_PRICE_1(p->isRepG1[state]);
-+      price += GET_PRICE(p->isRepG2[state], repIndex - 2);
-+    }
-+  }
-+  return price;
-+}
-+
-+static UInt32 GetRepPrice(CLzmaEnc *p, UInt32 repIndex, UInt32 len, UInt32 state, UInt32 posState)
-+{
-+  return p->repLenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN] +
-+    GetPureRepPrice(p, repIndex, state, posState);
-+}
-+
-+static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
-+{
-+  UInt32 posMem = p->opt[cur].posPrev;
-+  UInt32 backMem = p->opt[cur].backPrev;
-+  p->optimumEndIndex = cur;
-+  do
-+  {
-+    if (p->opt[cur].prev1IsChar)
-+    {
-+      MakeAsChar(&p->opt[posMem])
-+      p->opt[posMem].posPrev = posMem - 1;
-+      if (p->opt[cur].prev2)
-+      {
-+        p->opt[posMem - 1].prev1IsChar = False;
-+        p->opt[posMem - 1].posPrev = p->opt[cur].posPrev2;
-+        p->opt[posMem - 1].backPrev = p->opt[cur].backPrev2;
-+      }
-+    }
-+    {
-+      UInt32 posPrev = posMem;
-+      UInt32 backCur = backMem;
-+      
-+      backMem = p->opt[posPrev].backPrev;
-+      posMem = p->opt[posPrev].posPrev;
-+      
-+      p->opt[posPrev].backPrev = backCur;
-+      p->opt[posPrev].posPrev = cur;
-+      cur = posPrev;
-+    }
-+  }
-+  while (cur != 0);
-+  *backRes = p->opt[0].backPrev;
-+  p->optimumCurrentIndex  = p->opt[0].posPrev;
-+  return p->optimumCurrentIndex;
-+}
-+
-+#define LIT_PROBS(pos, prevByte) (p->litProbs + ((((pos) & p->lpMask) << p->lc) + ((prevByte) >> (8 - p->lc))) * 0x300)
-+
-+static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, numPairs, repMaxIndex, i, posState, lenEnd, len, cur;
-+  UInt32 matchPrice, repMatchPrice, normalMatchPrice;
-+  UInt32 reps[LZMA_NUM_REPS], repLens[LZMA_NUM_REPS];
-+  UInt32 *matches;
-+  const Byte *data;
-+  Byte curByte, matchByte;
-+  if (p->optimumEndIndex != p->optimumCurrentIndex)
-+  {
-+    const COptimal *opt = &p->opt[p->optimumCurrentIndex];
-+    UInt32 lenRes = opt->posPrev - p->optimumCurrentIndex;
-+    *backRes = opt->backPrev;
-+    p->optimumCurrentIndex = opt->posPrev;
-+    return lenRes;
-+  }
-+  p->optimumCurrentIndex = p->optimumEndIndex = 0;
-+  
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  if (numAvail < 2)
-+  {
-+    *backRes = (UInt32)(-1);
-+    return 1;
-+  }
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  repMaxIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 lenTest;
-+    const Byte *data2;
-+    reps[i] = p->reps[i];
-+    data2 = data - (reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+    {
-+      repLens[i] = 0;
-+      continue;
-+    }
-+    for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+    repLens[i] = lenTest;
-+    if (lenTest > repLens[repMaxIndex])
-+      repMaxIndex = i;
-+  }
-+  if (repLens[repMaxIndex] >= p->numFastBytes)
-+  {
-+    UInt32 lenRes;
-+    *backRes = repMaxIndex;
-+    lenRes = repLens[repMaxIndex];
-+    MovePos(p, lenRes - 1);
-+    return lenRes;
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+  curByte = *data;
-+  matchByte = *(data - (reps[0] + 1));
-+
-+  if (mainLen < 2 && curByte != matchByte && repLens[repMaxIndex] < 2)
-+  {
-+    *backRes = (UInt32)-1;
-+    return 1;
-+  }
-+
-+  p->opt[0].state = (CState)p->state;
-+
-+  posState = (position & p->pbMask);
-+
-+  {
-+    const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+    p->opt[1].price = GET_PRICE_0(p->isMatch[p->state][posState]) +
-+        (!IsCharState(p->state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+  }
-+
-+  MakeAsChar(&p->opt[1]);
-+
-+  matchPrice = GET_PRICE_1(p->isMatch[p->state][posState]);
-+  repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[p->state]);
-+
-+  if (matchByte == curByte)
-+  {
-+    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, p->state, posState);
-+    if (shortRepPrice < p->opt[1].price)
-+    {
-+      p->opt[1].price = shortRepPrice;
-+      MakeAsShortRep(&p->opt[1]);
-+    }
-+  }
-+  lenEnd = ((mainLen >= repLens[repMaxIndex]) ? mainLen : repLens[repMaxIndex]);
-+
-+  if (lenEnd < 2)
-+  {
-+    *backRes = p->opt[1].backPrev;
-+    return 1;
-+  }
-+
-+  p->opt[1].posPrev = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+    p->opt[0].backs[i] = reps[i];
-+
-+  len = lenEnd;
-+  do
-+    p->opt[len--].price = kInfinityPrice;
-+  while (len >= 2);
-+
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 repLen = repLens[i];
-+    UInt32 price;
-+    if (repLen < 2)
-+      continue;
-+    price = repMatchPrice + GetPureRepPrice(p, i, p->state, posState);
-+    do
-+    {
-+      UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][repLen - 2];
-+      COptimal *opt = &p->opt[repLen];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = i;
-+        opt->prev1IsChar = False;
-+      }
-+    }
-+    while (--repLen >= 2);
-+  }
-+
-+  normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[p->state]);
-+
-+  len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2);
-+  if (len <= mainLen)
-+  {
-+    UInt32 offs = 0;
-+    while (len > matches[offs])
-+      offs += 2;
-+    for (; ; len++)
-+    {
-+      COptimal *opt;
-+      UInt32 distance = matches[offs + 1];
-+
-+      UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][len - LZMA_MATCH_LEN_MIN];
-+      UInt32 lenToPosState = GetLenToPosState(len);
-+      if (distance < kNumFullDistances)
-+        curAndLenPrice += p->distancesPrices[lenToPosState][distance];
-+      else
-+      {
-+        UInt32 slot;
-+        GetPosSlot2(distance, slot);
-+        curAndLenPrice += p->alignPrices[distance & kAlignMask] + p->posSlotPrices[lenToPosState][slot];
-+      }
-+      opt = &p->opt[len];
-+      if (curAndLenPrice < opt->price)
-+      {
-+        opt->price = curAndLenPrice;
-+        opt->posPrev = 0;
-+        opt->backPrev = distance + LZMA_NUM_REPS;
-+        opt->prev1IsChar = False;
-+      }
-+      if (len == matches[offs])
-+      {
-+        offs += 2;
-+        if (offs == numPairs)
-+          break;
-+      }
-+    }
-+  }
-+
-+  cur = 0;
-+
-+    #ifdef SHOW_STAT2
-+    if (position >= 0)
-+    {
-+      unsigned i;
-+      printf("\n pos = %4X", position);
-+      for (i = cur; i <= lenEnd; i++)
-+      printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
-+    }
-+    #endif
-+
-+  for (;;)
-+  {
-+    UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
-+    UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
-+    Bool nextIsChar;
-+    Byte curByte, matchByte;
-+    const Byte *data;
-+    COptimal *curOpt;
-+    COptimal *nextOpt;
-+
-+    cur++;
-+    if (cur == lenEnd)
-+      return Backward(p, backRes, cur);
-+
-+    newLen = ReadMatchDistances(p, &numPairs);
-+    if (newLen >= p->numFastBytes)
-+    {
-+      p->numPairs = numPairs;
-+      p->longestMatchLength = newLen;
-+      return Backward(p, backRes, cur);
-+    }
-+    position++;
-+    curOpt = &p->opt[cur];
-+    posPrev = curOpt->posPrev;
-+    if (curOpt->prev1IsChar)
-+    {
-+      posPrev--;
-+      if (curOpt->prev2)
-+      {
-+        state = p->opt[curOpt->posPrev2].state;
-+        if (curOpt->backPrev2 < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      else
-+        state = p->opt[posPrev].state;
-+      state = kLiteralNextStates[state];
-+    }
-+    else
-+      state = p->opt[posPrev].state;
-+    if (posPrev == cur - 1)
-+    {
-+      if (IsShortRep(curOpt))
-+        state = kShortRepNextStates[state];
-+      else
-+        state = kLiteralNextStates[state];
-+    }
-+    else
-+    {
-+      UInt32 pos;
-+      const COptimal *prevOpt;
-+      if (curOpt->prev1IsChar && curOpt->prev2)
-+      {
-+        posPrev = curOpt->posPrev2;
-+        pos = curOpt->backPrev2;
-+        state = kRepNextStates[state];
-+      }
-+      else
-+      {
-+        pos = curOpt->backPrev;
-+        if (pos < LZMA_NUM_REPS)
-+          state = kRepNextStates[state];
-+        else
-+          state = kMatchNextStates[state];
-+      }
-+      prevOpt = &p->opt[posPrev];
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        UInt32 i;
-+        reps[0] = prevOpt->backs[pos];
-+        for (i = 1; i <= pos; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+        for (; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i];
-+      }
-+      else
-+      {
-+        UInt32 i;
-+        reps[0] = (pos - LZMA_NUM_REPS);
-+        for (i = 1; i < LZMA_NUM_REPS; i++)
-+          reps[i] = prevOpt->backs[i - 1];
-+      }
-+    }
-+    curOpt->state = (CState)state;
-+
-+    curOpt->backs[0] = reps[0];
-+    curOpt->backs[1] = reps[1];
-+    curOpt->backs[2] = reps[2];
-+    curOpt->backs[3] = reps[3];
-+
-+    curPrice = curOpt->price;
-+    nextIsChar = False;
-+    data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+    curByte = *data;
-+    matchByte = *(data - (reps[0] + 1));
-+
-+    posState = (position & p->pbMask);
-+
-+    curAnd1Price = curPrice + GET_PRICE_0(p->isMatch[state][posState]);
-+    {
-+      const CLzmaProb *probs = LIT_PROBS(position, *(data - 1));
-+      curAnd1Price +=
-+        (!IsCharState(state) ?
-+          LitEnc_GetPriceMatched(probs, curByte, matchByte, p->ProbPrices) :
-+          LitEnc_GetPrice(probs, curByte, p->ProbPrices));
-+    }
-+
-+    nextOpt = &p->opt[cur + 1];
-+
-+    if (curAnd1Price < nextOpt->price)
-+    {
-+      nextOpt->price = curAnd1Price;
-+      nextOpt->posPrev = cur;
-+      MakeAsChar(nextOpt);
-+      nextIsChar = True;
-+    }
-+
-+    matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
-+    repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
-+    
-+    if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
-+    {
-+      UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
-+      if (shortRepPrice <= nextOpt->price)
-+      {
-+        nextOpt->price = shortRepPrice;
-+        nextOpt->posPrev = cur;
-+        MakeAsShortRep(nextOpt);
-+        nextIsChar = True;
-+      }
-+    }
-+    numAvailFull = p->numAvail;
-+    {
-+      UInt32 temp = kNumOpts - 1 - cur;
-+      if (temp < numAvailFull)
-+        numAvailFull = temp;
-+    }
-+
-+    if (numAvailFull < 2)
-+      continue;
-+    numAvail = (numAvailFull <= p->numFastBytes ? numAvailFull : p->numFastBytes);
-+
-+    if (!nextIsChar && matchByte != curByte) /* speed optimization */
-+    {
-+      /* try Literal + rep0 */
-+      UInt32 temp;
-+      UInt32 lenTest2;
-+      const Byte *data2 = data - (reps[0] + 1);
-+      UInt32 limit = p->numFastBytes + 1;
-+      if (limit > numAvailFull)
-+        limit = numAvailFull;
-+
-+      for (temp = 1; temp < limit && data[temp] == data2[temp]; temp++);
-+      lenTest2 = temp - 1;
-+      if (lenTest2 >= 2)
-+      {
-+        UInt32 state2 = kLiteralNextStates[state];
-+        UInt32 posStateNext = (position + 1) & p->pbMask;
-+        UInt32 nextRepMatchPrice = curAnd1Price +
-+            GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+            GET_PRICE_1(p->isRep[state2]);
-+        /* for (; lenTest2 >= 2; lenTest2--) */
-+        {
-+          UInt32 curAndLenPrice;
-+          COptimal *opt;
-+          UInt32 offset = cur + 1 + lenTest2;
-+          while (lenEnd < offset)
-+            p->opt[++lenEnd].price = kInfinityPrice;
-+          curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+          opt = &p->opt[offset];
-+          if (curAndLenPrice < opt->price)
-+          {
-+            opt->price = curAndLenPrice;
-+            opt->posPrev = cur + 1;
-+            opt->backPrev = 0;
-+            opt->prev1IsChar = True;
-+            opt->prev2 = False;
-+          }
-+        }
-+      }
-+    }
-+    
-+    startLen = 2; /* speed optimization */
-+    {
-+    UInt32 repIndex;
-+    for (repIndex = 0; repIndex < LZMA_NUM_REPS; repIndex++)
-+    {
-+      UInt32 lenTest;
-+      UInt32 lenTestTemp;
-+      UInt32 price;
-+      const Byte *data2 = data - (reps[repIndex] + 1);
-+      if (data[0] != data2[0] || data[1] != data2[1])
-+        continue;
-+      for (lenTest = 2; lenTest < numAvail && data[lenTest] == data2[lenTest]; lenTest++);
-+      while (lenEnd < cur + lenTest)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+      lenTestTemp = lenTest;
-+      price = repMatchPrice + GetPureRepPrice(p, repIndex, state, posState);
-+      do
-+      {
-+        UInt32 curAndLenPrice = price + p->repLenEnc.prices[posState][lenTest - 2];
-+        COptimal *opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = repIndex;
-+          opt->prev1IsChar = False;
-+        }
-+      }
-+      while (--lenTest >= 2);
-+      lenTest = lenTestTemp;
-+      
-+      if (repIndex == 0)
-+        startLen = lenTest + 1;
-+        
-+      /* if (_maxMode) */
-+        {
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kRepNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice =
-+                price + p->repLenEnc.prices[posState][lenTest - 2] +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (position + lenTest + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = repIndex;
-+              }
-+            }
-+          }
-+        }
-+    }
-+    }
-+    /* for (UInt32 lenTest = 2; lenTest <= newLen; lenTest++) */
-+    if (newLen > numAvail)
-+    {
-+      newLen = numAvail;
-+      for (numPairs = 0; newLen > matches[numPairs]; numPairs += 2);
-+      matches[numPairs] = newLen;
-+      numPairs += 2;
-+    }
-+    if (newLen >= startLen)
-+    {
-+      UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
-+      UInt32 offs, curBack, posSlot;
-+      UInt32 lenTest;
-+      while (lenEnd < cur + newLen)
-+        p->opt[++lenEnd].price = kInfinityPrice;
-+
-+      offs = 0;
-+      while (startLen > matches[offs])
-+        offs += 2;
-+      curBack = matches[offs + 1];
-+      GetPosSlot2(curBack, posSlot);
-+      for (lenTest = /*2*/ startLen; ; lenTest++)
-+      {
-+        UInt32 curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
-+        UInt32 lenToPosState = GetLenToPosState(lenTest);
-+        COptimal *opt;
-+        if (curBack < kNumFullDistances)
-+          curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
-+        else
-+          curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
-+        
-+        opt = &p->opt[cur + lenTest];
-+        if (curAndLenPrice < opt->price)
-+        {
-+          opt->price = curAndLenPrice;
-+          opt->posPrev = cur;
-+          opt->backPrev = curBack + LZMA_NUM_REPS;
-+          opt->prev1IsChar = False;
-+        }
-+
-+        if (/*_maxMode && */lenTest == matches[offs])
-+        {
-+          /* Try Match + Literal + Rep0 */
-+          const Byte *data2 = data - (curBack + 1);
-+          UInt32 lenTest2 = lenTest + 1;
-+          UInt32 limit = lenTest2 + p->numFastBytes;
-+          UInt32 nextRepMatchPrice;
-+          if (limit > numAvailFull)
-+            limit = numAvailFull;
-+          for (; lenTest2 < limit && data[lenTest2] == data2[lenTest2]; lenTest2++);
-+          lenTest2 -= lenTest + 1;
-+          if (lenTest2 >= 2)
-+          {
-+            UInt32 state2 = kMatchNextStates[state];
-+            UInt32 posStateNext = (position + lenTest) & p->pbMask;
-+            UInt32 curAndLenCharPrice = curAndLenPrice +
-+                GET_PRICE_0(p->isMatch[state2][posStateNext]) +
-+                LitEnc_GetPriceMatched(LIT_PROBS(position + lenTest, data[lenTest - 1]),
-+                    data[lenTest], data2[lenTest], p->ProbPrices);
-+            state2 = kLiteralNextStates[state2];
-+            posStateNext = (posStateNext + 1) & p->pbMask;
-+            nextRepMatchPrice = curAndLenCharPrice +
-+                GET_PRICE_1(p->isMatch[state2][posStateNext]) +
-+                GET_PRICE_1(p->isRep[state2]);
-+            
-+            /* for (; lenTest2 >= 2; lenTest2--) */
-+            {
-+              UInt32 offset = cur + lenTest + 1 + lenTest2;
-+              UInt32 curAndLenPrice;
-+              COptimal *opt;
-+              while (lenEnd < offset)
-+                p->opt[++lenEnd].price = kInfinityPrice;
-+              curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2, state2, posStateNext);
-+              opt = &p->opt[offset];
-+              if (curAndLenPrice < opt->price)
-+              {
-+                opt->price = curAndLenPrice;
-+                opt->posPrev = cur + lenTest + 1;
-+                opt->backPrev = 0;
-+                opt->prev1IsChar = True;
-+                opt->prev2 = True;
-+                opt->posPrev2 = cur;
-+                opt->backPrev2 = curBack + LZMA_NUM_REPS;
-+              }
-+            }
-+          }
-+          offs += 2;
-+          if (offs == numPairs)
-+            break;
-+          curBack = matches[offs + 1];
-+          if (curBack >= kNumFullDistances)
-+            GetPosSlot2(curBack, posSlot);
-+        }
-+      }
-+    }
-+  }
-+}
-+
-+#define ChangePair(smallDist, bigDist) (((bigDist) >> 7) > (smallDist))
-+
-+static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
-+{
-+  UInt32 numAvail, mainLen, mainDist, numPairs, repIndex, repLen, i;
-+  const Byte *data;
-+  const UInt32 *matches;
-+
-+  if (p->additionalOffset == 0)
-+    mainLen = ReadMatchDistances(p, &numPairs);
-+  else
-+  {
-+    mainLen = p->longestMatchLength;
-+    numPairs = p->numPairs;
-+  }
-+
-+  numAvail = p->numAvail;
-+  *backRes = (UInt32)-1;
-+  if (numAvail < 2)
-+    return 1;
-+  if (numAvail > LZMA_MATCH_LEN_MAX)
-+    numAvail = LZMA_MATCH_LEN_MAX;
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+
-+  repLen = repIndex = 0;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    for (len = 2; len < numAvail && data[len] == data2[len]; len++);
-+    if (len >= p->numFastBytes)
-+    {
-+      *backRes = i;
-+      MovePos(p, len - 1);
-+      return len;
-+    }
-+    if (len > repLen)
-+    {
-+      repIndex = i;
-+      repLen = len;
-+    }
-+  }
-+
-+  matches = p->matches;
-+  if (mainLen >= p->numFastBytes)
-+  {
-+    *backRes = matches[numPairs - 1] + LZMA_NUM_REPS;
-+    MovePos(p, mainLen - 1);
-+    return mainLen;
-+  }
-+
-+  mainDist = 0; /* for GCC */
-+  if (mainLen >= 2)
-+  {
-+    mainDist = matches[numPairs - 1];
-+    while (numPairs > 2 && mainLen == matches[numPairs - 4] + 1)
-+    {
-+      if (!ChangePair(matches[numPairs - 3], mainDist))
-+        break;
-+      numPairs -= 2;
-+      mainLen = matches[numPairs - 2];
-+      mainDist = matches[numPairs - 1];
-+    }
-+    if (mainLen == 2 && mainDist >= 0x80)
-+      mainLen = 1;
-+  }
-+
-+  if (repLen >= 2 && (
-+        (repLen + 1 >= mainLen) ||
-+        (repLen + 2 >= mainLen && mainDist >= (1 << 9)) ||
-+        (repLen + 3 >= mainLen && mainDist >= (1 << 15))))
-+  {
-+    *backRes = repIndex;
-+    MovePos(p, repLen - 1);
-+    return repLen;
-+  }
-+  
-+  if (mainLen < 2 || numAvail <= 2)
-+    return 1;
-+
-+  p->longestMatchLength = ReadMatchDistances(p, &p->numPairs);
-+  if (p->longestMatchLength >= 2)
-+  {
-+    UInt32 newDistance = matches[p->numPairs - 1];
-+    if ((p->longestMatchLength >= mainLen && newDistance < mainDist) ||
-+        (p->longestMatchLength == mainLen + 1 && !ChangePair(mainDist, newDistance)) ||
-+        (p->longestMatchLength > mainLen + 1) ||
-+        (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
-+      return 1;
-+  }
-+  
-+  data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
-+  for (i = 0; i < LZMA_NUM_REPS; i++)
-+  {
-+    UInt32 len, limit;
-+    const Byte *data2 = data - (p->reps[i] + 1);
-+    if (data[0] != data2[0] || data[1] != data2[1])
-+      continue;
-+    limit = mainLen - 1;
-+    for (len = 2; len < limit && data[len] == data2[len]; len++);
-+    if (len >= limit)
-+      return 1;
-+  }
-+  *backRes = mainDist + LZMA_NUM_REPS;
-+  MovePos(p, mainLen - 2);
-+  return mainLen;
-+}
-+
-+static void WriteEndMarker(CLzmaEnc *p, UInt32 posState)
-+{
-+  UInt32 len;
-+  RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+  RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+  p->state = kMatchNextStates[p->state];
-+  len = LZMA_MATCH_LEN_MIN;
-+  LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+  RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, (1 << kNumPosSlotBits) - 1);
-+  RangeEnc_EncodeDirectBits(&p->rc, (((UInt32)1 << 30) - 1) >> kNumAlignBits, 30 - kNumAlignBits);
-+  RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, kAlignMask);
-+}
-+
-+static SRes CheckErrors(CLzmaEnc *p)
-+{
-+  if (p->result != SZ_OK)
-+    return p->result;
-+  if (p->rc.res != SZ_OK)
-+    p->result = SZ_ERROR_WRITE;
-+  if (p->matchFinderBase.result != SZ_OK)
-+    p->result = SZ_ERROR_READ;
-+  if (p->result != SZ_OK)
-+    p->finished = True;
-+  return p->result;
-+}
-+
-+static SRes Flush(CLzmaEnc *p, UInt32 nowPos)
-+{
-+  /* ReleaseMFStream(); */
-+  p->finished = True;
-+  if (p->writeEndMark)
-+    WriteEndMarker(p, nowPos & p->pbMask);
-+  RangeEnc_FlushData(&p->rc);
-+  RangeEnc_FlushStream(&p->rc);
-+  return CheckErrors(p);
-+}
-+
-+static void FillAlignPrices(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  for (i = 0; i < kAlignTableSize; i++)
-+    p->alignPrices[i] = RcTree_ReverseGetPrice(p->posAlignEncoder, kNumAlignBits, i, p->ProbPrices);
-+  p->alignPriceCount = 0;
-+}
-+
-+static void FillDistancesPrices(CLzmaEnc *p)
-+{
-+  UInt32 tempPrices[kNumFullDistances];
-+  UInt32 i, lenToPosState;
-+  for (i = kStartPosModelIndex; i < kNumFullDistances; i++)
-+  {
-+    UInt32 posSlot = GetPosSlot1(i);
-+    UInt32 footerBits = ((posSlot >> 1) - 1);
-+    UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+    tempPrices[i] = RcTree_ReverseGetPrice(p->posEncoders + base - posSlot - 1, footerBits, i - base, p->ProbPrices);
-+  }
-+
-+  for (lenToPosState = 0; lenToPosState < kNumLenToPosStates; lenToPosState++)
-+  {
-+    UInt32 posSlot;
-+    const CLzmaProb *encoder = p->posSlotEncoder[lenToPosState];
-+    UInt32 *posSlotPrices = p->posSlotPrices[lenToPosState];
-+    for (posSlot = 0; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] = RcTree_GetPrice(encoder, kNumPosSlotBits, posSlot, p->ProbPrices);
-+    for (posSlot = kEndPosModelIndex; posSlot < p->distTableSize; posSlot++)
-+      posSlotPrices[posSlot] += ((((posSlot >> 1) - 1) - kNumAlignBits) << kNumBitPriceShiftBits);
-+
-+    {
-+      UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
-+      UInt32 i;
-+      for (i = 0; i < kStartPosModelIndex; i++)
-+        distancesPrices[i] = posSlotPrices[i];
-+      for (; i < kNumFullDistances; i++)
-+        distancesPrices[i] = posSlotPrices[GetPosSlot1(i)] + tempPrices[i];
-+    }
-+  }
-+  p->matchPriceCount = 0;
-+}
-+
-+void LzmaEnc_Construct(CLzmaEnc *p)
-+{
-+  RangeEnc_Construct(&p->rc);
-+  MatchFinder_Construct(&p->matchFinderBase);
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Construct(&p->matchFinderMt);
-+  p->matchFinderMt.MatchFinder = &p->matchFinderBase;
-+  #endif
-+
-+  {
-+    CLzmaEncProps props;
-+    LzmaEncProps_Init(&props);
-+    LzmaEnc_SetProps(p, &props);
-+  }
-+
-+  #ifndef LZMA_LOG_BSR
-+  LzmaEnc_FastPosInit(p->g_FastPos);
-+  #endif
-+
-+  LzmaEnc_InitPriceTables(p->ProbPrices);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc)
-+{
-+  void *p;
-+  p = alloc->Alloc(alloc, sizeof(CLzmaEnc));
-+  if (p != 0)
-+    LzmaEnc_Construct((CLzmaEnc *)p);
-+  return p;
-+}
-+
-+void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc)
-+{
-+  alloc->Free(alloc, p->litProbs);
-+  alloc->Free(alloc, p->saveState.litProbs);
-+  p->litProbs = 0;
-+  p->saveState.litProbs = 0;
-+}
-+
-+void LzmaEnc_Destruct(CLzmaEnc *p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  #ifndef _7ZIP_ST
-+  MatchFinderMt_Destruct(&p->matchFinderMt, allocBig);
-+  #endif
-+  MatchFinder_Free(&p->matchFinderBase, allocBig);
-+  LzmaEnc_FreeLits(p, alloc);
-+  RangeEnc_Free(&p->rc, alloc);
-+}
-+
-+void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  LzmaEnc_Destruct((CLzmaEnc *)p, alloc, allocBig);
-+  alloc->Free(alloc, p);
-+}
-+
-+static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize, UInt32 maxUnpackSize)
-+{
-+  UInt32 nowPos32, startPos32;
-+  if (p->needInit)
-+  {
-+    p->matchFinder.Init(p->matchFinderObj);
-+    p->needInit = 0;
-+  }
-+
-+  if (p->finished)
-+    return p->result;
-+  RINOK(CheckErrors(p));
-+
-+  nowPos32 = (UInt32)p->nowPos64;
-+  startPos32 = nowPos32;
-+
-+  if (p->nowPos64 == 0)
-+  {
-+    UInt32 numPairs;
-+    Byte curByte;
-+    if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+      return Flush(p, nowPos32);
-+    ReadMatchDistances(p, &numPairs);
-+    RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][0], 0);
-+    p->state = kLiteralNextStates[p->state];
-+    curByte = p->matchFinder.GetIndexByte(p->matchFinderObj, 0 - p->additionalOffset);
-+    LitEnc_Encode(&p->rc, p->litProbs, curByte);
-+    p->additionalOffset--;
-+    nowPos32++;
-+  }
-+
-+  if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) != 0)
-+  for (;;)
-+  {
-+    UInt32 pos, len, posState;
-+
-+    if (p->fastMode)
-+      len = GetOptimumFast(p, &pos);
-+    else
-+      len = GetOptimum(p, nowPos32, &pos);
-+
-+    #ifdef SHOW_STAT2
-+    printf("\n pos = %4X,   len = %d   pos = %d", nowPos32, len, pos);
-+    #endif
-+
-+    posState = nowPos32 & p->pbMask;
-+    if (len == 1 && pos == (UInt32)-1)
-+    {
-+      Byte curByte;
-+      CLzmaProb *probs;
-+      const Byte *data;
-+
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 0);
-+      data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+      curByte = *data;
-+      probs = LIT_PROBS(nowPos32, *(data - 1));
-+      if (IsCharState(p->state))
-+        LitEnc_Encode(&p->rc, probs, curByte);
-+      else
-+        LitEnc_EncodeMatched(&p->rc, probs, curByte, *(data - p->reps[0] - 1));
-+      p->state = kLiteralNextStates[p->state];
-+    }
-+    else
-+    {
-+      RangeEnc_EncodeBit(&p->rc, &p->isMatch[p->state][posState], 1);
-+      if (pos < LZMA_NUM_REPS)
-+      {
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 1);
-+        if (pos == 0)
-+        {
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 0);
-+          RangeEnc_EncodeBit(&p->rc, &p->isRep0Long[p->state][posState], ((len == 1) ? 0 : 1));
-+        }
-+        else
-+        {
-+          UInt32 distance = p->reps[pos];
-+          RangeEnc_EncodeBit(&p->rc, &p->isRepG0[p->state], 1);
-+          if (pos == 1)
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 0);
-+          else
-+          {
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG1[p->state], 1);
-+            RangeEnc_EncodeBit(&p->rc, &p->isRepG2[p->state], pos - 2);
-+            if (pos == 3)
-+              p->reps[3] = p->reps[2];
-+            p->reps[2] = p->reps[1];
-+          }
-+          p->reps[1] = p->reps[0];
-+          p->reps[0] = distance;
-+        }
-+        if (len == 1)
-+          p->state = kShortRepNextStates[p->state];
-+        else
-+        {
-+          LenEnc_Encode2(&p->repLenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+          p->state = kRepNextStates[p->state];
-+        }
-+      }
-+      else
-+      {
-+        UInt32 posSlot;
-+        RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0);
-+        p->state = kMatchNextStates[p->state];
-+        LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices);
-+        pos -= LZMA_NUM_REPS;
-+        GetPosSlot(pos, posSlot);
-+        RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
-+        
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          UInt32 footerBits = ((posSlot >> 1) - 1);
-+          UInt32 base = ((2 | (posSlot & 1)) << footerBits);
-+          UInt32 posReduced = pos - base;
-+
-+          if (posSlot < kEndPosModelIndex)
-+            RcTree_ReverseEncode(&p->rc, p->posEncoders + base - posSlot - 1, footerBits, posReduced);
-+          else
-+          {
-+            RangeEnc_EncodeDirectBits(&p->rc, posReduced >> kNumAlignBits, footerBits - kNumAlignBits);
-+            RcTree_ReverseEncode(&p->rc, p->posAlignEncoder, kNumAlignBits, posReduced & kAlignMask);
-+            p->alignPriceCount++;
-+          }
-+        }
-+        p->reps[3] = p->reps[2];
-+        p->reps[2] = p->reps[1];
-+        p->reps[1] = p->reps[0];
-+        p->reps[0] = pos;
-+        p->matchPriceCount++;
-+      }
-+    }
-+    p->additionalOffset -= len;
-+    nowPos32 += len;
-+    if (p->additionalOffset == 0)
-+    {
-+      UInt32 processed;
-+      if (!p->fastMode)
-+      {
-+        if (p->matchPriceCount >= (1 << 7))
-+          FillDistancesPrices(p);
-+        if (p->alignPriceCount >= kAlignTableSize)
-+          FillAlignPrices(p);
-+      }
-+      if (p->matchFinder.GetNumAvailableBytes(p->matchFinderObj) == 0)
-+        break;
-+      processed = nowPos32 - startPos32;
-+      if (useLimits)
-+      {
-+        if (processed + kNumOpts + 300 >= maxUnpackSize ||
-+            RangeEnc_GetProcessed(&p->rc) + kNumOpts * 2 >= maxPackSize)
-+          break;
-+      }
-+      else if (processed >= (1 << 15))
-+      {
-+        p->nowPos64 += nowPos32 - startPos32;
-+        return CheckErrors(p);
-+      }
-+    }
-+  }
-+  p->nowPos64 += nowPos32 - startPos32;
-+  return Flush(p, nowPos32);
-+}
-+
-+#define kBigHashDicLimit ((UInt32)1 << 24)
-+
-+static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 beforeSize = kNumOpts;
-+  Bool btMode;
-+  if (!RangeEnc_Alloc(&p->rc, alloc))
-+    return SZ_ERROR_MEM;
-+  btMode = (p->matchFinderBase.btMode != 0);
-+  #ifndef _7ZIP_ST
-+  p->mtMode = (p->multiThread && !p->fastMode && btMode);
-+  #endif
-+
-+  {
-+    unsigned lclp = p->lc + p->lp;
-+    if (p->litProbs == 0 || p->saveState.litProbs == 0 || p->lclp != lclp)
-+    {
-+      LzmaEnc_FreeLits(p, alloc);
-+      p->litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      p->saveState.litProbs = (CLzmaProb *)alloc->Alloc(alloc, (0x300 << lclp) * sizeof(CLzmaProb));
-+      if (p->litProbs == 0 || p->saveState.litProbs == 0)
-+      {
-+        LzmaEnc_FreeLits(p, alloc);
-+        return SZ_ERROR_MEM;
-+      }
-+      p->lclp = lclp;
-+    }
-+  }
-+
-+  p->matchFinderBase.bigHash = (p->dictSize > kBigHashDicLimit);
-+
-+  if (beforeSize + p->dictSize < keepWindowSize)
-+    beforeSize = keepWindowSize - p->dictSize;
-+
-+  #ifndef _7ZIP_ST
-+  if (p->mtMode)
-+  {
-+    RINOK(MatchFinderMt_Create(&p->matchFinderMt, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig));
-+    p->matchFinderObj = &p->matchFinderMt;
-+    MatchFinderMt_CreateVTable(&p->matchFinderMt, &p->matchFinder);
-+  }
-+  else
-+  #endif
-+  {
-+    if (!MatchFinder_Create(&p->matchFinderBase, p->dictSize, beforeSize, p->numFastBytes, LZMA_MATCH_LEN_MAX, allocBig))
-+      return SZ_ERROR_MEM;
-+    p->matchFinderObj = &p->matchFinderBase;
-+    MatchFinder_CreateVTable(&p->matchFinderBase, &p->matchFinder);
-+  }
-+  return SZ_OK;
-+}
-+
-+void LzmaEnc_Init(CLzmaEnc *p)
-+{
-+  UInt32 i;
-+  p->state = 0;
-+  for (i = 0 ; i < LZMA_NUM_REPS; i++)
-+    p->reps[i] = 0;
-+
-+  RangeEnc_Init(&p->rc);
-+
-+
-+  for (i = 0; i < kNumStates; i++)
-+  {
-+    UInt32 j;
-+    for (j = 0; j < LZMA_NUM_PB_STATES_MAX; j++)
-+    {
-+      p->isMatch[i][j] = kProbInitValue;
-+      p->isRep0Long[i][j] = kProbInitValue;
-+    }
-+    p->isRep[i] = kProbInitValue;
-+    p->isRepG0[i] = kProbInitValue;
-+    p->isRepG1[i] = kProbInitValue;
-+    p->isRepG2[i] = kProbInitValue;
-+  }
-+
-+  {
-+    UInt32 num = 0x300 << (p->lp + p->lc);
-+    for (i = 0; i < num; i++)
-+      p->litProbs[i] = kProbInitValue;
-+  }
-+
-+  {
-+    for (i = 0; i < kNumLenToPosStates; i++)
-+    {
-+      CLzmaProb *probs = p->posSlotEncoder[i];
-+      UInt32 j;
-+      for (j = 0; j < (1 << kNumPosSlotBits); j++)
-+        probs[j] = kProbInitValue;
-+    }
-+  }
-+  {
-+    for (i = 0; i < kNumFullDistances - kEndPosModelIndex; i++)
-+      p->posEncoders[i] = kProbInitValue;
-+  }
-+
-+  LenEnc_Init(&p->lenEnc.p);
-+  LenEnc_Init(&p->repLenEnc.p);
-+
-+  for (i = 0; i < (1 << kNumAlignBits); i++)
-+    p->posAlignEncoder[i] = kProbInitValue;
-+
-+  p->optimumEndIndex = 0;
-+  p->optimumCurrentIndex = 0;
-+  p->additionalOffset = 0;
-+
-+  p->pbMask = (1 << p->pb) - 1;
-+  p->lpMask = (1 << p->lp) - 1;
-+}
-+
-+void LzmaEnc_InitPrices(CLzmaEnc *p)
-+{
-+  if (!p->fastMode)
-+  {
-+    FillDistancesPrices(p);
-+    FillAlignPrices(p);
-+  }
-+
-+  p->lenEnc.tableSize =
-+  p->repLenEnc.tableSize =
-+      p->numFastBytes + 1 - LZMA_MATCH_LEN_MIN;
-+  LenPriceEnc_UpdateTables(&p->lenEnc, 1 << p->pb, p->ProbPrices);
-+  LenPriceEnc_UpdateTables(&p->repLenEnc, 1 << p->pb, p->ProbPrices);
-+}
-+
-+static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  UInt32 i;
-+  for (i = 0; i < (UInt32)kDicLogSizeMaxCompress; i++)
-+    if (p->dictSize <= ((UInt32)1 << i))
-+      break;
-+  p->distTableSize = i * 2;
-+
-+  p->finished = False;
-+  p->result = SZ_OK;
-+  RINOK(LzmaEnc_Alloc(p, keepWindowSize, alloc, allocBig));
-+  LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  p->nowPos64 = 0;
-+  return SZ_OK;
-+}
-+
-+static SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  p->rc.outStream = outStream;
-+  return LzmaEnc_AllocAndInit(p, 0, alloc, allocBig);
-+}
-+
-+SRes LzmaEnc_PrepareForLzma2(CLzmaEncHandle pp,
-+    ISeqInStream *inStream, UInt32 keepWindowSize,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  p->matchFinderBase.stream = inStream;
-+  p->needInit = 1;
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen)
-+{
-+  p->matchFinderBase.directInput = 1;
-+  p->matchFinderBase.bufferBase = (Byte *)src;
-+  p->matchFinderBase.directInputRem = srcLen;
-+}
-+
-+SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen,
-+    UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+  p->needInit = 1;
-+
-+  return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig);
-+}
-+
-+void LzmaEnc_Finish(CLzmaEncHandle pp)
-+{
-+  #ifndef _7ZIP_ST
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  if (p->mtMode)
-+    MatchFinderMt_ReleaseStream(&p->matchFinderMt);
-+  #else
-+  pp = pp;
-+  #endif
-+}
-+
-+typedef struct
-+{
-+  ISeqOutStream funcTable;
-+  Byte *data;
-+  SizeT rem;
-+  Bool overflow;
-+} CSeqOutStreamBuf;
-+
-+static size_t MyWrite(void *pp, const void *data, size_t size)
-+{
-+  CSeqOutStreamBuf *p = (CSeqOutStreamBuf *)pp;
-+  if (p->rem < size)
-+  {
-+    size = p->rem;
-+    p->overflow = True;
-+  }
-+  memcpy(p->data, data, size);
-+  p->rem -= size;
-+  p->data += size;
-+  return size;
-+}
-+
-+
-+UInt32 LzmaEnc_GetNumAvailableBytes(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetNumAvailableBytes(p->matchFinderObj);
-+}
-+
-+const Byte *LzmaEnc_GetCurBuf(CLzmaEncHandle pp)
-+{
-+  const CLzmaEnc *p = (CLzmaEnc *)pp;
-+  return p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - p->additionalOffset;
-+}
-+
-+SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
-+    Byte *dest, size_t *destLen, UInt32 desiredPackSize, UInt32 *unpackSize)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  UInt64 nowPos64;
-+  SRes res;
-+  CSeqOutStreamBuf outStream;
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = False;
-+  p->finished = False;
-+  p->result = SZ_OK;
-+
-+  if (reInit)
-+    LzmaEnc_Init(p);
-+  LzmaEnc_InitPrices(p);
-+  nowPos64 = p->nowPos64;
-+  RangeEnc_Init(&p->rc);
-+  p->rc.outStream = &outStream.funcTable;
-+
-+  res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
-+  
-+  *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+
-+  return res;
-+}
-+
-+static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress)
-+{
-+  SRes res = SZ_OK;
-+
-+  #ifndef _7ZIP_ST
-+  Byte allocaDummy[0x300];
-+  int i = 0;
-+  for (i = 0; i < 16; i++)
-+    allocaDummy[i] = (Byte)i;
-+  #endif
-+
-+  for (;;)
-+  {
-+    res = LzmaEnc_CodeOneBlock(p, False, 0, 0);
-+    if (res != SZ_OK || p->finished != 0)
-+      break;
-+    if (progress != 0)
-+    {
-+      res = progress->Progress(progress, p->nowPos64, RangeEnc_GetProcessed(&p->rc));
-+      if (res != SZ_OK)
-+      {
-+        res = SZ_ERROR_PROGRESS;
-+        break;
-+      }
-+    }
-+  }
-+  LzmaEnc_Finish(p);
-+  return res;
-+}
-+
-+SRes LzmaEnc_Encode(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ICompressProgress *progress,
-+    ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  RINOK(LzmaEnc_Prepare(pp, outStream, inStream, alloc, allocBig));
-+  return LzmaEnc_Encode2((CLzmaEnc *)pp, progress);
-+}
-+
-+SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+  int i;
-+  UInt32 dictSize = p->dictSize;
-+  if (*size < LZMA_PROPS_SIZE)
-+    return SZ_ERROR_PARAM;
-+  *size = LZMA_PROPS_SIZE;
-+  props[0] = (Byte)((p->pb * 5 + p->lp) * 9 + p->lc);
-+
-+  for (i = 11; i <= 30; i++)
-+  {
-+    if (dictSize <= ((UInt32)2 << i))
-+    {
-+      dictSize = (2 << i);
-+      break;
-+    }
-+    if (dictSize <= ((UInt32)3 << i))
-+    {
-+      dictSize = (3 << i);
-+      break;
-+    }
-+  }
-+
-+  for (i = 0; i < 4; i++)
-+    props[1 + i] = (Byte)(dictSize >> (8 * i));
-+  return SZ_OK;
-+}
-+
-+SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  SRes res;
-+  CLzmaEnc *p = (CLzmaEnc *)pp;
-+
-+  CSeqOutStreamBuf outStream;
-+
-+  LzmaEnc_SetInputBuf(p, src, srcLen);
-+
-+  outStream.funcTable.Write = MyWrite;
-+  outStream.data = dest;
-+  outStream.rem = *destLen;
-+  outStream.overflow = False;
-+
-+  p->writeEndMark = writeEndMark;
-+
-+  p->rc.outStream = &outStream.funcTable;
-+  res = LzmaEnc_MemPrepare(pp, src, srcLen, 0, alloc, allocBig);
-+  if (res == SZ_OK)
-+    res = LzmaEnc_Encode2(p, progress);
-+
-+  *destLen -= outStream.rem;
-+  if (outStream.overflow)
-+    return SZ_ERROR_OUTPUT_EOF;
-+  return res;
-+}
-+
-+SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
-+    const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
-+    ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig)
-+{
-+  CLzmaEnc *p = (CLzmaEnc *)LzmaEnc_Create(alloc);
-+  SRes res;
-+  if (p == 0)
-+    return SZ_ERROR_MEM;
-+
-+  res = LzmaEnc_SetProps(p, props);
-+  if (res == SZ_OK)
-+  {
-+    res = LzmaEnc_WriteProperties(p, propsEncoded, propsSize);
-+    if (res == SZ_OK)
-+      res = LzmaEnc_MemEncode(p, dest, destLen, src, srcLen,
-+          writeEndMark, progress, alloc, allocBig);
-+  }
-+
-+  LzmaEnc_Destroy(p, alloc, allocBig);
-+  return res;
-+}
---- /dev/null
-+++ b/lib/lzma/Makefile
-@@ -0,0 +1,7 @@
-+lzma_compress-objs := LzFind.o LzmaEnc.o
-+lzma_decompress-objs := LzmaDec.o
-+
-+obj-$(CONFIG_LZMA_COMPRESS) += lzma_compress.o
-+obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o
-+
-+EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h
diff --git a/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch
deleted file mode 100644
index c2a043acde..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/011-mips_boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -121,6 +121,8 @@
- #endif
- 	.endm
- 
-+	j kernel_entry
-+	nop
- #ifndef CONFIG_NO_EXCEPT_FILL
- 	/*
- 	 * Reserved space for exception handlers.
diff --git a/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch
deleted file mode 100644
index 0b5174cbbd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/012-extra_optimization.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -529,7 +529,7 @@ all: vmlinux
- ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
- KBUILD_CFLAGS	+= -Os
- else
--KBUILD_CFLAGS	+= -O2
-+KBUILD_CFLAGS	+= -O2 -fno-reorder-blocks -fno-tree-ch
- endif
- 
- include $(srctree)/arch/$(SRCARCH)/Makefile
-@@ -567,6 +567,9 @@ endif
- NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- CHECKFLAGS     += $(NOSTDINC_FLAGS)
- 
-+# improve gcc optimization
-+CFLAGS += $(call cc-option,-funit-at-a-time,)
-+
- # warn about C99 declaration after statement
- KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch
deleted file mode 100644
index a7082de492..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/013-gcc4_inline_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
-@@ -198,7 +198,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
- #endif
- 
--static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
-+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
- {
- 	switch (size) {
- 	case 4:
diff --git a/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch
deleted file mode 100644
index 1b028edd98..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -372,6 +372,8 @@ static struct cfi_fixup fixup_table[] = 
- static void cfi_fixup_major_minor(struct cfi_private *cfi,
- 				  struct cfi_pri_amdstd *extp)
- {
-+	// manufacturers defined in include/linux/mtd/cfi.h
-+
- 	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- 	    extp->MajorVersion == '0')
- 		extp->MajorVersion = '1';
-@@ -404,6 +406,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 
- 	mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
- 
-+	printk(" CFI mfr 0x%08x\n", cfi->mfr);	// TODO: Is there a more general place to print this info?
-+	printk(" CFI id  0x%08x\n", cfi->id);
-+
- 	if (cfi->cfi_mode==CFI_MODE_CFI){
- 		unsigned char bootloc;
- 		__u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
-@@ -417,16 +422,24 @@ struct mtd_info *cfi_cmdset_0002(struct 
- 			 */
- 			cfi_fixup_major_minor(cfi, extp);
- 
--			if (extp->MajorVersion != '1' ||
--			    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
-+			// valid primary extension versions are: 1.0, 1.1, 1.2, 1.3
-+			// see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on
-+			//      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
-+			if (extp->MajorVersion < '1' ||
-+			    extp->MajorVersion > '1' ||
-+			    (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) {
- 				printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "
--				       "version %c.%c.\n",  extp->MajorVersion,
--				       extp->MinorVersion);
-+				       "version %c.%c (0x%02x/0x%02x).\n",
-+				       extp->MajorVersion, extp->MinorVersion,
-+				       extp->MajorVersion, extp->MinorVersion);
- 				kfree(extp);
- 				kfree(mtd);
- 				return NULL;
- 			}
- 
-+			printk("  Amd/Fujitsu Extended Query version %c.%c.\n",
-+			       extp->MajorVersion, extp->MinorVersion);
-+
- 			/* Install our own private info structure */
- 			cfi->cmdset_priv = extp;
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch
deleted file mode 100644
index ca0c10b20d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/020-mips_multi_machine_support.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- /dev/null
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -0,0 +1,54 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef __ASM_MIPS_MACHINE_H
-+#define __ASM_MIPS_MACHINE_H
-+
-+#include <linux/init.h>
-+#include <linux/list.h>
-+
-+#include <asm/bootinfo.h>
-+
-+struct mips_machine {
-+	unsigned long		mach_type;
-+	const char		*mach_id;
-+	const char		*mach_name;
-+	void			(*mach_setup)(void);
-+};
-+
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
-+static struct mips_machine machine_##_type			\
-+		__used __section(.mips.machines.init) =		\
-+{								\
-+	.mach_type	= _type,				\
-+	.mach_id	= machine_id_##_type,			\
-+	.mach_name	= machine_name_##_type,			\
-+	.mach_setup	= _setup,				\
-+};
-+
-+extern long __mips_machines_start;
-+extern long __mips_machines_end;
-+
-+#ifdef CONFIG_MIPS_MACHINE
-+int  mips_machtype_setup(char *id) __init;
-+void mips_machine_setup(void) __init;
-+void mips_set_machine_name(const char *name) __init;
-+char *mips_get_machine_name(void);
-+#else
-+static inline int mips_machtype_setup(char *id) { return 1; }
-+static inline void mips_machine_setup(void) { }
-+static inline void mips_set_machine_name(const char *name) { }
-+static inline char *mips_get_machine_name(void) { return NULL; }
-+#endif /* CONFIG_MIPS_MACHINE */
-+
-+#endif /* __ASM_MIPS_MACHINE_H */
---- /dev/null
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -0,0 +1,86 @@
-+/*
-+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ *
-+ */
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+
-+#include <asm/mips_machine.h>
-+
-+static struct mips_machine *mips_machine __initdata;
-+static char *mips_machine_name = "Unknown";
-+
-+#define for_each_machine(mach) \
-+	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
-+	     (mach) && \
-+	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \
-+	     (mach)++)
-+
-+__init void mips_set_machine_name(const char *name)
-+{
-+	char *p;
-+
-+	if (name == NULL)
-+		return;
-+
-+	p = kstrdup(name, GFP_KERNEL);
-+	if (!p)
-+		pr_err("MIPS: no memory for machine_name\n");
-+
-+	mips_machine_name = p;
-+}
-+
-+char *mips_get_machine_name(void)
-+{
-+	return mips_machine_name;
-+}
-+
-+__init int mips_machtype_setup(char *id)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, id) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	pr_err("MIPS: no machine found for id '%s', supported machines:\n", id);
-+	pr_err("%-24s : %s\n", "id", "name");
-+	for_each_machine(mach)
-+		pr_err("%-24s : %s\n", mach->mach_id, mach->mach_name);
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+__init void mips_machine_setup(void)
-+{
-+	struct mips_machine *mach;
-+
-+	for_each_machine(mach) {
-+		if (mips_machtype == mach->mach_type) {
-+			mips_machine = mach;
-+			break;
-+		}
-+	}
-+
-+	if (!mips_machine)
-+		return;
-+
-+	mips_set_machine_name(mips_machine->mach_name);
-+	pr_info("MIPS: machine is %s\n", mips_machine_name);
-+
-+	if (mips_machine->mach_setup)
-+		mips_machine->mach_setup();
-+}
---- a/arch/mips/kernel/Makefile
-+++ b/arch/mips/kernel/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
- obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
- obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
- obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o
-+obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o
- 
- CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
- config SYNC_R4K
- 	bool
- 
-+config MIPS_MACHINE
-+	def_bool n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/proc.c
-+++ b/arch/mips/kernel/proc.c
-@@ -12,6 +12,7 @@
- #include <asm/cpu-features.h>
- #include <asm/mipsregs.h>
- #include <asm/processor.h>
-+#include <asm/mips_machine.h>
- 
- unsigned int vced_count, vcei_count;
- 
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
- 	/*
- 	 * For the first processor also print the system type
- 	 */
--	if (n == 0)
-+	if (n == 0) {
- 		seq_printf(m, "system type\t\t: %s\n", get_system_type());
-+		if (mips_get_machine_name())
-+			seq_printf(m, "machine\t\t\t: %s\n",
-+				   mips_get_machine_name());
-+	}
- 
- 	seq_printf(m, "processor\t\t: %ld\n", n);
- 	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
---- a/arch/mips/kernel/vmlinux.lds.S
-+++ b/arch/mips/kernel/vmlinux.lds.S
-@@ -98,6 +98,13 @@ SECTIONS
- 	INIT_TEXT_SECTION(PAGE_SIZE)
- 	INIT_DATA_SECTION(16)
- 
-+	. = ALIGN(4);
-+	.mips.machines.init : AT(ADDR(.mips.machines.init) - LOAD_OFFSET) {
-+		__mips_machines_start = .;
-+		*(.mips.machines.init)
-+		__mips_machines_end = .;
-+	}
-+
- 	/* .exit.text is discarded at runtime, not link time, to deal with
- 	 * references from .rodata
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch
deleted file mode 100644
index a304f0bcc7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/021-mips_image_cmdline_hack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -856,6 +856,10 @@ config SYNC_R4K
- config MIPS_MACHINE
- 	def_bool n
- 
-+config IMAGE_CMDLINE_HACK
-+	bool "OpenWrt specific image command line hack"
-+	default n
-+
- config NO_IOPORT
- 	def_bool n
- 
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -143,6 +143,12 @@ FEXPORT(__kernel_entry)
- 	j	kernel_entry
- #endif
- 
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+	.ascii	"CMDLINE:"
-+EXPORT(__image_cmdline)
-+	.fill	0x400
-+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
-+
- 	__REF
- 
- NESTED(kernel_entry, 16, sp)			# kernel entry point
diff --git a/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch b/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch
deleted file mode 100644
index 786afd1dc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/022-mips_use_generic_thread_info_allocator.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/arch/mips/include/asm/thread_info.h
-+++ b/arch/mips/include/asm/thread_info.h
-@@ -83,6 +83,7 @@ register struct thread_info *__current_t
- #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
- #define THREAD_MASK (THREAD_SIZE - 1UL)
- 
-+#if 0
- #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
- 
- #ifdef CONFIG_DEBUG_STACK_USAGE
-@@ -92,6 +93,7 @@ register struct thread_info *__current_t
- #endif
- 
- #define free_thread_info(info) kfree(info)
-+#endif
- 
- #endif /* !__ASSEMBLY__ */
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch
deleted file mode 100644
index e6928dde91..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/023-mips-fix-kexec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/kernel/machine_kexec.c
-+++ b/arch/mips/kernel/machine_kexec.c
-@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
- 	reboot_code_buffer =
- 	  (unsigned long)page_address(image->control_code_page);
- 
--	kexec_start_address = image->start;
-+	kexec_start_address = (unsigned long) phys_to_virt(image->start);
- 	kexec_indirection_page =
- 		(unsigned long) phys_to_virt(image->head & PAGE_MASK);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch
deleted file mode 100644
index a65be6f2cf..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/025-mips_disable_fpu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-MIPS: allow disabling the kernel FPU emulator
-
-This patch allows turning off the in-kernel Algorithmics
-FPU emulator support, which allows one to save a couple of
-precious blocks on an embedded system.
-
-Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -841,6 +841,17 @@ config I8259
- config MIPS_BONITO64
- 	bool
- 
-+config MIPS_FPU_EMU
-+	bool "Enable FPU emulation"
-+	default y
-+	help
-+	   This option allows building a kernel with or without the Algorithmics
-+	   FPU emulator enabled. Turning off this option results in a kernel which
-+	   does not catch floating operations exceptions. Make sure that your toolchain
-+	   is configured to enable software floating point emulation in that case.
-+		
-+	   If unsure say Y here.
-+
- config MIPS_MSC
- 	bool
- 
---- a/arch/mips/math-emu/Makefile
-+++ b/arch/mips/math-emu/Makefile
-@@ -2,12 +2,14 @@
- # Makefile for the Linux/MIPS kernel FPU emulation.
- #
- 
--obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
-+obj-y	:=	kernel_linkage.o dsemul.o cp1emu.o
-+
-+obj-$(CONFIG_MIPS_FPU_EMU)	+= ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
- 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \
- 	   dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \
- 	   dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \
- 	   sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
- 	   sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
--	   dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-+	   dp_sqrt.o sp_sqrt.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -58,7 +58,11 @@
- #define __mips 4
- 
- /* Function which emulates a floating point instruction. */
-+#ifdef CONFIG_DEBUG_FS
-+DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
-+#endif
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- 	mips_instruction);
- 
-@@ -69,10 +73,6 @@ static int fpux_emu(struct pt_regs *,
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
--#ifdef CONFIG_DEBUG_FS
--DEFINE_PER_CPU(struct mips_fpu_emulator_stats, fpuemustats);
--#endif
--
- /* Control registers */
- 
- #define FPCREG_RID	0	/* $0  = revision id */
-@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r
- 
- 	return sig;
- }
--
- #ifdef CONFIG_DEBUG_FS
- 
- static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void)
- 	return 0;
- }
- __initcall(debugfs_fpuemu);
--#endif
-+#endif /* CONFIG_DEBUGFS */
-+#else
-+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+        int has_fpu)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/dsemul.c
-+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
- 	return SIGILL;		/* force out of emulation loop */
- }
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- int do_dsemulret(struct pt_regs *xcp)
- {
- 	struct emuframe __user *fr;
-@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp)
- 
- 	return 1;
- }
-+#else
-+int do_dsemulret(struct pt_regs *xcp)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_MIPS_FPU_EMU */
---- a/arch/mips/math-emu/kernel_linkage.c
-+++ b/arch/mips/math-emu/kernel_linkage.c
-@@ -29,6 +29,7 @@
- 
- #define SIGNALLING_NAN 0x7ff800007ff80000LL
- 
-+#ifdef CONFIG_MIPS_FPU_EMU
- void fpu_emulator_init_fpu(void)
- {
- 	static int first = 1;
-@@ -112,4 +113,36 @@ int fpu_emulator_restore_context32(struc
- 
- 	return err;
- }
--#endif
-+#endif	/* CONFIG_64BIT */
-+#else
-+
-+void fpu_emulator_init_fpu(void)
-+{
-+	printk(KERN_INFO "FPU emulator disabled, make sure your toolchain"
-+		"was compiled with software floating point support (soft-float)\n");
-+	return;
-+}
-+
-+int fpu_emulator_save_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context(struct sigcontext __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-+{
-+	return 0;
-+}
-+
-+#ifdef CONFIG_64BIT
-+#endif	/* CONFIG_64BIT */
-+#endif /* CONFIG_MIPS_FPU_EMU */
diff --git a/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch b/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch
deleted file mode 100644
index 024e7f16cd..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/027-mips_module_reloc.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -93,7 +93,7 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin
- cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
- cflags-y			+= -msoft-float
- LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
--MODFLAGS			+= -mlong-calls
-+MODFLAGS			+= -mno-long-calls
- 
- cflags-y += -ffreestanding
- 
---- a/arch/mips/include/asm/module.h
-+++ b/arch/mips/include/asm/module.h
-@@ -9,6 +9,11 @@ struct mod_arch_specific {
- 	struct list_head dbe_list;
- 	const struct exception_table_entry *dbe_start;
- 	const struct exception_table_entry *dbe_end;
-+
-+	void *phys_plt_tbl;
-+	void *virt_plt_tbl;
-+	unsigned int phys_plt_offset;
-+	unsigned int virt_plt_offset;
- };
- 
- typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
---- a/arch/mips/kernel/module.c
-+++ b/arch/mips/kernel/module.c
-@@ -43,6 +43,117 @@ static struct mips_hi16 *mips_hi16_list;
- static LIST_HEAD(dbe_list);
- static DEFINE_SPINLOCK(dbe_lock);
- 
-+/*
-+ * Get the potential max trampolines size required of the init and
-+ * non-init sections. Only used if we cannot find enough contiguous
-+ * physically mapped memory to put the module into.
-+ */
-+static unsigned int
-+get_plt_size(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-+             const char *secstrings, unsigned int symindex, bool is_init)
-+{
-+	unsigned long ret = 0;
-+	unsigned int i, j;
-+	Elf_Sym *syms;
-+
-+	/* Everything marked ALLOC (this includes the exported symbols) */
-+	for (i = 1; i < hdr->e_shnum; ++i) {
-+		unsigned int info = sechdrs[i].sh_info;
-+
-+		if (sechdrs[i].sh_type != SHT_REL
-+		    && sechdrs[i].sh_type != SHT_RELA)
-+			continue;
-+
-+		/* Not a valid relocation section? */
-+		if (info >= hdr->e_shnum)
-+			continue;
-+
-+		/* Don't bother with non-allocated sections */
-+		if (!(sechdrs[info].sh_flags & SHF_ALLOC))
-+			continue;
-+
-+		/* If it's called *.init*, and we're not init, we're
-+                   not interested */
-+		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
-+		    != is_init)
-+			continue;
-+
-+		syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
-+		if (sechdrs[i].sh_type == SHT_REL) {
-+			Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rel);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rel[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		} else {
-+			Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
-+			unsigned int size = sechdrs[i].sh_size / sizeof(*rela);
-+
-+			for (j = 0; j < size; ++j) {
-+				Elf_Sym *sym;
-+
-+				if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
-+					continue;
-+
-+				sym = syms + ELF_MIPS_R_SYM(rela[j]);
-+				if (!is_init && sym->st_shndx != SHN_UNDEF)
-+					continue;
-+
-+				ret += 4 * sizeof(int);
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+#ifndef MODULE_START
-+static void *alloc_phys(unsigned long size)
-+{
-+	unsigned order;
-+	struct page *page;
-+	struct page *p;
-+
-+	size = PAGE_ALIGN(size);
-+	order = get_order(size);
-+
-+	page = alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN |
-+			__GFP_THISNODE, order);
-+	if (!page)
-+		return NULL;
-+
-+	split_page(page, order);
-+
-+	for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
-+		__free_page(p);
-+
-+	return page_address(page);
-+}
-+#endif
-+
-+static void free_phys(void *ptr, unsigned long size)
-+{
-+	struct page *page;
-+	struct page *end;
-+
-+	page = virt_to_page(ptr);
-+	end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
-+
-+	for (; page < end; ++page)
-+		__free_page(page);
-+}
-+
-+
- void *module_alloc(unsigned long size)
- {
- #ifdef MODULE_START
-@@ -58,21 +169,99 @@ void *module_alloc(unsigned long size)
- 
- 	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
- #else
-+	void *ptr;
-+
- 	if (size == 0)
- 		return NULL;
--	return vmalloc(size);
-+
-+	ptr = alloc_phys(size);
-+
-+	/* If we failed to allocate physically contiguous memory,
-+	 * fall back to regular vmalloc. The module loader code will
-+	 * create jump tables to handle long jumps */
-+	if (!ptr)
-+		return vmalloc(size);
-+
-+	return ptr;
-+#endif
-+}
-+
-+static inline bool is_phys_addr(void *ptr)
-+{
-+#ifdef CONFIG_64BIT
-+	return (KSEGX((unsigned long)ptr) == CKSEG0);
-+#else
-+	return (KSEGX(ptr) == KSEG0);
- #endif
- }
- 
- /* Free memory returned from module_alloc */
- void module_free(struct module *mod, void *module_region)
- {
--	vfree(module_region);
-+	if (is_phys_addr(module_region)) {
-+		if (mod->module_init == module_region)
-+			free_phys(module_region, mod->init_size);
-+		else if (mod->module_core == module_region)
-+			free_phys(module_region, mod->core_size);
-+		else
-+			BUG();
-+	} else {
-+		vfree(module_region);
-+	}
-+}
-+
-+static void *__module_alloc(int size, bool phys)
-+{
-+	void *ptr;
-+
-+	if (phys)
-+		ptr = kmalloc(size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc(size);
-+	return ptr;
-+}
-+
-+static void __module_free(void *ptr)
-+{
-+	if (is_phys_addr(ptr))
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
- }
- 
- int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
- 			      char *secstrings, struct module *mod)
- {
-+	unsigned int symindex = 0;
-+	unsigned int core_size, init_size;
-+	int i;
-+
-+	for (i = 1; i < hdr->e_shnum; i++)
-+		if (sechdrs[i].sh_type == SHT_SYMTAB)
-+			symindex = i;
-+
-+	core_size = get_plt_size(hdr, sechdrs, secstrings, symindex, false);
-+	init_size = get_plt_size(hdr, sechdrs, secstrings, symindex, true);
-+
-+	mod->arch.phys_plt_offset = 0;
-+	mod->arch.virt_plt_offset = 0;
-+	mod->arch.phys_plt_tbl = NULL;
-+	mod->arch.virt_plt_tbl = NULL;
-+
-+	if ((core_size + init_size) == 0)
-+		return 0;
-+
-+	mod->arch.phys_plt_tbl = __module_alloc(core_size + init_size, 1);
-+	if (!mod->arch.phys_plt_tbl)
-+		return -ENOMEM;
-+
-+	mod->arch.virt_plt_tbl = __module_alloc(core_size + init_size, 0);
-+	if (!mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+		return -ENOMEM;
-+	}
-+
- 	return 0;
- }
- 
-@@ -95,28 +284,36 @@ static int apply_r_mips_32_rela(struct m
- 	return 0;
- }
- 
--static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
-+				 void *start, Elf_Addr v)
- {
--	if (v % 4) {
--		pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	unsigned *tramp = start + *plt_offset;
-+	*plt_offset += 4 * sizeof(int);
- 
--	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
--		       "module %s: relocation overflow\n",
--		       me->name);
--		return -ENOEXEC;
--	}
-+	/* adjust carry for addiu */
-+	if (v & 0x00008000)
-+		v += 0x10000;
- 
--	*location = (*location & ~0x03ffffff) |
--	            ((*location + (v >> 2)) & 0x03ffffff);
-+	tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
-+	tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
-+	tramp[2] = 0x03200008;                  /* jr t9 */
-+	tramp[3] = 0x00000000;                  /* nop */
- 
--	return 0;
-+	return (Elf_Addr) tramp;
- }
- 
--static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
-+{
-+	if (is_phys_addr(location))
-+		return add_plt_entry_to(&me->arch.phys_plt_offset,
-+				me->arch.phys_plt_tbl, v);
-+	else
-+		return add_plt_entry_to(&me->arch.virt_plt_offset,
-+				me->arch.virt_plt_tbl, v);
-+
-+}
-+
-+static int set_r_mips_26(struct module *me, u32 *location, u32 ofs, Elf_Addr v)
- {
- 	if (v % 4) {
- 		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-@@ -125,17 +322,31 @@ static int apply_r_mips_26_rela(struct m
- 	}
- 
- 	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
--		printk(KERN_ERR
-+	    v = add_plt_entry(me, location, v + (ofs << 2));
-+		if (!v) {
-+			printk(KERN_ERR
- 		       "module %s: relocation overflow\n",
- 		       me->name);
--		return -ENOEXEC;
-+			return -ENOEXEC;
-+		}
-+		ofs = 0;
- 	}
- 
--	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-+	*location = (*location & ~0x03ffffff) | ((ofs + (v >> 2)) & 0x03ffffff);
- 
- 	return 0;
- }
- 
-+static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, *location & 0x03ffffff, v);
-+}
-+
-+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-+{
-+	return set_r_mips_26(me, location, 0, v);
-+}
-+
- static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
- {
- 	struct mips_hi16 *n;
-@@ -400,11 +611,32 @@ int module_finalize(const Elf_Ehdr *hdr,
- 		list_add(&me->arch.dbe_list, &dbe_list);
- 		spin_unlock_irq(&dbe_lock);
- 	}
-+
-+	/* Get rid of the fixup trampoline if we're running the module
-+	 * from physically mapped address space */
-+	if (me->arch.phys_plt_offset == 0) {
-+		__module_free(me->arch.phys_plt_tbl);
-+		me->arch.phys_plt_tbl = NULL;
-+	}
-+	if (me->arch.virt_plt_offset == 0) {
-+		__module_free(me->arch.virt_plt_tbl);
-+		me->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	return 0;
- }
- 
- void module_arch_cleanup(struct module *mod)
- {
-+	if (mod->arch.phys_plt_tbl) {
-+		__module_free(mod->arch.phys_plt_tbl);
-+		mod->arch.phys_plt_tbl = NULL;
-+	}
-+	if (mod->arch.virt_plt_tbl) {
-+		__module_free(mod->arch.virt_plt_tbl);
-+		mod->arch.virt_plt_tbl = NULL;
-+	}
-+
- 	spin_lock_irq(&dbe_lock);
- 	list_del(&mod->arch.dbe_list);
- 	spin_unlock_irq(&dbe_lock);
diff --git a/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch b/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch
deleted file mode 100644
index ad9074a885..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/028-module_exports.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -52,6 +52,27 @@
- #define LOAD_OFFSET 0
- #endif
- 
-+#ifndef SYMTAB_KEEP_STR
-+#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
-+#define SYMTAB_DISCARD_STR
-+#else
-+#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP
-+#define SYMTAB_KEEP *(__ksymtab.*)
-+#define SYMTAB_DISCARD
-+#else
-+#define SYMTAB_DISCARD *(__ksymtab.*)
-+#endif
-+
-+#ifndef SYMTAB_KEEP_GPL
-+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
-+#define SYMTAB_DISCARD_GPL
-+#else
-+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
-+#endif
-+
- #ifndef SYMBOL_PREFIX
- #define VMLINUX_SYMBOL(sym) sym
- #else
-@@ -258,35 +279,35 @@
- 	/* Kernel symbol table: Normal symbols */			\
- 	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
- 		VMLINUX_SYMBOL(__start___ksymtab) = .;			\
--		*(__ksymtab)						\
-+		SYMTAB_KEEP						\
- 		VMLINUX_SYMBOL(__stop___ksymtab) = .;			\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only symbols */			\
- 	__ksymtab_gpl     : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl) = .;		\
--		*(__ksymtab_gpl)					\
-+		SYMTAB_KEEP_GPL						\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: Normal unused symbols */		\
- 	__ksymtab_unused  : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) {	\
- 		VMLINUX_SYMBOL(__start___ksymtab_unused) = .;		\
--		*(__ksymtab_unused)					\
-+		*(__ksymtab_unused.*)					\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused) = .;		\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-only unused symbols */		\
- 	__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .;	\
--		*(__ksymtab_unused_gpl)					\
-+		*(__ksymtab_unused_gpl.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .;	\
- 	}								\
- 									\
- 	/* Kernel symbol table: GPL-future-only symbols */		\
- 	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
- 		VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .;	\
--		*(__ksymtab_gpl_future)					\
-+		*(__ksymtab_gpl_future.*)				\
- 		VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .;	\
- 	}								\
- 									\
-@@ -327,7 +348,7 @@
- 									\
- 	/* Kernel symbol table: strings */				\
-         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
--		*(__ksymtab_strings)					\
-+		SYMTAB_KEEP_STR						\
- 	}								\
- 									\
- 	/* __*init sections */						\
-@@ -642,6 +663,9 @@
- 	EXIT_TEXT							\
- 	EXIT_DATA							\
- 	EXIT_CALL							\
-+	SYMTAB_DISCARD							\
-+	SYMTAB_DISCARD_GPL						\
-+	SYMTAB_DISCARD_STR						\
- 	*(.discard)							\
- 	}
- 
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -195,16 +195,24 @@ void *__symbol_get_gpl(const char *symbo
- #define __CRC_SYMBOL(sym, sec)
- #endif
- 
-+#ifdef MODULE
-+#define __EXPORT_SUFFIX(sym)
-+#else
-+#define __EXPORT_SUFFIX(sym) "." #sym
-+#endif
-+
- /* For every exported symbol, place a struct in the __ksymtab section */
- #define __EXPORT_SYMBOL(sym, sec)				\
- 	extern typeof(sym) sym;					\
- 	__CRC_SYMBOL(sym, sec)					\
- 	static const char __kstrtab_##sym[]			\
--	__attribute__((section("__ksymtab_strings"), aligned(1))) \
-+	__attribute__((section("__ksymtab_strings"		\
-+	  __EXPORT_SUFFIX(sym)), aligned(1)))			\
- 	= MODULE_SYMBOL_PREFIX #sym;                    	\
- 	static const struct kernel_symbol __ksymtab_##sym	\
- 	__used							\
--	__attribute__((section("__ksymtab" sec), unused))	\
-+	__attribute__((section("__ksymtab" sec			\
-+	  __EXPORT_SUFFIX(sym)), unused))			\
- 	= { (unsigned long)&sym, __kstrtab_##sym }
- 
- #define EXPORT_SYMBOL(sym)					\
diff --git a/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch b/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch
deleted file mode 100644
index 8a3b2e23cb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/029-arm_module_unresolved_weak_sym.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/arch/arm/kernel/module.c
-+++ b/arch/arm/kernel/module.c
-@@ -121,6 +121,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
- 			return -ENOEXEC;
- 		}
- 
-+		if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
-+		    ELF_ST_BIND(sym->st_info) == STB_WEAK)
-+			continue;
-+
- 		loc = dstsec->sh_addr + rel->r_offset;
- 
- 		switch (ELF32_R_TYPE(rel->r_info)) {
diff --git a/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch
deleted file mode 100644
index 0cf19789ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/030-pci_disable_common_quirks.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -40,6 +40,12 @@ config PCI_STUB
- 
- 	  When in doubt, say N.
- 
-+config PCI_DISABLE_COMMON_QUIRKS
-+	bool "PCI disable common quirks"
-+	depends on PCI
-+	help
-+	  If you don't know what to do here, say N.
-+
- config HT_IRQ
- 	bool "Interrupts on hypertransport devices"
- 	default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
- 	}
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
- 
- #endif	/* CONFIG_PCI_IOV */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- 
- /*
-  * This is a quirk for the Ricoh MMC controller found as a part of
diff --git a/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch b/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch
deleted file mode 100644
index be4d2bfc2d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/031-ppc_gcc_build_fix.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-GCC 4.4.x looks to be adding support for generating out-of-line register
-saves/restores based on:
-
-http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
-
-This breaks the kernel build as we'd have to link with libgcc to get the
-implementation of the register save/restores.
-
-To workaround this issue, we just stole the save/restore code from gcc
-and simplified it down for our needs (integer only).  We only do this if
-PPC32 as gcc makes believe the linker on ppc64 will deal with this and
-only if CONFIG_CC_OPTIMIZE_FOR_SIZE is set (thus -Os).
-
-Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
----
-
-If someone using cutting edge toolchains for ppc64 could test and make
-sure if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE things work that would be
-nice.
-
-- k
-
- arch/powerpc/kernel/misc_32.S   |   77 +++++++++++++++++++++++++++
- arch/powerpc/kernel/ppc_ksyms.c |  111 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -802,3 +802,80 @@ relocate_new_kernel_end:
- relocate_new_kernel_size:
- 	.long relocate_new_kernel_end - relocate_new_kernel
- #endif
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+/* Routines for saving integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer save area.  */
-+
-+_GLOBAL(_savegpr_14)   stw     14,-72(11)      /* save gp registers */
-+_GLOBAL(_savegpr_15)   stw     15,-68(11)
-+_GLOBAL(_savegpr_16)   stw     16,-64(11)
-+_GLOBAL(_savegpr_17)   stw     17,-60(11)
-+_GLOBAL(_savegpr_18)   stw     18,-56(11)
-+_GLOBAL(_savegpr_19)   stw     19,-52(11)
-+_GLOBAL(_savegpr_20)   stw     20,-48(11)
-+_GLOBAL(_savegpr_21)   stw     21,-44(11)
-+_GLOBAL(_savegpr_22)   stw     22,-40(11)
-+_GLOBAL(_savegpr_23)   stw     23,-36(11)
-+_GLOBAL(_savegpr_24)   stw     24,-32(11)
-+_GLOBAL(_savegpr_25)   stw     25,-28(11)
-+_GLOBAL(_savegpr_26)   stw     26,-24(11)
-+_GLOBAL(_savegpr_27)   stw     27,-20(11)
-+_GLOBAL(_savegpr_28)   stw     28,-16(11)
-+_GLOBAL(_savegpr_29)   stw     29,-12(11)
-+_GLOBAL(_savegpr_30)   stw     30,-8(11)
-+_GLOBAL(_savegpr_31)   stw     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14)   lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15)   lwz     15,-68(11)
-+_GLOBAL(_restgpr_16)   lwz     16,-64(11)
-+_GLOBAL(_restgpr_17)   lwz     17,-60(11)
-+_GLOBAL(_restgpr_18)   lwz     18,-56(11)
-+_GLOBAL(_restgpr_19)   lwz     19,-52(11)
-+_GLOBAL(_restgpr_20)   lwz     20,-48(11)
-+_GLOBAL(_restgpr_21)   lwz     21,-44(11)
-+_GLOBAL(_restgpr_22)   lwz     22,-40(11)
-+_GLOBAL(_restgpr_23)   lwz     23,-36(11)
-+_GLOBAL(_restgpr_24)   lwz     24,-32(11)
-+_GLOBAL(_restgpr_25)   lwz     25,-28(11)
-+_GLOBAL(_restgpr_26)   lwz     26,-24(11)
-+_GLOBAL(_restgpr_27)   lwz     27,-20(11)
-+_GLOBAL(_restgpr_28)   lwz     28,-16(11)
-+_GLOBAL(_restgpr_29)   lwz     29,-12(11)
-+_GLOBAL(_restgpr_30)   lwz     30,-8(11)
-+_GLOBAL(_restgpr_31)   lwz     31,-4(11)
-+                       blr
-+
-+/* Routines for restoring integer registers, called by the compiler.  */
-+/* Called with r11 pointing to the stack header word of the caller of the */
-+/* function, just beyond the end of the integer restore area.  */
-+
-+_GLOBAL(_restgpr_14_x) lwz     14,-72(11)      /* restore gp registers */
-+_GLOBAL(_restgpr_15_x) lwz     15,-68(11)
-+_GLOBAL(_restgpr_16_x) lwz     16,-64(11)
-+_GLOBAL(_restgpr_17_x) lwz     17,-60(11)
-+_GLOBAL(_restgpr_18_x) lwz     18,-56(11)
-+_GLOBAL(_restgpr_19_x) lwz     19,-52(11)
-+_GLOBAL(_restgpr_20_x) lwz     20,-48(11)
-+_GLOBAL(_restgpr_21_x) lwz     21,-44(11)
-+_GLOBAL(_restgpr_22_x) lwz     22,-40(11)
-+_GLOBAL(_restgpr_23_x) lwz     23,-36(11)
-+_GLOBAL(_restgpr_24_x) lwz     24,-32(11)
-+_GLOBAL(_restgpr_25_x) lwz     25,-28(11)
-+_GLOBAL(_restgpr_26_x) lwz     26,-24(11)
-+_GLOBAL(_restgpr_27_x) lwz     27,-20(11)
-+_GLOBAL(_restgpr_28_x) lwz     28,-16(11)
-+_GLOBAL(_restgpr_29_x) lwz     29,-12(11)
-+_GLOBAL(_restgpr_30_x) lwz     30,-8(11)
-+_GLOBAL(_restgpr_31_x) lwz     0,4(11)
-+                       lwz     31,-4(11)
-+                       mtlr    0
-+                       mr      1,11
-+                       blr
-+#endif
---- a/arch/powerpc/kernel/ppc_ksyms.c
-+++ b/arch/powerpc/kernel/ppc_ksyms.c
-@@ -186,3 +186,114 @@ EXPORT_SYMBOL(__mtdcr);
- EXPORT_SYMBOL(__mfdcr);
- #endif
- EXPORT_SYMBOL(empty_zero_page);
-+
-+#if defined(CONFIG_PPC32) && defined(CONFIG_CC_OPTIMIZE_FOR_SIZE)
-+void _savegpr_14(void);
-+void _savegpr_15(void);
-+void _savegpr_16(void);
-+void _savegpr_17(void);
-+void _savegpr_18(void);
-+void _savegpr_19(void);
-+void _savegpr_20(void);
-+void _savegpr_21(void);
-+void _savegpr_22(void);
-+void _savegpr_23(void);
-+void _savegpr_24(void);
-+void _savegpr_25(void);
-+void _savegpr_26(void);
-+void _savegpr_27(void);
-+void _savegpr_28(void);
-+void _savegpr_29(void);
-+void _savegpr_30(void);
-+void _savegpr_31(void);
-+void _restgpr_14(void);
-+void _restgpr_15(void);
-+void _restgpr_16(void);
-+void _restgpr_17(void);
-+void _restgpr_18(void);
-+void _restgpr_19(void);
-+void _restgpr_20(void);
-+void _restgpr_21(void);
-+void _restgpr_22(void);
-+void _restgpr_23(void);
-+void _restgpr_24(void);
-+void _restgpr_25(void);
-+void _restgpr_26(void);
-+void _restgpr_27(void);
-+void _restgpr_28(void);
-+void _restgpr_29(void);
-+void _restgpr_30(void);
-+void _restgpr_31(void);
-+void _restgpr_14_x(void);
-+void _restgpr_15_x(void);
-+void _restgpr_16_x(void);
-+void _restgpr_17_x(void);
-+void _restgpr_18_x(void);
-+void _restgpr_19_x(void);
-+void _restgpr_20_x(void);
-+void _restgpr_21_x(void);
-+void _restgpr_22_x(void);
-+void _restgpr_23_x(void);
-+void _restgpr_24_x(void);
-+void _restgpr_25_x(void);
-+void _restgpr_26_x(void);
-+void _restgpr_27_x(void);
-+void _restgpr_28_x(void);
-+void _restgpr_29_x(void);
-+void _restgpr_30_x(void);
-+void _restgpr_31_x(void);
-+EXPORT_SYMBOL(_savegpr_14);
-+EXPORT_SYMBOL(_savegpr_15);
-+EXPORT_SYMBOL(_savegpr_16);
-+EXPORT_SYMBOL(_savegpr_17);
-+EXPORT_SYMBOL(_savegpr_18);
-+EXPORT_SYMBOL(_savegpr_19);
-+EXPORT_SYMBOL(_savegpr_20);
-+EXPORT_SYMBOL(_savegpr_21);
-+EXPORT_SYMBOL(_savegpr_22);
-+EXPORT_SYMBOL(_savegpr_23);
-+EXPORT_SYMBOL(_savegpr_24);
-+EXPORT_SYMBOL(_savegpr_25);
-+EXPORT_SYMBOL(_savegpr_26);
-+EXPORT_SYMBOL(_savegpr_27);
-+EXPORT_SYMBOL(_savegpr_28);
-+EXPORT_SYMBOL(_savegpr_29);
-+EXPORT_SYMBOL(_savegpr_30);
-+EXPORT_SYMBOL(_savegpr_31);
-+EXPORT_SYMBOL(_restgpr_14);
-+EXPORT_SYMBOL(_restgpr_15);
-+EXPORT_SYMBOL(_restgpr_16);
-+EXPORT_SYMBOL(_restgpr_17);
-+EXPORT_SYMBOL(_restgpr_18);
-+EXPORT_SYMBOL(_restgpr_19);
-+EXPORT_SYMBOL(_restgpr_20);
-+EXPORT_SYMBOL(_restgpr_21);
-+EXPORT_SYMBOL(_restgpr_22);
-+EXPORT_SYMBOL(_restgpr_23);
-+EXPORT_SYMBOL(_restgpr_24);
-+EXPORT_SYMBOL(_restgpr_25);
-+EXPORT_SYMBOL(_restgpr_26);
-+EXPORT_SYMBOL(_restgpr_27);
-+EXPORT_SYMBOL(_restgpr_28);
-+EXPORT_SYMBOL(_restgpr_29);
-+EXPORT_SYMBOL(_restgpr_30);
-+EXPORT_SYMBOL(_restgpr_31);
-+EXPORT_SYMBOL(_restgpr_14_x);
-+EXPORT_SYMBOL(_restgpr_15_x);
-+EXPORT_SYMBOL(_restgpr_16_x);
-+EXPORT_SYMBOL(_restgpr_17_x);
-+EXPORT_SYMBOL(_restgpr_18_x);
-+EXPORT_SYMBOL(_restgpr_19_x);
-+EXPORT_SYMBOL(_restgpr_20_x);
-+EXPORT_SYMBOL(_restgpr_21_x);
-+EXPORT_SYMBOL(_restgpr_22_x);
-+EXPORT_SYMBOL(_restgpr_23_x);
-+EXPORT_SYMBOL(_restgpr_24_x);
-+EXPORT_SYMBOL(_restgpr_25_x);
-+EXPORT_SYMBOL(_restgpr_26_x);
-+EXPORT_SYMBOL(_restgpr_27_x);
-+EXPORT_SYMBOL(_restgpr_28_x);
-+EXPORT_SYMBOL(_restgpr_29_x);
-+EXPORT_SYMBOL(_restgpr_30_x);
-+EXPORT_SYMBOL(_restgpr_31_x);
-+#endif /* CONFIG_PPC32 && CONFIG_CC_OPTIMIZE_FOR_SIZE */
diff --git a/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch
deleted file mode 100644
index 7ff9c277ab..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/060-block2mtd_init.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -233,10 +234,11 @@ static void block2mtd_free_device(struct
- 
- 
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size)
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
- {
- 	struct block_device *bdev;
- 	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
- 	char *name;
- 
- 	if (!devname)
-@@ -276,13 +278,16 @@ static struct block2mtd_dev *add_device(
- 
- 	/* Setup the MTD structure */
- 	/* make the name contain the block device in */
--	name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
-+	if (!mtdname)
-+		mtdname = devname;
-+	name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- 	if (!name)
- 		goto devinit_err;
- 
-+	strcpy(name, mtdname);
- 	dev->mtd.name = name;
- 
--	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
-+	dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
- 	dev->mtd.erasesize = erase_size;
- 	dev->mtd.writesize = 1;
- 	dev->mtd.type = MTD_RAM;
-@@ -295,14 +300,17 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
- 
--	if (add_mtd_device(&dev->mtd)) {
-+	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+	part->name = dev->mtd.name;
-+	part->offset = 0;
-+	part->size = dev->mtd.size;
-+	if (add_mtd_partitions(&dev->mtd, part, 1)) {
- 		/* Device didnt get added, so free the entry */
- 		goto devinit_err;
- 	}
- 	list_add(&dev->list, &blkmtd_device_list);
- 	INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
--			dev->mtd.name + strlen("block2mtd: "),
--			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
-+			mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
- 	return dev;
- 
- devinit_err:
-@@ -375,9 +383,9 @@ static char block2mtd_paramline[80 + 12]
- 
- static int block2mtd_setup2(const char *val)
- {
--	char buf[80 + 12]; /* 80 for device, 12 for erase size */
-+	char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
- 	char *str = buf;
--	char *token[2];
-+	char *token[3];
- 	char *name;
- 	size_t erase_size = PAGE_SIZE;
- 	int i, ret;
-@@ -388,7 +396,7 @@ static int block2mtd_setup2(const char *
- 	strcpy(str, val);
- 	kill_final_newline(str);
- 
--	for (i = 0; i < 2; i++)
-+	for (i = 0; i < 3; i++)
- 		token[i] = strsep(&str, ",");
- 
- 	if (str)
-@@ -407,8 +415,10 @@ static int block2mtd_setup2(const char *
- 			parse_err("illegal erase size");
- 		}
- 	}
-+	if (token[2] && (strlen(token[2]) + 1 > 80))
-+		parse_err("mtd device name too long");
- 
--	add_device(name, erase_size);
-+	add_device(name, erase_size, token[2]);
- 
- 	return 0;
- }
-@@ -442,7 +452,7 @@ static int block2mtd_setup(const char *v
- 
- 
- module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
--MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
-+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
- 
- static int __init block2mtd_init(void)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -639,6 +639,7 @@ try_scan:
- 	kfree(state);
- 	return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
- 
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch
deleted file mode 100644
index d70d1835a3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/065-rootfs_split.patch
+++ /dev/null
@@ -1,625 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -53,6 +53,16 @@ config MTD_PARTITIONS
- 	  devices. Partitioning on NFTL 'devices' is a different - that's the
- 	  'normal' form of partitioning used on a block device.
- 
-+config MTD_ROOTFS_ROOT_DEV
-+	bool "Automatically set 'rootfs' partition to be root filesystem"
-+	depends on MTD_PARTITIONS
-+	default y
-+
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	depends on MTD_PARTITIONS
-+	default y
-+
- config MTD_REDBOOT_PARTS
- 	tristate "RedBoot partition table parsing"
- 	depends on MTD_PARTITIONS
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -18,6 +18,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/root_dev.h>
-+#include <linux/magic.h>
- 
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
-@@ -35,7 +37,7 @@ struct mtd_part {
-  * the pointer to that structure with this macro.
-  */
- #define PART(x)  ((struct mtd_part *)(x))
--
-+#define IS_PART(mtd) (mtd->read == part_read)
- 
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -503,6 +505,150 @@ out_register:
- 	return slave;
- }
- 
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+#define ROOTFS_SPLIT_NAME "rootfs_data"
-+#define ROOTFS_REMOVED_NAME "<removed>"
-+
-+struct squashfs_super_block {
-+	__le32 s_magic;
-+	__le32 pad0[9];
-+	__le64 bytes_used;
-+};
-+
-+
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	struct squashfs_super_block sb;
-+	int len, ret;
-+
-+	ret = master->read(master, offset, sizeof(sb), &len, (void *) &sb);
-+	if (ret || (len != sizeof(sb))) {
-+		printk(KERN_ALERT "split_squashfs: error occured while reading "
-+			"from \"%s\"\n", master->name);
-+		return -EINVAL;
-+	}
-+
-+	if (SQUASHFS_MAGIC != le32_to_cpu(sb.s_magic) ) {
-+		printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	if (le64_to_cpu((sb.bytes_used)) <= 0) {
-+		printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
-+			master->name);
-+		*split_offset = 0;
-+		return 0;
-+	}
-+
-+	len = (u32) le64_to_cpu(sb.bytes_used);
-+	len += (offset & 0x000fffff);
-+	len +=  (master->erasesize - 1);
-+	len &= ~(master->erasesize - 1);
-+	len -= (offset & 0x000fffff);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static int split_rootfs_data(struct mtd_info *master, struct mtd_info *rpart, const struct mtd_partition *part)
-+{
-+	struct mtd_partition *dpart;
-+	struct mtd_part *slave = NULL;
-+	int split_offset = 0;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return ret;
-+
-+	if (split_offset <= 0)
-+		return 0;
-+
-+	dpart = kmalloc(sizeof(*part)+sizeof(ROOTFS_SPLIT_NAME)+1, GFP_KERNEL);
-+	if (dpart == NULL) {
-+		printk(KERN_INFO "split_squashfs: no memory for partition \"%s\"\n",
-+			ROOTFS_SPLIT_NAME);
-+		return -ENOMEM;
-+	}
-+
-+	memcpy(dpart, part, sizeof(*part));
-+	dpart->name = (unsigned char *)&dpart[1];
-+	strcpy(dpart->name, ROOTFS_SPLIT_NAME);
-+
-+	dpart->size -= split_offset - dpart->offset;
-+	dpart->offset = split_offset;
-+
-+	if (dpart == NULL)
-+		return 1;
-+
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%llX, len=%llX \n",
-+		ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
-+
-+	slave = add_one_partition(master, dpart, 0, split_offset);
-+	if (!slave) {
-+		kfree(dpart);
-+		return -ENOMEM;
-+	}
-+	rpart->split = &slave->mtd;
-+
-+	return 0;
-+}
-+
-+static int refresh_rootfs_split(struct mtd_info *mtd)
-+{
-+	struct mtd_partition tpart;
-+	struct mtd_part *part;
-+	char *name;
-+	//int index = 0;
-+	int offset, size;
-+	int ret;
-+
-+	part = PART(mtd);
-+
-+	/* check for the new squashfs offset first */
-+	ret = split_squashfs(part->master, part->offset, &offset);
-+	if (ret)
-+		return ret;
-+
-+	if ((offset > 0) && !mtd->split) {
-+		printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name);
-+		/* if we don't have a rootfs split partition, create a new one */
-+		tpart.name = (char *) mtd->name;
-+		tpart.size = mtd->size;
-+		tpart.offset = part->offset;
-+
-+		return split_rootfs_data(part->master, &part->mtd, &tpart);
-+	} else if ((offset > 0) && mtd->split) {
-+		/* update the offsets of the existing partition */
-+		size = mtd->size + part->offset - offset;
-+
-+		part = PART(mtd->split);
-+		part->offset = offset;
-+		part->mtd.size = size;
-+		printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n",
-+			__func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"),
-+			(u32) part->offset, (u32) part->mtd.size);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_SPLIT_NAME);
-+		part->mtd.name = name;
-+	} else if ((offset <= 0) && mtd->split) {
-+		printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name);
-+
-+		/* mark existing partition as removed */
-+		part = PART(mtd->split);
-+		name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL);
-+		strcpy(name, ROOTFS_REMOVED_NAME);
-+		part->mtd.name = name;
-+		part->offset = 0;
-+		part->mtd.size = 0;
-+	}
-+
-+	return 0;
-+}
-+#endif /* CONFIG_MTD_ROOTFS_SPLIT */
-+
- /*
-  * This function, given a master MTD object and a partition table, creates
-  * and registers slave MTD objects which are bound to the master according to
-@@ -518,7 +664,7 @@ int add_mtd_partitions(struct mtd_info *
- {
- 	struct mtd_part *slave;
- 	uint64_t cur_offset = 0;
--	int i;
-+	int i, ret;
- 
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
- 
-@@ -526,6 +672,21 @@ int add_mtd_partitions(struct mtd_info *
- 		slave = add_one_partition(master, parts + i, i, cur_offset);
- 		if (!slave)
- 			return -ENOMEM;
-+
-+		if (!strcmp(parts[i].name, "rootfs")) {
-+#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
-+			if (ROOT_DEV == 0) {
-+				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
-+					"set to be root filesystem\n");
-+				ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
-+			}
-+#endif
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+			ret = split_rootfs_data(master, &slave->mtd, &parts[i]);
-+			/* if (ret == 0)
-+				j++; */
-+#endif
-+		}
- 		cur_offset = slave->offset + slave->mtd.size;
- 	}
- 
-@@ -533,6 +694,32 @@ int add_mtd_partitions(struct mtd_info *
- }
- EXPORT_SYMBOL(add_mtd_partitions);
- 
-+int refresh_mtd_partitions(struct mtd_info *mtd)
-+{
-+	int ret = 0;
-+
-+	if (IS_PART(mtd)) {
-+		struct mtd_part *part;
-+		struct mtd_info *master;
-+
-+		part = PART(mtd);
-+		master = part->master;
-+		if (master->refresh_device)
-+			ret = master->refresh_device(master);
-+	}
-+
-+	if (!ret && mtd->refresh_device)
-+		ret = mtd->refresh_device(mtd);
-+
-+#ifdef CONFIG_MTD_ROOTFS_SPLIT
-+	if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs"))
-+		refresh_rootfs_split(mtd);
-+#endif
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(refresh_mtd_partitions);
-+
- static DEFINE_SPINLOCK(part_parser_lock);
- static LIST_HEAD(part_parsers);
- 
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -30,6 +30,8 @@ struct block2mtd_dev {
- 	struct block_device *blkdev;
- 	struct mtd_info mtd;
- 	struct mutex write_mutex;
-+	rwlock_t bdev_mutex;
-+	char devname[0];
- };
- 
- 
-@@ -82,6 +84,12 @@ static int block2mtd_erase(struct mtd_in
- 	size_t len = instr->len;
- 	int err;
- 
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
-+
- 	instr->state = MTD_ERASING;
- 	mutex_lock(&dev->write_mutex);
- 	err = _block2mtd_erase(dev, from, len);
-@@ -94,6 +102,10 @@ static int block2mtd_erase(struct mtd_in
- 
- 	instr->state = MTD_ERASE_DONE;
- 	mtd_erase_callback(instr);
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+
- 	return err;
- }
- 
-@@ -105,10 +117,14 @@ static int block2mtd_read(struct mtd_inf
- 	struct page *page;
- 	int index = from >> PAGE_SHIFT;
- 	int offset = from & (PAGE_SIZE-1);
--	int cpylen;
-+	int cpylen, err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev || (from > mtd->size)) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
--	if (from > mtd->size)
--		return -EINVAL;
- 	if (from + len > mtd->size)
- 		len = mtd->size - from;
- 
-@@ -123,10 +139,14 @@ static int block2mtd_read(struct mtd_inf
- 		len = len - cpylen;
- 
- 		page = page_read(dev->blkdev->bd_inode->i_mapping, index);
--		if (!page)
--			return -ENOMEM;
--		if (IS_ERR(page))
--			return PTR_ERR(page);
-+		if (!page) {
-+			err = -ENOMEM;
-+			goto done;
-+		}
-+		if (IS_ERR(page)) {
-+			err = PTR_ERR(page);
-+			goto done;
-+		}
- 
- 		memcpy(buf, page_address(page) + offset, cpylen);
- 		page_cache_release(page);
-@@ -137,7 +157,10 @@ static int block2mtd_read(struct mtd_inf
- 		offset = 0;
- 		index++;
- 	}
--	return 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
-+	return err;
- }
- 
- 
-@@ -189,12 +212,22 @@ static int block2mtd_write(struct mtd_in
- 		size_t *retlen, const u_char *buf)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	int err;
-+	int err = 0;
-+
-+	read_lock(&dev->bdev_mutex);
-+	if (!dev->blkdev) {
-+		err = -EINVAL;
-+		goto done;
-+	}
- 
- 	if (!len)
--		return 0;
--	if (to >= mtd->size)
--		return -ENOSPC;
-+		goto done;
-+
-+	if (to >= mtd->size) {
-+		err = -ENOSPC;
-+		goto done;
-+	}
-+
- 	if (to + len > mtd->size)
- 		len = mtd->size - to;
- 
-@@ -203,6 +236,9 @@ static int block2mtd_write(struct mtd_in
- 	mutex_unlock(&dev->write_mutex);
- 	if (err > 0)
- 		err = 0;
-+
-+done:
-+	read_unlock(&dev->bdev_mutex);
- 	return err;
- }
- 
-@@ -211,52 +247,29 @@ static int block2mtd_write(struct mtd_in
- static void block2mtd_sync(struct mtd_info *mtd)
- {
- 	struct block2mtd_dev *dev = mtd->priv;
--	sync_blockdev(dev->blkdev);
--	return;
--}
--
--
--static void block2mtd_free_device(struct block2mtd_dev *dev)
--{
--	if (!dev)
--		return;
--
--	kfree(dev->mtd.name);
- 
--	if (dev->blkdev) {
--		invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
--					0, -1);
--		close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
--	}
-+	read_lock(&dev->bdev_mutex);
-+	if (dev->blkdev)
-+		sync_blockdev(dev->blkdev);
-+	read_unlock(&dev->bdev_mutex);
- 
--	kfree(dev);
-+	return;
- }
- 
- 
--/* FIXME: ensure that mtd->size % erase_size == 0 */
--static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
-+static int _open_bdev(struct block2mtd_dev *dev)
- {
- 	struct block_device *bdev;
--	struct block2mtd_dev *dev;
--	struct mtd_partition *part;
--	char *name;
--
--	if (!devname)
--		return NULL;
--
--	dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
--	if (!dev)
--		return NULL;
- 
- 	/* Get a handle on the device */
--	bdev = open_bdev_exclusive(devname, FMODE_READ|FMODE_WRITE, NULL);
-+	bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
- #ifndef MODULE
- 	if (IS_ERR(bdev)) {
- 
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
--		dev_t devt = name_to_dev_t(devname);
-+		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
- 		}
-@@ -264,17 +277,98 @@ static struct block2mtd_dev *add_device(
- #endif
- 
- 	if (IS_ERR(bdev)) {
--		ERROR("error: cannot open device %s", devname);
--		goto devinit_err;
-+		ERROR("error: cannot open device %s", dev->devname);
-+		return 1;
- 	}
- 	dev->blkdev = bdev;
- 
- 	if (MAJOR(bdev->bd_dev) == MTD_BLOCK_MAJOR) {
- 		ERROR("attempting to use an MTD device as a block device");
--		goto devinit_err;
-+		return 1;
- 	}
- 
-+	return 0;
-+}
-+
-+static void _close_bdev(struct block2mtd_dev *dev)
-+{
-+	struct block_device *bdev;
-+
-+	if (!dev->blkdev)
-+		return;
-+
-+	bdev = dev->blkdev;
-+	invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping, 0, -1);
-+	close_bdev_exclusive(dev->blkdev, FMODE_READ|FMODE_WRITE);
-+	dev->blkdev = NULL;
-+}
-+
-+static void block2mtd_free_device(struct block2mtd_dev *dev)
-+{
-+	if (!dev)
-+		return;
-+
-+	kfree(dev->mtd.name);
-+	_close_bdev(dev);
-+	kfree(dev);
-+}
-+
-+
-+static int block2mtd_refresh(struct mtd_info *mtd)
-+{
-+	struct block2mtd_dev *dev = mtd->priv;
-+	struct block_device *bdev;
-+	dev_t devt;
-+	int err = 0;
-+
-+	/* no other mtd function can run at this point */
-+	write_lock(&dev->bdev_mutex);
-+
-+	/* get the device number for the whole disk */
-+	devt = MKDEV(MAJOR(dev->blkdev->bd_dev), 0);
-+
-+	/* close the old block device */
-+	_close_bdev(dev);
-+
-+	/* open the whole disk, issue a partition rescan, then */
-+	bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
-+	if (!bdev || !bdev->bd_disk)
-+		err = -EINVAL;
-+#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
-+	else
-+		err = rescan_partitions(bdev->bd_disk, bdev);
-+#endif
-+	if (bdev)
-+		close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
-+
-+	/* try to open the partition block device again */
-+	_open_bdev(dev);
-+	write_unlock(&dev->bdev_mutex);
-+
-+	return err;
-+}
-+
-+/* FIXME: ensure that mtd->size % erase_size == 0 */
-+static struct block2mtd_dev *add_device(char *devname, int erase_size, char *mtdname)
-+{
-+	struct block2mtd_dev *dev;
-+	struct mtd_partition *part;
-+	char *name;
-+
-+	if (!devname)
-+		return NULL;
-+
-+	dev = kzalloc(sizeof(struct block2mtd_dev) + strlen(devname) + 1, GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	strcpy(dev->devname, devname);
-+
-+	if (_open_bdev(dev))
-+		goto devinit_err;
-+
- 	mutex_init(&dev->write_mutex);
-+	rwlock_init(&dev->bdev_mutex);
- 
- 	if (!mtdname)
- 		mtdname = devname;
-@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
- 	dev->mtd.read = block2mtd_read;
- 	dev->mtd.priv = dev;
- 	dev->mtd.owner = THIS_MODULE;
-+	dev->mtd.refresh_device = block2mtd_refresh;
- 
- 	part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
- 	part->name = dev->mtd.name;
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -18,6 +18,7 @@
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/compatmac.h>
-+#include <linux/mtd/partitions.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
- 		file->f_pos = 0;
- 		break;
- 	}
-+#ifdef CONFIG_MTD_PARTITIONS
-+	case MTDREFRESH:
-+	{
-+		ret = refresh_mtd_partitions(mtd);
-+		break;
-+	}
-+#endif
- 
- 	default:
- 		ret = -ENOTTY;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -101,6 +101,7 @@ struct mtd_oob_ops {
- 	uint8_t		*oobbuf;
- };
- 
-+struct mtd_info;
- struct mtd_info {
- 	u_char type;
- 	uint32_t flags;
-@@ -241,6 +242,9 @@ struct mtd_info {
- 	struct device dev;
- 	int usecount;
- 
-+	int (*refresh_device)(struct mtd_info *mtd);
-+	struct mtd_info *split;
-+
- 	/* If the driver is something smart, like UBI, it may need to maintain
- 	 * its own reference counting. The below functions are only for driver.
- 	 * The driver may register its callbacks. These callbacks are not
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -34,12 +34,14 @@
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
- 
-+struct mtd_partition;
- struct mtd_partition {
- 	char *name;			/* identifier string */
- 	uint64_t size;			/* partition size */
- 	uint64_t offset;		/* offset within the master MTD space */
- 	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */
- 	struct nand_ecclayout *ecclayout;	/* out of band layout for this partition (NAND only)*/
-+	int (*refresh_partition)(struct mtd_info *);
- };
- 
- #define MTDPART_OFS_NXTBLK	(-2)
-@@ -51,6 +53,7 @@ struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
-+int refresh_mtd_partitions(struct mtd_info *);
- 
- /*
-  * Functions dealing with the various ways of partitioning the space
---- a/include/mtd/mtd-abi.h
-+++ b/include/mtd/mtd-abi.h
-@@ -110,6 +110,7 @@ struct otp_info {
- #define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
- #define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
- #define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH		_IO('M', 23)
- 
- /*
-  * Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch b/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch
deleted file mode 100644
index 4cc7ef517c..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/066-block2mtd_probe.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -269,6 +269,7 @@ static int _open_bdev(struct block2mtd_d
- 		/* We might not have rootfs mounted at this point. Try
- 		   to resolve the device name by other means. */
- 
-+		wait_for_device_probe();
- 		dev_t devt = name_to_dev_t(dev->devname);
- 		if (devt) {
- 			bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
diff --git a/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch
deleted file mode 100644
index 6ace83c01a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/070-redboot_space.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
- #endif
- 		names += strlen(names)+1;
- 
--#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 		if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
--			i++;
--			parts[i].offset = parts[i-1].size + parts[i-1].offset;
--			parts[i].size = fl->next->img->flash_base - parts[i].offset;
--			parts[i].name = nullname;
--		}
-+			if (!strcmp(parts[i].name, "rootfs")) {
-+				parts[i].size = fl->next->img->flash_base;
-+				parts[i].size &= ~(master->erasesize - 1);
-+				parts[i].size -= parts[i].offset;
-+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+				nrparts--;
-+			} else {
-+				i++;
-+				parts[i].offset = parts[i-1].size + parts[i-1].offset;
-+				parts[i].size = fl->next->img->flash_base - parts[i].offset;
-+				parts[i].name = nullname;
- #endif
-+			}
-+		}
- 		tmp_fl = fl;
- 		fl = fl->next;
- 		kfree(tmp_fl);
diff --git a/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch
deleted file mode 100644
index f9bc4fe36b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/071-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -11,6 +11,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
-+#define BOARD_CONFIG_PART		"boardconfig"
-+
- struct fis_image_desc {
-     unsigned char name[16];      // Null terminated name
-     uint32_t	  flash_base;    // Address within FLASH of image
-@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
-                              struct mtd_partition **pparts,
-                              unsigned long fis_origin)
- {
-+	unsigned long max_offset = 0;
- 	int nrparts = 0;
- 	struct fis_image_desc *buf;
- 	struct mtd_partition *parts;
-@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
- 		}
- 	}
- #endif
--	parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
-+	parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
- 
- 	if (!parts) {
- 		ret = -ENOMEM;
- 		goto out;
- 	}
- 
--	nullname = (char *)&parts[nrparts];
-+	nullname = (char *)&parts[nrparts + 1];
- #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
- 	if (nulllen > 0) {
- 		strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
- 	}
- #endif
- 	for ( ; i<nrparts; i++) {
-+		if(max_offset < buf[i].flash_base + buf[i].size)
-+			max_offset = buf[i].flash_base + buf[i].size;
- 		parts[i].size = fl->img->size;
- 		parts[i].offset = fl->img->flash_base;
- 		parts[i].name = names;
-@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
- 		fl = fl->next;
- 		kfree(tmp_fl);
- 	}
-+	if(master->size - max_offset >= master->erasesize)
-+	{
-+		parts[nrparts].size = master->size - max_offset;
-+		parts[nrparts].offset = max_offset;
-+		parts[nrparts].name = names;
-+		strcpy(names, BOARD_CONFIG_PART);
-+		nrparts++;
-+	}
- 	ret = nrparts;
- 	*pparts = parts;
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
deleted file mode 100644
index 6ea82d96aa..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/linux/mtd/nand.h
-+++ b/include/linux/mtd/nand.h
-@@ -491,6 +491,7 @@ struct platform_nand_chip {
- 	int			chip_delay;
- 	unsigned int		options;
- 	const char		**part_probe_types;
-+	int			(*chip_fixup)(struct mtd_info *mtd);
- 	void			(*set_parts)(uint64_t size,
- 					struct platform_nand_chip *chip);
- 	void			*priv;
---- a/drivers/mtd/nand/plat_nand.c
-+++ b/drivers/mtd/nand/plat_nand.c
-@@ -91,7 +91,18 @@ static int __devinit plat_nand_probe(str
- 	}
- 
- 	/* Scan to find existance of the device */
--	if (nand_scan(&data->mtd, 1)) {
-+	if (nand_scan_ident(&data->mtd, 1, NULL)) {
-+		res = -ENXIO;
-+		goto out;
-+	}
-+
-+	if (pdata->chip.chip_fixup) {
-+		res = pdata->chip.chip_fixup(&data->mtd);
-+		if (res)
-+			goto out;
-+	}
-+
-+	if (nand_scan_tail(&data->mtd)) {
- 		err = -ENXIO;
- 		goto out;
- 	}
diff --git a/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch
deleted file mode 100644
index 61b822ee88..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/081-mtd_myloader_partition_parser.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -181,6 +181,22 @@ config MTD_AR7_PARTS
- 	---help---
- 	  TI AR7 partitioning support
- 
-+config MTD_MYLOADER_PARTS
-+	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
-+	---help---
-+	  MyLoader is a bootloader which allows the user to define partitions
-+	  in flash devices, by putting a table in the second erase block
-+	  on the device, similar to a partition table. This table gives the 
-+	  offsets and lengths of the user defined partitions.
-+
-+	  If you need code which can detect and parse these tables, and
-+	  register MTD 'partitions' corresponding to each image detected,
-+	  enable this option.
-+
-+	  You will still need the parsing functions to be called by the driver
-+	  for your particular device. It won't happen automatically.
-+
- comment "User Modules And Translation Layers"
- 
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch
deleted file mode 100644
index 13f0a217d4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/082-mtd_info_move_forward_decl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -33,6 +33,7 @@
-  * Note: writeable partitions require their size and offset be
-  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
-  */
-+struct mtd_info;
- 
- struct mtd_partition;
- struct mtd_partition {
-@@ -49,7 +50,6 @@ struct mtd_partition {
- #define MTDPART_SIZ_FULL	(0)
- 
- 
--struct mtd_info;
- 
- int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
- int del_mtd_partitions(struct mtd_info *);
diff --git a/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch b/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch
deleted file mode 100644
index f630059e87..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/083-mtd_fix_nand_correct_data_return_code.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/mtd/nand/nand_ecc.c
-+++ b/drivers/mtd/nand/nand_ecc.c
-@@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b
- 	if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
- 		return 1;	/* error in ecc data; no action needed */
- 
--	printk(KERN_ERR "uncorrectable error : ");
--	return -1;
-+	return -EBADMSG;
- }
- EXPORT_SYMBOL(__nand_correct_data);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index 96a5bd0132..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-+
- 	/* Spansion -- single (large) sector size only, at least
- 	 * for the chips listed here (without boot sectors).
- 	 */
diff --git a/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 9235e6ee16..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
diff --git a/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
deleted file mode 100644
index 293ed8bdb6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
- 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
- 	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
- 
-+	/* Numonyx -- xxxs33b */
-+	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
-+	{ "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
-+	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
-@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
- 	dev_set_drvdata(&spi->dev, flash);
- 
- 	/*
--	 * Atmel and SST serial flash tend to power
-+	 * Atmel, SST and Intel/Numonyx serial flash tend to power
- 	 * up with the software protection bits set
- 	 */
- 
- 	if (info->jedec_id >> 16 == 0x1f ||
-+	    info->jedec_id >> 16 == 0x89 ||
- 	    info->jedec_id >> 16 == 0xbf) {
- 		write_enable(flash);
- 		write_sr(flash, 0);
diff --git a/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
deleted file mode 100644
index 34dfdbd894..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -707,6 +707,7 @@ static const struct spi_device_id m25p_i
- 	{ "w25x80", INFO(0xef3014, 0, 64 * 1024,  16, SECT_4K) },
- 	{ "w25x16", INFO(0xef3015, 0, 64 * 1024,  32, SECT_4K) },
- 	{ "w25x32", INFO(0xef3016, 0, 64 * 1024,  64, SECT_4K) },
-+	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
- 	{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
- 
- 	/* Catalyst / On Semiconductor -- non-JEDEC */
diff --git a/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
deleted file mode 100644
index 7cb4efdffc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -374,9 +374,32 @@ static void cfi_fixup_major_minor(struct
- {
- 	// manufacturers defined in include/linux/mtd/cfi.h
- 
--	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
--	    extp->MajorVersion == '0')
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '0') {
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
- 		extp->MajorVersion = '1';
-+		extp->MinorVersion = '0';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
-+
-+	if (cfi->mfr == CFI_MFR_SAMSUNG &&
-+	    extp->MajorVersion == '3' && extp->MinorVersion == '3') {
-+		printk(KERN_NOTICE "  Newer Samsung flash detected, "
-+		       "should be compatibile with Amd/Fujitsu.\n");
-+
-+		printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
-+		       extp->MajorVersion, extp->MinorVersion);
-+
-+		extp->MajorVersion = '1';	// set to 1.3 (last defined version)
-+		extp->MinorVersion = '3';
-+
-+		printk(" to %c.%c.\n",
-+		       extp->MajorVersion, extp->MinorVersion);
-+	}
- }
- 
- struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
diff --git a/target/linux/generic-2.6/patches-2.6.35/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.35/100-netfilter_layer7_2.21.patch
deleted file mode 100644
index fa1274c3b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/100-netfilter_layer7_2.21.patch
+++ /dev/null
@@ -1,2132 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -0,0 +1,13 @@
-+#ifndef _XT_LAYER7_H
-+#define _XT_LAYER7_H
-+
-+#define MAX_PATTERN_LEN 8192
-+#define MAX_PROTOCOL_LEN 256
-+
-+struct xt_layer7_info {
-+    char protocol[MAX_PROTOCOL_LEN];
-+    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+};
-+
-+#endif /* _XT_LAYER7_H */
---- a/include/net/netfilter/nf_conntrack.h
-+++ b/include/net/netfilter/nf_conntrack.h
-@@ -116,6 +116,22 @@ struct nf_conn {
- 	u_int32_t secmark;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	struct {
-+		/*
-+		 * e.g. "http". NULL before decision. "unknown" after decision
-+		 * if no match.
-+		 */
-+		char *app_proto;
-+		/*
-+		 * application layer data so far. NULL after match decision.
-+		 */
-+		char *app_data;
-+		unsigned int app_data_len;
-+	} layer7;
-+#endif
-+
- 	/* Storage reserved for other modules: */
- 	union nf_conntrack_proto proto;
- 
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -921,6 +921,27 @@ config NETFILTER_XT_MATCH_STATE
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_LAYER7
-+	tristate '"layer7" match support'
-+	depends on NETFILTER_XTABLES
-+	depends on EXPERIMENTAL && (IP_NF_CONNTRACK || NF_CONNTRACK)
-+       depends on NF_CT_ACCT
-+	help
-+	  Say Y if you want to be able to classify connections (and their
-+	  packets) based on regular expression matching of their application
-+	  layer data.   This is one way to classify applications such as
-+	  peer-to-peer filesharing systems that do not always use the same
-+	  port.
-+
-+	  To compile it as a module, choose M here.  If unsure, say N.
-+
-+config NETFILTER_XT_MATCH_LAYER7_DEBUG
-+        bool 'Layer 7 debugging output'
-+        depends on NETFILTER_XT_MATCH_LAYER7
-+        help
-+          Say Y to get lots of debugging output.
-+
-+
- config NETFILTER_XT_MATCH_STATISTIC
- 	tristate '"statistic" match support'
- 	depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -91,6 +91,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
- obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_LAYER7) += xt_layer7.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
---- a/net/netfilter/nf_conntrack_core.c
-+++ b/net/netfilter/nf_conntrack_core.c
-@@ -202,6 +202,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
- 	nf_ct_remove_expectations(ct);
- 
-+	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto)
-+		kfree(ct->layer7.app_proto);
-+	if(ct->layer7.app_data)
-+	kfree(ct->layer7.app_data);
-+	#endif
-+
-+
- 	/* We overload first tuple to link into unconfirmed list. */
- 	if (!nf_ct_is_confirmed(ct)) {
- 		BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
---- a/net/netfilter/nf_conntrack_standalone.c
-+++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -178,6 +178,12 @@ static int ct_seq_show(struct seq_file *
- 		goto release;
- #endif
- 
-+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
-+	if(ct->layer7.app_proto &&
-+           seq_printf(s, "l7proto=%s ", ct->layer7.app_proto))
-+		return -ENOSPC;
-+#endif
-+
- 	if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- 		goto release;
- 
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.c
-@@ -0,0 +1,1197 @@
-+/*
-+ * regcomp and regexec -- regsub and regerror are elsewhere
-+ * @(#)regexp.c	1.3 of 18 April 87
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ * Beware that some of this code is subtly aware of the way operator
-+ * precedence is structured in regular expressions.  Serious changes in
-+ * regular-expression syntax might require a total rethink.
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ * Modified slightly by Matthew Strait to use more modern C.
-+ */
-+
-+#include "regexp.h"
-+#include "regmagic.h"
-+
-+/* added by ethan and matt.  Lets it work in both kernel and user space.
-+(So iptables can use it, for instance.)  Yea, it goes both ways... */
-+#if __KERNEL__
-+  #define malloc(foo) kmalloc(foo,GFP_ATOMIC)
-+#else
-+  #define printk(format,args...) printf(format,##args)
-+#endif
-+
-+void regerror(char * s)
-+{
-+        printk("<3>Regexp: %s\n", s);
-+        /* NOTREACHED */
-+}
-+
-+/*
-+ * The "internal use only" fields in regexp.h are present to pass info from
-+ * compile to execute that permits the execute phase to run lots faster on
-+ * simple cases.  They are:
-+ *
-+ * regstart	char that must begin a match; '\0' if none obvious
-+ * reganch	is the match anchored (at beginning-of-line only)?
-+ * regmust	string (pointer into program) that match must include, or NULL
-+ * regmlen	length of regmust string
-+ *
-+ * Regstart and reganch permit very fast decisions on suitable starting points
-+ * for a match, cutting down the work a lot.  Regmust permits fast rejection
-+ * of lines that cannot possibly match.  The regmust tests are costly enough
-+ * that regcomp() supplies a regmust only if the r.e. contains something
-+ * potentially expensive (at present, the only such thing detected is * or +
-+ * at the start of the r.e., which can involve a lot of backup).  Regmlen is
-+ * supplied because the test in regexec() needs it and regcomp() is computing
-+ * it anyway.
-+ */
-+
-+/*
-+ * Structure for regexp "program".  This is essentially a linear encoding
-+ * of a nondeterministic finite-state machine (aka syntax charts or
-+ * "railroad normal form" in parsing technology).  Each node is an opcode
-+ * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
-+ * all nodes except BRANCH implement concatenation; a "next" pointer with
-+ * a BRANCH on both ends of it is connecting two alternatives.  (Here we
-+ * have one of the subtle syntax dependencies:  an individual BRANCH (as
-+ * opposed to a collection of them) is never concatenated with anything
-+ * because of operator precedence.)  The operand of some types of node is
-+ * a literal string; for others, it is a node leading into a sub-FSM.  In
-+ * particular, the operand of a BRANCH node is the first node of the branch.
-+ * (NB this is *not* a tree structure:  the tail of the branch connects
-+ * to the thing following the set of BRANCHes.)  The opcodes are:
-+ */
-+
-+/* definition	number	opnd?	meaning */
-+#define	END	0	/* no	End of program. */
-+#define	BOL	1	/* no	Match "" at beginning of line. */
-+#define	EOL	2	/* no	Match "" at end of line. */
-+#define	ANY	3	/* no	Match any one character. */
-+#define	ANYOF	4	/* str	Match any character in this string. */
-+#define	ANYBUT	5	/* str	Match any character not in this string. */
-+#define	BRANCH	6	/* node	Match this alternative, or the next... */
-+#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-+#define	EXACTLY	8	/* str	Match this string. */
-+#define	NOTHING	9	/* no	Match empty string. */
-+#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-+#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-+#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-+			/*	OPEN+1 is number 1, etc. */
-+#define	CLOSE	30	/* no	Analogous to OPEN. */
-+
-+/*
-+ * Opcode notes:
-+ *
-+ * BRANCH	The set of branches constituting a single choice are hooked
-+ *		together with their "next" pointers, since precedence prevents
-+ *		anything being concatenated to any individual branch.  The
-+ *		"next" pointer of the last BRANCH in a choice points to the
-+ *		thing following the whole choice.  This is also where the
-+ *		final "next" pointer of each individual branch points; each
-+ *		branch starts with the operand node of a BRANCH node.
-+ *
-+ * BACK		Normal "next" pointers all implicitly point forward; BACK
-+ *		exists to make loop structures possible.
-+ *
-+ * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
-+ *		BRANCH structures using BACK.  Simple cases (one character
-+ *		per match) are implemented with STAR and PLUS for speed
-+ *		and to minimize recursive plunges.
-+ *
-+ * OPEN,CLOSE	...are numbered at compile time.
-+ */
-+
-+/*
-+ * A node is one char of opcode followed by two chars of "next" pointer.
-+ * "Next" pointers are stored as two 8-bit pieces, high order first.  The
-+ * value is a positive offset from the opcode of the node containing it.
-+ * An operand, if any, simply follows the node.  (Note that much of the
-+ * code generation knows about this implicit relationship.)
-+ *
-+ * Using two bytes for the "next" pointer is vast overkill for most things,
-+ * but allows patterns to get big without disasters.
-+ */
-+#define	OP(p)	(*(p))
-+#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-+#define	OPERAND(p)	((p) + 3)
-+
-+/*
-+ * See regmagic.h for one further detail of program structure.
-+ */
-+
-+
-+/*
-+ * Utility definitions.
-+ */
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#define	FAIL(m)	{ regerror(m); return(NULL); }
-+#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-+#define	META	"^$.[()|?+*\\"
-+
-+/*
-+ * Flags to be passed up and down.
-+ */
-+#define	HASWIDTH	01	/* Known never to match null string. */
-+#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-+#define	SPSTART		04	/* Starts with * or +. */
-+#define	WORST		0	/* Worst case. */
-+
-+/*
-+ * Global work variables for regcomp().
-+ */
-+struct match_globals {
-+char *reginput;		/* String-input pointer. */
-+char *regbol;		/* Beginning of input, for ^ check. */
-+char **regstartp;	/* Pointer to startp array. */
-+char **regendp;		/* Ditto for endp. */
-+char *regparse;		/* Input-scan pointer. */
-+int regnpar;		/* () count. */
-+char regdummy;
-+char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-+long regsize;		/* Code size. */
-+};
-+
-+/*
-+ * Forward declarations for regcomp()'s friends.
-+ */
-+#ifndef STATIC
-+#define	STATIC	static
-+#endif
-+STATIC char *reg(struct match_globals *g, int paren,int *flagp);
-+STATIC char *regbranch(struct match_globals *g, int *flagp);
-+STATIC char *regpiece(struct match_globals *g, int *flagp);
-+STATIC char *regatom(struct match_globals *g, int *flagp);
-+STATIC char *regnode(struct match_globals *g, char op);
-+STATIC char *regnext(struct match_globals *g, char *p);
-+STATIC void regc(struct match_globals *g, char b);
-+STATIC void reginsert(struct match_globals *g, char op, char *opnd);
-+STATIC void regtail(struct match_globals *g, char *p, char *val);
-+STATIC void regoptail(struct match_globals *g, char *p, char *val);
-+
-+
-+__kernel_size_t my_strcspn(const char *s1,const char *s2)
-+{
-+        char *scan1;
-+        char *scan2;
-+        int count;
-+
-+        count = 0;
-+        for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) {
-+                for (scan2 = (char *)s2; *scan2 != '\0';)       /* ++ moved down. */
-+                        if (*scan1 == *scan2++)
-+                                return(count);
-+                count++;
-+        }
-+        return(count);
-+}
-+
-+/*
-+ - regcomp - compile a regular expression into internal code
-+ *
-+ * We can't allocate space until we know how big the compiled form will be,
-+ * but we can't compile it (and thus know how big it is) until we've got a
-+ * place to put the code.  So we cheat:  we compile it twice, once with code
-+ * generation turned off and size counting turned on, and once "for real".
-+ * This also means that we don't allocate space until we are sure that the
-+ * thing really will compile successfully, and we never have to move the
-+ * code and thus invalidate pointers into it.  (Note that it has to be in
-+ * one piece because free() must be able to free it all.)
-+ *
-+ * Beware that the optimization-preparation code in here knows about some
-+ * of the structure of the compiled regexp.
-+ */
-+regexp *
-+regcomp(char *exp,int *patternsize)
-+{
-+	register regexp *r;
-+	register char *scan;
-+	register char *longest;
-+	register int len;
-+	int flags;
-+	struct match_globals g;
-+	
-+	/* commented out by ethan
-+	   extern char *malloc();
-+	*/
-+
-+	if (exp == NULL)
-+		FAIL("NULL argument");
-+
-+	/* First pass: determine size, legality. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regsize = 0L;
-+	g.regcode = &g.regdummy;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Small enough for pointer-storage convention? */
-+	if (g.regsize >= 32767L)		/* Probably could be 65535L. */
-+		FAIL("regexp too big");
-+
-+	/* Allocate space. */
-+	*patternsize=sizeof(regexp) + (unsigned)g.regsize;
-+	r = (regexp *)malloc(sizeof(regexp) + (unsigned)g.regsize);
-+	if (r == NULL)
-+		FAIL("out of space");
-+
-+	/* Second pass: emit code. */
-+	g.regparse = exp;
-+	g.regnpar = 1;
-+	g.regcode = r->program;
-+	regc(&g, MAGIC);
-+	if (reg(&g, 0, &flags) == NULL)
-+		return(NULL);
-+
-+	/* Dig out information for optimizations. */
-+	r->regstart = '\0';	/* Worst-case defaults. */
-+	r->reganch = 0;
-+	r->regmust = NULL;
-+	r->regmlen = 0;
-+	scan = r->program+1;			/* First BRANCH. */
-+	if (OP(regnext(&g, scan)) == END) {		/* Only one top-level choice. */
-+		scan = OPERAND(scan);
-+
-+		/* Starting-point info. */
-+		if (OP(scan) == EXACTLY)
-+			r->regstart = *OPERAND(scan);
-+		else if (OP(scan) == BOL)
-+			r->reganch++;
-+
-+		/*
-+		 * If there's something expensive in the r.e., find the
-+		 * longest literal string that must appear and make it the
-+		 * regmust.  Resolve ties in favor of later strings, since
-+		 * the regstart check works with the beginning of the r.e.
-+		 * and avoiding duplication strengthens checking.  Not a
-+		 * strong reason, but sufficient in the absence of others.
-+		 */
-+		if (flags&SPSTART) {
-+			longest = NULL;
-+			len = 0;
-+			for (; scan != NULL; scan = regnext(&g, scan))
-+				if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) {
-+					longest = OPERAND(scan);
-+					len = strlen(OPERAND(scan));
-+				}
-+			r->regmust = longest;
-+			r->regmlen = len;
-+		}
-+	}
-+
-+	return(r);
-+}
-+
-+/*
-+ - reg - regular expression, i.e. main body or parenthesized thing
-+ *
-+ * Caller must absorb opening parenthesis.
-+ *
-+ * Combining parenthesis handling with the base level of regular expression
-+ * is a trifle forced, but the need to tie the tails of the branches to what
-+ * follows makes it hard to avoid.
-+ */
-+static char *
-+reg(struct match_globals *g, int paren, int *flagp /* Parenthesized? */ )
-+{
-+	register char *ret;
-+	register char *br;
-+	register char *ender;
-+	register int parno = 0; /* 0 makes gcc happy */
-+	int flags;
-+
-+	*flagp = HASWIDTH;	/* Tentatively. */
-+
-+	/* Make an OPEN node, if parenthesized. */
-+	if (paren) {
-+		if (g->regnpar >= NSUBEXP)
-+			FAIL("too many ()");
-+		parno = g->regnpar;
-+		g->regnpar++;
-+		ret = regnode(g, OPEN+parno);
-+	} else
-+		ret = NULL;
-+
-+	/* Pick up the branches, linking them together. */
-+	br = regbranch(g, &flags);
-+	if (br == NULL)
-+		return(NULL);
-+	if (ret != NULL)
-+		regtail(g, ret, br);	/* OPEN -> first. */
-+	else
-+		ret = br;
-+	if (!(flags&HASWIDTH))
-+		*flagp &= ~HASWIDTH;
-+	*flagp |= flags&SPSTART;
-+	while (*g->regparse == '|') {
-+		g->regparse++;
-+		br = regbranch(g, &flags);
-+		if (br == NULL)
-+			return(NULL);
-+		regtail(g, ret, br);	/* BRANCH -> BRANCH. */
-+		if (!(flags&HASWIDTH))
-+			*flagp &= ~HASWIDTH;
-+		*flagp |= flags&SPSTART;
-+	}
-+
-+	/* Make a closing node, and hook it on the end. */
-+	ender = regnode(g, (paren) ? CLOSE+parno : END);	
-+	regtail(g, ret, ender);
-+
-+	/* Hook the tails of the branches to the closing node. */
-+	for (br = ret; br != NULL; br = regnext(g, br))
-+		regoptail(g, br, ender);
-+
-+	/* Check for proper termination. */
-+	if (paren && *g->regparse++ != ')') {
-+		FAIL("unmatched ()");
-+	} else if (!paren && *g->regparse != '\0') {
-+		if (*g->regparse == ')') {
-+			FAIL("unmatched ()");
-+		} else
-+			FAIL("junk on end");	/* "Can't happen". */
-+		/* NOTREACHED */
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regbranch - one alternative of an | operator
-+ *
-+ * Implements the concatenation operator.
-+ */
-+static char *
-+regbranch(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char *chain;
-+	register char *latest;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	ret = regnode(g, BRANCH);
-+	chain = NULL;
-+	while (*g->regparse != '\0' && *g->regparse != '|' && *g->regparse != ')') {
-+		latest = regpiece(g, &flags);
-+		if (latest == NULL)
-+			return(NULL);
-+		*flagp |= flags&HASWIDTH;
-+		if (chain == NULL)	/* First piece. */
-+			*flagp |= flags&SPSTART;
-+		else
-+			regtail(g, chain, latest);
-+		chain = latest;
-+	}
-+	if (chain == NULL)	/* Loop ran zero times. */
-+		(void) regnode(g, NOTHING);
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regpiece - something followed by possible [*+?]
-+ *
-+ * Note that the branching code sequences used for ? and the general cases
-+ * of * and + are somewhat optimized:  they use the same NOTHING node as
-+ * both the endmarker for their branch list and the body of the last branch.
-+ * It might seem that this node could be dispensed with entirely, but the
-+ * endmarker role is not redundant.
-+ */
-+static char *
-+regpiece(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	register char op;
-+	register char *next;
-+	int flags;
-+
-+	ret = regatom(g, &flags);
-+	if (ret == NULL)
-+		return(NULL);
-+
-+	op = *g->regparse;
-+	if (!ISMULT(op)) {
-+		*flagp = flags;
-+		return(ret);
-+	}
-+
-+	if (!(flags&HASWIDTH) && op != '?')
-+		FAIL("*+ operand could be empty");
-+	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-+
-+	if (op == '*' && (flags&SIMPLE))
-+		reginsert(g, STAR, ret);
-+	else if (op == '*') {
-+		/* Emit x* as (x&|), where & means "self". */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regoptail(g, ret, regnode(g, BACK));		/* and loop */
-+		regoptail(g, ret, ret);			/* back */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '+' && (flags&SIMPLE))
-+		reginsert(g, PLUS, ret);
-+	else if (op == '+') {
-+		/* Emit x+ as x(&|), where & means "self". */
-+		next = regnode(g, BRANCH);			/* Either */
-+		regtail(g, ret, next);
-+		regtail(g, regnode(g, BACK), ret);		/* loop back */
-+		regtail(g, next, regnode(g, BRANCH));		/* or */
-+		regtail(g, ret, regnode(g, NOTHING));		/* null. */
-+	} else if (op == '?') {
-+		/* Emit x? as (x|) */
-+		reginsert(g, BRANCH, ret);			/* Either x */
-+		regtail(g, ret, regnode(g, BRANCH));		/* or */
-+		next = regnode(g, NOTHING);		/* null. */
-+		regtail(g, ret, next);
-+		regoptail(g, ret, next);
-+	}
-+	g->regparse++;
-+	if (ISMULT(*g->regparse))
-+		FAIL("nested *?+");
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regatom - the lowest level
-+ *
-+ * Optimization:  gobbles an entire sequence of ordinary characters so that
-+ * it can turn them into a single node, which is smaller to store and
-+ * faster to run.  Backslashed characters are exceptions, each becoming a
-+ * separate node; the code is simpler that way and it's not worth fixing.
-+ */
-+static char *
-+regatom(struct match_globals *g, int *flagp)
-+{
-+	register char *ret;
-+	int flags;
-+
-+	*flagp = WORST;		/* Tentatively. */
-+
-+	switch (*g->regparse++) {
-+	case '^':
-+		ret = regnode(g, BOL);
-+		break;
-+	case '$':
-+		ret = regnode(g, EOL);
-+		break;
-+	case '.':
-+		ret = regnode(g, ANY);
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	case '[': {
-+			register int class;
-+			register int classend;
-+
-+			if (*g->regparse == '^') {	/* Complement of range. */
-+				ret = regnode(g, ANYBUT);
-+				g->regparse++;
-+			} else
-+				ret = regnode(g, ANYOF);
-+			if (*g->regparse == ']' || *g->regparse == '-')
-+				regc(g, *g->regparse++);
-+			while (*g->regparse != '\0' && *g->regparse != ']') {
-+				if (*g->regparse == '-') {
-+					g->regparse++;
-+					if (*g->regparse == ']' || *g->regparse == '\0')
-+						regc(g, '-');
-+					else {
-+						class = UCHARAT(g->regparse-2)+1;
-+						classend = UCHARAT(g->regparse);
-+						if (class > classend+1)
-+							FAIL("invalid [] range");
-+						for (; class <= classend; class++)
-+							regc(g, class);
-+						g->regparse++;
-+					}
-+				} else
-+					regc(g, *g->regparse++);
-+			}
-+			regc(g, '\0');
-+			if (*g->regparse != ']')
-+				FAIL("unmatched []");
-+			g->regparse++;
-+			*flagp |= HASWIDTH|SIMPLE;
-+		}
-+		break;
-+	case '(':
-+		ret = reg(g, 1, &flags);
-+		if (ret == NULL)
-+			return(NULL);
-+		*flagp |= flags&(HASWIDTH|SPSTART);
-+		break;
-+	case '\0':
-+	case '|':
-+	case ')':
-+		FAIL("internal urp");	/* Supposed to be caught earlier. */
-+		break;
-+	case '?':
-+	case '+':
-+	case '*':
-+		FAIL("?+* follows nothing");
-+		break;
-+	case '\\':
-+		if (*g->regparse == '\0')
-+			FAIL("trailing \\");
-+		ret = regnode(g, EXACTLY);
-+		regc(g, *g->regparse++);
-+		regc(g, '\0');
-+		*flagp |= HASWIDTH|SIMPLE;
-+		break;
-+	default: {
-+			register int len;
-+			register char ender;
-+
-+			g->regparse--;
-+			len = my_strcspn((const char *)g->regparse, (const char *)META);
-+			if (len <= 0)
-+				FAIL("internal disaster");
-+			ender = *(g->regparse+len);
-+			if (len > 1 && ISMULT(ender))
-+				len--;		/* Back off clear of ?+* operand. */
-+			*flagp |= HASWIDTH;
-+			if (len == 1)
-+				*flagp |= SIMPLE;
-+			ret = regnode(g, EXACTLY);
-+			while (len > 0) {
-+				regc(g, *g->regparse++);
-+				len--;
-+			}
-+			regc(g, '\0');
-+		}
-+		break;
-+	}
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regnode - emit a node
-+ */
-+static char *			/* Location. */
-+regnode(struct match_globals *g, char op)
-+{
-+	register char *ret;
-+	register char *ptr;
-+
-+	ret = g->regcode;
-+	if (ret == &g->regdummy) {
-+		g->regsize += 3;
-+		return(ret);
-+	}
-+
-+	ptr = ret;
-+	*ptr++ = op;
-+	*ptr++ = '\0';		/* Null "next" pointer. */
-+	*ptr++ = '\0';
-+	g->regcode = ptr;
-+
-+	return(ret);
-+}
-+
-+/*
-+ - regc - emit (if appropriate) a byte of code
-+ */
-+static void
-+regc(struct match_globals *g, char b)
-+{
-+	if (g->regcode != &g->regdummy)
-+		*g->regcode++ = b;
-+	else
-+		g->regsize++;
-+}
-+
-+/*
-+ - reginsert - insert an operator in front of already-emitted operand
-+ *
-+ * Means relocating the operand.
-+ */
-+static void
-+reginsert(struct match_globals *g, char op, char* opnd)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char *place;
-+
-+	if (g->regcode == &g->regdummy) {
-+		g->regsize += 3;
-+		return;
-+	}
-+
-+	src = g->regcode;
-+	g->regcode += 3;
-+	dst = g->regcode;
-+	while (src > opnd)
-+		*--dst = *--src;
-+
-+	place = opnd;		/* Op node, where operand used to be. */
-+	*place++ = op;
-+	*place++ = '\0';
-+	*place++ = '\0';
-+}
-+
-+/*
-+ - regtail - set the next-pointer at the end of a node chain
-+ */
-+static void
-+regtail(struct match_globals *g, char *p, char *val)
-+{
-+	register char *scan;
-+	register char *temp;
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return;
-+
-+	/* Find last node. */
-+	scan = p;
-+	for (;;) {
-+		temp = regnext(g, scan);
-+		if (temp == NULL)
-+			break;
-+		scan = temp;
-+	}
-+
-+	if (OP(scan) == BACK)
-+		offset = scan - val;
-+	else
-+		offset = val - scan;
-+	*(scan+1) = (offset>>8)&0377;
-+	*(scan+2) = offset&0377;
-+}
-+
-+/*
-+ - regoptail - regtail on operand of first argument; nop if operandless
-+ */
-+static void
-+regoptail(struct match_globals *g, char *p, char *val)
-+{
-+	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-+	if (p == NULL || p == &g->regdummy || OP(p) != BRANCH)
-+		return;
-+	regtail(g, OPERAND(p), val);
-+}
-+
-+/*
-+ * regexec and friends
-+ */
-+
-+
-+/*
-+ * Forwards.
-+ */
-+STATIC int regtry(struct match_globals *g, regexp *prog, char *string);
-+STATIC int regmatch(struct match_globals *g, char *prog);
-+STATIC int regrepeat(struct match_globals *g, char *p);
-+
-+#ifdef DEBUG
-+int regnarrate = 0;
-+void regdump();
-+STATIC char *regprop(char *op);
-+#endif
-+
-+/*
-+ - regexec - match a regexp against a string
-+ */
-+int
-+regexec(regexp *prog, char *string)
-+{
-+	register char *s;
-+	struct match_globals g;
-+
-+	/* Be paranoid... */
-+	if (prog == NULL || string == NULL) {
-+		printk("<3>Regexp: NULL parameter\n");
-+		return(0);
-+	}
-+
-+	/* Check validity of program. */
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		printk("<3>Regexp: corrupted program\n");
-+		return(0);
-+	}
-+
-+	/* If there is a "must appear" string, look for it. */
-+	if (prog->regmust != NULL) {
-+		s = string;
-+		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-+			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-+				break;	/* Found it. */
-+			s++;
-+		}
-+		if (s == NULL)	/* Not present. */
-+			return(0);
-+	}
-+
-+	/* Mark beginning of line for ^ . */
-+	g.regbol = string;
-+
-+	/* Simplest case:  anchored match need be tried only once. */
-+	if (prog->reganch)
-+		return(regtry(&g, prog, string));
-+
-+	/* Messy cases:  unanchored match. */
-+	s = string;
-+	if (prog->regstart != '\0')
-+		/* We know what char it must start with. */
-+		while ((s = strchr(s, prog->regstart)) != NULL) {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+			s++;
-+		}
-+	else
-+		/* We don't -- general case. */
-+		do {
-+			if (regtry(&g, prog, s))
-+				return(1);
-+		} while (*s++ != '\0');
-+
-+	/* Failure. */
-+	return(0);
-+}
-+
-+/*
-+ - regtry - try match at specific point
-+ */
-+static int			/* 0 failure, 1 success */
-+regtry(struct match_globals *g, regexp *prog, char *string)
-+{
-+	register int i;
-+	register char **sp;
-+	register char **ep;
-+
-+	g->reginput = string;
-+	g->regstartp = prog->startp;
-+	g->regendp = prog->endp;
-+
-+	sp = prog->startp;
-+	ep = prog->endp;
-+	for (i = NSUBEXP; i > 0; i--) {
-+		*sp++ = NULL;
-+		*ep++ = NULL;
-+	}
-+	if (regmatch(g, prog->program + 1)) {
-+		prog->startp[0] = string;
-+		prog->endp[0] = g->reginput;
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+/*
-+ - regmatch - main matching routine
-+ *
-+ * Conceptually the strategy is simple:  check to see whether the current
-+ * node matches, call self recursively to see whether the rest matches,
-+ * and then act accordingly.  In practice we make some effort to avoid
-+ * recursion, in particular by going through "ordinary" nodes (that don't
-+ * need to know whether the rest of the match failed) by a loop instead of
-+ * by recursion.
-+ */
-+static int			/* 0 failure, 1 success */
-+regmatch(struct match_globals *g, char *prog)
-+{
-+	register char *scan = prog; /* Current node. */
-+	char *next;		    /* Next node. */
-+
-+#ifdef DEBUG
-+	if (scan != NULL && regnarrate)
-+		fprintf(stderr, "%s(\n", regprop(scan));
-+#endif
-+	while (scan != NULL) {
-+#ifdef DEBUG
-+		if (regnarrate)
-+			fprintf(stderr, "%s...\n", regprop(scan));
-+#endif
-+		next = regnext(g, scan);
-+
-+		switch (OP(scan)) {
-+		case BOL:
-+			if (g->reginput != g->regbol)
-+				return(0);
-+			break;
-+		case EOL:
-+			if (*g->reginput != '\0')
-+				return(0);
-+			break;
-+		case ANY:
-+			if (*g->reginput == '\0')
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case EXACTLY: {
-+				register int len;
-+				register char *opnd;
-+
-+				opnd = OPERAND(scan);
-+				/* Inline the first character, for speed. */
-+				if (*opnd != *g->reginput)
-+					return(0);
-+				len = strlen(opnd);
-+				if (len > 1 && strncmp(opnd, g->reginput, len) != 0)
-+					return(0);
-+				g->reginput += len;
-+			}
-+			break;
-+		case ANYOF:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) == NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case ANYBUT:
-+			if (*g->reginput == '\0' || strchr(OPERAND(scan), *g->reginput) != NULL)
-+				return(0);
-+			g->reginput++;
-+			break;
-+		case NOTHING:
-+		case BACK:
-+			break;
-+		case OPEN+1:
-+		case OPEN+2:
-+		case OPEN+3:
-+		case OPEN+4:
-+		case OPEN+5:
-+		case OPEN+6:
-+		case OPEN+7:
-+		case OPEN+8:
-+		case OPEN+9: {
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - OPEN;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set startp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regstartp[no] == NULL)
-+						g->regstartp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case CLOSE+1:
-+		case CLOSE+2:
-+		case CLOSE+3:
-+		case CLOSE+4:
-+		case CLOSE+5:
-+		case CLOSE+6:
-+		case CLOSE+7:
-+		case CLOSE+8:
-+		case CLOSE+9:
-+			{
-+				register int no;
-+				register char *save;
-+
-+				no = OP(scan) - CLOSE;
-+				save = g->reginput;
-+
-+				if (regmatch(g, next)) {
-+					/*
-+					 * Don't set endp if some later
-+					 * invocation of the same parentheses
-+					 * already has.
-+					 */
-+					if (g->regendp[no] == NULL)
-+						g->regendp[no] = save;
-+					return(1);
-+				} else
-+					return(0);
-+			}
-+			break;
-+		case BRANCH: {
-+				register char *save;
-+
-+				if (OP(next) != BRANCH)		/* No choice. */
-+					next = OPERAND(scan);	/* Avoid recursion. */
-+				else {
-+					do {
-+						save = g->reginput;
-+						if (regmatch(g, OPERAND(scan)))
-+							return(1);
-+						g->reginput = save;
-+						scan = regnext(g, scan);
-+					} while (scan != NULL && OP(scan) == BRANCH);
-+					return(0);
-+					/* NOTREACHED */
-+				}
-+			}
-+			break;
-+		case STAR:
-+		case PLUS: {
-+				register char nextch;
-+				register int no;
-+				register char *save;
-+				register int min;
-+
-+				/*
-+				 * Lookahead to avoid useless match attempts
-+				 * when we know what character comes next.
-+				 */
-+				nextch = '\0';
-+				if (OP(next) == EXACTLY)
-+					nextch = *OPERAND(next);
-+				min = (OP(scan) == STAR) ? 0 : 1;
-+				save = g->reginput;
-+				no = regrepeat(g, OPERAND(scan));
-+				while (no >= min) {
-+					/* If it could work, try it. */
-+					if (nextch == '\0' || *g->reginput == nextch)
-+						if (regmatch(g, next))
-+							return(1);
-+					/* Couldn't or didn't -- back up. */
-+					no--;
-+					g->reginput = save + no;
-+				}
-+				return(0);
-+			}
-+			break;
-+		case END:
-+			return(1);	/* Success! */
-+			break;
-+		default:
-+			printk("<3>Regexp: memory corruption\n");
-+			return(0);
-+			break;
-+		}
-+
-+		scan = next;
-+	}
-+
-+	/*
-+	 * We get here only if there's trouble -- normally "case END" is
-+	 * the terminating point.
-+	 */
-+	printk("<3>Regexp: corrupted pointers\n");
-+	return(0);
-+}
-+
-+/*
-+ - regrepeat - repeatedly match something simple, report how many
-+ */
-+static int
-+regrepeat(struct match_globals *g, char *p)
-+{
-+	register int count = 0;
-+	register char *scan;
-+	register char *opnd;
-+
-+	scan = g->reginput;
-+	opnd = OPERAND(p);
-+	switch (OP(p)) {
-+	case ANY:
-+		count = strlen(scan);
-+		scan += count;
-+		break;
-+	case EXACTLY:
-+		while (*opnd == *scan) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYOF:
-+		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	case ANYBUT:
-+		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-+			count++;
-+			scan++;
-+		}
-+		break;
-+	default:		/* Oh dear.  Called inappropriately. */
-+		printk("<3>Regexp: internal foulup\n");
-+		count = 0;	/* Best compromise. */
-+		break;
-+	}
-+	g->reginput = scan;
-+
-+	return(count);
-+}
-+
-+/*
-+ - regnext - dig the "next" pointer out of a node
-+ */
-+static char*
-+regnext(struct match_globals *g, char *p)
-+{
-+	register int offset;
-+
-+	if (p == &g->regdummy)
-+		return(NULL);
-+
-+	offset = NEXT(p);
-+	if (offset == 0)
-+		return(NULL);
-+
-+	if (OP(p) == BACK)
-+		return(p-offset);
-+	else
-+		return(p+offset);
-+}
-+
-+#ifdef DEBUG
-+
-+STATIC char *regprop();
-+
-+/*
-+ - regdump - dump a regexp onto stdout in vaguely comprehensible form
-+ */
-+void
-+regdump(regexp *r)
-+{
-+	register char *s;
-+	register char op = EXACTLY;	/* Arbitrary non-END op. */
-+	register char *next;
-+	/* extern char *strchr(); */
-+
-+
-+	s = r->program + 1;
-+	while (op != END) {	/* While that wasn't END last time... */
-+		op = OP(s);
-+		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-+		next = regnext(s);
-+		if (next == NULL)		/* Next ptr. */
-+			printf("(0)");
-+		else
-+			printf("(%d)", (s-r->program)+(next-s));
-+		s += 3;
-+		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-+			/* Literal string, where present. */
-+			while (*s != '\0') {
-+				putchar(*s);
-+				s++;
-+			}
-+			s++;
-+		}
-+		putchar('\n');
-+	}
-+
-+	/* Header fields of interest. */
-+	if (r->regstart != '\0')
-+		printf("start `%c' ", r->regstart);
-+	if (r->reganch)
-+		printf("anchored ");
-+	if (r->regmust != NULL)
-+		printf("must have \"%s\"", r->regmust);
-+	printf("\n");
-+}
-+
-+/*
-+ - regprop - printable representation of opcode
-+ */
-+static char *
-+regprop(char *op)
-+{
-+#define BUFLEN 50
-+	register char *p;
-+	static char buf[BUFLEN];
-+
-+	strcpy(buf, ":");
-+
-+	switch (OP(op)) {
-+	case BOL:
-+		p = "BOL";
-+		break;
-+	case EOL:
-+		p = "EOL";
-+		break;
-+	case ANY:
-+		p = "ANY";
-+		break;
-+	case ANYOF:
-+		p = "ANYOF";
-+		break;
-+	case ANYBUT:
-+		p = "ANYBUT";
-+		break;
-+	case BRANCH:
-+		p = "BRANCH";
-+		break;
-+	case EXACTLY:
-+		p = "EXACTLY";
-+		break;
-+	case NOTHING:
-+		p = "NOTHING";
-+		break;
-+	case BACK:
-+		p = "BACK";
-+		break;
-+	case END:
-+		p = "END";
-+		break;
-+	case OPEN+1:
-+	case OPEN+2:
-+	case OPEN+3:
-+	case OPEN+4:
-+	case OPEN+5:
-+	case OPEN+6:
-+	case OPEN+7:
-+	case OPEN+8:
-+	case OPEN+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN);
-+		p = NULL;
-+		break;
-+	case CLOSE+1:
-+	case CLOSE+2:
-+	case CLOSE+3:
-+	case CLOSE+4:
-+	case CLOSE+5:
-+	case CLOSE+6:
-+	case CLOSE+7:
-+	case CLOSE+8:
-+	case CLOSE+9:
-+		snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-+		p = NULL;
-+		break;
-+	case STAR:
-+		p = "STAR";
-+		break;
-+	case PLUS:
-+		p = "PLUS";
-+		break;
-+	default:
-+		printk("<3>Regexp: corrupted opcode\n");
-+		break;
-+	}
-+	if (p != NULL)
-+		strncat(buf, p, BUFLEN-strlen(buf));
-+	return(buf);
-+}
-+#endif
-+
-+
---- /dev/null
-+++ b/net/netfilter/regexp/regexp.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Definitions etc. for regexp(3) routines.
-+ *
-+ * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
-+ * not the System V one.
-+ */
-+
-+#ifndef REGEXP_H
-+#define REGEXP_H
-+
-+
-+/*
-+http://www.opensource.apple.com/darwinsource/10.3/expect-1/expect/expect.h ,
-+which contains a version of this library, says:
-+
-+ *
-+ * NSUBEXP must be at least 10, and no greater than 117 or the parser
-+ * will not work properly.
-+ *
-+
-+However, it looks rather like this library is limited to 10.  If you think
-+otherwise, let us know.
-+*/
-+
-+#define NSUBEXP  10
-+typedef struct regexp {
-+	char *startp[NSUBEXP];
-+	char *endp[NSUBEXP];
-+	char regstart;		/* Internal use only. */
-+	char reganch;		/* Internal use only. */
-+	char *regmust;		/* Internal use only. */
-+	int regmlen;		/* Internal use only. */
-+	char program[1];	/* Unwarranted chumminess with compiler. */
-+} regexp;
-+
-+regexp * regcomp(char *exp, int *patternsize);
-+int regexec(regexp *prog, char *string);
-+void regsub(regexp *prog, char *source, char *dest);
-+void regerror(char *s);
-+
-+#endif
---- /dev/null
-+++ b/net/netfilter/regexp/regmagic.h
-@@ -0,0 +1,5 @@
-+/*
-+ * The first byte of the regexp internal "program" is actually this magic
-+ * number; the start node begins in the second byte.
-+ */
-+#define	MAGIC	0234
---- /dev/null
-+++ b/net/netfilter/regexp/regsub.c
-@@ -0,0 +1,95 @@
-+/*
-+ * regsub
-+ * @(#)regsub.c	1.3 of 2 April 86
-+ *
-+ *	Copyright (c) 1986 by University of Toronto.
-+ *	Written by Henry Spencer.  Not derived from licensed software.
-+ *
-+ *	Permission is granted to anyone to use this software for any
-+ *	purpose on any computer system, and to redistribute it freely,
-+ *	subject to the following restrictions:
-+ *
-+ *	1. The author is not responsible for the consequences of use of
-+ *		this software, no matter how awful, even if they arise
-+ *		from defects in it.
-+ *
-+ *	2. The origin of this software must not be misrepresented, either
-+ *		by explicit claim or by omission.
-+ *
-+ *	3. Altered versions must be plainly marked as such, and must not
-+ *		be misrepresented as being the original software.
-+ *
-+ *
-+ * This code was modified by Ethan Sommer to work within the kernel
-+ * (it now uses kmalloc etc..)
-+ *
-+ */
-+#include "regexp.h"
-+#include "regmagic.h"
-+#include <linux/string.h>
-+
-+
-+#ifndef CHARBITS
-+#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-+#else
-+#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-+#endif
-+
-+#if 0
-+//void regerror(char * s)
-+//{
-+//        printk("regexp(3): %s", s);
-+//        /* NOTREACHED */
-+//}
-+#endif
-+
-+/*
-+ - regsub - perform substitutions after a regexp match
-+ */
-+void
-+regsub(regexp * prog, char * source, char * dest)
-+{
-+	register char *src;
-+	register char *dst;
-+	register char c;
-+	register int no;
-+	register int len;
-+	
-+	/* Not necessary and gcc doesn't like it -MLS */
-+	/*extern char *strncpy();*/
-+
-+	if (prog == NULL || source == NULL || dest == NULL) {
-+		regerror("NULL parm to regsub");
-+		return;
-+	}
-+	if (UCHARAT(prog->program) != MAGIC) {
-+		regerror("damaged regexp fed to regsub");
-+		return;
-+	}
-+
-+	src = source;
-+	dst = dest;
-+	while ((c = *src++) != '\0') {
-+		if (c == '&')
-+			no = 0;
-+		else if (c == '\\' && '0' <= *src && *src <= '9')
-+			no = *src++ - '0';
-+		else
-+			no = -1;
-+
-+		if (no < 0) {	/* Ordinary character. */
-+			if (c == '\\' && (*src == '\\' || *src == '&'))
-+				c = *src++;
-+			*dst++ = c;
-+		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-+			len = prog->endp[no] - prog->startp[no];
-+			(void) strncpy(dst, prog->startp[no], len);
-+			dst += len;
-+			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-+				regerror("damaged match string");
-+				return;
-+			}
-+		}
-+	}
-+	*dst++ = '\0';
-+}
---- /dev/null
-+++ b/net/netfilter/xt_layer7.c
-@@ -0,0 +1,666 @@
-+/*
-+  Kernel module to match application layer (OSI layer 7) data in connections.
-+
-+  http://l7-filter.sf.net
-+
-+  (C) 2003-2009 Matthew Strait and Ethan Sommer.
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version
-+  2 of the License, or (at your option) any later version.
-+  http://www.gnu.org/licenses/gpl.txt
-+
-+  Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>,
-+  xt_helper.c (C) 2002 Harald Welte and cls_layer7.c (C) 2003 Matthew Strait,
-+  Ethan Sommer, Justin Levandoski.
-+*/
-+
-+#include <linux/spinlock.h>
-+#include <linux/version.h>
-+#include <net/ip.h>
-+#include <net/tcp.h>
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/netfilter.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_acct.h>
-+#endif
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_layer7.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+
-+#include "regexp/regexp.c"
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>");
-+MODULE_DESCRIPTION("iptables application layer match module");
-+MODULE_ALIAS("ipt_layer7");
-+MODULE_VERSION("2.21");
-+
-+static int maxdatalen = 2048; // this is the default
-+module_param(maxdatalen, int, 0444);
-+MODULE_PARM_DESC(maxdatalen, "maximum bytes of data looked at by l7-filter");
-+#ifdef CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG
-+	#define DPRINTK(format,args...) printk(format,##args)
-+#else
-+	#define DPRINTK(format,args...)
-+#endif
-+
-+/* Number of packets whose data we look at.
-+This can be modified through /proc/net/layer7_numpackets */
-+static int num_packets = 10;
-+
-+static struct pattern_cache {
-+	char * regex_string;
-+	regexp * pattern;
-+	struct pattern_cache * next;
-+} * first_pattern_cache = NULL;
-+
-+DEFINE_SPINLOCK(l7_lock);
-+
-+static int total_acct_packets(struct nf_conn *ct)
-+{
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
-+	BUG_ON(ct == NULL);
-+	return (ct->counters[IP_CT_DIR_ORIGINAL].packets + ct->counters[IP_CT_DIR_REPLY].packets);
-+#else
-+	struct nf_conn_counter *acct;
-+
-+	BUG_ON(ct == NULL);
-+	acct = nf_conn_acct_find(ct);
-+	if (!acct)
-+		return 0;
-+	return (acct[IP_CT_DIR_ORIGINAL].packets + acct[IP_CT_DIR_REPLY].packets);
-+#endif
-+}
-+
-+#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+/* Converts an unfriendly string into a friendly one by
-+replacing unprintables with periods and all whitespace with " ". */
-+static char * friendly_print(unsigned char * s)
-+{
-+	char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!f) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"friendly_print, bailing.\n");
-+		return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++){
-+		if(isprint(s[i]) && s[i] < 128)	f[i] = s[i];
-+		else if(isspace(s[i]))		f[i] = ' ';
-+		else 				f[i] = '.';
-+	}
-+	f[i] = '\0';
-+	return f;
-+}
-+
-+static char dec2hex(int i)
-+{
-+	switch (i) {
-+		case 0 ... 9:
-+			return (i + '0');
-+			break;
-+		case 10 ... 15:
-+			return (i - 10 + 'a');
-+			break;
-+		default:
-+			if (net_ratelimit())
-+				printk("layer7: Problem in dec2hex\n");
-+			return '\0';
-+	}
-+}
-+
-+static char * hex_print(unsigned char * s)
-+{
-+	char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC);
-+	int i;
-+
-+	if(!g) {
-+	       if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in hex_print, "
-+					"bailing.\n");
-+	       return NULL;
-+	}
-+
-+	for(i = 0; i < strlen(s); i++) {
-+		g[i*3    ] = dec2hex(s[i]/16);
-+		g[i*3 + 1] = dec2hex(s[i]%16);
-+		g[i*3 + 2] = ' ';
-+	}
-+	g[i*3] = '\0';
-+
-+	return g;
-+}
-+#endif // DEBUG
-+
-+/* Use instead of regcomp.  As we expect to be seeing the same regexps over and
-+over again, it make sense to cache the results. */
-+static regexp * compile_and_cache(const char * regex_string, 
-+                                  const char * protocol)
-+{
-+	struct pattern_cache * node               = first_pattern_cache;
-+	struct pattern_cache * last_pattern_cache = first_pattern_cache;
-+	struct pattern_cache * tmp;
-+	unsigned int len;
-+
-+	while (node != NULL) {
-+		if (!strcmp(node->regex_string, regex_string))
-+		return node->pattern;
-+
-+		last_pattern_cache = node;/* points at the last non-NULL node */
-+		node = node->next;
-+	}
-+
-+	/* If we reach the end of the list, then we have not yet cached
-+	   the pattern for this regex. Let's do that now.
-+	   Be paranoid about running out of memory to avoid list corruption. */
-+	tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC);
-+
-+	if(!tmp) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		return NULL;
-+	}
-+
-+	tmp->regex_string  = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC);
-+	tmp->pattern       = kmalloc(sizeof(struct regexp),    GFP_ATOMIC);
-+	tmp->next = NULL;
-+
-+	if(!tmp->regex_string || !tmp->pattern) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory in "
-+					"compile_and_cache, bailing.\n");
-+		kfree(tmp->regex_string);
-+		kfree(tmp->pattern);
-+		kfree(tmp);
-+		return NULL;
-+	}
-+
-+	/* Ok.  The new node is all ready now. */
-+	node = tmp;
-+
-+	if(first_pattern_cache == NULL) /* list is empty */
-+		first_pattern_cache = node; /* make node the beginning */
-+	else
-+		last_pattern_cache->next = node; /* attach node to the end */
-+
-+	/* copy the string and compile the regex */
-+	len = strlen(regex_string);
-+	DPRINTK("About to compile this: \"%s\"\n", regex_string);
-+	node->pattern = regcomp((char *)regex_string, &len);
-+	if ( !node->pattern ) {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: Error compiling regexp "
-+					"\"%s\" (%s)\n", 
-+					regex_string, protocol);
-+		/* pattern is now cached as NULL, so we won't try again. */
-+	}
-+
-+	strcpy(node->regex_string, regex_string);
-+	return node->pattern;
-+}
-+
-+static int can_handle(const struct sk_buff *skb)
-+{
-+	if(!ip_hdr(skb)) /* not IP */
-+		return 0;
-+	if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_UDP &&
-+	   ip_hdr(skb)->protocol != IPPROTO_ICMP)
-+		return 0;
-+	return 1;
-+}
-+
-+/* Returns offset the into the skb->data that the application data starts */
-+static int app_data_offset(const struct sk_buff *skb)
-+{
-+	/* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
-+	isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
-+	int ip_hl = 4*ip_hdr(skb)->ihl;
-+
-+	if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
-+		/* 12 == offset into TCP header for the header length field.
-+		Can't get this with skb->h.th->doff because the tcphdr
-+		struct doesn't get set when routing (this is confirmed to be
-+		true in Netfilter as well as QoS.) */
-+		int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
-+
-+		return ip_hl + tcp_hl;
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_UDP  ) {
-+		return ip_hl + 8; /* UDP header is always 8 bytes */
-+	} else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
-+		return ip_hl + 8; /* ICMP header is 8 bytes */
-+	} else {
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: tried to handle unknown "
-+					"protocol!\n");
-+		return ip_hl + 8; /* something reasonable */
-+	}
-+}
-+
-+/* handles whether there's a match when we aren't appending data anymore */
-+static int match_no_append(struct nf_conn * conntrack, 
-+                           struct nf_conn * master_conntrack, 
-+                           enum ip_conntrack_info ctinfo,
-+                           enum ip_conntrack_info master_ctinfo,
-+                           const struct xt_layer7_info * info)
-+{
-+	/* If we're in here, throw the app data away */
-+	if(master_conntrack->layer7.app_data != NULL) {
-+
-+	#ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG
-+		if(!master_conntrack->layer7.app_proto) {
-+			char * f = 
-+			  friendly_print(master_conntrack->layer7.app_data);
-+			char * g = 
-+			  hex_print(master_conntrack->layer7.app_data);
-+			DPRINTK("\nl7-filter gave up after %d bytes "
-+				"(%d packets):\n%s\n",
-+				strlen(f), total_acct_packets(master_conntrack), f);
-+			kfree(f);
-+			DPRINTK("In hex: %s\n", g);
-+			kfree(g);
-+		}
-+	#endif
-+
-+		kfree(master_conntrack->layer7.app_data);
-+		master_conntrack->layer7.app_data = NULL; /* don't free again */
-+	}
-+
-+	if(master_conntrack->layer7.app_proto){
-+		/* Here child connections set their .app_proto (for /proc) */
-+		if(!conntrack->layer7.app_proto) {
-+			conntrack->layer7.app_proto = 
-+			  kmalloc(strlen(master_conntrack->layer7.app_proto)+1, 
-+			    GFP_ATOMIC);
-+			if(!conntrack->layer7.app_proto){
-+				if (net_ratelimit())
-+					printk(KERN_ERR "layer7: out of memory "
-+							"in match_no_append, "
-+							"bailing.\n");
-+				return 1;
-+			}
-+			strcpy(conntrack->layer7.app_proto, 
-+				master_conntrack->layer7.app_proto);
-+		}
-+
-+		return (!strcmp(master_conntrack->layer7.app_proto, 
-+				info->protocol));
-+	}
-+	else {
-+		/* If not classified, set to "unknown" to distinguish from
-+		connections that are still being tested. */
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen("unknown")+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match_no_append, bailing.\n");
-+			return 1;
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, "unknown");
-+		return 0;
-+	}
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length = 0, i;
-+	int oldlength = master_conntrack->layer7.app_data_len;
-+
-+	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
-+	   clear on whether the race condition exists or whether this really 
-+	   fixes it.  I might just be being dense... Anyway, if it's not really 
-+	   a fix, all it does is waste a very small amount of time. */
-+	if(!master_conntrack->layer7.app_data) return 0;
-+
-+	/* Strip nulls. Make everything lower case (our regex lib doesn't
-+	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-oldlength-1 &&
-+		   i < appdatalen; i++) {
-+		if(app_data[i] != '\0') {
-+			/* the kernel version of tolower mungs 'upper ascii' */
-+			master_conntrack->layer7.app_data[length+oldlength] =
-+				isascii(app_data[i])? 
-+					tolower(app_data[i]) : app_data[i];
-+			length++;
-+		}
-+	}
-+
-+	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+	master_conntrack->layer7.app_data_len = length + oldlength;
-+
-+	return length;
-+}
-+
-+/* taken from drivers/video/modedb.c */
-+static int my_atoi(const char *s)
-+{
-+	int val = 0;
-+
-+	for (;; s++) {
-+		switch (*s) {
-+			case '0'...'9':
-+			val = 10*val+(*s-'0');
-+			break;
-+		default:
-+			return val;
-+		}
-+	}
-+}
-+
-+/* write out num_packets to userland. */
-+static int layer7_read_proc(char* page, char ** start, off_t off, int count,
-+                            int* eof, void * data)
-+{
-+	if(num_packets > 99 && net_ratelimit())
-+		printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n");
-+
-+	page[0] = num_packets/10 + '0';
-+	page[1] = num_packets%10 + '0';
-+	page[2] = '\n';
-+	page[3] = '\0';
-+
-+	*eof=1;
-+
-+	return 3;
-+}
-+
-+/* Read in num_packets from userland */
-+static int layer7_write_proc(struct file* file, const char* buffer,
-+                             unsigned long count, void *data)
-+{
-+	char * foo = kmalloc(count, GFP_ATOMIC);
-+
-+	if(!foo){
-+		if (net_ratelimit())
-+			printk(KERN_ERR "layer7: out of memory, bailing. "
-+					"num_packets unchanged.\n");
-+		return count;
-+	}
-+
-+	if(copy_from_user(foo, buffer, count)) {
-+		return -EFAULT;
-+	}
-+
-+
-+	num_packets = my_atoi(foo);
-+	kfree (foo);
-+
-+	/* This has an arbitrary limit to make the math easier. I'm lazy.
-+	But anyway, 99 is a LOT! If you want more, you're doing it wrong! */
-+	if(num_packets > 99) {
-+		printk(KERN_WARNING "layer7: num_packets can't be > 99.\n");
-+		num_packets = 99;
-+	} else if(num_packets < 1) {
-+		printk(KERN_WARNING "layer7: num_packets can't be < 1.\n");
-+		num_packets = 1;
-+	}
-+
-+	return count;
-+}
-+
-+static bool
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+match(const struct sk_buff *skbin, const struct xt_match_param *par)
-+#else
-+match(const struct sk_buff *skbin,
-+      const struct net_device *in,
-+      const struct net_device *out,
-+      const struct xt_match *match,
-+      const void *matchinfo,
-+      int offset,
-+      unsigned int protoff,
-+      bool *hotdrop)
-+#endif
-+{
-+	/* sidestep const without getting a compiler warning... */
-+	struct sk_buff * skb = (struct sk_buff *)skbin; 
-+
-+	const struct xt_layer7_info * info = 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+		par->matchinfo;
-+	#else
-+		matchinfo;
-+	#endif
-+
-+	enum ip_conntrack_info master_ctinfo, ctinfo;
-+	struct nf_conn *master_conntrack, *conntrack;
-+	unsigned char * app_data;
-+	unsigned int pattern_result, appdatalen;
-+	regexp * comppattern;
-+
-+	/* Be paranoid/incompetent - lock the entire match function. */
-+	spin_lock_bh(&l7_lock);
-+
-+	if(!can_handle(skb)){
-+		DPRINTK("layer7: This is some protocol I can't handle.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Treat parent & all its children together as one connection, except
-+	for the purpose of setting conntrack->layer7.app_proto in the actual
-+	connection. This makes /proc/net/ip_conntrack more satisfying. */
-+	if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
-+	   !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
-+		DPRINTK("layer7: couldn't get conntrack.\n");
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert;
-+	}
-+
-+	/* Try to get a master conntrack (and its master etc) for FTP, etc. */
-+	while (master_ct(master_conntrack) != NULL)
-+		master_conntrack = master_ct(master_conntrack);
-+
-+	/* if we've classified it or seen too many packets */
-+	if(total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto) {
-+
-+		pattern_result = match_no_append(conntrack, master_conntrack, 
-+						 ctinfo, master_ctinfo, info);
-+
-+		/* skb->cb[0] == seen. Don't do things twice if there are 
-+		multiple l7 rules. I'm not sure that using cb for this purpose 
-+		is correct, even though it says "put your private variables 
-+		there". But it doesn't look like it is being used for anything
-+		else in the skbs that make it here. */
-+		skb->cb[0] = 1; /* marking it seen here's probably irrelevant */
-+
-+		spin_unlock_bh(&l7_lock);
-+		return (pattern_result ^ info->invert);
-+	}
-+
-+	if(skb_is_nonlinear(skb)){
-+		if(skb_linearize(skb) != 0){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: failed to linearize "
-+						"packet, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* now that the skb is linearized, it's safe to set these. */
-+	app_data = skb->data + app_data_offset(skb);
-+	appdatalen = skb_tail_pointer(skb) - app_data;
-+
-+	/* the return value gets checked later, when we're ready to use it */
-+	comppattern = compile_and_cache(info->pattern, info->protocol);
-+
-+	/* On the first packet of a connection, allocate space for app data */
-+	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
-+	   !master_conntrack->layer7.app_data){
-+		master_conntrack->layer7.app_data = 
-+			kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+
-+		master_conntrack->layer7.app_data[0] = '\0';
-+	}
-+
-+	/* Can be here, but unallocated, if numpackets is increased near
-+	the beginning of a connection */
-+	if(master_conntrack->layer7.app_data == NULL){
-+		spin_unlock_bh(&l7_lock);
-+		return info->invert; /* unmatched */
-+	}
-+
-+	if(!skb->cb[0]){
-+		int newbytes;
-+		newbytes = add_data(master_conntrack, app_data, appdatalen);
-+
-+		if(newbytes == 0) { /* didn't add any data */
-+			skb->cb[0] = 1;
-+			/* Didn't match before, not going to match now */
-+			spin_unlock_bh(&l7_lock);
-+			return info->invert;
-+		}
-+	}
-+
-+	/* If looking for "unknown", then never match.  "Unknown" means that
-+	we've given up; we're still trying with these packets. */
-+	if(!strcmp(info->protocol, "unknown")) {
-+		pattern_result = 0;
-+	/* If looking for "unset", then always match. "Unset" means that we
-+	haven't yet classified the connection. */
-+	} else if(!strcmp(info->protocol, "unset")) {
-+		pattern_result = 2;
-+		DPRINTK("layer7: matched unset: not yet classified "
-+			"(%d/%d packets)\n",
-+                        total_acct_packets(master_conntrack), num_packets);
-+	/* If the regexp failed to compile, don't bother running it */
-+	} else if(comppattern && 
-+		  regexec(comppattern, master_conntrack->layer7.app_data)){
-+		DPRINTK("layer7: matched %s\n", info->protocol);
-+		pattern_result = 1;
-+	} else pattern_result = 0;
-+
-+	if(pattern_result == 1) {
-+		master_conntrack->layer7.app_proto = 
-+			kmalloc(strlen(info->protocol)+1, GFP_ATOMIC);
-+		if(!master_conntrack->layer7.app_proto){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in "
-+						"match, bailing.\n");
-+			spin_unlock_bh(&l7_lock);
-+			return (pattern_result ^ info->invert);
-+		}
-+		strcpy(master_conntrack->layer7.app_proto, info->protocol);
-+	} else if(pattern_result > 1) { /* cleanup from "unset" */
-+		pattern_result = 1;
-+	}
-+
-+	/* mark the packet seen */
-+	skb->cb[0] = 1;
-+
-+	spin_unlock_bh(&l7_lock);
-+	return (pattern_result ^ info->invert);
-+}
-+
-+// load nf_conntrack_ipv4
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+static bool check(const struct xt_mtchk_param *par)
-+{
-+        if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", par->match->family);
-+#else
-+static bool check(const char *tablename, const void *inf,
-+		 const struct xt_match *match, void *matchinfo,
-+		 unsigned int hook_mask)
-+{
-+        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
-+                printk(KERN_WARNING "can't load conntrack support for "
-+                                    "proto=%d\n", match->family);
-+#endif
-+                return 0;
-+        }
-+	return 1;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+	static void destroy(const struct xt_mtdtor_param *par)
-+	{
-+		nf_ct_l3proto_module_put(par->match->family);
-+	}
-+#else
-+	static void destroy(const struct xt_match *match, void *matchinfo)
-+	{
-+		nf_ct_l3proto_module_put(match->family);
-+	}
-+#endif
-+
-+static struct xt_match xt_layer7_match[] __read_mostly = {
-+{
-+	.name		= "layer7",
-+	.family		= AF_INET,
-+	.checkentry	= check,
-+	.match		= match,
-+	.destroy	= destroy,
-+	.matchsize	= sizeof(struct xt_layer7_info),
-+	.me		= THIS_MODULE
-+}
-+};
-+
-+static void layer7_cleanup_proc(void)
-+{
-+	remove_proc_entry("layer7_numpackets", init_net.proc_net);
-+}
-+
-+/* register the proc file */
-+static void layer7_init_proc(void)
-+{
-+	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
-+	entry->read_proc = layer7_read_proc;
-+	entry->write_proc = layer7_write_proc;
-+}
-+
-+static int __init xt_layer7_init(void)
-+{
-+	need_conntrack();
-+
-+	layer7_init_proc();
-+	if(maxdatalen < 1) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be < 1, "
-+			"using 1\n");
-+		maxdatalen = 1;
-+	}
-+	/* This is not a hard limit.  It's just here to prevent people from
-+	bringing their slow machines to a grinding halt. */
-+	else if(maxdatalen > 65536) {
-+		printk(KERN_WARNING "layer7: maxdatalen can't be > 65536, "
-+			"using 65536\n");
-+		maxdatalen = 65536;
-+	}
-+	return xt_register_matches(xt_layer7_match,
-+				   ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+static void __exit xt_layer7_fini(void)
-+{
-+	layer7_cleanup_proc();
-+	xt_unregister_matches(xt_layer7_match, ARRAY_SIZE(xt_layer7_match));
-+}
-+
-+module_init(xt_layer7_init);
-+module_exit(xt_layer7_fini);
diff --git a/target/linux/generic-2.6/patches-2.6.35/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.35/101-netfilter_layer7_pktmatch.patch
deleted file mode 100644
index f65e301fd1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/101-netfilter_layer7_pktmatch.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/include/linux/netfilter/xt_layer7.h
-+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@ struct xt_layer7_info {
-     char protocol[MAX_PROTOCOL_LEN];
-     char pattern[MAX_PATTERN_LEN];
-     u_int8_t invert;
-+    u_int8_t pkt;
- };
- 
- #endif /* _XT_LAYER7_H */
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
- }
- 
- /* add the new app data to the conntrack.  Return number of bytes added. */
--static int add_data(struct nf_conn * master_conntrack,
--                    char * app_data, int appdatalen)
-+static int add_datastr(char *target, int offset, char *app_data, int len)
- {
- 	int length = 0, i;
--	int oldlength = master_conntrack->layer7.app_data_len;
--
--	/* This is a fix for a race condition by Deti Fliegl. However, I'm not 
--	   clear on whether the race condition exists or whether this really 
--	   fixes it.  I might just be being dense... Anyway, if it's not really 
--	   a fix, all it does is waste a very small amount of time. */
--	if(!master_conntrack->layer7.app_data) return 0;
-+	if (!target) return 0;
- 
- 	/* Strip nulls. Make everything lower case (our regex lib doesn't
- 	do case insensitivity).  Add it to the end of the current data. */
--	for(i = 0; i < maxdatalen-oldlength-1 &&
--		   i < appdatalen; i++) {
-+ 	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
- 		if(app_data[i] != '\0') {
- 			/* the kernel version of tolower mungs 'upper ascii' */
--			master_conntrack->layer7.app_data[length+oldlength] =
-+			target[length+offset] =
- 				isascii(app_data[i])? 
- 					tolower(app_data[i]) : app_data[i];
- 			length++;
- 		}
- 	}
-+	target[length+offset] = '\0';
-+
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct nf_conn * master_conntrack,
-+                    char * app_data, int appdatalen)
-+{
-+	int length;
- 
--	master_conntrack->layer7.app_data[length+oldlength] = '\0';
--	master_conntrack->layer7.app_data_len = length + oldlength;
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
- 
- 	return length;
- }
-@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
- 
- 	enum ip_conntrack_info master_ctinfo, ctinfo;
- 	struct nf_conn *master_conntrack, *conntrack;
--	unsigned char * app_data;
-+	unsigned char *app_data, *tmp_data;
- 	unsigned int pattern_result, appdatalen;
- 	regexp * comppattern;
- 
-@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
- 		master_conntrack = master_ct(master_conntrack);
- 
- 	/* if we've classified it or seen too many packets */
--	if(total_acct_packets(master_conntrack) > num_packets ||
--	   master_conntrack->layer7.app_proto) {
-+	if(!info->pkt && (total_acct_packets(master_conntrack) > num_packets ||
-+	   master_conntrack->layer7.app_proto)) {
- 
- 		pattern_result = match_no_append(conntrack, master_conntrack, 
- 						 ctinfo, master_ctinfo, info);
-@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
- 	/* the return value gets checked later, when we're ready to use it */
- 	comppattern = compile_and_cache(info->pattern, info->protocol);
- 
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		spin_unlock_bh(&l7_lock);
-+
-+		return (pattern_result ^ info->invert);
-+	}
-+
- 	/* On the first packet of a connection, allocate space for app data */
- 	if(total_acct_packets(master_conntrack) == 1 && !skb->cb[0] && 
- 	   !master_conntrack->layer7.app_data){
diff --git a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch b/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
deleted file mode 100644
index 15fc5fadd2..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/net/netfilter/xt_layer7.c
-+++ b/net/netfilter/xt_layer7.c
-@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
- }
- 
- static bool
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+match(const struct sk_buff *skbin, struct xt_action_param *par)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
- match(const struct sk_buff *skbin, const struct xt_match_param *par)
- #else
- match(const struct sk_buff *skbin,
-@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
- 
- // load nf_conntrack_ipv4
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+static int check(const struct xt_mtchk_param *par)
-+#  else
- static bool check(const struct xt_mtchk_param *par)
-+#  endif
- {
-         if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
-                 printk(KERN_WARNING "can't load conntrack support for "
diff --git a/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch
deleted file mode 100644
index b688fda216..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/110-netfilter_match_speedup.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- a/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/include/linux/netfilter_ipv4/ip_tables.h
-@@ -62,6 +62,7 @@ struct ipt_ip {
- #define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */
- #define IPT_F_GOTO		0x02	/* Set if jump is a goto */
- #define IPT_F_MASK		0x03	/* All possible flag bits mask. */
-+#define IPT_F_NO_DEF_MATCH	0x80	/* Internal: no default match rules present */
- 
- /* Values for "inv" field in struct ipt_ip. */
- #define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -90,6 +90,9 @@ ip_packet_match(const struct iphdr *ip,
- 
- #define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
- 
-+	if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-+		return true;
-+
- 	if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
- 		  IPT_INV_SRCIP) ||
- 	    FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -140,13 +143,35 @@ ip_packet_match(const struct iphdr *ip,
- 		return false;
- 	}
- 
-+#undef FWINV
- 	return true;
- }
- 
- static bool
--ip_checkentry(const struct ipt_ip *ip)
-+ip_checkentry(struct ipt_ip *ip)
- {
--	if (ip->flags & ~IPT_F_MASK) {
-+#define FWINV(bool, invflg) ((bool) || (ip->invflags & (invflg)))
-+
-+	if (FWINV(ip->smsk.s_addr, IPT_INV_SRCIP) ||
-+		FWINV(ip->dmsk.s_addr, IPT_INV_DSTIP))
-+		goto has_match_rules;
-+
-+	if (FWINV(!!((const unsigned long *)ip->iniface_mask)[0],
-+		IPT_INV_VIA_IN) ||
-+	    FWINV(!!((const unsigned long *)ip->outiface_mask)[0],
-+		IPT_INV_VIA_OUT))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->proto, IPT_INV_PROTO))
-+		goto has_match_rules;
-+
-+	if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
-+		goto has_match_rules;
-+
-+	ip->flags |= IPT_F_NO_DEF_MATCH;
-+
-+has_match_rules:
-+	if (ip->flags & ~(IPT_F_MASK|IPT_F_NO_DEF_MATCH)) {
- 		duprintf("Unknown flag bits set: %08X\n",
- 			 ip->flags & ~IPT_F_MASK);
- 		return false;
-@@ -156,6 +181,8 @@ ip_checkentry(const struct ipt_ip *ip)
- 			 ip->invflags & ~IPT_INV_MASK);
- 		return false;
- 	}
-+
-+#undef FWINV
- 	return true;
- }
- 
-@@ -182,7 +209,6 @@ static inline bool unconditional(const s
- 	static const struct ipt_ip uncond;
- 
- 	return memcmp(ip, &uncond, sizeof(uncond)) == 0;
--#undef FWINV
- }
- 
- /* for const-correctness */
-@@ -312,8 +338,28 @@ ipt_do_table(struct sk_buff *skb,
- 	const struct xt_table_info *private;
- 	struct xt_action_param acpar;
- 
--	/* Initialization */
- 	ip = ip_hdr(skb);
-+
-+	IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-+	xt_info_rdlock_bh();
-+	private = table->private;
-+	table_base = private->entries[smp_processor_id()];
-+	e = get_entry(table_base, private->hook_entry[hook]);
-+
-+	if (e->target_offset <= sizeof(struct ipt_entry) &&
-+		(e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-+			struct ipt_entry_target *t = ipt_get_target(e);
-+			if (!t->u.kernel.target->target) {
-+				int v = ((struct ipt_standard_target *)t)->verdict;
-+				if ((v < 0) && (v != IPT_RETURN)) {
-+					ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-+					xt_info_rdunlock_bh();
-+					return (unsigned)(-v) - 1;
-+				}
-+			}
-+	}
-+
-+	/* Initialization */
- 	indev = in ? in->name : nulldevname;
- 	outdev = out ? out->name : nulldevname;
- 	/* We handle fragments by dealing with the first fragment as
-@@ -970,6 +1016,7 @@ copy_entries_to_user(unsigned int total_
- 		unsigned int i;
- 		const struct ipt_entry_match *m;
- 		const struct ipt_entry_target *t;
-+		u8 flags;
- 
- 		e = (struct ipt_entry *)(loc_cpu_entry + off);
- 		if (copy_to_user(userptr + off
-@@ -979,6 +1026,14 @@ copy_entries_to_user(unsigned int total_
- 			ret = -EFAULT;
- 			goto free_counters;
- 		}
-+
-+		flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
-+		if (copy_to_user(userptr + off
-+				 + offsetof(struct ipt_entry, ip.flags),
-+				 &flags, sizeof(flags)) != 0) {
-+			ret = -EFAULT;
-+			goto free_counters;
-+		}
- 
- 		for (i = sizeof(struct ipt_entry);
- 		     i < e->target_offset;
diff --git a/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch
deleted file mode 100644
index 1bda13d191..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/180-netfilter_depends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -173,7 +173,6 @@ config NF_CONNTRACK_FTP
- 
- config NF_CONNTRACK_H323
- 	tristate "H.323 protocol support"
--	depends on (IPV6 || IPV6=n)
- 	depends on NETFILTER_ADVANCED
- 	help
- 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
- 
- config NETFILTER_XT_TARGET_TCPMSS
- 	tristate '"TCPMSS" target support'
--	depends on (IPV6 || IPV6=n)
- 	default m if NETFILTER_ADVANCED=n
- 	---help---
- 	  This option adds a `TCPMSS' target, which allows you to alter the
diff --git a/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch
deleted file mode 100644
index 68792936bb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/190-netfilter_rtsp.patch
+++ /dev/null
@@ -1,1366 +0,0 @@
---- /dev/null
-+++ b/include/linux/netfilter/nf_conntrack_rtsp.h
-@@ -0,0 +1,63 @@
-+/*
-+ * RTSP extension for IP connection tracking.
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.h
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ */
-+#ifndef _IP_CONNTRACK_RTSP_H
-+#define _IP_CONNTRACK_RTSP_H
-+
-+//#define IP_NF_RTSP_DEBUG 1
-+#define IP_NF_RTSP_VERSION "0.6.21"
-+
-+#ifdef __KERNEL__
-+/* port block types */
-+typedef enum {
-+    pb_single,  /* client_port=x */
-+    pb_range,   /* client_port=x-y */
-+    pb_discon   /* client_port=x/y (rtspbis) */
-+} portblock_t;
-+
-+/* We record seq number and length of rtsp headers here, all in host order. */
-+
-+/*
-+ * This structure is per expected connection.  It is a member of struct
-+ * ip_conntrack_expect.  The TCP SEQ for the conntrack expect is stored
-+ * there and we are expected to only store the length of the data which
-+ * needs replaced.  If a packet contains multiple RTSP messages, we create
-+ * one expected connection per message.
-+ *
-+ * We use these variables to mark the entire header block.  This may seem
-+ * like overkill, but the nature of RTSP requires it.  A header may appear
-+ * multiple times in a message.  We must treat two Transport headers the
-+ * same as one Transport header with two entries.
-+ */
-+struct ip_ct_rtsp_expect
-+{
-+    u_int32_t   len;        /* length of header block */
-+    portblock_t pbtype;     /* Type of port block that was requested */
-+    u_int16_t   loport;     /* Port that was requested, low or first */
-+    u_int16_t   hiport;     /* Port that was requested, high or second */
-+#if 0
-+    uint        method;     /* RTSP method */
-+    uint        cseq;       /* CSeq from request */
-+#endif
-+};
-+
-+extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,
-+				 struct ip_ct_rtsp_expect *prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+
-+extern void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+#define RTSP_PORT   554
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _IP_CONNTRACK_RTSP_H */
---- /dev/null
-+++ b/include/linux/netfilter_helpers.h
-@@ -0,0 +1,133 @@
-+/*
-+ * Helpers for netfiler modules.  This file provides implementations for basic
-+ * functions such as strncasecmp(), etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_STRNCASECMP        nf_strncasecmp()
-+ *   NF_NEED_STRTOU16           nf_strtou16()
-+ *   NF_NEED_STRTOU32           nf_strtou32()
-+ */
-+#ifndef _NETFILTER_HELPERS_H
-+#define _NETFILTER_HELPERS_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+#define iseol(c) ( (c) == '\r' || (c) == '\n' )
-+
-+/*
-+ * The standard strncasecmp()
-+ */
-+#ifdef NF_NEED_STRNCASECMP
-+static int
-+nf_strncasecmp(const char* s1, const char* s2, u_int32_t len)
-+{
-+    if (s1 == NULL || s2 == NULL)
-+    {
-+        if (s1 == NULL && s2 == NULL)
-+        {
-+            return 0;
-+        }
-+        return (s1 == NULL) ? -1 : 1;
-+    }
-+    while (len > 0 && tolower(*s1) == tolower(*s2))
-+    {
-+        len--;
-+        s1++;
-+        s2++;
-+    }
-+    return ( (len == 0) ? 0 : (tolower(*s1) - tolower(*s2)) );
-+}
-+#endif /* NF_NEED_STRNCASECMP */
-+
-+/*
-+ * Parse a string containing a 16-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU16
-+static int
-+nf_strtou16(const char* pbuf, u_int16_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (isdigit(pbuf[n]))
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU16 */
-+
-+/*
-+ * Parse a string containing a 32-bit unsigned integer.
-+ * Returns the number of chars used, or zero if no number is found.
-+ */
-+#ifdef NF_NEED_STRTOU32
-+static int
-+nf_strtou32(const char* pbuf, u_int32_t* pval)
-+{
-+    int n = 0;
-+
-+    *pval = 0;
-+    while (pbuf[n] >= '0' && pbuf[n] <= '9')
-+    {
-+        *pval = (*pval * 10) + (pbuf[n] - '0');
-+        n++;
-+    }
-+
-+    return n;
-+}
-+#endif /* NF_NEED_STRTOU32 */
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.
-+ */
-+#ifdef NF_NEED_NEXTLINE
-+static int
-+nf_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    while (p[off] != '\n')
-+    {
-+        if (len-off <= 1)
-+        {
-+            return 0;
-+        }
-+
-+        physlen++;
-+        off++;
-+    }
-+
-+    /* if we saw a crlf, physlen needs adjusted */
-+    if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+    {
-+        physlen--;
-+    }
-+
-+    /* advance past the newline */
-+    off++;
-+
-+    *plineoff = *poff;
-+    *plinelen = physlen;
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_HELPERS_H */
---- /dev/null
-+++ b/include/linux/netfilter_mime.h
-@@ -0,0 +1,89 @@
-+/*
-+ * MIME functions for netfilter modules.  This file provides implementations
-+ * for basic MIME parsing.  MIME headers are used in many protocols, such as
-+ * HTTP, RTSP, SIP, etc.
-+ *
-+ * gcc will warn for defined but unused functions, so we only include the
-+ * functions requested.  The following macros are used:
-+ *   NF_NEED_MIME_NEXTLINE      nf_mime_nextline()
-+ */
-+#ifndef _NETFILTER_MIME_H
-+#define _NETFILTER_MIME_H
-+
-+/* Only include these functions for kernel code. */
-+#ifdef __KERNEL__
-+
-+#include <linux/ctype.h>
-+
-+/*
-+ * Given a buffer and length, advance to the next line and mark the current
-+ * line.  If the current line is empty, *plinelen will be set to zero.  If
-+ * not, it will be set to the actual line length (including CRLF).
-+ *
-+ * 'line' in this context means logical line (includes LWS continuations).
-+ * Returns 1 on success, 0 on failure.
-+ */
-+#ifdef NF_NEED_MIME_NEXTLINE
-+static int
-+nf_mime_nextline(char* p, uint len, uint* poff, uint* plineoff, uint* plinelen)
-+{
-+    uint    off = *poff;
-+    uint    physlen = 0;
-+    int     is_first_line = 1;
-+
-+    if (off >= len)
-+    {
-+        return 0;
-+    }
-+
-+    do
-+    {
-+        while (p[off] != '\n')
-+        {
-+            if (len-off <= 1)
-+            {
-+                return 0;
-+            }
-+
-+            physlen++;
-+            off++;
-+        }
-+
-+        /* if we saw a crlf, physlen needs adjusted */
-+        if (physlen > 0 && p[off] == '\n' && p[off-1] == '\r')
-+        {
-+            physlen--;
-+        }
-+
-+        /* advance past the newline */
-+        off++;
-+
-+        /* check for an empty line */
-+        if (physlen == 0)
-+        {
-+            break;
-+        }
-+
-+        /* check for colon on the first physical line */
-+        if (is_first_line)
-+        {
-+            is_first_line = 0;
-+            if (memchr(p+(*poff), ':', physlen) == NULL)
-+            {
-+                return 0;
-+            }
-+        }
-+    }
-+    while (p[off] == ' ' || p[off] == '\t');
-+
-+    *plineoff = *poff;
-+    *plinelen = (physlen == 0) ? 0 : (off - *poff);
-+    *poff = off;
-+
-+    return 1;
-+}
-+#endif /* NF_NEED_MIME_NEXTLINE */
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _NETFILTER_MIME_H */
---- a/net/ipv4/netfilter/Makefile
-+++ b/net/ipv4/netfilter/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
-+obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NF_CONNTRACK_RTSP
-+	tristate "RTSP protocol support"
-+	depends on NF_CONNTRACK
-+	help
-+		Support the RTSP protocol.  This allows UDP transports to be setup
-+		properly, including RTP and RDT.
-+
-+		If you want to compile it as a module, say 'M' here and read
-+		Documentation/modules.txt.  If unsure, say 'Y'.
-+
- config NF_CT_NETLINK
- 	tristate 'Connection tracking netlink interface'
- 	select NETFILTER_NETLINK
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
-+obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # transparent proxy support
- obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -257,6 +257,11 @@ config NF_NAT_IRC
- 	depends on NF_CONNTRACK && NF_NAT
- 	default NF_NAT && NF_CONNTRACK_IRC
- 
-+config NF_NAT_RTSP
-+	tristate
-+ 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
-+ 	default NF_NAT && NF_CONNTRACK_RTSP
-+
- config NF_NAT_TFTP
- 	tristate
- 	depends on NF_CONNTRACK && NF_NAT
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtsp.c
-@@ -0,0 +1,517 @@
-+/*
-+ * RTSP extension for IP connection tracking
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_conntrack_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *   insmod nf_conntrack_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                              max_outstanding=n setup_timeout=secs
-+ *
-+ * If no ports are specified, the default will be port 554.
-+ *
-+ * With max_outstanding you can define the maximum number of not yet
-+ * answered SETUP requests per RTSP session (default 8).
-+ * With setup_timeout you can specify how long the system waits for
-+ * an expected data channel (default 300 seconds).
-+ *
-+ * 2005-02-13: Harald Welte <laforge at netfilter.org>
-+ * 	- port to 2.6
-+ * 	- update to recent post-2.6.11 api changes
-+ * 2006-09-14: Steven Van Acker <deepstar at singularity.be>
-+ *      - removed calls to NAT code from conntrack helper: NAT no longer needed to use rtsp-conntrack
-+ * 2007-04-18: Michael Guntsche <mike at it-loops.com>
-+ * 			- Port to new NF API
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netfilter.h>
-+#include <linux/ip.h>
-+#include <linux/inet.h>
-+#include <net/tcp.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+#include <net/netfilter/nf_conntrack_helper.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#define NF_NEED_STRTOU32
-+#define NF_NEED_NEXTLINE
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#include <linux/ctype.h>
-+#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS 8
-+static int ports[MAX_PORTS];
-+static int num_ports = 0;
-+static int max_outstanding = 8;
-+static unsigned int setup_timeout = 300;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP connection tracking module");
-+MODULE_LICENSE("GPL");
-+module_param_array(ports, int, &num_ports, 0400);
-+MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
-+module_param(max_outstanding, int, 0400);
-+MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
-+module_param(setup_timeout, int, 0400);
-+MODULE_PARM_DESC(setup_timeout, "timeout on for unestablished data channels");
-+
-+static char *rtsp_buffer;
-+static DEFINE_SPINLOCK(rtsp_buffer_lock);
-+
-+unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
-+				 enum ip_conntrack_info ctinfo,
-+				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
-+				 struct nf_conntrack_expect *exp);
-+void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-+
-+EXPORT_SYMBOL_GPL(nf_nat_rtsp_hook);
-+
-+/*
-+ * Max mappings we will allow for one RTSP connection (for RTP, the number
-+ * of allocated ports is twice this value).  Note that SMIL burns a lot of
-+ * ports so keep this reasonably high.  If this is too low, you will see a
-+ * lot of "no free client map entries" messages.
-+ */
-+#define MAX_PORT_MAPS 16
-+
-+/*** default port list was here in the masq code: 554, 3030, 4040 ***/
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*
-+ * Parse an RTSP packet.
-+ *
-+ * Returns zero if parsing failed.
-+ *
-+ * Parameters:
-+ *  IN      ptcp        tcp data pointer
-+ *  IN      tcplen      tcp data len
-+ *  IN/OUT  ptcpoff     points to current tcp offset
-+ *  OUT     phdrsoff    set to offset of rtsp headers
-+ *  OUT     phdrslen    set to length of rtsp headers
-+ *  OUT     pcseqoff    set to offset of CSeq header
-+ *  OUT     pcseqlen    set to length of CSeq header
-+ */
-+static int
-+rtsp_parse_message(char* ptcp, uint tcplen, uint* ptcpoff,
-+                   uint* phdrsoff, uint* phdrslen,
-+                   uint* pcseqoff, uint* pcseqlen,
-+                   uint* transoff, uint* translen)
-+{
-+	uint    entitylen = 0;
-+	uint    lineoff;
-+	uint    linelen;
-+
-+	if (!nf_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen))
-+		return 0;
-+
-+	*phdrsoff = *ptcpoff;
-+	while (nf_mime_nextline(ptcp, tcplen, ptcpoff, &lineoff, &linelen)) {
-+		if (linelen == 0) {
-+			if (entitylen > 0)
-+				*ptcpoff += min(entitylen, tcplen - *ptcpoff);
-+			break;
-+		}
-+		if (lineoff+linelen > tcplen) {
-+			INFOP("!! overrun !!\n");
-+			break;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "CSeq:", 5) == 0) {
-+			*pcseqoff = lineoff;
-+			*pcseqlen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0) {
-+			*transoff = lineoff;
-+			*translen = linelen;
-+		}
-+
-+		if (nf_strncasecmp(ptcp+lineoff, "Content-Length:", 15) == 0) {
-+			uint off = lineoff+15;
-+			SKIP_WSPACE(ptcp+lineoff, linelen, off);
-+			nf_strtou32(ptcp+off, &entitylen);
-+		}
-+	}
-+	*phdrslen = (*ptcpoff) - (*phdrsoff);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Find lo/hi client ports (if any) in transport header
-+ * In:
-+ *   ptcp, tcplen = packet
-+ *   tranoff, tranlen = buffer to search
-+ *
-+ * Out:
-+ *   pport_lo, pport_hi = lo/hi ports (host endian)
-+ *
-+ * Returns nonzero if any client ports found
-+ *
-+ * Note: it is valid (and expected) for the client to request multiple
-+ * transports, so we need to parse the entire line.
-+ */
-+static int
-+rtsp_parse_transport(char* ptran, uint tranlen,
-+                     struct ip_ct_rtsp_expect* prtspexp)
-+{
-+	int     rc = 0;
-+	uint    off = 0;
-+
-+	if (tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+	    nf_strncasecmp(ptran, "Transport:", 10) != 0) {
-+		INFOP("sanity check failed\n");
-+		return 0;
-+	}
-+
-+	DEBUGP("tran='%.*s'\n", (int)tranlen, ptran);
-+	off += 10;
-+	SKIP_WSPACE(ptran, tranlen, off);
-+
-+	/* Transport: tran;field;field=val,tran;field;field=val,... */
-+	while (off < tranlen) {
-+		const char* pparamend;
-+		uint        nextparamoff;
-+
-+		pparamend = memchr(ptran+off, ',', tranlen-off);
-+		pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+		nextparamoff = pparamend-ptran;
-+
-+		while (off < nextparamoff) {
-+			const char* pfieldend;
-+			uint        nextfieldoff;
-+
-+			pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+			nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+			if (strncmp(ptran+off, "client_port=", 12) == 0) {
-+				u_int16_t   port;
-+				uint        numlen;
-+
-+				off += 12;
-+				numlen = nf_strtou16(ptran+off, &port);
-+				off += numlen;
-+				if (prtspexp->loport != 0 && prtspexp->loport != port)
-+					DEBUGP("multiple ports found, port %hu ignored\n", port);
-+				else {
-+					DEBUGP("lo port found : %hu\n", port);
-+					prtspexp->loport = prtspexp->hiport = port;
-+					if (ptran[off] == '-') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_range;
-+						prtspexp->hiport = port;
-+
-+						// If we have a range, assume rtp:
-+						// loport must be even, hiport must be loport+1
-+						if ((prtspexp->loport & 0x0001) != 0 ||
-+						    prtspexp->hiport != prtspexp->loport+1) {
-+							DEBUGP("incorrect range: %hu-%hu, correcting\n",
-+							       prtspexp->loport, prtspexp->hiport);
-+							prtspexp->loport &= 0xfffe;
-+							prtspexp->hiport = prtspexp->loport+1;
-+						}
-+					} else if (ptran[off] == '/') {
-+						off++;
-+						numlen = nf_strtou16(ptran+off, &port);
-+						off += numlen;
-+						prtspexp->pbtype = pb_discon;
-+						prtspexp->hiport = port;
-+					}
-+					rc = 1;
-+				}
-+			}
-+
-+			/*
-+			 * Note we don't look for the destination parameter here.
-+			 * If we are using NAT, the NAT module will handle it.  If not,
-+			 * and the client is sending packets elsewhere, the expectation
-+			 * will quietly time out.
-+			 */
-+
-+			off = nextfieldoff;
-+		}
-+
-+		off = nextparamoff;
-+	}
-+
-+	return rc;
-+}
-+
-+void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
-+{
-+    if(nf_nat_rtsp_hook_expectfn) {
-+        nf_nat_rtsp_hook_expectfn(ct,exp);
-+    }
-+}
-+
-+/*** conntrack functions ***/
-+
-+/* outbound packet: client->server */
-+
-+static inline int
-+help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-+                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct ip_ct_rtsp_expect expinfo;
-+
-+	int dir = CTINFO2DIR(ctinfo);   /* = IP_CT_DIR_ORIGINAL */
-+	//struct  tcphdr* tcph = (void*)iph + iph->ihl * 4;
-+	//uint    tcplen = pktlen - iph->ihl * 4;
-+	char*   pdata = rb_ptr;
-+	//uint    datalen = tcplen - tcph->doff * 4;
-+	uint    dataoff = 0;
-+	int ret = NF_ACCEPT;
-+
-+	struct nf_conntrack_expect *exp;
-+
-+	__be16 be_loport;
-+
-+	memset(&expinfo, 0, sizeof(expinfo));
-+
-+	while (dataoff < datalen) {
-+		uint    cmdoff = dataoff;
-+		uint    hdrsoff = 0;
-+		uint    hdrslen = 0;
-+		uint    cseqoff = 0;
-+		uint    cseqlen = 0;
-+		uint    transoff = 0;
-+		uint    translen = 0;
-+		uint    off;
-+
-+		if (!rtsp_parse_message(pdata, datalen, &dataoff,
-+					&hdrsoff, &hdrslen,
-+					&cseqoff, &cseqlen,
-+					&transoff, &translen))
-+			break;      /* not a valid message */
-+
-+		if (strncmp(pdata+cmdoff, "SETUP ", 6) != 0)
-+			continue;   /* not a SETUP message */
-+		DEBUGP("found a setup message\n");
-+
-+		off = 0;
-+		if(translen) {
-+			rtsp_parse_transport(pdata+transoff, translen, &expinfo);
-+		}
-+
-+		if (expinfo.loport == 0) {
-+			DEBUGP("no udp transports found\n");
-+			continue;   /* no udp transports found */
-+		}
-+
-+		DEBUGP("udp transport found, ports=(%d,%hu,%hu)\n",
-+		       (int)expinfo.pbtype, expinfo.loport, expinfo.hiport);
-+
-+		exp = nf_ct_expect_alloc(ct);
-+		if (!exp) {
-+			ret = NF_DROP;
-+			goto out;
-+		}
-+
-+		be_loport = htons(expinfo.loport);
-+
-+		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+			ct->tuplehash[!dir].tuple.src.l3num,
-+			&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
-+			IPPROTO_UDP, NULL, &be_loport);
-+
-+		exp->master = ct;
-+
-+		exp->expectfn = expected;
-+		exp->flags = 0;
-+
-+		if (expinfo.pbtype == pb_range) {
-+			DEBUGP("Changing expectation mask to handle multiple ports\n");
-+			exp->mask.src.u.udp.port  = 0xfffe;
-+		}
-+
-+		DEBUGP("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
-+		       NIPQUAD(exp->tuple.src.u3.ip),
-+		       ntohs(exp->tuple.src.u.udp.port),
-+		       NIPQUAD(exp->tuple.dst.u3.ip),
-+		       ntohs(exp->tuple.dst.u.udp.port));
-+
-+		if (nf_nat_rtsp_hook)
-+			/* pass the request off to the nat helper */
-+			ret = nf_nat_rtsp_hook(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
-+		else if (nf_ct_expect_related(exp) != 0) {
-+			INFOP("nf_ct_expect_related failed\n");
-+			ret  = NF_DROP;
-+		}
-+		nf_ct_expect_put(exp);
-+		goto out;
-+	}
-+out:
-+
-+	return ret;
-+}
-+
-+
-+static inline int
-+help_in(struct sk_buff *skb, size_t pktlen,
-+ struct nf_conn* ct, enum ip_conntrack_info ctinfo)
-+{
-+ return NF_ACCEPT;
-+}
-+
-+static int help(struct sk_buff *skb, unsigned int protoff,
-+		struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-+{
-+	struct tcphdr _tcph, *th;
-+	unsigned int dataoff, datalen;
-+	char *rb_ptr;
-+	int ret = NF_DROP;
-+
-+	/* Until there's been traffic both ways, don't look in packets. */
-+	if (ctinfo != IP_CT_ESTABLISHED &&
-+	    ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) {
-+		DEBUGP("conntrackinfo = %u\n", ctinfo);
-+		return NF_ACCEPT;
-+	}
-+
-+	/* Not whole TCP header? */
-+	th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph);
-+
-+	if (!th)
-+		return NF_ACCEPT;
-+
-+	/* No data ? */
-+	dataoff = protoff + th->doff*4;
-+	datalen = skb->len - dataoff;
-+	if (dataoff >= skb->len)
-+		return NF_ACCEPT;
-+
-+	spin_lock_bh(&rtsp_buffer_lock);
-+	rb_ptr = skb_header_pointer(skb, dataoff,
-+				    skb->len - dataoff, rtsp_buffer);
-+	BUG_ON(rb_ptr == NULL);
-+
-+#if 0
-+	/* Checksum invalid?  Ignore. */
-+	/* FIXME: Source route IP option packets --RR */
-+	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
-+			 csum_partial((char*)tcph, tcplen, 0)))
-+	{
-+		DEBUGP("bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-+		       tcph, tcplen, NIPQUAD(iph->saddr), NIPQUAD(iph->daddr));
-+		return NF_ACCEPT;
-+	}
-+#endif
-+
-+	switch (CTINFO2DIR(ctinfo)) {
-+	case IP_CT_DIR_ORIGINAL:
-+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
-+		break;
-+	case IP_CT_DIR_REPLY:
-+		DEBUGP("IP_CT_DIR_REPLY\n");
-+		/* inbound packet: server->client */
-+		ret = NF_ACCEPT;
-+		break;
-+	}
-+
-+	spin_unlock_bh(&rtsp_buffer_lock);
-+
-+	return ret;
-+}
-+
-+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS];
-+static char rtsp_names[MAX_PORTS][10];
-+static struct nf_conntrack_expect_policy rtsp_expect_policy;
-+
-+/* This function is intentionally _NOT_ defined as __exit */
-+static void
-+fini(void)
-+{
-+	int i;
-+	for (i = 0; i < num_ports; i++) {
-+		DEBUGP("unregistering port %d\n", ports[i]);
-+		nf_conntrack_helper_unregister(&rtsp_helpers[i]);
-+	}
-+	kfree(rtsp_buffer);
-+}
-+
-+static int __init
-+init(void)
-+{
-+	int i, ret;
-+	struct nf_conntrack_helper *hlpr;
-+	char *tmpname;
-+
-+	printk("nf_conntrack_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	if (max_outstanding < 1) {
-+		printk("nf_conntrack_rtsp: max_outstanding must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+	if (setup_timeout < 0) {
-+		printk("nf_conntrack_rtsp: setup_timeout must be a positive integer\n");
-+		return -EBUSY;
-+	}
-+
-+	rtsp_expect_policy.max_expected = max_outstanding;
-+	rtsp_expect_policy.timeout = setup_timeout;
-+
-+	rtsp_buffer = kmalloc(65536, GFP_KERNEL);
-+	if (!rtsp_buffer)
-+		return -ENOMEM;
-+
-+	/* If no port given, default to standard rtsp port */
-+	if (ports[0] == 0) {
-+		ports[0] = RTSP_PORT;
-+	}
-+
-+	for (i = 0; (i < MAX_PORTS) && ports[i]; i++) {
-+		hlpr = &rtsp_helpers[i];
-+		memset(hlpr, 0, sizeof(struct nf_conntrack_helper));
-+		hlpr->tuple.src.u.tcp.port = htons(ports[i]);
-+		hlpr->tuple.dst.protonum = IPPROTO_TCP;
-+		hlpr->expect_policy = &rtsp_expect_policy;
-+		hlpr->me = THIS_MODULE;
-+		hlpr->help = help;
-+
-+		tmpname = &rtsp_names[i][0];
-+		if (ports[i] == RTSP_PORT) {
-+			sprintf(tmpname, "rtsp");
-+		} else {
-+			sprintf(tmpname, "rtsp-%d", i);
-+		}
-+		hlpr->name = tmpname;
-+
-+		DEBUGP("port #%d: %d\n", i, ports[i]);
-+
-+		ret = nf_conntrack_helper_register(hlpr);
-+
-+		if (ret) {
-+			printk("nf_conntrack_rtsp: ERROR registering port %d\n", ports[i]);
-+			fini();
-+			return -EBUSY;
-+		}
-+		num_ports++;
-+	}
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
-+
-+EXPORT_SYMBOL(nf_nat_rtsp_hook_expectfn);
-+
---- /dev/null
-+++ b/net/ipv4/netfilter/nf_nat_rtsp.c
-@@ -0,0 +1,496 @@
-+/*
-+ * RTSP extension for TCP NAT alteration
-+ * (C) 2003 by Tom Marshall <tmarshall at real.com>
-+ * based on ip_nat_irc.c
-+ *
-+ *      This program is free software; you can redistribute it and/or
-+ *      modify it under the terms of the GNU General Public License
-+ *      as published by the Free Software Foundation; either version
-+ *      2 of the License, or (at your option) any later version.
-+ *
-+ * Module load syntax:
-+ *      insmod nf_nat_rtsp.o ports=port1,port2,...port<MAX_PORTS>
-+ *                           stunaddr=<address>
-+ *                           destaction=[auto|strip|none]
-+ *
-+ * If no ports are specified, the default will be port 554 only.
-+ *
-+ * stunaddr specifies the address used to detect that a client is using STUN.
-+ * If this address is seen in the destination parameter, it is assumed that
-+ * the client has already punched a UDP hole in the firewall, so we don't
-+ * mangle the client_port.  If none is specified, it is autodetected.  It
-+ * only needs to be set if you have multiple levels of NAT.  It should be
-+ * set to the external address that the STUN clients detect.  Note that in
-+ * this case, it will not be possible for clients to use UDP with servers
-+ * between the NATs.
-+ *
-+ * If no destaction is specified, auto is used.
-+ *   destaction=auto:  strip destination parameter if it is not stunaddr.
-+ *   destaction=strip: always strip destination parameter (not recommended).
-+ *   destaction=none:  do not touch destination parameter (not recommended).
-+ */
-+
-+#include <linux/module.h>
-+#include <net/tcp.h>
-+#include <net/netfilter/nf_nat_helper.h>
-+#include <net/netfilter/nf_nat_rule.h>
-+#include <linux/netfilter/nf_conntrack_rtsp.h>
-+#include <net/netfilter/nf_conntrack_expect.h>
-+
-+#include <linux/inet.h>
-+#include <linux/ctype.h>
-+#define NF_NEED_STRNCASECMP
-+#define NF_NEED_STRTOU16
-+#include <linux/netfilter_helpers.h>
-+#define NF_NEED_MIME_NEXTLINE
-+#include <linux/netfilter_mime.h>
-+
-+#define INFOP(fmt, args...) printk(KERN_INFO "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#if 0
-+#define DEBUGP(fmt, args...) printk(KERN_DEBUG "%s: %s: " fmt, __FILE__, __FUNCTION__ , ## args)
-+#else
-+#define DEBUGP(fmt, args...)
-+#endif
-+
-+#define MAX_PORTS       8
-+#define DSTACT_AUTO     0
-+#define DSTACT_STRIP    1
-+#define DSTACT_NONE     2
-+
-+static char*    stunaddr = NULL;
-+static char*    destaction = NULL;
-+
-+static u_int32_t extip = 0;
-+static int       dstact = 0;
-+
-+MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
-+MODULE_DESCRIPTION("RTSP network address translation module");
-+MODULE_LICENSE("GPL");
-+module_param(stunaddr, charp, 0644);
-+MODULE_PARM_DESC(stunaddr, "Address for detecting STUN");
-+module_param(destaction, charp, 0644);
-+MODULE_PARM_DESC(destaction, "Action for destination parameter (auto/strip/none)");
-+
-+#define SKIP_WSPACE(ptr,len,off) while(off < len && isspace(*(ptr+off))) { off++; }
-+
-+/*** helper functions ***/
-+
-+static void
-+get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
-+{
-+    struct iphdr*   iph  = ip_hdr(skb);
-+    struct tcphdr*  tcph = (void *)iph + ip_hdrlen(skb);
-+
-+    *pptcpdata = (char*)tcph +  tcph->doff*4;
-+    *ptcpdatalen = ((char*)skb_transport_header(skb) + skb->len) - *pptcpdata;
-+}
-+
-+/*** nat functions ***/
-+
-+/*
-+ * Mangle the "Transport:" header:
-+ *   - Replace all occurences of "client_port=<spec>"
-+ *   - Handle destination parameter
-+ *
-+ * In:
-+ *   ct, ctinfo = conntrack context
-+ *   skb        = packet
-+ *   tranoff    = Transport header offset from TCP data
-+ *   tranlen    = Transport header length (incl. CRLF)
-+ *   rport_lo   = replacement low  port (host endian)
-+ *   rport_hi   = replacement high port (host endian)
-+ *
-+ * Returns packet size difference.
-+ *
-+ * Assumes that a complete transport header is present, ending with CR or LF
-+ */
-+static int
-+rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
-+                 struct nf_conntrack_expect* exp,
-+								 struct ip_ct_rtsp_expect* prtspexp,
-+                 struct sk_buff* skb, uint tranoff, uint tranlen)
-+{
-+    char*       ptcp;
-+    uint        tcplen;
-+    char*       ptran;
-+    char        rbuf1[16];      /* Replacement buffer (one port) */
-+    uint        rbuf1len;       /* Replacement len (one port) */
-+    char        rbufa[16];      /* Replacement buffer (all ports) */
-+    uint        rbufalen;       /* Replacement len (all ports) */
-+    u_int32_t   newip;
-+    u_int16_t   loport, hiport;
-+    uint        off = 0;
-+    uint        diff;           /* Number of bytes we removed */
-+
-+    struct nf_conn *ct = exp->master;
-+    struct nf_conntrack_tuple *t;
-+
-+    char    szextaddr[15+1];
-+    uint    extaddrlen;
-+    int     is_stun;
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    ptran = ptcp+tranoff;
-+
-+    if (tranoff+tranlen > tcplen || tcplen-tranoff < tranlen ||
-+        tranlen < 10 || !iseol(ptran[tranlen-1]) ||
-+        nf_strncasecmp(ptran, "Transport:", 10) != 0)
-+    {
-+        INFOP("sanity check failed\n");
-+        return 0;
-+    }
-+    off += 10;
-+    SKIP_WSPACE(ptcp+tranoff, tranlen, off);
-+
-+    newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+    t = &exp->tuple;
-+    t->dst.u3.ip = newip;
-+
-+    extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
-+                       : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
-+    DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
-+
-+    rbuf1len = rbufalen = 0;
-+    switch (prtspexp->pbtype)
-+    {
-+    case pb_single:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu\n", loport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu", loport);
-+        }
-+        break;
-+    case pb_range:
-+        for (loport = prtspexp->loport; loport != 0; loport += 2) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                hiport = loport + ~exp->mask.src.u.udp.port;
-+                DEBUGP("using ports %hu-%hu\n", loport, hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            rbufalen = sprintf(rbufa, "%hu-%hu", loport, loport+1);
-+        }
-+        break;
-+    case pb_discon:
-+        for (loport = prtspexp->loport; loport != 0; loport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(loport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (1 of 2)\n", loport);
-+                break;
-+            }
-+        }
-+        for (hiport = prtspexp->hiport; hiport != 0; hiport++) /* XXX: improper wrap? */
-+        {
-+            t->dst.u.udp.port = htons(hiport);
-+            if (nf_ct_expect_related(exp) == 0)
-+            {
-+                DEBUGP("using port %hu (2 of 2)\n", hiport);
-+                break;
-+            }
-+        }
-+        if (loport != 0 && hiport != 0)
-+        {
-+            rbuf1len = sprintf(rbuf1, "%hu", loport);
-+            if (hiport == loport+1)
-+            {
-+                rbufalen = sprintf(rbufa, "%hu-%hu", loport, hiport);
-+            }
-+            else
-+            {
-+                rbufalen = sprintf(rbufa, "%hu/%hu", loport, hiport);
-+            }
-+        }
-+        break;
-+    }
-+
-+    if (rbuf1len == 0)
-+    {
-+        return 0;   /* cannot get replacement port(s) */
-+    }
-+
-+    /* Transport: tran;field;field=val,tran;field;field=val,... */
-+    while (off < tranlen)
-+    {
-+        uint        saveoff;
-+        const char* pparamend;
-+        uint        nextparamoff;
-+
-+        pparamend = memchr(ptran+off, ',', tranlen-off);
-+        pparamend = (pparamend == NULL) ? ptran+tranlen : pparamend+1;
-+        nextparamoff = pparamend-ptcp;
-+
-+        /*
-+         * We pass over each param twice.  On the first pass, we look for a
-+         * destination= field.  It is handled by the security policy.  If it
-+         * is present, allowed, and equal to our external address, we assume
-+         * that STUN is being used and we leave the client_port= field alone.
-+         */
-+        is_stun = 0;
-+        saveoff = off;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
-+            {
-+                if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
-+                {
-+                    is_stun = 1;
-+                }
-+                if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
-+                {
-+                    diff = nextfieldoff-off;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                                         off, diff, NULL, 0))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+        if (is_stun)
-+        {
-+            continue;
-+        }
-+        off = saveoff;
-+        while (off < nextparamoff)
-+        {
-+            const char* pfieldend;
-+            uint        nextfieldoff;
-+
-+            pfieldend = memchr(ptran+off, ';', nextparamoff-off);
-+            nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
-+
-+            if (strncmp(ptran+off, "client_port=", 12) == 0)
-+            {
-+                u_int16_t   port;
-+                uint        numlen;
-+                uint        origoff;
-+                uint        origlen;
-+                char*       rbuf    = rbuf1;
-+                uint        rbuflen = rbuf1len;
-+
-+                off += 12;
-+                origoff = (ptran-ptcp)+off;
-+                origlen = 0;
-+                numlen = nf_strtou16(ptran+off, &port);
-+                off += numlen;
-+                origlen += numlen;
-+                if (port != prtspexp->loport)
-+                {
-+                    DEBUGP("multiple ports found, port %hu ignored\n", port);
-+                }
-+                else
-+                {
-+                    if (ptran[off] == '-' || ptran[off] == '/')
-+                    {
-+                        off++;
-+                        origlen++;
-+                        numlen = nf_strtou16(ptran+off, &port);
-+                        off += numlen;
-+                        origlen += numlen;
-+                        rbuf = rbufa;
-+                        rbuflen = rbufalen;
-+                    }
-+
-+                    /*
-+                     * note we cannot just memcpy() if the sizes are the same.
-+                     * the mangle function does skb resizing, checks for a
-+                     * cloned skb, and updates the checksums.
-+                     *
-+                     * parameter 4 below is offset from start of tcp data.
-+                     */
-+                    diff = origlen-rbuflen;
-+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-+                                              origoff, origlen, rbuf, rbuflen))
-+                    {
-+                        /* mangle failed, all we can do is bail */
-+			nf_ct_unexpect_related(exp);
-+                        return 0;
-+                    }
-+                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+                    ptran = ptcp+tranoff;
-+                    tranlen -= diff;
-+                    nextparamoff -= diff;
-+                    nextfieldoff -= diff;
-+                }
-+            }
-+
-+            off = nextfieldoff;
-+        }
-+
-+        off = nextparamoff;
-+    }
-+
-+    return 1;
-+}
-+
-+static uint
-+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+	 struct nf_conntrack_expect* exp)
-+{
-+    char*   ptcp;
-+    uint    tcplen;
-+    uint    hdrsoff;
-+    uint    hdrslen;
-+    uint    lineoff;
-+    uint    linelen;
-+    uint    off;
-+
-+    //struct iphdr* iph = (struct iphdr*)skb->nh.iph;
-+    //struct tcphdr* tcph = (struct tcphdr*)((void*)iph + iph->ihl*4);
-+
-+    get_skb_tcpdata(skb, &ptcp, &tcplen);
-+    hdrsoff = matchoff;//exp->seq - ntohl(tcph->seq);
-+    hdrslen = matchlen;
-+    off = hdrsoff;
-+    DEBUGP("NAT rtsp help_out\n");
-+
-+    while (nf_mime_nextline(ptcp, hdrsoff+hdrslen, &off, &lineoff, &linelen))
-+    {
-+        if (linelen == 0)
-+        {
-+            break;
-+        }
-+        if (off > hdrsoff+hdrslen)
-+        {
-+            INFOP("!! overrun !!");
-+            break;
-+        }
-+        DEBUGP("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+
-+        if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
-+        {
-+            uint oldtcplen = tcplen;
-+	    DEBUGP("hdr: Transport\n");
-+            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
-+            {
-+		DEBUGP("hdr: Transport mangle failed");
-+                break;
-+            }
-+            get_skb_tcpdata(skb, &ptcp, &tcplen);
-+            hdrslen -= (oldtcplen-tcplen);
-+            off -= (oldtcplen-tcplen);
-+            lineoff -= (oldtcplen-tcplen);
-+            linelen -= (oldtcplen-tcplen);
-+            DEBUGP("rep: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
-+        }
-+    }
-+
-+    return NF_ACCEPT;
-+}
-+
-+static unsigned int
-+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
-+     unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
-+     struct nf_conntrack_expect* exp)
-+{
-+    int dir = CTINFO2DIR(ctinfo);
-+    int rc = NF_ACCEPT;
-+
-+    switch (dir)
-+    {
-+    case IP_CT_DIR_ORIGINAL:
-+        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
-+        break;
-+    case IP_CT_DIR_REPLY:
-+	DEBUGP("unmangle ! %u\n", ctinfo);
-+    	/* XXX: unmangle */
-+	rc = NF_ACCEPT;
-+        break;
-+    }
-+    //UNLOCK_BH(&ip_rtsp_lock);
-+
-+    return rc;
-+}
-+
-+static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
-+{
-+    struct nf_nat_multi_range_compat mr;
-+    u_int32_t newdstip, newsrcip, newip;
-+
-+    struct nf_conn *master = ct->master;
-+
-+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+    //FIXME (how to port that ?)
-+    //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
-+    newip = newdstip;
-+
-+    DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+           NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
-+
-+    mr.rangesize = 1;
-+    // We don't want to manip the per-protocol, just the IPs.
-+    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
-+    mr.range[0].min_ip = mr.range[0].max_ip = newip;
-+
-+    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
-+}
-+
-+
-+static void __exit fini(void)
-+{
-+	nf_nat_rtsp_hook = NULL;
-+        nf_nat_rtsp_hook_expectfn = NULL;
-+	synchronize_net();
-+}
-+
-+static int __init init(void)
-+{
-+	printk("nf_nat_rtsp v" IP_NF_RTSP_VERSION " loading\n");
-+
-+	BUG_ON(nf_nat_rtsp_hook);
-+	nf_nat_rtsp_hook = help;
-+        nf_nat_rtsp_hook_expectfn = &expected;
-+
-+	if (stunaddr != NULL)
-+		extip = in_aton(stunaddr);
-+
-+	if (destaction != NULL) {
-+	        if (strcmp(destaction, "auto") == 0)
-+			dstact = DSTACT_AUTO;
-+
-+		if (strcmp(destaction, "strip") == 0)
-+			dstact = DSTACT_STRIP;
-+
-+		if (strcmp(destaction, "none") == 0)
-+			dstact = DSTACT_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+module_init(init);
-+module_exit(fini);
diff --git a/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch
deleted file mode 100644
index 1d513580b3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/200-sched_esfq.patch
+++ /dev/null
@@ -1,795 +0,0 @@
---- a/include/linux/pkt_sched.h
-+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@ struct tc_sfq_xstats {
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values, use esfq instead.
-  */
- 
-+/* ESFQ section */
-+
-+enum
-+{
-+        /* traditional */
-+	TCA_SFQ_HASH_CLASSIC,
-+	TCA_SFQ_HASH_DST,
-+	TCA_SFQ_HASH_SRC,
-+	TCA_SFQ_HASH_FWMARK,
-+	/* conntrack */
-+	TCA_SFQ_HASH_CTORIGDST,
-+	TCA_SFQ_HASH_CTORIGSRC,
-+	TCA_SFQ_HASH_CTREPLDST,
-+	TCA_SFQ_HASH_CTREPLSRC,
-+	TCA_SFQ_HASH_CTNATCHG,
-+};
-+
-+struct tc_esfq_qopt
-+{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
-+	unsigned	hash_kind;	/* Hash function to use for flow identification */
-+};
-+
- /* RED section */
- 
- enum {
---- a/net/sched/Kconfig
-+++ b/net/sched/Kconfig
-@@ -137,6 +137,37 @@ config NET_SCH_SFQ
- 	  To compile this code as a module, choose M here: the
- 	  module will be called sch_sfq.
- 
-+config NET_SCH_ESFQ
-+	tristate "Enhanced Stochastic Fairness Queueing (ESFQ)"
-+	---help---
-+	  Say Y here if you want to use the Enhanced Stochastic Fairness
-+	  Queueing (ESFQ) packet scheduling algorithm for some of your network
-+	  devices or as a leaf discipline for a classful qdisc such as HTB or
-+	  CBQ (see the top of <file:net/sched/sch_esfq.c> for details and
-+	  references to the SFQ algorithm).
-+
-+	  This is an enchanced SFQ version which allows you to control some
-+	  hardcoded values in the SFQ scheduler.
-+
-+	  ESFQ also adds control of the hash function used to identify packet
-+	  flows. The original SFQ discipline hashes by connection; ESFQ add
-+	  several other hashing methods, such as by src IP or by dst IP, which
-+	  can be more fair to users in some networking situations.
-+
-+	  To compile this code as a module, choose M here: the
-+	  module will be called sch_esfq.
-+
-+config NET_SCH_ESFQ_NFCT
-+	bool "Connection Tracking Hash Types"
-+	depends on NET_SCH_ESFQ && NF_CONNTRACK
-+	---help---
-+	  Say Y here to enable support for hashing based on netfilter connection
-+	  tracking information. This is useful for a router that is also using
-+	  NAT to connect privately-addressed hosts to the Internet. If you want
-+	  to provide fair distribution of upstream bandwidth, ESFQ must use
-+	  connection tracking information, since all outgoing packets will share
-+	  the same source address.
-+
- config NET_SCH_TEQL
- 	tristate "True Link Equalizer (TEQL)"
- 	---help---
---- a/net/sched/Makefile
-+++ b/net/sched/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_NET_SCH_GRED)	+= sch_gred.o
- obj-$(CONFIG_NET_SCH_INGRESS)	+= sch_ingress.o 
- obj-$(CONFIG_NET_SCH_DSMARK)	+= sch_dsmark.o
- obj-$(CONFIG_NET_SCH_SFQ)	+= sch_sfq.o
-+obj-$(CONFIG_NET_SCH_ESFQ)	+= sch_esfq.o
- obj-$(CONFIG_NET_SCH_TBF)	+= sch_tbf.o
- obj-$(CONFIG_NET_SCH_TEQL)	+= sch_teql.o
- obj-$(CONFIG_NET_SCH_PRIO)	+= sch_prio.o
---- /dev/null
-+++ b/net/sched/sch_esfq.c
-@@ -0,0 +1,702 @@
-+/*
-+ * net/sched/sch_esfq.c	Extended Stochastic Fairness Queueing discipline.
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-+ *
-+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
-+ *		Added dynamic depth,limit,divisor,hash_kind options.
-+ *		Added dst and src hashes.
-+ *
-+ * 		Alexander Clouter, <alex@digriz.org.uk>
-+ *		Ported ESFQ to Linux 2.6.
-+ *
-+ * 		Corey Hickey, <bugfood-c@fatooh.org>
-+ *		Maintenance of the Linux 2.6 port.
-+ *		Added fwmark hash (thanks to Robert Kurjata).
-+ *		Added usage of jhash.
-+ *		Added conntrack support.
-+ *		Added ctnatchg hash (thanks to Ben Pfountz).
-+ */
-+
-+#include <linux/module.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <linux/bitops.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/socket.h>
-+#include <linux/sockios.h>
-+#include <linux/in.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/if_ether.h>
-+#include <linux/inet.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/notifier.h>
-+#include <linux/init.h>
-+#include <net/ip.h>
-+#include <net/netlink.h>
-+#include <linux/ipv6.h>
-+#include <net/route.h>
-+#include <linux/skbuff.h>
-+#include <net/sock.h>
-+#include <net/pkt_sched.h>
-+#include <linux/jhash.h>
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+#include <net/netfilter/nf_conntrack.h>
-+#endif
-+
-+/*	Stochastic Fairness Queuing algorithm.
-+	For more comments look at sch_sfq.c.
-+	The difference is that you can change limit, depth,
-+	hash table size and choose alternate hash types.
-+
-+	classic:	same as in sch_sfq.c
-+	dst:		destination IP address
-+	src:		source IP address
-+	fwmark:		netfilter mark value
-+	ctorigdst:	original destination IP address
-+	ctorigsrc:	original source IP address
-+	ctrepldst:	reply destination IP address
-+	ctreplsrc:	reply source IP
-+
-+*/
-+
-+#define ESFQ_HEAD 0
-+#define ESFQ_TAIL 1
-+
-+/* This type should contain at least SFQ_DEPTH*2 values */
-+typedef unsigned int esfq_index;
-+
-+struct esfq_head
-+{
-+	esfq_index	next;
-+	esfq_index	prev;
-+};
-+
-+struct esfq_sched_data
-+{
-+/* Parameters */
-+	int		perturb_period;
-+	unsigned	quantum;	/* Allotment per round: MUST BE >= MTU */
-+	int		limit;
-+	unsigned	depth;
-+	unsigned	hash_divisor;
-+	unsigned	hash_kind;
-+/* Variables */
-+	struct timer_list perturb_timer;
-+	int		perturbation;
-+	esfq_index	tail;		/* Index of current slot in round */
-+	esfq_index	max_depth;	/* Maximal depth */
-+
-+	esfq_index	*ht;			/* Hash table */
-+	esfq_index	*next;			/* Active slots link */
-+	short		*allot;			/* Current allotment per slot */
-+	unsigned short	*hash;			/* Hash value indexed by slots */
-+	struct sk_buff_head	*qs;		/* Slot queue */
-+	struct esfq_head	*dep;		/* Linked list of slots, indexed by depth */
-+};
-+
-+/* This contains the info we will hash. */
-+struct esfq_packet_info
-+{
-+	u32	proto;		/* protocol or port */
-+	u32	src;		/* source from packet header */
-+	u32	dst;		/* destination from packet header */
-+	u32	ctorigsrc;	/* original source from conntrack */
-+	u32	ctorigdst;	/* original destination from conntrack */
-+	u32	ctreplsrc;	/* reply source from conntrack */
-+	u32	ctrepldst;	/* reply destination from conntrack */
-+	u32	mark;		/* netfilter mark (fwmark) */
-+};
-+
-+static __inline__ unsigned esfq_jhash_1word(struct esfq_sched_data *q,u32 a)
-+{
-+	return jhash_1word(a, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_2words(struct esfq_sched_data *q, u32 a, u32 b)
-+{
-+	return jhash_2words(a, b, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static __inline__ unsigned esfq_jhash_3words(struct esfq_sched_data *q, u32 a, u32 b, u32 c)
-+{
-+	return jhash_3words(a, b, c, q->perturbation) & (q->hash_divisor-1);
-+}
-+
-+static unsigned esfq_hash(struct esfq_sched_data *q, struct sk_buff *skb)
-+{
-+	struct esfq_packet_info info;
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	enum ip_conntrack_info ctinfo;
-+	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
-+#endif
-+
-+	switch (skb->protocol) {
-+	case __constant_htons(ETH_P_IP):
-+	{
-+		struct iphdr *iph = ip_hdr(skb);
-+		info.dst = iph->daddr;
-+		info.src = iph->saddr;
-+		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
-+		    (iph->protocol == IPPROTO_TCP ||
-+		     iph->protocol == IPPROTO_UDP ||
-+		     iph->protocol == IPPROTO_SCTP ||
-+		     iph->protocol == IPPROTO_DCCP ||
-+		     iph->protocol == IPPROTO_ESP))
-+			info.proto = *(((u32*)iph) + iph->ihl);
-+		else
-+			info.proto = iph->protocol;
-+		break;
-+	}
-+	case __constant_htons(ETH_P_IPV6):
-+	{
-+		struct ipv6hdr *iph = ipv6_hdr(skb);
-+		/* Hash ipv6 addresses into a u32. This isn't ideal,
-+		 * but the code is simple. */
-+		info.dst = jhash2(iph->daddr.s6_addr32, 4, q->perturbation);
-+		info.src = jhash2(iph->saddr.s6_addr32, 4, q->perturbation);
-+		if (iph->nexthdr == IPPROTO_TCP ||
-+		    iph->nexthdr == IPPROTO_UDP ||
-+		    iph->nexthdr == IPPROTO_SCTP ||
-+		    iph->nexthdr == IPPROTO_DCCP ||
-+		    iph->nexthdr == IPPROTO_ESP)
-+			info.proto = *(u32*)&iph[1];
-+		else
-+			info.proto = iph->nexthdr;
-+		break;
-+	}
-+	default:
-+		info.dst   = (u32)(unsigned long)skb_dst(skb);
-+		info.src   = (u32)(unsigned long)skb->sk;
-+		info.proto = skb->protocol;
-+	}
-+
-+	info.mark = skb->mark;
-+
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	/* defaults if there is no conntrack info */
-+	info.ctorigsrc = info.src;
-+	info.ctorigdst = info.dst;
-+	info.ctreplsrc = info.dst;
-+	info.ctrepldst = info.src;
-+	/* collect conntrack info */
-+	if (ct && ct != &nf_conntrack_untracked) {
-+		if (skb->protocol == __constant_htons(ETH_P_IP)) {
-+			info.ctorigsrc = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-+			info.ctorigdst = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip;
-+			info.ctreplsrc = ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip;
-+			info.ctrepldst = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip;
-+		}
-+		else if (skb->protocol == __constant_htons(ETH_P_IPV6)) {
-+			/* Again, hash ipv6 addresses into a single u32. */
-+			info.ctorigsrc = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctorigdst = jhash2(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.ip6, 4, q->perturbation);
-+			info.ctreplsrc = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip6, 4, q->perturbation);
-+			info.ctrepldst = jhash2(ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip6, 4, q->perturbation);
-+		}
-+
-+	}
-+#endif
-+
-+	switch(q->hash_kind) {
-+	case TCA_SFQ_HASH_CLASSIC:
-+		return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+	case TCA_SFQ_HASH_DST:
-+		return esfq_jhash_1word(q, info.dst);
-+	case TCA_SFQ_HASH_SRC:
-+		return esfq_jhash_1word(q, info.src);
-+	case TCA_SFQ_HASH_FWMARK:
-+		return esfq_jhash_1word(q, info.mark);
-+#ifdef CONFIG_NET_SCH_ESFQ_NFCT
-+	case TCA_SFQ_HASH_CTORIGDST:
-+		return esfq_jhash_1word(q, info.ctorigdst);
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+		return esfq_jhash_1word(q, info.ctorigsrc);
-+	case TCA_SFQ_HASH_CTREPLDST:
-+		return esfq_jhash_1word(q, info.ctrepldst);
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	case TCA_SFQ_HASH_CTNATCHG:
-+	{
-+		if (info.ctorigdst == info.ctreplsrc)
-+			return esfq_jhash_1word(q, info.ctorigsrc);
-+		return esfq_jhash_1word(q, info.ctreplsrc);
-+	}
-+#endif
-+	default:
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash method. Falling back to classic.\n");
-+	}
-+	return esfq_jhash_3words(q, info.dst, info.src, info.proto);
-+}
-+
-+static inline void esfq_link(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d = q->qs[x].qlen + q->depth;
-+
-+	p = d;
-+	n = q->dep[d].next;
-+	q->dep[x].next = n;
-+	q->dep[x].prev = p;
-+	q->dep[p].next = q->dep[n].prev = x;
-+}
-+
-+static inline void esfq_dec(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+
-+	if (n == p && q->max_depth == q->qs[x].qlen + 1)
-+		q->max_depth--;
-+
-+	esfq_link(q, x);
-+}
-+
-+static inline void esfq_inc(struct esfq_sched_data *q, esfq_index x)
-+{
-+	esfq_index p, n;
-+	int d;
-+
-+	n = q->dep[x].next;
-+	p = q->dep[x].prev;
-+	q->dep[p].next = n;
-+	q->dep[n].prev = p;
-+	d = q->qs[x].qlen;
-+	if (q->max_depth < d)
-+		q->max_depth = d;
-+
-+	esfq_link(q, x);
-+}
-+
-+static unsigned int esfq_drop(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index d = q->max_depth;
-+	struct sk_buff *skb;
-+	unsigned int len;
-+
-+	/* Queue is full! Find the longest slot and
-+	   drop a packet from it */
-+
-+	if (d > 1) {
-+		esfq_index x = q->dep[d+q->depth].next;
-+		skb = q->qs[x].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[x]);
-+		kfree_skb(skb);
-+		esfq_dec(q, x);
-+		sch->q.qlen--;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	if (d == 1) {
-+		/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */
-+		d = q->next[q->tail];
-+		q->next[q->tail] = q->next[d];
-+		q->allot[q->next[d]] += q->quantum;
-+		skb = q->qs[d].prev;
-+		len = skb->len;
-+		__skb_unlink(skb, &q->qs[d]);
-+		kfree_skb(skb);
-+		esfq_dec(q, d);
-+		sch->q.qlen--;
-+		q->ht[q->hash[d]] = q->depth;
-+		sch->qstats.drops++;
-+		sch->qstats.backlog -= len;
-+		return len;
-+	}
-+
-+	return 0;
-+}
-+
-+static void esfq_q_enqueue(struct sk_buff *skb, struct esfq_sched_data *q, unsigned int end)
-+{
-+	unsigned hash = esfq_hash(q, skb);
-+	unsigned depth = q->depth;
-+	esfq_index x;
-+
-+	x = q->ht[hash];
-+	if (x == depth) {
-+		q->ht[hash] = x = q->dep[depth].next;
-+		q->hash[x] = hash;
-+	}
-+
-+	if (end == ESFQ_TAIL)
-+		__skb_queue_tail(&q->qs[x], skb);
-+	else
-+		__skb_queue_head(&q->qs[x], skb);
-+
-+	esfq_inc(q, x);
-+	if (q->qs[x].qlen == 1) {		/* The flow is new */
-+		if (q->tail == depth) {	/* It is the first flow */
-+			q->tail = x;
-+			q->next[x] = x;
-+			q->allot[x] = q->quantum;
-+		} else {
-+			q->next[x] = q->next[q->tail];
-+			q->next[q->tail] = x;
-+			q->tail = x;
-+		}
-+	}
-+}
-+
-+static int esfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_enqueue(skb, q, ESFQ_TAIL);
-+	sch->qstats.backlog += skb->len;
-+	if (++sch->q.qlen < q->limit-1) {
-+		sch->bstats.bytes += skb->len;
-+		sch->bstats.packets++;
-+		return 0;
-+	}
-+
-+	sch->qstats.drops++;
-+	esfq_drop(sch);
-+	return NET_XMIT_CN;
-+}
-+
-+static struct sk_buff *esfq_peek(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_index a;
-+
-+	/* No active slots */
-+	if (q->tail == q->depth)
-+		return NULL;
-+
-+	a = q->next[q->tail];
-+	return skb_peek(&q->qs[a]);
-+}
-+
-+static struct sk_buff *esfq_q_dequeue(struct esfq_sched_data *q)
-+{
-+	struct sk_buff *skb;
-+	unsigned depth = q->depth;
-+	esfq_index a, old_a;
-+
-+	/* No active slots */
-+	if (q->tail == depth)
-+		return NULL;
-+
-+	a = old_a = q->next[q->tail];
-+
-+	/* Grab packet */
-+	skb = __skb_dequeue(&q->qs[a]);
-+	esfq_dec(q, a);
-+
-+	/* Is the slot empty? */
-+	if (q->qs[a].qlen == 0) {
-+		q->ht[q->hash[a]] = depth;
-+		a = q->next[a];
-+		if (a == old_a) {
-+			q->tail = depth;
-+			return skb;
-+		}
-+		q->next[q->tail] = a;
-+		q->allot[a] += q->quantum;
-+	} else if ((q->allot[a] -= skb->len) <= 0) {
-+		q->tail = a;
-+		a = q->next[a];
-+		q->allot[a] += q->quantum;
-+	}
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *esfq_dequeue(struct Qdisc* sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct sk_buff *skb;
-+
-+	skb = esfq_q_dequeue(q);
-+	if (skb == NULL)
-+		return NULL;
-+	sch->q.qlen--;
-+	sch->qstats.backlog -= skb->len;
-+	return skb;
-+}
-+
-+static void esfq_q_destroy(struct esfq_sched_data *q)
-+{
-+	del_timer(&q->perturb_timer);
-+	if(q->ht)
-+		kfree(q->ht);
-+	if(q->dep)
-+		kfree(q->dep);
-+	if(q->next)
-+		kfree(q->next);
-+	if(q->allot)
-+		kfree(q->allot);
-+	if(q->hash)
-+		kfree(q->hash);
-+	if(q->qs)
-+		kfree(q->qs);
-+}
-+
-+static void esfq_destroy(struct Qdisc *sch)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	esfq_q_destroy(q);
-+}
-+
-+
-+static void esfq_reset(struct Qdisc* sch)
-+{
-+	struct sk_buff *skb;
-+
-+	while ((skb = esfq_dequeue(sch)) != NULL)
-+		kfree_skb(skb);
-+}
-+
-+static void esfq_perturbation(unsigned long arg)
-+{
-+	struct Qdisc *sch = (struct Qdisc*)arg;
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+
-+	q->perturbation = net_random()&0x1F;
-+
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+}
-+
-+static unsigned int esfq_check_hash(unsigned int kind)
-+{
-+	switch (kind) {
-+	case TCA_SFQ_HASH_CTORIGDST:
-+	case TCA_SFQ_HASH_CTORIGSRC:
-+	case TCA_SFQ_HASH_CTREPLDST:
-+	case TCA_SFQ_HASH_CTREPLSRC:
-+	case TCA_SFQ_HASH_CTNATCHG:
-+#ifndef CONFIG_NET_SCH_ESFQ_NFCT
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Conntrack hash types disabled in kernel config. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+#endif
-+	case TCA_SFQ_HASH_CLASSIC:
-+	case TCA_SFQ_HASH_DST:
-+	case TCA_SFQ_HASH_SRC:
-+	case TCA_SFQ_HASH_FWMARK:
-+		return kind;
-+	default:
-+	{
-+		if (net_ratelimit())
-+			printk(KERN_WARNING "ESFQ: Unknown hash type. Falling back to classic.\n");
-+		return TCA_SFQ_HASH_CLASSIC;
-+	}
-+	}
-+}
-+
-+static int esfq_q_init(struct esfq_sched_data *q, struct nlattr *opt)
-+{
-+	struct tc_esfq_qopt *ctl = nla_data(opt);
-+	esfq_index p = ~0U/2;
-+	int i;
-+
-+	if (opt && opt->nla_len < nla_attr_size(sizeof(*ctl)))
-+		return -EINVAL;
-+
-+	q->perturbation = 0;
-+	q->hash_kind = TCA_SFQ_HASH_CLASSIC;
-+	q->max_depth = 0;
-+	if (opt == NULL) {
-+		q->perturb_period = 0;
-+		q->hash_divisor = 1024;
-+		q->tail = q->limit = q->depth = 128;
-+
-+	} else {
-+		struct tc_esfq_qopt *ctl = nla_data(opt);
-+		if (ctl->quantum)
-+			q->quantum = ctl->quantum;
-+		q->perturb_period = ctl->perturb_period*HZ;
-+		q->hash_divisor = ctl->divisor ? : 1024;
-+		q->tail = q->limit = q->depth = ctl->flows ? : 128;
-+
-+		if ( q->depth > p - 1 )
-+			return -EINVAL;
-+
-+		if (ctl->limit)
-+			q->limit = min_t(u32, ctl->limit, q->depth);
-+
-+		if (ctl->hash_kind) {
-+			q->hash_kind = esfq_check_hash(ctl->hash_kind);
-+		}
-+	}
-+
-+	q->ht = kmalloc(q->hash_divisor*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->ht)
-+		goto err_case;
-+	q->dep = kmalloc((1+q->depth*2)*sizeof(struct esfq_head), GFP_KERNEL);
-+	if (!q->dep)
-+		goto err_case;
-+	q->next = kmalloc(q->depth*sizeof(esfq_index), GFP_KERNEL);
-+	if (!q->next)
-+		goto err_case;
-+	q->allot = kmalloc(q->depth*sizeof(short), GFP_KERNEL);
-+	if (!q->allot)
-+		goto err_case;
-+	q->hash = kmalloc(q->depth*sizeof(unsigned short), GFP_KERNEL);
-+	if (!q->hash)
-+		goto err_case;
-+	q->qs = kmalloc(q->depth*sizeof(struct sk_buff_head), GFP_KERNEL);
-+	if (!q->qs)
-+		goto err_case;
-+
-+	for (i=0; i< q->hash_divisor; i++)
-+		q->ht[i] = q->depth;
-+	for (i=0; i<q->depth; i++) {
-+		skb_queue_head_init(&q->qs[i]);
-+		q->dep[i+q->depth].next = i+q->depth;
-+		q->dep[i+q->depth].prev = i+q->depth;
-+	}
-+
-+	for (i=0; i<q->depth; i++)
-+		esfq_link(q, i);
-+	return 0;
-+err_case:
-+	esfq_q_destroy(q);
-+	return -ENOBUFS;
-+}
-+
-+static int esfq_init(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	int err;
-+
-+	q->quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(q, opt)))
-+		return err;
-+
-+	init_timer(&q->perturb_timer);
-+	q->perturb_timer.data = (unsigned long)sch;
-+	q->perturb_timer.function = esfq_perturbation;
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	}
-+
-+	return 0;
-+}
-+
-+static int esfq_change(struct Qdisc *sch, struct nlattr *opt)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	struct esfq_sched_data new;
-+	struct sk_buff *skb;
-+	int err;
-+
-+	/* set up new queue */
-+	memset(&new, 0, sizeof(struct esfq_sched_data));
-+	new.quantum = psched_mtu(qdisc_dev(sch)); /* default */
-+	if ((err = esfq_q_init(&new, opt)))
-+		return err;
-+
-+	/* copy all packets from the old queue to the new queue */
-+	sch_tree_lock(sch);
-+	while ((skb = esfq_q_dequeue(q)) != NULL)
-+		esfq_q_enqueue(skb, &new, ESFQ_TAIL);
-+
-+	/* clean up the old queue */
-+	esfq_q_destroy(q);
-+
-+	/* copy elements of the new queue into the old queue */
-+	q->perturb_period = new.perturb_period;
-+	q->quantum        = new.quantum;
-+	q->limit          = new.limit;
-+	q->depth          = new.depth;
-+	q->hash_divisor   = new.hash_divisor;
-+	q->hash_kind      = new.hash_kind;
-+	q->tail           = new.tail;
-+	q->max_depth      = new.max_depth;
-+	q->ht    = new.ht;
-+	q->dep   = new.dep;
-+	q->next  = new.next;
-+	q->allot = new.allot;
-+	q->hash  = new.hash;
-+	q->qs    = new.qs;
-+
-+	/* finish up */
-+	if (q->perturb_period) {
-+		q->perturb_timer.expires = jiffies + q->perturb_period;
-+		add_timer(&q->perturb_timer);
-+	} else {
-+		q->perturbation = 0;
-+	}
-+	sch_tree_unlock(sch);
-+	return 0;
-+}
-+
-+static int esfq_dump(struct Qdisc *sch, struct sk_buff *skb)
-+{
-+	struct esfq_sched_data *q = qdisc_priv(sch);
-+	unsigned char *b = skb_tail_pointer(skb);
-+	struct tc_esfq_qopt opt;
-+
-+	opt.quantum = q->quantum;
-+	opt.perturb_period = q->perturb_period/HZ;
-+
-+	opt.limit = q->limit;
-+	opt.divisor = q->hash_divisor;
-+	opt.flows = q->depth;
-+	opt.hash_kind = q->hash_kind;
-+
-+	NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
-+
-+	return skb->len;
-+
-+nla_put_failure:
-+	nlmsg_trim(skb, b);
-+	return -1;
-+}
-+
-+static struct Qdisc_ops esfq_qdisc_ops =
-+{
-+	.next		=	NULL,
-+	.cl_ops		=	NULL,
-+	.id		=	"esfq",
-+	.priv_size	=	sizeof(struct esfq_sched_data),
-+	.enqueue	=	esfq_enqueue,
-+	.dequeue	=	esfq_dequeue,
-+	.peek		=	esfq_peek,
-+	.drop		=	esfq_drop,
-+	.init		=	esfq_init,
-+	.reset		=	esfq_reset,
-+	.destroy	=	esfq_destroy,
-+	.change		=	esfq_change,
-+	.dump		=	esfq_dump,
-+	.owner		=	THIS_MODULE,
-+};
-+
-+static int __init esfq_module_init(void)
-+{
-+	return register_qdisc(&esfq_qdisc_ops);
-+}
-+static void __exit esfq_module_exit(void)
-+{
-+	unregister_qdisc(&esfq_qdisc_ops);
-+}
-+module_init(esfq_module_init)
-+module_exit(esfq_module_exit)
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch
deleted file mode 100644
index 0218fa19c5..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/201-jhash3.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/include/linux/jhash.h
-+++ b/include/linux/jhash.h
-@@ -3,80 +3,95 @@
- 
- /* jhash.h: Jenkins hash support.
-  *
-- * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net)
-+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
-  *
-  * http://burtleburtle.net/bob/hash/
-  *
-  * These are the credits from Bob's sources:
-  *
-- * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
-- * hash(), hash2(), hash3, and mix() are externally useful functions.
-- * Routines to test the hash are included if SELF_TEST is defined.
-- * You can use this free for any purpose.  It has no warranty.
-+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-  *
-- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
-+ * These are functions for producing 32-bit hashes for hash table lookup.
-+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-+ * are externally useful functions.  Routines to test the hash are included 
-+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-+ * the public domain.  It has no warranty.
-+ *
-+ * Copyright (C) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
-  *
-  * I've modified Bob's hash to be useful in the Linux kernel, and
-- * any bugs present are surely my fault.  -DaveM
-+ * any bugs present are my fault.  Jozsef
-  */
- 
--/* NOTE: Arguments are modified. */
--#define __jhash_mix(a, b, c) \
-+#define __rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-+
-+/* __jhash_mix - mix 3 32-bit values reversibly. */
-+#define __jhash_mix(a,b,c) \
-+{ \
-+  a -= c;  a ^= __rot(c, 4);  c += b; \
-+  b -= a;  b ^= __rot(a, 6);  a += c; \
-+  c -= b;  c ^= __rot(b, 8);  b += a; \
-+  a -= c;  a ^= __rot(c,16);  c += b; \
-+  b -= a;  b ^= __rot(a,19);  a += c; \
-+  c -= b;  c ^= __rot(b, 4);  b += a; \
-+}
-+
-+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
-+#define __jhash_final(a,b,c) \
- { \
--  a -= b; a -= c; a ^= (c>>13); \
--  b -= c; b -= a; b ^= (a<<8); \
--  c -= a; c -= b; c ^= (b>>13); \
--  a -= b; a -= c; a ^= (c>>12);  \
--  b -= c; b -= a; b ^= (a<<16); \
--  c -= a; c -= b; c ^= (b>>5); \
--  a -= b; a -= c; a ^= (c>>3);  \
--  b -= c; b -= a; b ^= (a<<10); \
--  c -= a; c -= b; c ^= (b>>15); \
-+  c ^= b; c -= __rot(b,14); \
-+  a ^= c; a -= __rot(c,11); \
-+  b ^= a; b -= __rot(a,25); \
-+  c ^= b; c -= __rot(b,16); \
-+  a ^= c; a -= __rot(c,4);  \
-+  b ^= a; b -= __rot(a,14); \
-+  c ^= b; c -= __rot(b,24); \
- }
- 
--/* The golden ration: an arbitrary value */
--#define JHASH_GOLDEN_RATIO	0x9e3779b9
-+/* An arbitrary initial parameter */
-+#define JHASH_GOLDEN_RATIO	0xdeadbeef
- 
- /* The most generic version, hashes an arbitrary sequence
-  * of bytes.  No alignment or length assumptions are made about
-- * the input key.
-+ * the input key. The result depends on endianness.
-  */
- static inline u32 jhash(const void *key, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a,b,c;
- 	const u8 *k = key;
- 
--	len = length;
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--
--	while (len >= 12) {
--		a += (k[0] +((u32)k[1]<<8) +((u32)k[2]<<16) +((u32)k[3]<<24));
--		b += (k[4] +((u32)k[5]<<8) +((u32)k[6]<<16) +((u32)k[7]<<24));
--		c += (k[8] +((u32)k[9]<<8) +((u32)k[10]<<16)+((u32)k[11]<<24));
--
--		__jhash_mix(a,b,c);
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + length + initval;
- 
-+	/* all but the last block: affect some 32 bits of (a,b,c) */
-+	while (length > 12) {
-+    		a += (k[0] + ((u32)k[1]<<8) + ((u32)k[2]<<16) + ((u32)k[3]<<24));
-+		b += (k[4] + ((u32)k[5]<<8) + ((u32)k[6]<<16) + ((u32)k[7]<<24));
-+		c += (k[8] + ((u32)k[9]<<8) + ((u32)k[10]<<16) + ((u32)k[11]<<24));
-+		__jhash_mix(a, b, c);
-+		length -= 12;
- 		k += 12;
--		len -= 12;
- 	}
- 
--	c += length;
--	switch (len) {
--	case 11: c += ((u32)k[10]<<24);
--	case 10: c += ((u32)k[9]<<16);
--	case 9 : c += ((u32)k[8]<<8);
--	case 8 : b += ((u32)k[7]<<24);
--	case 7 : b += ((u32)k[6]<<16);
--	case 6 : b += ((u32)k[5]<<8);
-+	/* last block: affect all 32 bits of (c) */
-+	/* all the case statements fall through */
-+	switch (length) {
-+	case 12: c += (u32)k[11]<<24;
-+	case 11: c += (u32)k[10]<<16;
-+	case 10: c += (u32)k[9]<<8;
-+	case 9 : c += k[8];
-+	case 8 : b += (u32)k[7]<<24;
-+	case 7 : b += (u32)k[6]<<16;
-+	case 6 : b += (u32)k[5]<<8;
- 	case 5 : b += k[4];
--	case 4 : a += ((u32)k[3]<<24);
--	case 3 : a += ((u32)k[2]<<16);
--	case 2 : a += ((u32)k[1]<<8);
-+	case 4 : a += (u32)k[3]<<24;
-+	case 3 : a += (u32)k[2]<<16;
-+	case 2 : a += (u32)k[1]<<8;
- 	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+		__jhash_final(a, b, c);
-+	case 0 :
-+		break;
-+	}
- 
- 	return c;
- }
-@@ -86,58 +101,57 @@ static inline u32 jhash(const void *key,
-  */
- static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
- {
--	u32 a, b, c, len;
-+	u32 a, b, c;
- 
--	a = b = JHASH_GOLDEN_RATIO;
--	c = initval;
--	len = length;
-+	/* Set up the internal state */
-+	a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- 
--	while (len >= 3) {
-+	/* handle most of the key */
-+	while (length > 3) {
- 		a += k[0];
- 		b += k[1];
- 		c += k[2];
- 		__jhash_mix(a, b, c);
--		k += 3; len -= 3;
-+		length -= 3;
-+		k += 3;
- 	}
- 
--	c += length * 4;
--
--	switch (len) {
--	case 2 : b += k[1];
--	case 1 : a += k[0];
--	};
--
--	__jhash_mix(a,b,c);
-+	/* handle the last 3 u32's */
-+	/* all the case statements fall through */ 
-+	switch (length) {
-+	case 3: c += k[2];
-+	case 2: b += k[1];
-+	case 1: a += k[0];
-+		__jhash_final(a, b, c);
-+	case 0:     /* case 0: nothing left to add */
-+		break;
-+	}
- 
- 	return c;
- }
- 
--
- /* A special ultra-optimized versions that knows they are hashing exactly
-  * 3, 2 or 1 word(s).
-- *
-- * NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
-- *       done at the end is not done here.
-  */
- static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
- {
--	a += JHASH_GOLDEN_RATIO;
--	b += JHASH_GOLDEN_RATIO;
--	c += initval;
-+	a += JHASH_GOLDEN_RATIO + initval;
-+	b += JHASH_GOLDEN_RATIO + initval;
-+	c += JHASH_GOLDEN_RATIO + initval;
- 
--	__jhash_mix(a, b, c);
-+	__jhash_final(a, b, c);
- 
- 	return c;
- }
- 
- static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
- {
--	return jhash_3words(a, b, 0, initval);
-+	return jhash_3words(0, a, b, initval);
- }
- 
- static inline u32 jhash_1word(u32 a, u32 initval)
- {
--	return jhash_3words(a, 0, 0, initval);
-+	return jhash_3words(0, 0, a, initval);
- }
- 
- #endif /* _LINUX_JHASH_H */
diff --git a/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch
deleted file mode 100644
index e4324717b4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/202-mips_mem_functions_performance.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/arch/mips/include/asm/string.h
-+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
- 
- #define __HAVE_ARCH_MEMSET
- extern void *memset(void *__s, int __c, size_t __count);
-+#define memset(__s, __c, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memset((__s), (__c), __len);		\
-+	else							\
-+		__ret = __builtin_memset((__s), (__c), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMCPY
- extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
-+#define memcpy(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memcpy((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memcpy((dst), (src), __len);	\
-+	__ret;							\
-+})
- 
- #define __HAVE_ARCH_MEMMOVE
- extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
-+#define memmove(dst, src, len)					\
-+({								\
-+	size_t __len = (len);					\
-+	void *__ret;						\
-+	if (__builtin_constant_p(len) && __len >= 64)		\
-+		__ret = memmove((dst), (src), __len);		\
-+	else							\
-+		__ret = __builtin_memmove((dst), (src), __len);	\
-+	__ret;							\
-+})
-+
-+#define __HAVE_ARCH_MEMCMP
-+#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
- 
- #endif /* _ASM_STRING_H */
---- a/arch/mips/lib/Makefile
-+++ b/arch/mips/lib/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- lib-y	+= csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
--	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o
-+	   strlen_user.o strncpy_user.o strnlen_user.o uncached.o memcmp.o
- 
- obj-y			+= iomap.o
- obj-$(CONFIG_PCI)	+= iomap-pci.o
---- /dev/null
-+++ b/arch/mips/lib/memcmp.c
-@@ -0,0 +1,22 @@
-+/*
-+ *  copied from linux/lib/string.c
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+
-+#undef memcmp
-+int memcmp(const void *cs, const void *ct, size_t count)
-+{
-+	const unsigned char *su1, *su2;
-+	int res = 0;
-+
-+	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
-+		if ((res = *su1 - *su2) != 0)
-+			break;
-+	return res;
-+}
-+EXPORT_SYMBOL(memcmp);
-+
diff --git a/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch
deleted file mode 100644
index fe8cecfc77..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/203-slab_maxsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -130,8 +130,8 @@ int kmem_ptr_validate(struct kmem_cache
-  * to do various tricks to work around compiler limitations in order to
-  * ensure proper constant folding.
-  */
--#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
--				(MAX_ORDER + PAGE_SHIFT - 1) : 25)
-+#define KMALLOC_SHIFT_HIGH	((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
-+				(MAX_ORDER + PAGE_SHIFT - 1) : 17)
- 
- #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_HIGH)
- #define KMALLOC_MAX_ORDER	(KMALLOC_SHIFT_HIGH - PAGE_SHIFT)
diff --git a/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch
deleted file mode 100644
index 16d3e1f8e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/204-jffs2_eofdetect.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- a/fs/jffs2/build.c
-+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
- 	dbg_fsbuild("scanned flash completely\n");
- 	jffs2_dbg_dump_block_lists_nolock(c);
- 
-+	if (c->flags & (1 << 7)) {
-+		printk("%s(): unlocking the mtd device... ", __func__);
-+		if (c->mtd->unlock)
-+			c->mtd->unlock(c->mtd, 0, c->mtd->size);
-+		printk("done.\n");
-+
-+		printk("%s(): erasing all blocks after the end marker... ", __func__);
-+		jffs2_erase_pending_blocks(c, -1);
-+		printk("done.\n");
-+	}
-+
- 	dbg_fsbuild("pass 1 starting\n");
- 	c->flags |= JFFS2_SB_FLAG_BUILDING;
- 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
---- a/fs/jffs2/scan.c
-+++ b/fs/jffs2/scan.c
-@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
- 		/* reset summary info for next eraseblock scan */
- 		jffs2_sum_reset_collected(s);
- 
--		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
--						buf_size, s);
-+		if (c->flags & (1 << 7))
-+			ret = BLK_STATE_ALLFF;
-+		else
-+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset),
-+							buf_size, s);
- 
- 		if (ret < 0)
- 			goto out;
-@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
- 			sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
-@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
-+								  sumlen - buf_len);
- 					if (err)
- 						return err;
- 				}
-@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
- 			return err;
- 	}
- 
-+	if ((buf[0] == 0xde) &&
-+		(buf[1] == 0xad) &&
-+		(buf[2] == 0xc0) &&
-+		(buf[3] == 0xde)) {
-+		/* end of filesystem. erase everything after this point */
-+		printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset);
-+		c->flags |= (1 << 7);
-+
-+		return BLK_STATE_ALLFF;
-+	}
-+
- 	/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
- 	ofs = 0;
- 
-@@ -671,7 +685,7 @@ scan_more:
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -907,7 +921,7 @@ scan_more:
- 
- 	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
diff --git a/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch
deleted file mode 100644
index 1272e82c75..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/207-powerpc_asm_segment_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null
-+++ b/include/asm-powerpc/segment.h
-@@ -0,0 +1,6 @@
-+#ifndef _ASM_SEGMENT_H
-+#define _ASM_SEGMENT_H
-+
-+/* Only here because we have some old header files that expect it.. */
-+
-+#endif /* _ASM_SEGMENT_H */
diff --git a/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch b/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch
deleted file mode 100644
index 0cbf4ed32b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/208-mips_oprofile_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -49,7 +49,9 @@ ifneq ($(SUBARCH),$(ARCH))
- endif
- 
- ifndef CONFIG_FUNCTION_TRACER
--cflags-y := -ffunction-sections
-+  ifndef CONFIG_PROFILING
-+    cflags-y := -ffunction-sections
-+  endif
- endif
- ifdef CONFIG_FUNCTION_GRAPH_TRACER
-   ifndef KBUILD_MCOUNT_RA_ADDRESS
---- a/arch/mips/oprofile/op_model_mipsxx.c
-+++ b/arch/mips/oprofile/op_model_mipsxx.c
-@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
- 	}
- }
- 
-+static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
-+{
-+	return mipsxx_perfcount_handler();
-+}
-+
- static int __init mipsxx_init(void)
- {
- 	int counters;
-@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
- 	save_perf_irq = perf_irq;
- 	perf_irq = mipsxx_perfcount_handler;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
-+			IRQF_SHARED, "Perfcounter", save_perf_irq);
-+
- 	return 0;
- }
- 
-@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
- {
- 	int counters = op_model_mipsxx_ops.num_counters;
- 
-+	if (cp0_perfcount_irq >= 0)
-+		free_irq(cp0_perfcount_irq, save_perf_irq);
-+
- 	counters = counters_per_cpu_to_total(counters);
- 	on_each_cpu(reset_counters, (void *)(long)counters, 1);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch
deleted file mode 100644
index d7e3220d24..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/209-mini_fo.patch
+++ /dev/null
@@ -1,7782 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -181,6 +181,7 @@ source "fs/logfs/Kconfig"
- source "fs/cramfs/Kconfig"
- source "fs/squashfs/Kconfig"
- source "fs/freevxfs/Kconfig"
-+source "fs/mini_fo/Kconfig"
- source "fs/minix/Kconfig"
- source "fs/omfs/Kconfig"
- source "fs/hpfs/Kconfig"
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)		+= squashfs/
- obj-y				+= ramfs/
- obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
- obj-$(CONFIG_CODA_FS)		+= coda/
-+obj-$(CONFIG_MINI_FO)		+= mini_fo/
- obj-$(CONFIG_MINIX_FS)		+= minix/
- obj-$(CONFIG_FAT_FS)		+= fat/
- obj-$(CONFIG_BFS_FS)		+= bfs/
---- /dev/null
-+++ b/fs/mini_fo/aux.c
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/* check if file exists in storage  */
-+int exists_in_storage(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+	if(dtost(dentry) == MODIFIED || dtost(dentry) == CREATED || dtost(dentry) == DEL_REWRITTEN)
-+		return 1;
-+	return 0;
-+}
-+
-+/* check if dentry is in an existing state */
-+int is_mini_fo_existant(dentry_t *dentry)
-+{
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) == DELETED || dtost(dentry) == NON_EXISTANT)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+/*
-+ * This function will create a negative storage dentry for
-+ * dentry, what is required for many create like options.
-+ * It will create the storage structure if necessary.
-+ */
-+int get_neg_sto_dentry(dentry_t *dentry)
-+{
-+	int err = 0;
-+	unsigned int len;
-+	const unsigned char *name;
-+
-+	if(!dentry ||
-+	   !dtopd(dentry) ||
-+	   !(dtost(dentry) == UNMODIFIED ||
-+	     dtost(dentry) == NON_EXISTANT ||
-+	     dtost(dentry) == DELETED)) {
-+		printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	/* Have we got a neg. dentry already? */
-+	if(dtohd2(dentry)) {
-+		err = 0;
-+		goto out;
-+	}
-+	if(dtost(dentry->d_parent) == UNMODIFIED) {
-+		/* build sto struct */
-+		err = build_sto_structure(dentry->d_parent->d_parent, dentry->d_parent);
-+		if(err ||
-+		   dtost(dentry->d_parent) != MODIFIED) {
-+			printk(KERN_CRIT "mini_fo: get_neg_sto_dentry: ERROR building sto structure.\n");
-+			err = -1;
-+			goto out;
-+		}
-+	}
-+
-+	len = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+
-+	dtohd2(dentry) =
-+		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+
-+ out:
-+	return err;
-+}
-+
-+int check_mini_fo_dentry(dentry_t *dentry)
-+{
-+ 	ASSERT(dentry != NULL);
-+	ASSERT(dtopd(dentry) != NULL);
-+	ASSERT((dtohd(dentry) != NULL) || (dtohd2(dentry) != NULL));
-+
-+/* 	if(dtost(dentry) == MODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT(dtohd(dentry) != NULL); */
-+/* 		ASSERT(dtohd(dentry)->d_inode != NULL); */
-+/* 		ASSERT(dtohd2(dentry) != NULL); */
-+/* 		ASSERT(dtohd2(dentry)->d_inode != NULL); */
-+/* 	} */
-+/* 	else if(dtost(dentry) == UNMODIFIED) { */
-+/* 		ASSERT(dentry->d_inode != NULL); */
-+/* 		ASSERT( */
-+/* 	} */
-+	return 0;
-+}
-+
-+int check_mini_fo_file(file_t *file)
-+{
-+	ASSERT(file != NULL);
-+	ASSERT(ftopd(file) != NULL);
-+	ASSERT(file->f_dentry != NULL);
-+
-+	/* violent checking, check depending of state and type
-+	 *	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {}
-+	 */
-+	ASSERT((ftohf(file) != NULL) || (ftohf2(file) != NULL));
-+	return 0;
-+}
-+
-+int check_mini_fo_inode(inode_t *inode)
-+{
-+	ASSERT(inode != NULL);
-+	ASSERT(itopd(inode) != NULL);
-+	ASSERT((itohi(inode) != NULL) || (itohi2(inode) != NULL));
-+	return 0;
-+}
-+
-+/*
-+ * will walk a base path as provided by get_mini_fo_bpath and return
-+ * the (hopefully ;-) ) positive dentry of the renamed base dir.
-+ *
-+ * This does some work of path_init.
-+ */
-+dentry_t *bpath_walk(super_block_t *sb, char *bpath)
-+{
-+	int err;
-+        struct vfsmount *mnt;
-+	struct nameidata nd;
-+
-+	/* be paranoid */
-+	if(!bpath || bpath[0] != '/') {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid string.\n");
-+		return NULL;
-+	}
-+	if(!sb || !stopd(sb)) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: Invalid sb.\n");
-+		return NULL;
-+	}
-+
-+	/* fix this: how do I reach this lock?
-+	 * read_lock(&current->fs->lock); */
-+	mnt = mntget(stopd(sb)->hidden_mnt);
-+	/* read_unlock(&current->fs->lock); */
-+
-+	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
-+
-+	/* validate */
-+	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
-+		return NULL;
-+	}
-+	return nd.dentry;
-+}
-+
-+
-+/* returns the full path of the basefile incl. its name */
-+int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len)
-+{
-+	char *buf_walker;
-+	int len = 0;
-+	dentry_t *sky_walker;
-+
-+	if(!dentry || !dtohd(dentry)) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		len += sky_walker->d_name.len + 1 ; /* 1 for '/' */
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* 1 to oil the loop */
-+	*bpath = (char*)  kmalloc(len + 1, GFP_KERNEL);
-+	if(!*bpath) {
-+		printk(KERN_CRIT "mini_fo: get_mini_fo_bpath: out of mem.\n");
-+		return -1;
-+	}
-+	buf_walker = *bpath+len; /* put it on last char */
-+	*buf_walker = '\n';
-+	sky_walker = dtohd(dentry);
-+
-+	do {
-+		buf_walker -= sky_walker->d_name.len;
-+		strncpy(buf_walker,
-+			sky_walker->d_name.name,
-+			sky_walker->d_name.len);
-+		*(--buf_walker) = '/';
-+		sky_walker = sky_walker->d_parent;
-+	} while(sky_walker != stopd(dentry->d_inode->i_sb)->base_dir_dentry);
-+
-+	/* bpath_len doesn't count newline! */
-+	*bpath_len = len;
-+ 	return 0;
-+}
-+
-+int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+		    dentry_t *src_dentry, struct vfsmount *src_mnt)
-+{
-+	void *buf;
-+	mm_segment_t old_fs;
-+	file_t *tgt_file;
-+	file_t *src_file;
-+	int bytes, len, tmp, err;
-+	err = 0;
-+
-+	if(!(tgt_dentry->d_inode && src_dentry->d_inode)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, neg. dentry passed.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dget(tgt_dentry);
-+	dget(src_dentry);
-+	mntget(tgt_mnt);
-+	mntget(src_mnt);
-+
-+	/* open file write only */
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	if(!tgt_file || IS_ERR(tgt_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
-+		err = PTR_ERR(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* open file read only */
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	if(!src_file || IS_ERR(src_file)) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
-+		err = PTR_ERR(src_file);
-+
-+		/* close target file */
-+		fput(tgt_file);
-+		goto out_err;
-+	}
-+
-+	/* check if the filesystem(s) support read respective write */
-+	if(!src_file->f_op->read || !tgt_file->f_op->write) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, no fs read or write support.\n");
-+		err = -EPERM;
-+		goto out_close;
-+	}
-+
-+	/* allocate a page for transfering the data */
-+	buf = (void *) __get_free_page(GFP_KERNEL);
-+	if(!buf) {
-+		printk(KERN_CRIT "mini_fo_cp_cont: ERROR, out of kernel mem.\n");
-+		goto out_err;
-+	}
-+
-+	tgt_file->f_pos = 0;
-+	src_file->f_pos = 0;
-+
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+
-+	/* Doing this I assume that a read operation will return a full
-+	 * buffer while there is still data to read, and a less than
-+	 * full buffer when all data has been read.
-+	 */
-+	bytes = len = PAGE_SIZE;
-+	while(bytes == len) {
-+		bytes = src_file->f_op->read(src_file, buf, len,
-+					     &src_file->f_pos);
-+		tmp = tgt_file->f_op->write(tgt_file, buf, bytes,
-+					    &tgt_file->f_pos);
-+		if(tmp != bytes) {
-+			printk(KERN_CRIT "mini_fo_cp_cont: ERROR writing.\n");
-+			goto out_close_unset;
-+		}
-+	}
-+
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+	fput(tgt_file);
-+	fput(src_file);
-+	goto out;
-+
-+ out_close_unset:
-+	free_page((unsigned long) buf);
-+	set_fs(old_fs);
-+
-+ out_close:
-+	fput(tgt_file);
-+	fput(src_file);
-+
-+ out_err:
-+	dput(tgt_dentry);
-+	dput(src_dentry);
-+
-+	/* mk: not sure if this need to be done */
-+	mntput(tgt_mnt);
-+	mntput(src_mnt);
-+
-+ out:
-+	return err;
-+}
-+
-+/* mk:
-+ * ndl (no-duplicate list) stuff
-+ * This is used in mini_fo_readdir, to save the storage directory contents
-+ * and later when reading base, match them against the list in order
-+ * to avoid duplicates.
-+ */
-+
-+/* add a file specified by name and len to the ndl
-+ * Return values: 0 on success, <0 on failure.
-+ */
-+int ndl_add_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct ndl_entry *tmp_entry;
-+
-+	tmp_entry = (struct ndl_entry *)
-+		kmalloc(sizeof(struct ndl_entry), GFP_KERNEL);
-+	if(!tmp_entry) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+        tmp_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!tmp_entry->name) {
-+                printk(KERN_CRIT "mini_fo: ndl_add_entry: out of mem.\n");
-+                return -ENOMEM;
-+        }
-+	strncpy(tmp_entry->name, name, len);
-+        tmp_entry->len = len;
-+
-+        list_add(&tmp_entry->list, &rd->ndl_list);
-+        rd->ndl_size++;
-+        return 0;
-+}
-+
-+/* delete all list entries and free memory */
-+void ndl_put_list(struct readdir_data *rd)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return;
-+	while(!list_empty(&rd->ndl_list)) {
-+		tmp = rd->ndl_list.next;
-+                list_del(tmp);
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+		kfree(tmp_entry->name);
-+                kfree(tmp_entry);
-+        }
-+	rd->ndl_size = 0;
-+}
-+
-+/* Check if a file specified by name and len is in the ndl
-+ * Return value: 0 if not in list, 1 if file is found in ndl.
-+ */
-+int ndl_check_entry(struct readdir_data *rd, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+	struct ndl_entry *tmp_entry;
-+
-+	if(rd->ndl_size <= 0)
-+		return 0;
-+
-+	list_for_each(tmp, &rd->ndl_list) {
-+                tmp_entry = list_entry(tmp, struct ndl_entry, list);
-+                if(tmp_entry->len != len)
-+                        continue;
-+                if(!strncmp(tmp_entry->name, name, len))
-+                        return 1;
-+        }
-+        return 0;
-+}
-+
-+/* mk:
-+ * Recursive function to create corresponding directorys in the storage fs.
-+ * The function will build the storage directorys up to dentry.
-+ */
-+int build_sto_structure(dentry_t *dir, dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(dentry->d_parent != dir) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [1].\n");
-+		return 1;
-+	}
-+
-+       	if(dtost(dir) != MODIFIED) {
-+		err = build_sto_structure(dir->d_parent, dentry->d_parent);
-+		if(err)
-+			return err;
-+	}
-+
-+	/* ok, coming back again. */
-+	check_mini_fo_dentry(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(!hidden_sto_dentry) {
-+		/*
-+		 * This is the case after creating the first
-+		 * hidden_sto_dentry.
-+		 * After one negative storage_dentry, all pointers to
-+		 * hidden_storage dentries are set to NULL. We need to
-+		 * create the negative dentry before we create the storage
-+		 * file.
-+		 */
-+		unsigned int len;
-+		const unsigned char *name;
-+		len = dtohd(dentry)->d_name.len;
-+		name = dtohd(dentry)->d_name.name;
-+		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		dtohd2(dentry) = hidden_sto_dentry;
-+	}
-+
-+	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	/* lets be safe */
-+	if(dtohd2(dir) != hidden_sto_dir_dentry) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-+		return 1;
-+	}
-+
-+	/* check for errors in lock_parent */
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if(IS_ERR(hidden_sto_dir_dentry)) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: lock_parent failed.\n");
-+		return err;
-+	}
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			dir->d_inode->i_mode);
-+
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return err;
-+	}
-+
-+	/* everything ok! */
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
-+		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
-+		up(&dir->d_inode->i_sem);
-+#endif
-+		dput(dir);
-+		return 1;
-+	}
-+
-+	/* interpose the new inode and set new state */
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	dtopd(dentry)->state = MODIFIED;
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+	fist_copy_attr_timesizes(dir->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dir->d_inode->i_nlink++;
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+	return 0;
-+}
-+
-+
-+#if 0 /* unused */
-+
-+/*
-+ * Read "len" bytes from "filename" into "buf".
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_read_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+    /* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDONLY, 0);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_read_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->read)
-+	return -2;  /* file(system) doesn't allow reads */
-+
-+    /* now read len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->read(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+
-+
-+/*
-+ * Write "len" bytes from "buf" to "filename"
-+ * "buf" is in kernel space.
-+ */
-+int
-+mini_fo_write_file(const char *filename, void *buf, int len)
-+{
-+    file_t *filp;
-+    mm_segment_t oldfs;
-+    int bytes;
-+				/* Chroot? Maybe NULL isn't right here */
-+    filp = filp_open(filename, O_RDWR|O_CREAT, 0640);
-+    if (!filp || IS_ERR(filp)) {
-+	printk("mini_fo_write_file err %d\n", (int) PTR_ERR(filp));
-+	return -1;  /* or do something else */
-+    }
-+
-+    if (!filp->f_op->write)
-+	return -2;  /* file(system) doesn't allow writes */
-+
-+    /* now write len bytes from offset 0 */
-+    filp->f_pos = 0;		/* start offset */
-+    oldfs = get_fs();
-+    set_fs(KERNEL_DS);
-+    bytes = filp->f_op->write(filp, buf, len, &filp->f_pos);
-+    set_fs(oldfs);
-+
-+    /* close the file */
-+    fput(filp);
-+
-+    return bytes;
-+}
-+
-+#endif /* unused */
-+
---- /dev/null
-+++ b/fs/mini_fo/ChangeLog
-@@ -0,0 +1,281 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
-+2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
-+
-+	* Bugfix for a serious memory leak in mini_fo_follow_link.
-+
-+2005-09-21  Markus Klotzbuecher  <mk@mary>
-+
-+	* new release 0.6.1
-+
-+	* fix of a compiler warning due to changes in 2.6.13
-+
-+2005-09-21  Klaus Wenninger  <klaus.wenninger@siemens.com>
-+
-+	* file.c: readdir: fix for a bug that caused directory entries
-+          to show up twice when using storage filesystems such as
-+          minixfs or pramfs.
-+
-+2005-06-30  Eric Lammerts <eric@lammerts.org>
-+
-+	* fix for an oops when overwriting a binary thats beeing
-+          executed.
-+
-+2005-06-09    <mk@mary>
-+
-+	* Renamed overlay to mini_fo-overlay.
-+
-+	* Added mini_fo-merge script to allow merging of storage and base
-+	after making modifications.
-+
-+2005-05-22  root  <mk@mary>
-+
-+	* Added overlay script that allows to easily mount mini_fo ontop
-+	of a given base directory
-+
-+2005-05-10    <mk@mary>
-+
-+	* inode.c: xattr functions return -EOPNOSUPP instead of
-+          -ENOSUPP, what confuses "ls -l"
-+
-+	* Changed license from LGPL to GPL.
-+
-+2005-05-08  root  <mk@mary>
-+
-+	* Makefile: clean it up and added make install and make
-+          uninstall.
-+
-+2005-05-06    <mk@mary>
-+
-+	* merged devel branch back to main. [v0-6-0-pre3]
-+
-+	* removed unused files print.c and fist_ioctl. [devel-0-0-18]
-+
-+	* ioctl: removed fist_ioctl stuff, that is not needed for
-+          now.
-+
-+2005-05-03    <mk@mary>
-+
-+	* file.c: simplified mini_fo_open and mini_fo_setattr using
-+          new state changing functions. [devel-0-0-17]
-+
-+	* inode.c: Fixed getattr state bug (see below) in 2.4 function
-+          mini_fo_inode revalidate.
-+
-+	* inode.c: found an other bug in mini_fo_getattr. States are not
-+	  reliable in this function, as a file can be opened, unlinked and
-+	  the getattr function called. This results in a deleted dentry
-+	  with an inode. Fix is to ignore states and simply use the inode
-+	  available.
-+
-+2005-04-29    <mk@mary>
-+
-+	* file.c: Bugfix and cleanup in fasync and fsync. [devel-0-0-16]
-+
-+	* file.c: do not use mini_fo_lock so the generic version is
-+          used (I guess).
-+
-+	* inode.c: getattr, never call getattr on lower files, as this
-+          will cause the inum to change.
-+
-+	* inode.c: rename_reg_file renamed to rename_nondir, as it
-+          doesn't matter as long it't not a dir. Removed all
-+          rename_dev_file etc.
-+
-+	* tagged as devel-0-0-15
-+
-+	* inode.c: added support for chosing support for extended
-+          attrs at compile time by XATTR define in mini_fo.h .
-+
-+	* inode.c: fixed mini_fo_getattr to use mini_fo inode and not
-+          lower again, what avoids inode number changes that confused
-+          rm again. This is the proper solution.
-+
-+2005-04-24    <mk@mary>
-+
-+	* all files: updated Copyright notive to 2005. [devel-0-0-14]
-+
-+	* inode.c: fixed mini_fo_getattr to not change the inode
-+          number, even if lower files change.
-+
-+	* super.c: fixed a bug that caused deleted base file to show
-+          up suddenly after some time, or after creating a special
-+          file. The problem was that after some time or after special
-+          file creating sync_sb_inodes is called by the vfs, that
-+          called our mini_fo_put_inode. There was (wrongly) called
-+          __meta_put_lists, that nuked the lists, although the inode
-+          was going to continue its life. Moving __meta_put_lists to
-+          mini_fo_clear_inode, where an inode is really destroyed,
-+          solved the problem.
-+
-+
-+2005-04-23    <mk@mary>
-+
-+	* state.c, aux.c: more cleaning up and
-+          simplifications. [devel-0-0-13]
-+
-+	* inode.c: implemented mini_fo_getattr, that was required for
-+          2.6 because inode_revalidate has been remove there, and the
-+	  old "du" bug returned.
-+
-+
-+2005-04-20    <mk@mary>
-+
-+	* aux.c: get_neg_sto_dentry(): allow to be called for dentries
-+          in state UNMODIFIED, NON_EXISTANT _and_ DELETED.
-+
-+2005-04-19    <mk@mary>
-+
-+	* Fixed a bug under 2.6 that caused files deleted via mini_fo
-+          not to be deleted properly and therefore the fs filled up
-+          untill no memory was left. [devel-0-0-12]
-+
-+	* Added basic hard link support. This means that creating
-+          hardlinks will work, but existing ones will be treated as
-+          individual files. [devel-0-0-11]
-+
-+2005-04-17    <mk@mary>
-+
-+	* Bugfixes
-+
-+2005-04-13  root  <mk@mary>
-+
-+	* Added file state.c for the state transition
-+          functions. Doesn't work very well yet, though...
-+
-+2005-04-12    <mk@mary>
-+
-+	* Porting to 2.6 started, which is easier than expected, also
-+          due to Olivier previous work.
-+
-+2005-04-08    <mk@mary>
-+
-+	* Fixed the bug that caused du to return invalid sizes of
-+          directory trees. The problem was that
-+          mini_fo_inode_revalidate didn't always copy the attributes
-+          from the base inode properly.
-+
-+2005-04-01  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Merged devel branch back to main trunk and updated the
-+          RELEASE notes. This will be 0-6-0-pre1.
-+
-+2005-03-31  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed some bugs in rename_reg_file, that only showed up in
-+          the kernel compile test. Kernel compiles cleanly ontop of
-+          mini_fo, now also make mrproper etc. work. Seems pretty stable.
-+
-+2005-03-28  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Many, many directory renaming bugfixes and a lot of other
-+          cleanup. Dir renaming seems to work relatively stable.
-+
-+2005-03-22  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing lightweight directory renaming. Some
-+          basic testing indicates it works fine.
-+	  Next is to implement testcases for the testsuite and confirm
-+          everything is really working ok.
-+
-+2005-03-18  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Finished implementing meta.c stuff required for directory
-+          renaming.
-+
-+2005-03-17  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Fixed all compile warnings + an extremly old bug that
-+          somehow crept in while reworking the wol stuff to the META
-+          system. Turning on -Werror again... :-)
-+
-+	* Fixed some bugs in the new rename_reg_file function.
-+
-+	* Rewrote mini_fo rename and split it into several
-+          subfunctions, that handle the different types
-+          seperately. Rewrote the regular file function aswell, as it
-+          was implemented somewhat inefficient.
-+
-+2005-03-16  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Implemented new META subsystem, removed old WOL stuff in favor
-+	  if it.
-+
-+	* After some basic testing everything seems ok...
-+
-+2005-03-11  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Renaming a non regular file caused trouble because I always
-+	  tried to copy the contents. Now I only do this for regular
-+	  files. mini_fo_rename still isn't implemented properly, renaming
-+	  of device files, symlinks etc. results in a empty regular file
-+	  instead of the proper type.
-+
-+	* Directory renaming suddenly works! What a surprise! I guess
-+          this is because renaming is implemented as making a copy and
-+          removing the original. Still this might not work
-+          everywhere...
-+
-+2005-03-09  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Bugfix, when a mini_fo directory that exists in storage
-+  	  (state: MODIFIED, CREATED and DEL_REWRITTEN) is deleted, a
-+  	  possibly existing WOL file contained in it needs to be
-+  	  deleted too.
-+
-+	* Starting cleanup: defined state names in order to get rid of
-+          the state numbers.
-+
-+2005-03-08  Markus Klotzbuecher  <mk@chasey>
-+
-+	* Makefile fix, fist_ioctl was built against wrong sources if ARCH=um
-+
-+	* Fixed a bug in dentry.c, mini_fo_d_hash. In state 4 =
-+          DEL_REWRITTEN the hash was calculated from the base dentry,
-+          which was wrong and and caused assertions in
-+          __mini_fo_hidden_dentry to fail.
-+
-+2005-02-21    <mk@mary>
-+
-+	* Implemented directory deleting (inode.c)
-+
-+	* main.c: made mini_fo_parse_options a little more robust.
-+
-+2004-12-22    <mk@mary>
-+
-+	* Makefile cleanup and uml stuff, removed unneccessary files
-+
-+	* Created a new and hopefully more informative README
-+
-+	* CHANGELOG: created a new CHANGELOG and added old entries reversely
-+
-+
-+2004-10-24 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Fix: owner and group where not correctly copied from base to
-+          storage.
-+
-+
-+2004-10-05 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of fsync, fasync and lock mini_fo functions.
-+
-+
-+2004-09-29 Bob Lee <bob@pantasys.com>
-+
-+	* Fix of a serious pointer bug
-+
-+
-+2004-09-28 Gleb Natapov <gleb@nbase.co.il>
-+
-+	* Implementation of mini_fo_mknod and mini_fo_rename, support
-+          for device files.
-+
---- /dev/null
-+++ b/fs/mini_fo/dentry.c
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+/*
-+ * THIS IS A BOOLEAN FUNCTION: returns 1 if valid, 0 otherwise.
-+ */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_d_revalidate(dentry_t *dentry, struct nameidata *nd)
-+#else
-+mini_fo_d_revalidate(dentry_t *dentry, int flags)
-+#endif
-+{
-+	int err1 = 1; /* valid = 1, invalid = 0 */
-+	int err2 = 1;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	hidden_dentry  = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry &&
-+	   hidden_dentry->d_op &&
-+	   hidden_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, nd);
-+#else
-+		err1 = hidden_dentry->d_op->d_revalidate(hidden_dentry, flags);
-+#endif
-+	}
-+	if(hidden_sto_dentry &&
-+	   hidden_sto_dentry->d_op &&
-+	   hidden_sto_dentry->d_op->d_revalidate) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     nd);
-+#else
-+		err2 = hidden_sto_dentry->d_op->d_revalidate(hidden_sto_dentry,
-+							     flags);
-+#endif
-+	}
-+
-+	/* mk: if one of the lower level dentries are valid,
-+	 * the mini_fo dentry is too.
-+	 */
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_d_hash(dentry_t *dentry, qstr_t *name)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry);
-+	 * hidden_sto_dentry = mini_fo_hidden_sto_dentry(dentry); */
-+
-+	/* state 1, 3, 4, 5: build the hash for the storage dentry */
-+	if((dtopd(dentry)->state == MODIFIED) ||
-+	   (dtopd(dentry)->state == CREATED) ||
-+	   (dtopd(dentry)->state == DEL_REWRITTEN) ||
-+	   (dtopd(dentry)->state == DELETED)) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 2: build the hash for the base dentry */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+		}
-+		goto out;
-+	}
-+	/* state 6: build hash for the dentry that exists */
-+	if(dtopd(dentry)->state == NON_EXISTANT) {
-+		hidden_sto_dentry = dtohd2(dentry);
-+		if(hidden_sto_dentry &&
-+		   hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_hash) {
-+			err = hidden_sto_dentry->d_op->d_hash(hidden_sto_dentry, name);
-+			goto out;
-+		}
-+		hidden_dentry = dtohd(dentry);
-+		if(hidden_dentry &&
-+		   hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_hash) {
-+			err = hidden_dentry->d_op->d_hash(hidden_dentry, name);
-+			goto out;
-+		}
-+	}
-+
-+	printk(KERN_CRIT "mini_fo: d_hash: invalid state detected.\n");
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_d_compare(dentry_t *dentry, qstr_t *a, qstr_t *b)
-+{
-+	int err;
-+	dentry_t *hidden_dentry=NULL;
-+
-+	/* hidden_dentry = mini_fo_hidden_dentry(dentry); */
-+	if(dtohd2(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else if(dtohd(dentry))
-+		hidden_dentry = dtohd(dentry);
-+
-+	if (hidden_dentry && hidden_dentry->d_op && hidden_dentry->d_op->d_compare) {
-+		err = hidden_dentry->d_op->d_compare(hidden_dentry, a, b);
-+	} else {
-+		err = ((a->len != b->len) || memcmp(a->name, b->name, b->len));
-+	}
-+
-+	return err;
-+}
-+
-+
-+int
-+mini_fo_d_delete(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	int err = 0;
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_delete: negative dentry passed.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		if(hidden_dentry->d_op &&
-+		   hidden_dentry->d_op->d_delete) {
-+			err = hidden_dentry->d_op->d_delete(hidden_dentry);
-+		}
-+	}
-+	if(hidden_sto_dentry) {
-+		if(hidden_sto_dentry->d_op &&
-+		   hidden_sto_dentry->d_op->d_delete) {
-+			err = hidden_sto_dentry->d_op->d_delete(hidden_sto_dentry);
-+		}
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+void
-+mini_fo_d_release(dentry_t *dentry)
-+{
-+	dentry_t *hidden_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+
-+	/* this could be a negative dentry, so check first */
-+	if (!dtopd(dentry)) {
-+		printk(KERN_CRIT "mini_fo_d_release: no private data.\n");
-+		goto out;
-+	}
-+	hidden_dentry = dtohd(dentry);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	if(hidden_dentry) {
-+		/* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_dentry);
-+	}
-+	if(hidden_sto_dentry) {
-+                /* decrement hidden dentry's counter and free its inode */
-+		dput(hidden_sto_dentry);
-+	}
-+
-+	/* free private data (mini_fo_dentry_info) here */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* just to be safe */
-+ out:
-+	return;
-+}
-+
-+
-+/*
-+ * we don't really need mini_fo_d_iput, because dentry_iput will call iput() if
-+ * mini_fo_d_iput is not defined. We left this implemented for ease of
-+ * tracing/debugging.
-+ */
-+void
-+mini_fo_d_iput(dentry_t *dentry, inode_t *inode)
-+{
-+	iput(inode);
-+}
-+
-+
-+struct dentry_operations mini_fo_dops = {
-+	d_revalidate:	mini_fo_d_revalidate,
-+	d_hash:		mini_fo_d_hash,
-+	d_compare:		mini_fo_d_compare,
-+	d_release:		mini_fo_d_release,
-+	d_delete:		mini_fo_d_delete,
-+	d_iput:		mini_fo_d_iput,
-+};
---- /dev/null
-+++ b/fs/mini_fo/file.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-+
-+/*******************
-+ * File Operations *
-+ *******************/
-+
-+STATIC loff_t
-+mini_fo_llseek(file_t *file, loff_t offset, int origin)
-+{
-+	loff_t err;
-+	file_t *hidden_file = NULL;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to llseek from a directory */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	/* always set hidden position to this one */
-+	hidden_file->f_pos = file->f_pos;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	memcpy(&(hidden_file->f_ra),
-+	       &(file->f_ra),
-+	       sizeof(struct file_ra_state));
-+#else
-+	if (file->f_reada) { /* update readahead information if needed */
-+		hidden_file->f_reada = file->f_reada;
-+		hidden_file->f_ramax = file->f_ramax;
-+		hidden_file->f_raend = file->f_raend;
-+		hidden_file->f_ralen = file->f_ralen;
-+		hidden_file->f_rawin = file->f_rawin;
-+	}
-+#endif
-+	if (hidden_file->f_op && hidden_file->f_op->llseek)
-+		err = hidden_file->f_op->llseek(hidden_file, offset, origin);
-+	else
-+		err = generic_file_llseek(hidden_file, offset, origin);
-+
-+	if (err < 0)
-+		goto out;
-+
-+	if (err != file->f_pos) {
-+		file->f_pos = err;
-+		// ION maybe this?
-+		// 	file->f_pos = hidden_file->f_pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		file->f_reada = 0;
-+#endif
-+		file->f_version++;
-+	}
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* mk: fanout capable */
-+STATIC ssize_t
-+mini_fo_read(file_t *file, char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	loff_t pos = *ppos;
-+
-+	if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+		/* Check if trying to read from a directory */
-+		/* printk(KERN_CRIT "mini_fo_read: ERROR: trying to read data from a directory.\n"); */
-+		err = -EISDIR;
-+		goto out;
-+	}
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->read)
-+		goto out;
-+
-+	err = hidden_file->f_op->read(hidden_file, buf, count, &pos);
-+	*ppos = pos;
-+
-+	if (err >= 0) {
-+		/* atime should also be updated for reads of size zero or more */
-+		fist_copy_attr_atime(file->f_dentry->d_inode,
-+				     hidden_file->f_dentry->d_inode);
-+	}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * MAJOR HACK
-+	 * because pread() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on read() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+	if (hidden_file->f_reada) { /* update readahead information if needed */
-+		file->f_reada = hidden_file->f_reada;
-+		file->f_ramax = hidden_file->f_ramax;
-+		file->f_raend = hidden_file->f_raend;
-+		file->f_ralen = hidden_file->f_ralen;
-+		file->f_rawin = hidden_file->f_rawin;
-+	}
-+#else
-+	memcpy(&(file->f_ra),&(hidden_file->f_ra),sizeof(struct file_ra_state));
-+#endif
-+
-+ out:
-+	return err;
-+}
-+
-+
-+/* this mini_fo_write() does not modify data pages! */
-+STATIC ssize_t
-+mini_fo_write(file_t *file, const char *buf, size_t count, loff_t *ppos)
-+{
-+	int err = -EINVAL;
-+	file_t *hidden_file = NULL;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	loff_t pos = *ppos;
-+
-+	/* mk: fan out: */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			/* This is bad! We have no storage file to write to. This
-+			 * should never happen because if a file is opened for
-+			 * writing, a copy should have been made earlier.
-+			 */
-+			printk(KERN_CRIT "mini_fo: write : ERROR, no storage file to write.\n");
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	inode = file->f_dentry->d_inode;
-+	hidden_inode = itohi2(inode);
-+	if(!hidden_inode) {
-+		printk(KERN_CRIT "mini_fo: write: no sto inode found, not good.\n");
-+		goto out;
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->write)
-+		goto out;
-+
-+	/* adjust for append -- seek to the end of the file */
-+	if (file->f_flags & O_APPEND)
-+		pos = inode->i_size;
-+
-+	err = hidden_file->f_op->write(hidden_file, buf, count, &pos);
-+
-+	/*
-+	 * copy ctime and mtime from lower layer attributes
-+	 * atime is unchanged for both layers
-+	 */
-+	if (err >= 0)
-+		fist_copy_attr_times(inode, hidden_inode);
-+
-+	*ppos = pos;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	/*
-+	 * XXX: MAJOR HACK
-+	 *
-+	 * because pwrite() does not have any way to tell us that it is
-+	 * our caller, then we don't know for sure if we have to update
-+	 * the file positions.  This hack relies on write() having passed us
-+	 * the "real" pointer of its struct file's f_pos field.
-+	 */
-+	if (ppos == &file->f_pos)
-+		hidden_file->f_pos = *ppos = pos;
-+#endif
-+	/* update this inode's size */
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+ out:
-+	return err;
-+}
-+
-+/* Global variable to hold a file_t pointer.
-+ * This serves to allow mini_fo_filldir function to know which file is
-+ * beeing read, which is required for two reasons:
-+ *
-+ *   - be able to call wol functions in order to avoid listing deleted
-+ *     base files.
-+ *   - if we're reading a directory which is in state 1, we need to
-+ *     maintain a list (in mini_fo_filldir) of which files allready
-+ *     have been copied to userspace,to detect files existing in base
-+ *     and storage and not list them twice.
-+ */
-+filldir_t mini_fo_filldir_orig;
-+file_t *mini_fo_filldir_file;
-+
-+/* mainly copied from fs/readdir.c */
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  u64 ino, unsigned int d_type)
-+#else
-+mini_fo_filldir(void * __buf, const char * name, int namlen, loff_t offset,
-+		  ino_t ino, unsigned int d_type)
-+#endif
-+{
-+	struct getdents_callback * buf = (struct getdents_callback *) __buf;
-+	file_t* file = mini_fo_filldir_file;
-+
-+	/* In theses states we filter meta files in storage (WOL) */
-+	if(file && (dtopd(file->f_dentry)->state == MODIFIED ||
-+		    dtopd(file->f_dentry)->state == CREATED ||
-+		    dtopd(file->f_dentry)->state == DEL_REWRITTEN)) {
-+
-+		int tmp = strlen(META_FILENAME);
-+		if(tmp  == namlen) {
-+			if(!strncmp(name, META_FILENAME, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	/* check if we are merging the contents of storage and base */
-+	if(file && dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* check if we are still reading storage contents, if
-+		 * yes, we just save the name of the file for duplicate
-+		 * checking later. */
-+
-+		if(!ftopd(file)->rd.sto_done) {
-+			/* put file into ndl list */
-+			if(ndl_add_entry(&ftopd(file)->rd, name, namlen))
-+				printk(KERN_CRIT "mini_fo_filldir: Error adding to ndl.\n");
-+		} else {
-+			/* check if file has been deleted */
-+			if(meta_check_d_entry(file->f_dentry, name, namlen))
-+				return 0;
-+
-+			/* do duplicate checking */
-+			if(ndl_check_entry(&ftopd(file)->rd, name, namlen))
-+				return 0;
-+		}
-+	}
-+
-+	return mini_fo_filldir_orig(buf, name, namlen, offset, ino, d_type);
-+}
-+
-+
-+STATIC int
-+mini_fo_readdir(file_t *file, void *dirent, filldir_t filldir)
-+{
-+	int err = 0;/* mk: ??? -ENOTDIR; */
-+	file_t *hidden_file = NULL;
-+	file_t *hidden_sto_file = NULL;
-+	inode_t *inode;
-+	struct getdents_callback *buf;
-+	int oldcount;
-+
-+#if defined(FIST_FILTER_NAME) || defined(FIST_FILTER_SCA)
-+	struct mini_fo_getdents_callback buf;
-+#endif /* FIST_FILTER_NAME || FIST_FILTER_SCA */
-+
-+	buf = (struct getdents_callback *) dirent;
-+	oldcount = buf->count;
-+	inode = file->f_dentry->d_inode;
-+	mini_fo_filldir_file = file;
-+	mini_fo_filldir_orig = filldir;
-+
-+	ftopd(file)->rd.sto_done = 0;
-+	do {
-+		if (ftopd(file) != NULL) {
-+			if(ftohf2(file)) {
-+				hidden_sto_file = ftohf2(file);
-+				err = vfs_readdir(hidden_sto_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_sto_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_sto_file->f_dentry->d_inode);
-+				/* not finshed yet, we'll be called again */
-+				if (buf->count != oldcount)
-+					break;
-+			}
-+
-+			ftopd(file)->rd.sto_done = 1;
-+
-+			if(ftohf(file)) {
-+				hidden_file = ftohf(file);
-+				err = vfs_readdir(hidden_file, mini_fo_filldir, dirent);
-+				file->f_pos = hidden_file->f_pos;
-+				if (err > 0)
-+					fist_copy_attr_atime(inode, hidden_file->f_dentry->d_inode);
-+			}
-+
-+		}
-+	} while (0);
-+
-+	/* mk:
-+	 * we need to check if all the directory data has been copied to userspace,
-+	 * or if we will be called again by userspace to complete the operation.
-+	 */
-+	if(buf->count == oldcount) {
-+		ndl_put_list(&ftopd(file)->rd);
-+	}
-+
-+	/* unset this, safe */
-+	mini_fo_filldir_file = NULL;
-+	return err;
-+}
-+
-+
-+STATIC unsigned int
-+mini_fo_poll(file_t *file, poll_table *wait)
-+{
-+	unsigned int mask = DEFAULT_POLLMASK;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	if (!hidden_file->f_op || !hidden_file->f_op->poll)
-+		goto out;
-+
-+	mask = hidden_file->f_op->poll(hidden_file, wait);
-+
-+ out:
-+	return mask;
-+}
-+
-+/* FIST-LITE special version of mmap */
-+STATIC int
-+mini_fo_mmap(file_t *file, vm_area_t *vma)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	/* fanout capability */
-+	if (ftopd(file) != NULL) {
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+		} else {
-+			hidden_file = ftohf(file);
-+		}
-+	}
-+
-+	ASSERT(hidden_file != NULL);
-+	ASSERT(hidden_file->f_op != NULL);
-+	ASSERT(hidden_file->f_op->mmap != NULL);
-+
-+	vma->vm_file = hidden_file;
-+	err = hidden_file->f_op->mmap(hidden_file, vma);
-+	get_file(hidden_file); /* make sure it doesn't get freed on us */
-+	fput(file);	       /* no need to keep extra ref on ours */
-+
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_open(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+ 	int hidden_flags;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	/* fanout stuff */
-+	file_t *hidden_sto_file = NULL;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	__ftopd(file) =
-+		kmalloc(sizeof(struct mini_fo_file_info), GFP_KERNEL);
-+	if (!ftopd(file)) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* init the readdir_helper structure */
-+	INIT_LIST_HEAD(&ftopd(file)->rd.ndl_list);
-+	ftopd(file)->rd.ndl_size = 0;
-+
-+	/* In certain paths this could stay uninitalized and cause trouble */
-+	ftohf(file) = NULL;
-+	ftohf2(file) = NULL;
-+	hidden_flags = file->f_flags;
-+
-+	/* create storage files? */
-+	if(dtost(file->f_dentry) == UNMODIFIED) {
-+		if(!IS_WRITE_FLAG(file->f_flags)) {
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+			/* dentry_open will decrement mnt refcnt if err.
-+			 * otherwise fput() will do an mntput() for us upon file close. */
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file;	/* link two files */
-+			goto out;
-+		}
-+		else {
-+			if(S_ISDIR(file->f_dentry->d_inode->i_mode)) {
-+				err = dir_unmod_to_mod(file->f_dentry);
-+			} else
-+				err = nondir_unmod_to_mod(file->f_dentry, 1);
-+
-+			if (err) {
-+				printk("mini_fo_open: ERROR creating storage file.\n");
-+				goto out;
-+			}
-+		}
-+	}
-+	hidden_sto_dentry = dtohd2(file->f_dentry);
-+	dget(hidden_sto_dentry);
-+
-+	if(dtopd(file->f_dentry)->state == MODIFIED) {
-+		/* Directorys are special, interpose on both lower level files */
-+		if(S_ISDIR(itohi(inode)->i_mode)) {
-+			/* check for invalid file types of lower level files */
-+			if(!(S_ISDIR(itohi(inode)->i_mode) && S_ISDIR(itohi2(inode)->i_mode))) {
-+				printk(KERN_CRIT "mini_fo_open: meta data corruption detected.\n");
-+				dput(hidden_sto_dentry);
-+				err = -EINVAL;
-+				goto out;
-+			}
-+
-+			/* lower level directorys are ok, open the base file */
-+			hidden_dentry = dtohd(file->f_dentry);
-+			dget(hidden_dentry);
-+
-+			mntget(stopd(inode->i_sb)->hidden_mnt);
-+			hidden_file = dentry_open(hidden_dentry,
-+						  stopd(inode->i_sb)->hidden_mnt,
-+						  hidden_flags);
-+			if (IS_ERR(hidden_file)) {
-+				err = PTR_ERR(hidden_file);
-+				dput(hidden_dentry);
-+				dput(hidden_sto_dentry);
-+				goto out;
-+			}
-+			ftohf(file) = hidden_file; /* link the two files */
-+		}
-+	}
-+
-+	if(!exists_in_storage(file->f_dentry)) {
-+		printk(KERN_CRIT "mini_fo_open: invalid file state detected.\n");
-+		err = -EINVAL;
-+		dput(hidden_sto_dentry);
-+
-+		/* If the base file has been opened, we need to close it here */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* ok, now we can safely open the storage file */
-+	mntget(stopd(inode->i_sb)->hidden_mnt2);
-+	hidden_sto_file = dentry_open(hidden_sto_dentry,
-+				      stopd(inode->i_sb)->hidden_mnt2,
-+				      hidden_flags);
-+
-+	/* dentry_open dputs the dentry if it fails */
-+	if (IS_ERR(hidden_sto_file)) {
-+		err = PTR_ERR(hidden_sto_file);
-+		/* close base file if open */
-+		if(ftohf(file)) {
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				hidden_file->f_op->flush(hidden_file, NULL);
-+#else
-+				hidden_file->f_op->flush(hidden_file);
-+#endif
-+			dput(hidden_dentry);
-+		}
-+		goto out;
-+	}
-+	ftohf2(file) = hidden_sto_file; /* link storage file */
-+
-+ out:
-+	if (err < 0 && ftopd(file)) {
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_flush(file_t *file, fl_owner_t id)
-+#else
-+mini_fo_flush(file_t *file)
-+#endif
-+{
-+	int err1 = 0;		/* assume ok (see open.c:close_fp) */
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	/* mk: we don't do any state checking here, as its not worth the time.
-+	 * Just flush the lower level files if they exist.
-+	 */
-+	if(ftopd(file) != NULL) {
-+		if(ftohf(file) != NULL) {
-+			hidden_file = ftohf(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err1 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err1 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+		if(ftohf2(file) != NULL) {
-+			hidden_file = ftohf2(file);
-+			if (hidden_file->f_op && hidden_file->f_op->flush)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+				err2 = hidden_file->f_op->flush(hidden_file, id);
-+#else
-+				err2 = hidden_file->f_op->flush(hidden_file);
-+#endif
-+		}
-+	}
-+	return (err1 | err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_release(inode_t *inode, file_t *file)
-+{
-+	int err = 0;
-+	file_t *hidden_file = NULL;
-+
-+	if (ftopd(file) != NULL) {
-+		if(ftohf(file)) {
-+			hidden_file = ftohf(file);
-+			fput(hidden_file);
-+		}
-+		if(ftohf2(file)) {
-+			hidden_file = ftohf2(file);
-+			fput(hidden_file);
-+		}
-+		kfree(ftopd(file));
-+	}
-+	return err;
-+}
-+
-+STATIC int
-+mini_fo_fsync(file_t *file, dentry_t *dentry, int datasync)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+
-+	check_mini_fo_file(file);
-+
-+	if ((hidden_file = ftohf(file)) != NULL) {
-+		hidden_dentry = dtohd(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+
-+	if ((hidden_file = ftohf2(file)) != NULL) {
-+		hidden_dentry = dtohd2(dentry);
-+		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+			up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		}
-+	}
-+	else
-+		goto err;
-+
-+err:
-+	return (err1 || err2);
-+}
-+
-+
-+STATIC int
-+mini_fo_fasync(int fd, file_t *file, int flag)
-+{
-+	int err1 = 0;
-+	int err2 = 0;
-+
-+	file_t *hidden_file = NULL;
-+
-+	check_mini_fo_file(file);
-+
-+	if((hidden_file = ftohf(file)) != NULL) {
-+		err1 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+	if((hidden_file = ftohf2(file)) != NULL) {
-+		err2 = hidden_file->f_op->fasync(fd, hidden_file, flag);
-+	}
-+
-+	return (err1 || err2);
-+}
-+
-+
-+
-+struct file_operations mini_fo_dir_fops =
-+	{
-+		read:	generic_read_dir,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
-+
-+struct file_operations mini_fo_main_fops =
-+	{
-+		llseek:	mini_fo_llseek,
-+		read:	mini_fo_read,
-+		write:	mini_fo_write,
-+		readdir: mini_fo_readdir,
-+		poll:	mini_fo_poll,
-+		/* ioctl:	mini_fo_ioctl, */
-+		mmap:	mini_fo_mmap,
-+		open:	mini_fo_open,
-+		flush:	mini_fo_flush,
-+		release: mini_fo_release,
-+		fsync:	mini_fo_fsync,
-+		fasync:	mini_fo_fasync,
-+		/* not needed: lock:	mini_fo_lock, */
-+		/* not needed: readv */
-+		/* not needed: writev */
-+		/* not implemented: sendpage */
-+		/* not implemented: get_unmapped_area */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/fist.h
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __FIST_H_
-+#define __FIST_H_
-+
-+/*
-+ * KERNEL ONLY CODE:
-+ */
-+#ifdef __KERNEL__
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+#include <linux/autoconf.h>
-+#else
-+#include <linux/config.h>
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_MODVERSIONS
-+# define MODVERSIONS
-+# include <linux/modversions.h>
-+#endif /* CONFIG_MODVERSIONS */
-+#endif /* KERNEL_VERSION < 2.6.0 */
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/stat.h>
-+#include <linux/errno.h>
-+#include <linux/wait.h>
-+#include <linux/limits.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#include <linux/locks.h>
-+#else
-+#include <linux/buffer_head.h>
-+#include <linux/pagemap.h>
-+#include <linux/namei.h>
-+#include <linux/module.h>
-+#include <linux/mount.h>
-+#include <linux/page-flags.h>
-+#include <linux/writeback.h>
-+#include <linux/statfs.h>
-+#endif
-+#include <linux/smp.h>
-+#include <linux/smp_lock.h>
-+#include <linux/file.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/poll.h>
-+#include <linux/list.h>
-+#include <linux/init.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
-+#include <linux/xattr.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/security.h>
-+#endif
-+
-+#include <linux/swap.h>
-+
-+#include <asm/system.h>
-+/* #include <asm/segment.h> */
-+#include <asm/mman.h>
-+#include <linux/seq_file.h>
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* those mapped to ATTR_* were copied from linux/fs.h */
-+#define FA_MODE		ATTR_MODE
-+#define FA_UID		ATTR_UID
-+#define FA_GID		ATTR_GID
-+#define FA_SIZE		ATTR_SIZE
-+#define FA_ATIME	ATTR_ATIME
-+#define FA_MTIME	ATTR_MTIME
-+#define FA_CTIME	ATTR_CTIME
-+#define FA_ATIME_SET	ATTR_ATIME_SET
-+#define FA_MTIME_SET	ATTR_MTIME_SET
-+#define FA_FORCE	ATTR_FORCE
-+#define FA_ATTR_FLAGS	ATTR_ATTR_FLAG
-+
-+/* must be greater than all other ATTR_* flags! */
-+#define FA_NLINK	2048
-+#define FA_BLKSIZE	4096
-+#define FA_BLOCKS	8192
-+#define FA_TIMES	(FA_ATIME|FA_MTIME|FA_CTIME)
-+#define FA_ALL		0
-+
-+/* macros to manage changes between kernels */
-+#define INODE_DATA(i)	(&(i)->i_data)
-+
-+#define MIN(x,y) ((x < y) ? (x) : (y))
-+#define MAX(x,y) ((x > y) ? (x) : (y))
-+#define MAXPATHLEN PATH_MAX
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5)
-+# define lookup_one_len(a,b,c) lookup_one(a,b)
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,5) */
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8)
-+# define generic_file_llseek default_llseek
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,4,8) */
-+
-+#ifndef SEEK_SET
-+# define SEEK_SET 0
-+#endif /* not SEEK_SET */
-+
-+#ifndef SEEK_CUR
-+# define SEEK_CUR 1
-+#endif /* not SEEK_CUR */
-+
-+#ifndef SEEK_END
-+# define SEEK_END 2
-+#endif /* not SEEK_END */
-+
-+#ifndef DEFAULT_POLLMASK
-+# define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-+#endif /* not DEFAULT_POLLMASK */
-+
-+/* XXX: fix this so fistgen generates kfree() code directly */
-+#define kfree_s(a,b) kfree(a)
-+
-+/*
-+ * TYPEDEFS:
-+ */
-+typedef struct dentry dentry_t;
-+typedef struct file file_t;
-+typedef struct inode inode_t;
-+typedef inode_t vnode_t;
-+typedef struct page page_t;
-+typedef struct qstr qstr_t;
-+typedef struct super_block super_block_t;
-+typedef super_block_t vfs_t;
-+typedef struct vm_area_struct vm_area_t;
-+
-+
-+/*
-+ * EXTERNALS:
-+ */
-+
-+#define FPPF(str,page) printk("PPF %s 0x%x/%d: Lck:%d Err:%d Ref:%d Upd:%d Other::%d:%d:%d:%d:\n", \
-+		str, \
-+		(int) page, \
-+		(int) page->index, \
-+		(PageLocked(page) ? 1 : 0), \
-+		(PageError(page) ? 1 : 0), \
-+		(PageReferenced(page) ? 1 : 0), \
-+		(Page_Uptodate(page) ? 1 : 0), \
-+		(PageDecrAfter(page) ? 1 : 0), \
-+		(PageSlab(page) ? 1 : 0), \
-+		(PageSwapCache(page) ? 1 : 0), \
-+		(PageReserved(page) ? 1 : 0) \
-+		)
-+#define EZKDBG printk("EZK %s:%d:%s\n",__FILE__,__LINE__,__FUNCTION__)
-+#if 0
-+# define EZKDBG1 printk("EZK %s:%d\n",__FILE__,__LINE__)
-+#else
-+# define EZKDBG1
-+#endif
-+
-+extern int fist_get_debug_value(void);
-+extern int fist_set_debug_value(int val);
-+#if 0 /* mini_fo doesn't need these */
-+extern void fist_dprint_internal(int level, char *str,...);
-+extern void fist_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_print_inode(char *str, const inode_t *inode);
-+extern void fist_print_file(char *str, const file_t *file);
-+extern void fist_print_buffer_flags(char *str, struct buffer_head *buffer);
-+extern void fist_print_page_flags(char *str, page_t *page);
-+extern void fist_print_page_bytes(char *str, page_t *page);
-+extern void fist_print_pte_flags(char *str, const page_t *page);
-+extern void fist_checkinode(inode_t *inode, char *msg);
-+extern void fist_print_sb(char *str, const super_block_t *sb);
-+
-+/* §$% by mk: special debug functions */
-+extern void fist_mk_print_dentry(char *str, const dentry_t *dentry);
-+extern void fist_mk_print_inode(char *str, const inode_t *inode);
-+
-+extern char *add_indent(void);
-+extern char *del_indent(void);
-+#endif/* mini_fo doesn't need these */
-+
-+
-+#define STATIC
-+#define ASSERT(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED: %s at %s:%d (%s)\n", #EX,	\
-+	       __FILE__, __LINE__, __FUNCTION__);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+/* same ASSERT, but tell me who was the caller of the function */
-+#define ASSERT2(EX)	\
-+do {	\
-+    if (!(EX)) {	\
-+	printk(KERN_CRIT "ASSERTION FAILED (caller): %s at %s:%d (%s)\n", #EX,	\
-+	       file, line, func);	\
-+	(*((char *)0))=0;	\
-+    }	\
-+} while (0)
-+
-+#if 0 /* mini_fo doesn't need these */
-+#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)
-+#define fist_dprint(level, str, args...) fist_dprint_internal(level, KERN_DEBUG str, ## args)
-+#define print_entry_location() fist_dprint(4, "%sIN:  %s %s:%d\n", add_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_location() fist_dprint(4, "%s OUT: %s %s:%d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__)
-+#define print_exit_status(status) fist_dprint(4, "%s OUT: %s %s:%d, STATUS: %d\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, status)
-+#define print_exit_pointer(status) \
-+do { \
-+  if (IS_ERR(status)) \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: %ld\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+  else \
-+    fist_dprint(4, "%s OUT: %s %s:%d, RESULT: 0x%x\n", del_indent(), __FUNCTION__, __FILE__, __LINE__, PTR_ERR(status)); \
-+} while (0)
-+#endif/* mini_fo doesn't need these */
-+
-+#endif /* __KERNEL__ */
-+
-+
-+/*
-+ * DEFINITIONS FOR USER AND KERNEL CODE:
-+ * (Note: ioctl numbers 1--9 are reserved for fistgen, the rest
-+ *  are auto-generated automatically based on the user's .fist file.)
-+ */
-+# define FIST_IOCTL_GET_DEBUG_VALUE	_IOR(0x15, 1, int)
-+# define FIST_IOCTL_SET_DEBUG_VALUE	_IOW(0x15, 2, int)
-+
-+#endif /* not __FIST_H_ */
---- /dev/null
-+++ b/fs/mini_fo/inode.c
-@@ -0,0 +1,1564 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+mini_fo_create(inode_t *dir, dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = create_sto_reg_file(dentry, mode, nd);
-+#else
-+	err = create_sto_reg_file(dentry, mode);
-+#endif
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC dentry_t *
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry, struct nameidata* nd)
-+#else
-+mini_fo_lookup(inode_t *dir, dentry_t *dentry)
-+#endif
-+{
-+	int err = 0;
-+	dentry_t *hidden_dir_dentry;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry = NULL;
-+
-+	/* whiteout flag */
-+	int del_flag = 0;
-+	char *bpath = NULL;
-+
-+	const char *name;
-+	unsigned int namelen;
-+
-+	/* Don't allow lookups of META-files */
-+	namelen = strlen(META_FILENAME);
-+	if(namelen == dentry->d_name.len) {
-+		if(!strncmp(dentry->d_name.name, META_FILENAME, namelen)) {
-+			err = -ENOENT;
-+			goto out;
-+		}
-+	}
-+
-+	hidden_dir_dentry = dtohd(dentry->d_parent);
-+	hidden_sto_dir_dentry = dtohd2(dentry->d_parent);
-+
-+	name = dentry->d_name.name;
-+	namelen = dentry->d_name.len;
-+
-+	/* must initialize dentry operations */
-+	dentry->d_op = &mini_fo_dops;
-+
-+	/* setup the del_flag */
-+	del_flag = __meta_check_d_entry(dir, name, namelen);
-+	bpath = __meta_check_r_entry(dir, name, namelen);
-+
-+	/* perform the lookups of base and storage files:
-+	 *
-+	 * This caused some serious trouble, as a lookup_one_len passing
-+	 * a negative dentry oopses. Solution is to only do the lookup
-+	 * if the dentry is positive, else we set it to NULL
-+	 * More trouble, who said a *_dir_dentry can't be NULL?
-+	 */
-+	if(bpath) {
-+		/* Cross-Interposing (C), yeah! */
-+		hidden_dentry = bpath_walk(dir->i_sb, bpath);
-+		if(!hidden_dentry || !hidden_dentry->d_inode) {
-+			printk(KERN_CRIT "mini_fo_lookup: bpath_walk failed.\n");
-+			err= -EINVAL;
-+			goto out;
-+		}
-+
-+		/* this can be set up safely without fear of spaghetti
-+		 * interposing as it is only used for copying times */
-+		hidden_dir_dentry = hidden_dentry->d_parent;
-+		kfree(bpath);
-+	}
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+		hidden_dentry =
-+			lookup_one_len(name, hidden_dir_dentry, namelen);
-+	else
-+		hidden_dentry = NULL;
-+
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+		hidden_sto_dentry =
-+			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
-+	else
-+		hidden_sto_dentry =  NULL;
-+
-+	/* catch error in lookup */
-+	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-+		/* mk: we need to call dput on the dentry, whose
-+		 * lookup_one_len operation failed, in order to avoid
-+		 * unmount trouble.
-+		 */
-+		if(IS_ERR(hidden_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from base dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_dentry);
-+		} else {
-+			dput(hidden_dentry);
-+		}
-+		if(IS_ERR(hidden_sto_dentry)) {
-+			printk(KERN_CRIT "mini_fo_lookup: ERR from storage dentry, lookup failed.\n");
-+			err = PTR_ERR(hidden_sto_dentry);
-+		} else {
-+			dput(hidden_sto_dentry);
-+		}
-+		goto out;
-+	}
-+
-+	/* allocate dentry private data */
-+	__dtopd(dentry) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+
-+	if (!dtopd(dentry)) {
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	/* check for different states of the mini_fo file to be looked up. */
-+
-+	/* state 1, file has been modified */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		/* update parent directory's atime */
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = MODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state1).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 2, file is unmodified */
-+	if(hidden_dentry && hidden_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = UNMODIFIED;
-+		dtohd(dentry) = hidden_dentry;
-+		dtohd2(dentry) = hidden_sto_dentry; /* could be negative */
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state2).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+	/* state 3, file has been newly created */
-+	if(hidden_sto_dentry && hidden_sto_dentry->d_inode && !del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = CREATED;
-+		dtohd(dentry) = hidden_dentry; /* could be negative */
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(hidden_dentry,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state3).\n");
-+			goto out_free;
-+		}
-+		goto out;
-+	}
-+
-+	/* state 4, file has deleted and created again. */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   hidden_sto_dentry->d_inode && del_flag) {
-+
-+		fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+		dtopd(dentry)->state = DEL_REWRITTEN;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		err = mini_fo_tri_interpose(NULL,
-+					    hidden_sto_dentry,
-+					    dentry, dir->i_sb, 1);
-+		if (err) {
-+			printk(KERN_CRIT "mini_fo_lookup: error interposing (state4).\n");
-+			goto out_free;
-+		}
-+		/* We will never need this dentry again, as the file has been
-+		 * deleted from base */
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 5, file has been deleted in base */
-+	if(hidden_dentry && hidden_sto_dentry &&
-+	   hidden_dentry->d_inode &&
-+	   !hidden_sto_dentry->d_inode && del_flag) {
-+
-+		/* check which parents atime we need for updating */
-+		if(hidden_sto_dir_dentry->d_inode)
-+			fist_copy_attr_atime(dir,
-+					     hidden_sto_dir_dentry->d_inode);
-+		else
-+			fist_copy_attr_atime(dir,
-+					     hidden_dir_dentry->d_inode);
-+
-+		dtopd(dentry)->state = DELETED;
-+		dtohd(dentry) = NULL;
-+		dtohd2(dentry) = hidden_sto_dentry;
-+
-+		/* add negative dentry to dcache to speed up lookups */
-+		d_add(dentry, NULL);
-+		dput(hidden_dentry);
-+		goto out;
-+	}
-+	/* state 6, file does not exist */
-+	if(((hidden_dentry && !hidden_dentry->d_inode) ||
-+	    (hidden_sto_dentry && !hidden_sto_dentry->d_inode)) && !del_flag)
-+		{
-+			/* check which parents atime we need for updating */
-+			if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+				fist_copy_attr_atime(dir, hidden_sto_dir_dentry->d_inode);
-+			else
-+				fist_copy_attr_atime(dir, hidden_dir_dentry->d_inode);
-+
-+			dtopd(dentry)->state = NON_EXISTANT;
-+			dtohd(dentry) = hidden_dentry;
-+			dtohd2(dentry) = hidden_sto_dentry;
-+			d_add(dentry, NULL);
-+			goto out;
-+		}
-+
-+	/* if we get to here, were in an invalid state. bad. */
-+	printk(KERN_CRIT "mini_fo_lookup: ERROR, meta data corruption detected.\n");
-+
-+	/* end state checking */
-+ out_free:
-+	d_drop(dentry);		/* so that our bad dentry will get destroyed */
-+	kfree(dtopd(dentry));
-+	__dtopd(dentry) = NULL;	/* be safe */
-+
-+ out_dput:
-+	if(hidden_dentry)
-+		dput(hidden_dentry);
-+	if(hidden_sto_dentry)
-+		dput(hidden_sto_dentry); /* drops usage count and marks for release */
-+
-+ out:
-+	/* initalize wol if file exists and is directory */
-+	if(dentry->d_inode) {
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			itopd(dentry->d_inode)->deleted_list_size = -1;
-+			itopd(dentry->d_inode)->renamed_list_size = -1;
-+			meta_build_lists(dentry);
-+		}
-+	}
-+	return ERR_PTR(err);
-+}
-+
-+
-+STATIC int
-+mini_fo_link(dentry_t *old_dentry, inode_t *dir, dentry_t *new_dentry)
-+{
-+	int err;
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_dir_dentry;
-+
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(dir);
-+
-+	/* no links to directorys and existing targets target allowed */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode) ||
-+	   is_mini_fo_existant(new_dentry)) {
-+		err = -EPERM;
-+		goto out;
-+	}
-+
-+	/* bring it directly from unmod to del_rew */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		err = meta_add_d_entry(old_dentry->d_parent,
-+				       old_dentry->d_name.name,
-+				       old_dentry->d_name.len);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+		dput(dtohd(old_dentry));
-+		dtohd(old_dentry) = NULL;
-+		dtost(old_dentry) = DEL_REWRITTEN;
-+	}
-+
-+	err = get_neg_sto_dentry(new_dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
-+	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = vfs_link(hidden_old_dentry,
-+		       hidden_dir_dentry->d_inode,
-+		       hidden_new_dentry);
-+	if (err || !hidden_new_dentry->d_inode)
-+		goto out_lock;
-+
-+	dtost(new_dentry) = CREATED;
-+ 	err = mini_fo_tri_interpose(NULL, hidden_new_dentry, new_dentry, dir->i_sb, 0);
-+	if (err)
-+		goto out_lock;
-+
-+	fist_copy_attr_timesizes(dir, hidden_new_dentry->d_inode);
-+	/* propagate number of hard-links */
-+	old_dentry->d_inode->i_nlink = itohi2(old_dentry->d_inode)->i_nlink;
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_dir_dentry);
-+
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+	if (!new_dentry->d_inode)
-+		d_drop(new_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_unlink(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		err = nondir_mod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		err = nondir_unmod_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		err = nondir_creat_to_del(dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		err = nondir_del_rew_to_del(dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_unlink: ERROR, invalid state detected.\n");
-+
-+ out:
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+
-+	if(!err) {
-+		/* is this causing my pain? d_delete(dentry); */
-+		d_drop(dentry);
-+	}
-+
-+	dput(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_symlink(inode_t *dir, dentry_t *dentry, const char *symname)
-+{
-+	int err=0;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        umode_t mode;
-+#endif
-+
-+	/* Fail if the symlink file exists */
-+	if(!(dtost(dentry) == DELETED ||
-+	     dtost(dentry) == NON_EXISTANT)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	dget(hidden_sto_dentry);
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	mode = S_IALLUGO;
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry, symname, mode);
-+#else
-+	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
-+			  hidden_sto_dentry,
-+			  symname);
-+#endif
-+	if (err || !hidden_sto_dentry->d_inode)
-+                goto out_lock;
-+
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        } else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+        /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+        dput(hidden_sto_dentry);
-+        if (!dentry->d_inode)
-+                d_drop(dentry);
-+ out:
-+        return err;
-+}
-+
-+STATIC int
-+mini_fo_mkdir(inode_t *dir, dentry_t *dentry, int mode)
-+{
-+	int err;
-+
-+	err = create_sto_dir(dentry, mode);
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rmdir(inode_t *dir, dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *meta_dentry;
-+	inode_t *hidden_sto_dir = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+	check_mini_fo_inode(dir);
-+
-+	dget(dentry);
-+	if(dtopd(dentry)->state == MODIFIED) {
-+		/* XXX: disabled, because it does not bother to check files on
-+		 * the original filesystem - just a hack, but better than simply
-+		 * removing it without testing */
-+		err = -EINVAL;
-+		goto out;
-+
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+		dput(dtohd(dentry));
-+
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* carefull with R files */
-+		if( __meta_is_r_entry(dir,
-+				      dentry->d_name.name,
-+				      dentry->d_name.len) == 1) {
-+			err = meta_remove_r_entry(dentry->d_parent,
-+						  dentry->d_name.name,
-+						  dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rmdir: meta_remove_r_entry failed.\n");
-+				goto out;
-+			}
-+		}
-+		else {
-+			/* ok, add deleted file to META */
-+			meta_add_d_entry(dentry->d_parent,
-+					 dentry->d_name.name,
-+					 dentry->d_name.len);
-+		}
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		/* XXX: simply adding it to the delete list here is fscking dangerous!
-+		 * as a temporary hack, i will disable rmdir on unmodified directories
-+		 * for now.
-+		 */
-+		err = -EINVAL;
-+		goto out;
-+
-+		err = get_neg_sto_dentry(dentry);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		/* dput base dentry, this will relase the inode and free the
-+		 * dentry, as we will never need it again. */
-+		dput(dtohd(dentry));
-+		dtohd(dentry) = NULL;
-+		dtopd(dentry)->state = DELETED;
-+
-+		/* add deleted file to META-file */
-+		meta_add_d_entry(dentry->d_parent,
-+				 dentry->d_name.name,
-+				 dentry->d_name.len);
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == CREATED) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = NON_EXISTANT;
-+
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+
-+		goto out;
-+	}
-+	else if(dtopd(dentry)->state == DEL_REWRITTEN) {
-+		hidden_sto_dir = itohi2(dir);
-+		hidden_sto_dentry = dtohd2(dentry);
-+
-+		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		/* Delete an old WOL file contained in the storage dir */
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     hidden_sto_dentry,
-+					     strlen(META_FILENAME));
-+		if(meta_dentry->d_inode) {
-+			/* is this necessary? dget(meta_dentry); */
-+			err = vfs_unlink(hidden_sto_dentry->d_inode,
-+					 meta_dentry);
-+			dput(meta_dentry);
-+			if(!err)
-+				d_delete(meta_dentry);
-+		}
-+
-+		err = vfs_rmdir(hidden_sto_dir, hidden_sto_dentry);
-+		dput(hidden_sto_dentry);
-+		if(!err)
-+			d_delete(hidden_sto_dentry);
-+
-+		/* propagate number of hard-links */
-+		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+		dtopd(dentry)->state = DELETED;
-+		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+		dput(hidden_sto_dir_dentry);
-+		goto out;
-+	}
-+
-+	printk(KERN_CRIT "mini_fo_rmdir: ERROR, invalid state detected.\n");
-+
-+ out:
-+	if(!err) {
-+		d_drop(dentry);
-+	}
-+
-+	fist_copy_attr_times(dir, itohi2(dentry->d_parent->d_inode));
-+	dput(dentry);
-+
-+	return err;
-+}
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, dev_t dev)
-+#else
-+mini_fo_mknod(inode_t *dir, dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	err = create_sto_nod(dentry, mode, dev);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo_mknod: creating sto nod failed.\n");
-+		err = -EINVAL;
-+	}
-+
-+	check_mini_fo_dentry(dentry);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_rename(inode_t *old_dir, dentry_t *old_dentry,
-+	       inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	/* dispatch */
-+	if(S_ISDIR(old_dentry->d_inode->i_mode))
-+		return rename_directory(old_dir, old_dentry, new_dir, new_dentry);
-+	return rename_nondir(old_dir, old_dentry, new_dir, new_dentry);
-+
-+}
-+
-+int rename_directory(inode_t *old_dir, dentry_t *old_dentry,
-+		     inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err, bpath_len;
-+	char *bpath;
-+
-+	dentry_t *hidden_old_dentry;
-+	dentry_t *hidden_new_dentry;
-+	dentry_t *hidden_old_dir_dentry;
-+	dentry_t *hidden_new_dir_dentry;
-+
-+	err = 0;
-+	bpath = NULL;
-+	bpath_len = 0;
-+
-+	/* this is a test, chuck out if it works */
-+	if(!(dtopd(new_dentry)->state == DELETED ||
-+	     dtopd(new_dentry)->state == NON_EXISTANT)) {
-+		printk(KERN_CRIT "mini_fo: rename_directory: \
-+                                  uh, ah, new_dentry not negative.\n");
-+		/* return -1; */
-+	}
-+
-+	/* state = UNMODIFIED */
-+	if(dtopd(old_dentry)->state == UNMODIFIED) {
-+		err = dir_unmod_to_mod(old_dentry);
-+		if (err)
-+			goto out;
-+	}
-+
-+	/* state = MODIFIED */
-+	if(dtopd(old_dentry)->state == MODIFIED) {
-+		bpath = meta_check_r_entry(old_dentry->d_parent,
-+					   old_dentry->d_name.name,
-+					   old_dentry->d_name.len);
-+		if(bpath) {
-+			err = meta_remove_r_entry(old_dentry->d_parent,
-+						  old_dentry->d_name.name,
-+						  old_dentry->d_name.len);
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: rename_directory:\
-+                                                   meta_remove_r_entry \
-+                                                  failed.\n");
-+				goto out;
-+			}
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath,
-+					       strlen(bpath),
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			kfree(bpath);
-+		}
-+		else {/* wol it */
-+			err = meta_add_d_entry(old_dentry->d_parent,
-+					       old_dentry->d_name.name,
-+					       old_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+			/* put it on rename list */
-+			err = get_mini_fo_bpath(old_dentry,
-+						&bpath,
-+						&bpath_len);
-+			if (err)
-+				goto out;
-+			err = meta_add_r_entry(new_dentry->d_parent,
-+					       bpath, bpath_len,
-+					       new_dentry->d_name.name,
-+					       new_dentry->d_name.len);
-+			if (err)
-+				goto out;
-+		}
-+		/* no state change, MODIFIED stays MODIFIED */
-+	}
-+	/* state = CREATED */
-+	if(dtopd(old_dentry)->state == CREATED ||
-+	   dtopd(old_dentry)->state == DEL_REWRITTEN) {
-+		if(dtohd(old_dentry))
-+			dput(dtohd(old_dentry));
-+
-+		if(dtopd(new_dentry)->state == DELETED) {
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+			dtohd(old_dentry) = NULL;
-+		}
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			dtopd(old_dentry)->state = CREATED;
-+			/* steal new dentry's neg. base dentry */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			dtohd(new_dentry) = NULL;
-+		}
-+	}
-+	if(dtopd(new_dentry)->state == UNMODIFIED ||
-+	   dtopd(new_dentry)->state == NON_EXISTANT) {
-+		err = get_neg_sto_dentry(new_dentry);
-+		if(err)
-+			goto out;
-+	}
-+
-+	/* now move sto file */
-+	hidden_old_dentry = dtohd2(old_dentry);
-+	hidden_new_dentry = dtohd2(new_dentry);
-+
-+	dget(hidden_old_dentry);
-+	dget(hidden_new_dentry);
-+
-+	hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+	hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+	double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+	err = vfs_rename(hidden_old_dir_dentry->d_inode, hidden_old_dentry,
-+			 hidden_new_dir_dentry->d_inode, hidden_new_dentry);
-+	if(err)
-+		goto out_lock;
-+
-+	fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+	if (new_dir != old_dir)
-+		fist_copy_attr_all(old_dir,
-+				   hidden_old_dir_dentry->d_inode);
-+
-+ out_lock:
-+	/* double_unlock will dput the new/old parent dentries
-+	 * whose refcnts were incremented via get_parent above. */
-+	double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+	dput(hidden_new_dentry);
-+	dput(hidden_old_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int rename_nondir(inode_t *old_dir, dentry_t *old_dentry,
-+		  inode_t *new_dir, dentry_t *new_dentry)
-+{
-+	int err=0;
-+
-+	check_mini_fo_dentry(old_dentry);
-+	check_mini_fo_dentry(new_dentry);
-+	check_mini_fo_inode(old_dir);
-+	check_mini_fo_inode(new_dir);
-+
-+	/* state: UNMODIFIED */
-+	if(dtost(old_dentry) == UNMODIFIED) {
-+		err = nondir_unmod_to_mod(old_dentry, 1);
-+		if(err) {
-+			err = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* the easy states */
-+	if(exists_in_storage(old_dentry)) {
-+
-+		dentry_t *hidden_old_dentry;
-+		dentry_t *hidden_new_dentry;
-+		dentry_t *hidden_old_dir_dentry;
-+		dentry_t *hidden_new_dir_dentry;
-+
-+		/* if old file is MODIFIED, add it to the deleted_list */
-+		if(dtopd(old_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(old_dentry->d_parent,
-+					 old_dentry->d_name.name,
-+					 old_dentry->d_name.len);
-+
-+			dput(dtohd(old_dentry));
-+		}
-+		/* if old file is CREATED, we only release the base dentry */
-+		if(dtopd(old_dentry)->state == CREATED) {
-+			if(dtohd(old_dentry))
-+				dput(dtohd(old_dentry));
-+		}
-+
-+		/* now setup the new states (depends on new_dentry state) */
-+		/* new dentry state =  MODIFIED */
-+		if(dtopd(new_dentry)->state == MODIFIED) {
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* new dentry will be d_put'ed later by the vfs
-+			 * so don't do it here
-+			 * dput(dtohd(new_dentry));
-+			 */
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  UNMODIFIED */
-+		else if(dtopd(new_dentry)->state == UNMODIFIED) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			meta_add_d_entry(new_dentry->d_parent,
-+					 new_dentry->d_name.name,
-+					 new_dentry->d_name.len);
-+
-+			/* is this right??? */
-+			/*dput(dtohd(new_dentry));*/
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		/* new dentry state =  CREATED */
-+		else if(dtopd(new_dentry)->state == CREATED) {
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  NON_EXISTANT */
-+		else if(dtopd(new_dentry)->state == NON_EXISTANT) {
-+			if(get_neg_sto_dentry(new_dentry))
-+				return -EINVAL;
-+
-+			/* we keep the neg. base dentry (if exists) */
-+			dtohd(old_dentry) = dtohd(new_dentry);
-+			/* ...and set it to Null, or we'll get
-+			 * Dr. dcache.c:345 if it gets dput twice... */
-+			dtohd(new_dentry) = NULL;
-+			dtopd(old_dentry)->state = CREATED;
-+		}
-+		/* new dentry state =  DEL_REWRITTEN or DELETED */
-+		else if(dtopd(new_dentry)->state == DEL_REWRITTEN ||
-+			dtopd(new_dentry)->state == DELETED) {
-+			dtohd(old_dentry) = NULL;
-+			dtopd(old_dentry)->state = DEL_REWRITTEN;
-+		}
-+		else { /* not possible, uhh, ahh */
-+			printk(KERN_CRIT
-+			       "mini_fo: rename_reg_file: invalid state detected [1].\n");
-+			return -1;
-+		}
-+
-+		/* now we definitely have a sto file */
-+		hidden_old_dentry = dtohd2(old_dentry);
-+		hidden_new_dentry = dtohd2(new_dentry);
-+
-+		dget(hidden_old_dentry);
-+		dget(hidden_new_dentry);
-+
-+		hidden_old_dir_dentry = dget(hidden_old_dentry->d_parent);
-+		hidden_new_dir_dentry = dget(hidden_new_dentry->d_parent);
-+		double_lock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+
-+		err = vfs_rename(hidden_old_dir_dentry->d_inode,
-+				 hidden_old_dentry,
-+				 hidden_new_dir_dentry->d_inode,
-+				 hidden_new_dentry);
-+		if(err)
-+			goto out_lock;
-+
-+		fist_copy_attr_all(new_dir, hidden_new_dir_dentry->d_inode);
-+		if (new_dir != old_dir)
-+			fist_copy_attr_all(old_dir, hidden_old_dir_dentry->d_inode);
-+
-+	out_lock:
-+		/* double_unlock will dput the new/old parent dentries
-+		 * whose refcnts were incremented via get_parent above.
-+		 */
-+		double_unlock(hidden_old_dir_dentry, hidden_new_dir_dentry);
-+		dput(hidden_new_dentry);
-+		dput(hidden_old_dentry);
-+	out:
-+		return err;
-+	}
-+	else { /* invalid state */
-+		printk(KERN_CRIT "mini_fo: rename_reg_file: ERROR: invalid state detected [2].\n");
-+		return -1;
-+	}
-+}
-+
-+
-+STATIC int
-+mini_fo_readlink(dentry_t *dentry, char *buf, int bufsiz)
-+{
-+	int err=0;
-+	dentry_t *hidden_dentry = NULL;
-+
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		hidden_dentry = dtohd2(dentry);
-+	} else if(dtohd(dentry) && dtohd(dentry)->d_inode) {
-+		hidden_dentry = dtohd(dentry);
-+	} else {
-+		goto out;
-+	}
-+
-+	if (!hidden_dentry->d_inode->i_op ||
-+	    !hidden_dentry->d_inode->i_op->readlink) {
-+		err = -EINVAL;		goto out;
-+	}
-+
-+	err = hidden_dentry->d_inode->i_op->readlink(hidden_dentry,
-+						     buf,
-+						     bufsiz);
-+	if (err > 0)
-+		fist_copy_attr_atime(dentry->d_inode, hidden_dentry->d_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+static int mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#else
-+static void* mini_fo_follow_link(dentry_t *dentry, struct nameidata *nd)
-+#endif
-+{
-+	char *buf;
-+	int len = PAGE_SIZE, err;
-+	mm_segment_t old_fs;
-+
-+	/* in 2.6 this is freed by mini_fo_put_link called by __do_follow_link */
-+	buf = kmalloc(len, GFP_KERNEL);
-+	if (!buf) {
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	/* read the symlink, and then we will follow it */
-+	old_fs = get_fs();
-+	set_fs(KERNEL_DS);
-+	err = dentry->d_inode->i_op->readlink(dentry, buf, len);
-+	set_fs(old_fs);
-+	if (err < 0) {
-+		kfree(buf);
-+		buf = NULL;
-+		goto out;
-+	}
-+	buf[err] = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        nd_set_link(nd, buf);
-+        err = 0;
-+#else
-+	err = vfs_follow_link(nd, buf);
-+#endif
-+
-+ out:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	kfree(buf);
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+        return err;
-+#else
-+        return ERR_PTR(err);
-+#endif
-+}
-+
-+STATIC
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+void mini_fo_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
-+#endif
-+{
-+        char *link;
-+        link = nd_get_link(nd);
-+        kfree(link);
-+}
-+#endif
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
-+#else
-+mini_fo_permission(inode_t *inode, int mask)
-+#endif
-+{
-+	inode_t *hidden_inode;
-+	int mode;
-+	int err;
-+
-+	if(itohi2(inode)) {
-+		hidden_inode = itohi2(inode);
-+	} else {
-+		hidden_inode = itohi(inode);
-+	}
-+	mode = inode->i_mode;
-+
-+	/* not really needed, as permission handles everything:
-+	 *	err = vfs_permission(inode, mask);
-+	 *	if (err)
-+	 *		goto out;
-+	 */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = permission(hidden_inode, mask, nd);
-+#else
-+	err = permission(hidden_inode, mask);
-+#endif
-+
-+	/*  out: */
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_inode_revalidate(dentry_t *dentry)
-+{
-+	int err = 0;
-+	dentry_t *hidden_dentry;
-+	inode_t *hidden_inode;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+		hidden_inode = hidden_dentry->d_inode;
-+	} else {
-+                printk(KERN_CRIT "mini_fo_inode_revalidate: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	if (hidden_inode && hidden_inode->i_op && hidden_inode->i_op->revalidate){
-+		err = hidden_inode->i_op->revalidate(hidden_dentry);
-+		if (err)
-+			goto out;
-+	}
-+	fist_copy_attr_all(dentry->d_inode, hidden_inode);
-+ out:
-+	return err;
-+}
-+#endif
-+
-+STATIC int
-+mini_fo_setattr(dentry_t *dentry, struct iattr *ia)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(!is_mini_fo_existant(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [1].\n");
-+		goto out;
-+	}
-+
-+	if(dtost(dentry) == UNMODIFIED) {
-+		if(!IS_COPY_FLAG(ia->ia_valid))
-+			goto out; /* we ignore these changes to base */
-+
-+		if(S_ISDIR(dentry->d_inode->i_mode)) {
-+			err = dir_unmod_to_mod(dentry);
-+		} else {
-+			/* we copy contents if file is not beeing truncated */
-+			if(S_ISREG(dentry->d_inode->i_mode) &&
-+			   !(ia->ia_size == 0 && (ia->ia_valid & ATTR_SIZE))) {
-+				err = nondir_unmod_to_mod(dentry, 1);
-+			} else
-+				err = nondir_unmod_to_mod(dentry, 0);
-+		}
-+		if(err) {
-+			err = -EINVAL;
-+			printk(KERN_CRIT "mini_fo_setattr: ERROR changing states.\n");
-+			goto out;
-+		}
-+	}
-+	if(!exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo_setattr: ERROR, invalid state detected [2].\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	ASSERT(dentry->d_inode);
-+	ASSERT(dtohd2(dentry));
-+	ASSERT(itopd(dentry->d_inode));
-+	ASSERT(itohi2(dentry->d_inode));
-+
-+	err = notify_change(dtohd2(dentry), ia);
-+	fist_copy_attr_all(dentry->d_inode, itohi2(dentry->d_inode));
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+STATIC int
-+mini_fo_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-+{
-+	int err = 0;
-+        dentry_t *hidden_dentry;
-+
-+	ASSERT(dentry->d_inode);
-+	ASSERT(itopd(dentry->d_inode));
-+
-+	if(itohi2(dentry->d_inode)) {
-+                hidden_dentry = dtohd2(dentry);
-+	} else if(itohi(dentry->d_inode)) {
-+                hidden_dentry = dtohd(dentry);
-+	} else {
-+                printk(KERN_CRIT "mini_fo_getattr: ERROR, invalid state detected.\n");
-+                err = -ENOENT;
-+                goto out;
-+        }
-+	fist_copy_attr_all(dentry->d_inode, hidden_dentry->d_inode);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	generic_fillattr(dentry->d_inode, stat);
-+	if (!stat->blksize) {
-+		struct super_block *s = hidden_dentry->d_inode->i_sb;
-+		unsigned blocks;
-+		blocks = (stat->size+s->s_blocksize-1) >> s->s_blocksize_bits;
-+		stat->blocks = (s->s_blocksize / 512) * blocks;
-+		stat->blksize = s->s_blocksize;
-+	}
-+ out:
-+        return err;
-+}
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+#if 0 /* no xattr_alloc() and xattr_free() */
-+/* This is lifted from fs/xattr.c */
-+static void *
-+xattr_alloc(size_t size, size_t limit)
-+{
-+	void *ptr;
-+
-+	if (size > limit)
-+		return ERR_PTR(-E2BIG);
-+
-+	if (!size)	/* size request, no buffer is needed */
-+		return NULL;
-+	else if (size <= PAGE_SIZE)
-+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);
-+	else
-+		ptr = vmalloc((unsigned long) size);
-+	if (!ptr)
-+		return ERR_PTR(-ENOMEM);
-+	return ptr;
-+}
-+
-+static void
-+xattr_free(void *ptr, size_t size)
-+{
-+	if (!size)	/* size request, no buffer was needed */
-+		return;
-+	else if (size <= PAGE_SIZE)
-+		kfree(ptr);
-+	else
-+		vfree(ptr);
-+}
-+#endif /* no xattr_alloc() and xattr_free() */
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	/* Define these anyway so we don't need as much ifdef'ed code. */
-+	char *encoded_name = NULL;
-+	char *encoded_value = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->getxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) \
-+     && LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,23)) \
-+     || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 const void *value, size_t size, int flags)
-+#else
-+mini_fo_setxattr(struct dentry *dentry, const char *name,
-+		 void *value, size_t size, int flags)
-+#endif
-+
-+{
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+
-+	/* Define these anyway, so we don't have as much ifdef'ed code. */
-+	char *encoded_value = NULL;
-+	char *encoded_name = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->setxattr) {
-+		encoded_name = (char *)name;
-+		encoded_value = (char *)value;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_removexattr(struct dentry *dentry, const char *name) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_name;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->removexattr) {
-+		encoded_name = (char *)name;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+
-+/* BKL held by caller.
-+ * dentry->d_inode->i_sem down
-+ */
-+STATIC int
-+mini_fo_listxattr(struct dentry *dentry, char *list, size_t size) {
-+	struct dentry *hidden_dentry = NULL;
-+	int err = -EOPNOTSUPP;
-+	char *encoded_list = NULL;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(exists_in_storage(dentry))
-+		hidden_dentry = dtohd2(dentry);
-+	else
-+		hidden_dentry = dtohd(dentry);
-+
-+	ASSERT(hidden_dentry);
-+	ASSERT(hidden_dentry->d_inode);
-+	ASSERT(hidden_dentry->d_inode->i_op);
-+
-+	if (hidden_dentry->d_inode->i_op->listxattr) {
-+		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		down(&hidden_dentry->d_inode->i_sem);
-+#endif
-+		/* lock_kernel() already done by caller. */
-+		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
-+		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_dentry->d_inode->i_sem);
-+#endif
-+	}
-+	return err;
-+}
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+
-+struct inode_operations mini_fo_symlink_iops =
-+	{
-+		readlink:	mini_fo_readlink,
-+		follow_link: mini_fo_follow_link,
-+		/* mk: permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+		put_link:       mini_fo_put_link,
-+#endif
-+
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)) */
-+	};
-+
-+struct inode_operations mini_fo_dir_iops =
-+	{
-+		create:	mini_fo_create,
-+		lookup:	mini_fo_lookup,
-+		link:	mini_fo_link,
-+		unlink:	mini_fo_unlink,
-+		symlink:	mini_fo_symlink,
-+		mkdir:	mini_fo_mkdir,
-+		rmdir:	mini_fo_rmdir,
-+		mknod:	mini_fo_mknod,
-+		rename:	mini_fo_rename,
-+		/* no readlink/follow_link for non-symlinks */
-+		// off because we have setattr
-+		//    truncate:	mini_fo_truncate,
-+		/* mk:permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+		setattr:	mini_fo_setattr,
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr: mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
-+
-+struct inode_operations mini_fo_main_iops =
-+	{
-+		/* permission:	mini_fo_permission, */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		revalidate:	mini_fo_inode_revalidate,
-+#endif
-+		setattr:	mini_fo_setattr,
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		getattr:	mini_fo_getattr,
-+#endif
-+#if defined(XATTR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20))
-+		setxattr:	mini_fo_setxattr,
-+		getxattr:	mini_fo_getxattr,
-+		listxattr:	mini_fo_listxattr,
-+		removexattr:    mini_fo_removexattr
-+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
-+	};
---- /dev/null
-+++ b/fs/mini_fo/main.c
-@@ -0,0 +1,423 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+#include <linux/module.h>
-+
-+/* This definition must only appear after we include <linux/module.h> */
-+#ifndef MODULE_LICENSE
-+# define MODULE_LICENSE(bison)
-+#endif /* not MODULE_LICENSE */
-+
-+/*
-+ * This is the mini_fo tri interpose function, which extends the
-+ * functionality of the regular interpose by interposing a higher
-+ * level inode on top of two lower level ones: the base filesystem
-+ * inode and the storage filesystem inode.
-+ *
-+ *  sb we pass is mini_fo's super_block
-+ */
-+int
-+mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+		      dentry_t *hidden_sto_dentry,
-+		      dentry_t *dentry, super_block_t *sb, int flag)
-+{
-+	inode_t *hidden_inode = NULL;
-+	inode_t *hidden_sto_inode = NULL; /* store corresponding storage inode */
-+	int err = 0;
-+	inode_t *inode;
-+
-+	/* Pointer to hidden_sto_inode if exists, else to hidden_inode.
-+	 * This is used to copy the attributes of the correct inode. */
-+	inode_t *master_inode;
-+
-+	if(hidden_dentry)
-+		hidden_inode = hidden_dentry->d_inode;
-+	if(hidden_sto_dentry)
-+		hidden_sto_inode = hidden_sto_dentry->d_inode;
-+
-+	ASSERT(dentry->d_inode == NULL);
-+
-+	/* mk: One of the inodes associated with the dentrys is likely to
-+	 * be NULL, so carefull:
-+	 */
-+	ASSERT((hidden_inode != NULL) || (hidden_sto_inode != NULL));
-+
-+	if(hidden_sto_inode)
-+		master_inode = hidden_sto_inode;
-+	else
-+		master_inode = hidden_inode;
-+
-+	/*
-+	 * We allocate our new inode below, by calling iget.
-+	 * iget will call our read_inode which will initialize some
-+	 * of the new inode's fields
-+	 */
-+
-+	/*
-+	 * original: inode = iget(sb, hidden_inode->i_ino);
-+	 */
-+	inode = iget(sb, iunique(sb, 25));
-+	if (!inode) {
-+		err = -EACCES;		/* should be impossible??? */
-+		goto out;
-+	}
-+
-+	/*
-+	 * interpose the inode if not already interposed
-+	 *   this is possible if the inode is being reused
-+	 * XXX: what happens if we get_empty_inode() but there's another already?
-+	 * for now, ASSERT() that this can't happen; fix later.
-+	 */
-+	if (itohi(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi(inode) != NULL.\n");
-+	}
-+	if (itohi2(inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo_tri_interpose: itohi2(inode) != NULL.\n");
-+	}
-+
-+	/* mk: Carefull, igrab can't handle NULL inodes (ok, why should it?), so
-+	 * we need to check here:
-+	 */
-+	if(hidden_inode)
-+		itohi(inode) = igrab(hidden_inode);
-+	else
-+		itohi(inode) = NULL;
-+
-+	if(hidden_sto_inode)
-+		itohi2(inode) = igrab(hidden_sto_inode);
-+	else
-+		itohi2(inode) = NULL;
-+
-+
-+	/* Use different set of inode ops for symlinks & directories*/
-+	if (S_ISLNK(master_inode->i_mode))
-+		inode->i_op = &mini_fo_symlink_iops;
-+	else if (S_ISDIR(master_inode->i_mode))
-+		inode->i_op = &mini_fo_dir_iops;
-+
-+	/* Use different set of file ops for directories */
-+	if (S_ISDIR(master_inode->i_mode))
-+		inode->i_fop = &mini_fo_dir_fops;
-+
-+	/* properly initialize special inodes */
-+	if (S_ISBLK(master_inode->i_mode) || S_ISCHR(master_inode->i_mode) ||
-+	    S_ISFIFO(master_inode->i_mode) || S_ISSOCK(master_inode->i_mode)) {
-+		init_special_inode(inode, master_inode->i_mode, master_inode->i_rdev);
-+	}
-+
-+	/* Fix our inode's address operations to that of the lower inode */
-+	if (inode->i_mapping->a_ops != master_inode->i_mapping->a_ops) {
-+		inode->i_mapping->a_ops = master_inode->i_mapping->a_ops;
-+	}
-+
-+	/* only (our) lookup wants to do a d_add */
-+	if (flag)
-+		d_add(dentry, inode);
-+	else
-+		d_instantiate(dentry, inode);
-+
-+	ASSERT(dtopd(dentry) != NULL);
-+
-+	/* all well, copy inode attributes */
-+	fist_copy_attr_all(inode, master_inode);
-+
-+ out:
-+	return err;
-+}
-+
-+/* parse mount options "base=" and "sto=" */
-+dentry_t *
-+mini_fo_parse_options(super_block_t *sb, char *options)
-+{
-+	dentry_t *hidden_root = ERR_PTR(-EINVAL);
-+	dentry_t *hidden_root2 = ERR_PTR(-EINVAL);
-+	struct nameidata nd, nd2;
-+	char *name, *tmp, *end;
-+	int err = 0;
-+
-+	/* We don't want to go off the end of our arguments later on. */
-+	for (end = options; *end; end++);
-+
-+	while (options < end) {
-+		tmp = options;
-+		while (*tmp && *tmp != ',')
-+			tmp++;
-+		*tmp = '\0';
-+		if (!strncmp("base=", options, 5)) {
-+			name = options + 5;
-+			printk(KERN_INFO "mini_fo: using base directory: %s\n", name);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if (path_init(name, LOOKUP_FOLLOW, &nd))
-+				err = path_walk(name, &nd);
-+#else
-+			err = path_lookup(name, LOOKUP_FOLLOW, &nd);
-+#endif
-+			if (err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden directory '%s'\n", name);
-+				hidden_root = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root = nd.dentry;
-+			stopd(sb)->base_dir_dentry = nd.dentry;
-+			stopd(sb)->hidden_mnt = nd.mnt;
-+
-+		} else if(!strncmp("sto=", options, 4)) {
-+			/* parse the storage dir */
-+			name = options + 4;
-+			printk(KERN_INFO "mini_fo: using storage directory: %s\n", name);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+			if(path_init(name, LOOKUP_FOLLOW, &nd2))
-+				err = path_walk(name, &nd2);
-+#else
-+                        err = path_lookup(name, LOOKUP_FOLLOW, &nd2);
-+#endif
-+			if(err) {
-+				printk(KERN_CRIT "mini_fo: error accessing hidden storage directory '%s'\n", name);
-+
-+				hidden_root2 = ERR_PTR(err);
-+				goto out;
-+			}
-+			hidden_root2 = nd2.dentry;
-+			stopd(sb)->storage_dir_dentry = nd2.dentry;
-+			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			stohs2(sb) = hidden_root2->d_sb;
-+
-+			/* validate storage dir, this is done in
-+			 * mini_fo_read_super for the base directory.
-+			 */
-+			if (IS_ERR(hidden_root2)) {
-+				printk(KERN_WARNING "mini_fo_parse_options: storage dentry lookup failed (err = %ld)\n", PTR_ERR(hidden_root2));
-+				goto out;
-+			}
-+			if (!hidden_root2->d_inode) {
-+				printk(KERN_WARNING "mini_fo_parse_options: no storage dir to interpose on.\n");
-+				goto out;
-+			}
-+			stohs2(sb) = hidden_root2->d_sb;
-+		} else {
-+			printk(KERN_WARNING "mini_fo: unrecognized option '%s'\n", options);
-+			hidden_root = ERR_PTR(-EINVAL);
-+			goto out;
-+		}
-+		options = tmp + 1;
-+	}
-+
-+ out:
-+	if(IS_ERR(hidden_root2))
-+		return hidden_root2;
-+	return hidden_root;
-+}
-+
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int
-+#else
-+super_block_t *
-+#endif
-+mini_fo_read_super(super_block_t *sb, void *raw_data, int silent)
-+{
-+	dentry_t *hidden_root;
-+	int err = 0;
-+
-+	if (!raw_data) {
-+		printk(KERN_WARNING "mini_fo_read_super: missing argument\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	/*
-+	 * Allocate superblock private data
-+	 */
-+	__stopd(sb) = kmalloc(sizeof(struct mini_fo_sb_info), GFP_KERNEL);
-+	if (!stopd(sb)) {
-+		printk(KERN_WARNING "%s: out of memory\n", __FUNCTION__);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+	stohs(sb) = NULL;
-+
-+	hidden_root = mini_fo_parse_options(sb, raw_data);
-+	if (IS_ERR(hidden_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: lookup_dentry failed (err = %ld)\n", PTR_ERR(hidden_root));
-+		err = PTR_ERR(hidden_root);
-+		goto out_free;
-+	}
-+	if (!hidden_root->d_inode) {
-+		printk(KERN_WARNING "mini_fo_read_super: no directory to interpose on\n");
-+		goto out_free;
-+	}
-+	stohs(sb) = hidden_root->d_sb;
-+
-+	/*
-+	 * Linux 2.4.2-ac3 and beyond has code in
-+	 * mm/filemap.c:generic_file_write() that requires sb->s_maxbytes
-+	 * to be populated.  If not set, all write()s under that sb will
-+	 * return 0.
-+	 *
-+	 * Linux 2.4.4+ automatically sets s_maxbytes to MAX_NON_LFS;
-+	 * the filesystem should override it only if it supports LFS.
-+	 */
-+	/* non-SCA code is good to go with LFS */
-+	sb->s_maxbytes = hidden_root->d_sb->s_maxbytes;
-+
-+	sb->s_op = &mini_fo_sops;
-+	/*
-+	 * we can't use d_alloc_root if we want to use
-+	 * our own interpose function unchanged,
-+	 * so we simply replicate *most* of the code in d_alloc_root here
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	sb->s_root = d_alloc(NULL, &(const struct qstr) { "/", 1, 0 });
-+#else
-+	sb->s_root = d_alloc(NULL, &(const struct qstr){hash: 0, name: "/", len : 1});
-+#endif
-+	if (IS_ERR(sb->s_root)) {
-+		printk(KERN_WARNING "mini_fo_read_super: d_alloc failed\n");
-+		err = -ENOMEM;
-+		goto out_dput;
-+	}
-+
-+	sb->s_root->d_op = &mini_fo_dops;
-+	sb->s_root->d_sb = sb;
-+	sb->s_root->d_parent = sb->s_root;
-+
-+	/* link the upper and lower dentries */
-+	__dtopd(sb->s_root) = (struct mini_fo_dentry_info *)
-+		kmalloc(sizeof(struct mini_fo_dentry_info), GFP_KERNEL);
-+	if (!dtopd(sb->s_root)) {
-+		err = -ENOMEM;
-+		goto out_dput2;
-+	}
-+	dtopd(sb->s_root)->state = MODIFIED;
-+	dtohd(sb->s_root) = hidden_root;
-+
-+	/* fanout relevant, interpose on storage root dentry too */
-+	dtohd2(sb->s_root) = stopd(sb)->storage_dir_dentry;
-+
-+	/* ...and call tri-interpose to interpose root dir inodes
-+	 * if (mini_fo_interpose(hidden_root, sb->s_root, sb, 0))
-+	 */
-+	if(mini_fo_tri_interpose(hidden_root, dtohd2(sb->s_root), sb->s_root, sb, 0))
-+		goto out_dput2;
-+
-+	/* initalize the wol list */
-+	itopd(sb->s_root->d_inode)->deleted_list_size = -1;
-+	itopd(sb->s_root->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(sb->s_root);
-+
-+	goto out;
-+
-+ out_dput2:
-+	dput(sb->s_root);
-+ out_dput:
-+	dput(hidden_root);
-+	dput(dtohd2(sb->s_root)); /* release the hidden_sto_dentry too */
-+ out_free:
-+	kfree(stopd(sb));
-+	__stopd(sb) = NULL;
-+ out:
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        return err;
-+#else
-+        if (err) {
-+		return ERR_PTR(err);
-+        } else {
-+		return sb;
-+        }
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+static int mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super, mnt);
-+}
-+#else
-+static struct super_block *mini_fo_get_sb(struct file_system_type *fs_type,
-+					  int flags, const char *dev_name,
-+					  void *raw_data)
-+{
-+	return get_sb_nodev(fs_type, flags, raw_data, mini_fo_read_super);
-+}
-+#endif
-+
-+void mini_fo_kill_block_super(struct super_block *sb)
-+{
-+	generic_shutdown_super(sb);
-+	/*
-+	 *      XXX: BUG: Halcrow: Things get unstable sometime after this point:
-+	 *      lib/rwsem-spinlock.c:127: spin_is_locked on uninitialized
-+	 *      fs/fs-writeback.c:402: spin_lock(fs/super.c:a0381828) already
-+	 *      locked by fs/fs-writeback.c/402
-+	 *
-+	 *      Apparently, someone's not releasing a lock on sb_lock...
-+	 */
-+}
-+
-+static struct file_system_type mini_fo_fs_type = {
-+	.owner          = THIS_MODULE,
-+	.name           = "mini_fo",
-+	.get_sb         = mini_fo_get_sb,
-+	.kill_sb        = mini_fo_kill_block_super,
-+	.fs_flags       = 0,
-+};
-+
-+
-+#else
-+static DECLARE_FSTYPE(mini_fo_fs_type, "mini_fo", mini_fo_read_super, 0);
-+#endif
-+
-+static int __init init_mini_fo_fs(void)
-+{
-+	printk("Registering mini_fo version $Id$\n");
-+	return register_filesystem(&mini_fo_fs_type);
-+}
-+static void __exit exit_mini_fo_fs(void)
-+{
-+	printk("Unregistering mini_fo version $Id$\n");
-+	unregister_filesystem(&mini_fo_fs_type);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+EXPORT_NO_SYMBOLS;
-+#endif
-+
-+MODULE_AUTHOR("Erez Zadok <ezk@cs.sunysb.edu>");
-+MODULE_DESCRIPTION("FiST-generated mini_fo filesystem");
-+MODULE_LICENSE("GPL");
-+
-+/* MODULE_PARM(fist_debug_var, "i"); */
-+/* MODULE_PARM_DESC(fist_debug_var, "Debug level"); */
-+
-+module_init(init_mini_fo_fs)
-+module_exit(exit_mini_fo_fs)
---- /dev/null
-+++ b/fs/mini_fo/Makefile
-@@ -0,0 +1,17 @@
-+#
-+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
-+#
-+# Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+obj-$(CONFIG_MINI_FO) := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
-+# dependencies
-+${mini_fo-objs}: mini_fo.h fist.h
-+
---- /dev/null
-+++ b/fs/mini_fo/meta.c
-@@ -0,0 +1,1000 @@
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+int meta_build_lists(dentry_t *dentry)
-+{
-+	struct mini_fo_inode_info *inode_info;
-+
-+	dentry_t *meta_dentry = 0;
-+	file_t *meta_file = 0;
-+	mm_segment_t old_fs;
-+	void *buf;
-+
-+	int bytes, len;
-+	struct vfsmount *meta_mnt;
-+	char *entry;
-+
-+	inode_info = itopd(dentry->d_inode);
-+	if(!(inode_info->deleted_list_size == -1 &&
-+	     inode_info->renamed_list_size == -1)) {
-+		printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                  Error, list(s) not virgin.\n");
-+		return -1;
-+	}
-+
-+	/* init our meta lists */
-+	INIT_LIST_HEAD(&inode_info->deleted_list);
-+	inode_info->deleted_list_size = 0;
-+
-+	INIT_LIST_HEAD(&inode_info->renamed_list);
-+	inode_info->renamed_list_size = 0;
-+
-+  	/* might there be a META-file? */
-+	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		meta_dentry = lookup_one_len(META_FILENAME,
-+					     dtohd2(dentry),
-+					     strlen(META_FILENAME));
-+		if(!meta_dentry->d_inode) {
-+			dput(meta_dentry);
-+			goto out_ok;
-+		}
-+		/* $%& err, is this correct? */
-+		meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		mntget(meta_mnt);
-+
-+
-+		/* open META-file for reading */
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		if(!meta_file || IS_ERR(meta_file)) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR opening META file.\n");
-+			goto out_err;
-+		}
-+
-+		/* check if fs supports reading */
-+		if(!meta_file->f_op->read) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, fs does not support reading.\n");
-+			goto out_err_close;
-+		}
-+
-+		/* allocate a page for transfering the data */
-+		buf = (void *) __get_free_page(GFP_KERNEL);
-+		if(!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-+                                          ERROR, out of mem.\n");
-+			goto out_err_close;
-+		}
-+		meta_file->f_pos = 0;
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		do {
-+			char *c;
-+			bytes = meta_file->f_op->read(meta_file, buf, PAGE_SIZE, &meta_file->f_pos);
-+			if(bytes == PAGE_SIZE) {
-+				/* trim a cut off filename and adjust f_pos to get it next time */
-+				for(c = (char*) buf+PAGE_SIZE;
-+				    *c != '\n';
-+				    c--, bytes--, meta_file->f_pos--);
-+			}
-+			entry = (char *) buf;
-+			while(entry < (char *) buf+bytes) {
-+
-+				char *old_path;
-+				char *dir_name;
-+				int old_len, new_len;
-+
-+				/* len without '\n'*/
-+				len = (int) (strchr(entry, '\n') - entry);
-+				switch (*entry) {
-+				case 'D':
-+					/* format: "D filename" */
-+					meta_list_add_d_entry(dentry,
-+							      entry+2,
-+							      len-2);
-+					break;
-+				case 'R':
-+					/* format: "R path/xy/dir newDir" */
-+					old_path = entry+2;
-+					dir_name = strchr(old_path, ' ') + 1;
-+					old_len =  dir_name - old_path - 1;
-+					new_len = ((int) entry) + len - ((int ) dir_name);
-+					meta_list_add_r_entry(dentry,
-+							      old_path,
-+							      old_len,
-+							      dir_name,
-+							      new_len);
-+					break;
-+				default:
-+					/* unknown entry type detected */
-+					break;
-+				}
-+				entry += len+1;
-+			}
-+
-+		} while(meta_file->f_pos < meta_dentry->d_inode->i_size);
-+
-+		free_page((unsigned long) buf);
-+		set_fs(old_fs);
-+		fput(meta_file);
-+	}
-+	goto out_ok;
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out_err:
-+	mntput(meta_mnt);
-+	dput(meta_dentry);
-+	return -1;
-+ out_ok:
-+	return 1; /* check this!!! inode_info->wol_size; */
-+}
-+
-+/* cleanups up all lists and free's the mem by dentry */
-+int meta_put_lists(dentry_t *dentry)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_put_lists: invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_put_lists(dentry->d_inode);
-+}
-+
-+/* cleanups up all lists and free's the mem by inode */
-+int __meta_put_lists(inode_t *inode)
-+{
-+	int err = 0;
-+	if(!inode || !itopd(inode)) {
-+		printk("mini_fo: __meta_put_lists: invalid inode passed.\n");
-+		return -1;
-+	}
-+	err = __meta_put_d_list(inode);
-+	err |= __meta_put_r_list(inode);
-+	return err;
-+}
-+
-+int meta_sync_lists(dentry_t *dentry)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk("mini_fo: meta_sync_lists: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	err = meta_sync_d_list(dentry, 0);
-+	err |= meta_sync_r_list(dentry, 1);
-+	return err;
-+}
-+
-+
-+/* remove all D entries from the renamed list and free the mem */
-+int __meta_put_d_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: __meta_put_d_list: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the DELETED-list */
-+        if(inode_info->deleted_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->deleted_list)) {
-+		tmp = inode_info->deleted_list.next;
-+		list_del(tmp);
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+	}
-+	inode_info->deleted_list_size = 0;
-+
-+	return 0;
-+}
-+
-+/* remove all R entries from the renamed list and free the mem */
-+int __meta_put_r_list(inode_t *inode)
-+{
-+	struct list_head *tmp;
-+	struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_put_r_list: invalid inode.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        /* nuke the RENAMED-list */
-+        if(inode_info->renamed_list_size <= 0)
-+		return 0;
-+
-+	while(!list_empty(&inode_info->renamed_list)) {
-+		tmp = inode_info->renamed_list.next;
-+		list_del(tmp);
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+	}
-+	inode_info->renamed_list_size = 0;
-+
-+	return 0;
-+}
-+
-+int meta_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	err = meta_list_add_d_entry(dentry, name, len);
-+	err |= meta_write_d_entry(dentry,name,len);
-+	return err;
-+}
-+
-+/* add a D entry to the deleted list */
-+int meta_list_add_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0)
-+                return -1;
-+
-+        del_entry = (struct deleted_entry *)
-+		kmalloc(sizeof(struct deleted_entry), GFP_KERNEL);
-+        del_entry->name = (char*) kmalloc(len, GFP_KERNEL);
-+        if(!del_entry || !del_entry->name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_d_entry: \
-+                                  out of mem.\n");
-+		kfree(del_entry->name);
-+		kfree(del_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(del_entry->name, name, len);
-+        del_entry->len = len;
-+
-+        list_add(&del_entry->list, &inode_info->deleted_list);
-+        inode_info->deleted_list_size++;
-+        return 0;
-+}
-+
-+int meta_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+	int err = 0;
-+	err = meta_list_add_r_entry(dentry,
-+				    old_name, old_len,
-+				    new_name, new_len);
-+	err |= meta_write_r_entry(dentry,
-+				  old_name, old_len,
-+				  new_name, new_len);
-+	return err;
-+}
-+
-+/* add a R entry to the renamed list */
-+int meta_list_add_r_entry(dentry_t *dentry,
-+			  const char *old_name, int old_len,
-+			  const char *new_name, int new_len)
-+{
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+
-+        ren_entry = (struct renamed_entry *)
-+		kmalloc(sizeof(struct renamed_entry), GFP_KERNEL);
-+        ren_entry->old_name = (char*) kmalloc(old_len, GFP_KERNEL);
-+        ren_entry->new_name = (char*) kmalloc(new_len, GFP_KERNEL);
-+
-+        if(!ren_entry || !ren_entry->old_name || !ren_entry->new_name) {
-+                printk(KERN_CRIT "mini_fo: meta_list_add_r_entry: \
-+                                  out of mem.\n");
-+		kfree(ren_entry->new_name);
-+		kfree(ren_entry->old_name);
-+		kfree(ren_entry);
-+                return -ENOMEM;
-+        }
-+
-+        strncpy(ren_entry->old_name, old_name, old_len);
-+        ren_entry->old_len = old_len;
-+        strncpy(ren_entry->new_name, new_name, new_len);
-+        ren_entry->new_len = new_len;
-+
-+        list_add(&ren_entry->list, &inode_info->renamed_list);
-+        inode_info->renamed_list_size++;
-+        return 0;
-+}
-+
-+
-+int meta_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	int err = 0;
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+
-+	err = meta_list_remove_r_entry(dentry, name, len);
-+	err |= meta_sync_lists(dentry);
-+	return err;
-+}
-+
-+int meta_list_remove_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT
-+		       "mini_fo: meta_list_remove_r_entry: \
-+                        invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_list_remove_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_list_remove_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT
-+		       "mini_fo: __meta_list_remove_r_entry: \
-+                        invalid inode passed.\n");
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size < 0)
-+                return -1;
-+        if(inode_info->renamed_list_size == 0)
-+                return 1;
-+
-+	list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			list_del(tmp);
-+			kfree(ren_entry->new_name);
-+			kfree(ren_entry->old_name);
-+			kfree(ren_entry);
-+			inode_info->renamed_list_size--;
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
-+
-+/* append a single D entry to the meta file */
-+int meta_write_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry), strlen (META_FILENAME));
-+
-+	/* We need to create a META-file */
-+        if(!meta_dentry->d_inode) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR,
-+			   NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry,
-+			   S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt); /* $%& is this necessary? */
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: len for name, 1 for \n and 2 for "D " */
-+	buf = (char *) kmalloc(len+3, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'D';
-+	buf[1] = ' ';
-+	strncpy(buf+2, name, len);
-+	buf[len+2] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, len+3,
-+				       &meta_file->f_pos);
-+	if(bytes != len+3) {
-+		printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-+                                  ERROR writing.\n");
-+		err = -1;
-+	}
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* append a single R entry to the meta file */
-+int meta_write_r_entry(dentry_t *dentry,
-+		       const char *old_name, int old_len,
-+		       const char *new_name, int new_len)
-+{
-+	dentry_t *meta_dentry = 0;
-+        file_t *meta_file = 0;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+	struct vfsmount *meta_mnt = 0;
-+        char *buf;
-+
-+
-+	err = 0;
-+
-+	if(itopd(dentry->d_inode)->renamed_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* build the storage structure? */
-+	if(dtopd(dentry)->state == UNMODIFIED) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen (META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+	}
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR opening meta file.\n");
-+                mntput(meta_mnt);
-+                dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* size: 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+	buf_len = old_len + new_len + 4;
-+	buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+	if (!buf) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: out of mem.\n");
-+		return -ENOMEM;
-+	}
-+
-+	buf[0] = 'R';
-+	buf[1] = ' ';
-+	strncpy(buf + 2, old_name, old_len);
-+	buf[old_len + 2] = ' ';
-+	strncpy(buf + old_len + 3, new_name, new_len);
-+	buf[buf_len -1] = '\n';
-+	bytes = meta_file->f_op->write(meta_file, buf, buf_len, &meta_file->f_pos);
-+	if(bytes != buf_len) {
-+		printk(KERN_CRIT "mini_fo: meta_write_r_entry: ERROR writing.\n");
-+		err = -1;
-+	}
-+
-+	kfree(buf);
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+/* sync D list to disk, append data if app_flag is 1 */
-+/* check the meta_mnt, which seems not to be used (properly)  */
-+
-+int meta_sync_d_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  invalid inode passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+
-+		/* size: len for name, 1 for \n and 2 for "D " */
-+		buf = (char *) kmalloc(del_entry->len+3, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+
-+		buf[0] = 'D';
-+		buf[1] = ' ';
-+		strncpy(buf+2, del_entry->name, del_entry->len);
-+		buf[del_entry->len+2] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       del_entry->len+3,
-+					       &meta_file->f_pos);
-+		if(bytes != del_entry->len+3) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+
-+}
-+
-+int meta_sync_r_list(dentry_t *dentry, int app_flag)
-+{
-+	dentry_t *meta_dentry;
-+        file_t *meta_file;
-+        mm_segment_t old_fs;
-+
-+        int bytes, err, buf_len;
-+        struct vfsmount *meta_mnt;
-+        char *buf;
-+
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	err = 0;
-+	meta_file=0;
-+	meta_mnt=0;
-+
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  invalid dentry passed.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	inode_info = itopd(dentry->d_inode);
-+
-+        if(inode_info->deleted_list_size < 0) {
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* ok, there is something to sync */
-+
-+	/* build the storage structure? */
-+        if(!dtohd2(dentry) && !itohi2(dentry->d_inode)) {
-+                err = build_sto_structure(dentry->d_parent, dentry);
-+                if(err) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          build_sto_structure failed.\n");
-+			goto out;
-+                }
-+        }
-+	meta_dentry = lookup_one_len(META_FILENAME,
-+				     dtohd2(dentry),
-+				     strlen(META_FILENAME));
-+        if(!meta_dentry->d_inode) {
-+                /* We need to create a META-file */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR, NULL);
-+#else
-+                vfs_create(dtohd2(dentry)->d_inode,
-+			   meta_dentry, S_IRUSR | S_IWUSR);
-+#endif
-+		app_flag = 0;
-+	}
-+	/* need we truncate the meta file? */
-+	if(!app_flag) {
-+		struct iattr newattrs;
-+                newattrs.ia_size = 0;
-+                newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                down(&meta_dentry->d_inode->i_sem);
-+#endif
-+                err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-+                up(&meta_dentry->d_inode->i_sem);
-+#endif
-+                if(err || meta_dentry->d_inode->i_size != 0) {
-+                        printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR truncating meta file.\n");
-+                        goto out_err_close;
-+		}
-+	}
-+
-+        /* open META-file for writing */
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        if(!meta_file || IS_ERR(meta_file)) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR opening meta file.\n");
-+		/* we don't mntget so we dont't mntput (for now)
-+		 * mntput(meta_mnt);
-+		 */
-+		dput(meta_dentry);
-+		err = -1;
-+                goto out;
-+        }
-+
-+        /* check if fs supports writing */
-+        if(!meta_file->f_op->write) {
-+                printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                  ERROR, fs does not support writing.\n");
-+                goto out_err_close;
-+        }
-+
-+	meta_file->f_pos = meta_dentry->d_inode->i_size; /* append */
-+        old_fs = get_fs();
-+        set_fs(KERNEL_DS);
-+
-+	/* here we go... */
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		/* size:
-+		 * 2 for "R ", old_len+new_len for names, 1 blank+1 \n */
-+		buf_len = ren_entry->old_len + ren_entry->new_len + 4;
-+		buf = (char *) kmalloc(buf_len, GFP_KERNEL);
-+		if (!buf) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          out of mem.\n");
-+			return -ENOMEM;
-+		}
-+		buf[0] = 'R';
-+		buf[1] = ' ';
-+		strncpy(buf + 2, ren_entry->old_name, ren_entry->old_len);
-+		buf[ren_entry->old_len + 2] = ' ';
-+		strncpy(buf + ren_entry->old_len + 3,
-+			ren_entry->new_name, ren_entry->new_len);
-+		buf[buf_len - 1] = '\n';
-+		bytes = meta_file->f_op->write(meta_file, buf,
-+					       buf_len, &meta_file->f_pos);
-+		if(bytes != buf_len) {
-+			printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-+                                          ERROR writing.\n");
-+			err |= -1;
-+		}
-+		kfree(buf);
-+	}
-+	set_fs(old_fs);
-+
-+ out_err_close:
-+	fput(meta_file);
-+ out:
-+	return err;
-+}
-+
-+int meta_check_d_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode)
-+		printk(KERN_CRIT "mini_fo: meta_check_d_dentry: \
-+                                  invalid dentry passed.\n");
-+	return __meta_check_d_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_check_d_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct deleted_entry *del_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode))
-+		printk(KERN_CRIT "mini_fo: __meta_check_d_dentry: \
-+                                  invalid inode passed.\n");
-+
-+        inode_info = itopd(inode);
-+
-+        if(inode_info->deleted_list_size <= 0)
-+                return 0;
-+
-+        list_for_each(tmp, &inode_info->deleted_list) {
-+		del_entry = list_entry(tmp, struct deleted_entry, list);
-+		if(del_entry->len != len)
-+			continue;
-+
-+		if(!strncmp(del_entry->name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * check if file has been renamed and return path to orig. base dir.
-+ * Implements no error return values so far, what of course sucks.
-+ * String is null terminated.'
-+ */
-+char* meta_check_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid dentry passed.\n");
-+		return NULL;
-+	}
-+	return __meta_check_r_entry(dentry->d_inode, name, len);
-+}
-+
-+char* __meta_check_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+	char *old_path;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry: \
-+                                  invalid inode passed.\n");
-+		return NULL;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return NULL;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len)) {
-+			old_path = (char *)
-+				kmalloc(ren_entry->old_len+1, GFP_KERNEL);
-+			strncpy(old_path,
-+				ren_entry->old_name,
-+				ren_entry->old_len);
-+			old_path[ren_entry->old_len]='\0';
-+			return old_path;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * This version only checks if entry exists and return:
-+ *     1 if exists,
-+ *     0 if not,
-+ *    -1 if error.
-+ */
-+int meta_is_r_entry(dentry_t *dentry, const char *name, int len)
-+{
-+	if(!dentry || !dentry->d_inode) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid dentry passed.\n");
-+		return -1;
-+	}
-+	return __meta_is_r_entry(dentry->d_inode, name, len);
-+}
-+
-+int __meta_is_r_entry(inode_t *inode, const char *name, int len)
-+{
-+	struct list_head *tmp;
-+        struct renamed_entry *ren_entry;
-+        struct mini_fo_inode_info *inode_info;
-+
-+	if(!inode || !itopd(inode)) {
-+		printk(KERN_CRIT "mini_fo: meta_check_r_dentry [2]: \
-+                                  invalid inode passed.\n");
-+		return -1;
-+	}
-+	inode_info = itopd(inode);
-+
-+        if(inode_info->renamed_list_size <= 0)
-+                return -1;
-+
-+        list_for_each(tmp, &inode_info->renamed_list) {
-+		ren_entry = list_entry(tmp, struct renamed_entry, list);
-+		if(ren_entry->new_len != len)
-+			continue;
-+
-+		if(!strncmp(ren_entry->new_name, name, len))
-+			return 1;
-+	}
-+	return 0;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/mini_fo.h
-@@ -0,0 +1,510 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifndef __MINI_FO_H_
-+#define __MINI_FO_H_
-+
-+#ifdef __KERNEL__
-+
-+/* META stuff */
-+#define META_FILENAME "META_dAfFgHE39ktF3HD2sr"
-+
-+/* use xattrs? */
-+#define XATTR
-+
-+/* File attributes that when changed, result in a file beeing copied to storage */
-+#define COPY_FLAGS ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE
-+
-+/*
-+ * mini_fo filestates
-+ */
-+#define MODIFIED       1
-+#define UNMODIFIED     2
-+#define CREATED        3
-+#define DEL_REWRITTEN  4
-+#define DELETED        5
-+#define NON_EXISTANT   6
-+
-+/* fist file systems superblock magic */
-+# define MINI_FO_SUPER_MAGIC 0xf15f
-+
-+/*
-+ * STRUCTURES:
-+ */
-+
-+/* mini_fo inode data in memory */
-+struct mini_fo_inode_info {
-+	inode_t *wii_inode;
-+	inode_t *wii_inode2; /* pointer to storage inode */
-+
-+	/* META-data lists */
-+	/* deleted list, ex wol */
-+	struct list_head deleted_list;
-+	int deleted_list_size;
-+
-+	/* renamed list */
-+	struct list_head renamed_list;
-+	int renamed_list_size;
-+
-+	/* add other lists here ... */
-+};
-+
-+/* mini_fo dentry data in memory */
-+struct mini_fo_dentry_info {
-+	dentry_t *wdi_dentry;
-+	dentry_t *wdi_dentry2; /* pointer to  storage dentry */
-+	unsigned int state;  /* state of the mini_fo dentry */
-+};
-+
-+
-+/* mini_fo super-block data in memory */
-+struct mini_fo_sb_info {
-+	super_block_t *wsi_sb, *wsi_sb2; /* mk: might point to the same sb */
-+	struct vfsmount *hidden_mnt, *hidden_mnt2;
-+	dentry_t *base_dir_dentry;
-+	dentry_t *storage_dir_dentry;
-+	;
-+};
-+
-+/* readdir_data, readdir helper struct */
-+struct readdir_data {
-+	struct list_head ndl_list; /* linked list head ptr */
-+	int ndl_size; /* list size */
-+	int sto_done; /* flag to show that the storage dir entries have
-+		       * all been read an now follow base entries */
-+};
-+
-+/* file private data. */
-+struct mini_fo_file_info {
-+	struct file *wfi_file;
-+	struct file *wfi_file2; /* pointer to storage file */
-+	struct readdir_data rd;
-+};
-+
-+/* struct ndl_entry */
-+struct ndl_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/********************************
-+ *  META-data structures
-+ ********************************/
-+
-+/* deleted entry */
-+struct deleted_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* renamed entry */
-+struct renamed_entry {
-+	struct list_head list;
-+	char *old_name;     /* old directory with full path */
-+	int old_len;        /* length of above string */
-+	char *new_name;     /* new directory name */
-+	int new_len;        /* length of above string */
-+};
-+
-+/* attr_change entry */
-+struct attr_change_entry {
-+	struct list_head list;
-+	char *name;
-+	int len;
-+};
-+
-+/* link entry */
-+struct link_entry {
-+	struct list_head list;
-+	int links_moved;
-+	int inum_base;
-+	int inum_sto;
-+	char *weird_name;
-+	int weird_name_len;
-+};
-+
-+
-+/* Some other stuff required for mini_fo_filldir64, copied from
-+ * fs/readdir.c
-+ */
-+
-+#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
-+#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-+
-+
-+struct linux_dirent64 {
-+        u64             d_ino;
-+        s64             d_off;
-+        unsigned short  d_reclen;
-+        unsigned char   d_type;
-+        char            d_name[0];
-+};
-+
-+
-+struct getdents_callback64 {
-+        struct linux_dirent64 * current_dir;
-+        struct linux_dirent64 * previous;
-+        int count;
-+        int error;
-+};
-+
-+struct linux_dirent {
-+	unsigned long   d_ino;
-+	unsigned long   d_off;
-+	unsigned short  d_reclen;
-+	char            d_name[1];
-+};
-+
-+struct getdents_callback {
-+	struct linux_dirent * current_dir;
-+	struct linux_dirent * previous;
-+	int count;
-+	int error;
-+};
-+
-+
-+/*
-+ * MACROS:
-+ */
-+
-+/* file TO private_data */
-+# define ftopd(file) ((struct mini_fo_file_info *)((file)->private_data))
-+# define __ftopd(file) ((file)->private_data)
-+/* file TO hidden_file */
-+# define ftohf(file) ((ftopd(file))->wfi_file)
-+# define ftohf2(file) ((ftopd(file))->wfi_file2)
-+
-+/* inode TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->i_private)
-+# define __itopd(ino) ((ino)->i_private)
-+#else
-+# define itopd(ino) ((struct mini_fo_inode_info *)(ino)->u.generic_ip)
-+# define __itopd(ino) ((ino)->u.generic_ip)
-+#endif
-+/* inode TO hidden_inode */
-+# define itohi(ino) (itopd(ino)->wii_inode)
-+# define itohi2(ino) (itopd(ino)->wii_inode2)
-+
-+/* superblock TO private_data */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->s_fs_info)
-+# define __stopd(super) ((super)->s_fs_info)
-+#else
-+# define stopd(super) ((struct mini_fo_sb_info *)(super)->u.generic_sbp)
-+# define __stopd(super) ((super)->u.generic_sbp)
-+#endif
-+
-+/* unused? # define vfs2priv stopd */
-+/* superblock TO hidden_superblock */
-+
-+# define stohs(super) (stopd(super)->wsi_sb)
-+# define stohs2(super) (stopd(super)->wsi_sb2)
-+
-+/* dentry TO private_data */
-+# define dtopd(dentry) ((struct mini_fo_dentry_info *)(dentry)->d_fsdata)
-+# define __dtopd(dentry) ((dentry)->d_fsdata)
-+/* dentry TO hidden_dentry */
-+# define dtohd(dent) (dtopd(dent)->wdi_dentry)
-+# define dtohd2(dent) (dtopd(dent)->wdi_dentry2)
-+
-+/* dentry to state */
-+# define dtost(dent) (dtopd(dent)->state)
-+# define sbt(sb) ((sb)->s_type->name)
-+
-+#define IS_WRITE_FLAG(flag) (flag & (O_RDWR | O_WRONLY | O_APPEND))
-+#define IS_COPY_FLAG(flag) (flag & (COPY_FLAGS))
-+
-+/* macros to simplify non-SCA code */
-+#  define MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages)
-+#  define MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages)
-+#  define FREE_PAGE_POINTERS(hidden_pages, num)
-+#  define FREE_PAGEDATA_POINTERS(hidden_pages_data, num)
-+#  define FOR_EACH_PAGE
-+#  define CURRENT_HIDDEN_PAGE hidden_page
-+#  define CURRENT_HIDDEN_PAGEDATA hidden_page_data
-+#  define CURRENT_HIDDEN_PAGEINDEX page->index
-+
-+/*
-+ * EXTERNALS:
-+ */
-+extern struct file_operations mini_fo_main_fops;
-+extern struct file_operations mini_fo_dir_fops;
-+extern struct inode_operations mini_fo_main_iops;
-+extern struct inode_operations mini_fo_dir_iops;
-+extern struct inode_operations mini_fo_symlink_iops;
-+extern struct super_operations mini_fo_sops;
-+extern struct dentry_operations mini_fo_dops;
-+extern struct vm_operations_struct mini_fo_shared_vmops;
-+extern struct vm_operations_struct mini_fo_private_vmops;
-+extern struct address_space_operations mini_fo_aops;
-+
-+#if 0 /* unused by mini_fo */
-+extern int mini_fo_interpose(dentry_t *hidden_dentry, dentry_t *this_dentry, super_block_t *sb, int flag);
-+#if defined(FIST_FILTER_DATA) || defined(FIST_FILTER_SCA)
-+extern page_t *mini_fo_get1page(file_t *file, int index);
-+extern int mini_fo_fill_zeros(file_t *file, page_t *page, unsigned from);
-+# endif /* FIST_FILTER_DATA || FIST_FILTER_SCA */
-+
-+
-+#  define mini_fo_hidden_dentry(d) __mini_fo_hidden_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+#  define mini_fo_hidden_sto_dentry(d) __mini_fo_hidden_sto_dentry(__FILE__,__FUNCTION__,__LINE__,(d))
-+
-+extern dentry_t *__mini_fo_hidden_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+extern dentry_t *__mini_fo_hidden_sto_dentry(char *file, char *func, int line, dentry_t *this_dentry);
-+
-+extern int mini_fo_read_file(const char *filename, void *buf, int len);
-+extern int mini_fo_write_file(const char *filename, void *buf, int len);
-+extern dentry_t *fist_lookup(dentry_t *dir, const char *name, vnode_t **out, uid_t uid, gid_t gid);
-+#endif /* unused by mini_fo */
-+
-+/* state transition functions */
-+extern int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag);
-+extern int nondir_del_rew_to_del(dentry_t *dentry);
-+extern int nondir_creat_to_del(dentry_t *dentry);
-+extern int nondir_mod_to_del(dentry_t *dentry);
-+extern int nondir_unmod_to_del(dentry_t *dentry);
-+
-+extern int dir_unmod_to_mod(dentry_t *dentry);
-+
-+/* rename specials */
-+extern int rename_directory(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+extern int rename_nondir(inode_t *old_dir, dentry_t *old_dentry, inode_t *new_dir, dentry_t *new_dentry);
-+
-+/* misc stuff */
-+extern int mini_fo_tri_interpose(dentry_t *hidden_dentry,
-+				 dentry_t *hidden_sto_dentry,
-+				 dentry_t *dentry,
-+				 super_block_t *sb, int flag);
-+
-+extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
-+			   dentry_t *src_dentry, struct vfsmount *src_mnt);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, dev_t dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd);
-+#else
-+extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode);
-+
-+extern int create_sto_nod(dentry_t *dentry, int mode, int dev);
-+extern int create_sto_reg_file(dentry_t *dentry, int mode);
-+#endif
-+
-+extern int create_sto_dir(dentry_t *dentry, int mode);
-+
-+extern int exists_in_storage(dentry_t *dentry);
-+extern int is_mini_fo_existant(dentry_t *dentry);
-+extern int get_neg_sto_dentry(dentry_t *dentry);
-+extern int build_sto_structure(dentry_t *dir, dentry_t *dentry);
-+extern int get_mini_fo_bpath(dentry_t *dentry, char **bpath, int *bpath_len);
-+extern dentry_t *bpath_walk(super_block_t *sb, char *bpath);
-+extern int bpath_put(dentry_t *dentry);
-+
-+/* check_mini_fo types functions */
-+extern int check_mini_fo_dentry(dentry_t *dentry);
-+extern int check_mini_fo_file(file_t *file);
-+extern int check_mini_fo_inode(inode_t *inode);
-+
-+/* General meta functions, can be called from outside of meta.c */
-+extern int meta_build_lists(dentry_t *dentry);
-+extern int meta_put_lists(dentry_t *dentry);
-+extern int __meta_put_lists(inode_t *inode);
-+
-+extern int meta_add_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_add_r_entry(dentry_t *dentry,
-+			    const char *old_name, int old_len,
-+			    const char *new_name, int new_len);
-+
-+extern int meta_remove_r_entry(dentry_t *dentry, const char *name, int len);
-+
-+extern int meta_check_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_check_d_entry(inode_t *inode, const char *name, int len);
-+
-+extern char* meta_check_r_entry(dentry_t *dentry, const char *name, int len);
-+extern char* __meta_check_r_entry(inode_t *inode, const char *name, int len);
-+extern int meta_is_r_entry(dentry_t *dentry, const char *name, int len);
-+extern int __meta_is_r_entry(inode_t *inode, const char *name, int len);
-+
-+/* Specific meta functions, should be called only inside meta.c */
-+extern int __meta_put_d_list(inode_t *inode);
-+extern int __meta_put_r_list(inode_t *inode);
-+
-+extern int meta_list_add_d_entry(dentry_t *dentry,
-+				 const char *name, int len);
-+extern int meta_list_add_r_entry(dentry_t *dentry,
-+				 const char *old_name, int old_len,
-+				 const char *new_name, int new_len);
-+
-+extern int meta_list_remove_r_entry(dentry_t *dentry,
-+				    const char *name, int len);
-+
-+extern int __meta_list_remove_r_entry(inode_t *inode,
-+				      const char *name, int len);
-+
-+extern int meta_write_d_entry(dentry_t *dentry, const char *name, int len);
-+extern int meta_write_r_entry(dentry_t *dentry,
-+			      const char *old_name, int old_len,
-+			      const char *new_name, int new_len);
-+
-+extern int meta_sync_lists(dentry_t *dentry);
-+extern int meta_sync_d_list(dentry_t *dentry, int app_flag);
-+extern int meta_sync_r_list(dentry_t *dentry, int app_flag);
-+
-+/* ndl stuff */
-+extern int ndl_add_entry(struct readdir_data *rd, const char *name, int len);
-+extern void ndl_put_list(struct readdir_data *rd);
-+extern int ndl_check_entry(struct readdir_data *rd,
-+			   const char *name, int len);
-+
-+
-+# define copy_inode_size(dst, src) \
-+    dst->i_size = src->i_size; \
-+    dst->i_blocks = src->i_blocks;
-+
-+static inline void
-+fist_copy_attr_atime(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+}
-+static inline void
-+fist_copy_attr_times(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+}
-+static inline void
-+fist_copy_attr_timesizes(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+	copy_inode_size(dest, src);
-+}
-+static inline void
-+fist_copy_attr_all(inode_t *dest, const inode_t *src)
-+{
-+	ASSERT(dest != NULL);
-+	ASSERT(src != NULL);
-+	dest->i_mode = src->i_mode;
-+	dest->i_nlink = src->i_nlink;
-+	dest->i_uid = src->i_uid;
-+	dest->i_gid = src->i_gid;
-+	dest->i_rdev = src->i_rdev;
-+	dest->i_atime = src->i_atime;
-+	dest->i_mtime = src->i_mtime;
-+	dest->i_ctime = src->i_ctime;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+	dest->i_blksize = src->i_blksize;
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12)
-+	dest->i_blkbits = src->i_blkbits;
-+# endif /* linux 2.4.12 and newer */
-+	copy_inode_size(dest, src);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	dest->i_attr_flags = src->i_attr_flags;
-+#else
-+	dest->i_flags = src->i_flags;
-+#endif
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
-+static inline void double_down(struct semaphore *s1, struct semaphore *s2)
-+{
-+        if (s1 != s2) {
-+                if ((unsigned long) s1 < (unsigned long) s2) {
-+                        struct semaphore *tmp = s2;
-+                        s2 = s1; s1 = tmp;
-+                }
-+                down(s1);
-+        }
-+        down(s2);
-+}
-+
-+static inline void double_up(struct semaphore *s1, struct semaphore *s2)
-+{
-+        up(s1);
-+        if (s1 != s2)
-+                up(s2);
-+}
-+
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+        double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem);
-+        dput(d1);
-+        dput(d2);
-+}
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Definitions for user and kernel code
-+ */
-+
-+/* ioctls */
-+
-+#endif	/* not __MINI_FO_H_ */
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-merge
-@@ -0,0 +1,180 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+BASE=
-+STO=
-+HELP=
-+DRYRUN=
-+VERBOSE=
-+TMP="/tmp/"
-+META_NAME="META_dAfFgHE39ktF3HD2sr"
-+SKIP_DEL_LIST="skip-delete-list.mini_fo-merge"
-+
-+COMMAND=
-+exec_command()
-+{
-+    if [ x$DRYRUN == "xset" ]; then
-+	echo "  would run: $COMMAND"
-+    elif ! [ x$DRYRUN == "xset" ]; then
-+	if [ x$VERBOSE == "xset" ]; then
-+	    echo "  running: $COMMAND"
-+	fi
-+	eval $COMMAND
-+    fi
-+}
-+
-+usage()
-+{
-+cat <<EOF
-+
-+USAGE: $0 -b <base dir> -s <storage dir>
-+Version 0.1
-+
-+This script merges the contents of a mini_fo storage file system back
-+to the base file system.
-+
-+!!! Warning: This will modify the base filesystem and can destroy data
-+             if used wrongly.
-+
-+Options:
-+     -b <base dir>
-+          the directory of the base file system.
-+
-+     -s <storage dir>
-+          the directory of the storage file system.
-+
-+     -d   dry run, will not change anything and print the commands that
-+          would be executed.
-+
-+     -t   tmp dir for storing temporary file. default: $TMP
-+
-+     -v   show what operations are performed.
-+
-+     -h   displays this message.
-+
-+EOF
-+}
-+
-+# parse parameters
-+while getopts hdvt:b:s: OPTS
-+  do
-+  case $OPTS in
-+      h)  HELP="set";;
-+      d)  DRYRUN="set";;
-+      v)  VERBOSE="set";;
-+      b)  BASE="$OPTARG";;
-+      s)  STO="$OPTARG";;
-+      t)  TMP="$OPTARG";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+if ! [ -d "$BASE" ] || ! [ -d "$STO" ]; then
-+    echo -e "$0:\n Error, -s and/or -b argument missing. type $0 -h for help."
-+    exit -1;
-+fi
-+
-+# get full paths
-+pushd $STO; STO=`pwd`; popd
-+pushd $BASE; BASE=`pwd`; popd
-+TMP=${TMP%/}
-+
-+
-+cat<<EOF
-+###############################################################################
-+# mini_fo-merge
-+#
-+# base dir:       $BASE
-+# storage dir:    $STO
-+# meta filename:  $META_NAME
-+# dry run:        $DRYRUN
-+# verbose:        $VERBOSE
-+# tmp files:      $TMP
-+###############################################################################
-+
-+EOF
-+
-+rm $TMP/$SKIP_DEL_LIST
-+
-+# first process all renamed dirs
-+echo "Merging renamed directories..."
-+pushd $STO &> /dev/null
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^R ' | tr -s ':R' ' ' | while read ENTRY; do
-+    echo "entry: $ENTRY"
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    OLD_B_DIR=`echo $ENTRY | cut -d ' ' -f 2 | sed -e 's/\///'`
-+    NEW_NAME=`echo $ENTRY | cut -d ' ' -f 3`
-+    NEW_B_DIR=`echo $META_FILE | sed -e "s/$META_NAME/$NEW_NAME/" | sed -e 's/^\.\///'`
-+    echo "META_FILE: $META_FILE"
-+    echo "OLD_B_DIR: $OLD_B_DIR"
-+    echo "NEW_NAME: $NEW_NAME"
-+    echo  "NEW_B_DIR: $NEW_B_DIR"
-+
-+    pushd $BASE &> /dev/null
-+    # remove an existing dir in storage
-+    COMMAND="rm -rf $NEW_B_DIR"; exec_command
-+    COMMAND="cp -R $OLD_B_DIR $NEW_B_DIR"; exec_command
-+    echo ""
-+    popd &> /dev/null
-+
-+    # remember this dir to exclude it from deleting later
-+    echo $NEW_B_DIR >> $TMP/$SKIP_DEL_LIST
-+done
-+
-+# delete all whiteouted files from base
-+echo -e "\nDeleting whiteout'ed files from base file system..."
-+find . -name $META_NAME -type f -print0  | xargs -0 -e grep  -e '^D ' | sed -e 's/:D//' | while read ENTRY; do
-+    META_FILE=`echo $ENTRY | cut -d ' ' -f 1`
-+    DEL_NAME=`echo $ENTRY | cut -d ' ' -f 2`
-+    DEL_FILE=`echo $META_FILE | sed -e "s/$META_NAME/$DEL_NAME/" | sed -e 's/^\.\///'`
-+    grep -x $DEL_FILE $TMP/$SKIP_DEL_LIST &> /dev/null
-+    if [ $? -ne 0 ]; then
-+	pushd $BASE &> /dev/null
-+	COMMAND="rm -rf $DEL_FILE"; exec_command
-+	popd &> /dev/null
-+    else
-+	echo "  excluding: $DEL_FILE as in skip-del-list."
-+    fi
-+done
-+
-+# create all dirs and update permissions
-+echo -e "\nSetting up directory structures in base file system..."
-+find . -type d | sed -e 's/^\.\///' | while read DIR; do
-+    PERMS=`stat -c %a $DIR`
-+    DIR_UID=`stat -c %u $DIR`
-+    DIR_GID=`stat -c %g $DIR`
-+    pushd $BASE &> /dev/null
-+    if ! [ -d $DIR ]; then
-+	COMMAND="mkdir -p $DIR"; exec_command
-+    fi
-+    COMMAND="chmod $PERMS $DIR"; exec_command
-+    COMMAND="chown $DIR_UID:$DIR_GID $DIR"; exec_command
-+    popd &> /dev/null
-+done
-+
-+# merge all non-directory files
-+echo -e "\nMerging all non-directory files...."
-+for i in b c p f l s; do
-+    find . -type $i | sed -e 's/^\.\///' | grep -v "$META_NAME" | while read FILE; do
-+	pushd $BASE #&> /dev/null
-+	COMMAND="cp -df $STO/$FILE $BASE/$FILE"; exec_command
-+	popd &> /dev/null
-+    done
-+done
-+popd &> /dev/null
-+
-+#rm $TMP/$SKIP_DEL_LIST
-+
-+echo "Done!"
---- /dev/null
-+++ b/fs/mini_fo/mini_fo-overlay
-@@ -0,0 +1,130 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version
-+# 2 of the License, or (at your option) any later version.
-+#
-+
-+HELP=
-+SUFF=
-+MNTP=
-+MNT_DIR="/mnt"
-+STO=
-+STO_DIR="/tmp"
-+BASE=
-+
-+usage()
-+{
-+cat <<EOF
-+
-+Usage: $0 [-s suffix] [-d sto_dir_dir] [-m mount point] base_dir
-+Version 0.1
-+
-+This script overlays the given base directory using the mini_fo file
-+system. If only the base directory base_dir is given, $0
-+will use a storage directory called "sto-<base_dir_name>" in $STO_DIR,
-+and mount point "mini_fo-<base_dir_dir>" in $MNT_DIR.
-+
-+Options:
-+     -s <suffix>
-+          add given suffix to storage directory and the mount
-+          point. This is usefull for overlaying one base directory
-+          several times and avoiding conflicts with storage directory
-+          names and mount points.
-+
-+     -d <sto_dir_dir>
-+          change the directory in which the storage directory will be
-+          created (default is currently "$STO_DIR".
-+
-+     -m <mount point>
-+          use an alternative directory to create the mini_fo
-+          mountpoint (default is currently "$MNT_DIR".
-+
-+     -h   displays this message.
-+
-+EOF
-+exit 1;
-+}
-+
-+while getopts hm:s:d: OPTS
-+  do
-+  case $OPTS in
-+      s)  SUFF="$OPTARG";;
-+      d)  STO_DIR="$OPTARG";;
-+      m)  MNT_DIR="$OPTARG";;
-+      h)  HELP="set";;
-+      ?)  usage
-+	  exit 1;;
-+  esac
-+done
-+shift $(($OPTIND - 1))
-+
-+BASE="$1"
-+
-+if [ "x$HELP" == "xset" ]; then
-+    usage
-+    exit -1
-+fi
-+
-+# fix suffix
-+if [ "x$SUFF" != "x" ]; then
-+    SUFF="-$SUFF"
-+fi
-+
-+# kill trailing slashes
-+MNT_DIR=${MNT_DIR%/}
-+STO_DIR=${STO_DIR%/}
-+BASE=${BASE%/}
-+
-+
-+if ! [ -d "$BASE" ]; then
-+    echo "invalid base dir $BASE, run $0 -h for help."
-+    exit -1
-+fi
-+
-+# check opts
-+if ! [ -d "$MNT_DIR" ]; then
-+    echo "invalid mount dir $MNT_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+if ! [ -d "$STO_DIR" ]; then
-+    echo "invalid sto_dir_dir $STO_DIR, run $0 -h for help."
-+    exit -1
-+fi
-+
-+MNTP="$MNT_DIR/mini_fo-`basename $BASE`$SUFF"
-+STO="$STO_DIR/sto-`basename $BASE`$SUFF"
-+
-+# create the mount point if it doesn't exist
-+mkdir -p $MNTP
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create mount point $MNTP"
-+fi
-+
-+mkdir -p $STO
-+if [ $? -ne 0 ]; then
-+    echo "Error, failed to create storage dir $STO"
-+fi
-+
-+# check if fs is already mounted
-+mount | grep mini_fo | grep $MNTP &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, existing mini_fo mount at $MNTP."
-+    exit -1
-+fi
-+
-+mount | grep mini_fo | grep $STO &> /dev/null
-+if [ $? -eq 0 ]; then
-+    echo "Error, $STO seems to be used already."
-+    exit -1
-+fi
-+
-+# mount
-+mount -t mini_fo -o base=$BASE,sto=$STO $BASE $MNTP
-+
-+if [ $? -ne 0 ]; then
-+    echo "Error, mounting failed, maybe no permisson to mount?"
-+fi
---- /dev/null
-+++ b/fs/mini_fo/mmap.c
-@@ -0,0 +1,637 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+#ifdef FIST_COUNT_WRITES
-+/* for counting writes in the middle vs. regular writes */
-+unsigned long count_writes = 0, count_writes_middle = 0;
-+#endif /* FIST_COUNT_WRITES */
-+
-+/* forward declaration of commit write and prepare write */
-+STATIC int mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+STATIC int mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to);
-+
-+
-+/*
-+ * Function for handling creation of holes when lseek-ing past the
-+ * end of the file and then writing some data.
-+ */
-+int
-+mini_fo_fill_zeros(file_t* file, page_t *page, unsigned from)
-+{
-+	int err = 0;
-+	dentry_t *dentry = file->f_dentry;
-+	inode_t *inode = dentry->d_inode;
-+	page_t *tmp_page;
-+	int index;
-+
-+	print_entry_location();
-+
-+	for (index = inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+		tmp_page = mini_fo_get1page(file, index);
-+		if (IS_ERR(tmp_page)) {
-+			err = PTR_ERR(tmp_page);
-+			goto out;
-+		}
-+
-+		/*
-+		 * zero out rest of the contents of the page between the appropriate
-+		 * offsets.
-+		 */
-+		memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+		if (! (err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+
-+		page_cache_release(tmp_page);
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+	/* zero out appropriate parts of last page */
-+
-+	/*
-+	 * if the encoding type is block, then adjust the 'from' (where the
-+	 * zeroing will start) offset appropriately
-+	 */
-+	from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+
-+	if ((from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0) {
-+
-+		memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, from - (inode->i_size & ~PAGE_CACHE_MASK));
-+		if (! (err = mini_fo_prepare_write(file, page, 0, PAGE_CACHE_SIZE)))
-+			err = mini_fo_commit_write(file, page, 0, PAGE_CACHE_SIZE);
-+
-+		if (err < 0)
-+			goto out;
-+		if (current->need_resched)
-+			schedule();
-+	}
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_writepage(page_t *page)
-+{
-+	int err = -EIO;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	char *kaddr, *hidden_kaddr;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	/*
-+	 * writepage is called when shared mmap'ed files need to write
-+	 * their pages, while prepare/commit_write are called from the
-+	 * non-paged write() interface.  (However, in 2.3 the two interfaces
-+	 * share the same cache, while in 2.2 they didn't.)
-+	 *
-+	 * So we pretty much have to duplicate much of what commit_write does.
-+	 */
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	/* get page address, and encode it */
-+	kaddr = (char *) kmap(page);
-+	hidden_kaddr = (char*) kmap(hidden_page);
-+	mini_fo_encode_block(kaddr, hidden_kaddr, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then return error */
-+	kunmap(page);
-+	kunmap(hidden_page);
-+
-+	/* call lower writepage (expects locked page) */
-+	err = hidden_inode->i_mapping->a_ops->writepage(hidden_page);
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,1)
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+# endif /* kernel older than 2.4.1 */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+	if (err)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+ out:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,1)
-+	UnlockPage(page);
-+# endif /* kernel 2.4.1 and newer */
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * returns unlocked, up-to-date page (if ok), with increased refcnt.
-+ */
-+page_t *
-+mini_fo_get1page(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+	wait_on_page(page);
-+	if (!Page_Uptodate(page)) {
-+		lock_page(page);
-+		err = mapping->a_ops->readpage(file, page);
-+		if (err) {
-+			page = ERR_PTR(err);
-+			goto out;
-+		}
-+		wait_on_page(page);
-+		if (!Page_Uptodate(page)) {
-+			page = ERR_PTR(-EIO);
-+			goto out;
-+		}
-+	}
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * get one page from cache or lower f/s, return error otherwise.
-+ * similar to get1page, but doesn't guarantee that it will return
-+ * an unlocked page.
-+ */
-+page_t *
-+mini_fo_get1page_cached(file_t *file, int index)
-+{
-+	page_t *page;
-+	dentry_t *dentry;
-+	inode_t *inode;
-+	struct address_space *mapping;
-+	int err;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	inode = dentry->d_inode;
-+	mapping = inode->i_mapping;
-+
-+	fist_dprint(8, "%s: read page index %d pid %d\n", __FUNCTION__, index, current->pid);
-+	if (index < 0) {
-+		printk("%s BUG: index=%d\n", __FUNCTION__, index);
-+		page = ERR_PTR(-EIO);
-+		goto out;
-+	}
-+	page = read_cache_page(mapping,
-+			       index,
-+			       (filler_t *) mapping->a_ops->readpage,
-+			       (void *) file);
-+	if (IS_ERR(page))
-+		goto out;
-+
-+ out:
-+	print_exit_pointer(page);
-+	return page;
-+}
-+
-+
-+/*
-+ * readpage is called from generic_page_read and the fault handler.
-+ * If your file system uses generic_page_read for the read op, it
-+ * must implement readpage.
-+ *
-+ * Readpage expects a locked page, and must unlock it.
-+ */
-+STATIC int
-+mini_fo_do_readpage(file_t *file, page_t *page)
-+{
-+	int err = -EIO;
-+	dentry_t *dentry;
-+	file_t *hidden_file = NULL;
-+	dentry_t *hidden_dentry;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	char *page_data;
-+	page_t *hidden_page;
-+	char *hidden_page_data;
-+	int real_size;
-+
-+	print_entry_location();
-+
-+	dentry = file->f_dentry; /* CPW: Moved below print_entry_location */
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+	hidden_dentry = dtohd(dentry);
-+	inode = dentry->d_inode;
-+	hidden_inode = itohi(inode);
-+
-+	fist_dprint(7, "%s: requesting page %d from file %s\n", __FUNCTION__, page->index, dentry->d_name.name);
-+
-+	MALLOC_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	MALLOC_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGE = NULL;
-+
-+	/* find lower page (returns a locked page) */
-+	FOR_EACH_PAGE {
-+		fist_dprint(8, "%s: Current page index = %d\n", __FUNCTION__, CURRENT_HIDDEN_PAGEINDEX);
-+		CURRENT_HIDDEN_PAGE = read_cache_page(hidden_inode->i_mapping,
-+						      CURRENT_HIDDEN_PAGEINDEX,
-+						      (filler_t *) hidden_inode->i_mapping->a_ops->readpage,
-+						      (void *) hidden_file);
-+		if (IS_ERR(CURRENT_HIDDEN_PAGE)) {
-+			err = PTR_ERR(CURRENT_HIDDEN_PAGE);
-+			CURRENT_HIDDEN_PAGE = NULL;
-+			goto out_release;
-+		}
-+	}
-+
-+	/*
-+	 * wait for the page data to show up
-+	 * (signaled by readpage as unlocking the page)
-+	 */
-+	FOR_EACH_PAGE {
-+		wait_on_page(CURRENT_HIDDEN_PAGE);
-+		if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+			/*
-+			 * call readpage() again if we returned from wait_on_page with a
-+			 * page that's not up-to-date; that can happen when a partial
-+			 * page has a few buffers which are ok, but not the whole
-+			 * page.
-+			 */
-+			lock_page(CURRENT_HIDDEN_PAGE);
-+			err = hidden_inode->i_mapping->a_ops->readpage(hidden_file,
-+								       CURRENT_HIDDEN_PAGE);
-+			if (err) {
-+				CURRENT_HIDDEN_PAGE = NULL;
-+				goto out_release;
-+			}
-+			wait_on_page(CURRENT_HIDDEN_PAGE);
-+			if (!Page_Uptodate(CURRENT_HIDDEN_PAGE)) {
-+				err = -EIO;
-+				goto out_release;
-+			}
-+		}
-+	}
-+
-+	/* map pages, get their addresses */
-+	page_data = (char *) kmap(page);
-+	FOR_EACH_PAGE
-+		CURRENT_HIDDEN_PAGEDATA = (char *) kmap(CURRENT_HIDDEN_PAGE);
-+
-+	/* if decode_block could fail, then return error */
-+	err = 0;
-+	real_size = hidden_inode->i_size - (page->index << PAGE_CACHE_SHIFT);
-+	if (real_size <= 0)
-+		memset(page_data, 0, PAGE_CACHE_SIZE);
-+	else if (real_size < PAGE_CACHE_SIZE) {
-+		mini_fo_decode_block(hidden_page_data, page_data, real_size, inode, inode->i_sb, page->index);
-+		memset(page_data + real_size, 0, PAGE_CACHE_SIZE - real_size);
-+	} else
-+		mini_fo_decode_block(hidden_page_data, page_data, PAGE_CACHE_SIZE, inode, inode->i_sb, page->index);
-+
-+	FOR_EACH_PAGE
-+		kunmap(CURRENT_HIDDEN_PAGE);
-+	kunmap(page);
-+
-+ out_release:
-+	FOR_EACH_PAGE
-+		if (CURRENT_HIDDEN_PAGE)
-+			page_cache_release(CURRENT_HIDDEN_PAGE); /* undo read_cache_page */
-+
-+	FREE_PAGE_POINTERS(hidden_pages, num_hidden_pages);
-+	FREE_PAGEDATA_POINTERS(hidden_pages_data, num_hidden_pages);
-+
-+ out:
-+	if (err == 0)
-+		SetPageUptodate(page);
-+	else
-+		ClearPageUptodate(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_readpage(file_t *file, page_t *page)
-+{
-+	int err;
-+	print_entry_location();
-+
-+	err = mini_fo_do_readpage(file, page);
-+
-+	/*
-+	 * we have to unlock our page, b/c we _might_ have gotten a locked page.
-+	 * but we no longer have to wakeup on our page here, b/c UnlockPage does
-+	 * it
-+	 */
-+	UnlockPage(page);
-+
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+STATIC int
-+mini_fo_prepare_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = 0;
-+
-+	print_entry_location();
-+
-+	/*
-+	 * we call kmap(page) only here, and do the kunmap
-+	 * and the actual downcalls, including unlockpage and uncache
-+	 * in commit_write.
-+	 */
-+	kmap(page);
-+
-+	/* fast path for whole page writes */
-+	if (from == 0 && to == PAGE_CACHE_SIZE)
-+		goto out;
-+	/* read the page to "revalidate" our data */
-+	/* call the helper function which doesn't unlock the page */
-+	if (!Page_Uptodate(page))
-+		err = mini_fo_do_readpage(file, page);
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
-+
-+
-+
-+STATIC int
-+mini_fo_commit_write(file_t *file, page_t *page, unsigned from, unsigned to)
-+{
-+	int err = -ENOMEM;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+	file_t *hidden_file = NULL;
-+	loff_t pos;
-+	unsigned bytes = to - from;
-+	unsigned hidden_from, hidden_to, hidden_bytes;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	ASSERT(file != NULL);
-+	/*
-+	 * here we have a kmapped page, with data from the user copied
-+	 * into it.  we need to encode_block it, and then call the lower
-+	 * commit_write.  We also need to simulate same behavior of
-+	 * generic_file_write, and call prepare_write on the lower f/s first.
-+	 */
-+#ifdef FIST_COUNT_WRITES
-+	count_writes++;
-+# endif /* FIST_COUNT_WRITES */
-+
-+	/* this is append and/or extend -- we can't have holes so fill them in */
-+	if (page->index > (hidden_inode->i_size >> PAGE_CACHE_SHIFT)) {
-+		page_t *tmp_page;
-+		int index;
-+		for (index = hidden_inode->i_size >> PAGE_CACHE_SHIFT; index < page->index; index++) {
-+			tmp_page = mini_fo_get1page(file, index);
-+			if (IS_ERR(tmp_page)) {
-+				err = PTR_ERR(tmp_page);
-+				goto out;
-+			}
-+			/* zero out the contents of the page at the appropriate offsets */
-+			memset((char*)page_address(tmp_page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, PAGE_CACHE_SIZE - (inode->i_size & ~PAGE_CACHE_MASK));
-+			if (!(err = mini_fo_prepare_write(file, tmp_page, 0, PAGE_CACHE_SIZE)))
-+				err = mini_fo_commit_write(file, tmp_page, 0, PAGE_CACHE_SIZE);
-+			page_cache_release(tmp_page);
-+			if (err < 0)
-+				goto out;
-+			if (current->need_resched)
-+				schedule();
-+		}
-+	}
-+
-+	if (ftopd(file) != NULL)
-+		hidden_file = ftohf(file);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
-+	down(&hidden_inode->i_sem);
-+#endif
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+#if FIST_ENCODING_BLOCKSIZE > 1
-+#  error encoding_blocksize greater than 1 is not yet supported
-+# endif /* FIST_ENCODING_BLOCKSIZE > 1 */
-+
-+	hidden_from = from & (~(FIST_ENCODING_BLOCKSIZE - 1));
-+	hidden_to = ((to + FIST_ENCODING_BLOCKSIZE - 1) & (~(FIST_ENCODING_BLOCKSIZE - 1)));
-+	if ((page->index << PAGE_CACHE_SHIFT) + to > hidden_inode->i_size) {
-+
-+		/*
-+		 * if this call to commit_write had introduced holes and the code
-+		 * for handling holes was invoked, then the beginning of this page
-+		 * must be zeroed out
-+		 * zero out bytes from 'size_of_file%pagesize' to 'from'.
-+		 */
-+		if ((hidden_from - (inode->i_size & ~PAGE_CACHE_MASK)) > 0)
-+			memset((char*)page_address(page) + (inode->i_size & ~PAGE_CACHE_MASK), 0, hidden_from - (inode->i_size & ~PAGE_CACHE_MASK));
-+
-+	}
-+	hidden_bytes = hidden_to - hidden_from;
-+
-+	/* call lower prepare_write */
-+	err = -EINVAL;
-+	if (hidden_inode->i_mapping &&
-+	    hidden_inode->i_mapping->a_ops &&
-+	    hidden_inode->i_mapping->a_ops->prepare_write)
-+		err = hidden_inode->i_mapping->a_ops->prepare_write(hidden_file,
-+								    hidden_page,
-+								    hidden_from,
-+								    hidden_to);
-+	if (err)
-+		/* don't leave locked pages behind, esp. on an ENOSPC */
-+		goto out_unlock;
-+
-+	fist_dprint(8, "%s: encoding %d bytes\n", __FUNCTION__, hidden_bytes);
-+	mini_fo_encode_block((char *) page_address(page) + hidden_from, (char*) page_address(hidden_page) + hidden_from, hidden_bytes, inode, inode->i_sb, page->index);
-+	/* if encode_block could fail, then goto unlock and return error */
-+
-+	/* call lower commit_write */
-+	err = hidden_inode->i_mapping->a_ops->commit_write(hidden_file,
-+							   hidden_page,
-+							   hidden_from,
-+							   hidden_to);
-+
-+	if (err < 0)
-+		goto out_unlock;
-+
-+	err = bytes;	/* convert error to no. of bytes */
-+
-+	inode->i_blocks = hidden_inode->i_blocks;
-+	/* we may have to update i_size */
-+	pos = (page->index << PAGE_CACHE_SHIFT) + to;
-+	if (pos > inode->i_size)
-+		inode->i_size = pos;
-+
-+	/*
-+	 * update mtime and ctime of lower level file system
-+	 * mini_fo' mtime and ctime are updated by generic_file_write
-+	 */
-+	hidden_inode->i_mtime = hidden_inode->i_ctime = CURRENT_TIME;
-+
-+	mark_inode_dirty_sync(inode);
-+
-+ out_unlock:
-+	UnlockPage(hidden_page);
-+	page_cache_release(hidden_page);
-+	kunmap(page);		/* kmap was done in prepare_write */
-+ out:
-+	/* we must set our page as up-to-date */
-+	if (err < 0)
-+		ClearPageUptodate(page);
-+	else
-+		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
-+	up(&hidden_inode->i_sem);
-+#endif
-+	print_exit_status(err);
-+	return err;			/* assume all is ok */
-+}
-+
-+
-+STATIC int
-+mini_fo_bmap(struct address_space *mapping, long block)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+
-+	print_entry_location();
-+
-+	inode = (inode_t *) mapping->host;
-+	hidden_inode = itohi(inode);
-+
-+	if (hidden_inode->i_mapping->a_ops->bmap)
-+		err = hidden_inode->i_mapping->a_ops->bmap(hidden_inode->i_mapping, block);
-+	print_exit_location();
-+	return err;
-+}
-+
-+
-+/*
-+ * This function is copied verbatim from mm/filemap.c.
-+ * XXX: It should be simply moved to some header file instead -- bug Al about it!
-+ */
-+static inline int sync_page(struct page *page)
-+{
-+	struct address_space *mapping = page->mapping;
-+
-+	if (mapping && mapping->a_ops && mapping->a_ops->sync_page)
-+		return mapping->a_ops->sync_page(page);
-+	return 0;
-+}
-+
-+
-+/*
-+ * XXX: we may not need this function if not FIST_FILTER_DATA.
-+ * FIXME: for FIST_FILTER_SCA, get all lower pages and sync them each.
-+ */
-+STATIC int
-+mini_fo_sync_page(page_t *page)
-+{
-+	int err = 0;
-+	inode_t *inode;
-+	inode_t *hidden_inode;
-+	page_t *hidden_page;
-+
-+	print_entry_location();
-+
-+	inode = page->mapping->host; /* CPW: Moved below print_entry_location */
-+	hidden_inode = itohi(inode);
-+
-+	/* find lower page (returns a locked page) */
-+	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
-+	if (!hidden_page)
-+		goto out;
-+
-+	err = sync_page(hidden_page);
-+
-+	UnlockPage(hidden_page);	/* b/c grab_cache_page locked it */
-+	page_cache_release(hidden_page); /* b/c grab_cache_page increased refcnt */
-+
-+ out:
-+	print_exit_status(err);
-+	return err;
-+}
---- /dev/null
-+++ b/fs/mini_fo/README
-@@ -0,0 +1,163 @@
-+README for the mini_fo overlay file system
-+=========================================
-+
-+
-+WHAT IS MINI_FO?
-+----------------
-+
-+mini_fo is a virtual kernel file system that can make read-only
-+file systems writable. This is done by redirecting modifying operations
-+to a writeable location called "storage directory", and leaving the
-+original data in the "base directory" untouched. When reading, the
-+file system merges the modifed and original data so that only the
-+newest versions will appear. This occurs transparently to the user,
-+who can access the data like on any other read-write file system.
-+
-+Base and storage directories may be located on the same or on
-+different partitions and may be of different file system types. While
-+the storage directory obviously needs to be writable, the base may or
-+may not be writable, what doesn't matter as it will no be modified
-+anyway.
-+
-+
-+WHAT IS GOOD FOR?
-+-----------------
-+
-+The primary purpose of the mini_fo file system is to allow easy
-+software updates to embedded systems, that often store their root
-+file system in a read-only flash file system, but there are many
-+more as for example sandboxing, or for allowing live-cds to
-+permanently store information.
-+
-+
-+BUILDING
-+--------
-+This should be simple. Adjust the Makefile to point to the correct
-+kernel headers you want to build the module for. Then:
-+
-+    # make
-+
-+should build "mini_fo.o" for a 2.4 kernel or "mini_fo.ko" for a 2.6
-+kernel.
-+
-+If you are building the module for you current kernel, you can install
-+the module (as root):
-+
-+    # make install
-+
-+or uninstall with
-+
-+    # make uninstall
-+
-+
-+USING THE FILE SYSTEM
-+--------------------
-+
-+the general mount syntax is:
-+
-+   mount -t mini_fo -o base=<base directory>,sto=<storage directory>\
-+                            <base directory> <mount point>
-+
-+Example:
-+
-+You have mounted a cdrom to /mnt/cdrom and want to modifiy some files
-+on it:
-+
-+load the module (as root)
-+
-+    # insmod mini_fo.o for a 2.4 kernel or
-+
-+    # insmod mini_fo.ko for a 2.6 kernel
-+
-+
-+create a storage dir in tmp and a mountpoint for mini_fo:
-+
-+    # mkdir /tmp/sto
-+    # mkdir /mnt/mini_fo
-+
-+and mount the mini_fo file system:
-+
-+    # mount -t mini_fo -o base=/mnt/cdrom,sto=/tmp/sto /mnt/cdrom /mnt/mini_fo
-+
-+
-+Now the data stored on the cd can be accessed via the mini_fo
-+mountpoint just like any read-write file system, files can be modified
-+and deleted, new ones can be created and so on. When done unmount the
-+file system:
-+
-+    # unmount /mnt/mini_fo
-+
-+Note that if the file system is mounted again using the same storage
-+file system, of course it will appear in the modified state again. If
-+you remount it using an new empty storage directory, it will be
-+unmodified. Therefore by executing:
-+
-+    # cd /tmp/sto
-+    # rm -rf *
-+
-+you can nuke all the changes you made to the original file system. But
-+ remember NEVER do this while the mini_fo file system is mounted!
-+
-+
-+Alternatively you can use the mini_fo-overlay bash script, that
-+simplifies managing mini_fo mounts. See TOOLS Section.
-+
-+
-+TOOLS
-+-----
-+
-+mini_fo-merge (experimental):
-+
-+This is a bash script that will merge changes contained in the storage
-+directory back to the base directory. This allows mini_fo to function
-+as a cache file system by overlaying a slow (network, ...) file system
-+and using a fast (ramdisk, ...) as storage. When done, changes can be
-+merged back to the (slow) base with mini_fo-merge. See "mini_fo-merge
-+-h" for details.
-+
-+It can be usefull for merging changes back after a successfull test
-+(patches, software updates...)
-+
-+
-+mini_fo-overlay:
-+
-+This bash script simplifies managing one or more mini_fo mounts. For
-+overlaying a directory called "basedir1", you can just call:
-+
-+    # mini_fo-overlay basedir1
-+
-+This will mount mini_fo with "basedir1" as base, "/tmp/sto-basedir1/"
-+as storage to "/mnt/mini_fo-basedir1/". It has more options though,
-+type "mini_fo-overlay -h" for details.
-+
-+
-+DOCUMENTATION, REPORTING BUGS, GETTING HELP
-+-------------------------------------------
-+
-+Please visit the mini_fo project page at:
-+
-+http://www.denx.de/twiki/bin/view/Know/MiniFOHome
-+
-+
-+WARNINGS
-+--------
-+
-+Never modify the base or the storage directorys while the mini_fo
-+file system is mounted, or you might crash you system. Simply accessing
-+and reading should not cause any trouble.
-+
-+Exporting a mini_fo mount point via NFS has not been tested, and may
-+or may not work.
-+
-+Check the RELEASE_NOTES for details on bugs and features.
-+
-+
-+
-+Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version
-+2 of the License, or (at your option) any later version.
-+
-+
---- /dev/null
-+++ b/fs/mini_fo/RELEASE_NOTES
-@@ -0,0 +1,111 @@
-+Release:	mini_fo-0.6.1 (v0-6-1)
-+Date:		21.09.2005
-+
-+
-+Changes:
-+--------
-+v0-6-1:
-+
-+- bugfixes (see ChangeLog)
-+
-+- two helper scripts "mini_fo_merge" and "mini_fo_overlay" (see
-+  README for details).
-+
-+v0-6-0:
-+
-+- Support for 2.4 and 2.6 (see Makefile)
-+
-+- Partial hard link support (creating works as expected, but already
-+  existing links in the base file system will be treated as if they
-+  were individual files).
-+
-+- Various bugfixes and cleanups.
-+
-+
-+v0-6-0-pre1:
-+
-+- This is mini_fo-0-6-0-pre1! This release is a complete rewrite of
-+  many vital mini_fo parts such as the old whiteout list code which
-+  has been replaced by the new META subsystem.
-+
-+- Light weight directory renaming implemented. This means if a
-+  directory is renamed via the mini_fo filesystem this will no longer
-+  result in a complete copy in storage, instead only one empty
-+  directory will be created. All base filed contained in the original
-+  directory stay there until modified.
-+
-+- Special files (creating, renaming, deleting etc.) now working.
-+
-+- Many bugfixes and cleanup, mini_fo is now a lot more stable.
-+
-+
-+v0-5-10:
-+
-+- Final release of the 0-5-* versions. Next will be a complete rewrite
-+  of many features. This release contains several bugfixes related to
-+  directory renaming.
-+
-+
-+v0-5-10-pre6:
-+
-+- Lots of cleanup and several bugfixes related to directory deleting
-+
-+- Directory renaming suddenly works, what is most likely due to the
-+  fact tha that "mv" is smart: if the classic rename doesn't work it
-+  will assume that source and target file are on different fs and will
-+  copy the directory and try to remove the source directory. Until
-+  directory removing wasn't implemented, it would fail to do this and
-+  rollback.
-+  So, directory renaming works for now, but it doesn't yet do what you
-+  would expect from a overlay fs, so use with care.
-+
-+
-+v0-5-10-pre5:
-+
-+- implemented directory deleting
-+- made parsing of mount options more stable
-+- New format of mount options! (See README)
-+- I can't reproduce the unknown panic with 2.4.25 anymore, so I'll
-+  happily assume it never existed!
-+
-+
-+Implemented features:
-+---------------------
-+
-+- creating hard links (see BUGS on already existing hard links)
-+- lightweight directory renaming
-+- renaming device files, pipes, sockets, etc.
-+- creating, renaming, deleting of special files
-+- deleting directorys
-+- general directory reading (simple "ls" )
-+- creating files in existing directorys
-+- creating directorys
-+- renaming files.
-+- reading and writing files (involves opening)
-+- appending to files (creates copy in storage)
-+- deleting files
-+- llseek works too, what allows editors to work
-+- persistency (a deleted file stay deleted over remounts)
-+- use of symbolic links
-+- creating of device files
-+
-+
-+Not (yet) implemented features:
-+-------------------------------
-+
-+- full hard link support.
-+
-+
-+
-+BUGS:
-+-----
-+
-+Hard links in the base file system will be treated as individual
-+files, not as links to one inode.
-+
-+The main problem with hard links isn't allowing to create them, but
-+their pure existence. If you modify a base hard link, the changes made
-+will only show up on this link, the other link will remain in the
-+original state. I hope to fix this someday. Please note that this does
-+not effect the special hard links '.' and '..', that are handled
-+seperately by the lower fs.
---- /dev/null
-+++ b/fs/mini_fo/state.c
-@@ -0,0 +1,620 @@
-+/*
-+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+/* create the storage file, setup new states */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_reg_file(dentry_t *dentry, int mode, struct nameidata *nd)
-+#else
-+int create_sto_reg_file(dentry_t *dentry, int mode)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: wrong type or state.\n");
-+		err = -EINVAL;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode, nd);
-+#else
-+	err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+			 hidden_sto_dentry,
-+			 mode);
-+#endif
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_file: ERROR creating sto file [2].\n");
-+                err = -EINVAL;
-+                goto out_lock;
-+        }
-+
-+        /* interpose the new inode */
-+        if(dtost(dentry) == DELETED) {
-+                dtost(dentry) = DEL_REWRITTEN;
-+                err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == NON_EXISTANT) {
-+                dtost(dentry) = CREATED;
-+                err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+                if(err)
-+                        goto out_lock;
-+        }
-+        else if(dtost(dentry) == UNMODIFIED) {
-+                dtost(dentry) = MODIFIED;
-+                /* interpose on new inode */
-+                if(itohi2(dentry->d_inode) != NULL) {
-+                        printk(KERN_CRIT "mini_fo: create_sto_file: invalid inode detected.\n");
-+                        err = -EINVAL;
-+                        goto out_lock;
-+                }
-+                itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+	fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* create the sto dir, setup states */
-+int create_sto_dir(dentry_t *dentry, int mode)
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+        dentry_t *hidden_sto_dir_dentry;
-+
-+	/* had to take the "!S_ISDIR(mode))" check out, because it failed */
-+	if(exists_in_storage(dentry)) {
-+                printk(KERN_CRIT "mini_fo: create_sto_dir: wrong type or state.\\
-+n");
-+                err = -EINVAL;
-+                goto out;
-+        }
-+
-+	err = get_neg_sto_dentry(dentry);
-+	if(err) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mkdir(hidden_sto_dir_dentry->d_inode,
-+			hidden_sto_dentry,
-+			mode);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir.\n");
-+		goto out_lock;
-+	}
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_dir: ERROR creating sto dir [2].\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == NON_EXISTANT) {
-+		dtopd(dentry)->state = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtopd(dentry)->state == UNMODIFIED) {
-+		dtopd(dentry)->state = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo:  create_sto_dir: ERROR, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+	/* initalize the wol list */
-+	itopd(dentry->d_inode)->deleted_list_size = -1;
-+	itopd(dentry->d_inode)->renamed_list_size = -1;
-+	meta_build_lists(dentry);
-+
-+
-+ out_lock:
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+int create_sto_nod(dentry_t *dentry, int mode, dev_t dev)
-+#else
-+int create_sto_nod(dentry_t *dentry, int mode, int dev)
-+#endif
-+{
-+	int err = 0;
-+	inode_t *dir;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	if(exists_in_storage(dentry)) {
-+		err = -EEXIST;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+                printk(KERN_CRIT "mini_fo: create_sto_nod: ERROR getting neg. sto dentry.\n");
-+                goto out;
-+        }
-+
-+	dir = dentry->d_parent->d_inode;
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+	if (IS_ERR(hidden_sto_dir_dentry))
-+		goto out;
-+
-+	err = vfs_mknod(hidden_sto_dir_dentry->d_inode, hidden_sto_dentry, mode, dev);
-+	if(err)
-+		goto out_lock;
-+
-+	if(!dtohd2(dentry)->d_inode) {
-+		printk(KERN_CRIT "mini_fo: create_sto_nod: creating storage inode failed [1].\n");
-+		err = -EINVAL; /* return something indicating failure */
-+		goto out_lock;
-+	}
-+
-+	/* interpose the new inode */
-+	if(dtost(dentry) == DELETED) {
-+		dtost(dentry) = DEL_REWRITTEN;
-+		err = mini_fo_tri_interpose(NULL, hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == NON_EXISTANT) {
-+		dtost(dentry) = CREATED;
-+		err = mini_fo_tri_interpose(dtohd(dentry), hidden_sto_dentry, dentry, dir->i_sb, 0);
-+		if(err)
-+			goto out_lock;
-+	}
-+	else if(dtost(dentry) == UNMODIFIED) {
-+		dtost(dentry) = MODIFIED;
-+		/* interpose on new inode */
-+		if(itohi2(dentry->d_inode) != NULL) {
-+			printk(KERN_CRIT "mini_fo: create_sto_nod: error, invalid inode detected.\n");
-+			err = -EINVAL;
-+			goto out_lock;
-+		}
-+		itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+	}
-+
-+	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+
-+/* unimplemented (and possibly not usefull):
-+
-+   nondir-del_to_del_rew
-+   nondir-non_exist_to_creat
-+
-+   dir-unmod_to_del
-+   dir-mod_to_del
-+   dir-creat_to_del
-+   dir-del_rew_to_del
-+   dir-del_to_del_rew
-+   dir-non_exist_to_creat
-+*/
-+
-+
-+/* bring a file of any type from state UNMODIFIED to MODIFIED */
-+int nondir_unmod_to_mod(dentry_t *dentry, int cp_flag)
-+{
-+	int err = 0;
-+	struct vfsmount *tgt_mnt;
-+	struct vfsmount *src_mnt;
-+	dentry_t *tgt_dentry;
-+	dentry_t *src_dentry;
-+	dentry_t *hidden_sto_dentry;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if((dtost(dentry) != UNMODIFIED) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if (err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR getting neg. sto dentry.\n");
-+		goto out;
-+	}
-+
-+	/* create sto file */
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* lock parent */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+        down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	err = PTR_ERR(hidden_sto_dir_dentry);
-+        if (IS_ERR(hidden_sto_dir_dentry))
-+                goto out;
-+
-+	/* handle different types of nondirs */
-+	if(S_ISCHR(dentry->d_inode->i_mode) ||
-+	   S_ISBLK(dentry->d_inode->i_mode)) {
-+		err = vfs_mknod(hidden_sto_dir_dentry->d_inode,
-+				hidden_sto_dentry,
-+				dtohd(dentry)->d_inode->i_mode,
-+				dtohd(dentry)->d_inode->i_rdev);
-+	}
-+
-+	else if(S_ISREG(dentry->d_inode->i_mode)) {
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode, NULL);
-+#else
-+		err = vfs_create(hidden_sto_dir_dentry->d_inode,
-+				 hidden_sto_dentry,
-+				 dtohd(dentry)->d_inode->i_mode);
-+#endif
-+	}
-+        if(err) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR creating sto file.\n");
-+                goto out_lock;
-+	}
-+
-+	/* interpose on new inode */
-+	if(itohi2(dentry->d_inode) != NULL) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                  ERROR, invalid inode detected.\n");
-+		err = -EINVAL;
-+		goto out_lock;
-+	}
-+
-+	itohi2(dentry->d_inode) = igrab(dtohd2(dentry)->d_inode);
-+
-+        fist_copy_attr_timesizes(dentry->d_parent->d_inode,
-+				 hidden_sto_dir_dentry->d_inode);
-+	dtost(dentry) = MODIFIED;
-+
-+	/* copy contents if regular file and cp_flag = 1 */
-+	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
-+
-+		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+		dput(hidden_sto_dir_dentry);
-+
-+		tgt_dentry = dtohd2(dentry);
-+		tgt_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+		src_dentry = dtohd(dentry);
-+		src_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt;
-+
-+		err = mini_fo_cp_cont(tgt_dentry, tgt_mnt,
-+				      src_dentry, src_mnt);
-+		if(err) {
-+			printk(KERN_CRIT "mini_fo: nondir_unmod_to_mod: \
-+                                          ERROR copying contents.\n");
-+		}
-+		goto out;
-+	}
-+
-+ out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+        dput(hidden_sto_dir_dentry);
-+ out:
-+	return err;
-+}
-+
-+/* this function is currently identical to nondir_creat_to_del */
-+int nondir_del_rew_to_del(dentry_t *dentry)
-+{
-+	return nondir_creat_to_del(dentry);
-+}
-+
-+int nondir_creat_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+	dentry_t *hidden_sto_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	/* for now this function serves for both state DEL_REWRITTEN and
-+	 * CREATED */
-+	if(!(dtost(dentry) == CREATED || (dtost(dentry) == DEL_REWRITTEN)) ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del/del_rew_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	dtost(dentry) = NON_EXISTANT;
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_mod_to_del(dentry_t *dentry)
-+{
-+	int err;
-+	dentry_t *hidden_sto_dentry;
-+	inode_t *hidden_sto_dir_inode;
-+	dentry_t *hidden_sto_dir_dentry;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != MODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_mod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	hidden_sto_dir_inode = itohi2(dentry->d_parent->d_inode);
-+	hidden_sto_dentry = dtohd2(dentry);
-+
-+	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
-+	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
-+	/* avoid destroying the hidden inode if the file is in use */
-+	dget(hidden_sto_dentry);
-+	err = vfs_unlink(hidden_sto_dir_inode, hidden_sto_dentry);
-+	dput(hidden_sto_dentry);
-+	if(!err)
-+		d_delete(hidden_sto_dentry);
-+
-+	/* propagate number of hard-links */
-+	dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
-+	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-+	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+	dput(hidden_sto_dir_dentry);
-+
-+ out:
-+	return err;
-+}
-+
-+int nondir_unmod_to_del(dentry_t *dentry)
-+{
-+	int err = 0;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: nondir_unmod_to_del: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	 /* next we have to get a negative dentry for the storage file */
-+	err = get_neg_sto_dentry(dentry);
-+
-+	if(err)
-+		goto out;
-+
-+	/* add deleted file to META lists */
-+	err = meta_add_d_entry(dentry->d_parent,
-+			       dentry->d_name.name,
-+			       dentry->d_name.len);
-+
-+	if(err)
-+		goto out;
-+
-+	/* dput base dentry, this will relase the inode and free the
-+	 * dentry, as we will never need it again. */
-+	dput(dtohd(dentry));
-+	dtohd(dentry) = NULL;
-+	dtost(dentry) = DELETED;
-+
-+ out:
-+	return err;
-+}
-+
-+/* bring a dir from state UNMODIFIED to MODIFIED */
-+int dir_unmod_to_mod(dentry_t *dentry)
-+{
-+	int err;
-+
-+	check_mini_fo_dentry(dentry);
-+
-+	if(dtost(dentry) != UNMODIFIED ||
-+	   !S_ISDIR(dentry->d_inode->i_mode)) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  wrong type or state.\n");
-+		err = -1;
-+		goto out;
-+	}
-+
-+	/* this creates our dir incl. sto. structure */
-+	err = build_sto_structure(dentry->d_parent, dentry);
-+	if(err) {
-+		printk(KERN_CRIT "mini_fo: dir_unmod_to_mod: \
-+                                  build_sto_structure failed.\n");
-+		goto out;
-+	}
-+ out:
-+	return err;
-+}
-+
---- /dev/null
-+++ b/fs/mini_fo/super.c
-@@ -0,0 +1,281 @@
-+/*
-+ * Copyright (c) 1997-2003 Erez Zadok
-+ * Copyright (c) 2001-2003 Stony Brook University
-+ *
-+ * For specific licensing information, see the COPYING file distributed with
-+ * this package, or get one from ftp://ftp.filesystems.org/pub/fist/COPYING.
-+ *
-+ * This Copyright notice must be kept intact and distributed with all
-+ * fistgen sources INCLUDING sources generated by fistgen.
-+ */
-+/*
-+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+/*
-+ *  $Id$
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "fist.h"
-+#include "mini_fo.h"
-+
-+
-+STATIC void
-+mini_fo_read_inode(inode_t *inode)
-+{
-+	static struct address_space_operations mini_fo_empty_aops;
-+
-+	__itopd(inode) = kmalloc(sizeof(struct mini_fo_inode_info), GFP_KERNEL);
-+	if (!itopd(inode)) {
-+		printk("<0>%s:%s:%d: No kernel memory!\n", __FILE__, __FUNCTION__, __LINE__);
-+		ASSERT(NULL);
-+	}
-+	itohi(inode) = NULL;
-+	itohi2(inode) = NULL;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	inode->i_version++;
-+#else
-+	inode->i_version = ++event;	/* increment inode version */
-+#endif
-+	inode->i_op = &mini_fo_main_iops;
-+	inode->i_fop = &mini_fo_main_fops;
-+#if 0
-+	/*
-+	 * XXX: To export a file system via NFS, it has to have the
-+	 * FS_REQUIRES_DEV flag, so turn it on.  But should we inherit it from
-+	 * the lower file system, or can we allow our file system to be exported
-+	 * even if the lower one cannot be natively exported.
-+	 */
-+	inode->i_sb->s_type->fs_flags |= FS_REQUIRES_DEV;
-+	/*
-+	 * OK, the above was a hack, which is now turned off because it may
-+	 * cause a panic/oops on some systems.  The correct way to export a
-+	 * "nodev" filesystem is via using nfs-utils > 1.0 and the "fsid=" export
-+	 * parameter, which requires 2.4.20 or later.
-+	 */
-+#endif
-+	/* I don't think ->a_ops is ever allowed to be NULL */
-+	inode->i_mapping->a_ops = &mini_fo_empty_aops;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * No need to call write_inode() on the lower inode, as it
-+ * will have been marked 'dirty' anyway. But we might need
-+ * to write some of our own stuff to disk.
-+ */
-+STATIC void
-+mini_fo_write_inode(inode_t *inode, int sync)
-+{
-+	print_entry_location();
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+STATIC void
-+mini_fo_put_inode(inode_t *inode)
-+{
-+	/*
-+	 * This is really funky stuff:
-+	 * Basically, if i_count == 1, iput will then decrement it and this inode will be destroyed.
-+	 * It is currently holding a reference to the hidden inode.
-+	 * Therefore, it needs to release that reference by calling iput on the hidden inode.
-+	 * iput() _will_ do it for us (by calling our clear_inode), but _only_ if i_nlink == 0.
-+	 * The problem is, NFS keeps i_nlink == 1 for silly_rename'd files.
-+	 * So we must for our i_nlink to 0 here to trick iput() into calling our clear_inode.
-+	 */
-+	if (atomic_read(&inode->i_count) == 1)
-+		inode->i_nlink = 0;
-+}
-+
-+
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+/*
-+ * we now define delete_inode, because there are two VFS paths that may
-+ * destroy an inode: one of them calls clear inode before doing everything
-+ * else that's needed, and the other is fine.  This way we truncate the inode
-+ * size (and its pages) and then clear our own inode, which will do an iput
-+ * on our and the lower inode.
-+ */
-+STATIC void
-+mini_fo_delete_inode(inode_t *inode)
-+{
-+	print_entry_location();
-+
-+	fist_checkinode(inode, "mini_fo_delete_inode IN");
-+	inode->i_size = 0;		/* every f/s seems to do that */
-+	clear_inode(inode);
-+
-+	print_exit_location();
-+}
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+
-+
-+/* final actions when unmounting a file system */
-+STATIC void
-+mini_fo_put_super(super_block_t *sb)
-+{
-+	if (stopd(sb)) {
-+		mntput(stopd(sb)->hidden_mnt);
-+		mntput(stopd(sb)->hidden_mnt2);
-+
-+		/* mk: no! dput(stopd(sb)->base_dir_dentry);
-+		   dput(stopd(sb)->storage_dir_dentry); */
-+
-+		kfree(stopd(sb));
-+		__stopd(sb) = NULL;
-+	}
-+}
-+
-+
-+#ifdef NOT_NEEDED
-+/*
-+ * This is called in do_umount before put_super.
-+ * The superblock lock is not held yet.
-+ * We probably do not need to define this or call write_super
-+ * on the hidden_sb, because sync_supers() will get to hidden_sb
-+ * sooner or later.  But it is also called from file_fsync()...
-+ */
-+STATIC void
-+mini_fo_write_super(super_block_t *sb)
-+{
-+	return;
-+}
-+#endif /* NOT_NEEDED */
-+
-+
-+STATIC int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_statfs(struct dentry *d, struct kstatfs *buf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+mini_fo_statfs(super_block_t *sb, struct kstatfs *buf)
-+#else
-+mini_fo_statfs(super_block_t *sb, struct statfs *buf)
-+#endif
-+{
-+	int err = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+	struct dentry *hidden_d;
-+
-+	hidden_d = dtohd(d);
-+	err = vfs_statfs(hidden_d, buf);
-+#else
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+	err = vfs_statfs(hidden_sb, buf);
-+#endif
-+
-+	return err;
-+}
-+
-+
-+/*
-+ * XXX: not implemented.  This is not allowed yet.
-+ * Should we call this on the hidden_sb?  Probably not.
-+ */
-+STATIC int
-+mini_fo_remount_fs(super_block_t *sb, int *flags, char *data)
-+{
-+	//printk(KERN_CRIT "mini_fo_remount_fs: WARNING, this function is umimplemented.\n");
-+	return -ENOSYS;
-+}
-+
-+
-+/*
-+ * Called by iput() when the inode reference count reached zero
-+ * and the inode is not hashed anywhere.  Used to clear anything
-+ * that needs to be, before the inode is completely destroyed and put
-+ * on the inode free list.
-+ */
-+STATIC void
-+mini_fo_clear_inode(inode_t *inode)
-+{
-+	/*
-+	 * Decrement a reference to a hidden_inode, which was incremented
-+	 * by our read_inode when it was created initially.
-+	 */
-+
-+	/* release the wol_list */
-+	if(S_ISDIR(inode->i_mode)) {
-+		__meta_put_lists(inode);
-+	}
-+
-+	/* mk: fan out fun */
-+	if(itohi(inode))
-+		iput(itohi(inode));
-+	if(itohi2(inode))
-+		iput(itohi2(inode));
-+
-+	// XXX: why this assertion fails?
-+	// because it doesn't like us
-+	// ASSERT((inode->i_state & I_DIRTY) == 0);
-+	kfree(itopd(inode));
-+	__itopd(inode) = NULL;
-+}
-+
-+
-+/*
-+ * Called in do_umount() if the MNT_FORCE flag was used and this
-+ * function is defined.  See comment in linux/fs/super.c:do_umount().
-+ * Used only in nfs, to kill any pending RPC tasks, so that subsequent
-+ * code can actually succeed and won't leave tasks that need handling.
-+ *
-+ * PS. I wonder if this is somehow useful to undo damage that was
-+ * left in the kernel after a user level file server (such as amd)
-+ * dies.
-+ */
-+STATIC void
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+mini_fo_umount_begin(struct vfsmount *mnt, int flags)
-+{
-+	struct vfsmount *hidden_mnt;
-+
-+	hidden_mnt = stopd(mnt->mnt_sb)->hidden_mnt;
-+
-+	if (hidden_mnt->mnt_sb->s_op->umount_begin)
-+		hidden_mnt->mnt_sb->s_op->umount_begin(hidden_mnt, flags);
-+
-+}
-+#else
-+mini_fo_umount_begin(super_block_t *sb)
-+{
-+	super_block_t *hidden_sb;
-+
-+	hidden_sb = stohs(sb);
-+
-+	if (hidden_sb->s_op->umount_begin)
-+		hidden_sb->s_op->umount_begin(hidden_sb);
-+
-+}
-+#endif
-+
-+
-+struct super_operations mini_fo_sops =
-+{
-+	read_inode:		mini_fo_read_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	write_inode:	mini_fo_write_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_inode:		mini_fo_put_inode,
-+#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-+	delete_inode:	mini_fo_delete_inode,
-+#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+	put_super:		mini_fo_put_super,
-+	statfs:		mini_fo_statfs,
-+	remount_fs:		mini_fo_remount_fs,
-+	clear_inode:	mini_fo_clear_inode,
-+	umount_begin:	mini_fo_umount_begin,
-+};
---- /dev/null
-+++ b/fs/mini_fo/Kconfig
-@@ -0,0 +1,3 @@
-+config MINI_FO
-+	tristate "Mini fanout overlay filesystem"
-+
diff --git a/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
deleted file mode 100644
index b64630d500..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/210-mini_fo_2.6.25_fixes.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/fs/mini_fo/main.c
-+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 	 * of the new inode's fields
- 	 */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	/*
- 	 * original: inode = iget(sb, hidden_inode->i_ino);
- 	 */
-@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
- 		err = -EACCES;		/* should be impossible??? */
- 		goto out;
- 	}
-+#else
-+	inode = mini_fo_iget(sb, iunique(sb, 25));
-+	if (IS_ERR(inode)) {
-+		err = PTR_ERR(inode);
-+		goto out;
-+	}
-+#endif
- 
- 	/*
- 	 * interpose the inode if not already interposed
-@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root = nd.dentry;
--			stopd(sb)->base_dir_dentry = nd.dentry;
--			stopd(sb)->hidden_mnt = nd.mnt;
-+			hidden_root = nd_get_dentry(&nd);
-+			stopd(sb)->base_dir_dentry = nd_get_dentry(&nd);
-+			stopd(sb)->hidden_mnt = nd_get_mnt(&nd);
- 
- 		} else if(!strncmp("sto=", options, 4)) {
- 			/* parse the storage dir */
-@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
- 				hidden_root2 = ERR_PTR(err);
- 				goto out;
- 			}
--			hidden_root2 = nd2.dentry;
--			stopd(sb)->storage_dir_dentry = nd2.dentry;
--			stopd(sb)->hidden_mnt2 = nd2.mnt;
-+			hidden_root2 = nd_get_dentry(&nd2);
-+			stopd(sb)->storage_dir_dentry = nd_get_dentry(&nd2);
-+			stopd(sb)->hidden_mnt2 = nd_get_mnt(&nd2);
- 			stohs2(sb) = hidden_root2->d_sb;
- 
- 			/* validate storage dir, this is done in
---- a/fs/mini_fo/mini_fo.h
-+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
- extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
- 			   dentry_t *src_dentry, struct vfsmount *src_mnt);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+extern struct inode *mini_fo_iget(struct super_block *sb, unsigned long ino);
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
- 
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
- #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->path.dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->path.mnt);
-+}
-+#else
-+static inline dentry_t *nd_get_dentry(struct nameidata *nd)
-+{
-+	return (nd->dentry);
-+}
-+
-+static inline struct vfsmount *nd_get_mnt(struct nameidata *nd)
-+{
-+	return (nd->mnt);
-+}
-+#endif
-+
- /*
-  * Definitions for user and kernel code
-  */
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
- }
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-+struct inode *
-+mini_fo_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	mini_fo_read_inode(inode);
-+
-+	unlock_new_inode(inode);
-+	return inode;
-+}
-+#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) */
- 
- struct super_operations mini_fo_sops =
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
- 	read_inode:		mini_fo_read_inode,
-+#endif
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
- 	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
- 
- 	/* validate */
--	if (err || !nd.dentry || !nd.dentry->d_inode) {
-+	if (err || !nd_get_dentry(&nd) || !nd_get_dentry(&nd)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: bpath_walk: path_walk failed.\n");
- 		return NULL;
- 	}
--	return nd.dentry;
-+	return nd_get_dentry(&nd);
- }
- 
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch
deleted file mode 100644
index 48a19429b9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/211-mini_fo_2.6.25_dentry_open_war.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			   S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
- 			   meta_dentry, S_IRUSR | S_IWUSR);
- #endif
- 	}
-+
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
-@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		}
- 	}
- 
-+	/* $%& err, is this correct? */
-+	meta_mnt = stopd(dentry->d_inode->i_sb)->hidden_mnt2;
-+	mntget(meta_mnt);
-+
-         /* open META-file for writing */
-         meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
--		/* we don't mntget so we dont't mntput (for now)
--		 * mntput(meta_mnt);
--		 */
-+		mntput(meta_mnt);
- 		dput(meta_dentry);
- 		err = -1;
-                 goto out;
diff --git a/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
deleted file mode 100644
index b5fa64e6a1..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/212-mini_fo_2.6.26_fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/fs/mini_fo/super.c
-+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- STATIC void
- mini_fo_put_inode(inode_t *inode)
- {
-@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
- 	if (atomic_read(&inode->i_count) == 1)
- 		inode->i_nlink = 0;
- }
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- 
- 
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
-  * dies.
-  */
- STATIC void
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- mini_fo_umount_begin(struct vfsmount *mnt, int flags)
- {
- 	struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	write_inode:	mini_fo_write_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
- 	put_inode:		mini_fo_put_inode,
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
- #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
- 	delete_inode:	mini_fo_delete_inode,
- #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch
deleted file mode 100644
index f92c18b254..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/213-mini_fo_2.6.27_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	int err=0;
- 	dentry_t *hidden_sto_dentry;
- 	dentry_t *hidden_sto_dir_dentry;
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         umode_t mode;
- #endif
- 
-@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- 	mode = S_IALLUGO;
- 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
- 			  hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
- #endif
- 
- STATIC int
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
- mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
- #else
- mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
- 	 *	if (err)
- 	 *		goto out;
- 	 */
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+	err = inode_permission(hidden_inode, mask);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	err = permission(hidden_inode, mask, nd);
- #else
- 	err = permission(hidden_inode, mask);
diff --git a/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch b/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch
deleted file mode 100644
index 63d704bf51..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/214-mini_fo_2.6.29.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -236,7 +236,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	mntget(src_mnt);
- 
- 	/* open file write only */
--	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1);
-+	tgt_file = dentry_open(tgt_dentry, tgt_mnt, 0x1, current_cred());
- 	if(!tgt_file || IS_ERR(tgt_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening target file.\n");
- 		err = PTR_ERR(tgt_file);
-@@ -244,7 +244,7 @@ int mini_fo_cp_cont(dentry_t *tgt_dentry
- 	}
- 
- 	/* open file read only */
--	src_file = dentry_open(src_dentry, src_mnt, 0x0);
-+	src_file = dentry_open(src_dentry, src_mnt, 0x0, current_cred());
- 	if(!src_file || IS_ERR(src_file)) {
- 		printk(KERN_CRIT "mini_fo_cp_cont: ERROR opening source file.\n");
- 		err = PTR_ERR(src_file);
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -437,7 +437,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -479,7 +479,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 			mntget(stopd(inode->i_sb)->hidden_mnt);
- 			hidden_file = dentry_open(hidden_dentry,
- 						  stopd(inode->i_sb)->hidden_mnt,
--						  hidden_flags);
-+						  hidden_flags, file->f_cred);
- 			if (IS_ERR(hidden_file)) {
- 				err = PTR_ERR(hidden_file);
- 				dput(hidden_dentry);
-@@ -512,7 +512,7 @@ mini_fo_open(inode_t *inode, file_t *fil
- 	mntget(stopd(inode->i_sb)->hidden_mnt2);
- 	hidden_sto_file = dentry_open(hidden_sto_dentry,
- 				      stopd(inode->i_sb)->hidden_mnt2,
--				      hidden_flags);
-+				      hidden_flags, file->f_cred);
- 
- 	/* dentry_open dputs the dentry if it fails */
- 	if (IS_ERR(hidden_sto_file)) {
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -56,7 +56,7 @@ int meta_build_lists(dentry_t *dentry)
- 
- 
- 		/* open META-file for reading */
--		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0);
-+		meta_file = dentry_open(meta_dentry, meta_mnt, 0x0, current_cred());
- 		if(!meta_file || IS_ERR(meta_file)) {
- 			printk(KERN_CRIT "mini_fo: meta_build_lists: \
-                                           ERROR opening META file.\n");
-@@ -448,7 +448,7 @@ int meta_write_d_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_d_entry: \
-                                   ERROR opening meta file.\n");
-@@ -546,7 +546,7 @@ int meta_write_r_entry(dentry_t *dentry,
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_write_r_entry: \
-                                   ERROR opening meta file.\n");
-@@ -686,7 +686,7 @@ int meta_sync_d_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                   ERROR opening meta file.\n");
-@@ -828,7 +828,7 @@ int meta_sync_r_list(dentry_t *dentry, i
- 	mntget(meta_mnt);
- 
-         /* open META-file for writing */
--        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
-+        meta_file = dentry_open(meta_dentry, meta_mnt, 0x1, current_cred());
-         if(!meta_file || IS_ERR(meta_file)) {
-                 printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                   ERROR opening meta file.\n");
diff --git a/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch
deleted file mode 100644
index 2d20920614..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/215-mini_fo_2.6.30.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- a/fs/mini_fo/aux.c
-+++ b/fs/mini_fo/aux.c
-@@ -86,8 +86,10 @@ int get_neg_sto_dentry(dentry_t *dentry)
- 	len = dentry->d_name.len;
- 	name = dentry->d_name.name;
- 
-+	mutex_lock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 	dtohd2(dentry) =
- 		lookup_one_len(name, dtohd2(dentry->d_parent), len);
-+	mutex_unlock(&dtohd2(dentry->d_parent)->d_inode->i_mutex);
- 
-  out:
- 	return err;
-@@ -426,7 +428,9 @@ int build_sto_structure(dentry_t *dir, d
- 		const unsigned char *name;
- 		len = dtohd(dentry)->d_name.len;
- 		name = dtohd(dentry)->d_name.name;
-+		mutex_lock(&dtohd2(dir)->d_inode->i_mutex);
- 		hidden_sto_dentry = lookup_one_len(name, dtohd2(dir), len);
-+		mutex_unlock(&dtohd2(dir)->d_inode->i_mutex);
- 		dtohd2(dentry) = hidden_sto_dentry;
- 	}
- 
---- a/fs/mini_fo/inode.c
-+++ b/fs/mini_fo/inode.c
-@@ -113,17 +113,23 @@ mini_fo_lookup(inode_t *dir, dentry_t *d
- 		hidden_dir_dentry = hidden_dentry->d_parent;
- 		kfree(bpath);
- 	}
--	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode)
-+	else if(hidden_dir_dentry && hidden_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
- 		hidden_dentry =
- 			lookup_one_len(name, hidden_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_dentry = NULL;
-+	}
- 
--	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode)
-+	if(hidden_sto_dir_dentry && hidden_sto_dir_dentry->d_inode) {
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- 		hidden_sto_dentry =
- 			lookup_one_len(name, hidden_sto_dir_dentry, namelen);
--	else
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+	} else {
- 		hidden_sto_dentry =  NULL;
-+	}
- 
- 	/* catch error in lookup */
- 	if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
-@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
- 			dput(meta_dentry);
-@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
-@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- #endif
- 
- 		/* Delete an old WOL file contained in the storage dir */
-+		mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     hidden_sto_dentry,
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
- 		if(meta_dentry->d_inode) {
- 			/* is this necessary? dget(meta_dentry); */
- 			err = vfs_unlink(hidden_sto_dentry->d_inode,
---- a/fs/mini_fo/meta.c
-+++ b/fs/mini_fo/meta.c
-@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
- 
-   	/* might there be a META-file? */
- 	if(dtohd2(dentry) && dtohd2(dentry)->d_inode) {
-+		mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 		meta_dentry = lookup_one_len(META_FILENAME,
- 					     dtohd2(dentry),
- 					     strlen(META_FILENAME));
-+		mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 		if(!meta_dentry->d_inode) {
- 			dput(meta_dentry);
- 			goto out_ok;
-@@ -426,8 +428,11 @@ int meta_write_d_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry), strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
- 
- 	/* We need to create a META-file */
-         if(!meta_dentry->d_inode) {
-@@ -527,9 +532,13 @@ int meta_write_r_entry(dentry_t *dentry,
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen (META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
- 			goto out;
-                 }
-         }
-+
-+	mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
- 	meta_dentry = lookup_one_len(META_FILENAME,
- 				     dtohd2(dentry),
- 				     strlen(META_FILENAME));
-+	mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
-+
-         if(!meta_dentry->d_inode) {
-                 /* We need to create a META-file */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch
deleted file mode 100644
index 4f075920fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/216-mini_fo_locking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/fs/mini_fo/state.c
-+++ b/fs/mini_fo/state.c
-@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	dtohd(dentry) = NULL;
- 	dtost(dentry) = DELETED;
- 
--	/* add deleted file to META-file */
--	meta_add_d_entry(dentry->d_parent,
--			 dentry->d_name.name,
--			 dentry->d_name.len);
--
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
- #else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
- #endif
-+	/* add deleted file to META-file */
-+	meta_add_d_entry(dentry->d_parent,
-+			 dentry->d_name.name,
-+			 dentry->d_name.len);
-+
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
diff --git a/target/linux/generic-2.6/patches-2.6.35/217-mini_fo_2.6.35.patch b/target/linux/generic-2.6/patches-2.6.35/217-mini_fo_2.6.35.patch
deleted file mode 100644
index ef697291b0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/217-mini_fo_2.6.35.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/fs/mini_fo/file.c
-+++ b/fs/mini_fo/file.c
-@@ -616,7 +616,7 @@ mini_fo_fsync(file_t *file, dentry_t *de
- #else
- 			down(&hidden_dentry->d_inode->i_sem);
- #endif
--			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
- #else
-@@ -633,7 +633,7 @@ mini_fo_fsync(file_t *file, dentry_t *de
- #else
- 			down(&hidden_dentry->d_inode->i_sem);
- #endif
--			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- 			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
- #else
diff --git a/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch
deleted file mode 100644
index f15749fa17..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/219-kobject_uevent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/lib/kobject_uevent.c
-+++ b/lib/kobject_uevent.c
-@@ -49,6 +49,18 @@ static const char *kobject_actions[] = {
- 	[KOBJ_OFFLINE] =	"offline",
- };
- 
-+u64 uevent_next_seqnum(void)
-+{
-+	u64 seq;
-+
-+	spin_lock(&sequence_lock);
-+	seq = ++uevent_seqnum;
-+	spin_unlock(&sequence_lock);
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
-+
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-@@ -244,9 +256,7 @@ int kobject_uevent_env(struct kobject *k
- 		kobj->state_remove_uevent_sent = 1;
- 
- 	/* we will send an event, so request a new sequence number */
--	spin_lock(&sequence_lock);
--	seq = ++uevent_seqnum;
--	spin_unlock(&sequence_lock);
-+	seq = uevent_next_seqnum();
- 	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq);
- 	if (retval)
- 		goto exit;
diff --git a/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch
deleted file mode 100644
index fb3df254dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/220-sound_kconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sound/core/Kconfig
-+++ b/sound/core/Kconfig
-@@ -8,7 +8,7 @@ config SND_PCM
- 	select GCD
- 
- config SND_HWDEP
--	tristate
-+	tristate "Sound hardware support"
- 
- config SND_RAWMIDI
- 	tristate
diff --git a/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch
deleted file mode 100644
index f452a25774..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/221-binfmt_elf_gcc4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -1136,7 +1136,7 @@ static unsigned long vma_dump_size(struc
- 	if (FILTER(ELF_HEADERS) &&
- 	    vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
- 		u32 __user *header = (u32 __user *) vma->vm_start;
--		u32 word;
-+		u32 word = 0;
- 		mm_segment_t fs = get_fs();
- 		/*
- 		 * Doing it this way gets the constant folded by GCC.
diff --git a/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch b/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch
deleted file mode 100644
index 0c7672e8be..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/222-partial_eraseblock_write.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -21,6 +21,8 @@
- #include <linux/root_dev.h>
- #include <linux/magic.h>
- 
-+#define MTD_ERASE_PARTIAL	0x8000 /* partition only covers parts of an erase block */
-+
- /* Our partition linked list */
- static LIST_HEAD(mtd_partitions);
- 
-@@ -226,13 +228,60 @@ static int part_erase(struct mtd_info *m
- 		return -EROFS;
- 	if (instr->addr >= mtd->size)
- 		return -EINVAL;
-+
-+	instr->partial_start = false;
-+	if (mtd->flags & MTD_ERASE_PARTIAL) {
-+		size_t readlen = 0;
-+		u64 mtd_ofs;
-+
-+		instr->erase_buf = kmalloc(part->master->erasesize, GFP_ATOMIC);
-+		if (!instr->erase_buf)
-+			return -ENOMEM;
-+
-+		mtd_ofs = part->offset + instr->addr;
-+		instr->erase_buf_ofs = do_div(mtd_ofs, part->master->erasesize);
-+
-+		if (instr->erase_buf_ofs > 0) {
-+			instr->addr -= instr->erase_buf_ofs;
-+			ret = part->master->read(part->master,
-+				instr->addr + part->offset,
-+				part->master->erasesize,
-+				&readlen, instr->erase_buf);
-+
-+			instr->partial_start = true;
-+		} else {
-+			mtd_ofs = part->offset + part->mtd.size;
-+			instr->erase_buf_ofs = part->master->erasesize -
-+				do_div(mtd_ofs, part->master->erasesize);
-+
-+			if (instr->erase_buf_ofs > 0) {
-+				instr->len += instr->erase_buf_ofs;
-+				ret = part->master->read(part->master,
-+					part->offset + instr->addr +
-+					instr->len - part->master->erasesize,
-+					part->master->erasesize, &readlen,
-+					instr->erase_buf);
-+			} else {
-+				ret = 0;
-+			}
-+		}
-+		if (ret < 0) {
-+			kfree(instr->erase_buf);
-+			return ret;
-+		}
-+
-+	}
-+
- 	instr->addr += part->offset;
- 	ret = part->master->erase(part->master, instr);
- 	if (ret) {
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-+		if (mtd->flags & MTD_ERASE_PARTIAL)
-+			kfree(instr->erase_buf);
- 	}
-+
- 	return ret;
- }
- 
-@@ -240,7 +289,25 @@ void mtd_erase_callback(struct erase_inf
- {
- 	if (instr->mtd->erase == part_erase) {
- 		struct mtd_part *part = PART(instr->mtd);
-+		size_t wrlen = 0;
- 
-+		if (instr->mtd->flags & MTD_ERASE_PARTIAL) {
-+			if (instr->partial_start) {
-+				part->master->write(part->master,
-+					instr->addr, instr->erase_buf_ofs,
-+					&wrlen, instr->erase_buf);
-+				instr->addr += instr->erase_buf_ofs;
-+			} else {
-+				instr->len -= instr->erase_buf_ofs;
-+				part->master->write(part->master,
-+					instr->addr + instr->len,
-+					instr->erase_buf_ofs, &wrlen,
-+					instr->erase_buf +
-+					part->master->erasesize -
-+					instr->erase_buf_ofs);
-+			}
-+			kfree(instr->erase_buf);
-+		}
- 		if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
- 			instr->fail_addr -= part->offset;
- 		instr->addr -= part->offset;
-@@ -473,18 +540,24 @@ static struct mtd_part *add_one_partitio
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
- 	    mtd_mod_by_eb(slave->offset, &slave->mtd)) {
- 		/* Doesn't start on a boundary of major erase size */
--		/* FIXME: Let it be writable if it is on a boundary of
--		 * _minor_ erase size though */
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't start on an erase block boundary -- force read-only\n",
--			part->name);
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+		if (((u32) slave->mtd.size) > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
- 	}
- 	if ((slave->mtd.flags & MTD_WRITEABLE) &&
--	    mtd_mod_by_eb(slave->mtd.size, &slave->mtd)) {
--		slave->mtd.flags &= ~MTD_WRITEABLE;
--		printk(KERN_WARNING"mtd: partition \"%s\" doesn't end on an erase block -- force read-only\n",
--			part->name);
--	}
-+	    mtd_mod_by_eb(slave->offset + slave->mtd.size, &slave->mtd)) {
-+		slave->mtd.flags |= MTD_ERASE_PARTIAL;
-+
-+		if ((u32) slave->mtd.size > master->erasesize)
-+			slave->mtd.flags &= ~MTD_WRITEABLE;
-+		else
-+			slave->mtd.erasesize = slave->mtd.size;
-+	}
-+	if ((slave->mtd.flags & (MTD_ERASE_PARTIAL|MTD_WRITEABLE)) == MTD_ERASE_PARTIAL)
-+		printk(KERN_WARNING"mtd: partition \"%s\" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only\n",
-+				part->name);
- 
- 	slave->mtd.ecclayout = master->ecclayout;
- 	if (master->block_isbad) {
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -46,6 +46,10 @@ struct erase_info {
- 	u_long priv;
- 	u_char state;
- 	struct erase_info *next;
-+
-+	u8 *erase_buf;
-+	u32 erase_buf_ofs;
-+	bool partial_start;
- };
- 
- struct mtd_erase_region_info {
diff --git a/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch
deleted file mode 100644
index afaf9204fe..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/240-packet_socket_type.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/linux/if_packet.h
-+++ b/include/linux/if_packet.h
-@@ -29,6 +29,8 @@ struct sockaddr_ll {
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK		5		/* MC/BRD frame looped back */
- #define PACKET_FASTROUTE	6		/* Fastrouted frame	*/
-+#define PACKET_MASK_ANY		0xffffffff	/* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -48,6 +50,7 @@ struct sockaddr_ll {
- #define PACKET_LOSS			14
- #define PACKET_VNET_HDR			15
- #define PACKET_TX_TIMESTAMP		16
-+#define PACKET_RECV_TYPE		17
- 
- struct tpacket_stats {
- 	unsigned int	tp_packets;
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -202,6 +202,7 @@ struct packet_sock {
- 	unsigned int		tp_reserve;
- 	unsigned int		tp_loss:1;
- 	struct packet_type	prot_hook ____cacheline_aligned_in_smp;
-+	__u8			pkt_type:3;
- };
- 
- struct packet_skb_cb {
-@@ -336,6 +337,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
- 	struct sock *sk;
- 	struct sockaddr_pkt *spkt;
-+	struct packet_sock *po;
- 
- 	/*
- 	 *	When we registered the protocol we saved the socket in the data
-@@ -343,6 +345,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 */
- 
- 	sk = pt->af_packet_priv;
-+	po = pkt_sk(sk);
- 
- 	/*
- 	 *	Yank back the headers [hope the device set this
-@@ -355,7 +358,7 @@ static int packet_rcv_spkt(struct sk_buf
- 	 *	so that this procedure is noop.
- 	 */
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
- 		goto out;
- 
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -531,12 +534,12 @@ static int packet_rcv(struct sk_buff *sk
- 	int skb_len = skb->len;
- 	unsigned int snaplen, res;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -651,12 +654,12 @@ static int tpacket_rcv(struct sk_buff *s
- 	struct timeval tv;
- 	struct timespec ts;
- 
--	if (skb->pkt_type == PACKET_LOOPBACK)
--		goto drop;
--
- 	sk = pt->af_packet_priv;
- 	po = pkt_sk(sk);
- 
-+	if (!(po->pkt_type & (1 << skb->pkt_type)))
-+		goto drop;
-+
- 	if (!net_eq(dev_net(dev), sock_net(sk)))
- 		goto drop;
- 
-@@ -1464,6 +1467,7 @@ static int packet_create(struct net *net
- 	spin_lock_init(&po->bind_lock);
- 	mutex_init(&po->pg_vec_lock);
- 	po->prot_hook.func = packet_rcv;
-+	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
- 	if (sock->type == SOCK_PACKET)
- 		po->prot_hook.func = packet_rcv_spkt;
-@@ -1968,6 +1972,16 @@ packet_setsockopt(struct socket *sock, i
- 		po->has_vnet_hdr = !!val;
- 		return 0;
- 	}
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~PACKET_LOOPBACK;
-+                return 0;
-+        }
- 	default:
- 		return -ENOPROTOOPT;
- 	}
-@@ -2025,6 +2039,13 @@ static int packet_getsockopt(struct sock
- 
- 		data = &val;
- 		break;
-+	case PACKET_RECV_TYPE:
-+		if (len > sizeof(unsigned int))
-+			len = sizeof(unsigned int);
-+		val = po->pkt_type;
-+
-+		data = &val;
-+		break;
- 	case PACKET_VERSION:
- 		if (len > sizeof(int))
- 			len = sizeof(int);
diff --git a/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch
deleted file mode 100644
index a2535db60e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/250-pppoe_header_pad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/pppoe.c
-+++ b/drivers/net/pppoe.c
-@@ -862,7 +862,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 		goto end;
- 
- 
--	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
-+	skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
- 			   0, GFP_KERNEL);
- 	if (!skb) {
- 		error = -ENOMEM;
-@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
- 	}
- 
- 	/* Reserve space for headers. */
--	skb_reserve(skb, dev->hard_header_len);
-+	skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
- 	skb_reset_network_header(skb);
- 
- 	skb->dev = dev;
diff --git a/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch b/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch
deleted file mode 100644
index f431f5d0ca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/260-crypto_optional_tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_PCOMP
- 
-+config CRYPTO_MANAGER_NO_TESTS
-+	bool "Disable internal testsuite to save space"
-+	depends on CRYPTO_MANAGER
-+
- config CRYPTO_GF128MUL
- 	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -47,6 +47,8 @@
- #define ENCRYPT 1
- #define DECRYPT 0
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- struct tcrypt_result {
- 	struct completion completion;
- 	int err;
-@@ -2443,8 +2445,11 @@ static int alg_find_test(const char *alg
- 	return -1;
- }
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
- {
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
- 	int i;
- 	int j;
- 	int rc;
-@@ -2499,5 +2504,8 @@ notest:
- 	return 0;
- non_fips_alg:
- 	return -EINVAL;
-+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+	return 0;
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
- }
- EXPORT_SYMBOL_GPL(alg_test);
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -20,6 +20,8 @@
- 
- #include <crypto/compress.h>
- 
-+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS
-+
- #define MAX_DIGEST_SIZE		64
- #define MAX_TAP			8
- 
-@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
- 	},
- };
- 
-+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */
-+
- #endif	/* _CRYPTO_TESTMGR_H */
diff --git a/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch
deleted file mode 100644
index 3f43c90aca..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/400-ledtrig_morse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -354,4 +354,8 @@ endif # LEDS_TRIGGERS
- 
- endif # LEDS_CLASS
- 
-+config LEDS_TRIGGER_MORSE
-+	tristate "LED Morse Trigger"
-+	depends on LEDS_TRIGGERS
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch
deleted file mode 100644
index 858966c908..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/402-ledtrig_netdev.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -358,4 +358,11 @@ config LEDS_TRIGGER_MORSE
- 	tristate "LED Morse Trigger"
- 	depends on LEDS_TRIGGERS
- 
-+config LEDS_TRIGGER_NETDEV
-+	tristate "LED Netdev Trigger"
-+	depends on NET && LEDS_TRIGGERS
-+	help
-+	  This allows LEDs to be controlled by network device activity.
-+	  If unsure, say Y.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
- obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
-+obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch
deleted file mode 100644
index e38c31de40..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/410-gpio_buttons.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -340,4 +340,20 @@ config INPUT_PCAP
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called pcap_keys.
- 
-+config INPUT_GPIO_BUTTONS
-+	tristate "Polled GPIO buttons interface"
-+	depends on GENERIC_GPIO
-+	select INPUT_POLLDEV
-+	help
-+	  This driver implements support for buttons connected
-+	  to GPIO pins of various CPUs (and some other chips).
-+
-+	  Say Y here if your device has buttons connected
-+	  directly to such GPIO pins.  Your board-specific
-+	  setup logic must also provide a platform device,
-+	  with configuration data saying which GPIOs are used.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called gpio-buttons.
-+
- endif
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR)		+= winb
- obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
- obj-$(CONFIG_INPUT_WM831X_ON)		+= wm831x-on.o
- obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
-+obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch
deleted file mode 100644
index 27da3c7812..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/420-gpiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -1024,6 +1024,14 @@ config CS5535_GPIO
- 
- 	  If compiled as a module, it will be called cs5535_gpio.
- 
-+config GPIO_DEVICE
-+	tristate "GPIO device support"
-+	depends on GENERIC_GPIO
-+	help
-+	  Say Y to enable Linux GPIO device support.  This allows control of
-+	  GPIO pins using a character device
-+
-+
- config RAW_DRIVER
- 	tristate "RAW driver (/dev/raw/rawN)"
- 	depends on BLOCK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
- obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
-+obj-$(CONFIG_GPIO_DEVICE)	+= gpio_dev.o
- obj-$(CONFIG_GPIO_TB0219)	+= tb0219.o
- obj-$(CONFIG_TELCLOCK)		+= tlclk.o
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch b/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch
deleted file mode 100644
index 59e4333611..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/430-scsi_header_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
- 
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
--	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
--	u8 control;
--	u8 misc[5];
--	u8 additional_cdb_length;         /* total cdb length - 8 */
-+	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-+	__u8 control;
-+	__u8 misc[5];
-+	__u8 additional_cdb_length;         /* total cdb length - 8 */
- 	__be16 service_action;
- 	/* service specific data follows */
- };
diff --git a/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch
deleted file mode 100644
index 192181f005..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/510-yaffs_support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -44,6 +44,7 @@ source "fs/gfs2/Kconfig"
- source "fs/ocfs2/Kconfig"
- source "fs/btrfs/Kconfig"
- source "fs/nilfs2/Kconfig"
-+source "fs/yaffs2/Kconfig"
- 
- endif # BLOCK
- 
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -127,3 +127,5 @@ obj-$(CONFIG_BTRFS_FS)		+= btrfs/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
- obj-$(CONFIG_EXOFS_FS)          += exofs/
- obj-$(CONFIG_CEPH_FS)		+= ceph/
-+obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
-+
diff --git a/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
deleted file mode 100644
index c40da10d69..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/511-yaffs-cvs-2009-04-24.patch
+++ /dev/null
@@ -1,12344 +0,0 @@
---- a/fs/yaffs2/devextras.h
-+++ b/fs/yaffs2/devextras.h
-@@ -14,194 +14,135 @@
-  */
- 
- /*
-- * This file is just holds extra declarations used during development.
-- * Most of these are from kernel includes placed here so we can use them in
-- * applications.
-+ * This file is just holds extra declarations of macros that would normally
-+ * be providesd in the Linux kernel. These macros have been written from
-+ * scratch but are functionally equivalent to the Linux ones.
-  *
-  */
- 
- #ifndef __EXTRAS_H__
- #define __EXTRAS_H__
- 
--#if defined WIN32
--#define __inline__ __inline
--#define new newHack
--#endif
--
--#if !(defined __KERNEL__) || (defined WIN32)
- 
--/* User space defines */
-+#if !(defined __KERNEL__)
- 
-+/* Definition of types */
- typedef unsigned char __u8;
- typedef unsigned short __u16;
- typedef unsigned __u32;
- 
-+#endif
-+
- /*
-- * Simple doubly linked list implementation.
-- *
-- * Some of the internal functions ("__xxx") are useful when
-- * manipulating whole lists rather than single entries, as
-- * sometimes we already know the next/prev entries and we can
-- * generate better code by using them directly rather than
-- * using the generic single-entry routines.
-+ * This is a simple doubly linked list implementation that matches the
-+ * way the Linux kernel doubly linked list implementation works.
-  */
- 
--#define prefetch(x) 1
--
--struct list_head {
--	struct list_head *next, *prev;
-+struct ylist_head {
-+	struct ylist_head *next; /* next in chain */
-+	struct ylist_head *prev; /* previous in chain */
- };
- 
--#define LIST_HEAD_INIT(name) { &(name), &(name) }
- 
--#define LIST_HEAD(name) \
--	struct list_head name = LIST_HEAD_INIT(name)
-+/* Initialise a static list */
-+#define YLIST_HEAD(name) \
-+struct ylist_head name = { &(name), &(name)}
-+
- 
--#define INIT_LIST_HEAD(ptr) do { \
--	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+
-+/* Initialise a list head to an empty list */
-+#define YINIT_LIST_HEAD(p) \
-+do { \
-+	(p)->next = (p);\
-+	(p)->prev = (p); \
- } while (0)
- 
--/*
-- * Insert a new entry between two known consecutive entries.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_add(struct list_head *new,
--				  struct list_head *prev,
--				  struct list_head *next)
--{
--	next->prev = new;
--	new->next = next;
--	new->prev = prev;
--	prev->next = new;
--}
- 
--/**
-- * list_add - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it after
-- *
-- * Insert a new entry after the specified head.
-- * This is good for implementing stacks.
-- */
--static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+/* Add an element to a list */
-+static __inline__ void ylist_add(struct ylist_head *newEntry,
-+				struct ylist_head *list)
- {
--	__list_add(new, head, head->next);
--}
-+	struct ylist_head *listNext = list->next;
-+
-+	list->next = newEntry;
-+	newEntry->prev = list;
-+	newEntry->next = listNext;
-+	listNext->prev = newEntry;
- 
--/**
-- * list_add_tail - add a new entry
-- * @new: new entry to be added
-- * @head: list head to add it before
-- *
-- * Insert a new entry before the specified head.
-- * This is useful for implementing queues.
-- */
--static __inline__ void list_add_tail(struct list_head *new,
--				     struct list_head *head)
--{
--	__list_add(new, head->prev, head);
- }
- 
--/*
-- * Delete a list entry by making the prev/next entries
-- * point to each other.
-- *
-- * This is only for internal list manipulation where we know
-- * the prev/next entries already!
-- */
--static __inline__ void __list_del(struct list_head *prev,
--				  struct list_head *next)
-+static __inline__ void ylist_add_tail(struct ylist_head *newEntry,
-+				 struct ylist_head *list)
- {
--	next->prev = prev;
--	prev->next = next;
-+	struct ylist_head *listPrev = list->prev;
-+
-+	list->prev = newEntry;
-+	newEntry->next = list;
-+	newEntry->prev = listPrev;
-+	listPrev->next = newEntry;
-+
- }
- 
--/**
-- * list_del - deletes entry from list.
-- * @entry: the element to delete from the list.
-- * Note: list_empty on entry does not return true after this, the entry is
-- * in an undefined state.
-- */
--static __inline__ void list_del(struct list_head *entry)
-+
-+/* Take an element out of its current list, with or without
-+ * reinitialising the links.of the entry*/
-+static __inline__ void ylist_del(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
-+	struct ylist_head *listNext = entry->next;
-+	struct ylist_head *listPrev = entry->prev;
-+
-+	listNext->prev = listPrev;
-+	listPrev->next = listNext;
-+
- }
- 
--/**
-- * list_del_init - deletes entry from list and reinitialize it.
-- * @entry: the element to delete from the list.
-- */
--static __inline__ void list_del_init(struct list_head *entry)
-+static __inline__ void ylist_del_init(struct ylist_head *entry)
- {
--	__list_del(entry->prev, entry->next);
--	INIT_LIST_HEAD(entry);
-+	ylist_del(entry);
-+	entry->next = entry->prev = entry;
- }
- 
--/**
-- * list_empty - tests whether a list is empty
-- * @head: the list to test.
-- */
--static __inline__ int list_empty(struct list_head *head)
-+
-+/* Test if the list is empty */
-+static __inline__ int ylist_empty(struct ylist_head *entry)
- {
--	return head->next == head;
-+	return (entry->next == entry);
- }
- 
--/**
-- * list_splice - join two lists
-- * @list: the new list to add.
-- * @head: the place to add it in the first list.
-+
-+/* ylist_entry takes a pointer to a list entry and offsets it to that
-+ * we can find a pointer to the object it is embedded in.
-  */
--static __inline__ void list_splice(struct list_head *list,
--				   struct list_head *head)
--{
--	struct list_head *first = list->next;
- 
--	if (first != list) {
--		struct list_head *last = list->prev;
--		struct list_head *at = head->next;
--
--		first->prev = head;
--		head->next = first;
--
--		last->next = at;
--		at->prev = last;
--	}
--}
- 
--/**
-- * list_entry - get the struct for this entry
-- * @ptr:	the &struct list_head pointer.
-- * @type:	the type of the struct this is embedded in.
-- * @member:	the name of the list_struct within the struct.
-- */
--#define list_entry(ptr, type, member) \
--	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
--
--/**
-- * list_for_each	-	iterate over a list
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @head:	the head for your list.
-- */
--#define list_for_each(pos, head) \
--	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
--        	pos = pos->next, prefetch(pos->next))
--
--/**
-- * list_for_each_safe	-	iterate over a list safe against removal
-- *                              of list entry
-- * @pos:	the &struct list_head to use as a loop counter.
-- * @n:		another &struct list_head to use as temporary storage
-- * @head:	the head for your list.
-- */
--#define list_for_each_safe(pos, n, head) \
--	for (pos = (head)->next, n = pos->next; pos != (head); \
--		pos = n, n = pos->next)
-+#define ylist_entry(entry, type, member) \
-+	((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
- 
--/*
-- * File types
-+
-+/* ylist_for_each and list_for_each_safe  iterate over lists.
-+ * ylist_for_each_safe uses temporary storage to make the list delete safe
-  */
-+
-+#define ylist_for_each(itervar, list) \
-+	for (itervar = (list)->next; itervar != (list); itervar = itervar->next)
-+
-+#define ylist_for_each_safe(itervar, saveVar, list) \
-+	for (itervar = (list)->next, saveVar = (list)->next->next; \
-+		itervar != (list); itervar = saveVar, saveVar = saveVar->next)
-+
-+
-+#if !(defined __KERNEL__)
-+
-+
-+#ifndef WIN32
-+#include <sys/stat.h>
-+#endif
-+
-+
-+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-+/* File types */
-+
-+
- #define DT_UNKNOWN	0
- #define DT_FIFO		1
- #define DT_CHR		2
-@@ -212,6 +153,7 @@ static __inline__ void list_splice(struc
- #define DT_SOCK		12
- #define DT_WHT		14
- 
-+
- #ifndef WIN32
- #include <sys/stat.h>
- #endif
-@@ -227,10 +169,6 @@ static __inline__ void list_splice(struc
- #define ATTR_ATIME	16
- #define ATTR_MTIME	32
- #define ATTR_CTIME	64
--#define ATTR_ATIME_SET	128
--#define ATTR_MTIME_SET	256
--#define ATTR_FORCE	512	/* Not a change, but a change it */
--#define ATTR_ATTR_FLAG	1024
- 
- struct iattr {
- 	unsigned int ia_valid;
-@@ -244,21 +182,15 @@ struct iattr {
- 	unsigned int ia_attr_flags;
- };
- 
--#define KERN_DEBUG
-+#endif
- 
- #else
- 
--#ifndef WIN32
- #include <linux/types.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/stat.h>
--#endif
- 
- #endif
- 
--#if defined WIN32
--#undef new
--#endif
- 
- #endif
---- a/fs/yaffs2/Kconfig
-+++ b/fs/yaffs2/Kconfig
-@@ -5,7 +5,7 @@
- config YAFFS_FS
- 	tristate "YAFFS2 file system support"
- 	default n
--	depends on MTD
-+	depends on MTD_BLOCK
- 	select YAFFS_YAFFS1
- 	select YAFFS_YAFFS2
- 	help
-@@ -43,7 +43,8 @@ config YAFFS_9BYTE_TAGS
- 	  format that you need to continue to support.  New data written
- 	  also uses the older-style format.  Note: Use of this option
- 	  generally requires that MTD's oob layout be adjusted to use the
--	  older-style format.  See notes on tags formats and MTD versions.
-+	  older-style format.  See notes on tags formats and MTD versions
-+	  in yaffs_mtdif1.c.
- 
- 	  If unsure, say N.
- 
-@@ -109,26 +110,6 @@ config YAFFS_DISABLE_LAZY_LOAD
- 
- 	  If unsure, say N.
- 
--config YAFFS_CHECKPOINT_RESERVED_BLOCKS
--	int "Reserved blocks for checkpointing"
--	depends on YAFFS_YAFFS2
--	default 10
--	help
--          Give the number of Blocks to reserve for checkpointing.
--	  Checkpointing saves the state at unmount so that mounting is
--	  much faster as a scan of all the flash to regenerate this state
--	  is not needed.  These Blocks are reserved per partition, so if
--	  you have very small partitions the default (10) may be a mess
--	  for you.  You can set this value to 0, but that does not mean
--	  checkpointing is disabled at all. There only won't be any
--	  specially reserved blocks for checkpointing, so if there is
--	  enough free space on the filesystem, it will be used for
--	  checkpointing.
--
--	  If unsure, leave at default (10), but don't wonder if there are
--	  always 2MB used on your large page device partition (10 x 2k
--	  pagesize). When using small partitions or when being very small
--	  on space, you probably want to set this to zero.
- 
- config YAFFS_DISABLE_WIDE_TNODES
- 	bool "Turn off wide tnodes"
---- a/fs/yaffs2/Makefile
-+++ b/fs/yaffs2/Makefile
-@@ -5,7 +5,6 @@
- obj-$(CONFIG_YAFFS_FS) += yaffs.o
- 
- yaffs-y := yaffs_ecc.o yaffs_fs.o yaffs_guts.o yaffs_checkptrw.o
--yaffs-y += yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
-+yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
- yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
--yaffs-y += yaffs_mtdif1.o yaffs_packedtags1.o
--yaffs-y += yaffs_mtdif.o yaffs_mtdif2.o
-+yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
---- a/fs/yaffs2/moduleconfig.h
-+++ b/fs/yaffs2/moduleconfig.h
-@@ -27,12 +27,12 @@
- 
- /* Default: Not selected */
- /* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
--//#define CONFIG_YAFFS_DOES_ECC
-+/* #define CONFIG_YAFFS_DOES_ECC */
- 
- /* Default: Not selected */
- /* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
- /*          CONFIG_YAFFS_DOES_ECC is set */
--//#define CONFIG_YAFFS_ECC_WRONG_ORDER
-+/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
- 
- /* Default: Selected */
- /* Meaning: Disables testing whether chunks are erased before writing to them*/
-@@ -54,11 +54,11 @@ that you need to continue to support.  N
- older-style format.
- Note: Use of this option generally requires that MTD's oob layout be
- adjusted to use the older-style format.  See notes on tags formats and
--MTD versions.
-+MTD versions in yaffs_mtdif1.c.
- */
- /* Default: Not selected */
- /* Meaning: Use older-style on-NAND data format with pageStatus byte */
--#define CONFIG_YAFFS_9BYTE_TAGS
-+/* #define CONFIG_YAFFS_9BYTE_TAGS */
- 
- #endif /* YAFFS_OUT_OF_TREE */
- 
---- a/fs/yaffs2/yaffs_checkptrw.c
-+++ b/fs/yaffs2/yaffs_checkptrw.c
-@@ -12,48 +12,43 @@
-  */
- 
- const char *yaffs_checkptrw_c_version =
--    "$Id: yaffs_checkptrw.c,v 1.14 2007-05-15 20:07:40 charles Exp $";
-+	"$Id: yaffs_checkptrw.c,v 1.18 2009-03-06 17:20:49 wookey Exp $";
- 
- 
- #include "yaffs_checkptrw.h"
--
-+#include "yaffs_getblockinfo.h"
- 
- static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
- {
--
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("checkpt blocks available = %d" TENDSTR),
- 		blocksAvailable));
- 
--
- 	return (blocksAvailable <= 0) ? 0 : 1;
- }
- 
- 
- static int yaffs_CheckpointErase(yaffs_Device *dev)
- {
--
- 	int i;
- 
--
--	if(!dev->eraseBlockInNAND)
-+	if (!dev->eraseBlockInNAND)
- 		return 0;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
--		dev->internalStartBlock,dev->internalEndBlock));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-+		dev->internalStartBlock, dev->internalEndBlock));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
--			if(dev->eraseBlockInNAND(dev,i- dev->blockOffset /* realign */)){
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
-+			if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) {
- 				bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
- 				dev->nErasedBlocks++;
- 				dev->nFreeChunks += dev->nChunksPerBlock;
--			}
--			else {
--				dev->markNANDBlockBad(dev,i);
-+			} else {
-+				dev->markNANDBlockBad(dev, i);
- 				bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 			}
- 		}
-@@ -71,23 +66,23 @@ static void yaffs_CheckpointFindNextEras
- 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- 	T(YAFFS_TRACE_CHECKPOINT,
- 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
--		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-+		dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock));
- 
--	if(dev->checkpointNextBlock >= 0 &&
--	   dev->checkpointNextBlock <= dev->internalEndBlock &&
--	   blocksAvailable > 0){
--
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
-+	if (dev->checkpointNextBlock >= 0 &&
-+			dev->checkpointNextBlock <= dev->internalEndBlock &&
-+			blocksAvailable > 0) {
-+
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
- 				dev->checkpointNextBlock = i + 1;
- 				dev->checkpointCurrentBlock = i;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 	}
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -98,30 +93,31 @@ static void yaffs_CheckpointFindNextChec
- 	int  i;
- 	yaffs_ExtendedTags tags;
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
- 		dev->blocksInCheckpoint, dev->checkpointNextBlock));
- 
--	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
--		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
-+	if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
-+		for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) {
- 			int chunk = i * dev->nChunksPerBlock;
- 			int realignedChunk = chunk - dev->chunkOffset;
- 
--			dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
--				i, tags.objectId,tags.sequenceNumber,tags.eccResult));
-+			dev->readChunkWithTagsFromNAND(dev, realignedChunk,
-+					NULL, &tags);
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-+				i, tags.objectId, tags.sequenceNumber, tags.eccResult));
- 
--			if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
-+			if (tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- 				/* Right kind of block */
- 				dev->checkpointNextBlock = tags.objectId;
- 				dev->checkpointCurrentBlock = i;
- 				dev->checkpointBlockList[dev->blocksInCheckpoint] = i;
- 				dev->blocksInCheckpoint++;
--				T(YAFFS_TRACE_CHECKPOINT,(TSTR("found checkpt block %d"TENDSTR),i));
-+				T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
- 				return;
- 			}
- 		}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("found no more checkpt blocks"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
- 
- 	dev->checkpointNextBlock = -1;
- 	dev->checkpointCurrentBlock = -1;
-@@ -133,17 +129,17 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 
- 	/* Got the functions we need? */
- 	if (!dev->writeChunkWithTagsToNAND ||
--	    !dev->readChunkWithTagsFromNAND ||
--	    !dev->eraseBlockInNAND ||
--	    !dev->markNANDBlockBad)
-+			!dev->readChunkWithTagsFromNAND ||
-+			!dev->eraseBlockInNAND ||
-+			!dev->markNANDBlockBad)
- 		return 0;
- 
--	if(forWriting && !yaffs_CheckpointSpaceOk(dev))
-+	if (forWriting && !yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
--	if(!dev->checkpointBuffer)
--		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
-+		dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk);
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
- 
-@@ -159,12 +155,10 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 	dev->checkpointNextBlock = dev->internalStartBlock;
- 
- 	/* Erase all the blocks in the checkpoint area */
--	if(forWriting){
--		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	if (forWriting) {
-+		memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 		dev->checkpointByteOffset = 0;
- 		return yaffs_CheckpointErase(dev);
--
--
- 	} else {
- 		int i;
- 		/* Set to a value that will kick off a read */
-@@ -174,7 +168,7 @@ int yaffs_CheckpointOpen(yaffs_Device *d
- 		dev->blocksInCheckpoint = 0;
- 		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
- 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
--		for(i = 0; i < dev->checkpointMaxBlocks; i++)
-+		for (i = 0; i < dev->checkpointMaxBlocks; i++)
- 			dev->checkpointBlockList[i] = -1;
- 	}
- 
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
- 
- static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
- {
--
- 	int chunk;
- 	int realignedChunk;
- 
- 	yaffs_ExtendedTags tags;
- 
--	if(dev->checkpointCurrentBlock < 0){
-+	if (dev->checkpointCurrentBlock < 0) {
- 		yaffs_CheckpointFindNextErasedBlock(dev);
- 		dev->checkpointCurrentChunk = 0;
- 	}
- 
--	if(dev->checkpointCurrentBlock < 0)
-+	if (dev->checkpointCurrentBlock < 0)
- 		return 0;
- 
- 	tags.chunkDeleted = 0;
-@@ -210,10 +203,10 @@ static int yaffs_CheckpointFlushBuffer(y
- 	tags.chunkId = dev->checkpointPageSequence + 1;
- 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
- 	tags.byteCount = dev->nDataBytesPerChunk;
--	if(dev->checkpointCurrentChunk == 0){
-+	if (dev->checkpointCurrentChunk == 0) {
- 		/* First chunk we write for the block? Set block state to
- 		   checkpoint */
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointCurrentBlock);
- 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 		dev->blocksInCheckpoint++;
- 	}
-@@ -221,28 +214,29 @@ static int yaffs_CheckpointFlushBuffer(y
- 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
--		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk, tags.objectId, tags.chunkId));
- 
- 	realignedChunk = chunk - dev->chunkOffset;
- 
--	dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
-+	dev->writeChunkWithTagsToNAND(dev, realignedChunk,
-+			dev->checkpointBuffer, &tags);
- 	dev->checkpointByteOffset = 0;
- 	dev->checkpointPageSequence++;
- 	dev->checkpointCurrentChunk++;
--	if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
-+	if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) {
- 		dev->checkpointCurrentChunk = 0;
- 		dev->checkpointCurrentBlock = -1;
- 	}
--	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-+	memset(dev->checkpointBuffer, 0, dev->nDataBytesPerChunk);
- 
- 	return 1;
- }
- 
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 
- 
-@@ -250,17 +244,14 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 
- 
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(!dev->checkpointOpenForWrite)
-+	if (!dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
--
--
--
--		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
-+	while (i < nBytes && ok) {
-+		dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes;
- 		dev->checkpointSum += *dataBytes;
- 		dev->checkpointXor ^= *dataBytes;
- 
-@@ -270,18 +261,17 @@ int yaffs_CheckpointWrite(yaffs_Device *
- 		dev->checkpointByteCount++;
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
-+		if (dev->checkpointByteOffset < 0 ||
- 		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
- 			ok = yaffs_CheckpointFlushBuffer(dev);
--
- 	}
- 
--	return 	i;
-+	return i;
- }
- 
- int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
- {
--	int i=0;
-+	int i = 0;
- 	int ok = 1;
- 	yaffs_ExtendedTags tags;
- 
-@@ -291,52 +281,54 @@ int yaffs_CheckpointRead(yaffs_Device *d
- 
- 	__u8 *dataBytes = (__u8 *)data;
- 
--	if(!dev->checkpointBuffer)
-+	if (!dev->checkpointBuffer)
- 		return 0;
- 
--	if(dev->checkpointOpenForWrite)
-+	if (dev->checkpointOpenForWrite)
- 		return -1;
- 
--	while(i < nBytes && ok) {
-+	while (i < nBytes && ok) {
- 
- 
--		if(dev->checkpointByteOffset < 0 ||
--		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-+		if (dev->checkpointByteOffset < 0 ||
-+			dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
- 
--		   	if(dev->checkpointCurrentBlock < 0){
-+			if (dev->checkpointCurrentBlock < 0) {
- 				yaffs_CheckpointFindNextCheckpointBlock(dev);
- 				dev->checkpointCurrentChunk = 0;
- 			}
- 
--			if(dev->checkpointCurrentBlock < 0)
-+			if (dev->checkpointCurrentBlock < 0)
- 				ok = 0;
- 			else {
--
--				chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
--				          dev->checkpointCurrentChunk;
-+				chunk = dev->checkpointCurrentBlock *
-+					dev->nChunksPerBlock +
-+					dev->checkpointCurrentChunk;
- 
- 				realignedChunk = chunk - dev->chunkOffset;
- 
--	   			/* read in the next chunk */
--	   			/* printf("read checkpoint page %d\n",dev->checkpointPage); */
--				dev->readChunkWithTagsFromNAND(dev, realignedChunk,
--							       dev->checkpointBuffer,
--							      &tags);
--
--				if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
--				   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
--				   ok = 0;
-+				/* read in the next chunk */
-+				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
-+				dev->readChunkWithTagsFromNAND(dev,
-+						realignedChunk,
-+						dev->checkpointBuffer,
-+						&tags);
-+
-+				if (tags.chunkId != (dev->checkpointPageSequence + 1) ||
-+					tags.eccResult > YAFFS_ECC_RESULT_FIXED ||
-+					tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+					ok = 0;
- 
- 				dev->checkpointByteOffset = 0;
- 				dev->checkpointPageSequence++;
- 				dev->checkpointCurrentChunk++;
- 
--				if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
-+				if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
- 					dev->checkpointCurrentBlock = -1;
- 			}
- 		}
- 
--		if(ok){
-+		if (ok) {
- 			*dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
- 			dev->checkpointSum += *dataBytes;
- 			dev->checkpointXor ^= *dataBytes;
-@@ -353,17 +345,17 @@ int yaffs_CheckpointRead(yaffs_Device *d
- int yaffs_CheckpointClose(yaffs_Device *dev)
- {
- 
--	if(dev->checkpointOpenForWrite){
--		if(dev->checkpointByteOffset != 0)
-+	if (dev->checkpointOpenForWrite) {
-+		if (dev->checkpointByteOffset != 0)
- 			yaffs_CheckpointFlushBuffer(dev);
- 	} else {
- 		int i;
--		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
--			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
--			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
-+		for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) {
-+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]);
-+			if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
- 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
- 			else {
--				// Todo this looks odd...
-+				/* Todo this looks odd... */
- 			}
- 		}
- 		YFREE(dev->checkpointBlockList);
-@@ -374,27 +366,25 @@ int yaffs_CheckpointClose(yaffs_Device *
- 	dev->nErasedBlocks -= dev->blocksInCheckpoint;
- 
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- 			dev->checkpointByteCount));
- 
--	if(dev->checkpointBuffer){
-+	if (dev->checkpointBuffer) {
- 		/* free the buffer */
- 		YFREE(dev->checkpointBuffer);
- 		dev->checkpointBuffer = NULL;
- 		return 1;
--	}
--	else
-+	} else
- 		return 0;
--
- }
- 
- int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
- {
- 	/* Erase the first checksum block */
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint invalidate"TENDSTR)));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR)));
- 
--	if(!yaffs_CheckpointSpaceOk(dev))
-+	if (!yaffs_CheckpointSpaceOk(dev))
- 		return 0;
- 
- 	return yaffs_CheckpointErase(dev);
---- a/fs/yaffs2/yaffs_checkptrw.h
-+++ b/fs/yaffs2/yaffs_checkptrw.h
-@@ -20,9 +20,9 @@
- 
- int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting);
- 
--int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes);
-+int yaffs_CheckpointWrite(yaffs_Device *dev, const void *data, int nBytes);
- 
--int yaffs_CheckpointRead(yaffs_Device *dev,void *data, int nBytes);
-+int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes);
- 
- int yaffs_GetCheckpointSum(yaffs_Device *dev, __u32 *sum);
- 
---- a/fs/yaffs2/yaffs_ecc.c
-+++ b/fs/yaffs2/yaffs_ecc.c
-@@ -29,7 +29,7 @@
-  */
- 
- const char *yaffs_ecc_c_version =
--    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -109,12 +109,10 @@ void yaffs_ECCCalculate(const unsigned c
- 		b = column_parity_table[*data++];
- 		col_parity ^= b;
- 
--		if (b & 0x01)	// odd number of bits in the byte
--		{
-+		if (b & 0x01) {		/* odd number of bits in the byte */
- 			line_parity ^= i;
- 			line_parity_prime ^= ~i;
- 		}
--
- 	}
- 
- 	ecc[2] = (~col_parity) | 0x03;
-@@ -158,7 +156,7 @@ void yaffs_ECCCalculate(const unsigned c
- 	ecc[0] = ~t;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--	// Swap the bytes into the wrong order
-+	/* Swap the bytes into the wrong order */
- 	t = ecc[0];
- 	ecc[0] = ecc[1];
- 	ecc[1] = t;
-@@ -189,7 +187,7 @@ int yaffs_ECCCorrect(unsigned char *data
- 		unsigned bit;
- 
- #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
--		// swap the bytes to correct for the wrong order
-+		/* swap the bytes to correct for the wrong order */
- 		unsigned char t;
- 
- 		t = d0;
-@@ -251,7 +249,7 @@ int yaffs_ECCCorrect(unsigned char *data
-  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
-  */
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * eccOther)
-+				yaffs_ECCOther *eccOther)
- {
- 	unsigned int i;
- 
-@@ -278,8 +276,8 @@ void yaffs_ECCCalculateOther(const unsig
- }
- 
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc)
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc)
- {
- 	unsigned char cDelta;	/* column parity delta */
- 	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		return 0; /* no error */
- 
- 	if (lDelta == ~lDeltaPrime &&
--	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
--	{
-+	    (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
- 		/* Single bit (recoverable) error in data */
- 
- 		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 		if (cDelta & 0x02)
- 			bit |= 0x01;
- 
--		if(lDelta >= nBytes)
-+		if (lDelta >= nBytes)
- 			return -1;
- 
- 		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
- 	}
- 
- 	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
--	     yaffs_CountBits(cDelta)) == 1) {
-+			yaffs_CountBits(cDelta)) == 1) {
- 		/* Reccoverable error in ecc */
- 
- 		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
- 	/* Unrecoverable error */
- 
- 	return -1;
--
- }
--
---- a/fs/yaffs2/yaffs_ecc.h
-+++ b/fs/yaffs2/yaffs_ecc.h
-@@ -13,15 +13,15 @@
-  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-  */
- 
-- /*
--  * This code implements the ECC algorithm used in SmartMedia.
--  *
--  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
--  * The two unused bit are set to 1.
--  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
--  * blocks are used on a 512-byte NAND page.
--  *
--  */
-+/*
-+ * This code implements the ECC algorithm used in SmartMedia.
-+ *
-+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
-+ * The two unused bit are set to 1.
-+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
-+ * blocks are used on a 512-byte NAND page.
-+ *
-+ */
- 
- #ifndef __YAFFS_ECC_H__
- #define __YAFFS_ECC_H__
-@@ -34,11 +34,11 @@ typedef struct {
- 
- void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
- int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
--		     const unsigned char *test_ecc);
-+		const unsigned char *test_ecc);
- 
- void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
--			     yaffs_ECCOther * ecc);
-+			yaffs_ECCOther *ecc);
- int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
--			  yaffs_ECCOther * read_ecc,
--			  const yaffs_ECCOther * test_ecc);
-+			yaffs_ECCOther *read_ecc,
-+			const yaffs_ECCOther *test_ecc);
- #endif
---- a/fs/yaffs2/yaffs_fs.c
-+++ b/fs/yaffs2/yaffs_fs.c
-@@ -1,7 +1,7 @@
- /*
-  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
-  *
-- * Copyright (C) 2002-2007 Aleph One Ltd.
-+ * Copyright (C) 2002-2009 Aleph One Ltd.
-  *   for Toby Churchill Ltd and Brightstar Engineering
-  *
-  * Created by Charles Manning <charles@aleph1.co.uk>
-@@ -32,18 +32,17 @@
-  */
- 
- const char *yaffs_fs_c_version =
--    "$Id: yaffs_fs.c,v 1.63 2007-09-19 20:35:40 imcd Exp $";
-+    "$Id: yaffs_fs.c,v 1.79 2009-03-17 01:12:00 wookey Exp $";
- extern const char *yaffs_guts_c_version;
- 
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/init.h>
--#include <linux/list.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/smp_lock.h>
-@@ -53,10 +52,12 @@ extern const char *yaffs_guts_c_version;
- #include <linux/string.h>
- #include <linux/ctype.h>
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#include "asm/div64.h"
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- #include <linux/statfs.h>	/* Added NCB 15-8-2003 */
--#include <asm/statfs.h>
-+#include <linux/statfs.h>
- #define UnlockPage(p) unlock_page(p)
- #define Page_Uptodate(page)	test_bit(PG_uptodate, &(page)->flags)
- 
-@@ -69,22 +70,45 @@ extern const char *yaffs_guts_c_version;
- #define	BDEVNAME_SIZE		0
- #define	yaffs_devname(sb, buf)	kdevname(sb->s_dev)
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0))
- /* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
- #define __user
- #endif
- 
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
-+#define YPROC_ROOT  (&proc_root)
-+#else
-+#define YPROC_ROOT  NULL
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- #define WRITE_SIZE_STR "writesize"
--#define WRITE_SIZE(mtd) (mtd)->writesize
-+#define WRITE_SIZE(mtd) ((mtd)->writesize)
- #else
- #define WRITE_SIZE_STR "oobblock"
--#define WRITE_SIZE(mtd) (mtd)->oobblock
-+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
- #endif
- 
--#include <asm/uaccess.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
-+#define YAFFS_USE_WRITE_BEGIN_END 1
-+#else
-+#define YAFFS_USE_WRITE_BEGIN_END 0
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
-+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
-+{
-+	uint64_t result = partition_size;
-+	do_div(result, block_size);
-+	return (uint32_t)result;
-+}
-+#else
-+#define YCALCBLOCKS(s, b) ((s)/(b))
-+#endif
-+
-+#include <linux/uaccess.h>
- 
- #include "yportenv.h"
- #include "yaffs_guts.h"
-@@ -96,28 +120,44 @@ extern const char *yaffs_guts_c_version;
- 
- unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS;
- unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
-+unsigned int yaffs_auto_checkpoint = 1;
- 
- /* Module Parameters */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--module_param(yaffs_traceMask,uint,0644);
--module_param(yaffs_wr_attempts,uint,0644);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+module_param(yaffs_traceMask, uint, 0644);
-+module_param(yaffs_wr_attempts, uint, 0644);
-+module_param(yaffs_auto_checkpoint, uint, 0644);
-+#else
-+MODULE_PARM(yaffs_traceMask, "i");
-+MODULE_PARM(yaffs_wr_attempts, "i");
-+MODULE_PARM(yaffs_auto_checkpoint, "i");
-+#endif
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-+/* use iget and read_inode */
-+#define Y_IGET(sb, inum) iget((sb), (inum))
-+static void yaffs_read_inode(struct inode *inode);
-+
- #else
--MODULE_PARM(yaffs_traceMask,"i");
--MODULE_PARM(yaffs_wr_attempts,"i");
-+/* Call local equivalent */
-+#define YAFFS_USE_OWN_IGET
-+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
- #endif
- 
- /*#define T(x) printk x */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
--#define yaffs_InodeToObjectLV(iptr) (iptr)->i_private
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
- #else
--#define yaffs_InodeToObjectLV(iptr) (iptr)->u.generic_ip
-+#define yaffs_InodeToObjectLV(iptr) ((iptr)->u.generic_ip)
- #endif
- 
- #define yaffs_InodeToObject(iptr) ((yaffs_Object *)(yaffs_InodeToObjectLV(iptr)))
- #define yaffs_DentryToObject(dptr) yaffs_InodeToObject((dptr)->d_inode)
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->s_fs_info)
- #else
- #define yaffs_SuperToDevice(sb)	((yaffs_Device *)sb->u.generic_sbp)
-@@ -126,47 +166,49 @@ MODULE_PARM(yaffs_wr_attempts,"i");
- static void yaffs_put_super(struct super_block *sb);
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos);
-+				loff_t *pos);
-+static ssize_t yaffs_hold_space(struct file *f);
-+static void yaffs_release_space(struct file *f);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id);
- #else
- static int yaffs_file_flush(struct file *file);
- #endif
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync);
-+				int datasync);
- 
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n);
-+					struct nameidata *n);
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
- #endif
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry);
-+			struct dentry *dentry);
- static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname);
-+			const char *symname);
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t dev);
-+			dev_t dev);
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int dev);
-+			int dev);
- #endif
- static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			struct inode *new_dir, struct dentry *new_dentry);
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait);
- static void yaffs_write_super(struct super_block *sb);
- #else
-@@ -174,33 +216,47 @@ static int yaffs_sync_fs(struct super_bl
- static int yaffs_write_super(struct super_block *sb);
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
- #else
- static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
- #endif
--static void yaffs_read_inode(struct inode *inode);
- 
-+#ifdef YAFFS_HAS_PUT_INODE
- static void yaffs_put_inode(struct inode *inode);
-+#endif
-+
- static void yaffs_delete_inode(struct inode *);
- static void yaffs_clear_inode(struct inode *);
- 
- static int yaffs_readpage(struct file *file, struct page *page);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
- #else
- static int yaffs_writepage(struct page *page);
- #endif
-+
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata);
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata);
-+#else
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to);
-+				unsigned offset, unsigned to);
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to);
-+				unsigned to);
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#endif
-+
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+				int buflen);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
-@@ -209,12 +265,17 @@ static int yaffs_follow_link(struct dent
- static struct address_space_operations yaffs_file_address_operations = {
- 	.readpage = yaffs_readpage,
- 	.writepage = yaffs_writepage,
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+	.write_begin = yaffs_write_begin,
-+	.write_end = yaffs_write_end,
-+#else
- 	.prepare_write = yaffs_prepare_write,
- 	.commit_write = yaffs_commit_write,
-+#endif
- };
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
--static struct file_operations yaffs_file_operations = {
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -224,11 +285,12 @@ static struct file_operations yaffs_file
- 	.fsync = yaffs_sync_object,
- 	.splice_read = generic_file_splice_read,
- 	.splice_write = generic_file_splice_write,
-+	.llseek = generic_file_llseek,
- };
- 
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = do_sync_read,
- 	.write = do_sync_write,
- 	.aio_read = generic_file_aio_read,
-@@ -241,29 +303,29 @@ static struct file_operations yaffs_file
- 
- #else
- 
--static struct file_operations yaffs_file_operations = {
-+static const struct file_operations yaffs_file_operations = {
- 	.read = generic_file_read,
- 	.write = generic_file_write,
- 	.mmap = generic_file_mmap,
- 	.flush = yaffs_file_flush,
- 	.fsync = yaffs_sync_object,
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	.sendfile = generic_file_sendfile,
- #endif
- };
- #endif
- 
--static struct inode_operations yaffs_file_inode_operations = {
-+static const struct inode_operations yaffs_file_inode_operations = {
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_symlink_inode_operations = {
-+static const struct inode_operations yaffs_symlink_inode_operations = {
- 	.readlink = yaffs_readlink,
- 	.follow_link = yaffs_follow_link,
- 	.setattr = yaffs_setattr,
- };
- 
--static struct inode_operations yaffs_dir_inode_operations = {
-+static const struct inode_operations yaffs_dir_inode_operations = {
- 	.create = yaffs_create,
- 	.lookup = yaffs_lookup,
- 	.link = yaffs_link,
-@@ -276,16 +338,21 @@ static struct inode_operations yaffs_dir
- 	.setattr = yaffs_setattr,
- };
- 
--static struct file_operations yaffs_dir_operations = {
-+static const struct file_operations yaffs_dir_operations = {
- 	.read = generic_read_dir,
- 	.readdir = yaffs_readdir,
- 	.fsync = yaffs_sync_object,
- };
- 
--static struct super_operations yaffs_super_ops = {
-+static const struct super_operations yaffs_super_ops = {
- 	.statfs = yaffs_statfs,
-+
-+#ifndef YAFFS_USE_OWN_IGET
- 	.read_inode = yaffs_read_inode,
-+#endif
-+#ifdef YAFFS_HAS_PUT_INODE
- 	.put_inode = yaffs_put_inode,
-+#endif
- 	.put_super = yaffs_put_super,
- 	.delete_inode = yaffs_delete_inode,
- 	.clear_inode = yaffs_clear_inode,
-@@ -293,22 +360,21 @@ static struct super_operations yaffs_sup
- 	.write_super = yaffs_write_super,
- };
- 
--static void yaffs_GrossLock(yaffs_Device * dev)
-+static void yaffs_GrossLock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs locking\n"));
--
-+	T(YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
- 	down(&dev->grossLock);
-+	T(YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
- }
- 
--static void yaffs_GrossUnlock(yaffs_Device * dev)
-+static void yaffs_GrossUnlock(yaffs_Device *dev)
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs unlocking\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
- 	up(&dev->grossLock);
--
- }
- 
--static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
--			  int buflen)
-+static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
-+			int buflen)
- {
- 	unsigned char *alias;
- 	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
- 	return ret;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
- static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
- #else
- static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-@@ -345,32 +411,31 @@ static int yaffs_follow_link(struct dent
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (!alias)
--        {
-+	if (!alias) {
- 		ret = -ENOMEM;
- 		goto out;
--        }
-+	}
- 
- 	ret = vfs_follow_link(nd, alias);
- 	kfree(alias);
- out:
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--	return ERR_PTR (ret);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	return ERR_PTR(ret);
- #else
- 	return ret;
- #endif
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj);
-+				yaffs_Object *obj);
- 
- /*
-  * Lookup is used to find objects in the fs
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
--				   struct nameidata *n)
-+				struct nameidata *n)
- #else
- static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
- #endif
-@@ -383,12 +448,11 @@ static struct dentry *yaffs_lookup(struc
- 	yaffs_GrossLock(dev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_lookup for %d:%s\n",
--	   yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
-+		("yaffs_lookup for %d:%s\n",
-+		yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
- 
--	obj =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(dir),
--				   dentry->d_name.name);
-+	obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
-+					dentry->d_name.name);
- 
- 	obj = yaffs_GetEquivalentObject(obj);	/* in case it was a hardlink */
- 
-@@ -397,13 +461,13 @@ static struct dentry *yaffs_lookup(struc
- 
- 	if (obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_lookup found %d\n", obj->objectId));
-+			("yaffs_lookup found %d\n", obj->objectId));
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 
- 		if (inode) {
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_loookup dentry \n"));
-+				("yaffs_loookup dentry \n"));
- /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
-  * d_add even if NULL inode */
- #if 0
-@@ -416,7 +480,7 @@ static struct dentry *yaffs_lookup(struc
- 		}
- 
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
- 
- 	}
- 
-@@ -425,20 +489,22 @@ static struct dentry *yaffs_lookup(struc
- 	d_add(dentry, inode);
- 
- 	return NULL;
--	/*      return (ERR_PTR(-EIO)); */
--
- }
- 
-+
-+#ifdef YAFFS_HAS_PUT_INODE
-+
- /* For now put inode is just for debugging
-  * Put inode is called when the inode **structure** is put.
-  */
- static void yaffs_put_inode(struct inode *inode)
- {
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count)));
-+		("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count)));
- 
- }
-+#endif
- 
- /* clear is called to tell the fs to release any per-inode data it holds */
- static void yaffs_clear_inode(struct inode *inode)
-@@ -449,9 +515,9 @@ static void yaffs_clear_inode(struct ino
- 	obj = yaffs_InodeToObject(inode);
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
-@@ -486,23 +552,23 @@ static void yaffs_delete_inode(struct in
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
--	   atomic_read(&inode->i_count),
--	   obj ? "object exists" : "null object"));
-+		("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
-+		atomic_read(&inode->i_count),
-+		obj ? "object exists" : "null object"));
- 
- 	if (obj) {
- 		dev = obj->myDev;
- 		yaffs_GrossLock(dev);
--		yaffs_DeleteFile(obj);
-+		yaffs_DeleteObject(obj);
- 		yaffs_GrossUnlock(dev);
- 	}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
--        truncate_inode_pages (&inode->i_data, 0);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-+	truncate_inode_pages(&inode->i_data, 0);
- #endif
- 	clear_inode(inode);
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_file_flush(struct file *file, fl_owner_t id)
- #else
- static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
- 	yaffs_Device *dev = obj->myDev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_flush object %d (%s)\n", obj->objectId,
--	   obj->dirty ? "dirty" : "clean"));
-+		("yaffs_file_flush object %d (%s)\n", obj->objectId,
-+		obj->dirty ? "dirty" : "clean"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage at %08x, size %08x\n",
--			   (unsigned)(pg->index << PAGE_CACHE_SHIFT),
--			   (unsigned)PAGE_CACHE_SIZE));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage at %08x, size %08x\n",
-+			(unsigned)(pg->index << PAGE_CACHE_SHIFT),
-+			(unsigned)PAGE_CACHE_SIZE));
- 
- 	obj = yaffs_DentryToObject(f->f_dentry);
- 
- 	dev = obj->myDev;
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	BUG_ON(!PageLocked(pg));
- #else
- 	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
- 
- 	yaffs_GrossLock(dev);
- 
--	ret =
--	    yaffs_ReadDataFromFile(obj, pg_buf, pg->index << PAGE_CACHE_SHIFT,
--				   PAGE_CACHE_SIZE);
-+	ret = yaffs_ReadDataFromFile(obj, pg_buf,
-+				pg->index << PAGE_CACHE_SHIFT,
-+				PAGE_CACHE_SIZE);
- 
- 	yaffs_GrossUnlock(dev);
- 
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
- 	flush_dcache_page(pg);
- 	kunmap(pg);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_readpage done\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
- 	return ret;
- }
- 
-@@ -593,7 +659,7 @@ static int yaffs_readpage(struct file *f
- 
- /* writepage inspired by/stolen from smbfs */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
- #else
- static int yaffs_writepage(struct page *page)
-@@ -616,12 +682,11 @@ static int yaffs_writepage(struct page *
- 
- 	if (offset > inode->i_size) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_writepage at %08x, inode size = %08x!!!\n",
--		   (unsigned)(page->index << PAGE_CACHE_SHIFT),
--		   (unsigned)inode->i_size));
-+			("yaffs_writepage at %08x, inode size = %08x!!!\n",
-+			(unsigned)(page->index << PAGE_CACHE_SHIFT),
-+			(unsigned)inode->i_size));
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "                -> don't care!!\n"));
-+			("                -> don't care!!\n"));
- 		unlock_page(page);
- 		return 0;
- 	}
-@@ -629,11 +694,10 @@ static int yaffs_writepage(struct page *
- 	end_index = inode->i_size >> PAGE_CACHE_SHIFT;
- 
- 	/* easy case */
--	if (page->index < end_index) {
-+	if (page->index < end_index)
- 		nBytes = PAGE_CACHE_SIZE;
--	} else {
-+	else
- 		nBytes = inode->i_size & (PAGE_CACHE_SIZE - 1);
--	}
- 
- 	get_page(page);
- 
-@@ -643,19 +707,18 @@ static int yaffs_writepage(struct page *
- 	yaffs_GrossLock(obj->myDev);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_writepage at %08x, size %08x\n",
--	   (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
-+		("yaffs_writepage at %08x, size %08x\n",
-+		(unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag0: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag0: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
--	nWritten =
--	    yaffs_WriteDataToFile(obj, buffer, page->index << PAGE_CACHE_SHIFT,
--				  nBytes, 0);
-+	nWritten = yaffs_WriteDataToFile(obj, buffer,
-+			page->index << PAGE_CACHE_SHIFT, nBytes, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "writepag1: obj = %05x, ino = %05x\n",
--	   (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
-+		("writepag1: obj = %05x, ino = %05x\n",
-+		(int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
- 
- 	yaffs_GrossUnlock(obj->myDev);
- 
-@@ -667,100 +730,207 @@ static int yaffs_writepage(struct page *
- 	return (nWritten == nBytes) ? 0 : -ENOSPC;
- }
- 
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned flags,
-+				struct page **pagep, void **fsdata)
-+{
-+	struct page *pg = NULL;
-+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-+	uint32_t offset = pos & (PAGE_CACHE_SIZE - 1);
-+	uint32_t to = offset + len;
-+
-+	int ret = 0;
-+	int space_held = 0;
-+
-+	T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));
-+	/* Get a page */
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
-+	pg = grab_cache_page_write_begin(mapping, index, flags);
-+#else
-+	pg = __grab_cache_page(mapping, index);
-+#endif
-+
-+	*pagep = pg;
-+	if (!pg) {
-+		ret =  -ENOMEM;
-+		goto out;
-+	}
-+	/* Get fs space */
-+	space_held = yaffs_hold_space(filp);
-+
-+	if (!space_held) {
-+		ret = -ENOSPC;
-+		goto out;
-+	}
-+
-+	/* Update page if required */
-+
-+	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
-+		ret = yaffs_readpage_nolock(filp, pg);
-+
-+	if (ret)
-+		goto out;
-+
-+	/* Happy path return */
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
-+
-+	return 0;
-+
-+out:
-+	T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
-+	if (space_held)
-+		yaffs_release_space(filp);
-+	if (pg) {
-+		unlock_page(pg);
-+		page_cache_release(pg);
-+	}
-+	return ret;
-+}
-+
-+#else
-+
- static int yaffs_prepare_write(struct file *f, struct page *pg,
--			       unsigned offset, unsigned to)
-+				unsigned offset, unsigned to)
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_prepair_write\n"));
- 	if (!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
- 		return yaffs_readpage_nolock(f, pg);
--
- 	return 0;
-+}
-+#endif
-+
-+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-+				loff_t pos, unsigned len, unsigned copied,
-+				struct page *pg, void *fsdadata)
-+{
-+	int ret = 0;
-+	void *addr, *kva;
-+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
-+
-+	kva = kmap(pg);
-+	addr = kva + offset_into_page;
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_write_end addr %x pos %x nBytes %d\n",
-+		(unsigned) addr,
-+		(int)pos, copied));
-+
-+	ret = yaffs_file_write(filp, addr, copied, &pos);
-+
-+	if (ret != copied) {
-+		T(YAFFS_TRACE_OS,
-+			("yaffs_write_end not same size ret %d  copied %d\n",
-+			ret, copied));
-+		SetPageError(pg);
-+		ClearPageUptodate(pg);
-+	} else {
-+		SetPageUptodate(pg);
-+	}
-+
-+	kunmap(pg);
- 
-+	yaffs_release_space(filp);
-+	unlock_page(pg);
-+	page_cache_release(pg);
-+	return ret;
- }
-+#else
- 
- static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
--			      unsigned to)
-+				unsigned to)
- {
-+	void *addr, *kva;
- 
--	void *addr = page_address(pg) + offset;
- 	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
- 	int nBytes = to - offset;
- 	int nWritten;
- 
- 	unsigned spos = pos;
--	unsigned saddr = (unsigned)addr;
-+	unsigned saddr;
-+
-+	kva = kmap(pg);
-+	addr = kva + offset;
-+
-+	saddr = (unsigned) addr;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write addr %x pos %x nBytes %d\n", saddr,
--	   spos, nBytes));
-+		("yaffs_commit_write addr %x pos %x nBytes %d\n",
-+		saddr, spos, nBytes));
- 
- 	nWritten = yaffs_file_write(f, addr, nBytes, &pos);
- 
- 	if (nWritten != nBytes) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_commit_write not same size nWritten %d  nBytes %d\n",
--		   nWritten, nBytes));
-+			("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
-+			nWritten, nBytes));
- 		SetPageError(pg);
- 		ClearPageUptodate(pg);
- 	} else {
- 		SetPageUptodate(pg);
- 	}
- 
-+	kunmap(pg);
-+
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_commit_write returning %d\n",
--	   nWritten == nBytes ? 0 : nWritten));
-+		("yaffs_commit_write returning %d\n",
-+		nWritten == nBytes ? 0 : nWritten));
- 
- 	return nWritten == nBytes ? 0 : nWritten;
--
- }
-+#endif
-+
- 
--static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object * obj)
-+static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
- {
- 	if (inode && obj) {
- 
- 
- 		/* Check mode against the variant type and attempt to repair if broken. */
-- 		__u32 mode = obj->yst_mode;
-- 		switch( obj->variantType ){
-- 		case YAFFS_OBJECT_TYPE_FILE :
-- 		        if( ! S_ISREG(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFREG;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_SYMLINK :
-- 		        if( ! S_ISLNK(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 				obj->yst_mode |= S_IFLNK;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_DIRECTORY :
-- 		        if( ! S_ISDIR(mode) ){
-- 			        obj->yst_mode &= ~S_IFMT;
-- 			        obj->yst_mode |= S_IFDIR;
-- 			}
--
-- 			break;
-- 		case YAFFS_OBJECT_TYPE_UNKNOWN :
-- 		case YAFFS_OBJECT_TYPE_HARDLINK :
-- 		case YAFFS_OBJECT_TYPE_SPECIAL :
-- 		default:
-- 		        /* TODO? */
-- 		        break;
-- 		}
-+		__u32 mode = obj->yst_mode;
-+		switch (obj->variantType) {
-+		case YAFFS_OBJECT_TYPE_FILE:
-+			if (!S_ISREG(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFREG;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_SYMLINK:
-+			if (!S_ISLNK(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFLNK;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_DIRECTORY:
-+			if (!S_ISDIR(mode)) {
-+				obj->yst_mode &= ~S_IFMT;
-+				obj->yst_mode |= S_IFDIR;
-+			}
-+
-+			break;
-+		case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		case YAFFS_OBJECT_TYPE_HARDLINK:
-+		case YAFFS_OBJECT_TYPE_SPECIAL:
-+		default:
-+			/* TODO? */
-+			break;
-+		}
-+
-+		inode->i_flags |= S_NOATIME;
- 
- 		inode->i_ino = obj->objectId;
- 		inode->i_mode = obj->yst_mode;
- 		inode->i_uid = obj->yst_uid;
- 		inode->i_gid = obj->yst_gid;
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- 		inode->i_blksize = inode->i_sb->s_blocksize;
- #endif
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 
- 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
- 		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-@@ -781,26 +951,25 @@ static void yaffs_FillInodeFromObject(st
- 		inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
--		   inode->i_mode, inode->i_uid, inode->i_gid,
--		   (int)inode->i_size, atomic_read(&inode->i_count)));
-+			("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
-+			inode->i_mode, inode->i_uid, inode->i_gid,
-+			(int)inode->i_size, atomic_read(&inode->i_count)));
- 
- 		switch (obj->yst_mode & S_IFMT) {
- 		default:	/* fifo, device or socket */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 			init_special_inode(inode, obj->yst_mode,
--					   old_decode_dev(obj->yst_rdev));
-+					old_decode_dev(obj->yst_rdev));
- #else
- 			init_special_inode(inode, obj->yst_mode,
--					   (dev_t) (obj->yst_rdev));
-+					(dev_t) (obj->yst_rdev));
- #endif
- 			break;
- 		case S_IFREG:	/* file */
- 			inode->i_op = &yaffs_file_inode_operations;
- 			inode->i_fop = &yaffs_file_operations;
- 			inode->i_mapping->a_ops =
--			    &yaffs_file_address_operations;
-+				&yaffs_file_address_operations;
- 			break;
- 		case S_IFDIR:	/* directory */
- 			inode->i_op = &yaffs_dir_inode_operations;
-@@ -817,34 +986,36 @@ static void yaffs_FillInodeFromObject(st
- 
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_FileInode invalid parameters\n"));
-+			("yaffs_FileInode invalid parameters\n"));
- 	}
- 
- }
- 
- struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
--			      yaffs_Object * obj)
-+				yaffs_Object *obj)
- {
- 	struct inode *inode;
- 
- 	if (!sb) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL super_block!!\n"));
-+			("yaffs_get_inode for NULL super_block!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	if (!obj) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_get_inode for NULL object!!\n"));
-+			("yaffs_get_inode for NULL object!!\n"));
- 		return NULL;
- 
- 	}
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
-+		("yaffs_get_inode for object %d\n", obj->objectId));
- 
--	inode = iget(sb, obj->objectId);
-+	inode = Y_IGET(sb, obj->objectId);
-+	if (IS_ERR(inode))
-+		return NULL;
- 
- 	/* NB Side effect: iget calls back to yaffs_read_inode(). */
- 	/* iget also increments the inode's i_count */
-@@ -854,7 +1025,7 @@ struct inode *yaffs_get_inode(struct sup
- }
- 
- static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
--				loff_t * pos)
-+				loff_t *pos)
- {
- 	yaffs_Object *obj;
- 	int nWritten, ipos;
-@@ -869,28 +1040,26 @@ static ssize_t yaffs_file_write(struct f
- 
- 	inode = f->f_dentry->d_inode;
- 
--	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) {
-+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
- 		ipos = inode->i_size;
--	} else {
-+	else
- 		ipos = *pos;
--	}
- 
--	if (!obj) {
-+	if (!obj)
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_file_write: hey obj is null!\n"));
--	} else {
-+			("yaffs_file_write: hey obj is null!\n"));
-+	else
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG
--		   "yaffs_file_write about to write writing %d bytes"
--		   "to object %d at %d\n",
--		   n, obj->objectId, ipos));
--	}
-+			("yaffs_file_write about to write writing %zu bytes"
-+			"to object %d at %d\n",
-+			n, obj->objectId, ipos));
- 
- 	nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_file_write writing %d bytes, %d written at %d\n",
--	   n, nWritten, ipos));
-+		("yaffs_file_write writing %zu bytes, %d written at %d\n",
-+		n, nWritten, ipos));
-+
- 	if (nWritten > 0) {
- 		ipos += nWritten;
- 		*pos = ipos;
-@@ -899,10 +1068,9 @@ static ssize_t yaffs_file_write(struct f
- 			inode->i_blocks = (ipos + 511) >> 9;
- 
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG
--			   "yaffs_file_write size updated to %d bytes, "
--			   "%d blocks\n",
--			   ipos, (int)(inode->i_blocks)));
-+				("yaffs_file_write size updated to %d bytes, "
-+				"%d blocks\n",
-+				ipos, (int)(inode->i_blocks)));
- 		}
- 
- 	}
-@@ -910,13 +1078,54 @@ static ssize_t yaffs_file_write(struct f
- 	return nWritten == 0 ? -ENOSPC : nWritten;
- }
- 
-+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-+/* For now we just assume few parallel writes and check against a small number. */
-+/* Todo: need to do this with a counter to handle parallel reads better */
-+
-+static ssize_t yaffs_hold_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+	int nFreeChunks;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+	nFreeChunks = yaffs_GetNumberOfFreeChunks(dev);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	return (nFreeChunks > 20) ? 1 : 0;
-+}
-+
-+static void yaffs_release_space(struct file *f)
-+{
-+	yaffs_Object *obj;
-+	yaffs_Device *dev;
-+
-+
-+	obj = yaffs_DentryToObject(f->f_dentry);
-+
-+	dev = obj->myDev;
-+
-+	yaffs_GrossLock(dev);
-+
-+
-+	yaffs_GrossUnlock(dev);
-+}
-+
- static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
- 	struct inode *inode = f->f_dentry->d_inode;
- 	unsigned long offset, curoffs;
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	char name[YAFFS_MAX_NAME_LENGTH + 1];
-@@ -932,24 +1141,20 @@ static int yaffs_readdir(struct file *f,
- 
- 	if (offset == 0) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry . ino %d \n",
--		   (int)inode->i_ino));
--		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR)
--		    < 0) {
-+			("yaffs_readdir: entry . ino %d \n",
-+			(int)inode->i_ino));
-+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
- 	if (offset == 1) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_readdir: entry .. ino %d \n",
--		   (int)f->f_dentry->d_parent->d_inode->i_ino));
--		if (filldir
--		    (dirent, "..", 2, offset,
--		     f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) {
-+			("yaffs_readdir: entry .. ino %d \n",
-+			(int)f->f_dentry->d_parent->d_inode->i_ino));
-+		if (filldir(dirent, "..", 2, offset,
-+			f->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
- 			goto out;
--		}
- 		offset++;
- 		f->f_pos++;
- 	}
-@@ -965,35 +1170,32 @@ static int yaffs_readdir(struct file *f,
- 		f->f_version = inode->i_version;
- 	}
- 
--	list_for_each(i, &obj->variant.directoryVariant.children) {
-+	ylist_for_each(i, &obj->variant.directoryVariant.children) {
- 		curoffs++;
- 		if (curoffs >= offset) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
- 
- 			yaffs_GetObjectName(l, name,
- 					    YAFFS_MAX_NAME_LENGTH + 1);
- 			T(YAFFS_TRACE_OS,
--			  (KERN_DEBUG "yaffs_readdir: %s inode %d\n", name,
-+			  ("yaffs_readdir: %s inode %d\n", name,
- 			   yaffs_GetObjectInode(l)));
- 
- 			if (filldir(dirent,
--				    name,
--				    strlen(name),
--				    offset,
--				    yaffs_GetObjectInode(l),
--				    yaffs_GetObjectType(l))
--			    < 0) {
-+					name,
-+					strlen(name),
-+					offset,
-+					yaffs_GetObjectInode(l),
-+					yaffs_GetObjectType(l)) < 0)
- 				goto up_and_out;
--			}
- 
- 			offset++;
- 			f->f_pos++;
- 		}
- 	}
- 
--      up_and_out:
--      out:
--
-+up_and_out:
-+out:
- 	yaffs_GrossUnlock(dev);
- 
- 	return 0;
-@@ -1002,12 +1204,19 @@ static int yaffs_readdir(struct file *f,
- /*
-  * File creation. Allocate an inode, and we're done..
-  */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+#define YCRED(x) x
-+#else
-+#define YCRED(x) (x->cred)
-+#endif
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       dev_t rdev)
-+			dev_t rdev)
- #else
- static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
--		       int rdev)
-+			int rdev)
- #endif
- {
- 	struct inode *inode;
-@@ -1018,25 +1227,25 @@ static int yaffs_mknod(struct inode *dir
- 	yaffs_Object *parent = yaffs_InodeToObject(dir);
- 
- 	int error = -ENOSPC;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	if((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
- 		mode |= S_ISGID;
- 
- 	if (parent) {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: parent object %d type %d\n",
--		   parent->objectId, parent->variantType));
-+			("yaffs_mknod: parent object %d type %d\n",
-+			parent->objectId, parent->variantType));
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: could not get parent object\n"));
-+			("yaffs_mknod: could not get parent object\n"));
- 		return -EPERM;
- 	}
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
--			   "mode %x dev %x\n",
--			   dentry->d_name.name, mode, rdev));
-+			"mode %x dev %x\n",
-+			dentry->d_name.name, mode, rdev));
- 
- 	dev = parent->myDev;
- 
-@@ -1045,33 +1254,28 @@ static int yaffs_mknod(struct inode *dir
- 	switch (mode & S_IFMT) {
- 	default:
- 		/* Special (socket, fifo, device...) */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG
--				   "yaffs_mknod: making special\n"));
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, old_encode_dev(rdev));
--#else
--		obj =
--		    yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
--				       gid, rdev);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, old_encode_dev(rdev));
-+#else
-+		obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
-+				gid, rdev);
- #endif
- 		break;
- 	case S_IFREG:		/* file          */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
--		obj =
--		    yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
--				    gid);
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
-+		obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
-+				gid);
- 		break;
- 	case S_IFDIR:		/* directory */
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod: making directory\n"));
--		obj =
--		    yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
--					 uid, gid);
-+			("yaffs_mknod: making directory\n"));
-+		obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
-+					uid, gid);
- 		break;
- 	case S_IFLNK:		/* symlink */
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mknod: making file\n"));
-+		T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
- 		obj = NULL;	/* Do we ever get here? */
- 		break;
- 	}
-@@ -1083,12 +1287,12 @@ static int yaffs_mknod(struct inode *dir
- 		inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
- 		d_instantiate(dentry, inode);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod created object %d count = %d\n",
--		   obj->objectId, atomic_read(&inode->i_count)));
-+			("yaffs_mknod created object %d count = %d\n",
-+			obj->objectId, atomic_read(&inode->i_count)));
- 		error = 0;
- 	} else {
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_mknod failed making object\n"));
-+			("yaffs_mknod failed making object\n"));
- 		error = -ENOMEM;
- 	}
- 
-@@ -1098,25 +1302,19 @@ static int yaffs_mknod(struct inode *dir
- static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
- {
- 	int retVal;
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_mkdir\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
- 	retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
--#if 0
--	/* attempt to fix dir bug - didn't work */
--	if (!retVal) {
--		dget(dentry);
--	}
--#endif
- 	return retVal;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
- 			struct nameidata *n)
- #else
- static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
- #endif
- {
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_create\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_create\n"));
- 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
- }
- 
-@@ -1127,8 +1325,8 @@ static int yaffs_unlink(struct inode *di
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_unlink %d:%s\n", (int)(dir->i_ino),
--	   dentry->d_name.name));
-+		("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
-+		dentry->d_name.name));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 
-@@ -1151,82 +1349,74 @@ static int yaffs_unlink(struct inode *di
-  * Create a link...
-  */
- static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
--		      struct dentry *dentry)
-+			struct dentry *dentry)
- {
- 	struct inode *inode = old_dentry->d_inode;
- 	yaffs_Object *obj = NULL;
- 	yaffs_Object *link = NULL;
- 	yaffs_Device *dev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_link\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_link\n"));
- 
- 	obj = yaffs_InodeToObject(inode);
- 	dev = obj->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
--	if (!S_ISDIR(inode->i_mode))	/* Don't link directories */
--	{
--		link =
--		    yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
--			       obj);
--	}
-+	if (!S_ISDIR(inode->i_mode))		/* Don't link directories */
-+		link = yaffs_Link(yaffs_InodeToObject(dir), dentry->d_name.name,
-+			obj);
- 
- 	if (link) {
- 		old_dentry->d_inode->i_nlink = yaffs_GetObjectLinkCount(obj);
- 		d_instantiate(dentry, old_dentry->d_inode);
- 		atomic_inc(&old_dentry->d_inode->i_count);
- 		T(YAFFS_TRACE_OS,
--		  (KERN_DEBUG "yaffs_link link count %d i_count %d\n",
--		   old_dentry->d_inode->i_nlink,
--		   atomic_read(&old_dentry->d_inode->i_count)));
--
-+			("yaffs_link link count %d i_count %d\n",
-+			old_dentry->d_inode->i_nlink,
-+			atomic_read(&old_dentry->d_inode->i_count)));
- 	}
- 
- 	yaffs_GrossUnlock(dev);
- 
--	if (link) {
--
-+	if (link)
- 		return 0;
--	}
- 
- 	return -EPERM;
- }
- 
- static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
--			 const char *symname)
-+				const char *symname)
- {
- 	yaffs_Object *obj;
- 	yaffs_Device *dev;
--	uid_t uid = current->fsuid;
--	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
-+	uid_t uid = YCRED(current)->fsuid;
-+	gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_symlink\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
- 
- 	dev = yaffs_InodeToObject(dir)->myDev;
- 	yaffs_GrossLock(dev);
- 	obj = yaffs_MknodSymLink(yaffs_InodeToObject(dir), dentry->d_name.name,
--				 S_IFLNK | S_IRWXUGO, uid, gid, symname);
-+				S_IFLNK | S_IRWXUGO, uid, gid, symname);
- 	yaffs_GrossUnlock(dev);
- 
- 	if (obj) {
--
- 		struct inode *inode;
- 
- 		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
- 		d_instantiate(dentry, inode);
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink created OK\n"));
-+		T(YAFFS_TRACE_OS, ("symlink created OK\n"));
- 		return 0;
- 	} else {
--		T(YAFFS_TRACE_OS, (KERN_DEBUG "symlink not created\n"));
--
-+		T(YAFFS_TRACE_OS, ("symlink not created\n"));
- 	}
- 
- 	return -ENOMEM;
- }
- 
- static int yaffs_sync_object(struct file *file, struct dentry *dentry,
--			     int datasync)
-+				int datasync)
- {
- 
- 	yaffs_Object *obj;
-@@ -1236,7 +1426,7 @@ static int yaffs_sync_object(struct file
- 
- 	dev = obj->myDev;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_object\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_object\n"));
- 	yaffs_GrossLock(dev);
- 	yaffs_FlushFile(obj, 1);
- 	yaffs_GrossUnlock(dev);
-@@ -1255,41 +1445,36 @@ static int yaffs_rename(struct inode *ol
- 	int retVal = YAFFS_FAIL;
- 	yaffs_Object *target;
- 
--        T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_rename\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
- 	dev = yaffs_InodeToObject(old_dir)->myDev;
- 
- 	yaffs_GrossLock(dev);
- 
- 	/* Check if the target is an existing directory that is not empty. */
--	target =
--	    yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
--				   new_dentry->d_name.name);
-+	target = yaffs_FindObjectByName(yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 
- 
- 
--	if (target &&
--	    target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--	    !list_empty(&target->variant.directoryVariant.children)) {
-+	if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+		!ylist_empty(&target->variant.directoryVariant.children)) {
- 
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "target is non-empty dir\n"));
-+		T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
- 
- 		retVal = YAFFS_FAIL;
- 	} else {
--
- 		/* Now does unlinking internally using shadowing mechanism */
--	        T(YAFFS_TRACE_OS, (KERN_DEBUG "calling yaffs_RenameObject\n"));
--
--		retVal =
--		    yaffs_RenameObject(yaffs_InodeToObject(old_dir),
--				       old_dentry->d_name.name,
--				       yaffs_InodeToObject(new_dir),
--				       new_dentry->d_name.name);
-+		T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
- 
-+		retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
-+				old_dentry->d_name.name,
-+				yaffs_InodeToObject(new_dir),
-+				new_dentry->d_name.name);
- 	}
- 	yaffs_GrossUnlock(dev);
- 
- 	if (retVal == YAFFS_OK) {
--		if(target) {
-+		if (target) {
- 			new_dentry->d_inode->i_nlink--;
- 			mark_inode_dirty(new_dentry->d_inode);
- 		}
-@@ -1298,7 +1483,6 @@ static int yaffs_rename(struct inode *ol
- 	} else {
- 		return -ENOTEMPTY;
- 	}
--
- }
- 
- static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
-@@ -1308,15 +1492,15 @@ static int yaffs_setattr(struct dentry *
- 	yaffs_Device *dev;
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_setattr of object %d\n",
--	   yaffs_InodeToObject(inode)->objectId));
--
--	if ((error = inode_change_ok(inode, attr)) == 0) {
-+		("yaffs_setattr of object %d\n",
-+		yaffs_InodeToObject(inode)->objectId));
- 
-+	error = inode_change_ok(inode, attr);
-+	if (error == 0) {
- 		dev = yaffs_InodeToObject(inode)->myDev;
- 		yaffs_GrossLock(dev);
- 		if (yaffs_SetAttributes(yaffs_InodeToObject(inode), attr) ==
--		    YAFFS_OK) {
-+				YAFFS_OK) {
- 			error = 0;
- 		} else {
- 			error = -EPERM;
-@@ -1328,12 +1512,12 @@ static int yaffs_setattr(struct dentry *
- 	return error;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_DentryToObject(dentry)->myDev;
- 	struct super_block *sb = dentry->d_sb;
--#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf)
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-@@ -1343,32 +1527,53 @@ static int yaffs_statfs(struct super_blo
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- #endif
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_statfs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
- 
- 	yaffs_GrossLock(dev);
- 
- 	buf->f_type = YAFFS_MAGIC;
- 	buf->f_bsize = sb->s_blocksize;
- 	buf->f_namelen = 255;
--	if (sb->s_blocksize > dev->nDataBytesPerChunk) {
-+
-+	if (dev->nDataBytesPerChunk & (dev->nDataBytesPerChunk - 1)) {
-+		/* Do this if chunk size is not a power of 2 */
-+
-+		uint64_t bytesInDev;
-+		uint64_t bytesFree;
-+
-+		bytesInDev = ((uint64_t)((dev->endBlock - dev->startBlock + 1))) *
-+			((uint64_t)(dev->nChunksPerBlock * dev->nDataBytesPerChunk));
-+
-+		do_div(bytesInDev, sb->s_blocksize); /* bytesInDev becomes the number of blocks */
-+		buf->f_blocks = bytesInDev;
-+
-+		bytesFree  = ((uint64_t)(yaffs_GetNumberOfFreeChunks(dev))) *
-+			((uint64_t)(dev->nDataBytesPerChunk));
-+
-+		do_div(bytesFree, sb->s_blocksize);
-+
-+		buf->f_bfree = bytesFree;
-+
-+	} else if (sb->s_blocksize > dev->nDataBytesPerChunk) {
- 
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock / (sb->s_blocksize /
--						  dev->nDataBytesPerChunk);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) / (sb->s_blocksize /
--							dev->nDataBytesPerChunk);
-+			yaffs_GetNumberOfFreeChunks(dev) /
-+			(sb->s_blocksize / dev->nDataBytesPerChunk);
- 	} else {
--
- 		buf->f_blocks =
--		    (dev->endBlock - dev->startBlock +
--		     1) * dev->nChunksPerBlock * (dev->nDataBytesPerChunk /
--						  sb->s_blocksize);
-+			(dev->endBlock - dev->startBlock + 1) *
-+			dev->nChunksPerBlock *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
-+
- 		buf->f_bfree =
--		    yaffs_GetNumberOfFreeChunks(dev) * (dev->nDataBytesPerChunk /
--							sb->s_blocksize);
-+			yaffs_GetNumberOfFreeChunks(dev) *
-+			(dev->nDataBytesPerChunk / sb->s_blocksize);
- 	}
-+
- 	buf->f_files = 0;
- 	buf->f_ffree = 0;
- 	buf->f_bavail = buf->f_bfree;
-@@ -1378,18 +1583,19 @@ static int yaffs_statfs(struct super_blo
- }
- 
- 
--/**
- static int yaffs_do_sync_fs(struct super_block *sb)
- {
- 
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_do_sync_fs\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_do_sync_fs\n"));
- 
--	if(sb->s_dirt) {
-+	if (sb->s_dirt) {
- 		yaffs_GrossLock(dev);
- 
--		if(dev)
-+		if (dev) {
-+			yaffs_FlushEntireDeviceCache(dev);
- 			yaffs_CheckpointSave(dev);
-+		}
- 
- 		yaffs_GrossUnlock(dev);
- 
-@@ -1397,35 +1603,73 @@ static int yaffs_do_sync_fs(struct super
- 	}
- 	return 0;
- }
--**/
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static void yaffs_write_super(struct super_block *sb)
- #else
- static int yaffs_write_super(struct super_block *sb)
- #endif
- {
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_write_super\n"));
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	T(YAFFS_TRACE_OS, ("yaffs_write_super\n"));
-+	if (yaffs_auto_checkpoint >= 2)
-+		yaffs_do_sync_fs(sb);
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+	return 0;
- #endif
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_sync_fs(struct super_block *sb, int wait)
- #else
- static int yaffs_sync_fs(struct super_block *sb)
- #endif
- {
-+	T(YAFFS_TRACE_OS, ("yaffs_sync_fs\n"));
-+
-+	if (yaffs_auto_checkpoint >= 1)
-+		yaffs_do_sync_fs(sb);
-+
-+	return 0;
-+}
-+
-+#ifdef YAFFS_USE_OWN_IGET
-+
-+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-+{
-+	struct inode *inode;
-+	yaffs_Object *obj;
-+	yaffs_Device *dev = yaffs_SuperToDevice(sb);
-+
-+	T(YAFFS_TRACE_OS,
-+		("yaffs_iget for %lu\n", ino));
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_sync_fs\n"));
-+	inode = iget_locked(sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-ENOMEM);
-+	if (!(inode->i_state & I_NEW))
-+		return inode;
-+
-+	/* NB This is called as a side effect of other functions, but
-+	 * we had to release the lock to prevent deadlocks, so
-+	 * need to lock again.
-+	 */
- 
--	return 0; /* yaffs_do_sync_fs(sb);*/
-+	yaffs_GrossLock(dev);
- 
-+	obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
-+
-+	yaffs_FillInodeFromObject(inode, obj);
-+
-+	yaffs_GrossUnlock(dev);
-+
-+	unlock_new_inode(inode);
-+	return inode;
- }
- 
-+#else
- 
- static void yaffs_read_inode(struct inode *inode)
- {
-@@ -1438,7 +1682,7 @@ static void yaffs_read_inode(struct inod
- 	yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
- 
- 	T(YAFFS_TRACE_OS,
--	  (KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
-+		("yaffs_read_inode for %d\n", (int)inode->i_ino));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1449,18 +1693,20 @@ static void yaffs_read_inode(struct inod
- 	yaffs_GrossUnlock(dev);
- }
- 
--static LIST_HEAD(yaffs_dev_list);
-+#endif
-+
-+static YLIST_HEAD(yaffs_dev_list);
- 
--#if 0 // not used
-+#if 0 /* not used */
- static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
- {
- 	yaffs_Device    *dev = yaffs_SuperToDevice(sb);
- 
--	if( *flags & MS_RDONLY ) {
-+	if (*flags & MS_RDONLY) {
- 		struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RO\n", dev->name ));
-+			("yaffs_remount_fs: %s: RO\n", dev->name));
- 
- 		yaffs_GrossLock(dev);
- 
-@@ -1472,10 +1718,9 @@ static int yaffs_remount_fs(struct super
- 			mtd->sync(mtd);
- 
- 		yaffs_GrossUnlock(dev);
--	}
--	else {
-+	} else {
- 		T(YAFFS_TRACE_OS,
--			(KERN_DEBUG "yaffs_remount_fs: %s: RW\n", dev->name ));
-+			("yaffs_remount_fs: %s: RW\n", dev->name));
- 	}
- 
- 	return 0;
-@@ -1486,7 +1731,7 @@ static void yaffs_put_super(struct super
- {
- 	yaffs_Device *dev = yaffs_SuperToDevice(sb);
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_put_super\n"));
-+	T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
- 
- 	yaffs_GrossLock(dev);
- 
-@@ -1494,18 +1739,17 @@ static void yaffs_put_super(struct super
- 
- 	yaffs_CheckpointSave(dev);
- 
--	if (dev->putSuperFunc) {
-+	if (dev->putSuperFunc)
- 		dev->putSuperFunc(sb);
--	}
- 
- 	yaffs_Deinitialise(dev);
- 
- 	yaffs_GrossUnlock(dev);
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_del(&dev->devList);
-+	ylist_del(&dev->devList);
- 
--	if(dev->spareBuffer){
-+	if (dev->spareBuffer) {
- 		YFREE(dev->spareBuffer);
- 		dev->spareBuffer = NULL;
- 	}
-@@ -1516,12 +1760,10 @@ static void yaffs_put_super(struct super
- 
- static void yaffs_MTDPutSuper(struct super_block *sb)
- {
--
- 	struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
- 
--	if (mtd->sync) {
-+	if (mtd->sync)
- 		mtd->sync(mtd);
--	}
- 
- 	put_mtd_device(mtd);
- }
-@@ -1531,9 +1773,9 @@ static void yaffs_MarkSuperBlockDirty(vo
- {
- 	struct super_block *sb = (struct super_block *)vsb;
- 
--	T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_MarkSuperBlockDirty() sb = %p\n",sb));
--//	if(sb)
--//		sb->s_dirt = 1;
-+	T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
-+	if (sb)
-+		sb->s_dirt = 1;
- }
- 
- typedef struct {
-@@ -1546,48 +1788,48 @@ typedef struct {
- #define MAX_OPT_LEN 20
- static int yaffs_parse_options(yaffs_options *options, const char *options_str)
- {
--	char cur_opt[MAX_OPT_LEN+1];
-+	char cur_opt[MAX_OPT_LEN + 1];
- 	int p;
- 	int error = 0;
- 
- 	/* Parse through the options which is a comma seperated list */
- 
--	while(options_str && *options_str && !error){
--		memset(cur_opt,0,MAX_OPT_LEN+1);
-+	while (options_str && *options_str && !error) {
-+		memset(cur_opt, 0, MAX_OPT_LEN + 1);
- 		p = 0;
- 
--		while(*options_str && *options_str != ','){
--			if(p < MAX_OPT_LEN){
-+		while (*options_str && *options_str != ',') {
-+			if (p < MAX_OPT_LEN) {
- 				cur_opt[p] = *options_str;
- 				p++;
- 			}
- 			options_str++;
- 		}
- 
--		if(!strcmp(cur_opt,"inband-tags"))
-+		if (!strcmp(cur_opt, "inband-tags"))
- 			options->inband_tags = 1;
--		else if(!strcmp(cur_opt,"no-cache"))
-+		else if (!strcmp(cur_opt, "no-cache"))
- 			options->no_cache = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-read"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-read"))
- 			options->skip_checkpoint_read = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint-write"))
-+		else if (!strcmp(cur_opt, "no-checkpoint-write"))
- 			options->skip_checkpoint_write = 1;
--		else if(!strcmp(cur_opt,"no-checkpoint")){
-+		else if (!strcmp(cur_opt, "no-checkpoint")) {
- 			options->skip_checkpoint_read = 1;
- 			options->skip_checkpoint_write = 1;
- 		} else {
--			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",cur_opt);
-+			printk(KERN_INFO "yaffs: Bad mount option \"%s\"\n",
-+					cur_opt);
- 			error = 1;
- 		}
--
- 	}
- 
- 	return error;
- }
- 
- static struct super_block *yaffs_internal_read_super(int yaffsVersion,
--						     struct super_block *sb,
--						     void *data, int silent)
-+						struct super_block *sb,
-+						void *data, int silent)
- {
- 	int nBlocks;
- 	struct inode *inode = NULL;
-@@ -1602,6 +1844,7 @@ static struct super_block *yaffs_interna
- 
- 	sb->s_magic = YAFFS_MAGIC;
- 	sb->s_op = &yaffs_super_ops;
-+	sb->s_flags |= MS_NOATIME;
- 
- 	if (!sb)
- 		printk(KERN_INFO "yaffs: sb is NULL\n");
-@@ -1614,14 +1857,14 @@ static struct super_block *yaffs_interna
- 		       sb->s_dev,
- 		       yaffs_devname(sb, devname_buf));
- 
--	if(!data_str)
-+	if (!data_str)
- 		data_str = "";
- 
--	printk(KERN_INFO "yaffs: passed flags \"%s\"\n",data_str);
-+	printk(KERN_INFO "yaffs: passed flags \"%s\"\n", data_str);
- 
--	memset(&options,0,sizeof(options));
-+	memset(&options, 0, sizeof(options));
- 
--	if(yaffs_parse_options(&options,data_str)){
-+	if (yaffs_parse_options(&options, data_str)) {
- 		/* Option parsing failed */
- 		return NULL;
- 	}
-@@ -1645,9 +1888,9 @@ static struct super_block *yaffs_interna
- 			       yaffs_devname(sb, devname_buf)));
- 
- 	/* Check it's an mtd device..... */
--	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) {
-+	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
- 		return NULL;	/* This isn't an mtd device */
--	}
-+
- 	/* Get the device */
- 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
- 	if (!mtd) {
-@@ -1673,29 +1916,23 @@ static struct super_block *yaffs_interna
- 	T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
- 	T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
- 	T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
--	T(YAFFS_TRACE_OS, (" size %d\n", mtd->size));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-+	T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
-+#else
-+	T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
-+#endif
- 
- #ifdef CONFIG_YAFFS_AUTO_YAFFS2
- 
--	if (yaffsVersion == 1 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize >= 2048) {
--#else
--	    mtd->oobblock >= 2048) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
--	    yaffsVersion = 2;
-+	if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
-+		yaffsVersion = 2;
- 	}
- 
- 	/* Added NCB 26/5/2006 for completeness */
--	if (yaffsVersion == 2 &&
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	    mtd->writesize == 512) {
--#else
--	    mtd->oobblock == 512) {
--#endif
--	    T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
--	    yaffsVersion = 1;
-+	if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
-+		T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
-+		yaffsVersion = 1;
- 	}
- 
- #endif
-@@ -1707,7 +1944,7 @@ static struct super_block *yaffs_interna
- 		    !mtd->block_markbad ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1719,12 +1956,9 @@ static struct super_block *yaffs_interna
- 			return NULL;
- 		}
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		if (mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#else
--		if (mtd->oobblock < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
--#endif
--		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) {
-+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-+		    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-+		    !options.inband_tags) {
- 			T(YAFFS_TRACE_ALWAYS,
- 			  ("yaffs: MTD device does not have the "
- 			   "right page sizes\n"));
-@@ -1735,7 +1969,7 @@ static struct super_block *yaffs_interna
- 		if (!mtd->erase ||
- 		    !mtd->read ||
- 		    !mtd->write ||
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		    !mtd->read_oob || !mtd->write_oob) {
- #else
- 		    !mtd->write_ecc ||
-@@ -1761,7 +1995,7 @@ static struct super_block *yaffs_interna
- 	 * Set the yaffs_Device up for mtd
- 	 */
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- 	sb->s_fs_info = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
- #else
- 	sb->u.generic_sbp = dev = kmalloc(sizeof(yaffs_Device), GFP_KERNEL);
-@@ -1780,13 +2014,15 @@ static struct super_block *yaffs_interna
- 
- 	/* Set up the memory size parameters.... */
- 
--	nBlocks = mtd->size / (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
-+	nBlocks = YCALCBLOCKS(mtd->size, (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
-+
- 	dev->startBlock = 0;
- 	dev->endBlock = nBlocks - 1;
- 	dev->nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK;
--	dev->nDataBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
-+	dev->totalBytesPerChunk = YAFFS_BYTES_PER_CHUNK;
- 	dev->nReservedBlocks = 5;
- 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
-+	dev->inbandTags = options.inband_tags;
- 
- 	/* ... and the functions. */
- 	if (yaffsVersion == 2) {
-@@ -1798,20 +2034,19 @@ static struct super_block *yaffs_interna
- 		dev->queryNANDBlock = nandmtd2_QueryNANDBlock;
- 		dev->spareBuffer = YMALLOC(mtd->oobsize);
- 		dev->isYaffs2 = 1;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--		dev->nDataBytesPerChunk = mtd->writesize;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+		dev->totalBytesPerChunk = mtd->writesize;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->writesize;
- #else
--		dev->nDataBytesPerChunk = mtd->oobblock;
-+		dev->totalBytesPerChunk = mtd->oobblock;
- 		dev->nChunksPerBlock = mtd->erasesize / mtd->oobblock;
- #endif
--		nBlocks = mtd->size / mtd->erasesize;
-+		nBlocks = YCALCBLOCKS(mtd->size, mtd->erasesize);
- 
--		dev->nCheckpointReservedBlocks = CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS;
- 		dev->startBlock = 0;
- 		dev->endBlock = nBlocks - 1;
- 	} else {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- 		/* use the MTD interface in yaffs_mtdif1.c */
- 		dev->writeChunkWithTagsToNAND =
- 			nandmtd1_WriteChunkWithTagsToNAND;
-@@ -1847,7 +2082,7 @@ static struct super_block *yaffs_interna
- 	dev->skipCheckpointWrite = options.skip_checkpoint_write;
- 
- 	/* we assume this is protected by lock_kernel() in mount/umount */
--	list_add_tail(&dev->devList, &yaffs_dev_list);
-+	ylist_add_tail(&dev->devList, &yaffs_dev_list);
- 
- 	init_MUTEX(&dev->grossLock);
- 
-@@ -1884,20 +2119,23 @@ static struct super_block *yaffs_interna
- 		return NULL;
- 	}
- 	sb->s_root = root;
-+	sb->s_dirt = !dev->isCheckpointed;
-+	T(YAFFS_TRACE_ALWAYS,
-+	  ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
- 
- 	T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
- 	return sb;
- }
- 
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
- 					 int silent)
- {
- 	return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs_read_super(struct file_system_type *fs,
- 			    int flags, const char *dev_name,
- 			    void *data, struct vfsmount *mnt)
-@@ -1938,14 +2176,14 @@ static DECLARE_FSTYPE(yaffs_fs_type, "ya
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
- 					  int silent)
- {
- 	return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
- }
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- static int yaffs2_read_super(struct file_system_type *fs,
- 			int flags, const char *dev_name, void *data,
- 			struct vfsmount *mnt)
-@@ -1990,12 +2228,12 @@ static char *yaffs_dump_dev(char *buf, y
- {
- 	buf += sprintf(buf, "startBlock......... %d\n", dev->startBlock);
- 	buf += sprintf(buf, "endBlock........... %d\n", dev->endBlock);
-+	buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->totalBytesPerChunk);
- 	buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
- 	buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
- 	buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
- 	buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
- 	buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->nReservedBlocks);
--	buf += sprintf(buf, "nCheckptResBlocks.. %d\n", dev->nCheckpointReservedBlocks);
- 	buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
- 	buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
- 	buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
-@@ -2006,10 +2244,8 @@ static char *yaffs_dump_dev(char *buf, y
- 	buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
- 	buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
- 	buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
--	buf +=
--	    sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
--	buf +=
--	    sprintf(buf, "passiveGCs......... %d\n",
-+	buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-+	buf += sprintf(buf, "passiveGCs......... %d\n",
- 		    dev->passiveGarbageCollections);
- 	buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
- 	buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->nShortOpCaches);
-@@ -2025,6 +2261,7 @@ static char *yaffs_dump_dev(char *buf, y
- 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
- 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
- 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
-+	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);
- 
- 	return buf;
- }
-@@ -2033,7 +2270,7 @@ static int yaffs_proc_read(char *page,
- 			   char **start,
- 			   off_t offset, int count, int *eof, void *data)
- {
--	struct list_head *item;
-+	struct ylist_head *item;
- 	char *buf = page;
- 	int step = offset;
- 	int n = 0;
-@@ -2057,8 +2294,8 @@ static int yaffs_proc_read(char *page,
- 	lock_kernel();
- 
- 	/* Locate and print the Nth entry.  Order N-squared but N is small. */
--	list_for_each(item, &yaffs_dev_list) {
--		yaffs_Device *dev = list_entry(item, yaffs_Device, devList);
-+	ylist_for_each(item, &yaffs_dev_list) {
-+		yaffs_Device *dev = ylist_entry(item, yaffs_Device, devList);
- 		if (n < step) {
- 			n++;
- 			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
- 	char *end;
- 	char *mask_name;
- 	const char *x;
--	char substring[MAX_MASK_NAME_LENGTH+1];
-+	char substring[MAX_MASK_NAME_LENGTH + 1];
- 	int i;
- 	int done = 0;
- 	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
- 
- 	while (!done && (pos < count)) {
- 		done = 1;
--		while ((pos < count) && isspace(buf[pos])) {
-+		while ((pos < count) && isspace(buf[pos]))
- 			pos++;
--		}
- 
- 		switch (buf[pos]) {
- 		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
- 		mask_name = NULL;
- 
- 		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
-+
- 		if (end > buf + pos) {
- 			mask_name = "numeral";
- 			len = end - (buf + pos);
- 			pos += len;
- 			done = 0;
- 		} else {
--			for(x = buf + pos, i = 0;
--			    (*x == '_' || (*x >='a' && *x <= 'z')) &&
--			    i <MAX_MASK_NAME_LENGTH; x++, i++, pos++)
--			    substring[i] = *x;
-+			for (x = buf + pos, i = 0;
-+			    (*x == '_' || (*x >= 'a' && *x <= 'z')) &&
-+			    i < MAX_MASK_NAME_LENGTH; x++, i++, pos++)
-+				substring[i] = *x;
- 			substring[i] = '\0';
- 
- 			for (i = 0; mask_flags[i].mask_name != NULL; i++) {
--				if(strcmp(substring,mask_flags[i].mask_name) == 0){
-+				if (strcmp(substring, mask_flags[i].mask_name) == 0) {
- 					mask_name = mask_flags[i].mask_name;
- 					mask_bitfield = mask_flags[i].mask_bitfield;
- 					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
- 
- 		if (mask_name != NULL) {
- 			done = 0;
--			switch(add) {
-+			switch (add) {
- 			case '-':
- 				rg &= ~mask_bitfield;
- 				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
- 
- 	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
- 
--	printk("new trace = 0x%08X\n",yaffs_traceMask);
-+	printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_traceMask);
- 
- 	if (rg & YAFFS_TRACE_ALWAYS) {
- 		for (i = 0; mask_flags[i].mask_name != NULL; i++) {
- 			char flag;
- 			flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
--			printk("%c%s\n", flag, mask_flags[i].mask_name);
-+			printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
- 		}
- 	}
- 
-@@ -2211,12 +2448,8 @@ struct file_system_to_install {
- };
- 
- static struct file_system_to_install fs_to_install[] = {
--//#ifdef CONFIG_YAFFS_YAFFS1
- 	{&yaffs_fs_type, 0},
--//#endif
--//#ifdef CONFIG_YAFFS_YAFFS2
- 	{&yaffs2_fs_type, 0},
--//#endif
- 	{NULL, 0}
- };
- 
-@@ -2231,15 +2464,14 @@ static int __init init_yaffs_fs(void)
- 	/* Install the proc_fs entry */
- 	my_proc_entry = create_proc_entry("yaffs",
- 					       S_IRUGO | S_IFREG,
--					       &proc_root);
-+					       YPROC_ROOT);
- 
- 	if (my_proc_entry) {
- 		my_proc_entry->write_proc = yaffs_proc_write;
- 		my_proc_entry->read_proc = yaffs_proc_read;
- 		my_proc_entry->data = NULL;
--	} else {
-+	} else
- 		return -ENOMEM;
--	}
- 
- 	/* Now add the file system entries */
- 
-@@ -2247,9 +2479,8 @@ static int __init init_yaffs_fs(void)
- 
- 	while (fsinst->fst && !error) {
- 		error = register_filesystem(fsinst->fst);
--		if (!error) {
-+		if (!error)
- 			fsinst->installed = 1;
--		}
- 		fsinst++;
- 	}
- 
-@@ -2277,7 +2508,7 @@ static void __exit exit_yaffs_fs(void)
- 	T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
- 			       " removing. \n"));
- 
--	remove_proc_entry("yaffs", &proc_root);
-+	remove_proc_entry("yaffs", YPROC_ROOT);
- 
- 	fsinst = fs_to_install;
- 
-@@ -2288,7 +2519,6 @@ static void __exit exit_yaffs_fs(void)
- 		}
- 		fsinst++;
- 	}
--
- }
- 
- module_init(init_yaffs_fs)
---- /dev/null
-+++ b/fs/yaffs2/yaffs_getblockinfo.h
-@@ -0,0 +1,34 @@
-+/*
-+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
-+ *
-+ * Copyright (C) 2002-2007 Aleph One Ltd.
-+ *   for Toby Churchill Ltd and Brightstar Engineering
-+ *
-+ * Created by Charles Manning <charles@aleph1.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 2.1 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
-+ */
-+
-+#ifndef __YAFFS_GETBLOCKINFO_H__
-+#define __YAFFS_GETBLOCKINFO_H__
-+
-+#include "yaffs_guts.h"
-+
-+/* Function to manipulate block info */
-+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
-+{
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		  (TSTR
-+		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-+		   blk));
-+		YBUG();
-+	}
-+	return &dev->blockInfo[blk - dev->internalStartBlock];
-+}
-+
-+#endif
---- a/fs/yaffs2/yaffs_guts.c
-+++ b/fs/yaffs2/yaffs_guts.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_guts_c_version =
--    "$Id: yaffs_guts.c,v 1.49 2007-05-15 20:07:40 charles Exp $";
-+    "$Id: yaffs_guts.c,v 1.82 2009-03-09 04:24:17 charles Exp $";
- 
- #include "yportenv.h"
- 
- #include "yaffsinterface.h"
- #include "yaffs_guts.h"
- #include "yaffs_tagsvalidity.h"
-+#include "yaffs_getblockinfo.h"
- 
- #include "yaffs_tagscompat.h"
--#ifndef  CONFIG_YAFFS_USE_OWN_SORT
-+#ifndef CONFIG_YAFFS_USE_OWN_SORT
- #include "yaffs_qsort.h"
- #endif
- #include "yaffs_nand.h"
-@@ -32,116 +33,116 @@ const char *yaffs_guts_c_version =
- #include "yaffs_packedtags2.h"
- 
- 
--#ifdef CONFIG_YAFFS_WINCE
--void yfsd_LockYAFFS(BOOL fsLockOnly);
--void yfsd_UnlockYAFFS(BOOL fsLockOnly);
--#endif
--
- #define YAFFS_PASSIVE_GC_CHUNKS 2
- 
- #include "yaffs_ecc.h"
- 
- 
- /* Robustification (if it ever comes about...) */
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags);
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags);
- 
- /* Other local prototypes */
--static int yaffs_UnlinkObject( yaffs_Object *obj);
-+static int yaffs_UnlinkObject(yaffs_Object *obj);
- static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
- 
- static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
- 
--static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device * dev,
--					     const __u8 * buffer,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve);
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
--				  int chunkInNAND, int inScan);
--
--static yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
--					   yaffs_ObjectType type);
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj);
--static int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name,
--				    int force, int isShrink, int shadows);
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
-+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
-+					const __u8 *buffer,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve);
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-+				int chunkInNAND, int inScan);
-+
-+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
-+					yaffs_ObjectType type);
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+				yaffs_Object *obj);
-+static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-+				int force, int isShrink, int shadows);
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
- static int yaffs_CheckStructures(void);
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
--			      int chunkOffset, int *limit);
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
--
--static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
--
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo);
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
--				    int lineNo);
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
-+			int chunkOffset, int *limit);
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
-+
-+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
- 
--static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND);
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj);
--static void yaffs_DestroyObject(yaffs_Object * obj);
-+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-+				int chunkInNAND);
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
--			   int chunkInObject);
-+static int yaffs_UnlinkWorker(yaffs_Object *obj);
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj);
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
-+			int chunkInObject);
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+				yaffs_BlockInfo **blockUsedPtr);
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
- 
- static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
- 
-+static void yaffs_VerifyDirectory(yaffs_Object *directory);
- #ifdef YAFFS_PARANOID
--static int yaffs_CheckFileSanity(yaffs_Object * in);
-+static int yaffs_CheckFileSanity(yaffs_Object *in);
- #else
- #define yaffs_CheckFileSanity(in)
- #endif
- 
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags);
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				yaffs_ExtendedTags *tags);
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId);
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos);
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId);
- 
- 
- /* Function to calculate chunk and offset */
- 
--static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, __u32 *chunk, __u32 *offset)
-+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
-+		__u32 *offsetOut)
- {
--	if(dev->chunkShift){
--		/* Easy-peasy power of 2 case */
--		*chunk  = (__u32)(addr >> dev->chunkShift);
--		*offset = (__u32)(addr & dev->chunkMask);
--	}
--	else if(dev->crumbsPerChunk)
--	{
--		/* Case where we're using "crumbs" */
--		*offset = (__u32)(addr & dev->crumbMask);
--		addr >>= dev->crumbShift;
--		*chunk = ((__u32)addr)/dev->crumbsPerChunk;
--		*offset += ((addr - (*chunk * dev->crumbsPerChunk)) << dev->crumbShift);
-+	int chunk;
-+	__u32 offset;
-+
-+	chunk  = (__u32)(addr >> dev->chunkShift);
-+
-+	if (dev->chunkDiv == 1) {
-+		/* easy power of 2 case */
-+		offset = (__u32)(addr & dev->chunkMask);
-+	} else {
-+		/* Non power-of-2 case */
-+
-+		loff_t chunkBase;
-+
-+		chunk /= dev->chunkDiv;
-+
-+		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
-+		offset = (__u32)(addr - chunkBase);
- 	}
--	else
--		YBUG();
-+
-+	*chunkOut = chunk;
-+	*offsetOut = offset;
- }
- 
--/* Function to return the number of shifts for a power of 2 greater than or equal
-- * to the given number
-+/* Function to return the number of shifts for a power of 2 greater than or
-+ * equal to the given number
-  * Note we don't try to cater for all possible numbers and this does not have to
-  * be hellishly efficient.
-  */
-@@ -153,13 +154,14 @@ static __u32 ShiftsGE(__u32 x)
- 
- 	nShifts = extraBits = 0;
- 
--	while(x>1){
--		if(x & 1) extraBits++;
--		x>>=1;
-+	while (x > 1) {
-+		if (x & 1)
-+			extraBits++;
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
--	if(extraBits)
-+	if (extraBits)
- 		nShifts++;
- 
- 	return nShifts;
-@@ -168,16 +170,17 @@ static __u32 ShiftsGE(__u32 x)
- /* Function to return the number of shifts to get a 1 in bit 0
-  */
- 
--static __u32 ShiftDiv(__u32 x)
-+static __u32 Shifts(__u32 x)
- {
- 	int nShifts;
- 
- 	nShifts =  0;
- 
--	if(!x) return 0;
-+	if (!x)
-+		return 0;
- 
--	while( !(x&1)){
--		x>>=1;
-+	while (!(x&1)) {
-+		x >>= 1;
- 		nShifts++;
- 	}
- 
-@@ -195,21 +198,25 @@ static int yaffs_InitialiseTempBuffers(y
- 	int i;
- 	__u8 *buf = (__u8 *)1;
- 
--	memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-+	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
- 
- 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		dev->tempBuffer[i].line = 0;	/* not in use */
- 		dev->tempBuffer[i].buffer = buf =
--		    YMALLOC_DMA(dev->nDataBytesPerChunk);
-+		    YMALLOC_DMA(dev->totalBytesPerChunk);
- 	}
- 
- 	return buf ? YAFFS_OK : YAFFS_FAIL;
--
- }
- 
--static __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
- {
- 	int i, j;
-+
-+	dev->tempInUse++;
-+	if (dev->tempInUse > dev->maxTemp)
-+		dev->maxTemp = dev->tempInUse;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].line == 0) {
- 			dev->tempBuffer[i].line = lineNo;
-@@ -227,9 +234,9 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 	T(YAFFS_TRACE_BUFFERS,
- 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
- 	   lineNo));
--	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
--	}
-+
- 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
- 
- 	/*
-@@ -242,10 +249,13 @@ static __u8 *yaffs_GetTempBuffer(yaffs_D
- 
- }
- 
--static void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
- 				    int lineNo)
- {
- 	int i;
-+
-+	dev->tempInUse--;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer) {
- 			dev->tempBuffer[i].line = 0;
-@@ -267,27 +277,26 @@ static void yaffs_ReleaseTempBuffer(yaff
- /*
-  * Determine if we have a managed buffer.
-  */
--int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
-+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
- {
- 	int i;
-+
- 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- 		if (dev->tempBuffer[i].buffer == buffer)
- 			return 1;
-+	}
- 
-+	for (i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].data == buffer)
-+			return 1;
- 	}
- 
--    for (i = 0; i < dev->nShortOpCaches; i++) {
--        if( dev->srCache[i].data == buffer )
--            return 1;
--
--    }
--
--    if (buffer == dev->checkpointBuffer)
--      return 1;
--
--    T(YAFFS_TRACE_ALWAYS,
--	  (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
--    return 0;
-+	if (buffer == dev->checkpointBuffer)
-+		return 1;
-+
-+	T(YAFFS_TRACE_ALWAYS,
-+		(TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-+	return 0;
- }
- 
- 
-@@ -296,62 +305,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Devi
-  * Chunk bitmap manipulations
-  */
- 
--static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
-+static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
- {
- 	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
--		   blk));
-+			(TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-+			blk));
- 		YBUG();
- 	}
- 	return dev->chunkBits +
--	    (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-+		(dev->chunkBitmapStride * (blk - dev->internalStartBlock));
- }
- 
- static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
- {
--	if(blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
--	   chunk < 0 || chunk >= dev->nChunksPerBlock) {
--	   T(YAFFS_TRACE_ERROR,
--	    (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
--	    YBUG();
-+	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-+			chunk < 0 || chunk >= dev->nChunksPerBlock) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-+			blk, chunk));
-+		YBUG();
- 	}
- }
- 
--static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
- 	memset(blkBits, 0, dev->chunkBitmapStride);
- }
- 
--static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] &= ~(1 << (chunk & 7));
- }
- 
--static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	blkBits[chunk / 8] |= (1 << (chunk & 7));
- }
- 
--static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
-+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
--	yaffs_VerifyChunkBitId(dev,blk,chunk);
-+	yaffs_VerifyChunkBitId(dev, blk, chunk);
- 
- 	return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
- }
- 
--static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
-+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
-@@ -363,17 +373,17 @@ static Y_INLINE int yaffs_StillSomeChunk
- 	return 0;
- }
- 
--static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
-+static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
- {
- 	__u8 *blkBits = yaffs_BlockBits(dev, blk);
- 	int i;
- 	int n = 0;
- 	for (i = 0; i < dev->chunkBitmapStride; i++) {
- 		__u8 x = *blkBits;
--		while(x){
--			if(x & 1)
-+		while (x) {
-+			if (x & 1)
- 				n++;
--			x >>=1;
-+			x >>= 1;
- 		}
- 
- 		blkBits++;
-@@ -400,7 +410,7 @@ static int yaffs_SkipNANDVerification(ya
- 	return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
- }
- 
--static const char * blockStateName[] = {
-+static const char *blockStateName[] = {
- "Unknown",
- "Needs scanning",
- "Scanning",
-@@ -413,64 +423,65 @@ static const char * blockStateName[] = {
- "Dead"
- };
- 
--static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
- {
- 	int actuallyUsed;
- 	int inUse;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Report illegal runtime states */
--	if(bi->blockState <0 || bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-+	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
- 
--	switch(bi->blockState){
--	 case YAFFS_BLOCK_STATE_UNKNOWN:
--	 case YAFFS_BLOCK_STATE_SCANNING:
--	 case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
--		n,blockStateName[bi->blockState]));
-+	switch (bi->blockState) {
-+	case YAFFS_BLOCK_STATE_UNKNOWN:
-+	case YAFFS_BLOCK_STATE_SCANNING:
-+	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-+		n, blockStateName[bi->blockState]));
- 	}
- 
- 	/* Check pages in use and soft deletions are legal */
- 
- 	actuallyUsed = bi->pagesInUse - bi->softDeletions;
- 
--	if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
-+	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
- 	   bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
- 	   actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
--		n,bi->pagesInUse,bi->softDeletions));
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-+		n, bi->pagesInUse, bi->softDeletions));
- 
- 
- 	/* Check chunk bitmap legal */
--	inUse = yaffs_CountChunkBits(dev,n);
--	if(inUse != bi->pagesInUse)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
--			n,bi->pagesInUse,inUse));
-+	inUse = yaffs_CountChunkBits(dev, n);
-+	if (inUse != bi->pagesInUse)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-+			n, bi->pagesInUse, inUse));
- 
- 	/* Check that the sequence number is valid.
- 	 * Ten million is legal, but is very unlikely
- 	 */
--	if(dev->isYaffs2 &&
-+	if (dev->isYaffs2 &&
- 	   (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
--	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000 ))
--		T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has suspect sequence number of %d"TENDSTR),
--		n,bi->sequenceNumber));
--
-+	   (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-+		n, bi->sequenceNumber));
- }
- 
--static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
-+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
-+		int n)
- {
--	yaffs_VerifyBlock(dev,bi,n);
-+	yaffs_VerifyBlock(dev, bi, n);
- 
- 	/* After collection the block should be in the erased state */
--	/* TODO: This will need to change if we do partial gc */
-+	/* This will need to change if we do partial gc */
- 
--	if(bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
--		T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
--			n,bi->blockState));
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-+			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-+			n, bi->blockState));
- 	}
- }
- 
-@@ -480,52 +491,49 @@ static void yaffs_VerifyBlocks(yaffs_Dev
- 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- 	int nIllegalBlockStates = 0;
- 
--
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
--	memset(nBlocksPerState,0,sizeof(nBlocksPerState));
--
-+	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
- 
--	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
--		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
--		yaffs_VerifyBlock(dev,bi,i);
-+	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-+		yaffs_VerifyBlock(dev, bi, i);
- 
--		if(bi->blockState >=0 && bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-+		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- 			nBlocksPerState[bi->blockState]++;
- 		else
- 			nIllegalBlockStates++;
--
- 	}
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
--	T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
--		T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-+		T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
- 
--	for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-+	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- 		T(YAFFS_TRACE_VERIFY,
- 		  (TSTR("%s %d blocks"TENDSTR),
--		  blockStateName[i],nBlocksPerState[i]));
-+		  blockStateName[i], nBlocksPerState[i]));
- 
--	if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-+	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- 		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
- 
--	if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-+	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- 		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
- 
--	if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-+	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- 		T(YAFFS_TRACE_VERIFY,
- 		 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- 		 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
- 
--	T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-+	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
- 
- }
- 
-@@ -535,26 +543,26 @@ static void yaffs_VerifyBlocks(yaffs_Dev
-  */
- static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
- {
--	if(yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
--	if(!(tags && obj && oh)){
--	 	T(YAFFS_TRACE_VERIFY,
--		 		(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
--		 		(__u32)tags,(__u32)obj,(__u32)oh));
-+	if (!(tags && obj && oh)) {
-+		T(YAFFS_TRACE_VERIFY,
-+				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-+				(__u32)tags, (__u32)obj, (__u32)oh));
- 		return;
- 	}
- 
--	if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
--	   oh->type > YAFFS_OBJECT_TYPE_MAX)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
--		 tags->objectId, oh->type));
--
--	if(tags->objectId != obj->objectId)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
--		 tags->objectId, obj->objectId));
-+	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-+			oh->type > YAFFS_OBJECT_TYPE_MAX)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-+			tags->objectId, oh->type));
-+
-+	if (tags->objectId != obj->objectId)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-+			tags->objectId, obj->objectId));
- 
- 
- 	/*
-@@ -563,46 +571,43 @@ static void yaffs_VerifyObjectHeader(yaf
- 	 * Tests do not apply to the root object.
- 	 */
- 
--	if(parentCheck && tags->objectId > 1 && !obj->parent)
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId));
--
--
--	if(parentCheck && obj->parent &&
--	   oh->parentObjectId != obj->parent->objectId &&
--	   (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
--	    obj->parent->objectId != YAFFS_OBJECTID_DELETED))
--	 	T(YAFFS_TRACE_VERIFY,
--		 (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
--	 	 tags->objectId, oh->parentObjectId, obj->parent->objectId));
-+	if (parentCheck && tags->objectId > 1 && !obj->parent)
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-+			tags->objectId, oh->parentObjectId));
- 
-+	if (parentCheck && obj->parent &&
-+			oh->parentObjectId != obj->parent->objectId &&
-+			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-+			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-+			tags->objectId, oh->parentObjectId, obj->parent->objectId));
- 
--	if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-+	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is NULL"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is NULL"TENDSTR),
-+			obj->objectId));
- 
--	if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-+	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
- 		T(YAFFS_TRACE_VERIFY,
--		(TSTR("Obj %d header name is 0xFF"TENDSTR),
--		 obj->objectId));
-+			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-+			obj->objectId));
- }
- 
- 
- 
--static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = obj->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_VerifyTnodeWorker(obj,
- 							tn->internal[i],
-@@ -611,20 +616,19 @@ static int yaffs_VerifyTnodeWorker(yaffs
- 				}
- 			}
- 		} else if (level == 0) {
--			int i;
- 			yaffs_ExtendedTags tags;
- 			__u32 objectId = obj->objectId;
- 
- 			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
- 
--			for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
--				__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-+				__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 
--				if(theChunk > 0){
-+				if (theChunk > 0) {
- 					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
--					yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--					if(tags.objectId != objectId || tags.chunkId != chunkOffset){
--						T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+					yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-+						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 							objectId, chunkOffset, theChunk,
- 							tags.objectId, tags.chunkId));
- 					}
-@@ -646,13 +650,15 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	__u32 lastChunk;
- 	__u32 x;
- 	__u32 i;
--	int ok;
- 	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	yaffs_Tnode *tn;
- 	__u32 objectId;
- 
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (!obj)
-+		return;
-+
-+	if (yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	dev = obj->myDev;
-@@ -662,17 +668,17 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- 	requiredTallness = 0;
--	while (x> 0) {
-+	while (x > 0) {
- 		x >>= YAFFS_TNODES_INTERNAL_BITS;
- 		requiredTallness++;
- 	}
- 
- 	actualTallness = obj->variant.fileVariant.topLevel;
- 
--	if(requiredTallness > actualTallness )
-+	if (requiredTallness > actualTallness)
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
--		 obj->objectId,actualTallness, requiredTallness));
-+		 obj->objectId, actualTallness, requiredTallness));
- 
- 
- 	/* Check that the chunks in the tnode tree are all correct.
-@@ -680,39 +686,31 @@ static void yaffs_VerifyFile(yaffs_Objec
- 	 * checking the tags for every chunk match.
- 	 */
- 
--	if(yaffs_SkipNANDVerification(dev))
-+	if (yaffs_SkipNANDVerification(dev))
- 		return;
- 
--	for(i = 1; i <= lastChunk; i++){
--		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
-+	for (i = 1; i <= lastChunk; i++) {
-+		tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
- 
- 		if (tn) {
--			__u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
--			if(theChunk > 0){
-+			__u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-+			if (theChunk > 0) {
- 				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
--				yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
--				if(tags.objectId != objectId || tags.chunkId != i){
--					T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-+				yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-+				if (tags.objectId != objectId || tags.chunkId != i) {
-+					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- 						objectId, i, theChunk,
- 						tags.objectId, tags.chunkId));
- 				}
- 			}
- 		}
--
- 	}
--
- }
- 
--static void yaffs_VerifyDirectory(yaffs_Object *obj)
--{
--	if(obj && yaffs_SkipVerification(obj->myDev))
--		return;
--
--}
- 
- static void yaffs_VerifyHardLink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify sane equivalent object */
-@@ -720,7 +718,7 @@ static void yaffs_VerifyHardLink(yaffs_O
- 
- static void yaffs_VerifySymlink(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- 
- 	/* Verify symlink string */
-@@ -728,7 +726,7 @@ static void yaffs_VerifySymlink(yaffs_Ob
- 
- static void yaffs_VerifySpecial(yaffs_Object *obj)
- {
--	if(obj && yaffs_SkipVerification(obj->myDev))
-+	if (obj && yaffs_SkipVerification(obj->myDev))
- 		return;
- }
- 
-@@ -740,14 +738,19 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	__u32 chunkMax;
- 
- 	__u32 chunkIdOk;
--	__u32 chunkIsLive;
-+	__u32 chunkInRange;
-+	__u32 chunkShouldNotBeDeleted;
-+	__u32 chunkValid;
-+
-+	if (!obj)
-+		return;
- 
--	if(!obj)
-+	if (obj->beingCreated)
- 		return;
- 
- 	dev = obj->myDev;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Check sane object header chunk */
-@@ -755,50 +758,54 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
- 	chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
- 
--	chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
--	chunkIsLive = chunkIdOk &&
-+	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-+	chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-+	chunkValid = chunkInRange &&
- 			yaffs_CheckChunkBit(dev,
--					    obj->chunkId / dev->nChunksPerBlock,
--					    obj->chunkId % dev->nChunksPerBlock);
--	if(!obj->fake &&
--	    (!chunkIdOk || !chunkIsLive)) {
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
--	   obj->objectId,obj->chunkId,
--	   chunkIdOk ? "" : ",out of range",
--	   chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
-+					obj->hdrChunk / dev->nChunksPerBlock,
-+					obj->hdrChunk % dev->nChunksPerBlock);
-+	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-+
-+	if (!obj->fake &&
-+			(!chunkIdOk || chunkShouldNotBeDeleted)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-+			obj->objectId, obj->hdrChunk,
-+			chunkIdOk ? "" : ",out of range",
-+			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
- 	}
- 
--	if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
-+	if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
- 		yaffs_ExtendedTags tags;
- 		yaffs_ObjectHeader *oh;
--		__u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-+		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
- 		oh = (yaffs_ObjectHeader *)buffer;
- 
--		yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-+		yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-+				&tags);
- 
--		yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-+		yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
- 
--		yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
-+		yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
- 	}
- 
- 	/* Verify it has a parent */
--	if(obj && !obj->fake &&
--	   (!obj->parent || obj->parent->myDev != dev)){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
--	   obj->objectId,obj->parent));
-+	if (obj && !obj->fake &&
-+			(!obj->parent || obj->parent->myDev != dev)) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-+			obj->objectId, obj->parent));
- 	}
- 
- 	/* Verify parent is a directory */
--	if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
--	   T(YAFFS_TRACE_VERIFY,
--	   (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
--	   obj->objectId,obj->parent->variantType));
-+	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_VERIFY,
-+			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-+			obj->objectId, obj->parent->variantType));
- 	}
- 
--	switch(obj->variantType){
-+	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
- 		yaffs_VerifyFile(obj);
- 		break;
-@@ -818,33 +825,30 @@ static void yaffs_VerifyObject(yaffs_Obj
- 	default:
- 		T(YAFFS_TRACE_VERIFY,
- 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
--		obj->objectId,obj->variantType));
-+		obj->objectId, obj->variantType));
- 		break;
- 	}
--
--
- }
- 
- static void yaffs_VerifyObjects(yaffs_Device *dev)
- {
- 	yaffs_Object *obj;
- 	int i;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	/* Iterate through the objects in each hash entry */
- 
--	 for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				yaffs_VerifyObject(obj);
- 			}
- 		}
--	 }
--
-+	}
- }
- 
- 
-@@ -855,19 +859,20 @@ static void yaffs_VerifyObjects(yaffs_De
- static Y_INLINE int yaffs_HashFunction(int n)
- {
- 	n = abs(n);
--	return (n % YAFFS_NOBJECT_BUCKETS);
-+	return n % YAFFS_NOBJECT_BUCKETS;
- }
- 
- /*
-- * Access functions to useful fake objects
-+ * Access functions to useful fake objects.
-+ * Note that root might have a presence in NAND if permissions are set.
-  */
- 
--yaffs_Object *yaffs_Root(yaffs_Device * dev)
-+yaffs_Object *yaffs_Root(yaffs_Device *dev)
- {
- 	return dev->rootDir;
- }
- 
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
- {
- 	return dev->lostNFoundDir;
- }
-@@ -877,7 +882,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Dev
-  *  Erased NAND checking functions
-  */
- 
--int yaffs_CheckFF(__u8 * buffer, int nBytes)
-+int yaffs_CheckFF(__u8 *buffer, int nBytes)
- {
- 	/* Horrible, slow implementation */
- 	while (nBytes--) {
-@@ -889,9 +894,8 @@ int yaffs_CheckFF(__u8 * buffer, int nBy
- }
- 
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND)
-+				int chunkInNAND)
- {
--
- 	int retval = YAFFS_OK;
- 	__u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
- 	yaffs_ExtendedTags tags;
-@@ -899,10 +903,9 @@ static int yaffs_CheckChunkErased(struct
- 
- 	result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
- 
--	if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
-+	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
- 		retval = YAFFS_FAIL;
- 
--
- 	if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
-@@ -915,11 +918,10 @@ static int yaffs_CheckChunkErased(struct
- 
- }
- 
--
- static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					     const __u8 * data,
--					     yaffs_ExtendedTags * tags,
--					     int useReserve)
-+					const __u8 *data,
-+					yaffs_ExtendedTags *tags,
-+					int useReserve)
- {
- 	int attempts = 0;
- 	int writeOk = 0;
-@@ -972,7 +974,7 @@ static int yaffs_WriteNewChunkWithTagsTo
- 			erasedOk = yaffs_CheckChunkErased(dev, chunk);
- 			if (erasedOk != YAFFS_OK) {
- 				T(YAFFS_TRACE_ERROR,
--				(TSTR ("**>> yaffs chunk %d was not erased"
-+				(TSTR("**>> yaffs chunk %d was not erased"
- 				TENDSTR), chunk));
- 
- 				/* try another chunk */
-@@ -992,7 +994,11 @@ static int yaffs_WriteNewChunkWithTagsTo
- 		/* Copy the data into the robustification buffer */
- 		yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
- 
--	} while (writeOk != YAFFS_OK && attempts < yaffs_wr_attempts);
-+	} while (writeOk != YAFFS_OK &&
-+		(yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-+
-+	if (!writeOk)
-+		chunk = -1;
- 
- 	if (attempts > 1) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -1009,13 +1015,35 @@ static int yaffs_WriteNewChunkWithTagsTo
-  * Block retiring for handling a broken block.
-  */
- 
--static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
-+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
- 	yaffs_InvalidateCheckpoint(dev);
- 
--	yaffs_MarkBlockBad(dev, blockInNAND);
-+	if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
-+		if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR(
-+				"yaffs: Failed to mark bad and erase block %d"
-+				TENDSTR), blockInNAND));
-+		} else {
-+			yaffs_ExtendedTags tags;
-+			int chunkId = blockInNAND * dev->nChunksPerBlock;
-+
-+			__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-+
-+			memset(buffer, 0xff, dev->nDataBytesPerChunk);
-+			yaffs_InitialiseTags(&tags);
-+			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-+			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-+				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-+					TCONT("write bad block marker to block %d")
-+					TENDSTR), blockInNAND));
-+
-+			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-+		}
-+	}
- 
- 	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
- 	bi->gcPrioritise = 0;
-@@ -1029,49 +1057,45 @@ static void yaffs_RetireBlock(yaffs_Devi
-  *
-  */
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_ExtendedTags * tags)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				const yaffs_ExtendedTags *tags)
- {
- }
- 
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
- {
--	if(!bi->gcPrioritise){
-+	if (!bi->gcPrioritise) {
- 		bi->gcPrioritise = 1;
- 		dev->hasPendingPrioritisedGCs = 1;
--		bi->chunkErrorStrikes ++;
-+		bi->chunkErrorStrikes++;
- 
--		if(bi->chunkErrorStrikes > 3){
-+		if (bi->chunkErrorStrikes > 3) {
- 			bi->needsRetiring = 1; /* Too many stikes, so retire this */
- 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
- 
- 		}
--
- 	}
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
-+		int erasedOk)
- {
--
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
- 
--	yaffs_HandleChunkError(dev,bi);
-+	yaffs_HandleChunkError(dev, bi);
- 
--
--	if(erasedOk ) {
-+	if (erasedOk) {
- 		/* Was an actual write failure, so mark the block for retirement  */
- 		bi->needsRetiring = 1;
- 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
--
--
- 	}
- 
- 	/* Delete the chunk */
-@@ -1081,12 +1105,12 @@ static void yaffs_HandleWriteChunkError(
- 
- /*---------------- Name handling functions ------------*/
- 
--static __u16 yaffs_CalcNameSum(const YCHAR * name)
-+static __u16 yaffs_CalcNameSum(const YCHAR *name)
- {
- 	__u16 sum = 0;
- 	__u16 i = 1;
- 
--	YUCHAR *bname = (YUCHAR *) name;
-+	const YUCHAR *bname = (const YUCHAR *) name;
- 	if (bname) {
- 		while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
- 
-@@ -1102,14 +1126,14 @@ static __u16 yaffs_CalcNameSum(const YCH
- 	return sum;
- }
- 
--static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
-+static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
- {
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
-+	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-+	if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
- 		yaffs_strcpy(obj->shortName, name);
--	} else {
-+	else
- 		obj->shortName[0] = _Y('\0');
--	}
- #endif
- 	obj->sum = yaffs_CalcNameSum(name);
- }
-@@ -1126,7 +1150,7 @@ static void yaffs_SetObjectName(yaffs_Ob
-  * Don't use this function directly
-  */
- 
--static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
-+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
- {
- 	int i;
- 	int tnodeSize;
-@@ -1143,6 +1167,9 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	 * Must be a multiple of 32-bits  */
- 	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 	/* make these things */
- 
- 	newTnodes = YMALLOC(nTnodes * tnodeSize);
-@@ -1150,7 +1177,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- 	if (!newTnodes) {
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-+			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -1170,7 +1197,7 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 	dev->freeTnodes = newTnodes;
- #else
- 	/* New hookup for wide tnodes */
--	for(i = 0; i < nTnodes -1; i++) {
-+	for (i = 0; i < nTnodes - 1; i++) {
- 		curr = (yaffs_Tnode *) &mem[i * tnodeSize];
- 		next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
- 		curr->internal[0] = next;
-@@ -1197,7 +1224,6 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 		  (TSTR
- 		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
- 		   return YAFFS_FAIL;
--
- 	} else {
- 		tnl->tnodes = newTnodes;
- 		tnl->next = dev->allocatedTnodeList;
-@@ -1211,14 +1237,13 @@ static int yaffs_CreateTnodes(yaffs_Devi
- 
- /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
- 
--static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = NULL;
- 
- 	/* If there are none left make more */
--	if (!dev->freeTnodes) {
-+	if (!dev->freeTnodes)
- 		yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
--	}
- 
- 	if (dev->freeTnodes) {
- 		tn = dev->freeTnodes;
-@@ -1233,21 +1258,27 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(ya
- 		dev->nFreeTnodes--;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
-+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
- {
- 	yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	if(tn)
--		memset(tn, 0, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
-+	if (tn)
-+		memset(tn, 0, tnodeSize);
- 
- 	return tn;
- }
- 
- /* FreeTnode frees up a tnode and puts it back on the free list */
--static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
-+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
- {
- 	if (tn) {
- #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-@@ -1262,9 +1293,10 @@ static void yaffs_FreeTnode(yaffs_Device
- 		dev->freeTnodes = tn;
- 		dev->nFreeTnodes++;
- 	}
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
--static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
- {
- 	/* Free the list of allocated tnodes */
- 	yaffs_TnodeList *tmp;
-@@ -1282,71 +1314,72 @@ static void yaffs_DeinitialiseTnodes(yaf
- 	dev->nFreeTnodes = 0;
- }
- 
--static void yaffs_InitialiseTnodes(yaffs_Device * dev)
-+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
- {
- 	dev->allocatedTnodeList = NULL;
- 	dev->freeTnodes = NULL;
- 	dev->nFreeTnodes = 0;
- 	dev->nTnodesCreated = 0;
--
- }
- 
- 
--void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
-+		unsigned val)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 mask;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 mask;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
--  val >>= dev->chunkGroupBits;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	val >>= dev->chunkGroupBits;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  mask = dev->tnodeMask << bitInWord;
-+	mask = dev->tnodeMask << bitInWord;
- 
--  map[wordInMap] &= ~mask;
--  map[wordInMap] |= (mask & (val << bitInWord));
-+	map[wordInMap] &= ~mask;
-+	map[wordInMap] |= (mask & (val << bitInWord));
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
--    map[wordInMap] &= ~mask;
--    map[wordInMap] |= (mask & (val >> bitInWord));
--  }
-+	if (dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-+		map[wordInMap] &= ~mask;
-+		map[wordInMap] |= (mask & (val >> bitInWord));
-+	}
- }
- 
--static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-+		unsigned pos)
- {
--  __u32 *map = (__u32 *)tn;
--  __u32 bitInMap;
--  __u32 bitInWord;
--  __u32 wordInMap;
--  __u32 val;
-+	__u32 *map = (__u32 *)tn;
-+	__u32 bitInMap;
-+	__u32 bitInWord;
-+	__u32 wordInMap;
-+	__u32 val;
- 
--  pos &= YAFFS_TNODES_LEVEL0_MASK;
-+	pos &= YAFFS_TNODES_LEVEL0_MASK;
- 
--  bitInMap = pos * dev->tnodeWidth;
--  wordInMap = bitInMap /32;
--  bitInWord = bitInMap & (32 -1);
-+	bitInMap = pos * dev->tnodeWidth;
-+	wordInMap = bitInMap / 32;
-+	bitInWord = bitInMap & (32 - 1);
- 
--  val = map[wordInMap] >> bitInWord;
-+	val = map[wordInMap] >> bitInWord;
- 
--  if(dev->tnodeWidth > (32-bitInWord)) {
--    bitInWord = (32 - bitInWord);
--    wordInMap++;;
--    val |= (map[wordInMap] << bitInWord);
--  }
-+	if	(dev->tnodeWidth > (32 - bitInWord)) {
-+		bitInWord = (32 - bitInWord);
-+		wordInMap++;;
-+		val |= (map[wordInMap] << bitInWord);
-+	}
- 
--  val &= dev->tnodeMask;
--  val <<= dev->chunkGroupBits;
-+	val &= dev->tnodeMask;
-+	val <<= dev->chunkGroupBits;
- 
--  return val;
-+	return val;
- }
- 
- /* ------------------- End of individual tnode manipulation -----------------*/
-@@ -1357,24 +1390,21 @@ static __u32 yaffs_GetChunkGroupBase(yaf
-  */
- 
- /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
--static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
--					  yaffs_FileStructure * fStruct,
--					  __u32 chunkId)
-+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId)
- {
--
- 	yaffs_Tnode *tn = fStruct->top;
- 	__u32 i;
- 	int requiredTallness;
- 	int level = fStruct->topLevel;
- 
- 	/* Check sane level and chunk Id */
--	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL) {
-+	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1385,22 +1415,17 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
- 		requiredTallness++;
- 	}
- 
--	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough, so we can't find it, return NULL. */
--		return NULL;
--	}
-+	if (requiredTallness > fStruct->topLevel)
-+		return NULL; /* Not tall enough, so we can't find it */
- 
- 	/* Traverse down to level 0 */
- 	while (level > 0 && tn) {
--		tn = tn->
--		    internal[(chunkId >>
--			       ( YAFFS_TNODES_LEVEL0_BITS +
--			         (level - 1) *
--			         YAFFS_TNODES_INTERNAL_BITS)
--			      ) &
--			     YAFFS_TNODES_INTERNAL_MASK];
-+		tn = tn->internal[(chunkId >>
-+			(YAFFS_TNODES_LEVEL0_BITS +
-+				(level - 1) *
-+				YAFFS_TNODES_INTERNAL_BITS)) &
-+			YAFFS_TNODES_INTERNAL_MASK];
- 		level--;
--
- 	}
- 
- 	return tn;
-@@ -1417,12 +1442,11 @@ static yaffs_Tnode *yaffs_FindLevel0Tnod
-  *  be plugged into the ttree.
-  */
- 
--static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
--					       yaffs_FileStructure * fStruct,
--					       __u32 chunkId,
--					       yaffs_Tnode *passedTn)
-+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
-+					yaffs_FileStructure *fStruct,
-+					__u32 chunkId,
-+					yaffs_Tnode *passedTn)
- {
--
- 	int requiredTallness;
- 	int i;
- 	int l;
-@@ -1432,13 +1456,11 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	/* Check sane level and page Id */
--	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL) {
-+	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
- 		return NULL;
--	}
- 
--	if (chunkId > YAFFS_MAX_CHUNK_ID) {
-+	if (chunkId > YAFFS_MAX_CHUNK_ID)
- 		return NULL;
--	}
- 
- 	/* First check we're tall enough (ie enough topLevel) */
- 
-@@ -1451,7 +1473,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 
- 
- 	if (requiredTallness > fStruct->topLevel) {
--		/* Not tall enough,gotta make the tree taller */
-+		/* Not tall enough, gotta make the tree taller */
- 		for (i = fStruct->topLevel; i < requiredTallness; i++) {
- 
- 			tn = yaffs_GetTnode(dev);
-@@ -1473,27 +1495,27 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 	l = fStruct->topLevel;
- 	tn = fStruct->top;
- 
--	if(l > 0) {
-+	if (l > 0) {
- 		while (l > 0 && tn) {
- 			x = (chunkId >>
--			     ( YAFFS_TNODES_LEVEL0_BITS +
-+			     (YAFFS_TNODES_LEVEL0_BITS +
- 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
- 			    YAFFS_TNODES_INTERNAL_MASK;
- 
- 
--			if((l>1) && !tn->internal[x]){
-+			if ((l > 1) && !tn->internal[x]) {
- 				/* Add missing non-level-zero tnode */
- 				tn->internal[x] = yaffs_GetTnode(dev);
- 
--			} else if(l == 1) {
-+			} else if (l == 1) {
- 				/* Looking from level 1 at level 0 */
--			 	if (passedTn) {
-+				if (passedTn) {
- 					/* If we already have one, then release it.*/
--					if(tn->internal[x])
--						yaffs_FreeTnode(dev,tn->internal[x]);
-+					if (tn->internal[x])
-+						yaffs_FreeTnode(dev, tn->internal[x]);
- 					tn->internal[x] = passedTn;
- 
--				} else if(!tn->internal[x]) {
-+				} else if (!tn->internal[x]) {
- 					/* Don't have one, none passed in */
- 					tn->internal[x] = yaffs_GetTnode(dev);
- 				}
-@@ -1504,31 +1526,29 @@ static yaffs_Tnode *yaffs_AddOrFindLevel
- 		}
- 	} else {
- 		/* top is level 0 */
--		if(passedTn) {
--			memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
--			yaffs_FreeTnode(dev,passedTn);
-+		if (passedTn) {
-+			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+			yaffs_FreeTnode(dev, passedTn);
- 		}
- 	}
- 
- 	return tn;
- }
- 
--static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
--				  yaffs_ExtendedTags * tags, int objectId,
--				  int chunkInInode)
-+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
-+				yaffs_ExtendedTags *tags, int objectId,
-+				int chunkInInode)
- {
- 	int j;
- 
- 	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
--		if (yaffs_CheckChunkBit
--		    (dev, theChunk / dev->nChunksPerBlock,
--		     theChunk % dev->nChunksPerBlock)) {
-+		if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
-+				theChunk % dev->nChunksPerBlock)) {
- 			yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
- 							tags);
- 			if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
- 				/* found it; */
- 				return theChunk;
--
- 			}
- 		}
- 		theChunk++;
-@@ -1543,7 +1563,7 @@ static int yaffs_FindChunkInGroup(yaffs_
-  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
-  */
- 
--static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
- 			      int chunkOffset, int *limit)
- {
- 	int i;
-@@ -1557,7 +1577,6 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- 	if (tn) {
- 		if (level > 0) {
--
- 			for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
- 			     i--) {
- 				if (tn->internal[i]) {
-@@ -1565,17 +1584,17 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						allDone = 0;
- 					} else {
- 						allDone =
--						    yaffs_DeleteWorker(in,
--								       tn->
--								       internal
--								       [i],
--								       level -
--								       1,
--								       (chunkOffset
-+							yaffs_DeleteWorker(in,
-+								tn->
-+								internal
-+								[i],
-+								level -
-+								1,
-+								(chunkOffset
- 									<<
- 									YAFFS_TNODES_INTERNAL_BITS)
--								       + i,
--								       limit);
-+								+ i,
-+								limit);
- 					}
- 					if (allDone) {
- 						yaffs_FreeTnode(dev,
-@@ -1584,27 +1603,25 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						tn->internal[i] = NULL;
- 					}
- 				}
--
- 			}
- 			return (allDone) ? 1 : 0;
- 		} else if (level == 0) {
- 			int hitLimit = 0;
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
--			     i--) {
--			        theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+					i--) {
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 
--					chunkInInode =
--					    (chunkOffset <<
--					     YAFFS_TNODES_LEVEL0_BITS) + i;
-+					chunkInInode = (chunkOffset <<
-+						YAFFS_TNODES_LEVEL0_BITS) + i;
- 
- 					foundChunk =
--					    yaffs_FindChunkInGroup(dev,
--								   theChunk,
--								   &tags,
--								   in->objectId,
--								   chunkInInode);
-+						yaffs_FindChunkInGroup(dev,
-+								theChunk,
-+								&tags,
-+								in->objectId,
-+								chunkInInode);
- 
- 					if (foundChunk > 0) {
- 						yaffs_DeleteChunk(dev,
-@@ -1613,14 +1630,13 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 						in->nDataChunks--;
- 						if (limit) {
- 							*limit = *limit - 1;
--							if (*limit <= 0) {
-+							if (*limit <= 0)
- 								hitLimit = 1;
--							}
- 						}
- 
- 					}
- 
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1634,9 +1650,8 @@ static int yaffs_DeleteWorker(yaffs_Obje
- 
- }
- 
--static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
-+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
- {
--
- 	yaffs_BlockInfo *theBlock;
- 
- 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
-@@ -1654,7 +1669,7 @@ static void yaffs_SoftDeleteChunk(yaffs_
-  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
-  */
- 
--static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
-+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
- 				  __u32 level, int chunkOffset)
- {
- 	int i;
-@@ -1691,14 +1706,14 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 		} else if (level == 0) {
- 
- 			for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
--				theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-+				theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
- 				if (theChunk) {
- 					/* Note this does not find the real chunk, only the chunk group.
- 					 * We make an assumption that a chunk group is not larger than
- 					 * a block.
- 					 */
- 					yaffs_SoftDeleteChunk(dev, theChunk);
--					yaffs_PutLevel0Tnode(dev,tn,i,0);
-+					yaffs_PutLevel0Tnode(dev, tn, i, 0);
- 				}
- 
- 			}
-@@ -1712,7 +1727,7 @@ static int yaffs_SoftDeleteWorker(yaffs_
- 
- }
- 
--static void yaffs_SoftDeleteFile(yaffs_Object * obj)
-+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
- {
- 	if (obj->deleted &&
- 	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-@@ -1746,8 +1761,8 @@ static void yaffs_SoftDeleteFile(yaffs_O
-  * by a special case.
-  */
- 
--static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
--				      __u32 level, int del0)
-+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
-+				__u32 level, int del0)
- {
- 	int i;
- 	int hasData;
-@@ -1763,9 +1778,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 						      (i == 0) ? del0 : 1);
- 			}
- 
--			if (tn->internal[i]) {
-+			if (tn->internal[i])
- 				hasData++;
--			}
- 		}
- 
- 		if (hasData == 0 && del0) {
-@@ -1781,8 +1795,8 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
- 
- }
- 
--static int yaffs_PruneFileStructure(yaffs_Device * dev,
--				    yaffs_FileStructure * fStruct)
-+static int yaffs_PruneFileStructure(yaffs_Device *dev,
-+				yaffs_FileStructure *fStruct)
- {
- 	int i;
- 	int hasData;
-@@ -1805,9 +1819,8 @@ static int yaffs_PruneFileStructure(yaff
- 
- 			hasData = 0;
- 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
--				if (tn->internal[i]) {
-+				if (tn->internal[i])
- 					hasData++;
--				}
- 			}
- 
- 			if (!hasData) {
-@@ -1828,7 +1841,7 @@ static int yaffs_PruneFileStructure(yaff
- /* yaffs_CreateFreeObjects creates a bunch more objects and
-  * adds them to the object free list.
-  */
--static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
-+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
- {
- 	int i;
- 	yaffs_Object *newObjects;
-@@ -1842,9 +1855,9 @@ static int yaffs_CreateFreeObjects(yaffs
- 	list = YMALLOC(sizeof(yaffs_ObjectList));
- 
- 	if (!newObjects || !list) {
--		if(newObjects)
-+		if (newObjects)
- 			YFREE(newObjects);
--		if(list)
-+		if (list)
- 			YFREE(list);
- 		T(YAFFS_TRACE_ALLOCATE,
- 		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-@@ -1854,7 +1867,7 @@ static int yaffs_CreateFreeObjects(yaffs
- 	/* Hook them into the free list */
- 	for (i = 0; i < nObjects - 1; i++) {
- 		newObjects[i].siblings.next =
--		    (struct list_head *)(&newObjects[i + 1]);
-+				(struct ylist_head *)(&newObjects[i + 1]);
- 	}
- 
- 	newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-@@ -1873,85 +1886,109 @@ static int yaffs_CreateFreeObjects(yaffs
- 
- 
- /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
--static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
-+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
- {
- 	yaffs_Object *tn = NULL;
- 
-+#ifdef VALGRIND_TEST
-+	tn = YMALLOC(sizeof(yaffs_Object));
-+#else
- 	/* If there are none left make more */
--	if (!dev->freeObjects) {
-+	if (!dev->freeObjects)
- 		yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
--	}
- 
- 	if (dev->freeObjects) {
- 		tn = dev->freeObjects;
- 		dev->freeObjects =
--		    (yaffs_Object *) (dev->freeObjects->siblings.next);
-+			(yaffs_Object *) (dev->freeObjects->siblings.next);
- 		dev->nFreeObjects--;
--
-+	}
-+#endif
-+	if (tn) {
- 		/* Now sweeten it up... */
- 
- 		memset(tn, 0, sizeof(yaffs_Object));
-+		tn->beingCreated = 1;
-+
- 		tn->myDev = dev;
--		tn->chunkId = -1;
-+		tn->hdrChunk = 0;
- 		tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
--		INIT_LIST_HEAD(&(tn->hardLinks));
--		INIT_LIST_HEAD(&(tn->hashLink));
--		INIT_LIST_HEAD(&tn->siblings);
-+		YINIT_LIST_HEAD(&(tn->hardLinks));
-+		YINIT_LIST_HEAD(&(tn->hashLink));
-+		YINIT_LIST_HEAD(&tn->siblings);
-+
-+
-+		/* Now make the directory sane */
-+		if (dev->rootDir) {
-+			tn->parent = dev->rootDir;
-+			ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
-+		}
- 
- 		/* Add it to the lost and found directory.
- 		 * NB Can't put root or lostNFound in lostNFound so
- 		 * check if lostNFound exists first
- 		 */
--		if (dev->lostNFoundDir) {
-+		if (dev->lostNFoundDir)
- 			yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
--		}
-+
-+		tn->beingCreated = 0;
- 	}
- 
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-+
- 	return tn;
- }
- 
--static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
-+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
- 					       __u32 mode)
- {
- 
- 	yaffs_Object *obj =
- 	    yaffs_CreateNewObject(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
- 	if (obj) {
--		obj->fake = 1;		/* it is fake so it has no NAND presence... */
-+		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
- 		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
- 		obj->unlinkAllowed = 0;	/* ... or unlink it */
- 		obj->deleted = 0;
- 		obj->unlinked = 0;
- 		obj->yst_mode = mode;
- 		obj->myDev = dev;
--		obj->chunkId = 0;	/* Not a valid chunk. */
-+		obj->hdrChunk = 0;	/* Not a valid chunk. */
- 	}
- 
- 	return obj;
- 
- }
- 
--static void yaffs_UnhashObject(yaffs_Object * tn)
-+static void yaffs_UnhashObject(yaffs_Object *tn)
- {
- 	int bucket;
- 	yaffs_Device *dev = tn->myDev;
- 
- 	/* If it is still linked into the bucket list, free from the list */
--	if (!list_empty(&tn->hashLink)) {
--		list_del_init(&tn->hashLink);
-+	if (!ylist_empty(&tn->hashLink)) {
-+		ylist_del_init(&tn->hashLink);
- 		bucket = yaffs_HashFunction(tn->objectId);
- 		dev->objectBucket[bucket].count--;
- 	}
--
- }
- 
- /*  FreeObject frees up a Object and puts it back on the free list */
--static void yaffs_FreeObject(yaffs_Object * tn)
-+static void yaffs_FreeObject(yaffs_Object *tn)
- {
--
- 	yaffs_Device *dev = tn->myDev;
- 
--#ifdef  __KERNEL__
-+#ifdef __KERNEL__
-+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-+#endif
-+
-+	if (tn->parent)
-+		YBUG();
-+	if (!ylist_empty(&tn->siblings))
-+		YBUG();
-+
-+
-+#ifdef __KERNEL__
- 	if (tn->myInode) {
- 		/* We're still hooked up to a cached inode.
- 		 * Don't delete now, but mark for later deletion
-@@ -1963,24 +2000,28 @@ static void yaffs_FreeObject(yaffs_Objec
- 
- 	yaffs_UnhashObject(tn);
- 
-+#ifdef VALGRIND_TEST
-+	YFREE(tn);
-+#else
- 	/* Link into the free list. */
--	tn->siblings.next = (struct list_head *)(dev->freeObjects);
-+	tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
- 	dev->freeObjects = tn;
- 	dev->nFreeObjects++;
-+#endif
-+	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
- }
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj)
-+void yaffs_HandleDeferedFree(yaffs_Object *obj)
- {
--	if (obj->deferedFree) {
-+	if (obj->deferedFree)
- 		yaffs_FreeObject(obj);
--	}
- }
- 
- #endif
- 
--static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
-+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
- {
- 	/* Free the list of allocated Objects */
- 
-@@ -1998,7 +2039,7 @@ static void yaffs_DeinitialiseObjects(ya
- 	dev->nFreeObjects = 0;
- }
- 
--static void yaffs_InitialiseObjects(yaffs_Device * dev)
-+static void yaffs_InitialiseObjects(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2007,15 +2048,14 @@ static void yaffs_InitialiseObjects(yaff
- 	dev->nFreeObjects = 0;
- 
- 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
--		INIT_LIST_HEAD(&dev->objectBucket[i].list);
-+		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
- 		dev->objectBucket[i].count = 0;
- 	}
--
- }
- 
--static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
-+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
- {
--	static int x = 0;
-+	static int x;
- 	int i;
- 	int l = 999;
- 	int lowest = 999999;
-@@ -2049,7 +2089,7 @@ static int yaffs_FindNiceObjectBucket(ya
- 	return l;
- }
- 
--static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
-+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
- {
- 	int bucket = yaffs_FindNiceObjectBucket(dev);
- 
-@@ -2058,7 +2098,7 @@ static int yaffs_CreateNewObjectNumber(y
- 	 */
- 
- 	int found = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
- 	__u32 n = (__u32) bucket;
- 
-@@ -2068,41 +2108,38 @@ static int yaffs_CreateNewObjectNumber(y
- 		found = 1;
- 		n += YAFFS_NOBJECT_BUCKETS;
- 		if (1 || dev->objectBucket[bucket].count > 0) {
--			list_for_each(i, &dev->objectBucket[bucket].list) {
-+			ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 				/* If there is already one in the list */
--				if (i
--				    && list_entry(i, yaffs_Object,
--						  hashLink)->objectId == n) {
-+				if (i && ylist_entry(i, yaffs_Object,
-+						hashLink)->objectId == n) {
- 					found = 0;
- 				}
- 			}
- 		}
- 	}
- 
--
- 	return n;
- }
- 
--static void yaffs_HashObject(yaffs_Object * in)
-+static void yaffs_HashObject(yaffs_Object *in)
- {
- 	int bucket = yaffs_HashFunction(in->objectId);
- 	yaffs_Device *dev = in->myDev;
- 
--	list_add(&in->hashLink, &dev->objectBucket[bucket].list);
-+	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
- 	dev->objectBucket[bucket].count++;
--
- }
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
- {
- 	int bucket = yaffs_HashFunction(number);
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *in;
- 
--	list_for_each(i, &dev->objectBucket[bucket].list) {
-+	ylist_for_each(i, &dev->objectBucket[bucket].list) {
- 		/* Look if it is in the list */
- 		if (i) {
--			in = list_entry(i, yaffs_Object, hashLink);
-+			in = ylist_entry(i, yaffs_Object, hashLink);
- 			if (in->objectId == number) {
- #ifdef __KERNEL__
- 				/* Don't tell the VFS about this one if it is defered free */
-@@ -2118,31 +2155,27 @@ yaffs_Object *yaffs_FindObjectByNumber(y
- 	return NULL;
- }
- 
--yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
-+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
- 				    yaffs_ObjectType type)
- {
--
- 	yaffs_Object *theObject;
--	yaffs_Tnode *tn;
-+	yaffs_Tnode *tn = NULL;
- 
--	if (number < 0) {
-+	if (number < 0)
- 		number = yaffs_CreateNewObjectNumber(dev);
--	}
- 
- 	theObject = yaffs_AllocateEmptyObject(dev);
--	if(!theObject)
-+	if (!theObject)
- 		return NULL;
- 
--	if(type == YAFFS_OBJECT_TYPE_FILE){
-+	if (type == YAFFS_OBJECT_TYPE_FILE) {
- 		tn = yaffs_GetTnode(dev);
--		if(!tn){
-+		if (!tn) {
- 			yaffs_FreeObject(theObject);
- 			return NULL;
- 		}
- 	}
- 
--
--
- 	if (theObject) {
- 		theObject->fake = 0;
- 		theObject->renameAllowed = 1;
-@@ -2171,8 +2204,8 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 			theObject->variant.fileVariant.top = tn;
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
--			INIT_LIST_HEAD(&theObject->variant.directoryVariant.
--				       children);
-+			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-+					children);
- 			break;
- 		case YAFFS_OBJECT_TYPE_SYMLINK:
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
-@@ -2188,32 +2221,30 @@ yaffs_Object *yaffs_CreateNewObject(yaff
- 	return theObject;
- }
- 
--static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
-+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
- 						      int number,
- 						      yaffs_ObjectType type)
- {
- 	yaffs_Object *theObject = NULL;
- 
--	if (number > 0) {
-+	if (number > 0)
- 		theObject = yaffs_FindObjectByNumber(dev, number);
--	}
- 
--	if (!theObject) {
-+	if (!theObject)
- 		theObject = yaffs_CreateNewObject(dev, number, type);
--	}
- 
- 	return theObject;
- 
- }
- 
- 
--static YCHAR *yaffs_CloneString(const YCHAR * str)
-+static YCHAR *yaffs_CloneString(const YCHAR *str)
- {
- 	YCHAR *newStr = NULL;
- 
- 	if (str && *str) {
- 		newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
--		if(newStr)
-+		if (newStr)
- 			yaffs_strcpy(newStr, str);
- 	}
- 
-@@ -2229,29 +2260,31 @@ static YCHAR *yaffs_CloneString(const YC
-  */
- 
- static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
--				       yaffs_Object * parent,
--				       const YCHAR * name,
-+				       yaffs_Object *parent,
-+				       const YCHAR *name,
- 				       __u32 mode,
- 				       __u32 uid,
- 				       __u32 gid,
--				       yaffs_Object * equivalentObject,
--				       const YCHAR * aliasString, __u32 rdev)
-+				       yaffs_Object *equivalentObject,
-+				       const YCHAR *aliasString, __u32 rdev)
- {
- 	yaffs_Object *in;
--	YCHAR *str;
-+	YCHAR *str = NULL;
- 
- 	yaffs_Device *dev = parent->myDev;
- 
- 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
--	if (yaffs_FindObjectByName(parent, name)) {
-+	if (yaffs_FindObjectByName(parent, name))
- 		return NULL;
--	}
- 
- 	in = yaffs_CreateNewObject(dev, -1, type);
- 
--	if(type == YAFFS_OBJECT_TYPE_SYMLINK){
-+	if (!in)
-+		return YAFFS_FAIL;
-+
-+	if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
- 		str = yaffs_CloneString(aliasString);
--		if(!str){
-+		if (!str) {
- 			yaffs_FreeObject(in);
- 			return NULL;
- 		}
-@@ -2260,7 +2293,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 
- 	if (in) {
--		in->chunkId = -1;
-+		in->hdrChunk = 0;
- 		in->valid = 1;
- 		in->variantType = type;
- 
-@@ -2293,10 +2326,10 @@ static yaffs_Object *yaffs_MknodObject(y
- 			break;
- 		case YAFFS_OBJECT_TYPE_HARDLINK:
- 			in->variant.hardLinkVariant.equivalentObject =
--			    equivalentObject;
-+				equivalentObject;
- 			in->variant.hardLinkVariant.equivalentObjectId =
--			    equivalentObject->objectId;
--			list_add(&in->hardLinks, &equivalentObject->hardLinks);
-+				equivalentObject->objectId;
-+			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
- 			break;
- 		case YAFFS_OBJECT_TYPE_FILE:
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -2308,7 +2341,7 @@ static yaffs_Object *yaffs_MknodObject(y
- 
- 		if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
- 			/* Could not create the object header, fail the creation */
--			yaffs_DestroyObject(in);
-+			yaffs_DeleteObject(in);
- 			in = NULL;
- 		}
- 
-@@ -2317,38 +2350,38 @@ static yaffs_Object *yaffs_MknodObject(y
- 	return in;
- }
- 
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+			__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
--				 uid, gid, NULL, NULL, 0);
-+				uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid)
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
- 				 mode, uid, gid, NULL, NULL, 0);
- }
- 
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
- 				 uid, gid, NULL, NULL, rdev);
- }
- 
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
--				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias)
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid,
-+				const YCHAR *alias)
- {
- 	return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
--				 uid, gid, NULL, alias, 0);
-+				uid, gid, NULL, alias, 0);
- }
- 
- /* yaffs_Link returns the object id of the equivalent object.*/
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject)
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			yaffs_Object *equivalentObject)
- {
- 	/* Get the real object in case we were fed a hard link as an equivalent object */
- 	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
- 
- }
- 
--static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
--				  const YCHAR * newName, int force, int shadows)
-+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
-+				const YCHAR *newName, int force, int shadows)
- {
- 	int unlinkOp;
- 	int deleteOp;
- 
- 	yaffs_Object *existingTarget;
- 
--	if (newDir == NULL) {
-+	if (newDir == NULL)
- 		newDir = obj->parent;	/* use the old directory */
--	}
- 
- 	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("tragendy: yaffs_ChangeObjectName: newDir is not a directory"
-+		   ("tragedy: yaffs_ChangeObjectName: newDir is not a directory"
- 		    TENDSTR)));
- 		YBUG();
- 	}
- 
- 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
--	if (obj->myDev->isYaffs2) {
-+	if (obj->myDev->isYaffs2)
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir);
--	} else {
-+	else
- 		unlinkOp = (newDir == obj->myDev->unlinkedDir
- 			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
--	}
- 
- 	deleteOp = (newDir == obj->myDev->deletedDir);
- 
-@@ -2415,40 +2446,40 @@ static int yaffs_ChangeObjectName(yaffs_
- 			obj->unlinked = 1;
- 
- 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
--		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows)>= 0)
-+		if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
- 			return YAFFS_OK;
- 	}
- 
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName)
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		yaffs_Object *newDir, const YCHAR *newName)
- {
--	yaffs_Object *obj;
--	yaffs_Object *existingTarget;
-+	yaffs_Object *obj = NULL;
-+	yaffs_Object *existingTarget = NULL;
- 	int force = 0;
- 
-+
-+	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-+		YBUG();
-+
- #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
- 	/* Special case for case insemsitive systems (eg. WinCE).
- 	 * While look-up is case insensitive, the name isn't.
- 	 * Therefore we might want to change x.txt to X.txt
- 	*/
--	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0) {
-+	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
- 		force = 1;
--	}
- #endif
- 
-+	else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-+		/* ENAMETOOLONG */
-+		return YAFFS_FAIL;
-+
- 	obj = yaffs_FindObjectByName(oldDir, oldName);
--	/* Check new name to long. */
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK &&
--	    yaffs_strlen(newName) > YAFFS_MAX_ALIAS_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
--	else if (obj->variantType != YAFFS_OBJECT_TYPE_SYMLINK &&
--		 yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
--	  /* ENAMETOOLONG */
--	  return YAFFS_FAIL;
- 
- 	if (obj && obj->renameAllowed) {
- 
-@@ -2456,8 +2487,8 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- 		existingTarget = yaffs_FindObjectByName(newDir, newName);
- 		if (existingTarget &&
--		    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
--		    !list_empty(&existingTarget->variant.directoryVariant.children)) {
-+			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-+			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
- 			/* There is a target that is a non-empty directory, so we fail */
- 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
- 		} else if (existingTarget && existingTarget != obj) {
-@@ -2465,7 +2496,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 			 * but only if it isn't the same object
- 			 */
- 			yaffs_ChangeObjectName(obj, newDir, newName, force,
--					       existingTarget->objectId);
-+						existingTarget->objectId);
- 			yaffs_UnlinkObject(existingTarget);
- 		}
- 
-@@ -2476,7 +2507,7 @@ int yaffs_RenameObject(yaffs_Object * ol
- 
- /*------------------------- Block Management and Page Allocation ----------------*/
- 
--static int yaffs_InitialiseBlocks(yaffs_Device * dev)
-+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
- {
- 	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
-@@ -2487,23 +2518,20 @@ static int yaffs_InitialiseBlocks(yaffs_
- 
- 	/* If the first allocation strategy fails, thry the alternate one */
- 	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
--	if(!dev->blockInfo){
-+	if (!dev->blockInfo) {
- 		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
- 		dev->blockInfoAlt = 1;
--	}
--	else
-+	} else
- 		dev->blockInfoAlt = 0;
- 
--	if(dev->blockInfo){
--
-+	if (dev->blockInfo) {
- 		/* Set up dynamic blockinfo stuff. */
- 		dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
- 		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
--		if(!dev->chunkBits){
-+		if (!dev->chunkBits) {
- 			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
- 			dev->chunkBitsAlt = 1;
--		}
--		else
-+		} else
- 			dev->chunkBitsAlt = 0;
- 	}
- 
-@@ -2514,30 +2542,29 @@ static int yaffs_InitialiseBlocks(yaffs_
- 	}
- 
- 	return YAFFS_FAIL;
--
- }
- 
--static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
-+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
- {
--	if(dev->blockInfoAlt && dev->blockInfo)
-+	if (dev->blockInfoAlt && dev->blockInfo)
- 		YFREE_ALT(dev->blockInfo);
--	else if(dev->blockInfo)
-+	else if (dev->blockInfo)
- 		YFREE(dev->blockInfo);
- 
- 	dev->blockInfoAlt = 0;
- 
- 	dev->blockInfo = NULL;
- 
--	if(dev->chunkBitsAlt && dev->chunkBits)
-+	if (dev->chunkBitsAlt && dev->chunkBits)
- 		YFREE_ALT(dev->chunkBits);
--	else if(dev->chunkBits)
-+	else if (dev->chunkBits)
- 		YFREE(dev->chunkBits);
- 	dev->chunkBitsAlt = 0;
- 	dev->chunkBits = NULL;
- }
- 
--static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
--					    yaffs_BlockInfo * bi)
-+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-+					yaffs_BlockInfo *bi)
- {
- 	int i;
- 	__u32 seq;
-@@ -2556,7 +2583,7 @@ static int yaffs_BlockNotDisqualifiedFro
- 		seq = dev->sequenceNumber;
- 
- 		for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
--		     i++) {
-+				i++) {
- 			b = yaffs_GetBlockInfo(dev, i);
- 			if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
- 			    (b->pagesInUse - b->softDeletions) <
-@@ -2571,38 +2598,36 @@ static int yaffs_BlockNotDisqualifiedFro
- 	 * discarded pages.
- 	 */
- 	return (bi->sequenceNumber <= dev->oldestDirtySequence);
--
- }
- 
- /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
-  * for garbage collection.
-  */
- 
--static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
--					       int aggressive)
-+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
-+					int aggressive)
- {
--
- 	int b = dev->currentDirtyChecker;
- 
- 	int i;
- 	int iterations;
- 	int dirtiest = -1;
- 	int pagesInUse = 0;
--	int prioritised=0;
-+	int prioritised = 0;
- 	yaffs_BlockInfo *bi;
- 	int pendingPrioritisedExist = 0;
- 
- 	/* First let's see if we need to grab a prioritised block */
--	if(dev->hasPendingPrioritisedGCs){
--		for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
-+	if (dev->hasPendingPrioritisedGCs) {
-+		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
- 
- 			bi = yaffs_GetBlockInfo(dev, i);
--			//yaffs_VerifyBlock(dev,bi,i);
-+			/* yaffs_VerifyBlock(dev,bi,i); */
- 
--			if(bi->gcPrioritise) {
-+			if (bi->gcPrioritise) {
- 				pendingPrioritisedExist = 1;
--				if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
-+				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-+				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 					pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 					dirtiest = i;
- 					prioritised = 1;
-@@ -2611,7 +2636,7 @@ static int yaffs_FindBlockForGarbageColl
- 			}
- 		}
- 
--		if(!pendingPrioritisedExist) /* None found, so we can clear this */
-+		if (!pendingPrioritisedExist) /* None found, so we can clear this */
- 			dev->hasPendingPrioritisedGCs = 0;
- 	}
- 
-@@ -2623,31 +2648,28 @@ static int yaffs_FindBlockForGarbageColl
- 
- 	dev->nonAggressiveSkip--;
- 
--	if (!aggressive && (dev->nonAggressiveSkip > 0)) {
-+	if (!aggressive && (dev->nonAggressiveSkip > 0))
- 		return -1;
--	}
- 
--	if(!prioritised)
-+	if (!prioritised)
- 		pagesInUse =
--	    		(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
-+			(aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
- 
--	if (aggressive) {
-+	if (aggressive)
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
--	} else {
-+	else {
- 		iterations =
- 		    dev->internalEndBlock - dev->internalStartBlock + 1;
- 		iterations = iterations / 16;
--		if (iterations > 200) {
-+		if (iterations > 200)
- 			iterations = 200;
--		}
- 	}
- 
- 	for (i = 0; i <= iterations && pagesInUse > 0 && !prioritised; i++) {
- 		b++;
--		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
-+		if (b < dev->internalStartBlock || b > dev->internalEndBlock)
- 			b = dev->internalStartBlock;
--		}
- 
- 		if (b < dev->internalStartBlock || b > dev->internalEndBlock) {
- 			T(YAFFS_TRACE_ERROR,
-@@ -2657,17 +2679,9 @@ static int yaffs_FindBlockForGarbageColl
- 
- 		bi = yaffs_GetBlockInfo(dev, b);
- 
--#if 0
--		if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
--			dirtiest = b;
--			pagesInUse = 0;
--		}
--		else
--#endif
--
- 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
--		       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
--		        yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
-+			(bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-+				yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
- 			dirtiest = b;
- 			pagesInUse = (bi->pagesInUse - bi->softDeletions);
- 		}
-@@ -2678,19 +2692,18 @@ static int yaffs_FindBlockForGarbageColl
- 	if (dirtiest > 0) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
--		   dev->nChunksPerBlock - pagesInUse,prioritised));
-+		   dev->nChunksPerBlock - pagesInUse, prioritised));
- 	}
- 
- 	dev->oldestDirtySequence = 0;
- 
--	if (dirtiest > 0) {
-+	if (dirtiest > 0)
- 		dev->nonAggressiveSkip = 4;
--	}
- 
- 	return dirtiest;
- }
- 
--static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
-+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
- {
- 	yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
- 
-@@ -2752,7 +2765,7 @@ static void yaffs_BlockBecameDirty(yaffs
- 	}
- }
- 
--static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
-+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
- {
- 	int i;
- 
-@@ -2763,7 +2776,7 @@ static int yaffs_FindBlockForAllocation(
- 		 * Can't get space to gc
- 		 */
- 		T(YAFFS_TRACE_ERROR,
--		  (TSTR("yaffs tragedy: no more eraased blocks" TENDSTR)));
-+		  (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
- 
- 		return -1;
- 	}
-@@ -2794,31 +2807,74 @@ static int yaffs_FindBlockForAllocation(
- 
- 	T(YAFFS_TRACE_ALWAYS,
- 	  (TSTR
--	   ("yaffs tragedy: no more eraased blocks, but there should have been %d"
-+	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
- 	    TENDSTR), dev->nErasedBlocks));
- 
- 	return -1;
- }
- 
- 
--// Check if there's space to allocate...
--// Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
--static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
-+
-+static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-+{
-+	if (!dev->nCheckpointBlocksRequired &&
-+	   dev->isYaffs2) {
-+		/* Not a valid value so recalculate */
-+		int nBytes = 0;
-+		int nBlocks;
-+		int devBlocks = (dev->endBlock - dev->startBlock + 1);
-+		int tnodeSize;
-+
-+		tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+		if (tnodeSize < sizeof(yaffs_Tnode))
-+			tnodeSize = sizeof(yaffs_Tnode);
-+
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(yaffs_CheckpointDevice);
-+		nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-+		nBytes += devBlocks * dev->chunkBitmapStride;
-+		nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-+		nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-+		nBytes += sizeof(yaffs_CheckpointValidity);
-+		nBytes += sizeof(__u32); /* checksum*/
-+
-+		/* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-+
-+		nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->nChunksPerBlock)) + 3;
-+
-+		dev->nCheckpointBlocksRequired = nBlocks;
-+	}
-+
-+	return dev->nCheckpointBlocksRequired;
-+}
-+
-+/*
-+ * Check if there's space to allocate...
-+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
-+ */
-+static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev)
- {
- 	int reservedChunks;
- 	int reservedBlocks = dev->nReservedBlocks;
- 	int checkpointBlocks;
- 
--	checkpointBlocks =  dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(checkpointBlocks < 0)
-+	if (dev->isYaffs2) {
-+		checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-+				    dev->blocksInCheckpoint;
-+		if (checkpointBlocks < 0)
-+			checkpointBlocks = 0;
-+	} else {
- 		checkpointBlocks = 0;
-+	}
- 
- 	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
- 
- 	return (dev->nFreeChunks > reservedChunks);
- }
- 
--static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
-+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
-+		yaffs_BlockInfo **blockUsedPtr)
- {
- 	int retVal;
- 	yaffs_BlockInfo *bi;
-@@ -2835,7 +2891,7 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 	}
- 
- 	if (dev->nErasedBlocks < dev->nReservedBlocks
--	    && dev->allocationPage == 0) {
-+			&& dev->allocationPage == 0) {
- 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
- 	}
- 
-@@ -2844,10 +2900,10 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 		bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
- 
- 		retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
--		    dev->allocationPage;
-+			dev->allocationPage;
- 		bi->pagesInUse++;
- 		yaffs_SetChunkBit(dev, dev->allocationBlock,
--				  dev->allocationPage);
-+				dev->allocationPage);
- 
- 		dev->allocationPage++;
- 
-@@ -2859,43 +2915,43 @@ static int yaffs_AllocateChunk(yaffs_Dev
- 			dev->allocationBlock = -1;
- 		}
- 
--		if(blockUsedPtr)
-+		if (blockUsedPtr)
- 			*blockUsedPtr = bi;
- 
- 		return retVal;
- 	}
- 
- 	T(YAFFS_TRACE_ERROR,
--	  (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-+			(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
- 
- 	return -1;
- }
- 
--static int yaffs_GetErasedChunks(yaffs_Device * dev)
-+static int yaffs_GetErasedChunks(yaffs_Device *dev)
- {
- 	int n;
- 
- 	n = dev->nErasedBlocks * dev->nChunksPerBlock;
- 
--	if (dev->allocationBlock > 0) {
-+	if (dev->allocationBlock > 0)
- 		n += (dev->nChunksPerBlock - dev->allocationPage);
--	}
- 
- 	return n;
- 
- }
- 
--static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
-+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
-+		int wholeBlock)
- {
- 	int oldChunk;
- 	int newChunk;
--	int chunkInBlock;
- 	int markNAND;
- 	int retVal = YAFFS_OK;
- 	int cleanups = 0;
- 	int i;
- 	int isCheckpointBlock;
- 	int matchingChunk;
-+	int maxCopies;
- 
- 	int chunksBefore = yaffs_GetErasedChunks(dev);
- 	int chunksAfter;
-@@ -2911,8 +2967,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 	bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
- 
- 	T(YAFFS_TRACE_TRACING,
--	  (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
--	   bi->pagesInUse, bi->hasShrinkHeader));
-+			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-+			 block,
-+			 bi->pagesInUse,
-+			 bi->hasShrinkHeader,
-+			 wholeBlock));
- 
- 	/*yaffs_VerifyFreeChunks(dev); */
- 
-@@ -2926,26 +2985,33 @@ static int yaffs_GarbageCollectBlock(yaf
- 	dev->isDoingGC = 1;
- 
- 	if (isCheckpointBlock ||
--	    !yaffs_StillSomeChunkBits(dev, block)) {
-+			!yaffs_StillSomeChunkBits(dev, block)) {
- 		T(YAFFS_TRACE_TRACING,
--		  (TSTR
--		   ("Collecting block %d that has no chunks in use" TENDSTR),
--		   block));
-+				(TSTR
-+				 ("Collecting block %d that has no chunks in use" TENDSTR),
-+				 block));
- 		yaffs_BlockBecameDirty(dev, block);
- 	} else {
- 
- 		__u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		yaffs_VerifyBlock(dev,bi,block);
-+		yaffs_VerifyBlock(dev, bi, block);
- 
--		for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
--		     chunkInBlock < dev->nChunksPerBlock
--		     && yaffs_StillSomeChunkBits(dev, block);
--		     chunkInBlock++, oldChunk++) {
--			if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
-+		maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
-+		oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-+
-+		for (/* init already done */;
-+		     retVal == YAFFS_OK &&
-+		     dev->gcChunk < dev->nChunksPerBlock &&
-+		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
-+		     maxCopies > 0;
-+		     dev->gcChunk++, oldChunk++) {
-+			if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
- 
- 				/* This page is in use and might need to be copied off */
- 
-+				maxCopies--;
-+
- 				markNAND = 1;
- 
- 				yaffs_InitialiseTags(&tags);
-@@ -2959,22 +3025,22 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 				T(YAFFS_TRACE_GC_DETAIL,
- 				  (TSTR
--				   ("Collecting page %d, %d %d %d " TENDSTR),
--				   chunkInBlock, tags.objectId, tags.chunkId,
-+				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-+				   dev->gcChunk, tags.objectId, tags.chunkId,
- 				   tags.byteCount));
- 
--				if(object && !yaffs_SkipVerification(dev)){
--					if(tags.chunkId == 0)
--						matchingChunk = object->chunkId;
--					else if(object->softDeleted)
-+				if (object && !yaffs_SkipVerification(dev)) {
-+					if (tags.chunkId == 0)
-+						matchingChunk = object->hdrChunk;
-+					else if (object->softDeleted)
- 						matchingChunk = oldChunk; /* Defeat the test */
- 					else
--						matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-+						matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
- 
--					if(oldChunk != matchingChunk)
-+					if (oldChunk != matchingChunk)
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
--						  oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-+						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
- 
- 				}
- 
-@@ -2986,9 +3052,11 @@ static int yaffs_GarbageCollectBlock(yaf
- 					    tags.objectId, tags.chunkId, tags.byteCount));
- 				}
- 
--				if (object && object->deleted
--				    && tags.chunkId != 0) {
--					/* Data chunk in a deleted file, throw it away
-+				if (object &&
-+				    object->deleted &&
-+				    object->softDeleted &&
-+				    tags.chunkId != 0) {
-+					/* Data chunk in a soft deleted file, throw it away
- 					 * It's a soft deleted data chunk,
- 					 * No need to copy this, just forget about it and
- 					 * fix up the object.
-@@ -3003,13 +3071,12 @@ static int yaffs_GarbageCollectBlock(yaf
- 						cleanups++;
- 					}
- 					markNAND = 0;
--				} else if (0
--					   /* Todo object && object->deleted && object->nDataChunks == 0 */
--					   ) {
-+				} else if (0) {
-+					/* Todo object && object->deleted && object->nDataChunks == 0 */
- 					/* Deleted object header with no data chunks.
- 					 * Can be discarded and the file deleted.
- 					 */
--					object->chunkId = 0;
-+					object->hdrChunk = 0;
- 					yaffs_FreeTnode(object->myDev,
- 							object->variant.
- 							fileVariant.top);
-@@ -3031,17 +3098,14 @@ static int yaffs_GarbageCollectBlock(yaf
- 						 * We need to nuke the shrinkheader flags first
- 						 * We no longer want the shrinkHeader flag since its work is done
- 						 * and if it is left in place it will mess up scanning.
--						 * Also, clear out any shadowing stuff
- 						 */
- 
- 						yaffs_ObjectHeader *oh;
- 						oh = (yaffs_ObjectHeader *)buffer;
- 						oh->isShrink = 0;
--						oh->shadowsObject = -1;
--						tags.extraShadows = 0;
- 						tags.extraIsShrinkHeader = 0;
- 
--						yaffs_VerifyObjectHeader(object,oh,&tags,1);
-+						yaffs_VerifyObjectHeader(object, oh, &tags, 1);
- 					}
- 
- 					newChunk =
-@@ -3055,7 +3119,7 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 						if (tags.chunkId == 0) {
- 							/* It's a header */
--							object->chunkId =  newChunk;
-+							object->hdrChunk =  newChunk;
- 							object->serial =   tags.serialNumber;
- 						} else {
- 							/* It's a data chunk */
-@@ -3067,7 +3131,8 @@ static int yaffs_GarbageCollectBlock(yaf
- 					}
- 				}
- 
--				yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
-+				if (retVal == YAFFS_OK)
-+					yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
- 
- 			}
- 		}
-@@ -3098,18 +3163,25 @@ static int yaffs_GarbageCollectBlock(yaf
- 
- 	}
- 
--	yaffs_VerifyCollectedBlock(dev,bi,block);
-+	yaffs_VerifyCollectedBlock(dev, bi, block);
- 
--	if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
-+	chunksAfter = yaffs_GetErasedChunks(dev);
-+	if (chunksBefore >= chunksAfter) {
- 		T(YAFFS_TRACE_GC,
- 		  (TSTR
- 		   ("gc did not increase free chunks before %d after %d"
- 		    TENDSTR), chunksBefore, chunksAfter));
- 	}
- 
-+	/* If the gc completed then clear the current gcBlock so that we find another. */
-+	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
-+		dev->gcBlock = -1;
-+		dev->gcChunk = 0;
-+	}
-+
- 	dev->isDoingGC = 0;
- 
--	return YAFFS_OK;
-+	return retVal;
- }
- 
- /* New garbage collector
-@@ -3121,7 +3193,7 @@ static int yaffs_GarbageCollectBlock(yaf
-  * The idea is to help clear out space in a more spread-out manner.
-  * Dunno if it really does anything useful.
-  */
--static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
-+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
- {
- 	int block;
- 	int aggressive;
-@@ -3142,8 +3214,8 @@ static int yaffs_CheckGarbageCollection(
- 	do {
- 		maxTries++;
- 
--		checkpointBlockAdjust = (dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint);
--		if(checkpointBlockAdjust < 0)
-+		checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+		if (checkpointBlockAdjust < 0)
- 			checkpointBlockAdjust = 0;
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
-@@ -3154,20 +3226,24 @@ static int yaffs_CheckGarbageCollection(
- 			aggressive = 0;
- 		}
- 
--		block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+		if (dev->gcBlock <= 0) {
-+			dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
-+			dev->gcChunk = 0;
-+		}
-+
-+		block = dev->gcBlock;
- 
- 		if (block > 0) {
- 			dev->garbageCollections++;
--			if (!aggressive) {
-+			if (!aggressive)
- 				dev->passiveGarbageCollections++;
--			}
- 
- 			T(YAFFS_TRACE_GC,
- 			  (TSTR
- 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
- 			   dev->nErasedBlocks, aggressive));
- 
--			gcOk = yaffs_GarbageCollectBlock(dev, block);
-+			gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
- 		}
- 
- 		if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
-@@ -3176,15 +3252,16 @@ static int yaffs_CheckGarbageCollection(
- 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
- 			    TENDSTR), dev->nErasedBlocks, maxTries, block));
- 		}
--	} while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
--		 && (maxTries < 2));
-+	} while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
-+		 (block > 0) &&
-+		 (maxTries < 2));
- 
- 	return aggressive ? gcOk : YAFFS_OK;
- }
- 
- /*-------------------------  TAGS --------------------------------*/
- 
--static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
- 			   int chunkInObject)
- {
- 	return (tags->chunkId == chunkInObject &&
-@@ -3195,8 +3272,8 @@ static int yaffs_TagsMatch(const yaffs_E
- 
- /*-------------------- Data file manipulation -----------------*/
- 
--static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
--				 yaffs_ExtendedTags * tags)
-+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
-+				 yaffs_ExtendedTags *tags)
- {
- 	/*Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3214,7 +3291,7 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
- 
- 	if (tn) {
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
-@@ -3223,8 +3300,8 @@ static int yaffs_FindChunkInFile(yaffs_O
- 	return retVal;
- }
- 
--static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
--					  yaffs_ExtendedTags * tags)
-+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
-+					  yaffs_ExtendedTags *tags)
- {
- 	/* Get the Tnode, then get the level 0 offset chunk offset */
- 	yaffs_Tnode *tn;
-@@ -3243,29 +3320,23 @@ static int yaffs_FindAndDeleteChunkInFil
- 
- 	if (tn) {
- 
--		theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+		theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 		retVal =
- 		    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
- 					   chunkInInode);
- 
- 		/* Delete the entry in the filestructure (if found) */
--		if (retVal != -1) {
--			yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
--		}
--	} else {
--		/*T(("No level 0 found for %d\n", chunkInInode)); */
-+		if (retVal != -1)
-+			yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
- 	}
- 
--	if (retVal == -1) {
--		/* T(("Could not find %d to delete\n",chunkInInode)); */
--	}
- 	return retVal;
- }
- 
- #ifdef YAFFS_PARANOID
- 
--static int yaffs_CheckFileSanity(yaffs_Object * in)
-+static int yaffs_CheckFileSanity(yaffs_Object *in)
- {
- 	int chunk;
- 	int nChunks;
-@@ -3278,10 +3349,8 @@ static int yaffs_CheckFileSanity(yaffs_O
- 	int theChunk;
- 	int chunkDeleted;
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		/* T(("Object not a file\n")); */
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- 		return YAFFS_FAIL;
--	}
- 
- 	objId = in->objectId;
- 	fSize = in->variant.fileVariant.fileSize;
-@@ -3294,7 +3363,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- 		if (tn) {
- 
--			theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
-+			theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
- 
- 			if (yaffs_CheckChunkBits
- 			    (dev, theChunk / dev->nChunksPerBlock,
-@@ -3323,7 +3392,7 @@ static int yaffs_CheckFileSanity(yaffs_O
- 
- #endif
- 
--static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
-+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
- 				  int chunkInNAND, int inScan)
- {
- 	/* NB inScan is zero unless scanning.
-@@ -3358,11 +3427,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 					&in->variant.fileVariant,
- 					chunkInInode,
- 					NULL);
--	if (!tn) {
-+	if (!tn)
- 		return YAFFS_FAIL;
--	}
- 
--	existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
-+	existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
- 
- 	if (inScan != 0) {
- 		/* If we're scanning then we need to test for duplicates
-@@ -3374,7 +3442,7 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 		 * Update: For backward scanning we don't need to re-read tags so this is quite cheap.
- 		 */
- 
--		if (existingChunk != 0) {
-+		if (existingChunk > 0) {
- 			/* NB Right now existing chunk will not be real chunkId if the device >= 32MB
- 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
- 			 *
-@@ -3411,8 +3479,10 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 			 * not be loaded during a scan
- 			 */
- 
--			newSerial = newTags.serialNumber;
--			existingSerial = existingTags.serialNumber;
-+			if (inScan > 0) {
-+				newSerial = newTags.serialNumber;
-+				existingSerial = existingTags.serialNumber;
-+			}
- 
- 			if ((inScan > 0) &&
- 			    (in->myDev->isYaffs2 ||
-@@ -3437,24 +3507,23 @@ static int yaffs_PutChunkIntoFile(yaffs_
- 
- 	}
- 
--	if (existingChunk == 0) {
-+	if (existingChunk == 0)
- 		in->nDataChunks++;
--	}
- 
--	yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
-+	yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
- 
- 	return YAFFS_OK;
- }
- 
--static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
--					 __u8 * buffer)
-+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
-+					__u8 *buffer)
- {
- 	int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
- 
--	if (chunkInNAND >= 0) {
-+	if (chunkInNAND >= 0)
- 		return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
--						       buffer,NULL);
--	} else {
-+						buffer, NULL);
-+	else {
- 		T(YAFFS_TRACE_NANDACCESS,
- 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
- 		   chunkInNAND));
-@@ -3465,7 +3534,7 @@ static int yaffs_ReadChunkDataFromObject
- 
- }
- 
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
- {
- 	int block;
- 	int page;
-@@ -3475,16 +3544,15 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 	if (chunkId <= 0)
- 		return;
- 
--
- 	dev->nDeletions++;
- 	block = chunkId / dev->nChunksPerBlock;
- 	page = chunkId % dev->nChunksPerBlock;
- 
- 
--	if(!yaffs_CheckChunkBit(dev,block,page))
-+	if (!yaffs_CheckChunkBit(dev, block, page))
- 		T(YAFFS_TRACE_VERIFY,
--		 	(TSTR("Deleting invalid chunk %d"TENDSTR),
--		 	 chunkId));
-+			(TSTR("Deleting invalid chunk %d"TENDSTR),
-+			 chunkId));
- 
- 	bi = yaffs_GetBlockInfo(dev, block);
- 
-@@ -3524,14 +3592,12 @@ void yaffs_DeleteChunk(yaffs_Device * de
- 			yaffs_BlockBecameDirty(dev, block);
- 		}
- 
--	} else {
--		/* T(("Bad news deleting chunk %d\n",chunkId)); */
- 	}
- 
- }
- 
--static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
--					const __u8 * buffer, int nBytes,
-+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
-+					const __u8 *buffer, int nBytes,
- 					int useReserve)
- {
- 	/* Find old chunk Need to do this to get serial number
-@@ -3561,6 +3627,12 @@ static int yaffs_WriteChunkDataToObject(
- 	    (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
- 	newTags.byteCount = nBytes;
- 
-+	if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
-+		T(YAFFS_TRACE_ERROR,
-+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-+		YBUG();
-+	}
-+
- 	newChunkId =
- 	    yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
- 					      useReserve);
-@@ -3568,11 +3640,9 @@ static int yaffs_WriteChunkDataToObject(
- 	if (newChunkId >= 0) {
- 		yaffs_PutChunkIntoFile(in, chunkInInode, newChunkId, 0);
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId >= 0)
- 			yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
- 
--		}
--
- 		yaffs_CheckFileSanity(in);
- 	}
- 	return newChunkId;
-@@ -3582,7 +3652,7 @@ static int yaffs_WriteChunkDataToObject(
- /* UpdateObjectHeader updates the header on NAND for an object.
-  * If name is not NULL, then that new name is used.
-  */
--int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
-+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
- 			     int isShrink, int shadows)
- {
- 
-@@ -3603,9 +3673,12 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 	yaffs_ObjectHeader *oh = NULL;
- 
--	yaffs_strcpy(oldName,"silly old name");
-+	yaffs_strcpy(oldName, _Y("silly old name"));
- 
--	if (!in->fake || force) {
-+
-+	if (!in->fake ||
-+		in == dev->rootDir || /* The rootDir should also be saved */
-+		force) {
- 
- 		yaffs_CheckGarbageCollection(dev);
- 		yaffs_CheckObjectDetailsLoaded(in);
-@@ -3613,13 +3686,13 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		buffer = yaffs_GetTempBuffer(in->myDev, __LINE__);
- 		oh = (yaffs_ObjectHeader *) buffer;
- 
--		prevChunkId = in->chunkId;
-+		prevChunkId = in->hdrChunk;
- 
--		if (prevChunkId >= 0) {
-+		if (prevChunkId > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
- 							buffer, &oldTags);
- 
--			yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-+			yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
- 
- 			memcpy(oldName, oh->name, sizeof(oh->name));
- 		}
-@@ -3628,7 +3701,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		oh->type = in->variantType;
- 		oh->yst_mode = in->yst_mode;
--		oh->shadowsObject = shadows;
-+		oh->shadowsObject = oh->inbandShadowsObject = shadows;
- 
- #ifdef CONFIG_YAFFS_WINCE
- 		oh->win_atime[0] = in->win_atime[0];
-@@ -3645,20 +3718,18 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		oh->yst_ctime = in->yst_ctime;
- 		oh->yst_rdev = in->yst_rdev;
- #endif
--		if (in->parent) {
-+		if (in->parent)
- 			oh->parentObjectId = in->parent->objectId;
--		} else {
-+		else
- 			oh->parentObjectId = 0;
--		}
- 
- 		if (name && *name) {
- 			memset(oh->name, 0, sizeof(oh->name));
- 			yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
--		} else if (prevChunkId>=0) {
-+		} else if (prevChunkId >= 0)
- 			memcpy(oh->name, oldName, sizeof(oh->name));
--		} else {
-+		else
- 			memset(oh->name, 0, sizeof(oh->name));
--		}
- 
- 		oh->isShrink = isShrink;
- 
-@@ -3708,7 +3779,7 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
- 		newTags.extraObjectType = in->variantType;
- 
--		yaffs_VerifyObjectHeader(in,oh,&newTags,1);
-+		yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
- 
- 		/* Create new chunk in NAND */
- 		newChunkId =
-@@ -3717,20 +3788,20 @@ int yaffs_UpdateObjectHeader(yaffs_Objec
- 
- 		if (newChunkId >= 0) {
- 
--			in->chunkId = newChunkId;
-+			in->hdrChunk = newChunkId;
- 
- 			if (prevChunkId >= 0) {
- 				yaffs_DeleteChunk(dev, prevChunkId, 1,
- 						  __LINE__);
- 			}
- 
--			if(!yaffs_ObjectHasCachedWriteData(in))
-+			if (!yaffs_ObjectHasCachedWriteData(in))
- 				in->dirty = 0;
- 
- 			/* If this was a shrink, then mark the block that the chunk lives on */
- 			if (isShrink) {
- 				bi = yaffs_GetBlockInfo(in->myDev,
--							newChunkId /in->myDev->	nChunksPerBlock);
-+					newChunkId / in->myDev->nChunksPerBlock);
- 				bi->hasShrinkHeader = 1;
- 			}
- 
-@@ -3766,7 +3837,7 @@ static int yaffs_ObjectHasCachedWriteDat
- 	yaffs_ChunkCache *cache;
- 	int nCaches = obj->myDev->nShortOpCaches;
- 
--	for(i = 0; i < nCaches; i++){
-+	for (i = 0; i < nCaches; i++) {
- 		cache = &dev->srCache[i];
- 		if (cache->object == obj &&
- 		    cache->dirty)
-@@ -3777,7 +3848,7 @@ static int yaffs_ObjectHasCachedWriteDat
- }
- 
- 
--static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
-+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
- 	int lowest = -99;	/* Stop compiler whining. */
-@@ -3844,16 +3915,16 @@ void yaffs_FlushEntireDeviceCache(yaffs_
- 	 */
- 	do {
- 		obj = NULL;
--		for( i = 0; i < nCaches && !obj; i++) {
-+		for (i = 0; i < nCaches && !obj; i++) {
- 			if (dev->srCache[i].object &&
- 			    dev->srCache[i].dirty)
- 				obj = dev->srCache[i].object;
- 
- 		}
--		if(obj)
-+		if (obj)
- 			yaffs_FlushFilesChunkCache(obj);
- 
--	} while(obj);
-+	} while (obj);
- 
- }
- 
-@@ -3863,41 +3934,21 @@ void yaffs_FlushEntireDeviceCache(yaffs_
-  * Then look for the least recently used non-dirty one.
-  * Then look for the least recently used dirty one...., flush and look again.
-  */
--static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
- {
- 	int i;
--	int usage;
--	int theOne;
- 
- 	if (dev->nShortOpCaches > 0) {
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
- 			if (!dev->srCache[i].object)
- 				return &dev->srCache[i];
- 		}
-+	}
- 
--		return NULL;
-+	return NULL;
-+}
- 
--		theOne = -1;
--		usage = 0;	/* just to stop the compiler grizzling */
--
--		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (!dev->srCache[i].dirty &&
--			    ((dev->srCache[i].lastUse < usage && theOne >= 0) ||
--			     theOne < 0)) {
--				usage = dev->srCache[i].lastUse;
--				theOne = i;
--			}
--		}
--
--
--		return theOne >= 0 ? &dev->srCache[theOne] : NULL;
--	} else {
--		return NULL;
--	}
--
--}
--
--static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
-+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
- {
- 	yaffs_ChunkCache *cache;
- 	yaffs_Object *theObj;
-@@ -3927,8 +3978,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
- 				if (dev->srCache[i].object &&
- 				    !dev->srCache[i].locked &&
--				    (dev->srCache[i].lastUse < usage || !cache))
--				{
-+				    (dev->srCache[i].lastUse < usage || !cache)) {
- 					usage = dev->srCache[i].lastUse;
- 					theObj = dev->srCache[i].object;
- 					cache = &dev->srCache[i];
-@@ -3950,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunk
- }
- 
- /* Find a cached chunk */
--static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
-+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
- 					      int chunkId)
- {
- 	yaffs_Device *dev = obj->myDev;
-@@ -3969,7 +4019,7 @@ static yaffs_ChunkCache *yaffs_FindChunk
- }
- 
- /* Mark the chunk for the least recently used algorithym */
--static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
-+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
- 				int isAWrite)
- {
- 
-@@ -3977,9 +4027,9 @@ static void yaffs_UseChunkCache(yaffs_De
- 		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
- 			/* Reset the cache usages */
- 			int i;
--			for (i = 1; i < dev->nShortOpCaches; i++) {
-+			for (i = 1; i < dev->nShortOpCaches; i++)
- 				dev->srCache[i].lastUse = 0;
--			}
-+
- 			dev->srLastUse = 0;
- 		}
- 
-@@ -3987,9 +4037,8 @@ static void yaffs_UseChunkCache(yaffs_De
- 
- 		cache->lastUse = dev->srLastUse;
- 
--		if (isAWrite) {
-+		if (isAWrite)
- 			cache->dirty = 1;
--		}
- 	}
- }
- 
-@@ -3997,21 +4046,20 @@ static void yaffs_UseChunkCache(yaffs_De
-  * Do this when a whole page gets written,
-  * ie the short cache for this page is no longer valid.
-  */
--static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
-+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
- {
- 	if (object->myDev->nShortOpCaches > 0) {
- 		yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
- 
--		if (cache) {
-+		if (cache)
- 			cache->object = NULL;
--		}
- 	}
- }
- 
- /* Invalidate all the cache pages associated with this object
-  * Do this whenever ther file is deleted or resized.
-  */
--static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
-+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
-@@ -4019,9 +4067,8 @@ static void yaffs_InvalidateWholeChunkCa
- 	if (dev->nShortOpCaches > 0) {
- 		/* Invalidate it. */
- 		for (i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].object == in) {
-+			if (dev->srCache[i].object == in)
- 				dev->srCache[i].object = NULL;
--			}
- 		}
- 	}
- }
-@@ -4029,18 +4076,18 @@ static void yaffs_InvalidateWholeChunkCa
- /*--------------------- Checkpointing --------------------*/
- 
- 
--static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
-+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
- {
- 	yaffs_CheckpointValidity cp;
- 
--	memset(&cp,0,sizeof(cp));
-+	memset(&cp, 0, sizeof(cp));
- 
- 	cp.structType = sizeof(cp);
- 	cp.magic = YAFFS_MAGIC;
- 	cp.version = YAFFS_CHECKPOINT_VERSION;
- 	cp.head = (head) ? 1 : 0;
- 
--	return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
-+	return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
- 		1 : 0;
- }
- 
-@@ -4049,9 +4096,9 @@ static int yaffs_ReadCheckpointValidityM
- 	yaffs_CheckpointValidity cp;
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--	if(ok)
-+	if (ok)
- 		ok = (cp.structType == sizeof(cp)) &&
- 		     (cp.magic == YAFFS_MAGIC) &&
- 		     (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-@@ -4100,21 +4147,21 @@ static int yaffs_WriteCheckpointDevice(y
- 	int ok;
- 
- 	/* Write device runtime values*/
--	yaffs_DeviceToCheckpointDevice(&cp,dev);
-+	yaffs_DeviceToCheckpointDevice(&cp, dev);
- 	cp.structType = sizeof(cp);
- 
--	ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	/* Write block info */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * sizeof(yaffs_BlockInfo);
--		ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
- 	}
- 
- 	/* Write chunk bits */
--	if(ok) {
-+	if (ok) {
- 		nBytes = nBlocks * dev->chunkBitmapStride;
--		ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
-+		ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
- 	}
- 	return	 ok ? 1 : 0;
- 
-@@ -4128,25 +4175,25 @@ static int yaffs_ReadCheckpointDevice(ya
- 
- 	int ok;
- 
--	ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--	if(!ok)
-+	ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+	if (!ok)
- 		return 0;
- 
--	if(cp.structType != sizeof(cp))
-+	if (cp.structType != sizeof(cp))
- 		return 0;
- 
- 
--	yaffs_CheckpointDeviceToDevice(dev,&cp);
-+	yaffs_CheckpointDeviceToDevice(dev, &cp);
- 
- 	nBytes = nBlocks * sizeof(yaffs_BlockInfo);
- 
--	ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 	nBytes = nBlocks * dev->chunkBitmapStride;
- 
--	ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-+	ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4157,7 +4204,7 @@ static void yaffs_ObjectToCheckpointObje
- 
- 	cp->objectId = obj->objectId;
- 	cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
--	cp->chunkId = obj->chunkId;
-+	cp->hdrChunk = obj->hdrChunk;
- 	cp->variantType = obj->variantType;
- 	cp->deleted = obj->deleted;
- 	cp->softDeleted = obj->softDeleted;
-@@ -4168,20 +4215,28 @@ static void yaffs_ObjectToCheckpointObje
- 	cp->serial = obj->serial;
- 	cp->nDataChunks = obj->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
- }
- 
--static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
-+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
- {
- 
- 	yaffs_Object *parent;
- 
-+	if (obj->variantType != cp->variantType) {
-+		T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-+			TCONT("chunk %d does not match existing object type %d")
-+			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-+			obj->variantType));
-+		return 0;
-+	}
-+
- 	obj->objectId = cp->objectId;
- 
--	if(cp->parentId)
-+	if (cp->parentId)
- 		parent = yaffs_FindOrCreateObjectByNumber(
- 					obj->myDev,
- 					cp->parentId,
-@@ -4189,10 +4244,19 @@ static void yaffs_CheckpointObjectToObje
- 	else
- 		parent = NULL;
- 
--	if(parent)
-+	if (parent) {
-+		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-+				TCONT(" chunk %d Parent type, %d, not directory")
-+				TENDSTR),
-+				cp->objectId, cp->parentId, cp->variantType,
-+				cp->hdrChunk, parent->variantType));
-+			return 0;
-+		}
- 		yaffs_AddObjectToDirectory(parent, obj);
-+	}
- 
--	obj->chunkId = cp->chunkId;
-+	obj->hdrChunk = cp->hdrChunk;
- 	obj->variantType = cp->variantType;
- 	obj->deleted = cp->deleted;
- 	obj->softDeleted = cp->softDeleted;
-@@ -4203,29 +4267,34 @@ static void yaffs_CheckpointObjectToObje
- 	obj->serial = cp->serial;
- 	obj->nDataChunks = cp->nDataChunks;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
--	else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-+	else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
- 		obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
- 
--	if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
-+	if (obj->hdrChunk > 0)
- 		obj->lazyLoaded = 1;
-+	return 1;
- }
- 
- 
- 
--static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
--				  	__u32 level, int chunkOffset)
-+static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-+					__u32 level, int chunkOffset)
- {
- 	int i;
- 	yaffs_Device *dev = in->myDev;
- 	int ok = 1;
--	int nTnodeBytes = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-+
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
-+
- 
- 	if (tn) {
- 		if (level > 0) {
- 
--			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
-+			for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- 				if (tn->internal[i]) {
- 					ok = yaffs_CheckpointTnodeWorker(in,
- 							tn->internal[i],
-@@ -4235,10 +4304,9 @@ static int yaffs_CheckpointTnodeWorker(y
- 			}
- 		} else if (level == 0) {
- 			__u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
--			/* printf("write tnode at %d\n",baseOffset); */
--			ok = (yaffs_CheckpointWrite(dev,&baseOffset,sizeof(baseOffset)) == sizeof(baseOffset));
--			if(ok)
--				ok = (yaffs_CheckpointWrite(dev,tn,nTnodeBytes) == nTnodeBytes);
-+			ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-+			if (ok)
-+				ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
- 		}
- 	}
- 
-@@ -4251,13 +4319,13 @@ static int yaffs_WriteCheckpointTnodes(y
- 	__u32 endMarker = ~0;
- 	int ok = 1;
- 
--	if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 		ok = yaffs_CheckpointTnodeWorker(obj,
- 					    obj->variant.fileVariant.top,
- 					    obj->variant.fileVariant.topLevel,
- 					    0);
--		if(ok)
--			ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
-+		if (ok)
-+			ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
- 				sizeof(endMarker));
- 	}
- 
-@@ -4272,38 +4340,38 @@ static int yaffs_ReadCheckpointTnodes(ya
- 	yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
- 	yaffs_Tnode *tn;
- 	int nread = 0;
-+	int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
- 
--	ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+	if (tnodeSize < sizeof(yaffs_Tnode))
-+		tnodeSize = sizeof(yaffs_Tnode);
- 
--	while(ok && (~baseChunk)){
-+	ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
-+
-+	while (ok && (~baseChunk)) {
- 		nread++;
- 		/* Read level 0 tnode */
- 
- 
--		/* printf("read  tnode at %d\n",baseChunk); */
- 		tn = yaffs_GetTnodeRaw(dev);
--		if(tn)
--			ok = (yaffs_CheckpointRead(dev,tn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8) ==
--			      (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-+		if (tn)
-+			ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
- 		else
- 			ok = 0;
- 
--		if(tn && ok){
-+		if (tn && ok)
- 			ok = yaffs_AddOrFindLevel0Tnode(dev,
--					       		fileStructPtr,
--					       		baseChunk,
--					       		tn) ? 1 : 0;
-+							fileStructPtr,
-+							baseChunk,
-+							tn) ? 1 : 0;
- 
--		}
--
--		if(ok)
--			ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-+		if (ok)
-+			ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
- 
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(
-+	T(YAFFS_TRACE_CHECKPOINT, (
- 		TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
--		nread,baseChunk,ok));
-+		nread, baseChunk, ok));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4315,41 +4383,40 @@ static int yaffs_WriteCheckpointObjects(
- 	yaffs_CheckpointObject cp;
- 	int i;
- 	int ok = 1;
--	struct list_head *lh;
-+	struct ylist_head *lh;
- 
- 
- 	/* Iterate through the objects in each hash entry,
- 	 * dumping them to the checkpointing stream.
- 	 */
- 
--	 for(i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++){
--	 	list_for_each(lh, &dev->objectBucket[i].list) {
-+	for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-+		ylist_for_each(lh, &dev->objectBucket[i].list) {
- 			if (lh) {
--				obj = list_entry(lh, yaffs_Object, hashLink);
-+				obj = ylist_entry(lh, yaffs_Object, hashLink);
- 				if (!obj->deferedFree) {
--					yaffs_ObjectToCheckpointObject(&cp,obj);
-+					yaffs_ObjectToCheckpointObject(&cp, obj);
- 					cp.structType = sizeof(cp);
- 
--					T(YAFFS_TRACE_CHECKPOINT,(
-+					T(YAFFS_TRACE_CHECKPOINT, (
- 						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
--						cp.objectId,cp.parentId,cp.variantType,cp.chunkId,(unsigned) obj));
-+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
- 
--					ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
--					if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
-+					if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 						ok = yaffs_WriteCheckpointTnodes(obj);
--					}
- 				}
- 			}
- 		}
--	 }
-+	}
- 
--	 /* Dump end of list */
--	memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
-+	/* Dump end of list */
-+	memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
- 	cp.structType = sizeof(cp);
- 
--	if(ok)
--		ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-+	if (ok)
-+		ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
- 
- 	return ok ? 1 : 0;
- }
-@@ -4362,38 +4429,39 @@ static int yaffs_ReadCheckpointObjects(y
- 	int done = 0;
- 	yaffs_Object *hardList = NULL;
- 
--	while(ok && !done) {
--		ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
--		if(cp.structType != sizeof(cp)) {
--			T(YAFFS_TRACE_CHECKPOINT,(TSTR("struct size %d instead of %d ok %d"TENDSTR),
--				cp.structType,sizeof(cp),ok));
-+	while (ok && !done) {
-+		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-+		if (cp.structType != sizeof(cp)) {
-+			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-+				cp.structType, sizeof(cp), ok));
- 			ok = 0;
- 		}
- 
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
--			cp.objectId,cp.parentId,cp.variantType,cp.chunkId));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-+			cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
- 
--		if(ok && cp.objectId == ~0)
-+		if (ok && cp.objectId == ~0)
- 			done = 1;
--		else if(ok){
--			obj = yaffs_FindOrCreateObjectByNumber(dev,cp.objectId, cp.variantType);
--			if(obj) {
--				yaffs_CheckpointObjectToObject(obj,&cp);
--				if(obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+		else if (ok) {
-+			obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-+			if (obj) {
-+				ok = yaffs_CheckpointObjectToObject(obj, &cp);
-+				if (!ok)
-+					break;
-+				if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
- 					ok = yaffs_ReadCheckpointTnodes(obj);
--				} else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-+				} else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 					obj->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+						(struct ylist_head *) hardList;
- 					hardList = obj;
- 				}
--
--			}
-+			} else
-+				ok = 0;
- 		}
- 	}
- 
--	if(ok)
--		yaffs_HardlinkFixup(dev,hardList);
-+	if (ok)
-+		yaffs_HardlinkFixup(dev, hardList);
- 
- 	return ok ? 1 : 0;
- }
-@@ -4403,11 +4471,11 @@ static int yaffs_WriteCheckpointSum(yaff
- 	__u32 checkpointSum;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum);
- 
--	ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-+	ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
- 	return 1;
-@@ -4419,14 +4487,14 @@ static int yaffs_ReadCheckpointSum(yaffs
- 	__u32 checkpointSum1;
- 	int ok;
- 
--	yaffs_GetCheckpointSum(dev,&checkpointSum0);
-+	yaffs_GetCheckpointSum(dev, &checkpointSum0);
- 
--	ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-+	ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
- 
--	if(!ok)
-+	if (!ok)
- 		return 0;
- 
--	if(checkpointSum0 != checkpointSum1)
-+	if (checkpointSum0 != checkpointSum1)
- 		return 0;
- 
- 	return 1;
-@@ -4435,46 +4503,43 @@ static int yaffs_ReadCheckpointSum(yaffs
- 
- static int yaffs_WriteCheckpointData(yaffs_Device *dev)
- {
--
- 	int ok = 1;
- 
--	if(dev->skipCheckpointWrite || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
-+	if (dev->skipCheckpointWrite || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,1);
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 1);
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
- 		ok = yaffs_WriteCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
- 		ok = yaffs_WriteCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
--		ok = yaffs_WriteCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-+		ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok)
- 		ok = yaffs_WriteCheckpointSum(dev);
--	}
--
- 
--	if(!yaffs_CheckpointClose(dev))
--		 ok = 0;
-+	if (!yaffs_CheckpointClose(dev))
-+		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return dev->isCheckpointed;
- }
-@@ -4483,43 +4548,43 @@ static int yaffs_ReadCheckpointData(yaff
- {
- 	int ok = 1;
- 
--	if(dev->skipCheckpointRead || !dev->isYaffs2){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
-+	if (dev->skipCheckpointRead || !dev->isYaffs2) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
- 		ok = 0;
- 	}
- 
--	if(ok)
--		ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-+	if (ok)
-+		ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
- 
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,1);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint device" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
- 		ok = yaffs_ReadCheckpointDevice(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
- 		ok = yaffs_ReadCheckpointObjects(dev);
- 	}
--	if(ok){
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
--		ok = yaffs_ReadCheckpointValidityMarker(dev,0);
-+	if (ok) {
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-+		ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
- 	}
- 
--	if(ok){
-+	if (ok) {
- 		ok = yaffs_ReadCheckpointSum(dev);
--		T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
-+		T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
- 	}
- 
--	if(!yaffs_CheckpointClose(dev))
-+	if (!yaffs_CheckpointClose(dev))
- 		ok = 0;
- 
--	if(ok)
--	    	dev->isCheckpointed = 1;
--	 else
--	 	dev->isCheckpointed = 0;
-+	if (ok)
-+		dev->isCheckpointed = 1;
-+	else
-+		dev->isCheckpointed = 0;
- 
- 	return ok ? 1 : 0;
- 
-@@ -4527,11 +4592,11 @@ static int yaffs_ReadCheckpointData(yaff
- 
- static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
- {
--	if(dev->isCheckpointed ||
--	   dev->blocksInCheckpoint > 0){
-+	if (dev->isCheckpointed ||
-+			dev->blocksInCheckpoint > 0) {
- 		dev->isCheckpointed = 0;
- 		yaffs_CheckpointInvalidateStream(dev);
--		if(dev->superBlock && dev->markSuperBlockDirty)
-+		if (dev->superBlock && dev->markSuperBlockDirty)
- 			dev->markSuperBlockDirty(dev->superBlock);
- 	}
- }
-@@ -4540,18 +4605,18 @@ static void yaffs_InvalidateCheckpoint(y
- int yaffs_CheckpointSave(yaffs_Device *dev)
- {
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	yaffs_VerifyObjects(dev);
- 	yaffs_VerifyBlocks(dev);
- 	yaffs_VerifyFreeChunks(dev);
- 
--	if(!dev->isCheckpointed) {
-+	if (!dev->isCheckpointed) {
- 		yaffs_InvalidateCheckpoint(dev);
- 		yaffs_WriteCheckpointData(dev);
- 	}
- 
--	T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return dev->isCheckpointed;
- }
-@@ -4559,17 +4624,17 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev)
- {
- 	int retval;
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	retval = yaffs_ReadCheckpointData(dev);
- 
--	if(dev->isCheckpointed){
-+	if (dev->isCheckpointed) {
- 		yaffs_VerifyObjects(dev);
- 		yaffs_VerifyBlocks(dev);
- 		yaffs_VerifyFreeChunks(dev);
- 	}
- 
--	T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-+	T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
- 
- 	return retval;
- }
-@@ -4584,12 +4649,12 @@ int yaffs_CheckpointRestore(yaffs_Device
-  * Curve-balls: the first chunk might also be the last chunk.
-  */
- 
--int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
--			   int nBytes)
-+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-+			int nBytes)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	dev = in->myDev;
- 
- 	while (n > 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
- 		 * the same chunk.
- 		 */
--		if ((start + n) < dev->nDataBytesPerChunk) {
-+		if ((start + n) < dev->nDataBytesPerChunk)
- 			nToCopy = n;
--		} else {
-+		else
- 			nToCopy = dev->nDataBytesPerChunk - start;
--		}
- 
- 		cache = yaffs_FindChunkCache(in, chunk);
- 
- 		/* If the chunk is already in the cache or it is less than a whole chunk
--		 * then use the cache (if there is caching)
-+		 * or we're using inband tags then use the cache (if there is caching)
- 		 * else bypass the cache.
- 		 */
--		if (cache || nToCopy != dev->nDataBytesPerChunk) {
-+		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
- 			if (dev->nShortOpCaches > 0) {
- 
- 				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 
- 				cache->locked = 1;
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &cache->data[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				cache->locked = 0;
- 			} else {
- 				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 				    yaffs_GetTempBuffer(dev, __LINE__);
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 				memcpy(buffer, &localBuffer[start], nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
-+
- 				yaffs_ReleaseTempBuffer(dev, localBuffer,
- 							__LINE__);
- 			}
- 
- 		} else {
--#ifdef CONFIG_YAFFS_WINCE
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			yaffs_ReadChunkDataFromObject(in, chunk, localBuffer);
--
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(buffer, localBuffer, dev->nDataBytesPerChunk);
- 
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#endif
--
--#else
- 			/* A full chunk. Read directly into the supplied buffer. */
- 			yaffs_ReadChunkDataFromObject(in, chunk, buffer);
--#endif
-+
- 		}
- 
- 		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
- 	return nDone;
- }
- 
--int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough)
-+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-+			int nBytes, int writeThrough)
- {
- 
- 	int chunk;
--	int start;
-+	__u32 start;
- 	int nToCopy;
- 	int n = nBytes;
- 	int nDone = 0;
- 	int nToWriteBack;
- 	int startOfWrite = offset;
- 	int chunkWritten = 0;
--	int nBytesRead;
-+	__u32 nBytesRead;
-+	__u32 chunkStart;
- 
- 	yaffs_Device *dev;
- 
- 	dev = in->myDev;
- 
- 	while (n > 0 && chunkWritten >= 0) {
--		//chunk = offset / dev->nDataBytesPerChunk + 1;
--		//start = offset % dev->nDataBytesPerChunk;
--		yaffs_AddrToChunk(dev,offset,&chunk,&start);
-+		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-+		/* start = offset % dev->nDataBytesPerChunk; */
-+		yaffs_AddrToChunk(dev, offset, &chunk, &start);
-+
-+		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-+				start >= dev->nDataBytesPerChunk) {
-+			T(YAFFS_TRACE_ERROR, (
-+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-+			   TENDSTR),
-+			   (int)offset, chunk, start));
-+		}
- 		chunk++;
- 
- 		/* OK now check for the curveball where the start and end are in
-@@ -4740,25 +4786,32 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			 * we need to write back as much as was there before.
- 			 */
- 
--			nBytesRead =
--			    in->variant.fileVariant.fileSize -
--			    ((chunk - 1) * dev->nDataBytesPerChunk);
-+			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-+
-+			if (chunkStart > in->variant.fileVariant.fileSize)
-+				nBytesRead = 0; /* Past end of file */
-+			else
-+				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
- 
--			if (nBytesRead > dev->nDataBytesPerChunk) {
-+			if (nBytesRead > dev->nDataBytesPerChunk)
- 				nBytesRead = dev->nDataBytesPerChunk;
--			}
- 
- 			nToWriteBack =
- 			    (nBytesRead >
- 			     (start + n)) ? nBytesRead : (start + n);
- 
-+			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-+				YBUG();
-+
- 		} else {
- 			nToCopy = dev->nDataBytesPerChunk - start;
- 			nToWriteBack = dev->nDataBytesPerChunk;
- 		}
- 
--		if (nToCopy != dev->nDataBytesPerChunk) {
--			/* An incomplete start or end chunk (or maybe both start and end chunk) */
-+		if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-+			/* An incomplete start or end chunk (or maybe both start and end chunk),
-+			 * or we're using inband tags, so we want to use the cache buffers.
-+			 */
- 			if (dev->nShortOpCaches > 0) {
- 				yaffs_ChunkCache *cache;
- 				/* If we can't find the data in the cache, then load the cache */
-@@ -4775,10 +4828,9 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 					yaffs_ReadChunkDataFromObject(in, chunk,
- 								      cache->
- 								      data);
--				}
--				else if(cache &&
--				        !cache->dirty &&
--					!yaffs_CheckSpaceForAllocation(in->myDev)){
-+				} else if (cache &&
-+					!cache->dirty &&
-+					!yaffs_CheckSpaceForAllocation(in->myDev)) {
- 					/* Drop the cache if it was a read cache item and
- 					 * no space check has been made for it.
- 					 */
-@@ -4788,16 +4840,12 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				if (cache) {
- 					yaffs_UseChunkCache(dev, cache, 1);
- 					cache->locked = 1;
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 					memcpy(&cache->data[start], buffer,
- 					       nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--					yfsd_LockYAFFS(TRUE);
--#endif
-+
- 					cache->locked = 0;
- 					cache->nBytes = nToWriteBack;
- 
-@@ -4825,15 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 				yaffs_ReadChunkDataFromObject(in, chunk,
- 							      localBuffer);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_UnlockYAFFS(TRUE);
--#endif
-+
- 
- 				memcpy(&localBuffer[start], buffer, nToCopy);
- 
--#ifdef CONFIG_YAFFS_WINCE
--				yfsd_LockYAFFS(TRUE);
--#endif
- 				chunkWritten =
- 				    yaffs_WriteChunkDataToObject(in, chunk,
- 								 localBuffer,
-@@ -4846,31 +4889,15 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 			}
- 
- 		} else {
--
--#ifdef CONFIG_YAFFS_WINCE
--			/* Under WinCE can't do direct transfer. Need to use a local buffer.
--			 * This is because we otherwise screw up WinCE's memory mapper
--			 */
--			__u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_UnlockYAFFS(TRUE);
--#endif
--			memcpy(localBuffer, buffer, dev->nDataBytesPerChunk);
--#ifdef CONFIG_YAFFS_WINCE
--			yfsd_LockYAFFS(TRUE);
--#endif
--			chunkWritten =
--			    yaffs_WriteChunkDataToObject(in, chunk, localBuffer,
--							 dev->nDataBytesPerChunk,
--							 0);
--			yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
--#else
- 			/* A full chunk. Write directly from the supplied buffer. */
-+
-+
-+
- 			chunkWritten =
- 			    yaffs_WriteChunkDataToObject(in, chunk, buffer,
- 							 dev->nDataBytesPerChunk,
- 							 0);
--#endif
-+
- 			/* Since we've overwritten the cached data, we better invalidate it. */
- 			yaffs_InvalidateChunkCache(in, chunk);
- 		}
-@@ -4886,9 +4913,8 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- 	/* Update file object */
- 
--	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize) {
-+	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
- 		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
--	}
- 
- 	in->dirty = 1;
- 
-@@ -4898,7 +4924,7 @@ int yaffs_WriteDataToFile(yaffs_Object *
- 
- /* ---------------------- File resizing stuff ------------------ */
- 
--static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
-+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
- {
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4939,11 +4965,11 @@ static void yaffs_PruneResizedChunks(yaf
- 
- }
- 
--int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
-+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
- {
- 
- 	int oldFileSize = in->variant.fileVariant.fileSize;
--	int newSizeOfPartialChunk;
-+	__u32 newSizeOfPartialChunk;
- 	int newFullChunks;
- 
- 	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 
- 	yaffs_CheckGarbageCollection(dev);
- 
--	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
--		return yaffs_GetFileSize(in);
--	}
-+	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-+		return YAFFS_FAIL;
- 
--	if (newSize == oldFileSize) {
--		return oldFileSize;
--	}
-+	if (newSize == oldFileSize)
-+		return YAFFS_OK;
- 
- 	if (newSize < oldFileSize) {
- 
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
- 	}
- 
- 
--
- 	/* Write a new object header.
- 	 * show we've shrunk the file, if need be
- 	 * Do this only if the file is not in the deleted directories.
- 	 */
--	if (in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
--	    in->parent->objectId != YAFFS_OBJECTID_DELETED) {
-+	if (in->parent &&
-+	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-+	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
- 		yaffs_UpdateObjectHeader(in, NULL, 0,
- 					 (newSize < oldFileSize) ? 1 : 0, 0);
--	}
- 
--	return newSize;
-+	return YAFFS_OK;
- }
- 
--loff_t yaffs_GetFileSize(yaffs_Object * obj)
-+loff_t yaffs_GetFileSize(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
- 
- 
- 
--int yaffs_FlushFile(yaffs_Object * in, int updateTime)
-+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
- {
- 	int retVal;
- 	if (in->dirty) {
-@@ -5039,9 +5062,8 @@ int yaffs_FlushFile(yaffs_Object * in, i
- #endif
- 		}
- 
--		retVal =
--		    (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
--		     0) ? YAFFS_OK : YAFFS_FAIL;
-+		retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-+			0) ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		retVal = YAFFS_OK;
- 	}
-@@ -5050,7 +5072,7 @@ int yaffs_FlushFile(yaffs_Object * in, i
- 
- }
- 
--static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
-+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
- {
- 
- 	/* First off, invalidate the file's data in the cache, without flushing. */
-@@ -5058,13 +5080,13 @@ static int yaffs_DoGenericObjectDeletion
- 
- 	if (in->myDev->isYaffs2 && (in->parent != in->myDev->deletedDir)) {
- 		/* Move to the unlinked directory so we have a record that it was deleted. */
--		yaffs_ChangeObjectName(in, in->myDev->deletedDir,"deleted", 0, 0);
-+		yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
- 
- 	}
- 
- 	yaffs_RemoveObjectFromDirectory(in);
--	yaffs_DeleteChunk(in->myDev, in->chunkId, 1, __LINE__);
--	in->chunkId = -1;
-+	yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-+	in->hdrChunk = 0;
- 
- 	yaffs_FreeObject(in);
- 	return YAFFS_OK;
-@@ -5075,62 +5097,63 @@ static int yaffs_DoGenericObjectDeletion
-  * and the inode associated with the file.
-  * It does not delete the links associated with the file.
-  */
--static int yaffs_UnlinkFile(yaffs_Object * in)
-+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
- {
- 
- 	int retVal;
- 	int immediateDeletion = 0;
- 
--	if (1) {
- #ifdef __KERNEL__
--		if (!in->myInode) {
--			immediateDeletion = 1;
--
--		}
-+	if (!in->myInode)
-+		immediateDeletion = 1;
- #else
--		if (in->inUse <= 0) {
--			immediateDeletion = 1;
--
--		}
-+	if (in->inUse <= 0)
-+		immediateDeletion = 1;
- #endif
--		if (immediateDeletion) {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
--						   "deleted", 0, 0);
--			T(YAFFS_TRACE_TRACING,
--			  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
--			   in->objectId));
--			in->deleted = 1;
--			in->myDev->nDeletedFiles++;
--			if (0 && in->myDev->isYaffs2) {
--				yaffs_ResizeFile(in, 0);
--			}
--			yaffs_SoftDeleteFile(in);
--		} else {
--			retVal =
--			    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
--						   "unlinked", 0, 0);
--		}
- 
-+	if (immediateDeletion) {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-+					   _Y("deleted"), 0, 0);
-+		T(YAFFS_TRACE_TRACING,
-+		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-+		   in->objectId));
-+		in->deleted = 1;
-+		in->myDev->nDeletedFiles++;
-+		if (1 || in->myDev->isYaffs2)
-+			yaffs_ResizeFile(in, 0);
-+		yaffs_SoftDeleteFile(in);
-+	} else {
-+		retVal =
-+		    yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- 	}
-+
-+
- 	return retVal;
- }
- 
--int yaffs_DeleteFile(yaffs_Object * in)
-+int yaffs_DeleteFile(yaffs_Object *in)
- {
- 	int retVal = YAFFS_OK;
-+	int deleted = in->deleted;
-+
-+	yaffs_ResizeFile(in, 0);
- 
- 	if (in->nDataChunks > 0) {
--		/* Use soft deletion if there is data in the file */
--		if (!in->unlinked) {
--			retVal = yaffs_UnlinkFile(in);
--		}
-+		/* Use soft deletion if there is data in the file.
-+		 * That won't be the case if it has been resized to zero.
-+		 */
-+		if (!in->unlinked)
-+			retVal = yaffs_UnlinkFileIfNeeded(in);
-+
- 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
- 			in->deleted = 1;
-+			deleted = 1;
- 			in->myDev->nDeletedFiles++;
- 			yaffs_SoftDeleteFile(in);
- 		}
--		return in->deleted ? YAFFS_OK : YAFFS_FAIL;
-+		return deleted ? YAFFS_OK : YAFFS_FAIL;
- 	} else {
- 		/* The file has no data chunks so we toss it immediately */
- 		yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-@@ -5141,62 +5164,75 @@ int yaffs_DeleteFile(yaffs_Object * in)
- 	}
- }
- 
--static int yaffs_DeleteDirectory(yaffs_Object * in)
-+static int yaffs_DeleteDirectory(yaffs_Object *in)
- {
- 	/* First check that the directory is empty. */
--	if (list_empty(&in->variant.directoryVariant.children)) {
-+	if (ylist_empty(&in->variant.directoryVariant.children))
- 		return yaffs_DoGenericObjectDeletion(in);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
- 
--static int yaffs_DeleteSymLink(yaffs_Object * in)
-+static int yaffs_DeleteSymLink(yaffs_Object *in)
- {
- 	YFREE(in->variant.symLinkVariant.alias);
- 
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static int yaffs_DeleteHardLink(yaffs_Object * in)
-+static int yaffs_DeleteHardLink(yaffs_Object *in)
- {
- 	/* remove this hardlink from the list assocaited with the equivalent
- 	 * object
- 	 */
--	list_del(&in->hardLinks);
-+	ylist_del_init(&in->hardLinks);
- 	return yaffs_DoGenericObjectDeletion(in);
- }
- 
--static void yaffs_DestroyObject(yaffs_Object * obj)
-+int yaffs_DeleteObject(yaffs_Object *obj)
- {
-+int retVal = -1;
- 	switch (obj->variantType) {
- 	case YAFFS_OBJECT_TYPE_FILE:
--		yaffs_DeleteFile(obj);
-+		retVal = yaffs_DeleteFile(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_DIRECTORY:
--		yaffs_DeleteDirectory(obj);
-+		return yaffs_DeleteDirectory(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SYMLINK:
--		yaffs_DeleteSymLink(obj);
-+		retVal = yaffs_DeleteSymLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_HARDLINK:
--		yaffs_DeleteHardLink(obj);
-+		retVal = yaffs_DeleteHardLink(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_SPECIAL:
--		yaffs_DoGenericObjectDeletion(obj);
-+		retVal = yaffs_DoGenericObjectDeletion(obj);
- 		break;
- 	case YAFFS_OBJECT_TYPE_UNKNOWN:
-+		retVal = 0;
- 		break;		/* should not happen. */
- 	}
-+
-+	return retVal;
- }
- 
--static int yaffs_UnlinkWorker(yaffs_Object * obj)
-+static int yaffs_UnlinkWorker(yaffs_Object *obj)
- {
- 
-+	int immediateDeletion = 0;
-+
-+#ifdef __KERNEL__
-+	if (!obj->myInode)
-+		immediateDeletion = 1;
-+#else
-+	if (obj->inUse <= 0)
-+		immediateDeletion = 1;
-+#endif
-+
- 	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		return yaffs_DeleteHardLink(obj);
--	} else if (!list_empty(&obj->hardLinks)) {
-+	} else if (!ylist_empty(&obj->hardLinks)) {
- 		/* Curve ball: We're unlinking an object that has a hardlink.
- 		 *
- 		 * This problem arises because we are not strictly following
-@@ -5215,24 +5251,24 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		int retVal;
- 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--		hl = list_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-+		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
- 
--		list_del_init(&hl->hardLinks);
--		list_del_init(&hl->siblings);
-+		ylist_del_init(&hl->hardLinks);
-+		ylist_del_init(&hl->siblings);
- 
- 		yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
- 
- 		retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
- 
--		if (retVal == YAFFS_OK) {
-+		if (retVal == YAFFS_OK)
- 			retVal = yaffs_DoGenericObjectDeletion(hl);
--		}
-+
- 		return retVal;
- 
--	} else {
-+	} else if (immediateDeletion) {
- 		switch (obj->variantType) {
- 		case YAFFS_OBJECT_TYPE_FILE:
--			return yaffs_UnlinkFile(obj);
-+			return yaffs_DeleteFile(obj);
- 			break;
- 		case YAFFS_OBJECT_TYPE_DIRECTORY:
- 			return yaffs_DeleteDirectory(obj);
-@@ -5248,21 +5284,22 @@ static int yaffs_UnlinkWorker(yaffs_Obje
- 		default:
- 			return YAFFS_FAIL;
- 		}
--	}
-+	} else
-+		return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-+					   _Y("unlinked"), 0, 0);
- }
- 
- 
--static int yaffs_UnlinkObject( yaffs_Object *obj)
-+static int yaffs_UnlinkObject(yaffs_Object *obj)
- {
- 
--	if (obj && obj->unlinkAllowed) {
-+	if (obj && obj->unlinkAllowed)
- 		return yaffs_UnlinkWorker(obj);
--	}
- 
- 	return YAFFS_FAIL;
- 
- }
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
- {
- 	yaffs_Object *obj;
- 
-@@ -5272,8 +5309,8 @@ int yaffs_Unlink(yaffs_Object * dir, con
- 
- /*----------------------- Initialisation Scanning ---------------------- */
- 
--static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
--				       int backwardScanning)
-+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-+				int backwardScanning)
- {
- 	yaffs_Object *obj;
- 
-@@ -5286,9 +5323,8 @@ static void yaffs_HandleShadowedObject(y
- 		/* Handle YAFFS2 case (backward scanning)
- 		 * If the shadowed object exists then ignore.
- 		 */
--		if (yaffs_FindObjectByNumber(dev, objId)) {
-+		if (yaffs_FindObjectByNumber(dev, objId))
- 			return;
--		}
- 	}
- 
- 	/* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-@@ -5297,6 +5333,8 @@ static void yaffs_HandleShadowedObject(y
- 	obj =
- 	    yaffs_FindOrCreateObjectByNumber(dev, objId,
- 					     YAFFS_OBJECT_TYPE_FILE);
-+	if (!obj)
-+		return;
- 	yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
- 	obj->variant.fileVariant.shrinkSize = 0;
- 	obj->valid = 1;		/* So that we don't read any other info for this file */
-@@ -5325,44 +5363,77 @@ static void yaffs_HardlinkFixup(yaffs_De
- 		if (in) {
- 			/* Add the hardlink pointers */
- 			hl->variant.hardLinkVariant.equivalentObject = in;
--			list_add(&hl->hardLinks, &in->hardLinks);
-+			ylist_add(&hl->hardLinks, &in->hardLinks);
- 		} else {
- 			/* Todo Need to report/handle this better.
- 			 * Got a problem... hardlink to a non-existant object
- 			 */
- 			hl->variant.hardLinkVariant.equivalentObject = NULL;
--			INIT_LIST_HEAD(&hl->hardLinks);
-+			YINIT_LIST_HEAD(&hl->hardLinks);
- 
- 		}
--
- 	}
-+}
-+
-+
- 
-+
-+
-+static int ybicmp(const void *a, const void *b)
-+{
-+	register int aseq = ((yaffs_BlockIndex *)a)->seq;
-+	register int bseq = ((yaffs_BlockIndex *)b)->seq;
-+	register int ablock = ((yaffs_BlockIndex *)a)->block;
-+	register int bblock = ((yaffs_BlockIndex *)b)->block;
-+	if (aseq == bseq)
-+		return ablock - bblock;
-+	else
-+		return aseq - bseq;
- }
- 
- 
-+struct yaffs_ShadowFixerStruct {
-+	int objectId;
-+	int shadowedId;
-+	struct yaffs_ShadowFixerStruct *next;
-+};
-+
- 
-+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-+{
-+	/*
-+	*  Sort out state of unlinked and deleted objects after scanning.
-+	*/
-+	struct ylist_head *i;
-+	struct ylist_head *n;
-+	yaffs_Object *l;
- 
-+	/* Soft delete all the unlinked files */
-+	ylist_for_each_safe(i, n,
-+		&dev->unlinkedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
--static int ybicmp(const void *a, const void *b){
--    register int aseq = ((yaffs_BlockIndex *)a)->seq;
--    register int bseq = ((yaffs_BlockIndex *)b)->seq;
--    register int ablock = ((yaffs_BlockIndex *)a)->block;
--    register int bblock = ((yaffs_BlockIndex *)b)->block;
--    if( aseq == bseq )
--        return ablock - bblock;
--    else
--        return aseq - bseq;
-+	ylist_for_each_safe(i, n,
-+		&dev->deletedDir->variant.directoryVariant.children) {
-+		if (i) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			yaffs_DeleteObject(l);
-+		}
-+	}
- 
- }
- 
--static int yaffs_Scan(yaffs_Device * dev)
-+static int yaffs_Scan(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
- 	int blockIterator;
- 	int startIterator;
- 	int endIterator;
--	int nBlocksToScan = 0;
- 	int result;
- 
- 	int chunk;
-@@ -5371,26 +5442,19 @@ static int yaffs_Scan(yaffs_Device * dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
--	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
- 
- 	int alloc_failed = 0;
- 
-+	struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-+
- 
- 	__u8 *chunkData;
- 
--	yaffs_BlockIndex *blockIndex = NULL;
- 
--	if (dev->isYaffs2) {
--		T(YAFFS_TRACE_SCAN,
--		  (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
--		return YAFFS_FAIL;
--	}
--
--	//TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
- 
- 	T(YAFFS_TRACE_SCAN,
- 	  (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-@@ -5400,12 +5464,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
- 
--	if (dev->isYaffs2) {
--		blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
--		if(!blockIndex)
--			return YAFFS_FAIL;
--	}
--
- 	/* Scan all the blocks to determine their state */
- 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
- 		bi = yaffs_GetBlockInfo(dev, blk);
-@@ -5418,6 +5476,9 @@ static int yaffs_Scan(yaffs_Device * dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-+
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
-@@ -5430,70 +5491,21 @@ static int yaffs_Scan(yaffs_Device * dev
- 			  (TSTR("Block empty " TENDSTR)));
- 			dev->nErasedBlocks++;
- 			dev->nFreeChunks += dev->nChunksPerBlock;
--		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
--
--			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
--			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
--
--				blockIndex[nBlocksToScan].seq = sequenceNumber;
--				blockIndex[nBlocksToScan].block = blk;
--
--				nBlocksToScan++;
--
--				if (sequenceNumber >= dev->sequenceNumber) {
--					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
--				/* TODO: Nasty sequence number! */
--				T(YAFFS_TRACE_SCAN,
--				  (TSTR
--				   ("Block scanning block %d has bad sequence number %d"
--				    TENDSTR), blk, sequenceNumber));
--
--			}
- 		}
- 	}
- 
--	/* Sort the blocks
--	 * Dungy old bubble sort for now...
--	 */
--	if (dev->isYaffs2) {
--		yaffs_BlockIndex temp;
--		int i;
--		int j;
--
--		for (i = 0; i < nBlocksToScan; i++)
--			for (j = i + 1; j < nBlocksToScan; j++)
--				if (blockIndex[i].seq > blockIndex[j].seq) {
--					temp = blockIndex[j];
--					blockIndex[j] = blockIndex[i];
--					blockIndex[i] = temp;
--				}
--	}
--
--	/* Now scan the blocks looking at the data. */
--	if (dev->isYaffs2) {
--		startIterator = 0;
--		endIterator = nBlocksToScan - 1;
--		T(YAFFS_TRACE_SCAN_DEBUG,
--		  (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
--	} else {
--		startIterator = dev->internalStartBlock;
--		endIterator = dev->internalEndBlock;
--	}
-+	startIterator = dev->internalStartBlock;
-+	endIterator = dev->internalEndBlock;
- 
- 	/* For each block.... */
- 	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- 	     blockIterator++) {
- 
--		if (dev->isYaffs2) {
--			/* get the block to scan in the correct order */
--			blk = blockIndex[blockIterator].block;
--		} else {
--			blk = blockIterator;
--		}
-+		YYIELD();
-+
-+		YYIELD();
-+
-+		blk = blockIterator;
- 
- 		bi = yaffs_GetBlockInfo(dev, blk);
- 		state = bi->blockState;
-@@ -5511,7 +5523,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 			/* Let's have a good look at this chunk... */
- 
--			if (!dev->isYaffs2 && tags.chunkDeleted) {
-+			if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
- 				/* YAFFS1 only...
- 				 * A deleted chunk
- 				 */
-@@ -5540,18 +5552,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 					dev->allocationBlockFinder = blk;
- 					/* Set it to here to encourage the allocator to go forth from here. */
- 
--					/* Yaffs2 sanity check:
--					 * This should be the one with the highest sequence number
--					 */
--					if (dev->isYaffs2
--					    && (dev->sequenceNumber !=
--						bi->sequenceNumber)) {
--						T(YAFFS_TRACE_ALWAYS,
--						  (TSTR
--						   ("yaffs: Allocation block %d was not highest sequence id:"
--						    " block seq = %d, dev seq = %d"
--						    TENDSTR), blk,bi->sequenceNumber,dev->sequenceNumber));
--					}
- 				}
- 
- 				dev->nFreeChunks += (dev->nChunksPerBlock - c);
-@@ -5570,11 +5570,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 				 * the same chunkId).
- 				 */
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
--				if(in){
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
-+				if (in) {
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
- 						alloc_failed = 1;
- 				}
- 
-@@ -5617,7 +5617,7 @@ static int yaffs_Scan(yaffs_Device * dev
- 					 * deleted, and worse still it has changed type. Delete the old object.
- 					 */
- 
--					yaffs_DestroyObject(in);
-+					yaffs_DeleteObject(in);
- 
- 					in = 0;
- 				}
-@@ -5627,14 +5627,20 @@ static int yaffs_Scan(yaffs_Device * dev
- 								      objectId,
- 								      oh->type);
- 
--				if(!in)
-+				if (!in)
- 					alloc_failed = 1;
- 
- 				if (in && oh->shadowsObject > 0) {
--					yaffs_HandleShadowedObject(dev,
--								   oh->
--								   shadowsObject,
--								   0);
-+
-+					struct yaffs_ShadowFixerStruct *fixer;
-+					fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-+					if (fixer) {
-+						fixer->next = shadowFixerList;
-+						shadowFixerList = fixer;
-+						fixer->objectId = tags.objectId;
-+						fixer->shadowedId = oh->shadowsObject;
-+					}
-+
- 				}
- 
- 				if (in && in->valid) {
-@@ -5643,12 +5649,10 @@ static int yaffs_Scan(yaffs_Device * dev
- 					unsigned existingSerial = in->serial;
- 					unsigned newSerial = tags.serialNumber;
- 
--					if (dev->isYaffs2 ||
--					    ((existingSerial + 1) & 3) ==
--					    newSerial) {
-+					if (((existingSerial + 1) & 3) == newSerial) {
- 						/* Use new one - destroy the exisiting one */
- 						yaffs_DeleteChunk(dev,
--								  in->chunkId,
-+								  in->hdrChunk,
- 								  1, __LINE__);
- 						in->valid = 0;
- 					} else {
-@@ -5681,7 +5685,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 				} else if (in && !in->valid) {
- 					/* we need to load this info */
-@@ -5705,7 +5710,8 @@ static int yaffs_Scan(yaffs_Device * dev
- 					in->yst_ctime = oh->yst_ctime;
- 					in->yst_rdev = oh->yst_rdev;
- #endif
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
-+					in->serial = tags.serialNumber;
- 
- 					yaffs_SetObjectName(in, oh->name);
- 					in->dirty = 0;
-@@ -5718,25 +5724,25 @@ static int yaffs_Scan(yaffs_Device * dev
- 					    yaffs_FindOrCreateObjectByNumber
- 					    (dev, oh->parentObjectId,
- 					     YAFFS_OBJECT_TYPE_DIRECTORY);
--					if (parent->variantType ==
-+					if (!parent)
-+						alloc_failed = 1;
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+								directoryVariant.
-+								children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -5760,15 +5766,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 						/* Todo got a problem */
- 						break;
- 					case YAFFS_OBJECT_TYPE_FILE:
--						if (dev->isYaffs2
--						    && oh->isShrink) {
--							/* Prune back the shrunken chunks */
--							yaffs_PruneResizedChunks
--							    (in, oh->fileSize);
--							/* Mark the block as having a shrinkHeader */
--							bi->hasShrinkHeader = 1;
--						}
--
- 						if (dev->useHeaderFileSize)
- 
- 							in->variant.fileVariant.
-@@ -5778,11 +5775,11 @@ static int yaffs_Scan(yaffs_Device * dev
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
- 						in->variant.hardLinkVariant.
--						    equivalentObjectId =
--						    oh->equivalentObjectId;
-+							equivalentObjectId =
-+							oh->equivalentObjectId;
- 						in->hardLinks.next =
--						    (struct list_head *)
--						    hardList;
-+							(struct ylist_head *)
-+							hardList;
- 						hardList = in;
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -5794,15 +5791,17 @@ static int yaffs_Scan(yaffs_Device * dev
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
- 						in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--						if(!in->variant.symLinkVariant.alias)
-+						if (!in->variant.symLinkVariant.alias)
- 							alloc_failed = 1;
- 						break;
- 					}
- 
-+/*
- 					if (parent == dev->deletedDir) {
- 						yaffs_DestroyObject(in);
- 						bi->hasShrinkHeader = 1;
- 					}
-+*/
- 				}
- 			}
- 		}
-@@ -5823,10 +5822,6 @@ static int yaffs_Scan(yaffs_Device * dev
- 
- 	}
- 
--	if (blockIndex) {
--		YFREE(blockIndex);
--	}
--
- 
- 	/* Ok, we've done all the scanning.
- 	 * Fix up the hard link chains.
-@@ -5834,32 +5829,36 @@ static int yaffs_Scan(yaffs_Device * dev
- 	 * hardlinks.
- 	 */
- 
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
--	/* Handle the unlinked files. Since they were left in an unlinked state we should
--	 * just delete them.
--	 */
-+	/* Fix up any shadowed objects */
- 	{
--		struct list_head *i;
--		struct list_head *n;
-+		struct yaffs_ShadowFixerStruct *fixer;
-+		yaffs_Object *obj;
- 
--		yaffs_Object *l;
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
-+		while (shadowFixerList) {
-+			fixer = shadowFixerList;
-+			shadowFixerList = fixer->next;
-+			/* Complete the rename transaction by deleting the shadowed object
-+			 * then setting the object header to unshadowed.
-+			 */
-+			obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-+			if (obj)
-+				yaffs_DeleteObject(obj);
-+
-+			obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-+
-+			if (obj)
-+				yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-+
-+			YFREE(fixer);
- 		}
- 	}
- 
- 	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--	if(alloc_failed){
-+	if (alloc_failed)
- 		return YAFFS_FAIL;
--	}
- 
- 	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
- 
-@@ -5871,25 +5870,27 @@ static void yaffs_CheckObjectDetailsLoad
- {
- 	__u8 *chunkData;
- 	yaffs_ObjectHeader *oh;
--	yaffs_Device *dev = in->myDev;
-+	yaffs_Device *dev;
- 	yaffs_ExtendedTags tags;
- 	int result;
- 	int alloc_failed = 0;
- 
--	if(!in)
-+	if (!in)
- 		return;
- 
-+	dev = in->myDev;
-+
- #if 0
--	T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
-+	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
- 		in->objectId,
- 		in->lazyLoaded ? "not yet" : "already"));
- #endif
- 
--	if(in->lazyLoaded){
-+	if (in->lazyLoaded && in->hdrChunk > 0) {
- 		in->lazyLoaded = 0;
- 		chunkData = yaffs_GetTempBuffer(dev, __LINE__);
- 
--		result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-+		result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
- 		oh = (yaffs_ObjectHeader *) chunkData;
- 
- 		in->yst_mode = oh->yst_mode;
-@@ -5911,18 +5912,18 @@ static void yaffs_CheckObjectDetailsLoad
- #endif
- 		yaffs_SetObjectName(in, oh->name);
- 
--		if(in->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
--			 in->variant.symLinkVariant.alias =
-+		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+			in->variant.symLinkVariant.alias =
- 						    yaffs_CloneString(oh->alias);
--			if(!in->variant.symLinkVariant.alias)
-+			if (!in->variant.symLinkVariant.alias)
- 				alloc_failed = 1; /* Not returned to caller */
- 		}
- 
--		yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
-+		yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 	}
- }
- 
--static int yaffs_ScanBackwards(yaffs_Device * dev)
-+static int yaffs_ScanBackwards(yaffs_Device *dev)
- {
- 	yaffs_ExtendedTags tags;
- 	int blk;
-@@ -5938,7 +5939,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	yaffs_BlockState state;
- 	yaffs_Object *hardList = NULL;
- 	yaffs_BlockInfo *bi;
--	int sequenceNumber;
-+	__u32 sequenceNumber;
- 	yaffs_ObjectHeader *oh;
- 	yaffs_Object *in;
- 	yaffs_Object *parent;
-@@ -5972,12 +5973,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
- 		altBlockIndex = 1;
- 	}
- 
--	if(!blockIndex) {
-+	if (!blockIndex) {
- 		T(YAFFS_TRACE_SCAN,
- 		  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
- 		return YAFFS_FAIL;
-@@ -5999,15 +6000,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		bi->blockState = state;
- 		bi->sequenceNumber = sequenceNumber;
- 
--		if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
- 			bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-+		if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-+			bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
- 
- 		T(YAFFS_TRACE_SCAN_DEBUG,
- 		  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
- 		   state, sequenceNumber));
- 
- 
--		if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
-+		if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- 			dev->blocksInCheckpoint++;
- 
- 		} else if (state == YAFFS_BLOCK_STATE_DEAD) {
-@@ -6021,8 +6024,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 		} else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
- 
- 			/* Determine the highest sequence number */
--			if (dev->isYaffs2 &&
--			    sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-+			if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
- 			    sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
- 
- 				blockIndex[nBlocksToScan].seq = sequenceNumber;
-@@ -6030,10 +6032,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				nBlocksToScan++;
- 
--				if (sequenceNumber >= dev->sequenceNumber) {
-+				if (sequenceNumber >= dev->sequenceNumber)
- 					dev->sequenceNumber = sequenceNumber;
--				}
--			} else if (dev->isYaffs2) {
-+			} else {
- 				/* TODO: Nasty sequence number! */
- 				T(YAFFS_TRACE_SCAN,
- 				  (TSTR
-@@ -6053,11 +6054,13 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* Sort the blocks */
- #ifndef CONFIG_YAFFS_USE_OWN_SORT
--	yaffs_qsort(blockIndex, nBlocksToScan,
--		sizeof(yaffs_BlockIndex), ybicmp);
-+	{
-+		/* Use qsort now. */
-+		yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-+	}
- #else
- 	{
--	 	/* Dungy old bubble sort... */
-+		/* Dungy old bubble sort... */
- 
- 		yaffs_BlockIndex temp;
- 		int i;
-@@ -6075,7 +6078,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	YYIELD();
- 
--    	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-+	T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
- 
- 	/* Now scan the blocks looking at the data. */
- 	startIterator = 0;
-@@ -6085,10 +6088,10 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 	/* For each block.... backwards */
- 	for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
--	     blockIterator--) {
--	        /* Cooperative multitasking! This loop can run for so
-+			blockIterator--) {
-+		/* Cooperative multitasking! This loop can run for so
- 		   long that watchdog timers expire. */
--	        YYIELD();
-+		YYIELD();
- 
- 		/* get the block to scan in the correct order */
- 		blk = blockIndex[blockIterator].block;
-@@ -6127,10 +6130,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				 * this is the one being allocated from
- 				 */
- 
--				if(foundChunksInBlock)
--				{
-+				if (foundChunksInBlock) {
- 					/* This is a chunk that was skipped due to failing the erased check */
--
- 				} else if (c == 0) {
- 					/* We're looking at the first chunk in the block so the block is unused */
- 					state = YAFFS_BLOCK_STATE_EMPTY;
-@@ -6138,7 +6139,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				} else {
- 					if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
- 					    state == YAFFS_BLOCK_STATE_ALLOCATING) {
--					    	if(dev->sequenceNumber == bi->sequenceNumber) {
-+						if (dev->sequenceNumber == bi->sequenceNumber) {
- 							/* this is the block being allocated from */
- 
- 							T(YAFFS_TRACE_SCAN,
-@@ -6150,27 +6151,31 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							dev->allocationBlock = blk;
- 							dev->allocationPage = c;
- 							dev->allocationBlockFinder = blk;
--						}
--						else {
-+						} else {
- 							/* This is a partially written block that is not
- 							 * the current allocation block. This block must have
- 							 * had a write failure, so set up for retirement.
- 							 */
- 
--							 bi->needsRetiring = 1;
-+							 /* bi->needsRetiring = 1; ??? TODO */
- 							 bi->gcPrioritise = 1;
- 
- 							 T(YAFFS_TRACE_ALWAYS,
--							 (TSTR("Partially written block %d being set for retirement" TENDSTR),
-+							 (TSTR("Partially written block %d detected" TENDSTR),
- 							 blk));
- 						}
--
- 					}
--
- 				}
- 
- 				dev->nFreeChunks++;
- 
-+			} else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-+				T(YAFFS_TRACE_SCAN,
-+				  (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-+				  blk, c));
-+
-+				  dev->nFreeChunks++;
-+
- 			} else if (tags.chunkId > 0) {
- 				/* chunkId > 0 so it is a data chunk... */
- 				unsigned int endpos;
-@@ -6187,7 +6192,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 								      tags.
- 								      objectId,
- 								      YAFFS_OBJECT_TYPE_FILE);
--				if(!in){
-+				if (!in) {
- 					/* Out of memory */
- 					alloc_failed = 1;
- 				}
-@@ -6197,8 +6202,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    && chunkBase <
- 				    in->variant.fileVariant.shrinkSize) {
- 					/* This has not been invalidated by a resize */
--					if(!yaffs_PutChunkIntoFile(in, tags.chunkId,
--							       chunk, -1)){
-+					if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
-+							       chunk, -1)) {
- 						alloc_failed = 1;
- 					}
- 
-@@ -6221,7 +6226,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    scannedFileSize;
- 					}
- 
--				} else if(in) {
-+				} else if (in) {
- 					/* This chunk has been invalidated by a resize, so delete */
- 					yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
- 
-@@ -6242,6 +6247,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					in = yaffs_FindOrCreateObjectByNumber
- 					    (dev, tags.objectId,
- 					     tags.extraObjectType);
-+					if (!in)
-+						alloc_failed = 1;
- 				}
- 
- 				if (!in ||
-@@ -6251,8 +6258,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 				    tags.extraShadows ||
- 				    (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
--				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
--				    ) {
-+				     tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
- 
- 					/* If we don't have  valid info then we need to read the chunk
- 					 * TODO In future we can probably defer reading the chunk and
-@@ -6266,8 +6272,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					oh = (yaffs_ObjectHeader *) chunkData;
- 
--					if (!in)
-+					if (dev->inbandTags) {
-+						/* Fix up the header if they got corrupted by inband tags */
-+						oh->shadowsObject = oh->inbandShadowsObject;
-+						oh->isShrink = oh->inbandIsShrink;
-+					}
-+
-+					if (!in) {
- 						in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-+						if (!in)
-+							alloc_failed = 1;
-+					}
- 
- 				}
- 
-@@ -6275,10 +6290,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* TODO Hoosterman we have a problem! */
- 					T(YAFFS_TRACE_ERROR,
- 					  (TSTR
--					   ("yaffs tragedy: Could not make object for object  %d  "
--					    "at chunk %d during scan"
-+					   ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
- 					    TENDSTR), tags.objectId, chunk));
--
-+					continue;
- 				}
- 
- 				if (in->valid) {
-@@ -6289,10 +6303,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 					if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
- 					     ((oh &&
--					       oh-> type == YAFFS_OBJECT_TYPE_FILE)||
-+					       oh->type == YAFFS_OBJECT_TYPE_FILE) ||
- 					      (tags.extraHeaderInfoAvailable  &&
--					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
--					    ) {
-+					       tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
- 						__u32 thisSize =
- 						    (oh) ? oh->fileSize : tags.
- 						    extraFileLength;
-@@ -6300,7 +6313,9 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						    (oh) ? oh->
- 						    parentObjectId : tags.
- 						    extraParentObjectId;
--						unsigned isShrink =
-+
-+
-+						isShrink =
- 						    (oh) ? oh->isShrink : tags.
- 						    extraIsShrinkHeader;
- 
-@@ -6323,9 +6338,8 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 							    thisSize;
- 						}
- 
--						if (isShrink) {
-+						if (isShrink)
- 							bi->hasShrinkHeader = 1;
--						}
- 
- 					}
- 					/* Use existing - destroy this one. */
-@@ -6333,6 +6347,17 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 				}
- 
-+				if (!in->valid && in->variantType !=
-+				    (oh ? oh->type : tags.extraObjectType))
-+					T(YAFFS_TRACE_ERROR, (
-+						TSTR("yaffs tragedy: Bad object type, "
-+					    TCONT("%d != %d, for object %d at chunk ")
-+					    TCONT("%d during scan")
-+						TENDSTR), oh ?
-+					    oh->type : tags.extraObjectType,
-+					    in->variantType, tags.objectId,
-+					    chunk));
-+
- 				if (!in->valid &&
- 				    (tags.objectId == YAFFS_OBJECTID_ROOT ||
- 				     tags.objectId ==
-@@ -6340,7 +6365,7 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					/* We only load some info, don't fiddle with directory structure */
- 					in->valid = 1;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6365,15 +6390,15 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						in->lazyLoaded = 1;
- 					}
- 
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
- 				} else if (!in->valid) {
- 					/* we need to load this info */
- 
- 					in->valid = 1;
--					in->chunkId = chunk;
-+					in->hdrChunk = chunk;
- 
--					if(oh) {
-+					if (oh) {
- 						in->variantType = oh->type;
- 
- 						in->yst_mode = oh->yst_mode;
-@@ -6403,20 +6428,19 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						yaffs_SetObjectName(in, oh->name);
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, oh->parentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, oh->parentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 
- 						 fileSize = oh->fileSize;
-- 						 isShrink = oh->isShrink;
-+						 isShrink = oh->isShrink;
- 						 equivalentObjectId = oh->equivalentObjectId;
- 
--					}
--					else {
-+					} else {
- 						in->variantType = tags.extraObjectType;
- 						parent =
- 						    yaffs_FindOrCreateObjectByNumber
--					    		(dev, tags.extraParentObjectId,
--					     		 YAFFS_OBJECT_TYPE_DIRECTORY);
-+							(dev, tags.extraParentObjectId,
-+							 YAFFS_OBJECT_TYPE_DIRECTORY);
- 						 fileSize = tags.extraFileLength;
- 						 isShrink = tags.extraIsShrinkHeader;
- 						 equivalentObjectId = tags.extraEquivalentObjectId;
-@@ -6425,29 +6449,30 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 					}
- 					in->dirty = 0;
- 
-+					if (!parent)
-+						alloc_failed = 1;
-+
- 					/* directory stuff...
- 					 * hook up to parent
- 					 */
- 
--					if (parent->variantType ==
-+					if (parent && parent->variantType ==
- 					    YAFFS_OBJECT_TYPE_UNKNOWN) {
- 						/* Set up as a directory */
- 						parent->variantType =
--						    YAFFS_OBJECT_TYPE_DIRECTORY;
--						INIT_LIST_HEAD(&parent->variant.
--							       directoryVariant.
--							       children);
--					} else if (parent->variantType !=
--						   YAFFS_OBJECT_TYPE_DIRECTORY)
--					{
-+							YAFFS_OBJECT_TYPE_DIRECTORY;
-+						YINIT_LIST_HEAD(&parent->variant.
-+							directoryVariant.
-+							children);
-+					} else if (!parent || parent->variantType !=
-+						   YAFFS_OBJECT_TYPE_DIRECTORY) {
- 						/* Hoosterman, another problem....
- 						 * We're trying to use a non-directory as a directory
- 						 */
- 
- 						T(YAFFS_TRACE_ERROR,
- 						  (TSTR
--						   ("yaffs tragedy: attempting to use non-directory as"
--						    " a directory in scan. Put in lost+found."
-+						   ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
- 						    TENDSTR)));
- 						parent = dev->lostNFoundDir;
- 					}
-@@ -6494,12 +6519,12 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 
- 						break;
- 					case YAFFS_OBJECT_TYPE_HARDLINK:
--						if(!itsUnlinked) {
--						  in->variant.hardLinkVariant.equivalentObjectId =
--						    equivalentObjectId;
--						  in->hardLinks.next =
--						    (struct list_head *) hardList;
--						  hardList = in;
-+						if (!itsUnlinked) {
-+							in->variant.hardLinkVariant.equivalentObjectId =
-+								equivalentObjectId;
-+							in->hardLinks.next =
-+								(struct ylist_head *) hardList;
-+							hardList = in;
- 						}
- 						break;
- 					case YAFFS_OBJECT_TYPE_DIRECTORY:
-@@ -6509,12 +6534,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 						/* Do nothing */
- 						break;
- 					case YAFFS_OBJECT_TYPE_SYMLINK:
--						if(oh){
--						   in->variant.symLinkVariant.alias =
--						    yaffs_CloneString(oh->
--								      alias);
--						   if(!in->variant.symLinkVariant.alias)
--						   	alloc_failed = 1;
-+						if (oh) {
-+							in->variant.symLinkVariant.alias =
-+								yaffs_CloneString(oh->alias);
-+							if (!in->variant.symLinkVariant.alias)
-+								alloc_failed = 1;
- 						}
- 						break;
- 					}
-@@ -6551,75 +6575,129 @@ static int yaffs_ScanBackwards(yaffs_Dev
- 	 * We should now have scanned all the objects, now it's time to add these
- 	 * hardlinks.
- 	 */
--	yaffs_HardlinkFixup(dev,hardList);
-+	yaffs_HardlinkFixup(dev, hardList);
- 
- 
--	/*
--	*  Sort out state of unlinked and deleted objects.
--	*/
--	{
--		struct list_head *i;
--		struct list_head *n;
-+	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
- 
--		yaffs_Object *l;
-+	if (alloc_failed)
-+		return YAFFS_FAIL;
- 
--		/* Soft delete all the unlinked files */
--		list_for_each_safe(i, n,
--				   &dev->unlinkedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
--			}
--		}
-+	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
- 
--		/* Soft delete all the deletedDir files */
--		list_for_each_safe(i, n,
--				   &dev->deletedDir->variant.directoryVariant.
--				   children) {
--			if (i) {
--				l = list_entry(i, yaffs_Object, siblings);
--				yaffs_DestroyObject(l);
-+	return YAFFS_OK;
-+}
- 
--			}
-+/*------------------------------  Directory Functions ----------------------------- */
-+
-+static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
-+
-+	int count = 0;
-+
-+	if (!obj) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (yaffs_SkipVerification(obj->myDev))
-+		return;
-+
-+	if (!obj->parent) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-+		YBUG();
-+		return;
-+	}
-+
-+	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			yaffs_VerifyObject(listObj);
-+			if (obj == listObj)
-+				count++;
- 		}
-+	 }
-+
-+	if (count != 1) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-+		YBUG();
- 	}
-+}
- 
--	yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-+static void yaffs_VerifyDirectory(yaffs_Object *directory)
-+{
-+	struct ylist_head *lh;
-+	yaffs_Object *listObj;
- 
--	if(alloc_failed){
--		return YAFFS_FAIL;
-+	if (!directory) {
-+		YBUG();
-+		return;
- 	}
- 
--	T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
-+	if (yaffs_SkipFullVerification(directory->myDev))
-+		return;
- 
--	return YAFFS_OK;
-+	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-+		YBUG();
-+	}
-+
-+	/* Iterate through the objects in each hash entry */
-+
-+	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-+		if (lh) {
-+			listObj = ylist_entry(lh, yaffs_Object, siblings);
-+			if (listObj->parent != directory) {
-+				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-+				YBUG();
-+			}
-+			yaffs_VerifyObjectInDirectory(listObj);
-+		}
-+	}
- }
- 
--/*------------------------------  Directory Functions ----------------------------- */
- 
--static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
-+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
- {
- 	yaffs_Device *dev = obj->myDev;
-+	yaffs_Object *parent;
-+
-+	yaffs_VerifyObjectInDirectory(obj);
-+	parent = obj->parent;
-+
-+	yaffs_VerifyDirectory(parent);
- 
--	if(dev && dev->removeObjectCallback)
-+	if (dev && dev->removeObjectCallback)
- 		dev->removeObjectCallback(obj);
- 
--	list_del_init(&obj->siblings);
-+
-+	ylist_del_init(&obj->siblings);
- 	obj->parent = NULL;
-+
-+	yaffs_VerifyDirectory(parent);
- }
- 
- 
--static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
--				       yaffs_Object * obj)
-+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-+					yaffs_Object *obj)
- {
--
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: Trying to add an object to a null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6631,37 +6709,42 @@ static void yaffs_AddObjectToDirectory(y
- 
- 	if (obj->siblings.prev == NULL) {
- 		/* Not initialised */
--		INIT_LIST_HEAD(&obj->siblings);
--
--	} else if (!list_empty(&obj->siblings)) {
--		/* If it is holed up somewhere else, un hook it */
--		yaffs_RemoveObjectFromDirectory(obj);
-+		YBUG();
- 	}
-+
-+
-+	yaffs_VerifyDirectory(directory);
-+
-+	yaffs_RemoveObjectFromDirectory(obj);
-+
-+
- 	/* Now add it */
--	list_add(&obj->siblings, &directory->variant.directoryVariant.children);
-+	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
- 	obj->parent = directory;
- 
- 	if (directory == obj->myDev->unlinkedDir
--	    || directory == obj->myDev->deletedDir) {
-+			|| directory == obj->myDev->deletedDir) {
- 		obj->unlinked = 1;
- 		obj->myDev->nUnlinkedFiles++;
- 		obj->renameAllowed = 0;
- 	}
-+
-+	yaffs_VerifyDirectory(directory);
-+	yaffs_VerifyObjectInDirectory(obj);
- }
- 
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
--				     const YCHAR * name)
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
-+				     const YCHAR *name)
- {
- 	int sum;
- 
--	struct list_head *i;
-+	struct ylist_head *i;
- 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
- 
- 	yaffs_Object *l;
- 
--	if (!name) {
-+	if (!name)
- 		return NULL;
--	}
- 
- 	if (!directory) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6669,6 +6752,7 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return NULL;
- 	}
- 	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
-@@ -6679,28 +6763,27 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 	sum = yaffs_CalcNameSum(name);
- 
--	list_for_each(i, &directory->variant.directoryVariant.children) {
-+	ylist_for_each(i, &directory->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+
-+			if (l->parent != directory)
-+				YBUG();
- 
- 			yaffs_CheckObjectDetailsLoaded(l);
- 
- 			/* Special case for lost-n-found */
- 			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
--				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
-+				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
- 					return l;
--				}
--			} else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)
--			{
--				/* LostnFound cunk called Objxxx
-+			} else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
-+				/* LostnFound chunk called Objxxx
- 				 * Do a real check
- 				 */
- 				yaffs_GetObjectName(l, buffer,
- 						    YAFFS_MAX_NAME_LENGTH);
--				if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
-+				if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
- 					return l;
--				}
--
- 			}
- 		}
- 	}
-@@ -6710,10 +6793,10 @@ yaffs_Object *yaffs_FindObjectByName(yaf
- 
- 
- #if 0
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
--				   int (*fn) (yaffs_Object *))
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-+					int (*fn) (yaffs_Object *))
- {
--	struct list_head *i;
-+	struct ylist_head *i;
- 	yaffs_Object *l;
- 
- 	if (!theDir) {
-@@ -6722,20 +6805,21 @@ int yaffs_ApplyToDirectoryChildren(yaffs
- 		   ("tragedy: yaffs_FindObjectByName: null pointer directory"
- 		    TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
- 		   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
- 		YBUG();
-+		return YAFFS_FAIL;
- 	}
- 
--	list_for_each(i, &theDir->variant.directoryVariant.children) {
-+	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
- 		if (i) {
--			l = list_entry(i, yaffs_Object, siblings);
--			if (l && !fn(l)) {
-+			l = ylist_entry(i, yaffs_Object, siblings);
-+			if (l && !fn(l))
- 				return YAFFS_FAIL;
--			}
- 		}
- 	}
- 
-@@ -6748,7 +6832,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs
-  * actual object.
-  */
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
- {
- 	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
- 		/* We want the object id of the equivalent object, not this one */
-@@ -6756,10 +6840,9 @@ yaffs_Object *yaffs_GetEquivalentObject(
- 		yaffs_CheckObjectDetailsLoaded(obj);
- 	}
- 	return obj;
--
- }
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
- {
- 	memset(name, 0, buffSize * sizeof(YCHAR));
- 
-@@ -6767,18 +6850,26 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
- 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
--	} else if (obj->chunkId <= 0) {
-+	} else if (obj->hdrChunk <= 0) {
- 		YCHAR locName[20];
-+		YCHAR numString[20];
-+		YCHAR *x = &numString[19];
-+		unsigned v = obj->objectId;
-+		numString[19] = 0;
-+		while (v > 0) {
-+			x--;
-+			*x = '0' + (v % 10);
-+			v /= 10;
-+		}
- 		/* make up a name */
--		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
--			      obj->objectId);
-+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-+		yaffs_strcat(locName, x);
- 		yaffs_strncpy(name, locName, buffSize - 1);
- 
- 	}
- #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
--	else if (obj->shortName[0]) {
-+	else if (obj->shortName[0])
- 		yaffs_strcpy(name, obj->shortName);
--	}
- #endif
- 	else {
- 		int result;
-@@ -6788,9 +6879,9 @@ int yaffs_GetObjectName(yaffs_Object * o
- 
- 		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
- 
--		if (obj->chunkId >= 0) {
-+		if (obj->hdrChunk > 0) {
- 			result = yaffs_ReadChunkWithTagsFromNAND(obj->myDev,
--							obj->chunkId, buffer,
-+							obj->hdrChunk, buffer,
- 							NULL);
- 		}
- 		yaffs_strncpy(name, oh->name, buffSize - 1);
-@@ -6801,46 +6892,43 @@ int yaffs_GetObjectName(yaffs_Object * o
- 	return yaffs_strlen(name);
- }
- 
--int yaffs_GetObjectFileLength(yaffs_Object * obj)
-+int yaffs_GetObjectFileLength(yaffs_Object *obj)
- {
--
- 	/* Dereference any hard linking */
- 	obj = yaffs_GetEquivalentObject(obj);
- 
--	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
- 		return obj->variant.fileVariant.fileSize;
--	}
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_strlen(obj->variant.symLinkVariant.alias);
--	} else {
-+	else {
- 		/* Only a directory should drop through to here */
- 		return obj->myDev->nDataBytesPerChunk;
- 	}
- }
- 
--int yaffs_GetObjectLinkCount(yaffs_Object * obj)
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
- {
- 	int count = 0;
--	struct list_head *i;
-+	struct ylist_head *i;
- 
--	if (!obj->unlinked) {
--		count++;	/* the object itself */
--	}
--	list_for_each(i, &obj->hardLinks) {
--		count++;	/* add the hard links; */
--	}
--	return count;
-+	if (!obj->unlinked)
-+		count++;		/* the object itself */
-+
-+	ylist_for_each(i, &obj->hardLinks)
-+		count++;		/* add the hard links; */
- 
-+	return count;
- }
- 
--int yaffs_GetObjectInode(yaffs_Object * obj)
-+int yaffs_GetObjectInode(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
- 	return obj->objectId;
- }
- 
--unsigned yaffs_GetObjectType(yaffs_Object * obj)
-+unsigned yaffs_GetObjectType(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
- 
-@@ -6872,19 +6960,18 @@ unsigned yaffs_GetObjectType(yaffs_Objec
- 	}
- }
- 
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
- {
- 	obj = yaffs_GetEquivalentObject(obj);
--	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-+	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
- 		return yaffs_CloneString(obj->variant.symLinkVariant.alias);
--	} else {
-+	else
- 		return yaffs_CloneString(_Y(""));
--	}
- }
- 
- #ifndef CONFIG_YAFFS_WINCE
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = attr->ia_valid;
- 
-@@ -6910,7 +6997,7 @@ int yaffs_SetAttributes(yaffs_Object * o
- 	return YAFFS_OK;
- 
- }
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
- {
- 	unsigned int valid = 0;
- 
-@@ -6934,13 +7021,12 @@ int yaffs_GetAttributes(yaffs_Object * o
- 	attr->ia_valid = valid;
- 
- 	return YAFFS_OK;
--
- }
- 
- #endif
- 
- #if 0
--int yaffs_DumpObject(yaffs_Object * obj)
-+int yaffs_DumpObject(yaffs_Object *obj)
- {
- 	YCHAR name[257];
- 
-@@ -6951,7 +7037,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
- 	    " chunk %d type %d size %d\n"
- 	    TENDSTR), obj->objectId, yaffs_GetObjectInode(obj), name,
--	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->chunkId,
-+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
- 	   yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
- 
- 	return YAFFS_OK;
-@@ -6960,7 +7046,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
- 
- /*---------------------------- Initialisation code -------------------------------------- */
- 
--static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
-+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
- {
- 
- 	/* Common functions, gotta have */
-@@ -7011,7 +7097,7 @@ static int yaffs_CreateInitialDirectorie
- 	    yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
- 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
- 
--	if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
-+	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
- 		yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
- 		return YAFFS_OK;
- 	}
-@@ -7019,7 +7105,7 @@ static int yaffs_CreateInitialDirectorie
- 	return YAFFS_FAIL;
- }
- 
--int yaffs_GutsInitialise(yaffs_Device * dev)
-+int yaffs_GutsInitialise(yaffs_Device *dev)
- {
- 	int init_failed = 0;
- 	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->chunkOffset = 0;
- 	dev->nFreeChunks = 0;
- 
-+	dev->gcBlock = -1;
-+
- 	if (dev->startBlock == 0) {
- 		dev->internalStartBlock = dev->startBlock + 1;
- 		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	/* Check geometry parameters. */
- 
--	if ((dev->isYaffs2 && dev->nDataBytesPerChunk < 1024) ||
--	    (!dev->isYaffs2 && dev->nDataBytesPerChunk != 512) ||
-+	if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-+	    (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
-+	    (dev->inbandTags && !dev->isYaffs2) ||
- 	     dev->nChunksPerBlock < 2 ||
- 	     dev->nReservedBlocks < 2 ||
- 	     dev->internalStartBlock <= 0 ||
- 	     dev->internalEndBlock <= 0 ||
--	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)	// otherwise it is too small
--	    ) {
-+	     dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {	/* otherwise it is too small */
- 		T(YAFFS_TRACE_ALWAYS,
- 		  (TSTR
--		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s "
--		    TENDSTR), dev->nDataBytesPerChunk, dev->isYaffs2 ? "2" : ""));
-+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-+		    TENDSTR), dev->totalBytesPerChunk, dev->isYaffs2 ? "2" : "", dev->inbandTags));
- 		return YAFFS_FAIL;
- 	}
- 
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
- 		return YAFFS_FAIL;
- 	}
- 
-+	/* Sort out space for inband tags, if required */
-+	if (dev->inbandTags)
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-+	else
-+		dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
-+
- 	/* Got the right mix of functions? */
- 	if (!yaffs_CheckDevFunctions(dev)) {
- 		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->isMounted = 1;
- 
--
--
- 	/* OK now calculate a few things for the device */
- 
- 	/*
- 	 *  Calculate all the chunk size manipulation numbers:
- 	 */
--	 /* Start off assuming it is a power of 2 */
--	 dev->chunkShift = ShiftDiv(dev->nDataBytesPerChunk);
--	 dev->chunkMask = (1<<dev->chunkShift) - 1;
--
--	 if(dev->nDataBytesPerChunk == (dev->chunkMask + 1)){
--	 	/* Yes it is a power of 2, disable crumbs */
--		dev->crumbMask = 0;
--		dev->crumbShift = 0;
--		dev->crumbsPerChunk = 0;
--	 } else {
--	 	/* Not a power of 2, use crumbs instead */
--		dev->crumbShift = ShiftDiv(sizeof(yaffs_PackedTags2TagsPart));
--		dev->crumbMask = (1<<dev->crumbShift)-1;
--		dev->crumbsPerChunk = dev->nDataBytesPerChunk/(1 << dev->crumbShift);
--		dev->chunkShift = 0;
--		dev->chunkMask = 0;
--	}
--
-+	x = dev->nDataBytesPerChunk;
-+	/* We always use dev->chunkShift and dev->chunkDiv */
-+	dev->chunkShift = Shifts(x);
-+	x >>= dev->chunkShift;
-+	dev->chunkDiv = x;
-+	/* We only use chunk mask if chunkDiv is 1 */
-+	dev->chunkMask = (1<<dev->chunkShift) - 1;
- 
- 	/*
- 	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	bits = ShiftsGE(x);
- 
- 	/* Set up tnode width if wide tnodes are enabled. */
--	if(!dev->wideTnodesDisabled){
-+	if (!dev->wideTnodesDisabled) {
- 		/* bits must be even so that we end up with 32-bit words */
--		if(bits & 1)
-+		if (bits & 1)
- 			bits++;
--		if(bits < 16)
-+		if (bits < 16)
- 			dev->tnodeWidth = 16;
- 		else
- 			dev->tnodeWidth = bits;
--	}
--	else
-+	} else
- 		dev->tnodeWidth = 16;
- 
- 	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
- 
- 	/* Initialise temporary buffers and caches. */
--	if(!yaffs_InitialiseTempBuffers(dev))
-+	if (!yaffs_InitialiseTempBuffers(dev))
- 		init_failed = 1;
- 
- 	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
- 	if (!init_failed &&
- 	    dev->nShortOpCaches > 0) {
- 		int i;
--		__u8 *buf;
-+		void *buf;
- 		int srCacheBytes = dev->nShortOpCaches * sizeof(yaffs_ChunkCache);
- 
--		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES) {
-+		if (dev->nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
- 			dev->nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
--		}
- 
--		buf = dev->srCache =  YMALLOC(srCacheBytes);
-+		dev->srCache =  YMALLOC(srCacheBytes);
- 
--		if(dev->srCache)
--			memset(dev->srCache,0,srCacheBytes);
-+		buf = (__u8 *) dev->srCache;
-+
-+		if (dev->srCache)
-+			memset(dev->srCache, 0, srCacheBytes);
- 
- 		for (i = 0; i < dev->nShortOpCaches && buf; i++) {
- 			dev->srCache[i].object = NULL;
- 			dev->srCache[i].lastUse = 0;
- 			dev->srCache[i].dirty = 0;
--			dev->srCache[i].data = buf = YMALLOC_DMA(dev->nDataBytesPerChunk);
-+			dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
- 		}
--		if(!buf)
-+		if (!buf)
- 			init_failed = 1;
- 
- 		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- 	dev->cacheHits = 0;
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
--		if(!dev->gcCleanupList)
-+		if (!dev->gcCleanupList)
- 			init_failed = 1;
- 	}
- 
--	if (dev->isYaffs2) {
-+	if (dev->isYaffs2)
- 		dev->useHeaderFileSize = 1;
--	}
--	if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+
-+	if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 		init_failed = 1;
- 
- 	yaffs_InitialiseTnodes(dev);
- 	yaffs_InitialiseObjects(dev);
- 
--	if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+	if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 		init_failed = 1;
- 
- 
--	if(!init_failed){
-+	if (!init_failed) {
- 		/* Now scan the flash. */
- 		if (dev->isYaffs2) {
--			if(yaffs_CheckpointRestore(dev)) {
-+			if (yaffs_CheckpointRestore(dev)) {
-+				yaffs_CheckObjectDetailsLoaded(dev->rootDir);
- 				T(YAFFS_TRACE_ALWAYS,
- 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
- 			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
- 				dev->nBackgroundDeletions = 0;
- 				dev->oldestDirtySequence = 0;
- 
--				if(!init_failed && !yaffs_InitialiseBlocks(dev))
-+				if (!init_failed && !yaffs_InitialiseBlocks(dev))
- 					init_failed = 1;
- 
- 				yaffs_InitialiseTnodes(dev);
- 				yaffs_InitialiseObjects(dev);
- 
--				if(!init_failed && !yaffs_CreateInitialDirectories(dev))
-+				if (!init_failed && !yaffs_CreateInitialDirectories(dev))
- 					init_failed = 1;
- 
--				if(!init_failed && !yaffs_ScanBackwards(dev))
-+				if (!init_failed && !yaffs_ScanBackwards(dev))
- 					init_failed = 1;
- 			}
--		}else
--			if(!yaffs_Scan(dev))
-+		} else if (!yaffs_Scan(dev))
- 				init_failed = 1;
-+
-+		yaffs_StripDeletedObjects(dev);
- 	}
- 
--	if(init_failed){
-+	if (init_failed) {
- 		/* Clean up the mess */
- 		T(YAFFS_TRACE_TRACING,
- 		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
- 
- }
- 
--void yaffs_Deinitialise(yaffs_Device * dev)
-+void yaffs_Deinitialise(yaffs_Device *dev)
- {
- 	if (dev->isMounted) {
- 		int i;
-@@ -7330,7 +7413,7 @@ void yaffs_Deinitialise(yaffs_Device * d
- 		    dev->srCache) {
- 
- 			for (i = 0; i < dev->nShortOpCaches; i++) {
--				if(dev->srCache[i].data)
-+				if (dev->srCache[i].data)
- 					YFREE(dev->srCache[i].data);
- 				dev->srCache[i].data = NULL;
- 			}
-@@ -7341,16 +7424,17 @@ void yaffs_Deinitialise(yaffs_Device * d
- 
- 		YFREE(dev->gcCleanupList);
- 
--		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-+		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
- 			YFREE(dev->tempBuffer[i].buffer);
--		}
- 
- 		dev->isMounted = 0;
--	}
- 
-+		if (dev->deinitialiseNAND)
-+			dev->deinitialiseNAND(dev);
-+	}
- }
- 
--static int yaffs_CountFreeChunks(yaffs_Device * dev)
-+static int yaffs_CountFreeChunks(yaffs_Device *dev)
- {
- 	int nFree;
- 	int b;
-@@ -7358,7 +7442,7 @@ static int yaffs_CountFreeChunks(yaffs_D
- 	yaffs_BlockInfo *blk;
- 
- 	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
--	     b++) {
-+			b++) {
- 		blk = yaffs_GetBlockInfo(dev, b);
- 
- 		switch (blk->blockState) {
-@@ -7373,19 +7457,19 @@ static int yaffs_CountFreeChunks(yaffs_D
- 		default:
- 			break;
- 		}
--
- 	}
- 
- 	return nFree;
- }
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
- {
- 	/* This is what we report to the outside world */
- 
- 	int nFree;
- 	int nDirtyCacheChunks;
- 	int blocksForCheckpoint;
-+	int i;
- 
- #if 1
- 	nFree = dev->nFreeChunks;
-@@ -7397,12 +7481,9 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- 	/* Now count the number of dirty chunks in the cache and subtract those */
- 
--	{
--		int i;
--		for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
--			if (dev->srCache[i].dirty)
--				nDirtyCacheChunks++;
--		}
-+	for (nDirtyCacheChunks = 0, i = 0; i < dev->nShortOpCaches; i++) {
-+		if (dev->srCache[i].dirty)
-+			nDirtyCacheChunks++;
- 	}
- 
- 	nFree -= nDirtyCacheChunks;
-@@ -7410,8 +7491,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 	nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
- 
- 	/* Now we figure out how much to reserve for the checkpoint and report that... */
--	blocksForCheckpoint = dev->nCheckpointReservedBlocks - dev->blocksInCheckpoint;
--	if(blocksForCheckpoint < 0)
-+	blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-+	if (blocksForCheckpoint < 0)
- 		blocksForCheckpoint = 0;
- 
- 	nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
-@@ -7425,12 +7506,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_De
- 
- static int yaffs_freeVerificationFailures;
- 
--static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
-+static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
- {
- 	int counted;
- 	int difference;
- 
--	if(yaffs_SkipVerification(dev))
-+	if (yaffs_SkipVerification(dev))
- 		return;
- 
- 	counted = yaffs_CountFreeChunks(dev);
-@@ -7447,23 +7528,25 @@ static void yaffs_VerifyFreeChunks(yaffs
- 
- /*---------------------------------------- YAFFS test code ----------------------*/
- 
--#define yaffs_CheckStruct(structure,syze, name) \
--           if(sizeof(structure) != syze) \
--	       { \
--	         T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),\
--		 name,syze,sizeof(structure))); \
--	         return YAFFS_FAIL; \
--		}
-+#define yaffs_CheckStruct(structure, syze, name) \
-+	do { \
-+		if (sizeof(structure) != syze) { \
-+			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-+				name, syze, sizeof(structure))); \
-+			return YAFFS_FAIL; \
-+		} \
-+	} while (0)
- 
- static int yaffs_CheckStructures(void)
- {
--/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags") */
--/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion") */
--/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare") */
-+/*      yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags"); */
-+/*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
-+/*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
- #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
--	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode")
-+	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
- #endif
--	    yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader")
--
--	    return YAFFS_OK;
-+#ifndef CONFIG_YAFFS_WINCE
-+	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
-+#endif
-+	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_guts.h
-+++ b/fs/yaffs2/yaffs_guts.h
-@@ -90,7 +90,7 @@
- 
- #define YAFFS_MAX_SHORT_OP_CACHES	20
- 
--#define YAFFS_N_TEMP_BUFFERS		4
-+#define YAFFS_N_TEMP_BUFFERS		6
- 
- /* We limit the number attempts at sucessfully saving a chunk of data.
-  * Small-page devices have 32 pages per block; large-page devices have 64.
-@@ -108,6 +108,9 @@
- #define YAFFS_LOWEST_SEQUENCE_NUMBER	0x00001000
- #define YAFFS_HIGHEST_SEQUENCE_NUMBER	0xEFFFFF00
- 
-+/* Special sequence number for bad block that failed to be marked bad */
-+#define YAFFS_SEQUENCE_BAD_BLOCK	0xFFFF0000
-+
- /* ChunkCache is used for short read/write operations.*/
- typedef struct {
- 	struct yaffs_ObjectStruct *object;
-@@ -134,11 +137,10 @@ typedef struct {
- typedef struct {
- 	unsigned chunkId:20;
- 	unsigned serialNumber:2;
--	unsigned byteCount:10;
-+	unsigned byteCountLSB:10;
- 	unsigned objectId:18;
- 	unsigned ecc:12;
--	unsigned unusedStuff:2;
--
-+	unsigned byteCountMSB:2;
- } yaffs_Tags;
- 
- typedef union {
-@@ -277,13 +279,13 @@ typedef struct {
- 
- 	int softDeletions:10;	/* number of soft deleted pages */
- 	int pagesInUse:10;	/* number of pages in use */
--	yaffs_BlockState blockState:4;	/* One of the above block states */
-+	unsigned blockState:4;	/* One of the above block states. NB use unsigned because enum is sometimes an int */
- 	__u32 needsRetiring:1;	/* Data has failed on this block, need to get valid data off */
--                        	/* and retire the block. */
--	__u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
--	__u32 gcPrioritise: 1; 	/* An ECC check or blank check has failed on this block.
-+				/* and retire the block. */
-+	__u32 skipErasedCheck:1; /* If this is set we can skip the erased check on this block */
-+	__u32 gcPrioritise:1; 	/* An ECC check or blank check has failed on this block.
- 				   It should be prioritised for GC */
--        __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
-+	__u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
- 
- #ifdef CONFIG_YAFFS_YAFFS2
- 	__u32 hasShrinkHeader:1; /* This block has at least one shrink object header */
-@@ -300,11 +302,11 @@ typedef struct {
- 
- 	/* Apply to everything  */
- 	int parentObjectId;
--	__u16 sum__NoLongerUsed;	/* checksum of name. No longer used */
-+	__u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
- 	YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
- 
--	/* Thes following apply to directories, files, symlinks - not hard links */
--	__u32 yst_mode;		/* protection */
-+	/* The following apply to directories, files, symlinks - not hard links */
-+	__u32 yst_mode;         /* protection */
- 
- #ifdef CONFIG_YAFFS_WINCE
- 	__u32 notForWinCE[5];
-@@ -331,11 +333,14 @@ typedef struct {
- 	__u32 win_ctime[2];
- 	__u32 win_atime[2];
- 	__u32 win_mtime[2];
--	__u32 roomToGrow[4];
- #else
--	__u32 roomToGrow[10];
-+	__u32 roomToGrow[6];
-+
- #endif
-+	__u32 inbandShadowsObject;
-+	__u32 inbandIsShrink;
- 
-+	__u32 reservedSpace[2];
- 	int shadowsObject;	/* This object header shadows the specified object if > 0 */
- 
- 	/* isShrink applies to object headers written when we shrink the file (ie resize) */
-@@ -381,7 +386,7 @@ typedef struct {
- } yaffs_FileStructure;
- 
- typedef struct {
--	struct list_head children;	/* list of child links */
-+	struct ylist_head children;     /* list of child links */
- } yaffs_DirectoryStructure;
- 
- typedef struct {
-@@ -418,23 +423,24 @@ struct yaffs_ObjectStruct {
- 				 * still in the inode cache. Free of object is defered.
- 				 * until the inode is released.
- 				 */
-+	__u8 beingCreated:1;	/* This object is still being created so skip some checks. */
- 
- 	__u8 serial;		/* serial number of chunk in NAND. Cached here */
- 	__u16 sum;		/* sum of the name to speed searching */
- 
--	struct yaffs_DeviceStruct *myDev;	/* The device I'm on */
-+	struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
- 
--	struct list_head hashLink;	/* list of objects in this hash bucket */
-+	struct ylist_head hashLink;     /* list of objects in this hash bucket */
- 
--	struct list_head hardLinks;	/* all the equivalent hard linked objects */
-+	struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
- 
- 	/* directory structure stuff */
- 	/* also used for linking up the free list */
- 	struct yaffs_ObjectStruct *parent;
--	struct list_head siblings;
-+	struct ylist_head siblings;
- 
- 	/* Where's my object header in NAND? */
--	int chunkId;
-+	int hdrChunk;
- 
- 	int nDataChunks;	/* Number of data chunks attached to the file. */
- 
-@@ -485,7 +491,7 @@ struct yaffs_ObjectList_struct {
- typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
- 
- typedef struct {
--	struct list_head list;
-+	struct ylist_head list;
- 	int count;
- } yaffs_ObjectBucket;
- 
-@@ -495,11 +501,10 @@ typedef struct {
-  */
- 
- typedef struct {
--        int structType;
-+	int structType;
- 	__u32 objectId;
- 	__u32 parentId;
--	int chunkId;
--
-+	int hdrChunk;
- 	yaffs_ObjectType variantType:3;
- 	__u8 deleted:1;
- 	__u8 softDeleted:1;
-@@ -511,8 +516,7 @@ typedef struct {
- 
- 	int nDataChunks;
- 	__u32 fileSizeOrEquivalentObjectId;
--
--}yaffs_CheckpointObject;
-+} yaffs_CheckpointObject;
- 
- /*--------------------- Temporary buffers ----------------
-  *
-@@ -528,13 +532,13 @@ typedef struct {
- /*----------------- Device ---------------------------------*/
- 
- struct yaffs_DeviceStruct {
--	struct list_head devList;
-+	struct ylist_head devList;
- 	const char *name;
- 
- 	/* Entry parameters set up way early. Yaffs sets up the rest.*/
- 	int nDataBytesPerChunk;	/* Should be a power of 2 >= 512 */
- 	int nChunksPerBlock;	/* does not need to be a power of 2 */
--	int nBytesPerSpare;	/* spare area size */
-+	int spareBytesPerChunk;	/* spare area size */
- 	int startBlock;		/* Start block we're allowed to use */
- 	int endBlock;		/* End block we're allowed to use */
- 	int nReservedBlocks;	/* We want this tuneable so that we can reduce */
-@@ -544,9 +548,7 @@ struct yaffs_DeviceStruct {
- 	/* Stuff used by the shared space checkpointing mechanism */
- 	/* If this value is zero, then this mechanism is disabled */
- 
--	int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
--
--
-+/*	int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */
- 
- 
- 	int nShortOpCaches;	/* If <= 0, then short op caching is disabled, else
-@@ -560,30 +562,31 @@ struct yaffs_DeviceStruct {
- 	void *genericDevice;	/* Pointer to device context
- 				 * On an mtd this holds the mtd pointer.
- 				 */
--        void *superBlock;
-+	void *superBlock;
- 
- 	/* NAND access functions (Must be set before calling YAFFS)*/
- 
--	int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
--				 int chunkInNAND, const __u8 * data,
--				 const yaffs_Spare * spare);
--	int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
--				  int chunkInNAND, __u8 * data,
--				  yaffs_Spare * spare);
--	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
--				 int blockInNAND);
--	int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);
-+	int (*writeChunkToNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_Spare *spare);
-+	int (*readChunkFromNAND) (struct yaffs_DeviceStruct *dev,
-+					int chunkInNAND, __u8 *data,
-+					yaffs_Spare *spare);
-+	int (*eraseBlockInNAND) (struct yaffs_DeviceStruct *dev,
-+					int blockInNAND);
-+	int (*initialiseNAND) (struct yaffs_DeviceStruct *dev);
-+	int (*deinitialiseNAND) (struct yaffs_DeviceStruct *dev);
- 
- #ifdef CONFIG_YAFFS_YAFFS2
--	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
--					 int chunkInNAND, const __u8 * data,
--					 const yaffs_ExtendedTags * tags);
--	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
--					  int chunkInNAND, __u8 * data,
--					  yaffs_ExtendedTags * tags);
--	int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
--	int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
--			       yaffs_BlockState * state, int *sequenceNumber);
-+	int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct *dev,
-+					 int chunkInNAND, const __u8 *data,
-+					 const yaffs_ExtendedTags *tags);
-+	int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct *dev,
-+					  int chunkInNAND, __u8 *data,
-+					  yaffs_ExtendedTags *tags);
-+	int (*markNANDBlockBad) (struct yaffs_DeviceStruct *dev, int blockNo);
-+	int (*queryNANDBlock) (struct yaffs_DeviceStruct *dev, int blockNo,
-+			       yaffs_BlockState *state, __u32 *sequenceNumber);
- #endif
- 
- 	int isYaffs2;
-@@ -595,10 +598,12 @@ struct yaffs_DeviceStruct {
- 	void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
- 
- 	/* Callback to mark the superblock dirsty */
--	void (*markSuperBlockDirty)(void * superblock);
-+	void (*markSuperBlockDirty)(void *superblock);
- 
- 	int wideTnodesDisabled; /* Set to disable wide tnodes */
- 
-+	YCHAR *pathDividers;	/* String of legal path dividers */
-+
- 
- 	/* End of stuff that must be set before initialisation. */
- 
-@@ -615,16 +620,14 @@ struct yaffs_DeviceStruct {
- 	__u32 tnodeWidth;
- 	__u32 tnodeMask;
- 
--	/* Stuff to support various file offses to chunk/offset translations */
--	/* "Crumbs" for nDataBytesPerChunk not being a power of 2 */
--	__u32 crumbMask;
--	__u32 crumbShift;
--	__u32 crumbsPerChunk;
--
--	/* Straight shifting for nDataBytesPerChunk being a power of 2 */
--	__u32 chunkShift;
--	__u32 chunkMask;
--
-+	/* Stuff for figuring out file offset to chunk conversions */
-+	__u32 chunkShift; /* Shift value */
-+	__u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
-+	__u32 chunkMask;  /* Mask to use for power-of-2 case */
-+
-+	/* Stuff to handle inband tags */
-+	int inbandTags;
-+	__u32 totalBytesPerChunk;
- 
- #ifdef __KERNEL__
- 
-@@ -633,7 +636,7 @@ struct yaffs_DeviceStruct {
- 	__u8 *spareBuffer;	/* For mtdif2 use. Don't know the size of the buffer
- 				 * at compile time so we have to allocate it.
- 				 */
--	void (*putSuperFunc) (struct super_block * sb);
-+	void (*putSuperFunc) (struct super_block *sb);
- #endif
- 
- 	int isMounted;
-@@ -663,6 +666,8 @@ struct yaffs_DeviceStruct {
- 	__u32 checkpointSum;
- 	__u32 checkpointXor;
- 
-+	int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-+
- 	/* Block Info */
- 	yaffs_BlockInfo *blockInfo;
- 	__u8 *chunkBits;	/* bitmap of chunks in use */
-@@ -684,11 +689,15 @@ struct yaffs_DeviceStruct {
- 	yaffs_TnodeList *allocatedTnodeList;
- 
- 	int isDoingGC;
-+	int gcBlock;
-+	int gcChunk;
- 
- 	int nObjectsCreated;
- 	yaffs_Object *freeObjects;
- 	int nFreeObjects;
- 
-+	int nHardLinks;
-+
- 	yaffs_ObjectList *allocatedObjectList;
- 
- 	yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-@@ -745,8 +754,10 @@ struct yaffs_DeviceStruct {
- 	int nBackgroundDeletions;	/* Count of background deletions. */
- 
- 
-+	/* Temporary buffer management */
- 	yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
- 	int maxTemp;
-+	int tempInUse;
- 	int unmanagedTempAllocations;
- 	int unmanagedTempDeallocations;
- 
-@@ -758,9 +769,9 @@ struct yaffs_DeviceStruct {
- 
- typedef struct yaffs_DeviceStruct yaffs_Device;
- 
--/* The static layout of bllock usage etc is stored in the super block header */
-+/* The static layout of block usage etc is stored in the super block header */
- typedef struct {
--        int StructType;
-+	int StructType;
- 	int version;
- 	int checkpointStartBlock;
- 	int checkpointEndBlock;
-@@ -773,7 +784,7 @@ typedef struct {
-  * must be preserved over unmount/mount cycles.
-  */
- typedef struct {
--        int structType;
-+	int structType;
- 	int nErasedBlocks;
- 	int allocationBlock;	/* Current block being allocated off */
- 	__u32 allocationPage;
-@@ -791,57 +802,45 @@ typedef struct {
- 
- 
- typedef struct {
--    int structType;
--    __u32 magic;
--    __u32 version;
--    __u32 head;
-+	int structType;
-+	__u32 magic;
-+	__u32 version;
-+	__u32 head;
- } yaffs_CheckpointValidity;
- 
--/* Function to manipulate block info */
--static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
--{
--	if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
--		T(YAFFS_TRACE_ERROR,
--		  (TSTR
--		   ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
--		   blk));
--		YBUG();
--	}
--	return &dev->blockInfo[blk - dev->internalStartBlock];
--}
- 
- /*----------------------- YAFFS Functions -----------------------*/
- 
--int yaffs_GutsInitialise(yaffs_Device * dev);
--void yaffs_Deinitialise(yaffs_Device * dev);
-+int yaffs_GutsInitialise(yaffs_Device *dev);
-+void yaffs_Deinitialise(yaffs_Device *dev);
- 
--int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);
-+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
- 
--int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
--		       yaffs_Object * newDir, const YCHAR * newName);
-+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
-+		       yaffs_Object *newDir, const YCHAR *newName);
- 
--int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
--int yaffs_DeleteFile(yaffs_Object * obj);
-+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-+int yaffs_DeleteObject(yaffs_Object *obj);
- 
--int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
--int yaffs_GetObjectFileLength(yaffs_Object * obj);
--int yaffs_GetObjectInode(yaffs_Object * obj);
--unsigned yaffs_GetObjectType(yaffs_Object * obj);
--int yaffs_GetObjectLinkCount(yaffs_Object * obj);
-+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize);
-+int yaffs_GetObjectFileLength(yaffs_Object *obj);
-+int yaffs_GetObjectInode(yaffs_Object *obj);
-+unsigned yaffs_GetObjectType(yaffs_Object *obj);
-+int yaffs_GetObjectLinkCount(yaffs_Object *obj);
- 
--int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
--int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
-+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
- 
- /* File operations */
--int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
--			   int nBytes);
--int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
--			  int nBytes, int writeThrough);
--int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
--
--yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
--			      __u32 mode, __u32 uid, __u32 gid);
--int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
-+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, loff_t offset,
-+				int nBytes);
-+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, loff_t offset,
-+				int nBytes, int writeThrough);
-+int yaffs_ResizeFile(yaffs_Object *obj, loff_t newSize);
-+
-+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+int yaffs_FlushFile(yaffs_Object *obj, int updateTime);
- 
- /* Flushing and checkpointing */
- void yaffs_FlushEntireDeviceCache(yaffs_Device *dev);
-@@ -850,33 +849,33 @@ int yaffs_CheckpointSave(yaffs_Device *d
- int yaffs_CheckpointRestore(yaffs_Device *dev);
- 
- /* Directory operations */
--yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
--				   __u32 mode, __u32 uid, __u32 gid);
--yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
--int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
-+				__u32 mode, __u32 uid, __u32 gid);
-+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir, const YCHAR *name);
-+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
- 				   int (*fn) (yaffs_Object *));
- 
--yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);
-+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number);
- 
- /* Link operations */
--yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
--			 yaffs_Object * equivalentObject);
-+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-+			 yaffs_Object *equivalentObject);
- 
--yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);
-+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
- 
- /* Symlink operations */
--yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid,
--				 const YCHAR * alias);
--YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);
-+				 const YCHAR *alias);
-+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
- 
- /* Special inodes (fifos, sockets and devices) */
--yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
- 				 __u32 mode, __u32 uid, __u32 gid, __u32 rdev);
- 
- /* Special directories */
--yaffs_Object *yaffs_Root(yaffs_Device * dev);
--yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);
-+yaffs_Object *yaffs_Root(yaffs_Device *dev);
-+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
- 
- #ifdef CONFIG_YAFFS_WINCE
- /* CONFIG_YAFFS_WINCE special stuff */
-@@ -885,18 +884,21 @@ void yfsd_WinFileTimeNow(__u32 target[2]
- 
- #ifdef __KERNEL__
- 
--void yaffs_HandleDeferedFree(yaffs_Object * obj);
-+void yaffs_HandleDeferedFree(yaffs_Object *obj);
- #endif
- 
- /* Debug dump  */
--int yaffs_DumpObject(yaffs_Object * obj);
-+int yaffs_DumpObject(yaffs_Object *obj);
- 
--void yaffs_GutsTest(yaffs_Device * dev);
-+void yaffs_GutsTest(yaffs_Device *dev);
- 
- /* A few useful functions */
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
--int yaffs_CheckFF(__u8 * buffer, int nBytes);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn);
-+int yaffs_CheckFF(__u8 *buffer, int nBytes);
- void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
- 
-+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo);
-+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo);
-+
- #endif
---- a/fs/yaffs2/yaffs_mtdif1.c
-+++ b/fs/yaffs2/yaffs_mtdif1.c
-@@ -26,7 +26,7 @@
- #include "yportenv.h"
- #include "yaffs_guts.h"
- #include "yaffs_packedtags1.h"
--#include "yaffs_tagscompat.h"	// for yaffs_CalcTagsECC
-+#include "yaffs_tagscompat.h"	/* for yaffs_CalcTagsECC */
- 
- #include "linux/kernel.h"
- #include "linux/version.h"
-@@ -34,9 +34,9 @@
- #include "linux/mtd/mtd.h"
- 
- /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 
--const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.3 2007/05/15 20:16:11 ian Exp $";
-+const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.10 2009-03-09 07:41:10 charles Exp $";
- 
- #ifndef CONFIG_YAFFS_9BYTE_TAGS
- # define YTAG1_SIZE 8
-@@ -89,9 +89,9 @@ static struct nand_ecclayout nand_oob_16
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
--	int chunkInNAND, const __u8 * data, const yaffs_ExtendedTags * etags)
-+	int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	struct mtd_oob_ops ops;
-@@ -146,7 +146,7 @@ int nandmtd1_WriteChunkWithTagsToNAND(ya
- 
- /* Return with empty ExtendedTags but add eccResult.
-  */
--static int rettags(yaffs_ExtendedTags * etags, int eccResult, int retval)
-+static int rettags(yaffs_ExtendedTags *etags, int eccResult, int retval)
- {
- 	if (etags) {
- 		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
- int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
--	int chunkInNAND, __u8 * data, yaffs_ExtendedTags * etags)
-+	int chunkInNAND, __u8 *data, yaffs_ExtendedTags *etags)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkBytes = dev->nDataBytesPerChunk;
- 	loff_t addr = ((loff_t)chunkInNAND) * chunkBytes;
- 	int eccres = YAFFS_ECC_RESULT_NO_ERROR;
-@@ -189,7 +189,7 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
- 	ops.datbuf = data;
- 	ops.oobbuf = (__u8 *)&pt1;
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
- 	/* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
- 	 * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
- 	 */
-@@ -284,11 +284,11 @@ int nandmtd1_ReadChunkWithTagsFromNAND(y
-  */
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int blocksize = dev->nChunksPerBlock * dev->nDataBytesPerChunk;
- 	int retval;
- 
--	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", blockNo);
-+	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
- 
- 	retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
- 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
-@@ -298,7 +298,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaf
-  *
-  * Returns YAFFS_OK or YAFFS_FAIL.
-  */
--static int nandmtd1_TestPrerequists(struct mtd_info * mtd)
-+static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
- {
- 	/* 2.6.18 has mtd->ecclayout->oobavail */
- 	/* 2.6.21 has mtd->ecclayout->oobavail and mtd->oobavail */
-@@ -323,10 +323,11 @@ static int nandmtd1_TestPrerequists(stru
-  * Always returns YAFFS_OK.
-  */
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * pState, int *pSequenceNumber)
-+	yaffs_BlockState *pState, __u32 *pSequenceNumber)
- {
--	struct mtd_info * mtd = dev->genericDevice;
-+	struct mtd_info *mtd = dev->genericDevice;
- 	int chunkNo = blockNo * dev->nChunksPerBlock;
-+	loff_t addr = (loff_t)chunkNo * dev->nDataBytesPerChunk;
- 	yaffs_ExtendedTags etags;
- 	int state = YAFFS_BLOCK_STATE_DEAD;
- 	int seqnum = 0;
-@@ -335,21 +336,22 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	/* We don't yet have a good place to test for MTD config prerequists.
- 	 * Do it here as we are called during the initial scan.
- 	 */
--	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK) {
-+	if (nandmtd1_TestPrerequists(mtd) != YAFFS_OK)
- 		return YAFFS_FAIL;
--	}
- 
- 	retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
-+	etags.blockBad = (mtd->block_isbad)(mtd, addr);
- 	if (etags.blockBad) {
- 		yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
--			"block %d is marked bad", blockNo);
-+			"block %d is marked bad\n", blockNo);
- 		state = YAFFS_BLOCK_STATE_DEAD;
--	}
--	else if (etags.chunkUsed) {
-+	} else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
-+		/* bad tags, need to look more closely */
-+		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-+	} else if (etags.chunkUsed) {
- 		state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- 		seqnum = etags.sequenceNumber;
--	}
--	else {
-+	} else {
- 		state = YAFFS_BLOCK_STATE_EMPTY;
- 	}
- 
-@@ -360,4 +362,4 @@ int nandmtd1_QueryNANDBlock(struct yaffs
- 	return YAFFS_OK;
- }
- 
--#endif /*KERNEL_VERSION*/
-+#endif /*MTD_VERSION*/
---- a/fs/yaffs2/yaffs_mtdif1.h
-+++ b/fs/yaffs2/yaffs_mtdif1.h
-@@ -14,15 +14,15 @@
- #ifndef __YAFFS_MTDIF1_H__
- #define __YAFFS_MTDIF1_H__
- 
--int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--	const __u8 * data, const yaffs_ExtendedTags * tags);
-+int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+	const __u8 *data, const yaffs_ExtendedTags *tags);
- 
--int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--	__u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+	__u8 *data, yaffs_ExtendedTags *tags);
- 
- int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- 
- int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--	yaffs_BlockState * state, int *sequenceNumber);
-+	yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif2.c
-+++ b/fs/yaffs2/yaffs_mtdif2.c
-@@ -14,7 +14,7 @@
- /* mtd interface for YAFFS2 */
- 
- const char *yaffs_mtdif2_c_version =
--    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -27,19 +27,23 @@ const char *yaffs_mtdif2_c_version =
- 
- #include "yaffs_packedtags2.h"
- 
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags)
-+/* NB For use with inband tags....
-+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
-+ * use it to load the tags.
-+ */
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				      const __u8 *data,
-+				      const yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #else
- 	size_t dummy;
- #endif
- 	int retval = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -48,46 +52,40 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 	   ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (tags)
--		yaffs_PackTags2(&pt, tags);
--	else
--		BUG(); /* both tags and data should always be present */
- 
--	if (data) {
--		ops.mode = MTD_OOB_AUTO;
--		ops.ooblen = sizeof(pt);
--		ops.len = dev->nDataBytesPerChunk;
--		ops.ooboffs = 0;
--		ops.datbuf = (__u8 *)data;
--		ops.oobbuf = (void *)&pt;
--		retval = mtd->write_oob(mtd, addr, &ops);
-+	addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-+
-+	/* For yaffs2 writing there must be both data and tags.
-+	 * If we're using inband tags, then the tags are stuffed into
-+	 * the end of the data buffer.
-+	 */
-+	if (!data || !tags)
-+		BUG();
-+	else if (dev->inbandTags) {
-+		yaffs_PackedTags2TagsPart *pt2tp;
-+		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-+		yaffs_PackTags2TagsPart(pt2tp, tags);
- 	} else
--		BUG(); /* both tags and data should always be present */
--#else
--	if (tags) {
- 		yaffs_PackTags2(&pt, tags);
--	}
- 
--	if (data && tags) {
--		if (dev->useNANDECC)
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--		else
--			retval =
--			    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					   &dummy, data, (__u8 *) & pt, NULL);
--	} else {
--		if (data)
--			retval =
--			    mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
--				       data);
--		if (tags)
--			retval =
--			    mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
--					   (__u8 *) & pt);
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	ops.mode = MTD_OOB_AUTO;
-+	ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
-+	ops.len = dev->totalBytesPerChunk;
-+	ops.ooboffs = 0;
-+	ops.datbuf = (__u8 *)data;
-+	ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
-+	retval = mtd->write_oob(mtd, addr, &ops);
- 
-+#else
-+	if (!dev->inbandTags) {
-+		retval =
-+		    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+				   &dummy, data, (__u8 *) &pt, NULL);
-+	} else {
-+		retval =
-+		    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
-+			       data);
- 	}
- #endif
- 
-@@ -97,17 +95,18 @@ int nandmtd2_WriteChunkWithTagsToNAND(ya
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags)
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				       __u8 *data, yaffs_ExtendedTags *tags)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
-+	int localData = 0;
- 
--	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-+	loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
- 
- 	yaffs_PackedTags2 pt;
- 
-@@ -116,9 +115,20 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 	   ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- 	    TENDSTR), chunkInNAND, data, tags));
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
--	if (data && !tags)
--		retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
-+	if (dev->inbandTags) {
-+
-+		if (!data) {
-+			localData = 1;
-+			data = yaffs_GetTempBuffer(dev, __LINE__);
-+		}
-+
-+
-+	}
-+
-+
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-+	if (dev->inbandTags || (data && !tags))
-+		retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
- 				&dummy, data);
- 	else if (tags) {
- 		ops.mode = MTD_OOB_AUTO;
-@@ -130,38 +140,42 @@ int nandmtd2_ReadChunkWithTagsFromNAND(y
- 		retval = mtd->read_oob(mtd, addr, &ops);
- 	}
- #else
--	if (data && tags) {
--		if (dev->useNANDECC) {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
--					  &dummy, data, dev->spareBuffer,
--					  NULL);
--		} else {
--			retval =
--			    mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-+	if (!dev->inbandTags && data && tags) {
-+
-+		retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
- 					  &dummy, data, dev->spareBuffer,
- 					  NULL);
--		}
- 	} else {
- 		if (data)
- 			retval =
- 			    mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
- 				      data);
--		if (tags)
-+		if (!dev->inbandTags && tags)
- 			retval =
- 			    mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- 					  dev->spareBuffer);
- 	}
- #endif
- 
--	memcpy(&pt, dev->spareBuffer, sizeof(pt));
- 
--	if (tags)
--		yaffs_UnpackTags2(tags, &pt);
-+	if (dev->inbandTags) {
-+		if (tags) {
-+			yaffs_PackedTags2TagsPart *pt2tp;
-+			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
-+			yaffs_UnpackTags2TagsPart(tags, pt2tp);
-+		}
-+	} else {
-+		if (tags) {
-+			memcpy(&pt, dev->spareBuffer, sizeof(pt));
-+			yaffs_UnpackTags2(tags, &pt);
-+		}
-+	}
- 
--	if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
--		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+	if (localData)
-+		yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- 
-+	if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+		tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
- 	if (retval == 0)
- 		return YAFFS_OK;
- 	else
-@@ -178,7 +192,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- 	retval =
- 	    mtd->block_markbad(mtd,
- 			       blockNo * dev->nChunksPerBlock *
--			       dev->nDataBytesPerChunk);
-+			       dev->totalBytesPerChunk);
- 
- 	if (retval == 0)
- 		return YAFFS_OK;
-@@ -188,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaf
- }
- 
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber)
-+			    yaffs_BlockState *state, __u32 *sequenceNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	int retval;
-@@ -198,7 +212,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs
- 	retval =
- 	    mtd->block_isbad(mtd,
- 			     blockNo * dev->nChunksPerBlock *
--			     dev->nDataBytesPerChunk);
-+			     dev->totalBytesPerChunk);
- 
- 	if (retval) {
- 		T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
---- a/fs/yaffs2/yaffs_mtdif2.h
-+++ b/fs/yaffs2/yaffs_mtdif2.h
-@@ -17,13 +17,13 @@
- #define __YAFFS_MTDIF2_H__
- 
- #include "yaffs_guts.h"
--int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
--				      const __u8 * data,
--				      const yaffs_ExtendedTags * tags);
--int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--				       __u8 * data, yaffs_ExtendedTags * tags);
-+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
-+				const __u8 *data,
-+				const yaffs_ExtendedTags *tags);
-+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+				__u8 *data, yaffs_ExtendedTags *tags);
- int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			    yaffs_BlockState * state, int *sequenceNumber);
-+			yaffs_BlockState *state, __u32 *sequenceNumber);
- 
- #endif
---- a/fs/yaffs2/yaffs_mtdif.c
-+++ b/fs/yaffs2/yaffs_mtdif.c
-@@ -12,7 +12,7 @@
-  */
- 
- const char *yaffs_mtdif_c_version =
--    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
- 
- #include "yportenv.h"
- 
-@@ -24,7 +24,7 @@ const char *yaffs_mtdif_c_version =
- #include "linux/time.h"
- #include "linux/mtd/nand.h"
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
- static struct nand_oobinfo yaffs_oobinfo = {
- 	.useecc = 1,
- 	.eccbytes = 6,
-@@ -36,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccin
- };
- #endif
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
- {
- 	oob[0] = spare->tagByte0;
-@@ -45,8 +45,8 @@ static inline void translate_spare2oob(c
- 	oob[3] = spare->tagByte3;
- 	oob[4] = spare->tagByte4;
- 	oob[5] = spare->tagByte5 & 0x3f;
--	oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
--	oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
-+	oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
-+	oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
- 	oob[6] = spare->tagByte6;
- 	oob[7] = spare->tagByte7;
- }
-@@ -71,18 +71,18 @@ static inline void translate_oob2spare(y
- }
- #endif
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare)
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			     const __u8 *data, const yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -135,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare)
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			      yaffs_Spare *spare)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	struct mtd_oob_ops ops;
- #endif
- 	size_t dummy;
- 	int retval = 0;
- 
- 	loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
-+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
- 	__u8 spareAsBytes[8]; /* OOB */
- 
- 	if (data && !spare)
-@@ -205,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Devi
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
- {
- 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- 	__u32 addr =
-@@ -234,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Devic
- 		return YAFFS_FAIL;
- }
- 
--int nandmtd_InitialiseNAND(yaffs_Device * dev)
-+int nandmtd_InitialiseNAND(yaffs_Device *dev)
- {
- 	return YAFFS_OK;
- }
---- a/fs/yaffs2/yaffs_mtdif.h
-+++ b/fs/yaffs2/yaffs_mtdif.h
-@@ -18,10 +18,15 @@
- 
- #include "yaffs_guts.h"
- 
--int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
--			     const __u8 * data, const yaffs_Spare * spare);
--int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
--			      yaffs_Spare * spare);
--int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
--int nandmtd_InitialiseNAND(yaffs_Device * dev);
-+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
-+extern struct nand_oobinfo yaffs_oobinfo;
-+extern struct nand_oobinfo yaffs_noeccinfo;
-+#endif
-+
-+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
-+			const __u8 *data, const yaffs_Spare *spare);
-+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
-+			yaffs_Spare *spare);
-+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-+int nandmtd_InitialiseNAND(yaffs_Device *dev);
- #endif
---- a/fs/yaffs2/yaffs_nand.c
-+++ b/fs/yaffs2/yaffs_nand.c
-@@ -12,16 +12,17 @@
-  */
- 
- const char *yaffs_nand_c_version =
--    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";
-+	"$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
- 
- #include "yaffs_nand.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_tagsvalidity.h"
- 
-+#include "yaffs_getblockinfo.h"
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags)
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					   __u8 *buffer,
-+					   yaffs_ExtendedTags *tags)
- {
- 	int result;
- 	yaffs_ExtendedTags localTags;
-@@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
- 
- 	/* If there are no tags provided, use local tags to get prioritised gc working */
--	if(!tags)
-+	if (!tags)
- 		tags = &localTags;
- 
- 	if (dev->readChunkWithTagsFromNAND)
-@@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaff
- 									realignedChunkInNAND,
- 									buffer,
- 									tags);
--	if(tags &&
--	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-+	if (tags &&
-+	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- 
- 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
--                yaffs_HandleChunkError(dev,bi);
-+		yaffs_HandleChunkError(dev, bi);
- 	}
- 
- 	return result;
- }
- 
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
- 						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags)
-+						   const __u8 *buffer,
-+						   yaffs_ExtendedTags *tags)
- {
- 	chunkInNAND -= dev->chunkOffset;
- 
-@@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs
- 								       tags);
- }
- 
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
- {
- 	blockNo -= dev->blockOffset;
- 
-@@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * de
- 		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
- }
- 
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
- 						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber)
-+						 yaffs_BlockState *state,
-+						 __u32 *sequenceNumber)
- {
- 	blockNo -= dev->blockOffset;
- 
---- a/fs/yaffs2/yaffs_nandemul2k.h
-+++ b/fs/yaffs2/yaffs_nandemul2k.h
-@@ -21,14 +21,14 @@
- #include "yaffs_guts.h"
- 
- int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
--					int chunkInNAND, const __u8 * data,
--					yaffs_ExtendedTags * tags);
-+					int chunkInNAND, const __u8 *data,
-+					const yaffs_ExtendedTags *tags);
- int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_DeviceStruct *dev,
--					 int chunkInNAND, __u8 * data,
--					 yaffs_ExtendedTags * tags);
-+					 int chunkInNAND, __u8 *data,
-+					 yaffs_ExtendedTags *tags);
- int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo);
- int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
--			      yaffs_BlockState * state, int *sequenceNumber);
-+			      yaffs_BlockState *state, __u32 *sequenceNumber);
- int nandemul2k_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				int blockInNAND);
- int nandemul2k_InitialiseNAND(struct yaffs_DeviceStruct *dev);
---- a/fs/yaffs2/yaffs_nand.h
-+++ b/fs/yaffs2/yaffs_nand.h
-@@ -19,21 +19,21 @@
- 
- 
- 
--int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
--					   __u8 * buffer,
--					   yaffs_ExtendedTags * tags);
--
--int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
--						   int chunkInNAND,
--						   const __u8 * buffer,
--						   yaffs_ExtendedTags * tags);
--
--int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
--
--int yaffs_QueryInitialBlockState(yaffs_Device * dev,
--						 int blockNo,
--						 yaffs_BlockState * state,
--						 unsigned *sequenceNumber);
-+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-+					__u8 *buffer,
-+					yaffs_ExtendedTags *tags);
-+
-+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *buffer,
-+						yaffs_ExtendedTags *tags);
-+
-+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
-+
-+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-+						int blockNo,
-+						yaffs_BlockState *state,
-+						unsigned *sequenceNumber);
- 
- int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
- 				  int blockInNAND);
---- a/fs/yaffs2/yaffs_packedtags1.c
-+++ b/fs/yaffs2/yaffs_packedtags1.c
-@@ -14,7 +14,7 @@
- #include "yaffs_packedtags1.h"
- #include "yportenv.h"
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
- {
- 	pt->chunkId = t->chunkId;
- 	pt->serialNumber = t->serialNumber;
-@@ -27,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 *
- 
- }
- 
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
- {
- 	static const __u8 allFF[] =
- 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-@@ -35,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 
- 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
- 		t->blockBad = 0;
--		if (pt->shouldBeFF != 0xFFFFFFFF) {
-+		if (pt->shouldBeFF != 0xFFFFFFFF)
- 			t->blockBad = 1;
--		}
- 		t->chunkUsed = 1;
- 		t->objectId = pt->objectId;
- 		t->chunkId = pt->chunkId;
-@@ -47,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTag
- 		t->serialNumber = pt->serialNumber;
- 	} else {
- 		memset(t, 0, sizeof(yaffs_ExtendedTags));
--
- 	}
- }
---- a/fs/yaffs2/yaffs_packedtags1.h
-+++ b/fs/yaffs2/yaffs_packedtags1.h
-@@ -32,6 +32,6 @@ typedef struct {
- 
- } yaffs_PackedTags1;
- 
--void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
-+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt);
- #endif
---- a/fs/yaffs2/yaffs_packedtags2.c
-+++ b/fs/yaffs2/yaffs_packedtags2.c
-@@ -37,60 +37,68 @@
- #define EXTRA_OBJECT_TYPE_SHIFT (28)
- #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
- 
--static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
-+
-+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
--	   pt->t.objectId, pt->t.chunkId, pt->t.byteCount,
--	   pt->t.sequenceNumber));
-+	   ptt->objectId, ptt->chunkId, ptt->byteCount,
-+	   ptt->sequenceNumber));
-+}
-+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
-+{
-+	yaffs_DumpPackedTags2TagsPart(&pt->t);
- }
- 
--static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
-+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
- {
- 	T(YAFFS_TRACE_MTD,
- 	  (TSTR
--	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte "
--	    "%d del %d ser %d seq %d"
-+	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
- 	    TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId,
- 	   t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber,
- 	   t->sequenceNumber));
- 
- }
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
-+		const yaffs_ExtendedTags *t)
- {
--	pt->t.chunkId = t->chunkId;
--	pt->t.sequenceNumber = t->sequenceNumber;
--	pt->t.byteCount = t->byteCount;
--	pt->t.objectId = t->objectId;
-+	ptt->chunkId = t->chunkId;
-+	ptt->sequenceNumber = t->sequenceNumber;
-+	ptt->byteCount = t->byteCount;
-+	ptt->objectId = t->objectId;
- 
- 	if (t->chunkId == 0 && t->extraHeaderInfoAvailable) {
- 		/* Store the extra header info instead */
- 		/* We save the parent object in the chunkId */
--		pt->t.chunkId = EXTRA_HEADER_INFO_FLAG
-+		ptt->chunkId = EXTRA_HEADER_INFO_FLAG
- 			| t->extraParentObjectId;
--		if (t->extraIsShrinkHeader) {
--			pt->t.chunkId |= EXTRA_SHRINK_FLAG;
--		}
--		if (t->extraShadows) {
--			pt->t.chunkId |= EXTRA_SHADOWS_FLAG;
--		}
-+		if (t->extraIsShrinkHeader)
-+			ptt->chunkId |= EXTRA_SHRINK_FLAG;
-+		if (t->extraShadows)
-+			ptt->chunkId |= EXTRA_SHADOWS_FLAG;
- 
--		pt->t.objectId &= ~EXTRA_OBJECT_TYPE_MASK;
--		pt->t.objectId |=
-+		ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
-+		ptt->objectId |=
- 		    (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT);
- 
--		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--			pt->t.byteCount = t->extraEquivalentObjectId;
--		} else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) {
--			pt->t.byteCount = t->extraFileLength;
--		} else {
--			pt->t.byteCount = 0;
--		}
-+		if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+			ptt->byteCount = t->extraEquivalentObjectId;
-+		else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE)
-+			ptt->byteCount = t->extraFileLength;
-+		else
-+			ptt->byteCount = 0;
- 	}
- 
--	yaffs_DumpPackedTags2(pt);
-+	yaffs_DumpPackedTags2TagsPart(ptt);
- 	yaffs_DumpTags2(t);
-+}
-+
-+
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
-+{
-+	yaffs_PackTags2TagsPart(&pt->t, t);
- 
- #ifndef YAFFS_IGNORE_TAGS_ECC
- 	{
-@@ -101,82 +109,98 @@ void yaffs_PackTags2(yaffs_PackedTags2 *
- #endif
- }
- 
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
-+
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
-+		yaffs_PackedTags2TagsPart *ptt)
- {
- 
- 	memset(t, 0, sizeof(yaffs_ExtendedTags));
- 
- 	yaffs_InitialiseTags(t);
- 
--	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
--		/* Page is in use */
--#ifdef YAFFS_IGNORE_TAGS_ECC
--		{
--			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--		}
--#else
--		{
--			yaffs_ECCOther ecc;
--			int result;
--			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
--						sizeof
--						(yaffs_PackedTags2TagsPart),
--						&ecc);
--			result =
--			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
--						  sizeof
--						  (yaffs_PackedTags2TagsPart),
--						  &pt->ecc, &ecc);
--			switch(result){
--				case 0:
--					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
--					break;
--				case 1:
--					t->eccResult = YAFFS_ECC_RESULT_FIXED;
--					break;
--				case -1:
--					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
--					break;
--				default:
--					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
--			}
--		}
--#endif
-+	if (ptt->sequenceNumber != 0xFFFFFFFF) {
- 		t->blockBad = 0;
- 		t->chunkUsed = 1;
--		t->objectId = pt->t.objectId;
--		t->chunkId = pt->t.chunkId;
--		t->byteCount = pt->t.byteCount;
-+		t->objectId = ptt->objectId;
-+		t->chunkId = ptt->chunkId;
-+		t->byteCount = ptt->byteCount;
- 		t->chunkDeleted = 0;
- 		t->serialNumber = 0;
--		t->sequenceNumber = pt->t.sequenceNumber;
-+		t->sequenceNumber = ptt->sequenceNumber;
- 
- 		/* Do extra header info stuff */
- 
--		if (pt->t.chunkId & EXTRA_HEADER_INFO_FLAG) {
-+		if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) {
- 			t->chunkId = 0;
- 			t->byteCount = 0;
- 
- 			t->extraHeaderInfoAvailable = 1;
- 			t->extraParentObjectId =
--			    pt->t.chunkId & (~(ALL_EXTRA_FLAGS));
-+			    ptt->chunkId & (~(ALL_EXTRA_FLAGS));
- 			t->extraIsShrinkHeader =
--			    (pt->t.chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0;
- 			t->extraShadows =
--			    (pt->t.chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
-+			    (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0;
- 			t->extraObjectType =
--			    pt->t.objectId >> EXTRA_OBJECT_TYPE_SHIFT;
-+			    ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT;
- 			t->objectId &= ~EXTRA_OBJECT_TYPE_MASK;
- 
--			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) {
--				t->extraEquivalentObjectId = pt->t.byteCount;
--			} else {
--				t->extraFileLength = pt->t.byteCount;
-+			if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK)
-+				t->extraEquivalentObjectId = ptt->byteCount;
-+			else
-+				t->extraFileLength = ptt->byteCount;
-+		}
-+	}
-+
-+	yaffs_DumpPackedTags2TagsPart(ptt);
-+	yaffs_DumpTags2(t);
-+
-+}
-+
-+
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
-+{
-+
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+
-+	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
-+		/* Page is in use */
-+#ifndef YAFFS_IGNORE_TAGS_ECC
-+		{
-+			yaffs_ECCOther ecc;
-+			int result;
-+			yaffs_ECCCalculateOther((unsigned char *)&pt->t,
-+						sizeof
-+						(yaffs_PackedTags2TagsPart),
-+						&ecc);
-+			result =
-+			    yaffs_ECCCorrectOther((unsigned char *)&pt->t,
-+						  sizeof
-+						  (yaffs_PackedTags2TagsPart),
-+						  &pt->ecc, &ecc);
-+			switch (result) {
-+			case 0:
-+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-+				break;
-+			case 1:
-+				eccResult = YAFFS_ECC_RESULT_FIXED;
-+				break;
-+			case -1:
-+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
-+				break;
-+			default:
-+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 			}
- 		}
-+#endif
- 	}
- 
-+	yaffs_UnpackTags2TagsPart(t, &pt->t);
-+
-+	t->eccResult = eccResult;
-+
- 	yaffs_DumpPackedTags2(pt);
- 	yaffs_DumpTags2(t);
- 
- }
-+
---- a/fs/yaffs2/yaffs_packedtags2.h
-+++ b/fs/yaffs2/yaffs_packedtags2.h
-@@ -33,6 +33,11 @@ typedef struct {
- 	yaffs_ECCOther ecc;
- } yaffs_PackedTags2;
- 
--void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
--void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
-+/* Full packed tags with ECC, used for oob tags */
-+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt);
-+
-+/* Only the tags part (no ECC for use with inband tags */
-+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t);
-+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt);
- #endif
---- a/fs/yaffs2/yaffs_qsort.c
-+++ b/fs/yaffs2/yaffs_qsort.c
-@@ -28,12 +28,12 @@
-  */
- 
- #include "yportenv.h"
--//#include <linux/string.h>
-+/* #include <linux/string.h> */
- 
- /*
-  * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
-  */
--#define swapcode(TYPE, parmi, parmj, n) { 		\
-+#define swapcode(TYPE, parmi, parmj, n) do { 		\
- 	long i = (n) / sizeof (TYPE); 			\
- 	register TYPE *pi = (TYPE *) (parmi); 		\
- 	register TYPE *pj = (TYPE *) (parmj); 		\
-@@ -41,28 +41,29 @@
- 		register TYPE	t = *pi;		\
- 		*pi++ = *pj;				\
- 		*pj++ = t;				\
--        } while (--i > 0);				\
--}
-+	} while (--i > 0);				\
-+} while (0)
- 
- #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
--	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-+	es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1;
- 
- static __inline void
- swapfunc(char *a, char *b, int n, int swaptype)
- {
- 	if (swaptype <= 1)
--		swapcode(long, a, b, n)
-+		swapcode(long, a, b, n);
- 	else
--		swapcode(char, a, b, n)
-+		swapcode(char, a, b, n);
- }
- 
--#define swap(a, b)					\
-+#define yswap(a, b) do {					\
- 	if (swaptype == 0) {				\
- 		long t = *(long *)(a);			\
- 		*(long *)(a) = *(long *)(b);		\
- 		*(long *)(b) = t;			\
- 	} else						\
--		swapfunc(a, b, es, swaptype)
-+		swapfunc(a, b, es, swaptype);		\
-+} while (0)
- 
- #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
- 
-@@ -70,12 +71,12 @@ static __inline char *
- med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
- {
- 	return cmp(a, b) < 0 ?
--	       (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
--              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-+		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-+		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
- }
- 
- #ifndef min
--#define min(a,b) (((a) < (b)) ? (a) : (b))
-+#define min(a, b) (((a) < (b)) ? (a) : (b))
- #endif
- 
- void
-@@ -92,7 +93,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 	pm = (char *)a + (n / 2) * es;
-@@ -107,7 +108,7 @@ loop:	SWAPINIT(a, es);
- 		}
- 		pm = med3(pl, pm, pn, cmp);
- 	}
--	swap(a, pm);
-+	yswap(a, pm);
- 	pa = pb = (char *)a + es;
- 
- 	pc = pd = (char *)a + (n - 1) * es;
-@@ -115,7 +116,7 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pb, a)) <= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pa, pb);
-+				yswap(pa, pb);
- 				pa += es;
- 			}
- 			pb += es;
-@@ -123,14 +124,14 @@ loop:	SWAPINIT(a, es);
- 		while (pb <= pc && (r = cmp(pc, a)) >= 0) {
- 			if (r == 0) {
- 				swap_cnt = 1;
--				swap(pc, pd);
-+				yswap(pc, pd);
- 				pd -= es;
- 			}
- 			pc -= es;
- 		}
- 		if (pb > pc)
- 			break;
--		swap(pb, pc);
-+		yswap(pb, pc);
- 		swap_cnt = 1;
- 		pb += es;
- 		pc -= es;
-@@ -139,7 +140,7 @@ loop:	SWAPINIT(a, es);
- 		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
- 			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
- 			     pl -= es)
--				swap(pl, pl - es);
-+				yswap(pl, pl - es);
- 		return;
- 	}
- 
-@@ -148,9 +149,11 @@ loop:	SWAPINIT(a, es);
- 	vecswap(a, pb - r, r);
- 	r = min((long)(pd - pc), (long)(pn - pd - es));
- 	vecswap(pb, pn - r, r);
--	if ((r = pb - pa) > es)
-+	r = pb - pa;
-+	if (r > es)
- 		yaffs_qsort(a, r / es, es, cmp);
--	if ((r = pd - pc) > es) {
-+	r = pd - pc;
-+	if (r > es) {
- 		/* Iterate rather than recurse to save stack space */
- 		a = pn - r;
- 		n = r / es;
---- a/fs/yaffs2/yaffs_qsort.h
-+++ b/fs/yaffs2/yaffs_qsort.h
-@@ -17,7 +17,7 @@
- #ifndef __YAFFS_QSORT_H__
- #define __YAFFS_QSORT_H__
- 
--extern void yaffs_qsort (void *const base, size_t total_elems, size_t size,
--                   int (*cmp)(const void *, const void *));
-+extern void yaffs_qsort(void *const base, size_t total_elems, size_t size,
-+			int (*cmp)(const void *, const void *));
- 
- #endif
---- a/fs/yaffs2/yaffs_tagscompat.c
-+++ b/fs/yaffs2/yaffs_tagscompat.c
-@@ -14,16 +14,17 @@
- #include "yaffs_guts.h"
- #include "yaffs_tagscompat.h"
- #include "yaffs_ecc.h"
-+#include "yaffs_getblockinfo.h"
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND);
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND);
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare);
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare);
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND);
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND);
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare);
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare);
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND);
- #endif
- 
- static const char yaffs_countBitsTable[256] = {
-@@ -54,13 +55,13 @@ int yaffs_CountBits(__u8 x)
- 
- /********** Tags ECC calculations  *********/
- 
--void yaffs_CalcECC(const __u8 * data, yaffs_Spare * spare)
-+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
- {
- 	yaffs_ECCCalculate(data, spare->ecc1);
- 	yaffs_ECCCalculate(&data[256], spare->ecc2);
- }
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags)
-+void yaffs_CalcTagsECC(yaffs_Tags *tags)
- {
- 	/* Calculate an ecc */
- 
-@@ -74,9 +75,8 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 	for (i = 0; i < 8; i++) {
- 		for (j = 1; j & 0xff; j <<= 1) {
- 			bit++;
--			if (b[i] & j) {
-+			if (b[i] & j)
- 				ecc ^= bit;
--			}
- 		}
- 	}
- 
-@@ -84,7 +84,7 @@ void yaffs_CalcTagsECC(yaffs_Tags * tags
- 
- }
- 
--int yaffs_CheckECCOnTags(yaffs_Tags * tags)
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags)
- {
- 	unsigned ecc = tags->ecc;
- 
-@@ -115,8 +115,8 @@ int yaffs_CheckECCOnTags(yaffs_Tags * ta
- 
- /********** Tags **********/
- 
--static void yaffs_LoadTagsIntoSpare(yaffs_Spare * sparePtr,
--				    yaffs_Tags * tagsPtr)
-+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 
-@@ -132,8 +132,8 @@ static void yaffs_LoadTagsIntoSpare(yaff
- 	sparePtr->tagByte7 = tu->asBytes[7];
- }
- 
--static void yaffs_GetTagsFromSpare(yaffs_Device * dev, yaffs_Spare * sparePtr,
--				   yaffs_Tags * tagsPtr)
-+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,
-+				yaffs_Tags *tagsPtr)
- {
- 	yaffs_TagsUnion *tu = (yaffs_TagsUnion *) tagsPtr;
- 	int result;
-@@ -148,21 +148,20 @@ static void yaffs_GetTagsFromSpare(yaffs
- 	tu->asBytes[7] = sparePtr->tagByte7;
- 
- 	result = yaffs_CheckECCOnTags(tagsPtr);
--	if (result > 0) {
-+	if (result > 0)
- 		dev->tagsEccFixed++;
--	} else if (result < 0) {
-+	else if (result < 0)
- 		dev->tagsEccUnfixed++;
--	}
- }
- 
--static void yaffs_SpareInitialise(yaffs_Spare * spare)
-+static void yaffs_SpareInitialise(yaffs_Spare *spare)
- {
- 	memset(spare, 0xFF, sizeof(yaffs_Spare));
- }
- 
- static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,
--				  int chunkInNAND, const __u8 * data,
--				  yaffs_Spare * spare)
-+				int chunkInNAND, const __u8 *data,
-+				yaffs_Spare *spare)
- {
- 	if (chunkInNAND < dev->startBlock * dev->nChunksPerBlock) {
- 		T(YAFFS_TRACE_ERROR,
-@@ -177,9 +176,9 @@ static int yaffs_WriteChunkToNAND(struct
- 
- static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
- 				   int chunkInNAND,
--				   __u8 * data,
--				   yaffs_Spare * spare,
--				   yaffs_ECCResult * eccResult,
-+				   __u8 *data,
-+				   yaffs_Spare *spare,
-+				   yaffs_ECCResult *eccResult,
- 				   int doErrorCorrection)
- {
- 	int retVal;
-@@ -252,9 +251,11 @@ static int yaffs_ReadChunkFromNAND(struc
- 		/* Must allocate enough memory for spare+2*sizeof(int) */
- 		/* for ecc results from device. */
- 		struct yaffs_NANDSpare nspare;
--		retVal =
--		    dev->readChunkFromNAND(dev, chunkInNAND, data,
--					   (yaffs_Spare *) & nspare);
-+
-+		memset(&nspare, 0, sizeof(nspare));
-+
-+		retVal = dev->readChunkFromNAND(dev, chunkInNAND, data,
-+					(yaffs_Spare *) &nspare);
- 		memcpy(spare, &nspare, sizeof(yaffs_Spare));
- 		if (data && doErrorCorrection) {
- 			if (nspare.eccres1 > 0) {
-@@ -302,8 +303,7 @@ static int yaffs_ReadChunkFromNAND(struc
- static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
- 				  int chunkInNAND)
- {
--
--	static int init = 0;
-+	static int init;
- 	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
- 	static __u8 data[YAFFS_BYTES_PER_CHUNK];
- 	/* Might as well always allocate the larger size for */
-@@ -331,12 +331,12 @@ static int yaffs_CheckChunkErased(struct
-  * Functions for robustisizing
-  */
- 
--static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleReadDataError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
- 	/* Mark the block for retirement */
--	yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
-+	yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
- 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
- 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));
- 
-@@ -348,22 +348,22 @@ static void yaffs_HandleReadDataError(ya
- }
- 
- #ifdef NOTYET
--static void yaffs_CheckWrittenBlock(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_CheckWrittenBlock(yaffs_Device *dev, int chunkInNAND)
- {
- }
- 
--static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
--				     const __u8 * data,
--				     const yaffs_Spare * spare)
-+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
-+				     const __u8 *data,
-+				     const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
--				    const yaffs_Spare * spare)
-+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
-+				    const yaffs_Spare *spare)
- {
- }
- 
--static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND)
-+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND)
- {
- 	int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
- 
-@@ -373,8 +373,8 @@ static void yaffs_HandleWriteChunkError(
- 	yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
- }
- 
--static int yaffs_VerifyCompare(const __u8 * d0, const __u8 * d1,
--			       const yaffs_Spare * s0, const yaffs_Spare * s1)
-+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 *d1,
-+			       const yaffs_Spare *s0, const yaffs_Spare *s1)
- {
- 
- 	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-@@ -398,28 +398,35 @@ static int yaffs_VerifyCompare(const __u
- }
- #endif				/* NOTYET */
- 
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    eTags)
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *eTags)
- {
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
- 
- 	yaffs_SpareInitialise(&spare);
- 
--	if (eTags->chunkDeleted) {
-+	if (eTags->chunkDeleted)
- 		spare.pageStatus = 0;
--	} else {
-+	else {
- 		tags.objectId = eTags->objectId;
- 		tags.chunkId = eTags->chunkId;
--		tags.byteCount = eTags->byteCount;
-+
-+		tags.byteCountLSB = eTags->byteCount & 0x3ff;
-+
-+		if (dev->nDataBytesPerChunk >= 1024)
-+			tags.byteCountMSB = (eTags->byteCount >> 10) & 3;
-+		else
-+			tags.byteCountMSB = 3;
-+
-+
- 		tags.serialNumber = eTags->serialNumber;
- 
--		if (!dev->useNANDECC && data) {
-+		if (!dev->useNANDECC && data)
- 			yaffs_CalcECC(data, &spare);
--		}
-+
- 		yaffs_LoadTagsIntoSpare(&spare, &tags);
- 
- 	}
-@@ -427,15 +434,15 @@ int yaffs_TagsCompatabilityWriteChunkWit
- 	return yaffs_WriteChunkToNAND(dev, chunkInNAND, data, &spare);
- }
- 
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
- 						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags * eTags)
-+						     __u8 *data,
-+						     yaffs_ExtendedTags *eTags)
- {
- 
- 	yaffs_Spare spare;
- 	yaffs_Tags tags;
--	yaffs_ECCResult eccResult;
-+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_UNKNOWN;
- 
- 	static yaffs_Spare spareFF;
- 	static int init;
-@@ -466,7 +473,11 @@ int yaffs_TagsCompatabilityReadChunkWith
- 
- 				eTags->objectId = tags.objectId;
- 				eTags->chunkId = tags.chunkId;
--				eTags->byteCount = tags.byteCount;
-+				eTags->byteCount = tags.byteCountLSB;
-+
-+				if (dev->nDataBytesPerChunk >= 1024)
-+					eTags->byteCount |= (((unsigned) tags.byteCountMSB) << 10);
-+
- 				eTags->serialNumber = tags.serialNumber;
- 			}
- 		}
-@@ -497,9 +508,9 @@ int yaffs_TagsCompatabilityMarkNANDBlock
- }
- 
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state,
--					  int *sequenceNumber)
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber)
- {
- 
- 	yaffs_Spare spare0, spare1;
---- a/fs/yaffs2/yaffs_tagscompat.h
-+++ b/fs/yaffs2/yaffs_tagscompat.h
-@@ -17,24 +17,23 @@
- #define __YAFFS_TAGSCOMPAT_H__
- 
- #include "yaffs_guts.h"
--int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device * dev,
--						    int chunkInNAND,
--						    const __u8 * data,
--						    const yaffs_ExtendedTags *
--						    tags);
--int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev,
--						     int chunkInNAND,
--						     __u8 * data,
--						     yaffs_ExtendedTags *
--						     tags);
-+int yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						const __u8 *data,
-+						const yaffs_ExtendedTags *tags);
-+int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device *dev,
-+						int chunkInNAND,
-+						__u8 *data,
-+						yaffs_ExtendedTags *tags);
- int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev,
- 					    int blockNo);
- int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev,
--					  int blockNo, yaffs_BlockState *
--					  state, int *sequenceNumber);
-+					  int blockNo,
-+					  yaffs_BlockState *state,
-+					  __u32 *sequenceNumber);
- 
--void yaffs_CalcTagsECC(yaffs_Tags * tags);
--int yaffs_CheckECCOnTags(yaffs_Tags * tags);
-+void yaffs_CalcTagsECC(yaffs_Tags *tags);
-+int yaffs_CheckECCOnTags(yaffs_Tags *tags);
- int yaffs_CountBits(__u8 byte);
- 
- #endif
---- a/fs/yaffs2/yaffs_tagsvalidity.c
-+++ b/fs/yaffs2/yaffs_tagsvalidity.c
-@@ -13,14 +13,14 @@
- 
- #include "yaffs_tagsvalidity.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags)
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags)
- {
- 	memset(tags, 0, sizeof(yaffs_ExtendedTags));
- 	tags->validMarker0 = 0xAAAAAAAA;
- 	tags->validMarker1 = 0x55555555;
- }
- 
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags)
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags)
- {
- 	return (tags->validMarker0 == 0xAAAAAAAA &&
- 		tags->validMarker1 == 0x55555555);
---- a/fs/yaffs2/yaffs_tagsvalidity.h
-+++ b/fs/yaffs2/yaffs_tagsvalidity.h
-@@ -19,6 +19,6 @@
- 
- #include "yaffs_guts.h"
- 
--void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
--int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
-+void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-+int yaffs_ValidateTags(yaffs_ExtendedTags *tags);
- #endif
---- a/fs/yaffs2/yportenv.h
-+++ b/fs/yaffs2/yportenv.h
-@@ -17,17 +17,28 @@
- #ifndef __YPORTENV_H__
- #define __YPORTENV_H__
- 
-+/*
-+ * Define the MTD version in terms of Linux Kernel versions
-+ * This allows yaffs to be used independantly of the kernel
-+ * as well as with it.
-+ */
-+
-+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-+
- #if defined CONFIG_YAFFS_WINCE
- 
- #include "ywinceenv.h"
- 
--#elif  defined __KERNEL__
-+#elif defined __KERNEL__
- 
- #include "moduleconfig.h"
- 
- /* Linux kernel */
-+
- #include <linux/version.h>
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-+#define MTD_VERSION_CODE LINUX_VERSION_CODE
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
- #include <linux/config.h>
- #endif
- #include <linux/kernel.h>
-@@ -40,12 +51,13 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -53,19 +65,19 @@
- #define YAFFS_LOSTNFOUND_PREFIX		"obj"
- 
- /* #define YPRINTF(x) printk x */
--#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-+#define YMALLOC(x) kmalloc(x, GFP_NOFS)
- #define YFREE(x)   kfree(x)
- #define YMALLOC_ALT(x) vmalloc(x)
- #define YFREE_ALT(x)   vfree(x)
- #define YMALLOC_DMA(x) YMALLOC(x)
- 
--// KR - added for use in scan so processes aren't blocked indefinitely.
-+/* KR - added for use in scan so processes aren't blocked indefinitely. */
- #define YYIELD() schedule()
- 
- #define YAFFS_ROOT_MODE			0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
- #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
- #define Y_TIME_CONVERT(x) (x).tv_sec
- #else
-@@ -73,11 +85,12 @@
- #define Y_TIME_CONVERT(x) (x)
- #endif
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #define TENDSTR "\n"
- #define TSTR(x) KERN_WARNING x
-+#define TCONT(x) x
- #define TOUT(p) printk p
- 
- #define yaffs_trace(mask, fmt, args...) \
-@@ -90,6 +103,8 @@
- 
- #elif defined CONFIG_YAFFS_DIRECT
- 
-+#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22)
-+
- /* Direct interface */
- #include "ydirectenv.h"
- 
-@@ -111,11 +126,12 @@
- #define YCHAR char
- #define YUCHAR unsigned char
- #define _Y(x)     x
--#define yaffs_strcpy(a,b)    strcpy(a,b)
--#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
--#define yaffs_strlen(s)	     strlen(s)
--#define yaffs_sprintf	     sprintf
--#define yaffs_toupper(a)     toupper(a)
-+#define yaffs_strcat(a, b)     strcat(a, b)
-+#define yaffs_strcpy(a, b)     strcpy(a, b)
-+#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
-+#define yaffs_strlen(s)	       strlen(s)
-+#define yaffs_sprintf	       sprintf
-+#define yaffs_toupper(a)       toupper(a)
- 
- #define Y_INLINE inline
- 
-@@ -133,8 +149,8 @@
- #define YAFFS_ROOT_MODE				0666
- #define YAFFS_LOSTNFOUND_MODE		0666
- 
--#define yaffs_SumCompare(x,y) ((x) == (y))
--#define yaffs_strcmp(a,b) strcmp(a,b)
-+#define yaffs_SumCompare(x, y) ((x) == (y))
-+#define yaffs_strcmp(a, b) strcmp(a, b)
- 
- #else
- /* Should have specified a configuration type */
-@@ -178,10 +194,10 @@ extern unsigned int yaffs_wr_attempts;
- #define YAFFS_TRACE_ALWAYS		0xF0000000
- 
- 
--#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-+#define T(mask, p) do { if ((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p); } while (0)
- 
--#ifndef CONFIG_YAFFS_WINCE
--#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
-+#ifndef YBUG
-+#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0)
- #endif
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch
deleted file mode 100644
index 7ae6d2ab00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/600-phy_extension.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -298,6 +298,50 @@ int phy_ethtool_gset(struct phy_device *
- }
- EXPORT_SYMBOL(phy_ethtool_gset);
- 
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
-+{
-+	u32 cmd;
-+	int tmp;
-+	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-+	struct ethtool_value edata = { ETHTOOL_GLINK };
-+
-+	if (get_user(cmd, (u32 *) useraddr))
-+		return -EFAULT;
-+
-+	switch (cmd) {
-+	case ETHTOOL_GSET:
-+		phy_ethtool_gset(phydev, &ecmd);
-+		if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
-+			return -EFAULT;
-+		return 0;
-+
-+	case ETHTOOL_SSET:
-+		if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
-+			return -EFAULT;
-+		return phy_ethtool_sset(phydev, &ecmd);
-+
-+	case ETHTOOL_NWAY_RST:
-+		/* if autoneg is off, it's an error */
-+		tmp = phy_read(phydev, MII_BMCR);
-+		if (tmp & BMCR_ANENABLE) {
-+			tmp |= (BMCR_ANRESTART);
-+			phy_write(phydev, MII_BMCR, tmp);
-+			return 0;
-+		}
-+		return -EINVAL;
-+
-+	case ETHTOOL_GLINK:
-+		edata.data = (phy_read(phydev,
-+				MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
-+		if (copy_to_user(useraddr, &edata, sizeof(edata)))
-+			return -EFAULT;
-+		return 0;
-+	}
-+
-+	return -EOPNOTSUPP;
-+}
-+EXPORT_SYMBOL(phy_ethtool_ioctl);
-+
- /**
-  * phy_mii_ioctl - generic PHY MII ioctl interface
-  * @phydev: the phy_device struct
-@@ -351,7 +395,7 @@ int phy_mii_ioctl(struct phy_device *phy
- 		}
- 
- 		phy_write(phydev, mii_data->reg_num, val);
--		
-+
- 		if (mii_data->reg_num == MII_BMCR &&
- 		    val & BMCR_RESET &&
- 		    phydev->drv->config_init) {
-@@ -465,7 +509,7 @@ static void phy_force_reduction(struct p
- 	int idx;
- 
- 	idx = phy_find_setting(phydev->speed, phydev->duplex);
--	
-+
- 	idx++;
- 
- 	idx = phy_find_valid(idx, phydev->supported);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -492,6 +492,7 @@ void phy_start_machine(struct phy_device
- void phy_stop_machine(struct phy_device *phydev);
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
- int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
- int phy_mii_ioctl(struct phy_device *phydev,
- 		struct mii_ioctl_data *mii_data, int cmd);
- int phy_start_interrupts(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.35/601-phy-add-aneg-done-function.patch b/target/linux/generic-2.6/patches-2.6.35/601-phy-add-aneg-done-function.patch
deleted file mode 100644
index aac38ff2e7..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/601-phy-add-aneg-done-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -393,9 +393,18 @@ struct phy_driver {
- 	 */
- 	int (*config_aneg)(struct phy_device *phydev);
- 
-+	/* Determine if autonegotiation is done */
-+	int (*aneg_done)(struct phy_device *phydev);
-+
- 	/* Determines the negotiated speed and duplex */
- 	int (*read_status)(struct phy_device *phydev);
- 
-+	/* 
-+	 * Update the value in phydev->link to reflect the 
-+	 * current link value
-+	 */
-+	int (*update_link)(struct phy_device *phydev);
-+
- 	/* Clears any pending interrupts */
- 	int (*ack_interrupt)(struct phy_device *phydev);
- 
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
- {
- 	int status;
- 
-+	if (phydev->drv->update_link)
-+		return phydev->drv->update_link(phydev);
-+
- 	/* Do a fake read */
- 	status = phy_read(phydev, MII_BMSR);
- 
---- a/drivers/net/phy/phy.c
-+++ b/drivers/net/phy/phy.c
-@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
- {
- 	int retval;
- 
-+	if (phydev->drv->aneg_done)
-+		return phydev->drv->aneg_done(phydev);
-+
- 	retval = phy_read(phydev, MII_BMSR);
- 
- 	return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE);
diff --git a/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch
deleted file mode 100644
index 86bab7a1eb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/620-phy_adm6996.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -93,6 +93,11 @@ config MICREL_PHY
- 	---help---
- 	  Supports the KSZ9021, VSC8201, KS8001 PHYs.
- 
-+config ADM6996_PHY
-+	tristate "Driver for ADM6996 switches"
-+	---help---
-+	  Currently supports the ADM6996F switch
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
- obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
-+obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch
deleted file mode 100644
index fd6d0d2438..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/630-phy_packets.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -146,6 +146,18 @@ int phy_scan_fixups(struct phy_device *p
- }
- EXPORT_SYMBOL(phy_scan_fixups);
- 
-+static int generic_receive_skb(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_receive_skb(skb);
-+}
-+
-+static int generic_rx(struct sk_buff *skb)
-+{
-+	skb->protocol = eth_type_trans(skb, skb->dev);
-+	return netif_rx(skb);
-+}
-+
- struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
- {
- 	struct phy_device *dev;
-@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
- 	dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
- 
- 	dev->state = PHY_DOWN;
-+	dev->netif_receive_skb = &generic_receive_skb;
-+	dev->netif_rx = &generic_rx;
- 
- 	mutex_init(&dev->lock);
- 	INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -325,6 +325,20 @@ struct phy_device {
- 	void (*adjust_link)(struct net_device *dev);
- 
- 	void (*adjust_state)(struct net_device *dev);
-+
-+	/*
-+	 * By default these point to the original functions
-+	 * with the same name. adding them to the phy_device
-+	 * allows the phy driver to override them for packet
-+	 * mangling if the ethernet driver supports it
-+	 * This is required to support some really horrible
-+	 * switches such as the Marvell 88E6060
-+	 */
-+	int (*netif_receive_skb)(struct sk_buff *skb);
-+	int (*netif_rx)(struct sk_buff *skb);
-+
-+	/* alignment offset for packets */
-+	int pkt_align;
- };
- #define to_phy_device(d) container_of(d, struct phy_device, dev)
- 
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -863,6 +863,7 @@ struct net_device {
- 	void			*ax25_ptr;	/* AX.25 specific data */
- 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
- 						   assign before registering */
-+	void			*phy_ptr; /* PHY device specific data */
- 
- /*
-  * Cache line mostly used on receive path (including eth_type_trans())
diff --git a/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch b/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch
deleted file mode 100644
index 6825037ce9..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/650-swconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -13,6 +13,12 @@ menuconfig PHYLIB
- 
- if PHYLIB
- 
-+config SWCONFIG
-+	tristate "Switch configuration API"
-+	---help---
-+	  Switch configuration API using netlink. This allows
-+	  you to configure the VLAN features of certain switches.
-+
- comment "MII PHY device drivers"
- 
- config MARVELL_PHY
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -3,6 +3,7 @@
- libphy-objs			:= phy.o phy_device.o mdio_bus.o
- 
- obj-$(CONFIG_PHYLIB)		+= libphy.o
-+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
- obj-$(CONFIG_MARVELL_PHY)	+= marvell.o
- obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
- obj-$(CONFIG_CICADA_PHY)	+= cicada.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch
deleted file mode 100644
index b86e259c8d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/651-swconfig-2.6.32-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/net/phy/swconfig.c
-+++ b/drivers/net/phy/swconfig.c
-@@ -335,7 +335,7 @@ swconfig_send_multipart(struct swconfig_
- 			if (cb->close(cb, arg) < 0)
- 				goto error;
- 		}
--		err = genlmsg_unicast(cb->msg, info->snd_pid);
-+		err = genlmsg_reply(cb->msg, info);
- 		cb->msg = NULL;
- 		if (err < 0)
- 			goto error;
-@@ -419,7 +419,7 @@ swconfig_list_attrs(struct sk_buff *skb,
- 	if (!cb.msg)
- 		return 0;
- 
--	return genlmsg_unicast(cb.msg, info->snd_pid);
-+	return genlmsg_reply(cb.msg, info);
- 
- error:
- 	if (cb.msg)
-@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
- 		goto nla_put_failure;
- 
- 	swconfig_put_dev(dev);
--	return genlmsg_unicast(msg, info->snd_pid);
-+	return genlmsg_reply(msg, info);
- 
- nla_put_failure:
- 	if (msg)
diff --git a/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch
deleted file mode 100644
index f5ff558b0f..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/660-phy_mvswitch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,9 @@ config ADM6996_PHY
- 	---help---
- 	  Currently supports the ADM6996F switch
- 
-+config MVSWITCH_PHY
-+	tristate "Driver for Marvell 88E6060 switches"
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
- obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
-+obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch
deleted file mode 100644
index 22a56ed4dc..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/670-phy_ip175c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -107,6 +107,10 @@ config ADM6996_PHY
- config MVSWITCH_PHY
- 	tristate "Driver for Marvell 88E6060 switches"
- 
-+config IP17XX_PHY
-+	tristate "Driver for IC+ IP17xx switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY)	+= bcm63xx.o
- obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
- obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
-+obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch
deleted file mode 100644
index 2bc9d6754d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/680-phy_ar8216.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -111,6 +111,10 @@ config IP175C_PHY
- 	tristate "Driver for IC+ IP175C/IP178C switches"
- 	select SWCONFIG
- 
-+config AR8216_PHY
-+	tristate "Driver for Atheros AR8216 switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch
deleted file mode 100644
index 9e86748a86..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/690-phy_rtl8306.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -115,6 +115,10 @@ config AR8216_PHY
- 	tristate "Driver for Atheros AR8216 switches"
- 	select SWCONFIG
- 
-+config RTL8306_PHY
-+	tristate "Driver for Realtek RTL8306S switches"
-+	select SWCONFIG
-+
- config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
- obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
-+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch
deleted file mode 100644
index ec07636308..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/691-phy_rtl8366.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -157,4 +157,29 @@ config MDIO_OCTEON
- 
- 	  If in doubt, say Y.
- 
-+config RTL8366_SMI
-+	tristate "Driver for the RTL8366 SMI interface"
-+	depends on GENERIC_GPIO
-+	---help---
-+	  This module implements the SMI interface protocol which is used
-+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
-+
-+if RTL8366_SMI
-+
-+config RTL8366S_PHY
-+	tristate "Driver for the Realtek RTL8366S switch"
-+	select SWCONFIG
-+
-+config RTL8366RB_PHY
-+	tristate "Driver for the Realtek RTL8366RB switch"
-+	select SWCONFIG
-+
-+config RTL8366S_PHY_DEBUG_FS
-+	bool "RTL8366 switch driver DEBUG_FS support"
-+	depends on RTL8366S_PHY || RTL8366RB_PHY
-+	depends on DEBUG_FS
-+	default n
-+
-+endif # RTL8366_SMI
-+
- endif # PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY)	+= ip175c.o
- obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
- obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
-+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
-+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
-+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
- obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
- obj-$(CONFIG_FIXED_PHY)		+= fixed.o
- obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch b/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch
deleted file mode 100644
index f4325d298a..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/700-rtc7301.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -618,6 +618,15 @@ config RTC_DRV_NUC900
- 	  If you say yes here you get support for the RTC subsystem of the
- 	  NUC910/NUC920 used in embedded systems.
- 
-+config RTC_DRV_RTC7301
-+	tristate "Epson RTC-7301 SF/DG"
-+	help
-+	  If you say Y here you will get support for the
-+	  Epson RTC-7301 SF/DG RTC chips.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-7301.
-+
- comment "on-CPU RTC drivers"
- 
- config RTC_DRV_OMAP
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -74,6 +74,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
-+obj-$(CONFIG_RTC_DRV_RTC7301)	+= rtc-rtc7301.o
- obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o
- obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o
- obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rtc7301.c
-@@ -0,0 +1,219 @@
-+/*
-+ * Driver for Epson RTC-7301SF/DG
-+ *
-+ * Copyright (C) 2009 Jose Vasconcellos
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/rtc.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/delay.h>
-+#include <linux/bcd.h>
-+
-+#define RTC_NAME "rtc7301"
-+#define RTC_VERSION "0.1"
-+
-+/* Epson RTC-7301 register addresses */
-+#define RTC7301_SEC		0x00
-+#define RTC7301_SEC10		0x01
-+#define RTC7301_MIN		0x02
-+#define RTC7301_MIN10		0x03
-+#define RTC7301_HOUR		0x04
-+#define RTC7301_HOUR10		0x05
-+#define RTC7301_WEEKDAY		0x06
-+#define RTC7301_DAY		0x07
-+#define RTC7301_DAY10		0x08
-+#define RTC7301_MON		0x09
-+#define RTC7301_MON10		0x0A
-+#define RTC7301_YEAR		0x0B
-+#define RTC7301_YEAR10		0x0C
-+#define RTC7301_YEAR100		0x0D
-+#define RTC7301_YEAR1000	0x0E
-+#define RTC7301_CTRLREG		0x0F
-+
-+static uint8_t __iomem *rtc7301_base;
-+
-+#define read_reg(offset) (readb(rtc7301_base + offset) & 0xf)
-+#define write_reg(offset, data) writeb(data, rtc7301_base + (offset))
-+
-+#define rtc7301_isbusy() (read_reg(RTC7301_CTRLREG) & 1)
-+
-+static void rtc7301_init_settings(void)
-+{
-+	int i;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+	write_reg(RTC7301_YEAR1000, 2);
-+	udelay(122);
-+
-+	/* bank 1 */
-+	write_reg(RTC7301_CTRLREG, 6);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+
-+	/* bank 2 */
-+	write_reg(RTC7301_CTRLREG, 14);
-+	for (i=0; i<15; i++)
-+		write_reg(i, 0);
-+	write_reg(RTC7301_CTRLREG, 0);
-+}
-+
-+static int rtc7301_get_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int cnt;
-+	uint8_t buf[16];
-+
-+	cnt = 0;
-+	while (rtc7301_isbusy()) {
-+		udelay(244);
-+		if (cnt++ > 100) {
-+			dev_err(dev, "%s: timeout error %x\n", __func__, rtc7301_base[RTC7301_CTRLREG]);
-+			return -EIO;
-+		}
-+	}
-+
-+	for (cnt=0; cnt<16; cnt++)
-+		buf[cnt] = read_reg(cnt);
-+
-+	if (buf[RTC7301_SEC10] & 8) {
-+		dev_err(dev, "%s: RTC not set\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	memset(dt, 0, sizeof(*dt));
-+
-+	dt->tm_sec =  buf[RTC7301_SEC] + buf[RTC7301_SEC10]*10;
-+	dt->tm_min =  buf[RTC7301_MIN] + buf[RTC7301_MIN10]*10;
-+	dt->tm_hour = buf[RTC7301_HOUR] + buf[RTC7301_HOUR10]*10;
-+
-+	dt->tm_mday = buf[RTC7301_DAY] + buf[RTC7301_DAY10]*10;
-+	dt->tm_mon =  buf[RTC7301_MON] + buf[RTC7301_MON10]*10 - 1;
-+	dt->tm_year = buf[RTC7301_YEAR] + buf[RTC7301_YEAR10]*10 +
-+		      buf[RTC7301_YEAR100]*100 +
-+		      ((buf[RTC7301_YEAR1000] & 3)*1000) - 1900;
-+
-+	/* the rtc device may contain illegal values on power up
-+	 * according to the data sheet. make sure they are valid.
-+	 */
-+
-+	return rtc_valid_tm(dt);
-+}
-+
-+static int rtc7301_set_datetime(struct device *dev, struct rtc_time *dt)
-+{
-+	int data;
-+
-+	data = dt->tm_year + 1900;
-+	if (data >= 2100 || data < 1900)
-+		return -EINVAL;
-+
-+	write_reg(RTC7301_CTRLREG, 2);
-+       	udelay(122);
-+
-+	data = bin2bcd(dt->tm_sec);
-+	write_reg(RTC7301_SEC, data);
-+	write_reg(RTC7301_SEC10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_min);
-+	write_reg(RTC7301_MIN, data );
-+	write_reg(RTC7301_MIN10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_hour);
-+	write_reg(RTC7301_HOUR, data);
-+	write_reg(RTC7301_HOUR10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_mday);
-+	write_reg(RTC7301_DAY, data);
-+	write_reg(RTC7301_DAY10, (data>> 4));
-+
-+	data = bin2bcd(dt->tm_mon + 1);
-+	write_reg(RTC7301_MON, data);
-+	write_reg(RTC7301_MON10, (data >> 4));
-+
-+	data = bin2bcd(dt->tm_year % 100);
-+	write_reg(RTC7301_YEAR, data);
-+	write_reg(RTC7301_YEAR10, (data >> 4));
-+	data = bin2bcd((1900 + dt->tm_year) / 100);
-+	write_reg(RTC7301_YEAR100, data);
-+
-+	data = bin2bcd(dt->tm_wday);
-+	write_reg(RTC7301_WEEKDAY, data);
-+
-+	write_reg(RTC7301_CTRLREG, 0);
-+
-+	return 0;
-+}
-+
-+static const struct rtc_class_ops rtc7301_rtc_ops = {
-+	.read_time	= rtc7301_get_datetime,
-+	.set_time	= rtc7301_set_datetime,
-+};
-+
-+static int __devinit rtc7301_probe(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc;
-+	struct resource *res;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENOENT;
-+
-+	rtc7301_base = ioremap_nocache(res->start, 0x1000 /*res->end - res->start + 1*/);
-+	if (!rtc7301_base)
-+		return -EINVAL;
-+
-+	rtc = rtc_device_register(RTC_NAME, &pdev->dev,
-+				&rtc7301_rtc_ops, THIS_MODULE);
-+	if (IS_ERR(rtc)) {
-+		iounmap(rtc7301_base);
-+		return PTR_ERR(rtc);
-+	}
-+
-+	platform_set_drvdata(pdev, rtc);
-+
-+	rtc7301_init_settings();
-+	return 0;
-+}
-+
-+static int __devexit rtc7301_remove(struct platform_device *pdev)
-+{
-+	struct rtc_device *rtc = platform_get_drvdata(pdev);
-+
-+	if (rtc)
-+		rtc_device_unregister(rtc);
-+	if (rtc7301_base)
-+		iounmap(rtc7301_base);
-+	return 0;
-+}
-+
-+static struct platform_driver rtc7301_driver = {
-+	.driver = {
-+		.name	= RTC_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe	= rtc7301_probe,
-+	.remove = __devexit_p(rtc7301_remove),
-+};
-+
-+static __init int rtc7301_init(void)
-+{
-+	return platform_driver_register(&rtc7301_driver);
-+}
-+module_init(rtc7301_init);
-+
-+static __exit void rtc7301_exit(void)
-+{
-+	platform_driver_unregister(&rtc7301_driver);
-+}
-+module_exit(rtc7301_exit);
-+
-+MODULE_DESCRIPTION("Epson 7301 RTC driver");
-+MODULE_AUTHOR("Jose Vasconcellos <jvasco@verizon.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:" RTC_NAME);
-+MODULE_VERSION(RTC_VERSION);
diff --git a/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch
deleted file mode 100644
index c2e3880641..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/750-glamo-headers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -124,6 +124,7 @@ struct dentry;
- #define FB_ACCEL_TRIDENT_BLADE3D 52	/* Trident Blade3D		*/
- #define FB_ACCEL_TRIDENT_BLADEXP 53	/* Trident BladeXP		*/
- #define FB_ACCEL_CIRRUS_ALPINE   53	/* Cirrus Logic 543x/544x/5480	*/
-+#define FB_ACCEL_GLAMO		50	/* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90	/* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91	/* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92	/* NeoMagic NM2093              */
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -77,6 +77,8 @@ header-y += genetlink.h
- header-y += gen_stats.h
- header-y += gfs2_ondisk.h
- header-y += gigaset_dev.h
-+header-y += glamofb.h
-+header-y += glamo-engine.h
- header-y += hysdn_if.h
- header-y += i2o-dev.h
- header-y += i8k.h
diff --git a/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch
deleted file mode 100644
index cfbcbe88fb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/801-usb_serial_endpoint_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/serial/usb-serial.c
-+++ b/drivers/usb/serial/usb-serial.c
-@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv
-    drivers depend on it.
- */
- 
-+static ushort maxSize = 0;
- static int debug;
- /* initially all NULL */
- static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -912,7 +913,7 @@ int usb_serial_probe(struct usb_interfac
- 		}
- 		buffer_size = serial->type->bulk_in_size;
- 		if (!buffer_size)
--			buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
-+			buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
- 		port->bulk_in_size = buffer_size;
- 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
- 		port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1382,3 +1383,5 @@ MODULE_LICENSE("GPL");
- 
- module_param(debug, bool, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(debug, "Debug enabled or not");
-+module_param(maxSize, ushort,0);
-+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
diff --git a/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch
deleted file mode 100644
index 6a634b7b39..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/840-unable_to_open_console.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -887,7 +887,7 @@ static int __init kernel_init(void * unu
- 
- 	/* Open the /dev/console on the rootfs, this should never fail */
- 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		printk(KERN_WARNING "Please be patient, while OpenWrt loads ...\n");
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
diff --git a/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch
deleted file mode 100644
index 39b6abe8d0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/902-darwin_scripts_include.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/scripts/genksyms/parse.c_shipped
-+++ b/scripts/genksyms/parse.c_shipped
-@@ -160,7 +160,9 @@
- 
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/genksyms/parse.y
-+++ b/scripts/genksyms/parse.y
-@@ -24,7 +24,9 @@
- %{
- 
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "genksyms.h"
- 
- static int is_typedef;
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -22,6 +22,35 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef __APPLE__
-+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */
-+void *memmem (const void *haystack, size_t haystack_len,
-+                          const void *needle,  size_t needle_len)
-+{
-+  const char *begin;
-+  const char *const last_possible
-+    = (const char *) haystack + haystack_len - needle_len;
-+
-+  if (needle_len == 0)
-+    /* The first occurrence of the empty string is deemed to occur at
-+       the beginning of the string.  */
-+    return (void *) haystack;
-+
-+  /* Sanity check, otherwise the loop might search through the whole
-+     memory.  */
-+  if (__builtin_expect (haystack_len < needle_len, 0))
-+    return NULL;
-+
-+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
-+    if (begin[0] == ((const char *) needle)[0] &&
-+        !memcmp ((const void *) &begin[1],
-+                 (const void *) ((const char *) needle + 1),
-+                 needle_len - 1))
-+      return (void *) begin;
-+
-+  return NULL;
-+}
-+#endif
- 
- #ifndef ARRAY_SIZE
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -140,6 +140,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd
- # we really need to do so. (Do not call gcc as part of make mrproper)
- HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
- HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+ifeq ($(shell uname -s),Darwin)
-+HOST_LOADLIBES  += -lncurses
-+endif
- 
- HOST_EXTRACFLAGS += -DLOCALE
- 
---- a/scripts/mod/mk_elfconfig.c
-+++ b/scripts/mod/mk_elfconfig.c
-@@ -1,7 +1,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __APPLE__
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- int
- main(int argc, char **argv)
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -7,7 +7,11 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#if !(defined(__APPLE__) || defined(__CYGWIN__))
- #include <elf.h>
-+#else
-+#include "../../../../../tools/sstrip/include/elf.h"
-+#endif
- 
- #include "elfconfig.h"
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch
deleted file mode 100644
index 8aa43c5242..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/903-hostap_txpower.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/hostap/hostap_ap.c
-+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2336,13 +2336,13 @@ int prism2_ap_get_sta_qual(local_info_t
- 		addr[count].sa_family = ARPHRD_ETHER;
- 		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
- 		if (sta->last_rx_silence == 0)
--			qual[count].qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+                        qual[count].qual = (sta->last_rx_signal - 156) == 0 ?
-+                                0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			qual[count].qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        qual[count].qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                qual[count].level = sta->last_rx_signal;
-+                qual[count].noise = sta->last_rx_silence;
- 		qual[count].updated = sta->last_rx_updated;
- 
- 		sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2408,13 +2408,13 @@ int prism2_ap_translate_scan(struct net_
- 		memset(&iwe, 0, sizeof(iwe));
- 		iwe.cmd = IWEVQUAL;
- 		if (sta->last_rx_silence == 0)
--			iwe.u.qual.qual = sta->last_rx_signal < 27 ?
--				0 : (sta->last_rx_signal - 27) * 92 / 127;
-+	                iwe.u.qual.qual = (sta->last_rx_signal -156) == 0 ?
-+	                        0 : (sta->last_rx_signal - 156) * 92 / 64;
- 		else
--			iwe.u.qual.qual = sta->last_rx_signal -
--				sta->last_rx_silence - 35;
--		iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
--		iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
-+                        iwe.u.qual.qual = (sta->last_rx_signal -
-+                                sta->last_rx_silence) * 92 / 64;
-+                iwe.u.qual.level = sta->last_rx_signal;
-+                iwe.u.qual.noise = sta->last_rx_silence;
- 		iwe.u.qual.updated = sta->last_rx_updated;
- 		iwe.len = IW_EV_QUAL_LEN;
- 		current_ev = iwe_stream_add_event(info, current_ev, end_buf,
---- a/drivers/net/wireless/hostap/hostap_config.h
-+++ b/drivers/net/wireless/hostap/hostap_config.h
-@@ -45,4 +45,9 @@
-  */
- /* #define PRISM2_NO_STATION_MODES */
- 
-+/* Enable TX power Setting functions
-+ * (min att = -128 , max att =  127)
-+ */
-+#define RAW_TXPOWER_SETTING
-+
- #endif /* HOSTAP_CONFIG_H */
---- a/drivers/net/wireless/hostap/hostap.h
-+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
- extern const struct ethtool_ops prism2_ethtool_ops;
- 
- int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+int hostap_restore_power(struct net_device *dev);
- 
- 
- #endif /* HOSTAP_H */
---- a/drivers/net/wireless/hostap/hostap_hw.c
-+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -932,6 +932,7 @@ static int hfa384x_set_rid(struct net_de
- 			prism2_hw_reset(dev);
- 	}
- 
-+	hostap_restore_power(dev);
- 	return res;
- }
- 
---- a/drivers/net/wireless/hostap/hostap_info.c
-+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -433,6 +433,11 @@ static void handle_info_queue_linkstatus
- 	}
- 
- 	/* Get BSSID if we have a valid AP address */
-+
-+	if ( val == HFA384X_LINKSTATUS_CONNECTED ||
-+	     val == HFA384X_LINKSTATUS_DISCONNECTED )
-+			hostap_restore_power(local->dev);
-+
- 	if (connected) {
- 		netif_carrier_on(local->dev);
- 		netif_carrier_on(local->ddev);
---- a/drivers/net/wireless/hostap/hostap_ioctl.c
-+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1477,23 +1477,20 @@ static int prism2_txpower_hfa386x_to_dBm
- 		val = 255;
- 
- 	tmp = val;
--	tmp >>= 2;
- 
--	return -12 - tmp;
-+	return tmp;
- }
- 
- static u16 prism2_txpower_dBm_to_hfa386x(int val)
- {
- 	signed char tmp;
- 
--	if (val > 20)
--		return 128;
--	else if (val < -43)
-+	if (val > 127)
- 		return 127;
-+	else if (val < -128)
-+		return 128;
- 
- 	tmp = val;
--	tmp = -12 - tmp;
--	tmp <<= 2;
- 
- 	return (unsigned char) tmp;
- }
-@@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev,
- 
- 	return ret;
- }
-+
-+/* BUG FIX: Restore power setting value when lost due to F/W bug */
-+
-+int hostap_restore_power(struct net_device *dev)
-+{
-+        struct hostap_interface *iface = netdev_priv(dev);
-+       local_info_t *local = iface->local;
-+
-+       u16 val;
-+       int ret = 0;
-+
-+       if (local->txpower_type == PRISM2_TXPOWER_OFF) {
-+                       val = 0xff; /* use all standby and sleep modes */
-+                       ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                                              HFA386X_CR_A_D_TEST_MODES2,
-+                                              &val, NULL);
-+       }
-+
-+#ifdef RAW_TXPOWER_SETTING
-+       if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
-+               val = HFA384X_TEST_CFG_BIT_ALC;
-+               local->func->cmd(dev, HFA384X_CMDCODE_TEST |
-+                                (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
-+               val = prism2_txpower_dBm_to_hfa386x(local->txpower);
-+               ret = (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
-+                            HFA386X_CR_MANUAL_TX_POWER, &val, NULL));
-+       }
-+#endif /* RAW_TXPOWER_SETTING */
-+       return (ret ? -EOPNOTSUPP : 0);
-+}
-+
-+EXPORT_SYMBOL(hostap_restore_power);
diff --git a/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch
deleted file mode 100644
index 7fe248d8d3..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/903-stddef_include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/linux/stddef.h
-+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@ enum {
- 	false	= 0,
- 	true	= 1
- };
-+#endif /* __KERNEL__ */
- 
- #undef offsetof
- #ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@ enum {
- #else
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
- #endif
--#endif /* __KERNEL__ */
- 
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch b/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch
deleted file mode 100644
index c701fdaa95..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/905-i386_build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/x86/boot/tools/build.c
-+++ b/arch/x86/boot/tools/build.c
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
diff --git a/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch b/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch
deleted file mode 100644
index b10bc9a65e..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix spi-gpio for hotplug.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
- 	spi_bitbang_cleanup(spi);
- }
- 
--static int __init spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
-+static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
- {
- 	int value;
- 
-@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
- 	return value;
- }
- 
--static int __init
-+static int __devinit
- spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
- {
- 	int value;
-@@ -261,7 +261,7 @@ done:
- 	return value;
- }
- 
--static int __init spi_gpio_probe(struct platform_device *pdev)
-+static int __devinit spi_gpio_probe(struct platform_device *pdev)
- {
- 	int				status;
- 	struct spi_master		*master;
-@@ -317,7 +317,7 @@ gpio_free:
- 	return status;
- }
- 
--static int __exit spi_gpio_remove(struct platform_device *pdev)
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
- {
- 	struct spi_gpio			*spi_gpio;
- 	struct spi_gpio_platform_data	*pdata;
-@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
- static struct platform_driver spi_gpio_driver = {
- 	.driver.name	= DRIVER_NAME,
- 	.driver.owner	= THIS_MODULE,
--	.remove		= __exit_p(spi_gpio_remove),
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
- };
- 
- static int __init spi_gpio_init(void)
- {
--	return platform_driver_probe(&spi_gpio_driver, spi_gpio_probe);
-+	return platform_driver_register(&spi_gpio_driver);
- }
- module_init(spi_gpio_init);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch b/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch
deleted file mode 100644
index 19032881b8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Implement the SPI-GPIO delay function for busses that need speed limitation.
-
---mb
-
-
-
---- a/drivers/spi/spi_gpio.c
-+++ b/drivers/spi/spi_gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
-@@ -69,6 +70,7 @@ struct spi_gpio {
-  *		#define	SPI_MOSI_GPIO	120
-  *		#define	SPI_SCK_GPIO	121
-  *		#define	SPI_N_CHIPSEL	4
-+ *		#undef NEED_SPIDELAY
-  *		#include "spi_gpio.c"
-  */
- 
-@@ -76,6 +78,7 @@ struct spi_gpio {
- #define DRIVER_NAME	"spi_gpio"
- 
- #define GENERIC_BITBANG	/* vs tight inlines */
-+#define NEED_SPIDELAY	1
- 
- /* all functions referencing these symbols must define pdata */
- #define SPI_MISO_GPIO	((pdata)->miso)
-@@ -120,12 +123,20 @@ static inline int getmiso(const struct s
- #undef pdata
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * NOTE:  to clock "as fast as we can", set spi_device.max_speed_hz
-+ * and spi_transfer.speed_hz to 0.
-+ * Otherwise this is a function of the requested device clock.
-+ * Software overhead means we usually have trouble
-+ * reaching even one Mbit/sec (except when we can inline bitops). So on small
-+ * embedded devices with fast SPI slaves you usually don't need a delay.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+static inline void spidelay(unsigned nsecs)
-+{
-+#ifdef NEED_SPIDELAY
-+	if (unlikely(nsecs))
-+		ndelay(nsecs);
-+#endif /* NEED_SPIDELAY */
-+}
- 
- #define	EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
diff --git a/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch
deleted file mode 100644
index 65f17b49eb..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/921-gpio_spi_driver.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-THIS CODE IS DEPRECATED.
-
-Please use the new mainline SPI-GPIO driver, as of 2.6.29.
-
---mb
-
-
-
---- /dev/null
-+++ b/include/linux/spi/spi_gpio_old.h
-@@ -0,0 +1,73 @@
-+/*
-+ * spi_gpio interface to platform code
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+#ifndef _LINUX_SPI_SPI_GPIO
-+#define _LINUX_SPI_SPI_GPIO
-+
-+#include <linux/types.h>
-+#include <linux/spi/spi.h>
-+
-+
-+/**
-+ * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-+ *
-+ * This structure holds information about a GPIO-based SPI device.
-+ *
-+ * @pin_clk: The GPIO pin number of the CLOCK pin.
-+ *
-+ * @pin_miso: The GPIO pin number of the MISO pin.
-+ *
-+ * @pin_mosi: The GPIO pin number of the MOSI pin.
-+ *
-+ * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-+ *
-+ * @cs_activelow: If true, the chip is selected when the CS line is low.
-+ *
-+ * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-+ *                Note that doing no delay is not standards compliant,
-+ *                but it might be needed to speed up transfers on some
-+ *                slow embedded machines.
-+ *
-+ * @boardinfo_setup: This callback is called after the
-+ *                   SPI master device was registered, but before the
-+ *                   device is registered.
-+ * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-+ */
-+struct spi_gpio_platform_data {
-+	unsigned int pin_clk;
-+	unsigned int pin_miso;
-+	unsigned int pin_mosi;
-+	unsigned int pin_cs;
-+	bool cs_activelow;
-+	bool no_spi_delay;
-+	int (*boardinfo_setup)(struct spi_board_info *bi,
-+			       struct spi_master *master,
-+			       void *data);
-+	void *boardinfo_setup_data;
-+};
-+
-+/**
-+ * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a spi-gpio device.
-+ */
-+#define SPI_GPIO_PLATDEV_NAME	"spi-gpio"
-+
-+/**
-+ * spi_gpio_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int spi_gpio_next_id(void);
-+
-+#endif /* _LINUX_SPI_SPI_GPIO */
---- /dev/null
-+++ b/drivers/spi/spi_gpio_old.c
-@@ -0,0 +1,251 @@
-+/*
-+ * Bitbanging SPI bus driver using GPIO API
-+ *
-+ * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * based on spi_s3c2410_gpio.c
-+ *   Copyright (c) 2006 Ben Dooks
-+ *   Copyright (c) 2006 Simtec Electronics
-+ * and on i2c-gpio.c
-+ *   Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+struct spi_gpio {
-+	struct spi_bitbang bitbang;
-+	struct spi_gpio_platform_data *info;
-+	struct platform_device *pdev;
-+	struct spi_board_info bi;
-+};
-+
-+
-+static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
-+{
-+	return dev->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int val)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+	return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
-+}
-+
-+static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (!sp->info->no_spi_delay)
-+		ndelay(nsecs);
-+}
-+
-+#define spidelay(nsecs) do {					\
-+	/* Steal the spi_device pointer from our caller.	\
-+	 * The bitbang-API should probably get fixed here... */	\
-+	do_spidelay(spi, nsecs);				\
-+  } while (0)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
-+			       unsigned nsecs, u32 word, u8 bits)
-+{
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+static void spi_gpio_chipselect(struct spi_device *dev, int on)
-+{
-+	struct spi_gpio *sp = spidev_to_sg(dev);
-+
-+	if (sp->info->cs_activelow)
-+		on = !on;
-+	gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
-+}
-+
-+static int spi_gpio_probe(struct platform_device *pdev)
-+{
-+	struct spi_master *master;
-+	struct spi_gpio_platform_data *pdata;
-+	struct spi_gpio *sp;
-+	struct spi_device *spidev;
-+	int err;
-+
-+	pdata = pdev->dev.platform_data;
-+	if (!pdata)
-+		return -ENXIO;
-+
-+	err = -ENOMEM;
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
-+	if (!master)
-+		goto err_alloc_master;
-+
-+	sp = spi_master_get_devdata(master);
-+	platform_set_drvdata(pdev, sp);
-+	sp->info = pdata;
-+
-+	err = gpio_request(pdata->pin_clk, "spi_clock");
-+	if (err)
-+		goto err_request_clk;
-+	err = gpio_request(pdata->pin_mosi, "spi_mosi");
-+	if (err)
-+		goto err_request_mosi;
-+	err = gpio_request(pdata->pin_miso, "spi_miso");
-+	if (err)
-+		goto err_request_miso;
-+	err = gpio_request(pdata->pin_cs, "spi_cs");
-+	if (err)
-+		goto err_request_cs;
-+
-+	sp->bitbang.master = spi_master_get(master);
-+	sp->bitbang.master->bus_num = -1;
-+	sp->bitbang.master->num_chipselect = 1;
-+	sp->bitbang.chipselect = spi_gpio_chipselect;
-+	sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
-+	sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
-+	sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
-+	sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
-+
-+	gpio_direction_output(pdata->pin_clk, 0);
-+	gpio_direction_output(pdata->pin_mosi, 0);
-+	gpio_direction_output(pdata->pin_cs,
-+			      pdata->cs_activelow ? 1 : 0);
-+	gpio_direction_input(pdata->pin_miso);
-+
-+	err = spi_bitbang_start(&sp->bitbang);
-+	if (err)
-+		goto err_no_bitbang;
-+	err = pdata->boardinfo_setup(&sp->bi, master,
-+				     pdata->boardinfo_setup_data);
-+	if (err)
-+		goto err_bi_setup;
-+	sp->bi.controller_data = sp;
-+	spidev = spi_new_device(master, &sp->bi);
-+	if (!spidev)
-+		goto err_new_dev;
-+
-+	return 0;
-+
-+err_new_dev:
-+err_bi_setup:
-+	spi_bitbang_stop(&sp->bitbang);
-+err_no_bitbang:
-+	spi_master_put(sp->bitbang.master);
-+	gpio_free(pdata->pin_cs);
-+err_request_cs:
-+	gpio_free(pdata->pin_miso);
-+err_request_miso:
-+	gpio_free(pdata->pin_mosi);
-+err_request_mosi:
-+	gpio_free(pdata->pin_clk);
-+err_request_clk:
-+	kfree(master);
-+
-+err_alloc_master:
-+	return err;
-+}
-+
-+static int __devexit spi_gpio_remove(struct platform_device *pdev)
-+{
-+	struct spi_gpio *sp;
-+	struct spi_gpio_platform_data *pdata;
-+
-+	pdata = pdev->dev.platform_data;
-+	sp = platform_get_drvdata(pdev);
-+
-+	gpio_free(pdata->pin_clk);
-+	gpio_free(pdata->pin_mosi);
-+	gpio_free(pdata->pin_miso);
-+	gpio_free(pdata->pin_cs);
-+	spi_bitbang_stop(&sp->bitbang);
-+	spi_master_put(sp->bitbang.master);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver spi_gpio_driver = {
-+	.driver		= {
-+		.name	= SPI_GPIO_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+	.probe		= spi_gpio_probe,
-+	.remove		= __devexit_p(spi_gpio_remove),
-+};
-+
-+int spi_gpio_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(spi_gpio_next_id);
-+
-+static int __init spi_gpio_init(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&spi_gpio_driver);
-+	if (err)
-+		printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
-+
-+	return err;
-+}
-+module_init(spi_gpio_init);
-+
-+static void __exit spi_gpio_exit(void)
-+{
-+	platform_driver_unregister(&spi_gpio_driver);
-+}
-+module_exit(spi_gpio_exit);
-+
-+MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -133,6 +133,15 @@ config SPI_GPIO
- 	  GPIO operations, you should be able to leverage that for better
- 	  speed with a custom version of this driver; see the source code.
- 
-+config SPI_GPIO_OLD
-+	tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)"
-+	depends on SPI_MASTER && GENERIC_GPIO
-+	select SPI_BITBANG
-+	help
-+	  This code is deprecated. Please use the new mainline SPI-GPIO driver.
-+
-+	  If unsure, say N.
-+
- config SPI_IMX
- 	tristate "Freescale i.MX SPI controllers"
- 	depends on ARCH_MXC
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.
- obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
- obj-$(CONFIG_SPI_DW_MMIO)		+= dw_spi_mmio.o
- obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
-+obj-$(CONFIG_SPI_GPIO_OLD)		+= spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
diff --git a/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch
deleted file mode 100644
index 24e5d592e8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/922-gpiommc.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- /dev/null
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -0,0 +1,608 @@
-+/*
-+ * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-+ * This module hooks up the mmc_spi and spi_gpio modules and also
-+ * provides a configfs interface.
-+ *
-+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-+ *
-+ * Licensed under the GNU/GPL. See COPYING for details.
-+ */
-+
-+#include <linux/mmc/gpiommc.h>
-+#include <linux/platform_device.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio_old.h>
-+#include <linux/configfs.h>
-+#include <linux/gpio.h>
-+#include <asm/atomic.h>
-+
-+
-+#define PFX				"gpio-mmc: "
-+
-+
-+struct gpiommc_device {
-+	struct platform_device *pdev;
-+	struct platform_device *spi_pdev;
-+	struct spi_board_info boardinfo;
-+};
-+
-+
-+MODULE_DESCRIPTION("GPIO based MMC driver");
-+MODULE_AUTHOR("Michael Buesch");
-+MODULE_LICENSE("GPL");
-+
-+
-+static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
-+				   struct spi_master *master,
-+				   void *data)
-+{
-+	struct gpiommc_device *d = data;
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	/* Bind the SPI master to the MMC-SPI host driver. */
-+	strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
-+
-+	bi->max_speed_hz = pdata->max_bus_speed;
-+	bi->bus_num = master->bus_num;
-+	bi->mode = pdata->mode;
-+
-+	return 0;
-+}
-+
-+static int gpiommc_probe(struct platform_device *pdev)
-+{
-+	struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
-+	struct spi_gpio_platform_data spi_pdata;
-+	struct gpiommc_device *d;
-+	int err;
-+
-+	err = -ENXIO;
-+	if (!mmc_pdata)
-+		goto error;
-+
-+#ifdef CONFIG_MMC_SPI_MODULE
-+	err = request_module("mmc_spi");
-+	if (err) {
-+		printk(KERN_WARNING PFX
-+		       "Failed to request mmc_spi module.\n");
-+	}
-+#endif /* CONFIG_MMC_SPI_MODULE */
-+
-+	/* Allocate the GPIO-MMC device */
-+	err = -ENOMEM;
-+	d = kzalloc(sizeof(*d), GFP_KERNEL);
-+	if (!d)
-+		goto error;
-+	d->pdev = pdev;
-+
-+	/* Create the SPI-GPIO device */
-+	d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
-+					    spi_gpio_next_id());
-+	if (!d->spi_pdev)
-+		goto err_free_d;
-+
-+	memset(&spi_pdata, 0, sizeof(spi_pdata));
-+	spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
-+	spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
-+	spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
-+	spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
-+	spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
-+	spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
-+	spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
-+	spi_pdata.boardinfo_setup_data = d;
-+
-+	err = platform_device_add_data(d->spi_pdev, &spi_pdata,
-+				       sizeof(spi_pdata));
-+	if (err)
-+		goto err_free_pdev;
-+	err = platform_device_add(d->spi_pdev);
-+	if (err)
-+		goto err_free_pdata;
-+	platform_set_drvdata(pdev, d);
-+
-+	printk(KERN_INFO PFX "MMC-Card \"%s\" "
-+	       "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
-+	       mmc_pdata->name, mmc_pdata->pins.gpio_di,
-+	       mmc_pdata->pins.gpio_do,
-+	       mmc_pdata->pins.gpio_clk,
-+	       mmc_pdata->pins.gpio_cs);
-+
-+	return 0;
-+
-+err_free_pdata:
-+	kfree(d->spi_pdev->dev.platform_data);
-+	d->spi_pdev->dev.platform_data = NULL;
-+err_free_pdev:
-+	platform_device_put(d->spi_pdev);
-+err_free_d:
-+	kfree(d);
-+error:
-+	return err;
-+}
-+
-+static int gpiommc_remove(struct platform_device *pdev)
-+{
-+	struct gpiommc_device *d = platform_get_drvdata(pdev);
-+	struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
-+
-+	platform_device_unregister(d->spi_pdev);
-+	printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
-+	       pdata->name);
-+	platform_device_put(d->spi_pdev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+
-+/* A device that was created through configfs */
-+struct gpiommc_configfs_device {
-+	struct config_item item;
-+	/* The platform device, after registration. */
-+	struct platform_device *pdev;
-+	/* The configuration */
-+	struct gpiommc_platform_data pdata;
-+};
-+
-+#define GPIO_INVALID	-1
-+
-+static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
-+{
-+	return (dev->pdev != NULL);
-+}
-+
-+static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
-+{
-+	return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
-+}
-+
-+static struct configfs_attribute gpiommc_attr_DI = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_in",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_DO = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_data_out",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CLK = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_clock",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_CS_activelow = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "gpio_chipselect_activelow",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spimode = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_mode",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_spidelay = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "spi_delay",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_max_bus_speed = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "max_bus_speed",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute gpiommc_attr_register = {
-+	.ca_owner = THIS_MODULE,
-+	.ca_name = "register",
-+	.ca_mode = S_IRUGO | S_IWUSR,
-+};
-+
-+static struct configfs_attribute *gpiommc_config_attrs[] = {
-+	&gpiommc_attr_DI,
-+	&gpiommc_attr_DO,
-+	&gpiommc_attr_CLK,
-+	&gpiommc_attr_CS,
-+	&gpiommc_attr_CS_activelow,
-+	&gpiommc_attr_spimode,
-+	&gpiommc_attr_spidelay,
-+	&gpiommc_attr_max_bus_speed,
-+	&gpiommc_attr_register,
-+	NULL,
-+};
-+
-+static ssize_t gpiommc_config_attr_show(struct config_item *item,
-+					struct configfs_attribute *attr,
-+					char *page)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	ssize_t count = 0;
-+	unsigned int gpio;
-+	int err = 0;
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		gpio = dev->pdata.pins.gpio_di;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		gpio = dev->pdata.pins.gpio_do;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		gpio = dev->pdata.pins.gpio_clk;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		gpio = dev->pdata.pins.gpio_cs;
-+		if (gpio == GPIO_INVALID)
-+			count = snprintf(page, PAGE_SIZE, "not configured\n");
-+		else
-+			count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.pins.cs_activelow);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.mode);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 !dev->pdata.no_spi_delay);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 dev->pdata.max_bus_speed);
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_register) {
-+		count = snprintf(page, PAGE_SIZE, "%u\n",
-+				 gpiommc_is_registered(dev));
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
-+			       const char *name)
-+{
-+	int err;
-+
-+	if (gpiommc_is_registered(dev))
-+		return 0;
-+
-+	if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_do) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
-+	    !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
-+		printk(KERN_ERR PFX
-+		       "configfs: Invalid GPIO pin number(s)\n");
-+		return -EINVAL;
-+	}
-+
-+	strlcpy(dev->pdata.name, name,
-+		sizeof(dev->pdata.name));
-+
-+	dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
-+					  gpiommc_next_id());
-+	if (!dev->pdev)
-+		return -ENOMEM;
-+	err = platform_device_add_data(dev->pdev, &dev->pdata,
-+				       sizeof(dev->pdata));
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+	err = platform_device_add(dev->pdev);
-+	if (err) {
-+		platform_device_put(dev->pdev);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
-+{
-+	if (!gpiommc_is_registered(dev))
-+		return;
-+
-+	platform_device_unregister(dev->pdev);
-+	dev->pdev = NULL;
-+}
-+
-+static ssize_t gpiommc_config_attr_store(struct config_item *item,
-+					 struct configfs_attribute *attr,
-+					 const char *page, size_t count)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+	int err = -EINVAL;
-+	unsigned long data;
-+
-+	if (attr == &gpiommc_attr_register) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data == 1)
-+			err = gpiommc_do_register(dev, item->ci_name);
-+		if (data == 0) {
-+			gpiommc_do_unregister(dev);
-+			err = 0;
-+		}
-+		goto out;
-+	}
-+
-+	if (gpiommc_is_registered(dev)) {
-+		/* The rest of the config parameters can only be set
-+		 * as long as the device is not registered, yet. */
-+		err = -EBUSY;
-+		goto out;
-+	}
-+
-+	if (attr == &gpiommc_attr_DI) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_di = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_DO) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_do = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CLK) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_clk = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (!gpio_is_valid(data))
-+			goto out;
-+		dev->pdata.pins.gpio_cs = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_CS_activelow) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.pins.cs_activelow = data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spimode) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		switch (data) {
-+		case 0:
-+			dev->pdata.mode = SPI_MODE_0;
-+			break;
-+		case 1:
-+			dev->pdata.mode = SPI_MODE_1;
-+			break;
-+		case 2:
-+			dev->pdata.mode = SPI_MODE_2;
-+			break;
-+		case 3:
-+			dev->pdata.mode = SPI_MODE_3;
-+			break;
-+		default:
-+			goto out;
-+		}
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_spidelay) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data != 0 && data != 1)
-+			goto out;
-+		dev->pdata.no_spi_delay = !data;
-+		err = 0;
-+		goto out;
-+	}
-+	if (attr == &gpiommc_attr_max_bus_speed) {
-+		err = strict_strtoul(page, 10, &data);
-+		if (err)
-+			goto out;
-+		err = -EINVAL;
-+		if (data > UINT_MAX)
-+			goto out;
-+		dev->pdata.max_bus_speed = data;
-+		err = 0;
-+		goto out;
-+	}
-+	WARN_ON(1);
-+	err = -ENOSYS;
-+out:
-+	return err ? err : count;
-+}
-+
-+static void gpiommc_config_item_release(struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	kfree(dev);
-+}
-+
-+static struct configfs_item_operations gpiommc_config_item_ops = {
-+	.release		= gpiommc_config_item_release,
-+	.show_attribute		= gpiommc_config_attr_show,
-+	.store_attribute	= gpiommc_config_attr_store,
-+};
-+
-+static struct config_item_type gpiommc_dev_ci_type = {
-+	.ct_item_ops	= &gpiommc_config_item_ops,
-+	.ct_attrs	= gpiommc_config_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *gpiommc_make_item(struct config_group *group,
-+					     const char *name)
-+{
-+	struct gpiommc_configfs_device *dev;
-+
-+	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
-+		printk(KERN_ERR PFX "configfs: device name too long\n");
-+		return NULL;
-+	}
-+
-+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return NULL;
-+
-+	config_item_init_type_name(&dev->item, name,
-+				   &gpiommc_dev_ci_type);
-+
-+	/* Assign default configuration */
-+	dev->pdata.pins.gpio_di = GPIO_INVALID;
-+	dev->pdata.pins.gpio_do = GPIO_INVALID;
-+	dev->pdata.pins.gpio_clk = GPIO_INVALID;
-+	dev->pdata.pins.gpio_cs = GPIO_INVALID;
-+	dev->pdata.pins.cs_activelow = 1;
-+	dev->pdata.mode = SPI_MODE_0;
-+	dev->pdata.no_spi_delay = 0;
-+	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
-+
-+	return &(dev->item);
-+}
-+
-+static void gpiommc_drop_item(struct config_group *group,
-+			      struct config_item *item)
-+{
-+	struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
-+
-+	gpiommc_do_unregister(dev);
-+	kfree(dev);
-+}
-+
-+static struct configfs_group_operations gpiommc_ct_group_ops = {
-+	.make_item	= gpiommc_make_item,
-+	.drop_item	= gpiommc_drop_item,
-+};
-+
-+static struct config_item_type gpiommc_ci_type = {
-+	.ct_group_ops	= &gpiommc_ct_group_ops,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct configfs_subsystem gpiommc_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = GPIOMMC_PLATDEV_NAME,
-+			.ci_type = &gpiommc_ci_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
-+};
-+
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+static struct platform_driver gpiommc_plat_driver = {
-+	.probe	= gpiommc_probe,
-+	.remove	= gpiommc_remove,
-+	.driver	= {
-+		.name	= GPIOMMC_PLATDEV_NAME,
-+		.owner	= THIS_MODULE,
-+	},
-+};
-+
-+int gpiommc_next_id(void)
-+{
-+	static atomic_t counter = ATOMIC_INIT(-1);
-+
-+	return atomic_inc_return(&counter);
-+}
-+EXPORT_SYMBOL(gpiommc_next_id);
-+
-+static int __init gpiommc_modinit(void)
-+{
-+	int err;
-+
-+	err = platform_driver_register(&gpiommc_plat_driver);
-+	if (err)
-+		return err;
-+
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	config_group_init(&gpiommc_subsys.su_group);
-+	err = configfs_register_subsystem(&gpiommc_subsys);
-+	if (err) {
-+		platform_driver_unregister(&gpiommc_plat_driver);
-+		return err;
-+	}
-+#endif /* CONFIG_GPIOMMC_CONFIGFS */
-+
-+	return 0;
-+}
-+module_init(gpiommc_modinit);
-+
-+static void __exit gpiommc_modexit(void)
-+{
-+#ifdef CONFIG_GPIOMMC_CONFIGFS
-+	configfs_unregister_subsystem(&gpiommc_subsys);
-+#endif
-+	platform_driver_unregister(&gpiommc_plat_driver);
-+}
-+module_exit(gpiommc_modexit);
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -370,6 +370,31 @@ config MMC_TMIO
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also HTC ASIC3
- 
-+config GPIOMMC
-+	tristate "MMC/SD over GPIO-based SPI"
-+	depends on MMC && MMC_SPI && SPI_GPIO_OLD
-+	help
-+	  This driver hooks up the mmc_spi and spi_gpio modules so that
-+	  MMC/SD cards can be used on a GPIO based bus by bitbanging
-+	  the SPI protocol in software.
-+
-+	  This driver provides a configfs interface to dynamically create
-+	  and destroy GPIO-based MMC/SD card devices. It also provides
-+	  a platform device interface API.
-+	  See Documentation/gpiommc.txt for details.
-+
-+	  The module will be called gpiommc.
-+
-+	  If unsure, say N.
-+
-+config GPIOMMC_CONFIGFS
-+	bool
-+	depends on GPIOMMC && CONFIGFS_FS
-+	default y
-+	help
-+	  This option automatically enables configfs support for gpiommc
-+	  if configfs is available.
-+
- config MMC_CB710
- 	tristate "ENE CB710 MMC/SD Interface support"
- 	depends on PCI
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
- obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
-+obj-$(CONFIG_GPIOMMC)		+= gpiommc.o
- obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o
- 
- obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
---- /dev/null
-+++ b/include/linux/mmc/gpiommc.h
-@@ -0,0 +1,71 @@
-+/*
-+ * Device driver for MMC/SD cards driven over a GPIO bus.
-+ *
-+ * Copyright (c) 2008 Michael Buesch
-+ *
-+ * Licensed under the GNU/GPL version 2.
-+ */
-+#ifndef LINUX_GPIOMMC_H_
-+#define LINUX_GPIOMMC_H_
-+
-+#include <linux/types.h>
-+
-+
-+#define GPIOMMC_MAX_NAMELEN		15
-+#define GPIOMMC_MAX_NAMELEN_STR		__stringify(GPIOMMC_MAX_NAMELEN)
-+
-+/**
-+ * struct gpiommc_pins - Hardware pin assignments
-+ *
-+ * @gpio_di: The GPIO number of the DATA IN pin
-+ * @gpio_do: The GPIO number of the DATA OUT pin
-+ * @gpio_clk: The GPIO number of the CLOCK pin
-+ * @gpio_cs: The GPIO number of the CHIPSELECT pin
-+ * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-+ */
-+struct gpiommc_pins {
-+	unsigned int gpio_di;
-+	unsigned int gpio_do;
-+	unsigned int gpio_clk;
-+	unsigned int gpio_cs;
-+	bool cs_activelow;
-+};
-+
-+/**
-+ * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-+ *
-+ * @name: The unique name string of the device.
-+ * @pins: The hardware pin assignments.
-+ * @mode: The hardware mode. This is either SPI_MODE_0,
-+ *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-+ * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-+ *                This is not standards compliant, but may be required for some
-+ *                embedded machines to gain reasonable speed.
-+ * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-+ */
-+struct gpiommc_platform_data {
-+	char name[GPIOMMC_MAX_NAMELEN + 1];
-+	struct gpiommc_pins pins;
-+	u8 mode;
-+	bool no_spi_delay;
-+	unsigned int max_bus_speed;
-+};
-+
-+/**
-+ * GPIOMMC_PLATDEV_NAME - The platform device name string.
-+ *
-+ * The name string that has to be used for platform_device_alloc
-+ * when allocating a gpiommc device.
-+ */
-+#define GPIOMMC_PLATDEV_NAME	"gpiommc"
-+
-+/**
-+ * gpiommc_next_id - Get another platform device ID number.
-+ *
-+ * This returns the next platform device ID number that has to be used
-+ * for platform_device_alloc. The ID is opaque and should not be used for
-+ * anything else.
-+ */
-+int gpiommc_next_id(void);
-+
-+#endif /* LINUX_GPIOMMC_H_ */
---- /dev/null
-+++ b/Documentation/gpiommc.txt
-@@ -0,0 +1,97 @@
-+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
-+================================================================
-+
-+The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
-+MMC or SD card on GPIO pins.
-+
-+Two interfaces for registering a new MMC/SD card device are provided:
-+A static platform-device based mechanism and a dynamic configfs based interface.
-+
-+
-+Registering devices via platform-device
-+=======================================
-+
-+The platform-device interface is used for registering MMC/SD devices that are
-+part of the hardware platform. This is most useful only for embedded machines
-+with MMC/SD devices statically connected to the platform GPIO bus.
-+
-+The data structures are declared in <linux/mmc/gpiommc.h>.
-+
-+To register a new device, define an instance of struct gpiommc_platform_data.
-+This structure holds any information about how the device is hooked up to the
-+GPIO pins and what hardware modes the device supports. See the docbook-style
-+documentation in the header file for more information on the struct fields.
-+
-+Then allocate a new instance of a platform device by doing:
-+
-+	pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
-+
-+This will allocate the platform device data structures and hook it up to the
-+gpiommc driver.
-+Then add the gpiommc_platform_data to the platform device.
-+
-+	err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
-+
-+You may free the local instance of struct gpiommc_platform_data now. (So the
-+struct may be allocated on the stack, too).
-+Now simply register the platform device.
-+
-+	err = platform_device_add(pdev);
-+
-+Done. The gpiommc probe routine will be invoked now and you should see a kernel
-+log message for the added device.
-+
-+
-+Registering devices via configfs
-+================================
-+
-+MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
-+selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
-+hardware are a common situation.
-+So we provide a dynamic interface to conveniently handle adding and removing
-+devices from userspace, without the need to recompile the kernel.
-+
-+The "gpiommc" subdirectory at the configfs mountpoint is used for handling
-+the dynamic configuration.
-+
-+To create a new device, it must first be allocated with mkdir.
-+The following command will allocate a device named "my_mmc":
-+	mkdir /config/gpiommc/my_mmc
-+
-+There are several configuration files available in the new
-+/config/gpiommc/my_mmc/ directory:
-+
-+gpio_data_in			= The SPI data-IN GPIO pin number.
-+gpio_data_out			= The SPI data-OUT GPIO pin number.
-+gpio_clock			= The SPI Clock GPIO pin number.
-+gpio_chipselect			= The SPI Chipselect GPIO pin number.
-+gpio_chipselect_activelow	= Boolean. If 0, Chipselect is active-HIGH.
-+				  If 1, Chipselect is active-LOW.
-+spi_mode			= The SPI data mode. Can be 0-3.
-+spi_delay			= Enable all delays in the lowlevel bitbanging.
-+max_bus_speed			= The maximum SPI bus speed. In Hertz.
-+
-+register			= Not a configuration parameter.
-+				  Used to register the configured card
-+				  with the kernel.
-+
-+The device must first get configured and then registered by writing "1" to
-+the "register" file.
-+The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
-+and "gpio_chipselect" are essential and _must_ be configured before writing
-+"1" to the "register" file. The registration will fail, otherwise.
-+
-+The default values for the other parameters are:
-+gpio_chipselect_activelow	= 1		(CS active-LOW)
-+spi_mode			= 0		(SPI_MODE_0)
-+spi_delay			= 1		(enabled)
-+max_bus_speed			= 5000000	(5 Mhz)
-+
-+Configuration values can not be changed after registration. To unregister
-+the device, write a "0" to the "register" file. The configuration can be
-+changed again after unregistering.
-+
-+To completely remove the device, simply rmdir the directory
-+(/config/gpiommc/my_mmc in this example).
-+There's no need to first unregister the device before removing it. That will
-+be done automatically.
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2540,6 +2540,11 @@ T:	git git://git.kernel.org/pub/scm/linu
- S:	Maintained
- F:	drivers/media/video/gspca/
- 
-+GPIOMMC DRIVER
-+P:	Michael Buesch
-+M:	mb@bu3sch.de
-+S:	Maintained
-+
- HARDWARE MONITORING
- L:	lm-sensors@lm-sensors.org
- W:	http://www.lm-sensors.org/
diff --git a/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch
deleted file mode 100644
index 2e4e820b2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/923-gpiommc-configfs-locking.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-The gpiommc configfs context structure needs locking, as configfs
-does not lock access between files.
-
---- a/drivers/mmc/host/gpiommc.c
-+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
- 	struct platform_device *pdev;
- 	/* The configuration */
- 	struct gpiommc_platform_data pdata;
-+	/* Mutex to protect this structure */
-+	struct mutex mutex;
- };
- 
- #define GPIO_INVALID	-1
-@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
- 	unsigned int gpio;
- 	int err = 0;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_DI) {
- 		gpio = dev->pdata.pins.gpio_di;
- 		if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
- 	int err = -EINVAL;
- 	unsigned long data;
- 
-+	mutex_lock(&dev->mutex);
-+
- 	if (attr == &gpiommc_attr_register) {
- 		err = strict_strtoul(page, 10, &data);
- 		if (err)
-@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
- 	WARN_ON(1);
- 	err = -ENOSYS;
- out:
-+	mutex_unlock(&dev->mutex);
-+
- 	return err ? err : count;
- }
- 
-@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
- 	if (!dev)
- 		return NULL;
- 
-+	mutex_init(&dev->mutex);
- 	config_item_init_type_name(&dev->item, name,
- 				   &gpiommc_dev_ci_type);
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch
deleted file mode 100644
index 9081be84a4..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/924-cs5535_gpio.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/drivers/char/cs5535_gpio.c
-+++ b/drivers/char/cs5535_gpio.c
-@@ -15,6 +15,7 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/cdev.h>
-+#include <linux/device.h>
- #include <linux/ioport.h>
- #include <linux/pci.h>
- 
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
- MODULE_DEVICE_TABLE(pci, divil_pci);
- 
- static struct cdev cs5535_gpio_cdev;
-+static struct class *cs5535_gpio_class;
- 
- /* reserve 32 entries even though some aren't usable */
- #define CS5535_GPIO_COUNT	32
-@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
- 	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */
- 	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */
- 	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */
-+	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */
-+	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */
- 	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */
- 	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */
- 	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */
-+	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */
-+	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */
-+	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */
- };
- 
- 
-@@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void)
- {
- 	dev_t	dev_id;
- 	u32	low, hi;
--	int	retval;
-+	int	retval, i;
- 
- 	if (pci_dev_present(divil_pci) == 0) {
- 		printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void)
- 		major = MAJOR(dev_id);
- 	}
- 
--	if (retval) {
--		release_region(gpio_base, CS5535_GPIO_SIZE);
--		return -1;
--	}
-+	if (retval)
-+		goto error;
- 
- 	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n",
- 	       gpio_base, mask, major);
- 
- 	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops);
--	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT);
-+	if (retval) {
-+		kobject_put(&cs5535_gpio_cdev.kobj);
-+		goto error_region;
-+	}
-+
-+	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio");
-+	if (IS_ERR(cs5535_gpio_class)) {
-+		printk(KERN_ERR "Error creating cs5535_gpio class\n");
-+		cdev_del(&cs5535_gpio_cdev);
-+		retval = PTR_ERR(cs5535_gpio_class);
-+		goto error_region;
-+	}
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i);
-+		}
-+	}
- 
- 	return 0;
-+
-+error_region:
-+	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
-+error:
-+	release_region(gpio_base, CS5535_GPIO_SIZE);
-+	return retval;
- }
- 
- static void __exit cs5535_gpio_cleanup(void)
- {
- 	dev_t dev_id = MKDEV(major, 0);
-+	int i;
-+
-+	for (i = 0; i < CS5535_GPIO_COUNT; i++) {
-+		if (mask & (1<<i)) {
-+			device_destroy(cs5535_gpio_class, MKDEV(major, i));
-+		}
-+	}
-+
-+	class_destroy(cs5535_gpio_class);
- 
- 	cdev_del(&cs5535_gpio_cdev);
- 	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT);
diff --git a/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch
deleted file mode 100644
index 33d5299f25..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/940-wireless_mesh_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -138,7 +138,7 @@ static inline bool dev_xmit_complete(int
-  */
- 
- #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
--# if defined(CONFIG_MAC80211_MESH)
-+# if 1 || defined(CONFIG_MAC80211_MESH)
- #  define LL_MAX_HEADER 128
- # else
- #  define LL_MAX_HEADER 96
diff --git a/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch
deleted file mode 100644
index d2c76a8f2b..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/951-revert_gcc4_4_fixes.patch
+++ /dev/null
@@ -1,524 +0,0 @@
---- a/arch/powerpc/boot/crtsavres.S
-+++ /dev/null
-@@ -1,233 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--/* On PowerPC64 Linux, these functions are provided by the linker.  */
--#ifndef __powerpc64__
--
--#define _GLOBAL(name) \
--	.type name,@function; \
--	.globl name; \
--name:
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -60,7 +60,7 @@ libfdtheader := fdt.h libfdt.h libfdt_in
- $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
- 	$(addprefix $(obj)/,$(libfdtheader))
- 
--src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
-+src-wlib := string.S crt0.S stdio.c main.c \
- 		$(libfdt) libfdt-wrapper.c \
- 		ns16550.c serial.c simple_alloc.c div64.S util.S \
- 		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
---- a/arch/powerpc/kernel/prom_init_check.sh
-+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@ do
- 		fi
- 	done
- 
--	# ignore register save/restore funcitons
--	if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
--		OK=1
--	fi
--	if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
--		OK=1
--	fi
--
- 	if [ $OK -eq 0 ]; then
- 		ERROR=1
- 		echo "Error: External symbol '$UNDEF' referenced" \
---- a/arch/powerpc/lib/crtsavres.S
-+++ /dev/null
-@@ -1,229 +0,0 @@
--/*
-- * Special support for eabi and SVR4
-- *
-- *   Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-- *   Copyright 2008 Freescale Semiconductor, Inc.
-- *   Written By Michael Meissner
-- *
-- * Based on gcc/config/rs6000/crtsavres.asm from gcc
-- *
-- * This file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; either version 2, or (at your option) any
-- * later version.
-- *
-- * In addition to the permissions in the GNU General Public License, the
-- * Free Software Foundation gives you unlimited permission to link the
-- * compiled version of this file with other programs, and to distribute
-- * those programs without any restriction coming from the use of this
-- * file.  (The General Public License restrictions do apply in other
-- * respects; for example, they cover modification of the file, and
-- * distribution when not linked into another program.)
-- *
-- * This file is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; see the file COPYING.  If not, write to
-- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-- * Boston, MA 02110-1301, USA.
-- *
-- *    As a special exception, if you link this library with files
-- *    compiled with GCC to produce an executable, this does not cause
-- *    the resulting executable to be covered by the GNU General Public License.
-- *    This exception does not however invalidate any other reasons why
-- *    the executable file might be covered by the GNU General Public License.
-- */
--
--#include <asm/ppc_asm.h>
--
--	.file	"crtsavres.S"
--	.section ".text"
--
--#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--
--/* Routines for saving integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer save area.  */
--
--_GLOBAL(_savegpr_14)
--_GLOBAL(_save32gpr_14)
--	stw	14,-72(11)	/* save gp registers */
--_GLOBAL(_savegpr_15)
--_GLOBAL(_save32gpr_15)
--	stw	15,-68(11)
--_GLOBAL(_savegpr_16)
--_GLOBAL(_save32gpr_16)
--	stw	16,-64(11)
--_GLOBAL(_savegpr_17)
--_GLOBAL(_save32gpr_17)
--	stw	17,-60(11)
--_GLOBAL(_savegpr_18)
--_GLOBAL(_save32gpr_18)
--	stw	18,-56(11)
--_GLOBAL(_savegpr_19)
--_GLOBAL(_save32gpr_19)
--	stw	19,-52(11)
--_GLOBAL(_savegpr_20)
--_GLOBAL(_save32gpr_20)
--	stw	20,-48(11)
--_GLOBAL(_savegpr_21)
--_GLOBAL(_save32gpr_21)
--	stw	21,-44(11)
--_GLOBAL(_savegpr_22)
--_GLOBAL(_save32gpr_22)
--	stw	22,-40(11)
--_GLOBAL(_savegpr_23)
--_GLOBAL(_save32gpr_23)
--	stw	23,-36(11)
--_GLOBAL(_savegpr_24)
--_GLOBAL(_save32gpr_24)
--	stw	24,-32(11)
--_GLOBAL(_savegpr_25)
--_GLOBAL(_save32gpr_25)
--	stw	25,-28(11)
--_GLOBAL(_savegpr_26)
--_GLOBAL(_save32gpr_26)
--	stw	26,-24(11)
--_GLOBAL(_savegpr_27)
--_GLOBAL(_save32gpr_27)
--	stw	27,-20(11)
--_GLOBAL(_savegpr_28)
--_GLOBAL(_save32gpr_28)
--	stw	28,-16(11)
--_GLOBAL(_savegpr_29)
--_GLOBAL(_save32gpr_29)
--	stw	29,-12(11)
--_GLOBAL(_savegpr_30)
--_GLOBAL(_save32gpr_30)
--	stw	30,-8(11)
--_GLOBAL(_savegpr_31)
--_GLOBAL(_save32gpr_31)
--	stw	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14)
--_GLOBAL(_rest32gpr_14)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15)
--_GLOBAL(_rest32gpr_15)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16)
--_GLOBAL(_rest32gpr_16)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17)
--_GLOBAL(_rest32gpr_17)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18)
--_GLOBAL(_rest32gpr_18)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19)
--_GLOBAL(_rest32gpr_19)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20)
--_GLOBAL(_rest32gpr_20)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21)
--_GLOBAL(_rest32gpr_21)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22)
--_GLOBAL(_rest32gpr_22)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23)
--_GLOBAL(_rest32gpr_23)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24)
--_GLOBAL(_rest32gpr_24)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25)
--_GLOBAL(_rest32gpr_25)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26)
--_GLOBAL(_rest32gpr_26)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27)
--_GLOBAL(_rest32gpr_27)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28)
--_GLOBAL(_rest32gpr_28)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29)
--_GLOBAL(_rest32gpr_29)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30)
--_GLOBAL(_rest32gpr_30)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31)
--_GLOBAL(_rest32gpr_31)
--	lwz	31,-4(11)
--	blr
--
--/* Routines for restoring integer registers, called by the compiler.  */
--/* Called with r11 pointing to the stack header word of the caller of the */
--/* function, just beyond the end of the integer restore area.  */
--
--_GLOBAL(_restgpr_14_x)
--_GLOBAL(_rest32gpr_14_x)
--	lwz	14,-72(11)	/* restore gp registers */
--_GLOBAL(_restgpr_15_x)
--_GLOBAL(_rest32gpr_15_x)
--	lwz	15,-68(11)
--_GLOBAL(_restgpr_16_x)
--_GLOBAL(_rest32gpr_16_x)
--	lwz	16,-64(11)
--_GLOBAL(_restgpr_17_x)
--_GLOBAL(_rest32gpr_17_x)
--	lwz	17,-60(11)
--_GLOBAL(_restgpr_18_x)
--_GLOBAL(_rest32gpr_18_x)
--	lwz	18,-56(11)
--_GLOBAL(_restgpr_19_x)
--_GLOBAL(_rest32gpr_19_x)
--	lwz	19,-52(11)
--_GLOBAL(_restgpr_20_x)
--_GLOBAL(_rest32gpr_20_x)
--	lwz	20,-48(11)
--_GLOBAL(_restgpr_21_x)
--_GLOBAL(_rest32gpr_21_x)
--	lwz	21,-44(11)
--_GLOBAL(_restgpr_22_x)
--_GLOBAL(_rest32gpr_22_x)
--	lwz	22,-40(11)
--_GLOBAL(_restgpr_23_x)
--_GLOBAL(_rest32gpr_23_x)
--	lwz	23,-36(11)
--_GLOBAL(_restgpr_24_x)
--_GLOBAL(_rest32gpr_24_x)
--	lwz	24,-32(11)
--_GLOBAL(_restgpr_25_x)
--_GLOBAL(_rest32gpr_25_x)
--	lwz	25,-28(11)
--_GLOBAL(_restgpr_26_x)
--_GLOBAL(_rest32gpr_26_x)
--	lwz	26,-24(11)
--_GLOBAL(_restgpr_27_x)
--_GLOBAL(_rest32gpr_27_x)
--	lwz	27,-20(11)
--_GLOBAL(_restgpr_28_x)
--_GLOBAL(_rest32gpr_28_x)
--	lwz	28,-16(11)
--_GLOBAL(_restgpr_29_x)
--_GLOBAL(_rest32gpr_29_x)
--	lwz	29,-12(11)
--_GLOBAL(_restgpr_30_x)
--_GLOBAL(_rest32gpr_30_x)
--	lwz	30,-8(11)
--_GLOBAL(_restgpr_31_x)
--_GLOBAL(_rest32gpr_31_x)
--	lwz	0,4(11)
--	lwz	31,-4(11)
--	mtlr	0
--	mr	1,11
--	blr
--#endif
---- a/arch/powerpc/lib/Makefile
-+++ b/arch/powerpc/lib/Makefile
-@@ -13,7 +13,7 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
- 
- obj-y			:= string.o alloc.o \
- 			   checksum_$(CONFIG_WORD_SIZE).o
--obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
-+obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
- obj-$(CONFIG_HAS_IOMEM)	+= devres.o
- 
- obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -92,8 +92,6 @@ endif
- else
- 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
- endif
--else
--LDFLAGS_MODULE	+= arch/powerpc/lib/crtsavres.o
- endif
- 
- ifeq ($(CONFIG_TUNE_CELL),y)
diff --git a/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch
deleted file mode 100644
index 76413e9cef..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/970-ocf_kbuild_integration.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -836,3 +836,6 @@ config CRYPTO_ANSI_CPRNG
- source "drivers/crypto/Kconfig"
- 
- endif	# if CRYPTO
-+
-+source "crypto/ocf/Kconfig"
-+
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -86,6 +86,8 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
- obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
- obj-$(CONFIG_CRYPTO_GHASH) += ghash-generic.o
- 
-+obj-$(CONFIG_OCF_OCF) += ocf/
-+
- #
- # generic algorithms and the async_tx api
- #
diff --git a/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch
deleted file mode 100644
index 9aa36bcd50..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/971-ocf_20100325.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -129,6 +129,9 @@
-  *                                unsigned int value);
-  * 	void add_interrupt_randomness(int irq);
-  *
-+ *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+ *      int random_input_wait(void);
-+ *
-  * add_input_randomness() uses the input layer interrupt timing, as well as
-  * the event type information from the hardware.
-  *
-@@ -140,6 +143,13 @@
-  * a better measure, since the timing of the disk interrupts are more
-  * unpredictable.
-  *
-+ * random_input_words() just provides a raw block of entropy to the input
-+ * pool, such as from a hardware entropy generator.
-+ *
-+ * random_input_wait() suspends the caller until such time as the
-+ * entropy pool falls below the write threshold, and returns a count of how
-+ * much entropy (in bits) is needed to sustain the pool.
-+ *
-  * All of these routines try to estimate how many bits of randomness a
-  * particular randomness source.  They do this by keeping track of the
-  * first and second order deltas of the event timings.
-@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk
- }
- #endif
- 
-+/*
-+ * random_input_words - add bulk entropy to pool
-+ *
-+ * @buf: buffer to add
-+ * @wordcount: number of __u32 words to add
-+ * @ent_count: total amount of entropy (in bits) to credit
-+ *
-+ * this provides bulk input of entropy to the input pool
-+ *
-+ */
-+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
-+{
-+        mix_pool_bytes(&input_pool, buf, wordcount*4);
-+
-+        credit_entropy_bits(&input_pool, ent_count);
-+
-+        DEBUG_ENT("crediting %d bits => %d\n",
-+                  ent_count, input_pool.entropy_count);
-+	/*
-+	 * Wake up waiting processes if we have enough
-+	 * entropy.
-+	 */
-+	if (input_pool.entropy_count >= random_read_wakeup_thresh)
-+		wake_up_interruptible(&random_read_wait);
-+}
-+EXPORT_SYMBOL(random_input_words);
-+
-+/*
-+ * random_input_wait - wait until random needs entropy
-+ *
-+ * this function sleeps until the /dev/random subsystem actually
-+ * needs more entropy, and then return the amount of entropy
-+ * that it would be nice to have added to the system.
-+ */
-+int random_input_wait(void)
-+{
-+	int count;
-+
-+	wait_event_interruptible(random_write_wait,
-+		input_pool.entropy_count < random_write_wakeup_thresh);
-+
-+	count = random_write_wakeup_thresh - input_pool.entropy_count;
-+
-+	/* likely we got woken up due to a signal */
-+	if (count <= 0) count = random_read_wakeup_thresh;
-+
-+	DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
-+		count,
-+		input_pool.entropy_count, random_write_wakeup_thresh);
-+
-+	return count;
-+}
-+EXPORT_SYMBOL(random_input_wait);
-+
-+
- /*********************************************************************
-  *
-  * Entropy extraction routines
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(sys_dup);
- 
- #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
- 
---- a/include/linux/miscdevice.h
-+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
- #define APOLLO_MOUSE_MINOR	7
- #define PC110PAD_MINOR		9
- /*#define ADB_MOUSE_MINOR	10	FIXME OBSOLETE */
-+#define CRYPTODEV_MINOR		70	/* /dev/crypto */
- #define WATCHDOG_MINOR		130	/* Watchdog timer     */
- #define TEMP_MINOR		131	/* Temperature Sensor */
- #define RTC_MINOR		135
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -9,6 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#include <linux/types.h> /* for __u32 in user space */
- #include <linux/irqnr.h>
- 
- /* ioctl()'s for the random number generator */
-@@ -34,6 +35,30 @@
- /* Clear the entropy pool and associated counters.  (Superuser only.) */
- #define RNDCLEARPOOL	_IO( 'R', 0x06 )
- 
-+#ifdef CONFIG_FIPS_RNG
-+
-+/* Size of seed value - equal to AES blocksize */
-+#define AES_BLOCK_SIZE_BYTES	16
-+#define SEED_SIZE_BYTES			AES_BLOCK_SIZE_BYTES
-+/* Size of AES key */
-+#define KEY_SIZE_BYTES		16
-+
-+/* ioctl() structure used by FIPS 140-2 Tests */
-+struct rand_fips_test {
-+	unsigned char key[KEY_SIZE_BYTES];			/* Input */
-+	unsigned char datetime[SEED_SIZE_BYTES];	/* Input */
-+	unsigned char seed[SEED_SIZE_BYTES];		/* Input */
-+	unsigned char result[SEED_SIZE_BYTES];		/* Output */
-+};
-+
-+/* FIPS 140-2 RNG Variable Seed Test. (Superuser only.) */
-+#define RNDFIPSVST	_IOWR('R', 0x10, struct rand_fips_test)
-+
-+/* FIPS 140-2 RNG Monte Carlo Test. (Superuser only.) */
-+#define RNDFIPSMCT	_IOWR('R', 0x11, struct rand_fips_test)
-+
-+#endif /* #ifdef CONFIG_FIPS_RNG */
-+
- struct rand_pool_info {
- 	int	entropy_count;
- 	int	buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
- 				 unsigned int value);
- extern void add_interrupt_randomness(int irq);
- 
-+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
-+extern int random_input_wait(void);
-+#define HAS_RANDOM_INPUT_WAIT 1
-+
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -389,6 +389,7 @@ struct task_struct *find_task_by_vpid(pi
- {
- 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
- }
-+EXPORT_SYMBOL(find_task_by_vpid);
- 
- struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
- {
diff --git a/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch
deleted file mode 100644
index 3176dcb4d8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/974-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
diff --git a/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch b/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch
deleted file mode 100644
index 3a37c951ec..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/975-hifn795x-byteswap.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -682,12 +682,12 @@ static inline u32 hifn_read_1(struct hif
- 
- static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);
-+	writel(val, dev->bar[0] + reg);
- }
- 
- static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
- {
--	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);
-+	writel(val, dev->bar[1] + reg);
- }
- 
- static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch
deleted file mode 100644
index e9577ba5a0..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/977-textsearch_kconfig_hacks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -158,16 +158,16 @@ config REED_SOLOMON_DEC16
- # Textsearch support is select'ed if needed
- #
- config TEXTSEARCH
--	boolean
-+	boolean	"Textsearch support"
- 
- config TEXTSEARCH_KMP
--	tristate
-+	tristate "Textsearch KMP"
- 
- config TEXTSEARCH_BM
--	tristate
-+	tristate "Textsearch BM"
- 
- config TEXTSEARCH_FSM
--	tristate
-+	tristate "Textsearch FSM"
- 
- config BTREE
- 	boolean
diff --git a/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch b/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch
deleted file mode 100644
index c044deac00..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/978-lib80211_kconfig_hacks.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -142,13 +142,13 @@ config LIB80211
- 	  you want this built into your kernel.
- 
- config LIB80211_CRYPT_WEP
--	tristate
-+	tristate "LIB80211_CRYPT_WEP"
- 
- config LIB80211_CRYPT_CCMP
--	tristate
-+	tristate "LIB80211_CRYPT_CCMP"
- 
- config LIB80211_CRYPT_TKIP
--	tristate
-+	tristate "LIB80211_CRYPT_TKIP"
- 
- config LIB80211_DEBUG
- 	bool "lib80211 debugging messages"
diff --git a/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch
deleted file mode 100644
index b40b2cea96..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/979-crypto_add_kconfig_prompts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -32,7 +32,7 @@ config CRYPTO_FIPS
- 	  option is selected
- 
- config CRYPTO_ALGAPI
--	tristate
-+	tristate "ALGAPI"
- 	select CRYPTO_ALGAPI2
- 	help
- 	  This option provides the API for cryptographic algorithms.
-@@ -41,7 +41,7 @@ config CRYPTO_ALGAPI2
- 	tristate
- 
- config CRYPTO_AEAD
--	tristate
-+	tristate "AEAD"
- 	select CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI
- 
-@@ -50,7 +50,7 @@ config CRYPTO_AEAD2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_BLKCIPHER
--	tristate
-+	tristate "BLKCIPHER"
- 	select CRYPTO_BLKCIPHER2
- 	select CRYPTO_ALGAPI
- 
-@@ -61,7 +61,7 @@ config CRYPTO_BLKCIPHER2
- 	select CRYPTO_WORKQUEUE
- 
- config CRYPTO_HASH
--	tristate
-+	tristate "HASH"
- 	select CRYPTO_HASH2
- 	select CRYPTO_ALGAPI
- 
-@@ -70,7 +70,7 @@ config CRYPTO_HASH2
- 	select CRYPTO_ALGAPI2
- 
- config CRYPTO_RNG
--	tristate
-+	tristate "RNG"
- 	select CRYPTO_RNG2
- 	select CRYPTO_ALGAPI
- 
diff --git a/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch
deleted file mode 100644
index 5d0b5c6970..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/980-vm_exports.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/mm/shmem.c
-+++ b/mm/shmem.c
-@@ -29,6 +29,7 @@
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/swap.h>
-+#include <linux/ima.h>
- 
- static struct vfsmount *shm_mnt;
- 
-@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
- 
- /* common code */
- 
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
-+{
-+	ima_counts_get(file);
-+	if (vma->vm_file)
-+		fput(vma->vm_file);
-+	vma->vm_file = file;
-+	vma->vm_ops = &shmem_vm_ops;
-+}
-+EXPORT_SYMBOL_GPL(shmem_set_file);
-+
- /**
-  * shmem_file_setup - get an unlinked file living in tmpfs
-  * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
- 	if (IS_ERR(file))
- 		return PTR_ERR(file);
- 
--	if (vma->vm_file)
--		fput(vma->vm_file);
--	vma->vm_file = file;
--	vma->vm_ops = &shmem_vm_ops;
-+	shmem_set_file(vma, file);
- 	return 0;
- }
---- a/fs/file.c
-+++ b/fs/file.c
-@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
- 	/* All good, so we try */
- 	return expand_fdtable(files, nr);
- }
-+EXPORT_SYMBOL_GPL(expand_files);
- 
- static int count_open_files(struct fdtable *fdt)
- {
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
- 
- 	return files;
- }
-+EXPORT_SYMBOL_GPL(get_files_struct);
- 
- void put_files_struct(struct files_struct *files)
- {
-@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
- 		rcu_read_unlock();
- 	}
- }
-+EXPORT_SYMBOL_GPL(put_files_struct);
- 
- void reset_files_struct(struct files_struct *files)
- {
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -177,6 +177,7 @@ void __put_task_struct(struct task_struc
- 	if (!profile_handoff_task(tsk))
- 		free_task(tsk);
- }
-+EXPORT_SYMBOL_GPL(__put_task_struct);
- 
- /*
-  * macro override instead of weak attribute alias, to workaround
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
- 	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
- 		capable(CAP_SYS_NICE));
- }
-+EXPORT_SYMBOL_GPL(can_nice);
- 
- #ifdef __ARCH_WANT_SYS_NICE
- 
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1203,6 +1203,7 @@ unsigned long zap_page_range(struct vm_a
- 		tlb_finish_mmu(tlb, address, end);
- 	return end;
- }
-+EXPORT_SYMBOL_GPL(zap_page_range);
- 
- /**
-  * zap_vma_ptes - remove ptes mapping the vma
-@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
- 
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(vmtruncate_range);
- 
- /*
-  * We enter with non-exclusive mmap_sem (to exclude vma changes,
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
- 	vunmap_page_range(addr, end);
- 	flush_tlb_kernel_range(addr, end);
- }
-+EXPORT_SYMBOL_GPL(unmap_kernel_range);
- 
- int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
- {
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
- 	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
- 				-1, GFP_KERNEL, __builtin_return_address(0));
- }
-+EXPORT_SYMBOL_GPL(get_vm_area);
- 
- struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
- 				void *caller)
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -728,6 +728,7 @@ extern void show_free_areas(void);
- 
- int shmem_lock(struct file *file, int lock, struct user_struct *user);
- struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
-+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
- int shmem_zero_setup(struct vm_area_struct *);
- 
- #ifndef CONFIG_MMU
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand
- 
- 	return sighand;
- }
-+EXPORT_SYMBOL(lock_task_sighand);
- 
- /*
-  * send signal info to all the members of a group
diff --git a/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch
deleted file mode 100644
index daac5898ae..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/981-wireless_ext_kconfig_hack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/net/wireless/Kconfig
-+++ b/net/wireless/Kconfig
-@@ -1,5 +1,5 @@
- config WIRELESS_EXT
--	bool
-+	bool "Wireless extensions"
- 
- config WEXT_CORE
- 	def_bool y
-@@ -11,10 +11,10 @@ config WEXT_PROC
- 	depends on WEXT_CORE
- 
- config WEXT_SPY
--	bool
-+	bool "WEXT_SPY"
- 
- config WEXT_PRIV
--	bool
-+	bool "WEXT_PRIV"
- 
- config CFG80211
- 	tristate "cfg80211 - wireless configuration API"
diff --git a/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch b/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch
deleted file mode 100644
index 73ede933ba..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
diff --git a/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch b/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch
deleted file mode 100644
index 0efb777809..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/991-ppc4xx_optimization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream doesn't optimize the kernel and bootwrappers for ppc44x because
-they still want to support gcc 3.3 -- well, we don't.
-
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
- KBUILD_CFLAGS		+= -mno-sched-epilog
- endif
- 
--cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
-+cpu-as-$(CONFIG_40x)		+= -Wa,-m405
-+cpu-as-$(CONFIG_44x)		+= -Wa,-m440
- cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec
- cpu-as-$(CONFIG_E500)		+= -Wa,-me500
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -38,10 +38,10 @@ BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(ob
- DTS_FLAGS	?= -p 1024
- 
- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
--$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
--$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
-+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
-+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
- $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
- $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
- $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
diff --git a/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch
deleted file mode 100644
index 450986538d..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/997-lzo_decompressor_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usr/Kconfig
-+++ b/usr/Kconfig
-@@ -75,7 +75,7 @@ config RD_LZMA
- config RD_LZO
- 	bool "Support initial ramdisks compressed using LZO" if EMBEDDED
- 	default !EMBEDDED
--	depends on BLK_DEV_INITRD
-+	depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO
- 	select DECOMPRESS_LZO
- 	help
- 	  Support loading of a LZO encoded initial ramdisk or cpio buffer
diff --git a/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch
deleted file mode 100644
index 3e32b67aed..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/998-openwrt_lzma_options.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
- 
- quiet_cmd_lzma = LZMA    $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
--	lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
-+	lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
- 	(rm -f $@ ; false)
- 
- quiet_cmd_lzo = LZO    $@
---- a/scripts/gen_initramfs_list.sh
-+++ b/scripts/gen_initramfs_list.sh
-@@ -226,7 +226,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
--compr="gzip -9 -f"
-+compr="gzip -9 -f -"
- 
- arg="$1"
- case "$arg" in
-@@ -240,9 +240,9 @@ case "$arg" in
- 		output_file="$1"
- 		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
- 		output=${cpio_list}
--		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
--		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
--		echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-+		echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
-+		echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
-+		echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- 		echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
- 		echo "$output_file" | grep -q "\.cpio$" && compr="cat"
- 		shift
-@@ -294,7 +294,7 @@ if [ ! -z ${output_file} ]; then
- 	if [ "${is_cpio_compressed}" = "compressed" ]; then
- 		cat ${cpio_tfile} > ${output_file}
- 	else
--		(cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-+		(cat ${cpio_tfile} | ${compr} > ${output_file}) \
- 		|| (rm -f ${output_file} ; false)
- 	fi
- 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
---- a/lib/decompress.c
-+++ b/lib/decompress.c
-@@ -36,6 +36,7 @@ static const struct compress_format {
- 	{ {037, 0236}, "gzip", gunzip },
- 	{ {0x42, 0x5a}, "bzip2", bunzip2 },
- 	{ {0x5d, 0x00}, "lzma", unlzma },
-+	{ {0x6d, 0x00}, "lzma-openwrt", unlzma },
- 	{ {0x89, 0x4c}, "lzo", unlzo },
- 	{ {0, 0}, NULL, NULL }
- };
diff --git a/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch
deleted file mode 100644
index 5499f75bc6..0000000000
--- a/target/linux/generic-2.6/patches-2.6.35/999-use_preinit_as_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init/main.c
-+++ b/init/main.c
-@@ -842,10 +842,7 @@ static noinline int init_post(void)
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	run_init_process("/sbin/init");
--	run_init_process("/etc/init");
--	run_init_process("/bin/init");
--	run_init_process("/bin/sh");
-+	run_init_process("/etc/preinit");
- 
- 	panic("No init found.  Try passing init= option to kernel. "
- 	      "See Linux Documentation/init.txt for guidance.");